diff --git a/roles/kubernetes-apps/ansible/tasks/netchecker.yml b/roles/kubernetes-apps/ansible/tasks/netchecker.yml index 6319d1c1c20cf46fc82c99e41182efd7700f2ace..f3c7ac1dfb3221af020532607cee2f707611407a 100644 --- a/roles/kubernetes-apps/ansible/tasks/netchecker.yml +++ b/roles/kubernetes-apps/ansible/tasks/netchecker.yml @@ -4,7 +4,7 @@ dest: "{{kube_config_dir}}/{{item.file}}" with_items: - {file: netchecker-agent-ds.yml, type: ds, name: netchecker-agent} - - {file: netchecker-agent-hostnet-ds.yml, type: ds, name: netchecker-agent-hostnet} + - {file: netchecker-agent-hostnet-ds.j2, type: ds, name: netchecker-agent-hostnet} - {file: netchecker-server-pod.yml, type: po, name: netchecker-server} - {file: netchecker-server-svc.yml, type: svc, name: netchecker-service} register: manifests diff --git a/roles/kubernetes-apps/ansible/templates/netchecker-agent-hostnet-ds.yml b/roles/kubernetes-apps/ansible/templates/netchecker-agent-hostnet-ds.j2 similarity index 90% rename from roles/kubernetes-apps/ansible/templates/netchecker-agent-hostnet-ds.yml rename to roles/kubernetes-apps/ansible/templates/netchecker-agent-hostnet-ds.j2 index 834321e87495f60ef1376d6d8f2205328a7028b3..6f0c54db885009f2d1d5e19852461ba95b31ec81 100644 --- a/roles/kubernetes-apps/ansible/templates/netchecker-agent-hostnet-ds.yml +++ b/roles/kubernetes-apps/ansible/templates/netchecker-agent-hostnet-ds.j2 @@ -13,6 +13,9 @@ spec: app: netchecker-agent-hostnet spec: hostNetwork: True +{%- if kube_version | version_compare('v1.6', '>=') -%} + dnsPolicy: ClusterFirstWithHostNet +{%- endif -%} containers: - name: netchecker-agent image: "{{ agent_img }}" diff --git a/roles/kubernetes/master/templates/manifests/kube-apiserver.manifest.j2 b/roles/kubernetes/master/templates/manifests/kube-apiserver.manifest.j2 index d3057a840a21afc96d5636c803df97194b794fb3..967f0a9cbf5455079a745b26a28539d8a3afa313 100644 --- a/roles/kubernetes/master/templates/manifests/kube-apiserver.manifest.j2 +++ b/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 }} diff --git a/roles/kubernetes/master/templates/manifests/kube-controller-manager.manifest.j2 b/roles/kubernetes/master/templates/manifests/kube-controller-manager.manifest.j2 index 6faf6dea512a451b357400f896020129503a19e0..c214719a305c1818305a3826d13478e1cd20fff2 100644 --- a/roles/kubernetes/master/templates/manifests/kube-controller-manager.manifest.j2 +++ b/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 }} diff --git a/roles/kubernetes/master/templates/manifests/kube-scheduler.manifest.j2 b/roles/kubernetes/master/templates/manifests/kube-scheduler.manifest.j2 index 781e38d7b76229674111ba9a0991246267171c2f..77d34288b999c4ee6bfea38c13ef6e9155c5a34c 100644 --- a/roles/kubernetes/master/templates/manifests/kube-scheduler.manifest.j2 +++ b/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 }} diff --git a/roles/kubernetes/node/templates/kubelet-container.j2 b/roles/kubernetes/node/templates/kubelet-container.j2 index ffea01cec3895fce74b52c47a40da17ad85ac0ec..66832cd1f73259b3781afe7aff18b5f6290e0523 100644 --- a/roles/kubernetes/node/templates/kubelet-container.j2 +++ b/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 -%}