From edc250d62a8d2b3e5f983ac0baa0b1eb1ed7a193 Mon Sep 17 00:00:00 2001 From: Dalton Hubble Date: Sun, 29 Jul 2018 12:13:29 -0700 Subject: [PATCH] Fix Kublet version for Fedora Atomic modules * Release v1.11.1 erroneously left Fedora Atomic clusters using the v1.11.0 Kubelet. The rest of the control plane ran v1.11.1 as expected * Update Kubelet from v1.11.0 to v1.11.1 so Fedora Atomic matches Container Linux * Container Linux modules were not affected --- CHANGES.md | 5 +++++ aws/fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl | 2 +- .../kubernetes/workers/cloudinit/worker.yaml.tmpl | 2 +- .../fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl | 2 +- .../fedora-atomic/kubernetes/cloudinit/worker.yaml.tmpl | 2 +- .../fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl | 2 +- .../fedora-atomic/kubernetes/cloudinit/worker.yaml.tmpl | 2 +- .../fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl | 2 +- .../kubernetes/workers/cloudinit/worker.yaml.tmpl | 2 +- 9 files changed, 13 insertions(+), 8 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 036c44c7..5b675486 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -6,6 +6,7 @@ Notable changes between versions. * Update etcd from v3.3.8 to [v3.3.9](https://github.com/coreos/etcd/blob/master/CHANGELOG-3.3.md#v339-2018-07-24) * Use kubernetes-incubator/bootkube v0.13.0 +* Fix Fedora Atomic modules' Kubelet version ([#270](https://github.com/poseidon/typhoon/issues/270)) #### Bare-Metal @@ -27,6 +28,10 @@ Notable changes between versions. * Update Prometheus from v2.3.1 to v2.3.2 +#### Errata + +* Fedora Atomic modules shipped with Kubelet v1.11.0, instead of v1.11.1. Fixed in [#270](https://github.com/poseidon/typhoon/issues/270). + ## v1.11.0 * Kubernetes [v1.11.0](https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG-1.11.md#v1110) diff --git a/aws/fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl b/aws/fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl index 65d2a3e7..2bf9d9c0 100644 --- a/aws/fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl +++ b/aws/fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl @@ -93,7 +93,7 @@ runcmd: - [systemctl, daemon-reload] - [systemctl, restart, NetworkManager] - "atomic install --system --name=etcd quay.io/poseidon/etcd:v3.3.9" - - "atomic install --system --name=kubelet quay.io/poseidon/kubelet:v1.11.0" + - "atomic install --system --name=kubelet quay.io/poseidon/kubelet:v1.11.1" - "atomic install --system --name=bootkube quay.io/poseidon/bootkube:v0.13.0" - [systemctl, start, --no-block, etcd.service] - [systemctl, enable, cloud-metadata.service] diff --git a/aws/fedora-atomic/kubernetes/workers/cloudinit/worker.yaml.tmpl b/aws/fedora-atomic/kubernetes/workers/cloudinit/worker.yaml.tmpl index 9e9b0fb1..a611ed80 100644 --- a/aws/fedora-atomic/kubernetes/workers/cloudinit/worker.yaml.tmpl +++ b/aws/fedora-atomic/kubernetes/workers/cloudinit/worker.yaml.tmpl @@ -69,7 +69,7 @@ runcmd: - [systemctl, daemon-reload] - [systemctl, restart, NetworkManager] - [systemctl, enable, cloud-metadata.service] - - "atomic install --system --name=kubelet quay.io/poseidon/kubelet:v1.11.0" + - "atomic install --system --name=kubelet quay.io/poseidon/kubelet:v1.11.1" - [systemctl, start, --no-block, kubelet.service] users: - default diff --git a/bare-metal/fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl b/bare-metal/fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl index 03fbd02b..b2b5b082 100644 --- a/bare-metal/fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl +++ b/bare-metal/fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl @@ -84,7 +84,7 @@ runcmd: - [systemctl, restart, NetworkManager] - [hostnamectl, set-hostname, ${domain_name}] - "atomic install --system --name=etcd quay.io/poseidon/etcd:v3.3.9" - - "atomic install --system --name=kubelet quay.io/poseidon/kubelet:v1.11.0" + - "atomic install --system --name=kubelet quay.io/poseidon/kubelet:v1.11.1" - "atomic install --system --name=bootkube quay.io/poseidon/bootkube:v0.13.0" - [systemctl, start, --no-block, etcd.service] - [systemctl, enable, kubelet.path] diff --git a/bare-metal/fedora-atomic/kubernetes/cloudinit/worker.yaml.tmpl b/bare-metal/fedora-atomic/kubernetes/cloudinit/worker.yaml.tmpl index e032ff1e..a5676a9a 100644 --- a/bare-metal/fedora-atomic/kubernetes/cloudinit/worker.yaml.tmpl +++ b/bare-metal/fedora-atomic/kubernetes/cloudinit/worker.yaml.tmpl @@ -59,7 +59,7 @@ runcmd: - [systemctl, daemon-reload] - [systemctl, restart, NetworkManager] - [hostnamectl, set-hostname, ${domain_name}] - - "atomic install --system --name=kubelet quay.io/poseidon/kubelet:v1.11.0" + - "atomic install --system --name=kubelet quay.io/poseidon/kubelet:v1.11.1" - [systemctl, enable, kubelet.path] - [systemctl, start, --no-block, kubelet.path] users: diff --git a/digital-ocean/fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl b/digital-ocean/fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl index aafabf80..1f6f4c14 100644 --- a/digital-ocean/fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl +++ b/digital-ocean/fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl @@ -90,7 +90,7 @@ bootcmd: runcmd: - [systemctl, daemon-reload] - "atomic install --system --name=etcd quay.io/poseidon/etcd:v3.3.9" - - "atomic install --system --name=kubelet quay.io/poseidon/kubelet:v1.11.0" + - "atomic install --system --name=kubelet quay.io/poseidon/kubelet:v1.11.1" - "atomic install --system --name=bootkube quay.io/poseidon/bootkube:v0.13.0" - [systemctl, start, --no-block, etcd.service] - [systemctl, enable, cloud-metadata.service] diff --git a/digital-ocean/fedora-atomic/kubernetes/cloudinit/worker.yaml.tmpl b/digital-ocean/fedora-atomic/kubernetes/cloudinit/worker.yaml.tmpl index 4b929c5a..36b023cf 100644 --- a/digital-ocean/fedora-atomic/kubernetes/cloudinit/worker.yaml.tmpl +++ b/digital-ocean/fedora-atomic/kubernetes/cloudinit/worker.yaml.tmpl @@ -66,7 +66,7 @@ bootcmd: runcmd: - [systemctl, daemon-reload] - [systemctl, enable, cloud-metadata.service] - - "atomic install --system --name=kubelet quay.io/poseidon/kubelet:v1.11.0" + - "atomic install --system --name=kubelet quay.io/poseidon/kubelet:v1.11.1" - [systemctl, enable, kubelet.path] - [systemctl, start, --no-block, kubelet.path] users: diff --git a/google-cloud/fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl b/google-cloud/fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl index d8f82854..05e31729 100644 --- a/google-cloud/fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl +++ b/google-cloud/fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl @@ -94,7 +94,7 @@ runcmd: - [systemctl, daemon-reload] - [systemctl, restart, NetworkManager] - "atomic install --system --name=etcd quay.io/poseidon/etcd:v3.3.9" - - "atomic install --system --name=kubelet quay.io/poseidon/kubelet:v1.11.0" + - "atomic install --system --name=kubelet quay.io/poseidon/kubelet:v1.11.1" - "atomic install --system --name=bootkube quay.io/poseidon/bootkube:v0.13.0" - [systemctl, start, --no-block, etcd.service] - [systemctl, enable, cloud-metadata.service] diff --git a/google-cloud/fedora-atomic/kubernetes/workers/cloudinit/worker.yaml.tmpl b/google-cloud/fedora-atomic/kubernetes/workers/cloudinit/worker.yaml.tmpl index 86cc633f..0fddd5b6 100644 --- a/google-cloud/fedora-atomic/kubernetes/workers/cloudinit/worker.yaml.tmpl +++ b/google-cloud/fedora-atomic/kubernetes/workers/cloudinit/worker.yaml.tmpl @@ -70,7 +70,7 @@ runcmd: - [systemctl, daemon-reload] - [systemctl, restart, NetworkManager] - [systemctl, enable, cloud-metadata.service] - - "atomic install --system --name=kubelet quay.io/poseidon/kubelet:v1.11.0" + - "atomic install --system --name=kubelet quay.io/poseidon/kubelet:v1.11.1" - [systemctl, start, --no-block, kubelet.service] users: - default