From 3fa3ea341feb50d3f42ee7ba1dae005946bd83f8 Mon Sep 17 00:00:00 2001 From: Artiom Diomin Date: Tue, 5 Apr 2022 17:41:03 +0300 Subject: [PATCH] Use --force-confold on containerd installation in deb based OS Signed-off-by: Artiom Diomin --- pkg/scripts/render.go | 9 ++++++++- .../testdata/TestKubeadmDebian-with_containerd.golden | 6 +++++- ...mDebian-with_containerd_with_insecure_registry.golden | 6 +++++- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/pkg/scripts/render.go b/pkg/scripts/render.go index cbdc000dc..1a84a6a3c 100644 --- 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 index d8c6756f7..59aa5c7ee 100644 --- 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 index f9133a45a..753bf9434 100644 --- 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