From e4d977bfcd67a87f4666a8ff3fc558f8659df2cb Mon Sep 17 00:00:00 2001 From: Dalton Hubble Date: Sat, 22 Feb 2020 15:01:57 -0800 Subject: [PATCH] Fix worker_node_labels for initial Fedora CoreOS * Add Terraform strip markers to consume beginning and trailing whitespace in templated Kubelet arguments for podman (Fedora CoreOS only) * Fix initial `worker_node_labels` being quietly ignored on Fedora CoreOS cloud platforms that offer the feature * Close https://github.com/poseidon/typhoon/issues/650 --- CHANGES.md | 8 ++++++++ aws/fedora-coreos/kubernetes/workers/fcc/worker.yaml | 4 ++-- .../fedora-coreos/kubernetes/workers/fcc/worker.yaml | 4 ++-- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 784561ab..50450f9c 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -6,6 +6,14 @@ Notable changes between versions. * Update CoreDNS from v1.6.6 to v1.6.7 ([#648](https://github.com/poseidon/typhoon/pull/648)) +#### AWS + +* Fix `worker_node_labels` for setting initial worker node labels on Fedora CoreOS ([#651](https://github.com/poseidon/typhoon/pull/651)) + +#### Google Cloud + +* Fix `worker_node_labels` for setting initial worker node labels on Fedora CoreOS ([#651](https://github.com/poseidon/typhoon/pull/651)) + #### DigitalOcean * Add support for Flatcar Container Linux ([#644](https://github.com/poseidon/typhoon/pull/644)) diff --git a/aws/fedora-coreos/kubernetes/workers/fcc/worker.yaml b/aws/fedora-coreos/kubernetes/workers/fcc/worker.yaml index 992cb604..6e6fd2fe 100644 --- a/aws/fedora-coreos/kubernetes/workers/fcc/worker.yaml +++ b/aws/fedora-coreos/kubernetes/workers/fcc/worker.yaml @@ -66,9 +66,9 @@ systemd: --lock-file=/var/run/lock/kubelet.lock \ --network-plugin=cni \ --node-labels=node.kubernetes.io/node \ - %{ for label in split(",", node_labels) } + %{~ for label in split(",", node_labels) ~} --node-labels=${label} \ - %{ endfor ~} + %{~ endfor ~} --pod-manifest-path=/etc/kubernetes/manifests \ --read-only-port=0 \ --volume-plugin-dir=/var/lib/kubelet/volumeplugins diff --git a/google-cloud/fedora-coreos/kubernetes/workers/fcc/worker.yaml b/google-cloud/fedora-coreos/kubernetes/workers/fcc/worker.yaml index 992cb604..6e6fd2fe 100644 --- a/google-cloud/fedora-coreos/kubernetes/workers/fcc/worker.yaml +++ b/google-cloud/fedora-coreos/kubernetes/workers/fcc/worker.yaml @@ -66,9 +66,9 @@ systemd: --lock-file=/var/run/lock/kubelet.lock \ --network-plugin=cni \ --node-labels=node.kubernetes.io/node \ - %{ for label in split(",", node_labels) } + %{~ for label in split(",", node_labels) ~} --node-labels=${label} \ - %{ endfor ~} + %{~ endfor ~} --pod-manifest-path=/etc/kubernetes/manifests \ --read-only-port=0 \ --volume-plugin-dir=/var/lib/kubelet/volumeplugins