From c8c399c009b3e75efa56d356448e39b5ec0c6d61 Mon Sep 17 00:00:00 2001
From: Yakul Garg <yakul@debian-BULLSEYE-live-builder-AMD64>
Date: Fri, 15 Oct 2021 21:28:22 +0530
Subject: [PATCH] Allow-downgrades for dockerce and containerd If dockerce
 or/and containerd is/are already present on the machine, then the setup
 script will not install them if the version installed is already higher than
 what we require, so I have added a allow-downgrades flag to the installation
 script

Signed-off-by: Yakul Garg <2000yeshu@gmail.com>
---
 pkg/containerruntime/containerd.go                              | 2 +-
 pkg/containerruntime/docker.go                                  | 2 +-
 pkg/userdata/ubuntu/testdata/containerd.yaml                    | 2 +-
 pkg/userdata/ubuntu/testdata/dist-upgrade-on-boot.yaml          | 2 +-
 .../ubuntu/testdata/kubelet-version-without-v-prefix.yaml       | 2 +-
 pkg/userdata/ubuntu/testdata/multiple-dns-servers.yaml          | 2 +-
 pkg/userdata/ubuntu/testdata/multiple-ssh-keys.yaml             | 2 +-
 .../ubuntu/testdata/openstack-overwrite-cloud-config.yaml       | 2 +-
 pkg/userdata/ubuntu/testdata/openstack.yaml                     | 2 +-
 pkg/userdata/ubuntu/testdata/version-1.17.16.yaml               | 2 +-
 pkg/userdata/ubuntu/testdata/version-1.18.14.yaml               | 2 +-
 pkg/userdata/ubuntu/testdata/version-1.19.4.yaml                | 2 +-
 pkg/userdata/ubuntu/testdata/version-1.20.1.yaml                | 2 +-
 pkg/userdata/ubuntu/testdata/vsphere-mirrors.yaml               | 2 +-
 pkg/userdata/ubuntu/testdata/vsphere-proxy.yaml                 | 2 +-
 pkg/userdata/ubuntu/testdata/vsphere.yaml                       | 2 +-
 16 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/pkg/containerruntime/containerd.go b/pkg/containerruntime/containerd.go
index 63b18ec0f..e0e49106c 100644
--- a/pkg/containerruntime/containerd.go
+++ b/pkg/containerruntime/containerd.go
@@ -144,7 +144,7 @@ Restart=always
 EnvironmentFile=-/etc/environment
 EOF
 
-apt-get install -y containerd.io={{ .ContainerdVersion }}*
+apt-get install -y --allow-downgrades containerd.io={{ .ContainerdVersion }}*
 apt-mark hold containerd.io
 
 systemctl daemon-reload
diff --git a/pkg/containerruntime/docker.go b/pkg/containerruntime/docker.go
index 40f8110b4..580af1a68 100644
--- a/pkg/containerruntime/docker.go
+++ b/pkg/containerruntime/docker.go
@@ -151,7 +151,7 @@ Restart=always
 EnvironmentFile=-/etc/environment
 EOF
 
-apt-get install -y \
+apt-get install --allow-downgrades -y \
 {{- if .ContainerdVersion }}
     containerd.io={{ .ContainerdVersion }}* \
     docker-ce-cli=5:{{ .DockerVersion }}* \
diff --git a/pkg/userdata/ubuntu/testdata/containerd.yaml b/pkg/userdata/ubuntu/testdata/containerd.yaml
index fa38dc643..16c3a4e07 100644
--- a/pkg/userdata/ubuntu/testdata/containerd.yaml
+++ b/pkg/userdata/ubuntu/testdata/containerd.yaml
@@ -105,7 +105,7 @@ write_files:
     EnvironmentFile=-/etc/environment
     EOF
 
-    apt-get install -y containerd.io=1.4*
+    apt-get install -y --allow-downgrades containerd.io=1.4*
     apt-mark hold containerd.io
 
     systemctl daemon-reload
diff --git a/pkg/userdata/ubuntu/testdata/dist-upgrade-on-boot.yaml b/pkg/userdata/ubuntu/testdata/dist-upgrade-on-boot.yaml
index 5d8d62487..fbccfa0d6 100644
--- a/pkg/userdata/ubuntu/testdata/dist-upgrade-on-boot.yaml
+++ b/pkg/userdata/ubuntu/testdata/dist-upgrade-on-boot.yaml
@@ -102,7 +102,7 @@ write_files:
     EnvironmentFile=-/etc/environment
     EOF
 
