From 0223b31e1a40ffc6e0608c7c6412ba1513de286b Mon Sep 17 00:00:00 2001 From: Dalton Hubble Date: Mon, 6 Jan 2020 21:38:20 -0800 Subject: [PATCH] Ensure /etc/kubernetes exists following Kubelet inlining * Inlining the Kubelet service removed the need for the kubelet.env file declared in Ignition. However, on some platforms, this removed the guarantee that /etc/kubernetes exists. Bare-Metal and DigitalOcean distribute the kubelet kubeconfig through Terraform file provisioner (scp) and place it in (now missing) /etc/kubernetes * https://github.com/poseidon/typhoon/pull/606 * Fix bare-metal and DigitalOcean Ignition to ensure the desired directory exists following first boot from disk * Cloud platforms with worker pools distribute the kubeconfig through Ignition user data (no impact or need) --- bare-metal/container-linux/kubernetes/cl/controller.yaml | 3 +++ bare-metal/container-linux/kubernetes/cl/worker.yaml | 3 +++ digital-ocean/container-linux/kubernetes/cl/controller.yaml | 3 +++ digital-ocean/container-linux/kubernetes/cl/worker.yaml | 3 +++ 4 files changed, 12 insertions(+) diff --git a/bare-metal/container-linux/kubernetes/cl/controller.yaml b/bare-metal/container-linux/kubernetes/cl/controller.yaml index c5bbe9ab..4289b3cf 100644 --- a/bare-metal/container-linux/kubernetes/cl/controller.yaml +++ b/bare-metal/container-linux/kubernetes/cl/controller.yaml @@ -155,6 +155,9 @@ systemd: [Install] WantedBy=multi-user.target storage: + directories: + - path: /etc/kubernetes + filesystem: root files: - path: /etc/hostname filesystem: root diff --git a/bare-metal/container-linux/kubernetes/cl/worker.yaml b/bare-metal/container-linux/kubernetes/cl/worker.yaml index 64c598bc..5c8ab2b0 100644 --- a/bare-metal/container-linux/kubernetes/cl/worker.yaml +++ b/bare-metal/container-linux/kubernetes/cl/worker.yaml @@ -103,6 +103,9 @@ systemd: WantedBy=multi-user.target storage: + directories: + - path: /etc/kubernetes + filesystem: root files: - path: /etc/hostname filesystem: root diff --git a/digital-ocean/container-linux/kubernetes/cl/controller.yaml b/digital-ocean/container-linux/kubernetes/cl/controller.yaml index f318d04c..4cb2a20a 100644 --- a/digital-ocean/container-linux/kubernetes/cl/controller.yaml +++ b/digital-ocean/container-linux/kubernetes/cl/controller.yaml @@ -152,6 +152,9 @@ systemd: [Install] WantedBy=multi-user.target storage: + directories: + - path: /etc/kubernetes + filesystem: root files: - path: /opt/bootstrap/layout filesystem: root diff --git a/digital-ocean/container-linux/kubernetes/cl/worker.yaml b/digital-ocean/container-linux/kubernetes/cl/worker.yaml index 073c3339..8427ec47 100644 --- a/digital-ocean/container-linux/kubernetes/cl/worker.yaml +++ b/digital-ocean/container-linux/kubernetes/cl/worker.yaml @@ -111,6 +111,9 @@ systemd: [Install] WantedBy=multi-user.target storage: + directories: + - path: /etc/kubernetes + filesystem: root files: - path: /etc/sysctl.d/max-user-watches.conf filesystem: root