Merge pull request #1186 from holser/resolv_conf

Set ClusterFirstWithHostNet for Pods with hostnetwork: true

roles/kubernetes/master/templates/manifests/kube-apiserver.manifest.j2

@@ -8,6 +8,9 @@ metadata:
     kargo: v2
 spec:
   hostNetwork: true
+{% if kube_version | version_compare('v1.6', '>=')  %}
+  dnsPolicy: ClusterFirstWithHostNet
+{% endif %}
   containers:
   - name: kube-apiserver
     image: {{ hyperkube_image_repo }}:{{ hyperkube_image_tag }}

roles/kubernetes/master/templates/manifests/kube-controller-manager.manifest.j2

@@ -7,6 +7,9 @@ metadata:
     k8s-app: kube-controller
 spec:
   hostNetwork: true
+{%- if kube_version | version_compare('v1.6', '>=') -%}
+  dnsPolicy: ClusterFirstWithHostNet
+{%- endif -%}
   containers:
   - name: kube-controller-manager
     image: {{ hyperkube_image_repo }}:{{ hyperkube_image_tag }}

roles/kubernetes/master/templates/manifests/kube-scheduler.manifest.j2

@@ -7,6 +7,9 @@ metadata:
     k8s-app: kube-scheduler
 spec:
   hostNetwork: true
+{%- if kube_version | version_compare('v1.6', '>=')  -%}
+  dnsPolicy: ClusterFirstWithHostNet
+{%- endif -%}
   containers:
   - name: kube-scheduler
     image: {{ hyperkube_image_repo }}:{{ hyperkube_image_tag }}

roles/kubernetes/node/templates/kubelet-container.j2

@@ -11,6 +11,7 @@
   -v /etc/cni:/etc/cni:ro \
   -v /opt/cni:/opt/cni:ro \
   -v /etc/ssl:/etc/ssl:ro \
+  -v /etc/resolv.conf:/etc/resolv.conf \
   {% for dir in ssl_ca_dirs -%}
   -v {{ dir }}:{{ dir }}:ro \
   {% endfor -%}