From 36f475afac843a005e9c04b0b2035a88cd8367db Mon Sep 17 00:00:00 2001 From: Anton Johansson Date: Wed, 5 Aug 2020 09:55:40 +0200 Subject: [PATCH 1/4] Bump Kubernetes to v1.16.13 --- README.md | 14 +++++++------- roles/kube-apiserver/tasks/main.yml | 4 ++-- roles/kube-controller-manager/tasks/main.yml | 4 ++-- roles/kube-proxy/tasks/main.yml | 4 ++-- roles/kube-scheduler/tasks/main.yml | 4 ++-- roles/kubelet/tasks/main.yml | 4 ++-- test/main.yml | 2 +- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index 32908a7..3534a8d 100644 --- a/README.md +++ b/README.md @@ -67,8 +67,8 @@ ansible-playbook -i inventory install.yml - Use the kubeconfig in `~/.ktrw//kubeconfig` to manage the cluster ```shell $ KUBECONFIG=~/.ktrw//kubeconfig kubectl version --short -Client Version: v1.16.7 -Server Version: v1.16.7 +Client Version: v1.16.13 +Server Version: v1.16.13 ``` ## Installing additional plugins @@ -120,11 +120,11 @@ $ ansible-playbook --inventory ansible-inventory --extra-vars "serial_all=50%" i | containerd | 1.3.3 | node | | crictl | 1.16.1 | node | | etcd | 3.3.15 | etcd | -| kube-apiserver | 1.16.7 | master | -| kube-controller-manager | 1.16.7 | master | -| kube-scheduler | 1.16.7 | master | -| kube-proxy | 1.16.7 | node | -| kubelet | 1.16.7 | node | +| kube-apiserver | 1.16.13 | master | +| kube-controller-manager | 1.16.13 | master | +| kube-scheduler | 1.16.13 | master | +| kube-proxy | 1.16.13 | node | +| kubelet | 1.16.13 | node | | runc | 1.0.0-rc10 | node | # How to contribute diff --git a/roles/kube-apiserver/tasks/main.yml b/roles/kube-apiserver/tasks/main.yml index b913864..ab2b389 100644 --- a/roles/kube-apiserver/tasks/main.yml +++ b/roles/kube-apiserver/tasks/main.yml @@ -21,12 +21,12 @@ - name: Download kube-apiserver get_url: - url: https://storage.googleapis.com/kubernetes-release/release/v1.16.7/bin/linux/amd64/kube-apiserver + url: https://storage.googleapis.com/kubernetes-release/release/v1.16.13/bin/linux/amd64/kube-apiserver dest: /usr/local/bin/kube-apiserver mode: 0755 owner: root group: root - checksum: sha256:aa2a4adef0ce70e2d0524e38dc544fb2211ba3a2fa9292ca30c6a4d01cb10f42 + checksum: sha256:ac61f2d9c0a95e901547230abd3b28262dde59250619dfcfc17f8e1632839878 notify: - restart kube-apiserver diff --git a/roles/kube-controller-manager/tasks/main.yml b/roles/kube-controller-manager/tasks/main.yml index 49da652..989bc21 100644 --- a/roles/kube-controller-manager/tasks/main.yml +++ b/roles/kube-controller-manager/tasks/main.yml @@ -16,12 +16,12 @@ - name: Download kube-controller-manager get_url: - url: https://storage.googleapis.com/kubernetes-release/release/v1.16.7/bin/linux/amd64/kube-controller-manager + url: https://storage.googleapis.com/kubernetes-release/release/v1.16.13/bin/linux/amd64/kube-controller-manager dest: /usr/local/bin/kube-controller-manager mode: 0755 owner: root group: root - checksum: sha256:ff31b0507c67e94b1bf8af580029e4dde330a9ef81474d64b4cc54e85a4ce4a3 + checksum: sha256:2d57d0c3a351260d1d3cd1843189a49a09aca7e7905c90b2c08b4165d1171b5e notify: - restart kube-controller-manager diff --git a/roles/kube-proxy/tasks/main.yml b/roles/kube-proxy/tasks/main.yml index a045d88..9dde476 100644 --- a/roles/kube-proxy/tasks/main.yml +++ b/roles/kube-proxy/tasks/main.yml @@ -15,12 +15,12 @@ - name: Download kube-proxy get_url: - url: https://storage.googleapis.com/kubernetes-release/release/v1.16.7/bin/linux/amd64/kube-proxy + url: https://storage.googleapis.com/kubernetes-release/release/v1.16.13/bin/linux/amd64/kube-proxy dest: /usr/local/bin/kube-proxy mode: 0755 owner: root group: root - checksum: sha256:a96c8ff94252e6d5ac4ce84e5ce6933e9a7f61fc0f11ac7a21297f45e149831b + checksum: sha256:f83dee5a2eaa86b62ac271d5b306e07420f2ab978ae757eb839c207f95186a11 notify: - restart kube-proxy diff --git a/roles/kube-scheduler/tasks/main.yml b/roles/kube-scheduler/tasks/main.yml index da24c01..1e4d711 100644 --- a/roles/kube-scheduler/tasks/main.yml +++ b/roles/kube-scheduler/tasks/main.yml @@ -15,12 +15,12 @@ - name: Download kube-scheduler get_url: - url: https://storage.googleapis.com/kubernetes-release/release/v1.16.7/bin/linux/amd64/kube-scheduler + url: https://storage.googleapis.com/kubernetes-release/release/v1.16.13/bin/linux/amd64/kube-scheduler dest: /usr/local/bin/kube-scheduler mode: 0755 owner: root group: root - checksum: sha256:a05d8c8dde761dd0d1bea17e57bc30b27cd34de9b5ee36d82cad4584e46e1219 + checksum: sha256:6aed00d41867e17d6d602b623fa6f9cb5e72ba26386087f8221b3b292a7b039e notify: - restart kube-scheduler diff --git a/roles/kubelet/tasks/main.yml b/roles/kubelet/tasks/main.yml index f85a473..544878a 100644 --- a/roles/kubelet/tasks/main.yml +++ b/roles/kubelet/tasks/main.yml @@ -15,12 +15,12 @@ - name: Download kubelet get_url: - url: https://storage.googleapis.com/kubernetes-release/release/v1.16.7/bin/linux/amd64/kubelet + url: https://storage.googleapis.com/kubernetes-release/release/v1.16.13/bin/linux/amd64/kubelet dest: /usr/local/bin/kubelet mode: 0755 owner: root group: root - checksum: sha256:f49755b06848914c2729353d3580199a70ec8d732609660e90214b4f48ff4398 + checksum: sha256:a88c0e9f8c4b5a2e91c2c4a8d772cc65ca3a0eb5d477cbce06fbf82d3e50c158 notify: - restart kubelet diff --git a/test/main.yml b/test/main.yml index d5a34e6..2f4b59c 100644 --- a/test/main.yml +++ b/test/main.yml @@ -140,7 +140,7 @@ - name: Get kubectl get_url: - url: https://storage.googleapis.com/kubernetes-release/release/v1.16.7/bin/linux/amd64/kubectl + url: https://storage.googleapis.com/kubernetes-release/release/v1.16.13/bin/linux/amd64/kubectl dest: /usr/local/bin/kubectl mode: 0755 From a857c19755d47ea4ee082e9f3de31678acfcc3b0 Mon Sep 17 00:00:00 2001 From: Amir Mofasser Date: Wed, 5 Aug 2020 14:10:38 +0200 Subject: [PATCH 2/4] Use Xenial image in Travis builds --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e21a225..65f6417 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ sudo: required -dist: stretch +dist: xenial language: python python: - "2.7" From 5fa9e091b75909a4924f6ee934796799194b904e Mon Sep 17 00:00:00 2001 From: Amir Mofasser Date: Wed, 5 Aug 2020 14:16:35 +0200 Subject: [PATCH 3/4] Add `sudo` to centos containers --- test/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/main.yml b/test/main.yml index 2f4b59c..ed6205d 100644 --- a/test/main.yml +++ b/test/main.yml @@ -103,7 +103,7 @@ tasks: - yum: - name: ['iproute', 'libseccomp', 'libseccomp-devel', 'conntrack'] + name: ['iproute', 'libseccomp', 'libseccomp-devel', 'conntrack', 'sudo'] state: present - name: Remove swapfile from /etc/fstab From 381843f2d88bdac3f14333030f26f6971ee34f7a Mon Sep 17 00:00:00 2001 From: Anton Johansson Date: Wed, 5 Aug 2020 14:35:56 +0200 Subject: [PATCH 4/4] Update the incorrect checksum for `runc` Due to some versioning issues, the version that is currently use for `runc` has been rebuilt, which causes a new checksum. Info: > NOTE: For those who are confused by the massive version jump (rc10 > to rc91), this was done to avoid issues with SemVer and lexical > comparisons -- there haven't been 90 other release candidates. Please > also note that runc 1.0.0-rc90 is identical to 1.0.0-rc10. See #2399 > for more details. See more here: https://github.com/opencontainers/runc/issues/2399 --- roles/runc/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/runc/tasks/main.yml b/roles/runc/tasks/main.yml index c697899..1c997bf 100644 --- a/roles/runc/tasks/main.yml +++ b/roles/runc/tasks/main.yml @@ -6,4 +6,4 @@ mode: 0755 owner: root group: root - checksum: sha256:a01afd5ff47d5a2a96bea3a871fb445b432f90c249a8a5d5239b05fe0d5bee4a \ No newline at end of file + checksum: sha256:0fec6929f8675aa7530a7920498e8910365cc9f2867e9a31d2129defd96aa489