From 0f38a6d40546bd511852490d4947849a647d95bf Mon Sep 17 00:00:00 2001 From: Dalton Hubble Date: Thu, 20 Oct 2022 08:39:51 -0700 Subject: [PATCH] Remove defunct delete-node.service from worker nodes * delete-node.service used to be used to remove nodes from the cluster on shutdown, but its long since it last worked properly * If there is still a desire for this concept, it can be added with a custom snippet and with a better systemd unit --- CHANGES.md | 4 ++++ .../kubernetes/workers/butane/worker.yaml | 13 ------------- .../kubernetes/workers/butane/worker.yaml | 13 ------------- .../kubernetes/workers/butane/worker.yaml | 13 ------------- .../kubernetes/workers/butane/worker.yaml | 13 ------------- .../fedora-coreos/kubernetes/butane/worker.yaml | 13 ------------- .../flatcar-linux/kubernetes/butane/worker.yaml | 13 ------------- .../kubernetes/workers/butane/worker.yaml | 13 ------------- .../kubernetes/workers/butane/worker.yaml | 13 ------------- 9 files changed, 4 insertions(+), 104 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 2b81bc04..6257f730 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -8,6 +8,10 @@ Notable changes between versions. * Remove unused `Wants=network.target` from `etcd-member.service` ([#1254](https://github.com/poseidon/typhoon/pull/1254)) +### Cloud + +* Remove defunct `delete-node.service` from worker node configurations ([#1256](https://github.com/poseidon/typhoon/pull/1256)) + ## v1.25.3 * Kubernetes [v1.25.3](https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG/CHANGELOG-1.25.md#v1253) diff --git a/aws/fedora-coreos/kubernetes/workers/butane/worker.yaml b/aws/fedora-coreos/kubernetes/workers/butane/worker.yaml index 54cc9370..37a72a5d 100644 --- a/aws/fedora-coreos/kubernetes/workers/butane/worker.yaml +++ b/aws/fedora-coreos/kubernetes/workers/butane/worker.yaml @@ -77,19 +77,6 @@ systemd: RestartSec=10 [Install] WantedBy=multi-user.target - - name: delete-node.service - enabled: true - contents: | - [Unit] - Description=Delete Kubernetes node on shutdown - [Service] - Environment=KUBELET_IMAGE=quay.io/poseidon/kubelet:v1.25.3 - Type=oneshot - RemainAfterExit=true - ExecStart=/bin/true - ExecStop=/bin/bash -c '/usr/bin/podman run --volume /var/lib/kubelet:/var/lib/kubelet:ro,z --entrypoint /usr/local/bin/kubectl $${KUBELET_IMAGE} --kubeconfig=/var/lib/kubelet/kubeconfig delete node $HOSTNAME' - [Install] - WantedBy=multi-user.target storage: directories: - path: /etc/kubernetes diff --git a/aws/flatcar-linux/kubernetes/workers/butane/worker.yaml b/aws/flatcar-linux/kubernetes/workers/butane/worker.yaml index 23b202dc..506fb743 100644 --- a/aws/flatcar-linux/kubernetes/workers/butane/worker.yaml +++ b/aws/flatcar-linux/kubernetes/workers/butane/worker.yaml @@ -78,19 +78,6 @@ systemd: RestartSec=5 [Install] WantedBy=multi-user.target - - name: delete-node.service - enabled: true - contents: | - [Unit] - Description=Delete Kubernetes node on shutdown - [Service] - Environment=KUBELET_IMAGE=quay.io/poseidon/kubelet:v1.25.3 - Type=oneshot - RemainAfterExit=true - ExecStart=/bin/true - ExecStop=/bin/bash -c '/usr/bin/docker run -v /var/lib/kubelet:/var/lib/kubelet:ro --entrypoint /usr/local/bin/kubectl $${KUBELET_IMAGE} --kubeconfig=/var/lib/kubelet/kubeconfig delete node $HOSTNAME' - [Install] - WantedBy=multi-user.target storage: files: - path: /etc/kubernetes/kubeconfig diff --git a/azure/fedora-coreos/kubernetes/workers/butane/worker.yaml b/azure/fedora-coreos/kubernetes/workers/butane/worker.yaml index 9bd1b964..0a922951 100644 --- a/azure/fedora-coreos/kubernetes/workers/butane/worker.yaml +++ b/azure/fedora-coreos/kubernetes/workers/butane/worker.yaml @@ -72,19 +72,6 @@ systemd: RestartSec=10 [Install] WantedBy=multi-user.target - - name: delete-node.service - enabled: true - contents: | - [Unit] - Description=Delete Kubernetes node on shutdown - [Service] - Environment=KUBELET_IMAGE=quay.io/poseidon/kubelet:v1.25.3 - Type=oneshot - RemainAfterExit=true - ExecStart=/bin/true - ExecStop=/bin/bash -c '/usr/bin/podman run --volume /var/lib/kubelet:/var/lib/kubelet:ro,z --entrypoint /usr/local/bin/kubectl $${KUBELET_IMAGE} --kubeconfig=/var/lib/kubelet/kubeconfig delete node $HOSTNAME' - [Install] - WantedBy=multi-user.target storage: directories: - path: /etc/kubernetes diff --git a/azure/flatcar-linux/kubernetes/workers/butane/worker.yaml b/azure/flatcar-linux/kubernetes/workers/butane/worker.yaml index 7b31fc02..349d144f 100644 --- a/azure/flatcar-linux/kubernetes/workers/butane/worker.yaml +++ b/azure/flatcar-linux/kubernetes/workers/butane/worker.yaml @@ -74,19 +74,6 @@ systemd: RestartSec=5 [Install] WantedBy=multi-user.target - - name: delete-node.service - enabled: true - contents: | - [Unit] - Description=Delete Kubernetes node on shutdown - [Service] - Environment=KUBELET_IMAGE=quay.io/poseidon/kubelet:v1.25.3 - Type=oneshot - RemainAfterExit=true - ExecStart=/bin/true - ExecStop=/bin/bash -c '/usr/bin/docker run -v /var/lib/kubelet:/var/lib/kubelet:ro --entrypoint /usr/local/bin/kubectl $${KUBELET_IMAGE} --kubeconfig=/var/lib/kubelet/kubeconfig delete node $HOSTNAME' - [Install] - WantedBy=multi-user.target storage: files: - path: /etc/kubernetes/kubeconfig diff --git a/digital-ocean/fedora-coreos/kubernetes/butane/worker.yaml b/digital-ocean/fedora-coreos/kubernetes/butane/worker.yaml index c32c1bed..9cedde1a 100644 --- a/digital-ocean/fedora-coreos/kubernetes/butane/worker.yaml +++ b/digital-ocean/fedora-coreos/kubernetes/butane/worker.yaml @@ -82,19 +82,6 @@ systemd: PathExists=/etc/kubernetes/kubeconfig [Install] WantedBy=multi-user.target - - name: delete-node.service - enabled: true - contents: | - [Unit] - Description=Delete Kubernetes node on shutdown - [Service] - Environment=KUBELET_IMAGE=quay.io/poseidon/kubelet:v1.25.3 - Type=oneshot - RemainAfterExit=true - ExecStart=/bin/true - ExecStop=/bin/bash -c '/usr/bin/podman run --volume /var/lib/kubelet:/var/lib/kubelet:ro,z --entrypoint /usr/local/bin/kubectl $${KUBELET_IMAGE} --kubeconfig=/var/lib/kubelet/kubeconfig delete node $HOSTNAME' - [Install] - WantedBy=multi-user.target storage: directories: - path: /etc/kubernetes diff --git a/digital-ocean/flatcar-linux/kubernetes/butane/worker.yaml b/digital-ocean/flatcar-linux/kubernetes/butane/worker.yaml index b1e1848f..84494653 100644 --- a/digital-ocean/flatcar-linux/kubernetes/butane/worker.yaml +++ b/digital-ocean/flatcar-linux/kubernetes/butane/worker.yaml @@ -80,19 +80,6 @@ systemd: RestartSec=5 [Install] WantedBy=multi-user.target - - name: delete-node.service - enabled: true - contents: | - [Unit] - Description=Delete Kubernetes node on shutdown - [Service] - Environment=KUBELET_IMAGE=quay.io/poseidon/kubelet:v1.25.3 - Type=oneshot - RemainAfterExit=true - ExecStart=/bin/true - ExecStop=/bin/bash -c '/usr/bin/docker run -v /var/lib/kubelet:/var/lib/kubelet:ro --entrypoint /usr/local/bin/kubectl $${KUBELET_IMAGE} --kubeconfig=/var/lib/kubelet/kubeconfig delete node $HOSTNAME' - [Install] - WantedBy=multi-user.target storage: directories: - path: /etc/kubernetes diff --git a/google-cloud/fedora-coreos/kubernetes/workers/butane/worker.yaml b/google-cloud/fedora-coreos/kubernetes/workers/butane/worker.yaml index d1260a08..fec05f29 100644 --- a/google-cloud/fedora-coreos/kubernetes/workers/butane/worker.yaml +++ b/google-cloud/fedora-coreos/kubernetes/workers/butane/worker.yaml @@ -72,19 +72,6 @@ systemd: RestartSec=10 [Install] WantedBy=multi-user.target - - name: delete-node.service - enabled: true - contents: | - [Unit] - Description=Delete Kubernetes node on shutdown - [Service] - Environment=KUBELET_IMAGE=quay.io/poseidon/kubelet:v1.25.3 - Type=oneshot - RemainAfterExit=true - ExecStart=/bin/true - ExecStop=/bin/bash -c '/usr/bin/podman run --volume /var/lib/kubelet:/var/lib/kubelet:ro,z --entrypoint /usr/local/bin/kubectl $${KUBELET_IMAGE} --kubeconfig=/var/lib/kubelet/kubeconfig delete node $HOSTNAME' - [Install] - WantedBy=multi-user.target storage: directories: - path: /etc/kubernetes diff --git a/google-cloud/flatcar-linux/kubernetes/workers/butane/worker.yaml b/google-cloud/flatcar-linux/kubernetes/workers/butane/worker.yaml index af6e67c5..db0b80c7 100644 --- a/google-cloud/flatcar-linux/kubernetes/workers/butane/worker.yaml +++ b/google-cloud/flatcar-linux/kubernetes/workers/butane/worker.yaml @@ -74,19 +74,6 @@ systemd: RestartSec=5 [Install] WantedBy=multi-user.target - - name: delete-node.service - enabled: true - contents: | - [Unit] - Description=Delete Kubernetes node on shutdown - [Service] - Environment=KUBELET_IMAGE=quay.io/poseidon/kubelet:v1.25.3 - Type=oneshot - RemainAfterExit=true - ExecStart=/bin/true - ExecStop=/bin/bash -c '/usr/bin/docker run -v /var/lib/kubelet:/var/lib/kubelet:ro --entrypoint /usr/local/bin/kubectl $${KUBELET_IMAGE} --kubeconfig=/var/lib/kubelet/kubeconfig delete node $HOSTNAME' - [Install] - WantedBy=multi-user.target storage: files: - path: /etc/kubernetes/kubeconfig