Fix Flatcar: mkdir /opt/bin before untar anything in it (#2305)

Signed-off-by: Marko Mudrinić <mudrinic.mare@gmail.com> Signed-off-by: Marko Mudrinić <mudrinic.mare@gmail.com>
kubermatic · Aug 23, 2022 · d1d50d2 · d1d50d2
1 parent b6f0259
commit d1d50d2
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 14 deletions.
diff --git a/pkg/scripts/os_flatcar.go b/pkg/scripts/os_flatcar.go
@@ -29,7 +29,7 @@ source /etc/kubeone/proxy-env
 {{ template "sysctl-k8s" . }}
 {{ template "journald-config" }}
 
-sudo mkdir -p /opt/cni/bin /etc/kubernetes/pki /etc/kubernetes/manifests
+sudo mkdir -p /opt/bin /opt/cni/bin /etc/kubernetes/pki /etc/kubernetes/manifests
 curl -L "https://github.com/containernetworking/plugins/releases/download/v{{ .KUBERNETES_CNI_VERSION }}/cni-plugins-linux-${HOST_ARCH}-v{{ .KUBERNETES_CNI_VERSION }}.tgz" |
 	sudo tar -C /opt/cni/bin -xz
 
@@ -47,7 +47,6 @@ curl -L https://github.com/kubernetes-sigs/cri-tools/releases/download/${CRI_TOO
 {{ template "flatcar-containerd" . }}
 {{ end }}
 
-sudo mkdir -p /opt/bin
 cd /opt/bin
 k8s_rel_baseurl=https://storage.googleapis.com/kubernetes-release/release
 for binary in kubeadm kubelet kubectl; do

diff --git a/pkg/scripts/testdata/TestKubeadmFlatcar-force.golden b/pkg/scripts/testdata/TestKubeadmFlatcar-force.golden
@@ -54,7 +54,7 @@ EOF
 sudo systemctl force-reload systemd-journald
 
 
-sudo mkdir -p /opt/cni/bin /etc/kubernetes/pki /etc/kubernetes/manifests
+sudo mkdir -p /opt/bin /opt/cni/bin /etc/kubernetes/pki /etc/kubernetes/manifests
 curl -L "https://github.com/containernetworking/plugins/releases/download/v0.8.7/cni-plugins-linux-${HOST_ARCH}-v0.8.7.tgz" |
 	sudo tar -C /opt/cni/bin -xz
 
@@ -94,7 +94,6 @@ sudo systemctl restart docker
 
 
 
-sudo mkdir -p /opt/bin
 cd /opt/bin
 k8s_rel_baseurl=https://storage.googleapis.com/kubernetes-release/release
 for binary in kubeadm kubelet kubectl; do

diff --git a/pkg/scripts/testdata/TestKubeadmFlatcar-overwrite_registry.golden b/pkg/scripts/testdata/TestKubeadmFlatcar-overwrite_registry.golden
@@ -54,7 +54,7 @@ EOF
 sudo systemctl force-reload systemd-journald
 
 
-sudo mkdir -p /opt/cni/bin /etc/kubernetes/pki /etc/kubernetes/manifests
+sudo mkdir -p /opt/bin /opt/cni/bin /etc/kubernetes/pki /etc/kubernetes/manifests
 curl -L "https://github.com/containernetworking/plugins/releases/download/v0.8.7/cni-plugins-linux-${HOST_ARCH}-v0.8.7.tgz" |
 	sudo tar -C /opt/cni/bin -xz
 
@@ -94,7 +94,6 @@ sudo systemctl restart docker
 
 
 
-sudo mkdir -p /opt/bin
 cd /opt/bin
 k8s_rel_baseurl=https://storage.googleapis.com/kubernetes-release/release
 for binary in kubeadm kubelet kubectl; do

diff --git a/pkg/scripts/testdata/TestKubeadmFlatcar-overwrite_registry_insecure.golden b/pkg/scripts/testdata/TestKubeadmFlatcar-overwrite_registry_insecure.golden
@@ -54,7 +54,7 @@ EOF
 sudo systemctl force-reload systemd-journald
 
 
-sudo mkdir -p /opt/cni/bin /etc/kubernetes/pki /etc/kubernetes/manifests
+sudo mkdir -p /opt/bin /opt/cni/bin /etc/kubernetes/pki /etc/kubernetes/manifests
 curl -L "https://github.com/containernetworking/plugins/releases/download/v0.8.7/cni-plugins-linux-${HOST_ARCH}-v0.8.7.tgz" |
 	sudo tar -C /opt/cni/bin -xz
 
@@ -97,7 +97,6 @@ sudo systemctl restart docker
 
 
 
-sudo mkdir -p /opt/bin
 cd /opt/bin
 k8s_rel_baseurl=https://storage.googleapis.com/kubernetes-release/release
 for binary in kubeadm kubelet kubectl; do

diff --git a/pkg/scripts/testdata/TestKubeadmFlatcar-simple.golden b/pkg/scripts/testdata/TestKubeadmFlatcar-simple.golden
@@ -54,7 +54,7 @@ EOF
 sudo systemctl force-reload systemd-journald
 
 
-sudo mkdir -p /opt/cni/bin /etc/kubernetes/pki /etc/kubernetes/manifests
+sudo mkdir -p /opt/bin /opt/cni/bin /etc/kubernetes/pki /etc/kubernetes/manifests
 curl -L "https://github.com/containernetworking/plugins/releases/download/v0.8.7/cni-plugins-linux-${HOST_ARCH}-v0.8.7.tgz" |
 	sudo tar -C /opt/cni/bin -xz
 
@@ -94,7 +94,6 @@ sudo systemctl restart docker
 
 
 
-sudo mkdir -p /opt/bin
 cd /opt/bin
 k8s_rel_baseurl=https://storage.googleapis.com/kubernetes-release/release
 for binary in kubeadm kubelet kubectl; do

diff --git a/pkg/scripts/testdata/TestKubeadmFlatcar-with_cilium.golden b/pkg/scripts/testdata/TestKubeadmFlatcar-with_cilium.golden
@@ -60,7 +60,7 @@ EOF
 sudo systemctl force-reload systemd-journald
 
 
-sudo mkdir -p /opt/cni/bin /etc/kubernetes/pki /etc/kubernetes/manifests
+sudo mkdir -p /opt/bin /opt/cni/bin /etc/kubernetes/pki /etc/kubernetes/manifests
 curl -L "https://github.com/containernetworking/plugins/releases/download/v0.8.7/cni-plugins-linux-${HOST_ARCH}-v0.8.7.tgz" |
 	sudo tar -C /opt/cni/bin -xz
 
@@ -74,7 +74,6 @@ curl -L https://github.com/kubernetes-sigs/cri-tools/releases/download/${CRI_TOO
 
 
 
-sudo mkdir -p /opt/bin
 cd /opt/bin
 k8s_rel_baseurl=https://storage.googleapis.com/kubernetes-release/release
 for binary in kubeadm kubelet kubectl; do

diff --git a/pkg/scripts/testdata/TestKubeadmFlatcar-with_containerd.golden b/pkg/scripts/testdata/TestKubeadmFlatcar-with_containerd.golden
@@ -54,7 +54,7 @@ EOF
 sudo systemctl force-reload systemd-journald
 
 
-sudo mkdir -p /opt/cni/bin /etc/kubernetes/pki /etc/kubernetes/manifests
+sudo mkdir -p /opt/bin /opt/cni/bin /etc/kubernetes/pki /etc/kubernetes/manifests
 curl -L "https://github.com/containernetworking/plugins/releases/download/v0.8.7/cni-plugins-linux-${HOST_ARCH}-v0.8.7.tgz" |
 	sudo tar -C /opt/cni/bin -xz
 
@@ -111,7 +111,6 @@ sudo systemctl restart containerd
 
 
 
-sudo mkdir -p /opt/bin
 cd /opt/bin
 k8s_rel_baseurl=https://storage.googleapis.com/kubernetes-release/release
 for binary in kubeadm kubelet kubectl; do