Merge pull request #1246 from holser/disable_dns_for_kube_services

Change DNS policy for kubernetes components
pull/1249/head
Matthew Mosesohn 2017-04-20 16:12:52 +03:00 committed by GitHub
commit 2d6bc9536c
5 changed files with 5 additions and 5 deletions

View File

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

View File

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

View File

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

View File

@ -8,7 +8,7 @@ metadata:
spec: spec:
hostNetwork: true hostNetwork: true
{% if kube_version | version_compare('v1.6', '>=') %} {% if kube_version | version_compare('v1.6', '>=') %}
dnsPolicy: ClusterFirstWithHostNet dnsPolicy: ClusterFirst
{% endif %} {% endif %}
containers: containers:
- name: kube-proxy - name: kube-proxy

View File

@ -16,7 +16,7 @@
{{dns_domain}}.{{d}}./{{d}}.{{d}}./com.{{d}}./ {{dns_domain}}.{{d}}./{{d}}.{{d}}./com.{{d}}./
{%- endfor %} {%- endfor %}
default_resolver: >- default_resolver: >-
{%- if cloud_provider is defined and cloud_provider == 'gce' -%}169.254.169.254{%- else -%}8.8.8.8{%- endif -%} {%- if cloud_provider is defined and cloud_provider in [ 'gce', 'aws' ] -%}169.254.169.254{%- else -%}8.8.8.8{%- endif -%}
- name: check if kubelet is configured - name: check if kubelet is configured
stat: stat: