From 3901480bc17d6e59164b5c5642deb77ec4552e41 Mon Sep 17 00:00:00 2001 From: Bort Verwilst Date: Thu, 28 Mar 2019 14:20:46 +0100 Subject: [PATCH] go to k8s 1.12.7 (#4400) --- README.md | 2 +- inventory/sample/group_vars/k8s-cluster/k8s-cluster.yml | 2 +- roles/download/defaults/main.yml | 4 +++- roles/kubespray-defaults/defaults/main.yaml | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index c78fac8f4..5852ff874 100644 --- a/README.md +++ b/README.md @@ -114,7 +114,7 @@ Supported Components -------------------- - Core - - [kubernetes](https://github.com/kubernetes/kubernetes) v1.12.5 + - [kubernetes](https://github.com/kubernetes/kubernetes) v1.12.7 - [etcd](https://github.com/coreos/etcd) v3.2.24 - [docker](https://www.docker.com/) v18.06 (see note) - [rkt](https://github.com/rkt/rkt) v1.21.0 (see Note 2) diff --git a/inventory/sample/group_vars/k8s-cluster/k8s-cluster.yml b/inventory/sample/group_vars/k8s-cluster/k8s-cluster.yml index 4247319b2..97fb1fea4 100644 --- a/inventory/sample/group_vars/k8s-cluster/k8s-cluster.yml +++ b/inventory/sample/group_vars/k8s-cluster/k8s-cluster.yml @@ -19,7 +19,7 @@ kube_users_dir: "{{ kube_config_dir }}/users" kube_api_anonymous_auth: true ## Change this to use another Kubernetes version, e.g. a current beta release -kube_version: v1.12.6 +kube_version: v1.12.7 # kubernetes image repo define kube_image_repo: "gcr.io/google-containers" diff --git a/roles/download/defaults/main.yml b/roles/download/defaults/main.yml index 454968d8d..53cefa1d7 100644 --- a/roles/download/defaults/main.yml +++ b/roles/download/defaults/main.yml @@ -35,7 +35,7 @@ download_delegate: "{% if download_localhost %}localhost{% else %}{{groups['kube image_arch: "{{host_architecture | default('amd64')}}" # Versions -kube_version: v1.12.6 +kube_version: v1.12.7 kubeadm_version: "{{ kube_version }}" etcd_version: v3.2.24 @@ -70,6 +70,7 @@ cni_download_url: "https://github.com/containernetworking/plugins/releases/downl # Checksums hyperkube_checksums: + v1.12.7: cfcee7cadc18ffb40f87bcb21bc33e98d17a3bf97e1d75f0c63642d9e3b1ec65 v1.12.6: eb7bd0c21977bca7071c65fa0ef60d5e09c9e9a16c4fd8435be5bd7f5b0d1221 v1.12.5: f8b651816b2caa33e8b25a666e5c370e9786356d59f89579bba772f28370ed00 v1.12.4: a4697d8f3791f0408fcdb97b3de187e47d7b39a63332c75f68f95e25f4891cc9 @@ -91,6 +92,7 @@ hyperkube_checksums: v1.10.1: 6e0642ad6bae68dc81b8d1c9efa18e265e17e23da1895862823cafac08c0344c v1.10.0: b5575b2fb4266754c1675b8cd5d9b6cac70f3fee7a05c4e80da3a9e83e58c57e kubeadm_checksums: + v1.12.7: 8a16dea17c1f7aa5b72d9abdc4c3f0e50b52f325084647d71acdd0361eec5f6a v1.12.6: 9048031930be9cb0506940c04f6ce67408d9caa9384b32d65d7aa5b6f1ad58ec v1.12.5: d61730b3deb4d9825af0cc1e452a4be2292400507128279770c39669f6599af9 v1.12.4: 674ad5892ff2403f492c9042c3cea3fa0bfa3acf95bc7d1777c3645f0ddf64d7 diff --git a/roles/kubespray-defaults/defaults/main.yaml b/roles/kubespray-defaults/defaults/main.yaml index cb315fc97..b646465cc 100644 --- a/roles/kubespray-defaults/defaults/main.yaml +++ b/roles/kubespray-defaults/defaults/main.yaml @@ -12,7 +12,7 @@ is_atomic: false disable_swap: true ## Change this to use another Kubernetes version, e.g. a current beta release -kube_version: v1.12.6 +kube_version: v1.12.7 ## Kube Proxy mode One of ['iptables','ipvs'] kube_proxy_mode: ipvs