Use --force-confold on containerd installation in deb based OS (#1935)

Signed-off-by: Artiom Diomin <kron82@gmail.com> Co-authored-by: Artiom Diomin <kron82@gmail.com>
kubermatic · Apr 5, 2022 · 7e16357 · 7e16357
1 parent 37427f7
commit 7e16357
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/pkg/scripts/render.go b/pkg/scripts/render.go
@@ -147,7 +147,14 @@ var (
 			{{ end }}
 
 			sudo apt-mark unhold containerd.io || true
-			sudo apt-get install -y containerd.io=%s
+			sudo DEBIAN_FRONTEND=noninteractive apt-get install \
+				--option "Dpkg::Options::=--force-confold" \
+				--no-install-recommends \
+				{{- if .FORCE }}
+				--allow-downgrades \
+				{{- end }}
+				-y \
+				containerd.io=%s
 			sudo apt-mark hold containerd.io
 
 			{{ template "container-runtime-daemon-config" . }}

diff --git a/pkg/scripts/testdata/TestKubeadmDebian-with_containerd.golden b/pkg/scripts/testdata/TestKubeadmDebian-with_containerd.golden
@@ -75,7 +75,11 @@ sudo add-apt-repository "deb https://download.docker.com/linux/ubuntu $(lsb_rele
 
 
 sudo apt-mark unhold containerd.io || true
-sudo apt-get install -y containerd.io=1.4.*
+sudo DEBIAN_FRONTEND=noninteractive apt-get install \
+	--option "Dpkg::Options::=--force-confold" \
+	--no-install-recommends \
+	-y \
+	containerd.io=1.4.*
 sudo apt-mark hold containerd.io
 
 

diff --git a/pkg/scripts/testdata/TestKubeadmDebian-with_containerd_with_insecure_registry.golden b/pkg/scripts/testdata/TestKubeadmDebian-with_containerd_with_insecure_registry.golden
@@ -75,7 +75,11 @@ sudo add-apt-repository "deb https://download.docker.com/linux/ubuntu $(lsb_rele
 
 
 sudo apt-mark unhold containerd.io || true
-sudo apt-get install -y containerd.io=1.4.*
+sudo DEBIAN_FRONTEND=noninteractive apt-get install \
+	--option "Dpkg::Options::=--force-confold" \
+	--no-install-recommends \
+	-y \
+	containerd.io=1.4.*
 sudo apt-mark hold containerd.io