fix: handle GPG key for Docker repo (#402)

* Properly handle GPG key for Docker repo Signed-off-by: Karol Szwaj <[email protected]> * test fixtures Signed-off-by: Karol Szwaj <[email protected]> * test fixtures Signed-off-by: Karol Szwaj <[email protected]> --------- Signed-off-by: Karol Szwaj <[email protected]>
kubermatic · Jul 12, 2024 · 418f1e6 · 418f1e6
1 parent 204a5bf
commit 418f1e6
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 16 deletions.
diff --git a/deploy/osps/default/osp-ubuntu.yaml b/deploy/osps/default/osp-ubuntu.yaml
@@ -204,8 +204,9 @@ spec:
           containerRuntimeInstallation: |-
             apt-get update
             apt-get install -y apt-transport-https ca-certificates curl software-properties-common lsb-release
-            curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add -
-            add-apt-repository "deb https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
+            sudo install -m 0755 -d /etc/apt/keyrings
+            curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /etc/apt/keyrings/docker.gpg
+            echo "deb [signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list
 
             apt-get install -y --allow-downgrades containerd.io=1.6*
             apt-mark hold containerd.io

diff --git a/pkg/controllers/osc/testdata/osc-kubelet-configuration-containerd.yaml b/pkg/controllers/osc/testdata/osc-kubelet-configuration-containerd.yaml
@@ -294,8 +294,9 @@ spec:
               ipvsadm
             apt-get update
             apt-get install -y apt-transport-https ca-certificates curl software-properties-common lsb-release
-            curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add -
-            add-apt-repository "deb https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
+            sudo install -m 0755 -d /etc/apt/keyrings
+            curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /etc/apt/keyrings/docker.gpg
+            echo "deb [signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list
 
             apt-get install -y --allow-downgrades containerd.io=1.6*
             apt-mark hold containerd.io

diff --git a/pkg/controllers/osc/testdata/osc-ubuntu-aws-containerd.yaml b/pkg/controllers/osc/testdata/osc-ubuntu-aws-containerd.yaml
@@ -294,8 +294,9 @@ spec:
               ipvsadm
             apt-get update
             apt-get install -y apt-transport-https ca-certificates curl software-properties-common lsb-release
-            curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add -
-            add-apt-repository "deb https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
+            sudo install -m 0755 -d /etc/apt/keyrings
+            curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /etc/apt/keyrings/docker.gpg
+            echo "deb [signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list
 
             apt-get install -y --allow-downgrades containerd.io=1.6*
             apt-mark hold containerd.io

diff --git a/pkg/controllers/osc/testdata/osc-ubuntu-aws-dualstack-IPv6+IPv4.yaml b/pkg/controllers/osc/testdata/osc-ubuntu-aws-dualstack-IPv6+IPv4.yaml
@@ -293,8 +293,9 @@ spec:
               ipvsadm
             apt-get update
             apt-get install -y apt-transport-https ca-certificates curl software-properties-common lsb-release
-            curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add -
-            add-apt-repository "deb https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
+            sudo install -m 0755 -d /etc/apt/keyrings
+            curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /etc/apt/keyrings/docker.gpg
+            echo "deb [signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list
 
             apt-get install -y --allow-downgrades containerd.io=1.6*
             apt-mark hold containerd.io

diff --git a/pkg/controllers/osc/testdata/osc-ubuntu-aws-dualstack.yaml b/pkg/controllers/osc/testdata/osc-ubuntu-aws-dualstack.yaml
@@ -293,8 +293,9 @@ spec:
               ipvsadm
             apt-get update
             apt-get install -y apt-transport-https ca-certificates curl software-properties-common lsb-release
-            curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add -
-            add-apt-repository "deb https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
+            sudo install -m 0755 -d /etc/apt/keyrings
+            curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /etc/apt/keyrings/docker.gpg
+            echo "deb [signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list
 
             apt-get install -y --allow-downgrades containerd.io=1.6*
             apt-mark hold containerd.io

diff --git a/pkg/controllers/osc/testdata/osc-ubuntu-aws.yaml b/pkg/controllers/osc/testdata/osc-ubuntu-aws.yaml
@@ -289,8 +289,9 @@ spec:
                 ipvsadm
               apt-get update
               apt-get install -y apt-transport-https ca-certificates curl software-properties-common lsb-release
-              curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add -
-              add-apt-repository "deb https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
+              sudo install -m 0755 -d /etc/apt/keyrings
+              curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /etc/apt/keyrings/docker.gpg
+              echo "deb [signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list
 
               apt-get install -y --allow-downgrades containerd.io=1.6*
               apt-mark hold containerd.io

diff --git a/pkg/controllers/osc/testdata/secret-kubelet-configuration-containerd-provisioning.yaml b/pkg/controllers/osc/testdata/secret-kubelet-configuration-containerd-provisioning.yaml
diff --git a/pkg/controllers/osc/testdata/secret-ubuntu-aws-containerd-provisioning.yaml b/pkg/controllers/osc/testdata/secret-ubuntu-aws-containerd-provisioning.yaml
diff --git a/pkg/controllers/osc/testdata/secret-ubuntu-aws-dualstack-IPv6+IPv4-provisioning.yaml b/pkg/controllers/osc/testdata/secret-ubuntu-aws-dualstack-IPv6+IPv4-provisioning.yaml
diff --git a/pkg/controllers/osc/testdata/secret-ubuntu-aws-dualstack-provisioning.yaml b/pkg/controllers/osc/testdata/secret-ubuntu-aws-dualstack-provisioning.yaml