External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-03-16 00:17:31 -02:30
Code Issues Packages Projects Releases Wiki Activity

Fix flannel for 1.6 and apply fixes to enable containerized kubelet

Browse Source
This commit is contained in:
Matthew Mosesohn
2017-04-05 13:47:03 +03:00
parent ccc11e5680
commit ff2fb9196f
8 changed files with 27 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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