Use RHEL upstream docker repo instead of abandoned CentOS (#407)

Sister commit of kubermatic/kubeone#3316 Signed-off-by: Artiom Diomin <[email protected]>
kubermatic · Jul 25, 2024 · 5503e90 · 5503e90
1 parent 75e6ecd
commit 5503e90
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 24 deletions.
diff --git a/deploy/osps/default/osp-amzn2.yaml b/deploy/osps/default/osp-amzn2.yaml
@@ -162,9 +162,7 @@ spec:
                   {{ .ContainerRuntimeConfig }}
         templates:
           containerRuntimeInstallation: |-
-            yum install -y \
-              containerd-1.7* \
-              yum-plugin-versionlock
+            yum install -y containerd-1.7* yum-plugin-versionlock
             yum versionlock add containerd
 
             systemctl daemon-reload

diff --git a/deploy/osps/default/osp-centos.yaml b/deploy/osps/default/osp-centos.yaml
@@ -178,12 +178,7 @@ spec:
         templates:
           containerRuntimeInstallation: |-
             yum install -y yum-utils
-            yum-config-manager --add-repo=https://download.docker.com/linux/centos/docker-ce.repo
-            {{- /*
-                Due to DNF modules we have to do this on docker-ce repo
-                More info at: https://bugzilla.redhat.com/show_bug.cgi?id=1756473
-            */}}
-            yum-config-manager --save --setopt=docker-ce-stable.module_hotfixes=true
+            yum-config-manager --add-repo=https://download.docker.com/linux/rhel/docker-ce.repo
 
             yum install -y containerd.io-1.7* yum-plugin-versionlock
             yum versionlock add containerd.io

diff --git a/deploy/osps/default/osp-rhel.yaml b/deploy/osps/default/osp-rhel.yaml
@@ -167,12 +167,7 @@ spec:
         templates:
           containerRuntimeInstallation: |-
             yum install -y yum-utils
-            yum-config-manager --add-repo=https://download.docker.com/linux/centos/docker-ce.repo
-            {{- /*
-                Due to DNF modules we have to do this on docker-ce repo
-                More info at: https://bugzilla.redhat.com/show_bug.cgi?id=1756473
-            */}}
-            yum-config-manager --save --setopt=docker-ce-stable.module_hotfixes=true
+            yum-config-manager --add-repo=https://download.docker.com/linux/rhel/docker-ce.repo
 
             yum install -y containerd.io-1.7* yum-plugin-versionlock
             yum versionlock add containerd.io

diff --git a/deploy/osps/default/osp-rockylinux.yaml b/deploy/osps/default/osp-rockylinux.yaml
@@ -171,12 +171,7 @@ spec:
         templates:
           containerRuntimeInstallation: |-
             yum install -y yum-utils
-            yum-config-manager --add-repo=https://download.docker.com/linux/centos/docker-ce.repo
-            {{- /*
-                Due to DNF modules we have to do this on docker-ce repo
-                More info at: https://bugzilla.redhat.com/show_bug.cgi?id=1756473
-            */}}
-            yum-config-manager --save --setopt=docker-ce-stable.module_hotfixes=true
+            yum-config-manager --add-repo=https://download.docker.com/linux/rhel/docker-ce.repo
 
             yum install -y containerd.io-1.7* yum-plugin-versionlock
             yum versionlock add containerd.io

diff --git a/pkg/controllers/osc/testdata/osc-rhel-8.x-azure-containerd.yaml b/pkg/controllers/osc/testdata/osc-rhel-8.x-azure-containerd.yaml
@@ -321,8 +321,7 @@ spec:
 
             systemctl disable --now firewalld || true
             yum install -y yum-utils
-            yum-config-manager --add-repo=https://download.docker.com/linux/centos/docker-ce.repo
-            yum-config-manager --save --setopt=docker-ce-stable.module_hotfixes=true
+            yum-config-manager --add-repo=https://download.docker.com/linux/rhel/docker-ce.repo
 
             yum install -y containerd.io-1.7* yum-plugin-versionlock
             yum versionlock add containerd.io

diff --git a/pkg/controllers/osc/testdata/secret-rhel-8.x-azure-containerd-provisioning.yaml b/pkg/controllers/osc/testdata/secret-rhel-8.x-azure-containerd-provisioning.yaml