-    apt-get install -y \
+    apt-get install --allow-downgrades -y \
         containerd.io=1.4* \
         docker-ce-cli=5:19.03* \
         docker-ce=5:19.03*
diff --git a/pkg/userdata/ubuntu/testdata/kubelet-version-without-v-prefix.yaml b/pkg/userdata/ubuntu/testdata/kubelet-version-without-v-prefix.yaml
index d04e63a50..64b02b0bd 100644
--- a/pkg/userdata/ubuntu/testdata/kubelet-version-without-v-prefix.yaml
+++ b/pkg/userdata/ubuntu/testdata/kubelet-version-without-v-prefix.yaml
@@ -100,7 +100,7 @@ write_files:
     EnvironmentFile=-/etc/environment
     EOF
 
-    apt-get install -y \
+    apt-get install --allow-downgrades -y \
         containerd.io=1.4* \
         docker-ce-cli=5:19.03* \
         docker-ce=5:19.03*
diff --git a/pkg/userdata/ubuntu/testdata/multiple-dns-servers.yaml b/pkg/userdata/ubuntu/testdata/multiple-dns-servers.yaml
index 9f3b468a1..ba3b58964 100644
--- a/pkg/userdata/ubuntu/testdata/multiple-dns-servers.yaml
+++ b/pkg/userdata/ubuntu/testdata/multiple-dns-servers.yaml
@@ -100,7 +100,7 @@ write_files:
     EnvironmentFile=-/etc/environment
     EOF
 
-    apt-get install -y \
+    apt-get install --allow-downgrades -y \
         containerd.io=1.4* \
         docker-ce-cli=5:19.03* \
         docker-ce=5:19.03*
diff --git a/pkg/userdata/ubuntu/testdata/multiple-ssh-keys.yaml b/pkg/userdata/ubuntu/testdata/multiple-ssh-keys.yaml
index 74ae95b4f..31a45b767 100644
--- a/pkg/userdata/ubuntu/testdata/multiple-ssh-keys.yaml
+++ b/pkg/userdata/ubuntu/testdata/multiple-ssh-keys.yaml
@@ -102,7 +102,7 @@ write_files:
     EnvironmentFile=-/etc/environment
     EOF
 
-    apt-get install -y \
+    apt-get install --allow-downgrades -y \
         containerd.io=1.4* \
         docker-ce-cli=5:19.03* \
         docker-ce=5:19.03*
diff --git a/pkg/userdata/ubuntu/testdata/openstack-overwrite-cloud-config.yaml b/pkg/userdata/ubuntu/testdata/openstack-overwrite-cloud-config.yaml
index 70a188de2..a31a8a522 100644
--- a/pkg/userdata/ubuntu/testdata/openstack-overwrite-cloud-config.yaml
+++ b/pkg/userdata/ubuntu/testdata/openstack-overwrite-cloud-config.yaml
@@ -100,7 +100,7 @@ write_files:
     EnvironmentFile=-/etc/environment
     EOF
 
-    apt-get install -y \
+    apt-get install --allow-downgrades -y \
         containerd.io=1.4* \
         docker-ce-cli=5:19.03* \
         docker-ce=5:19.03*
diff --git a/pkg/userdata/ubuntu/testdata/openstack.yaml b/pkg/userdata/ubuntu/testdata/openstack.yaml
index 2031720cd..f355ecbcf 100644
--- a/pkg/userdata/ubuntu/testdata/openstack.yaml
+++ b/pkg/userdata/ubuntu/testdata/openstack.yaml
@@ -100,7 +100,7 @@ write_files:
     EnvironmentFile=-/etc/environment
     EOF
 
-    apt-get install -y \
+    apt-get install --allow-downgrades -y \
         containerd.io=1.4* \
         docker-ce-cli=5:19.03* \
         docker-ce=5:19.03*
diff --git a/pkg/userdata/ubuntu/testdata/version-1.17.16.yaml b/pkg/userdata/ubuntu/testdata/version-1.17.16.yaml
index 8439a6c1c..7f8fb5142 100644
--- a/pkg/userdata/ubuntu/testdata/version-1.17.16.yaml
+++ b/pkg/userdata/ubuntu/testdata/version-1.17.16.yaml
@@ -100,7 +100,7 @@ write_files:
     EnvironmentFile=-/etc/environment
     EOF
 
