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

Upgrade k8s to 1.10.2 (#2748)

Browse Source 
* Upgrade k8s to 1.10.2

Bumped etcd version to 3.2.16 as recommended

* Add ipvs fix for v1.10

* change flannel addons test to ha
This commit is contained in:
Matthew Mosesohn
2018-05-15 16:00:29 +03:00
committed by GitHub
parent 1be399ab7b
commit 7c93e71801
7 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
roles/kubernetes/master/templates/kubeadm-config.yaml.j2
View File

@@ -19,7 +19,7 @@ kubernetesVersion: {{ kube_version }}
{% if cloud_provider is defined and cloud_provider != "gce" %}
cloudProvider: {{ cloud_provider }}
{% endif %}
{% if kube_proxy_mode == 'ipvs' %}
{% if kube_proxy_mode == 'ipvs' and kube_version | version_compare('v1.10', '<') %}
kubeProxy:
config:
featureGates: SupportIPVSProxyMode=true

2
roles/kubernetes/node/templates/manifests/kube-proxy.manifest.j2
View File

@@ -47,7 +47,9 @@ spec:
- --masquerade-all
{% elif kube_proxy_mode == 'ipvs' %}
- --masquerade-all
{% if kube_version | version_compare('v1.10', '<') %}
- --feature-gates=SupportIPVSProxyMode=true
{% endif %}
- --ipvs-min-sync-period=5s
- --ipvs-sync-period=5s
- --ipvs-scheduler=rr