From 0efa3e63925939eb8f87722a76476d5656a644a9 Mon Sep 17 00:00:00 2001 From: Bart Verwilst Date: Wed, 27 Mar 2019 11:16:21 +0100 Subject: [PATCH] Upgrade to k8s 1.13.5 --- README.md | 2 +- inventory/sample/group_vars/k8s-cluster/k8s-cluster.yml | 2 +- roles/download/defaults/main.yml | 6 +++++- roles/kubespray-defaults/defaults/main.yaml | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 18706c74a..6559d0307 100644 --- a/README.md +++ b/README.md @@ -112,7 +112,7 @@ Supported Components -------------------- - Core - - [kubernetes](https://github.com/kubernetes/kubernetes) v1.13.4 + - [kubernetes](https://github.com/kubernetes/kubernetes) v1.13.5 - [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 03f70a4ca..3cac5fca0 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.13.4 +kube_version: v1.13.5 # 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 f4c16e09f..925a0bb9a 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.13.4 +kube_version: v1.13.5 kubeadm_version: "{{ kube_version }}" etcd_version: v3.2.24 @@ -71,6 +71,7 @@ cni_download_url: "https://github.com/containernetworking/plugins/releases/downl # Checksums hyperkube_checksums: arm64: + v1.13.5: 8ffd84ba0cb6382a0ff96000458db8a83c92cac09458defe8496f0f0e155a6a8 v1.13.4: b9e909e388634d103fe5376aafa313bed5e69293383b0c740de4fe8e18d42d12 v1.13.3: 588037923b7f4090f5f7a3de23ea49a10345295f0b39bd0c1ebdaa24eaa76731 v1.13.2: 7f2c2b0c6dcc81102a89fa41957db214416fc8a0cfae664fc0e150a7d3ad337b @@ -89,6 +90,7 @@ hyperkube_checksums: v1.11.1: 43be988ec21bc34c0d1a838098b542016199e4f42466fdf8b0edb26718a1338f v1.11.0: 1422f67530888947cc5a7e71a12757ef496efa91cf68888a315d4803cc414294 amd64: + v1.13.5: 1a8a357ebfeab8ec62d0c6f11b59df1a93d6711c3a16e1501da32b55c144c73a v1.13.4: 6f2d755a350efec8b3b29e0ddf8362f60475cc10d42dea37f8f2159f7776867b v1.13.3: b238c772b5e4b9deed0cdc695fe86324660d037b38c6d6d7eeae7d7a657840c7 v1.13.2: f159b587ec80ad03bf3b9bb09de5d64b773d01b0e34f2a4f1c816879c56aae6d @@ -108,6 +110,7 @@ hyperkube_checksums: v1.11.0: 7e191c164dc2c942abd37e4b50846e0be31ca959afffeff6b034beacbc2a106a kubeadm_checksums: arm64: + v1.13.5: 59a1995c171e5c1e74f5d02657eb2c155706f2d159ec1847b64dc866228c40d2 v1.13.4: 4de71d4cfa4dc64127148d48f3a1a1fa7ea24cf0c4fa42957459d0e7f9c03799 v1.13.3: bef1cbc2d199d32a1a31e70b864dc539b24e3c1cb87b50a1295cf03bec4832b0 v1.13.2: 08279a3bfeff8c4f6768d6fd92ceff8276a555f9e81bf9d541112fc8eb29963e @@ -126,6 +129,7 @@ kubeadm_checksums: v1.11.1: 6d7c7d5d4b8295ebe18aa2e9fb29917018e41628390909d0de6accbd0f2d56f5 v1.11.0: f61d9bacdb8306c7e8662010817e0f9d2f380aeb87b2b0fe7801e83843b83d0e amd64: + v1.13.5: 274bf887039a9993e30f96047a4a474c39e8471c4094acb75aea6beed793f079 v1.13.4: c4300d1f3ebccad48c8e267e45a736c7d227b0e45ef36582fa8dcfe2ef7b1b10 v1.13.3: ab767ea53e45aceba628977ef6c8c62eace72d6d232efeaf35ac50cbea5f3739 v1.13.2: 7cb0ce57c1e6e2d85e05de3780a2f35a191fe93f89cfc5816b424efcf39834b9 diff --git a/roles/kubespray-defaults/defaults/main.yaml b/roles/kubespray-defaults/defaults/main.yaml index ea5d57b9d..8eb1ee642 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.13.4 +kube_version: v1.13.5 ## Kube Proxy mode One of ['iptables','ipvs'] kube_proxy_mode: ipvs