-    apt-get install -y \
+    apt-get install --allow-downgrades -y \
         containerd.io=1.4* \
         docker-ce-cli=5:19.03* \
         docker-ce=5:19.03*
diff --git a/pkg/userdata/ubuntu/testdata/version-1.18.14.yaml b/pkg/userdata/ubuntu/testdata/version-1.18.14.yaml
index e6b960198..82fc6ba3a 100644
--- a/pkg/userdata/ubuntu/testdata/version-1.18.14.yaml
+++ b/pkg/userdata/ubuntu/testdata/version-1.18.14.yaml
@@ -100,7 +100,7 @@ write_files:
     EnvironmentFile=-/etc/environment
     EOF
 
-    apt-get install -y \
+    apt-get install --allow-downgrades -y \
         containerd.io=1.4* \
         docker-ce-cli=5:19.03* \
         docker-ce=5:19.03*
diff --git a/pkg/userdata/ubuntu/testdata/version-1.19.4.yaml b/pkg/userdata/ubuntu/testdata/version-1.19.4.yaml
index f306774c4..0eaef6879 100644
--- a/pkg/userdata/ubuntu/testdata/version-1.19.4.yaml
+++ b/pkg/userdata/ubuntu/testdata/version-1.19.4.yaml
@@ -100,7 +100,7 @@ write_files:
     EnvironmentFile=-/etc/environment
     EOF
 
-    apt-get install -y \
+    apt-get install --allow-downgrades -y \
         containerd.io=1.4* \
         docker-ce-cli=5:19.03* \
         docker-ce=5:19.03*
diff --git a/pkg/userdata/ubuntu/testdata/version-1.20.1.yaml b/pkg/userdata/ubuntu/testdata/version-1.20.1.yaml
index 77131c0c6..ff0d98592 100644
--- a/pkg/userdata/ubuntu/testdata/version-1.20.1.yaml
+++ b/pkg/userdata/ubuntu/testdata/version-1.20.1.yaml
@@ -100,7 +100,7 @@ write_files:
     EnvironmentFile=-/etc/environment
     EOF
 
-    apt-get install -y \
+    apt-get install --allow-downgrades -y \
         containerd.io=1.4* \
         docker-ce-cli=5:19.03* \
         docker-ce=5:19.03*
diff --git a/pkg/userdata/ubuntu/testdata/vsphere-mirrors.yaml b/pkg/userdata/ubuntu/testdata/vsphere-mirrors.yaml
index e5bed40c4..b66b6707c 100644
--- a/pkg/userdata/ubuntu/testdata/vsphere-mirrors.yaml
+++ b/pkg/userdata/ubuntu/testdata/vsphere-mirrors.yaml
@@ -110,7 +110,7 @@ write_files:
     EnvironmentFile=-/etc/environment
     EOF
 
-    apt-get install -y \
+    apt-get install --allow-downgrades -y \
         containerd.io=1.4* \
         docker-ce-cli=5:19.03* \
         docker-ce=5:19.03*
diff --git a/pkg/userdata/ubuntu/testdata/vsphere-proxy.yaml b/pkg/userdata/ubuntu/testdata/vsphere-proxy.yaml
index 8e7327e71..3eef17ae4 100644
--- a/pkg/userdata/ubuntu/testdata/vsphere-proxy.yaml
+++ b/pkg/userdata/ubuntu/testdata/vsphere-proxy.yaml
@@ -110,7 +110,7 @@ write_files:
     EnvironmentFile=-/etc/environment
     EOF
 
-    apt-get install -y \
+    apt-get install --allow-downgrades -y \
         containerd.io=1.4* \
         docker-ce-cli=5:19.03* \
         docker-ce=5:19.03*
diff --git a/pkg/userdata/ubuntu/testdata/vsphere.yaml b/pkg/userdata/ubuntu/testdata/vsphere.yaml
index bfa48a242..eb8423114 100644
--- a/pkg/userdata/ubuntu/testdata/vsphere.yaml
+++ b/pkg/userdata/ubuntu/testdata/vsphere.yaml
@@ -101,7 +101,7 @@ write_files:
     EnvironmentFile=-/etc/environment
     EOF
 
-    apt-get install -y \
+    apt-get install --allow-downgrades -y \
         containerd.io=1.4* \
         docker-ce-cli=5:19.03* \
         docker-ce=5:19.03*