Upgrade k8s to 1.10.2 (#2748)

* 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

View File

@@ -24,9 +24,9 @@ download_always_pull: False
download_delegate: "{% if download_localhost %}localhost{% else %}{{groups['kube-master'][0]}}{% endif %}"
# Versions
kube_version: v1.9.5
kube_version: v1.10.2
kubeadm_version: "{{ kube_version }}"
etcd_version: v3.2.4
etcd_version: v3.2.16
# TODO(mattymo): Move calico versions to roles/network_plugins/calico/defaults
# after migration to container download
calico_version: "v2.6.8"
@@ -50,7 +50,7 @@ vault_download_url: "https://releases.hashicorp.com/vault/{{ vault_version }}/va
# Checksums
istioctl_checksum: fd703063c540b8c0ab943f478c05ab257d88ae27224c746a27d0526ddbf7c370
kubeadm_checksum: 12b6e9ac1624852b7c978bde70b9bde9ca0e4fc6581d09bddfb117bb41f93c74
kubeadm_checksum: 394d7d340214c91d669186cf4f2110d8eb840ca965399b4d8b22d0545a60e377
vault_binary_checksum: 3c4d70ba71619a43229e65c67830e30e050eab7a81ac6b28325ff707e5914188
# Containers

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

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

View File

@@ -14,7 +14,7 @@ is_atomic: false
## Change this to use another Kubernetes version, e.g. a current beta release
kube_version: v1.9.5
kube_version: v1.10.2
## Kube Proxy mode One of ['iptables','ipvs']
kube_proxy_mode: iptables