[release/v1.2] Hotfix: cloud-init broken flags / bump version to 1.2.5 (

#381) (#385) * [release/v1.2] Hotfix: cloud-init broken flags (#381) * bump version to 1.2.5 --------- Co-authored-by: Waleed Malik <[email protected]>
kubermatic · Apr 30, 2024 · a96954b · a96954b
1 parent c8b81ec
commit a96954b
Show file tree

Hide file tree

Showing 16 changed files with 93 additions and 25 deletions.
diff --git a/deploy/osps/default/osp-amzn2.yaml b/deploy/osps/default/osp-amzn2.yaml
@@ -20,7 +20,7 @@ metadata:
 spec:
   osName: "amzn2"
   osVersion: "2.0"
-  version: "v1.2.4"
+  version: "v1.2.5"
   supportedCloudProviders:
     - name: "aws"
 
@@ -80,7 +80,15 @@ spec:
 
               curl -s -k -v --header 'Authorization: Bearer {{ .Token }}' {{ .ServerURL }}/api/v1/namespaces/cloud-init-settings/secrets/{{ .SecretName }} | jq '.data["cloud-config"]' -r| base64 -d > /etc/cloud/cloud.cfg.d/{{ .SecretName }}.cfg
               cloud-init clean
-              cloud-init --file /etc/cloud/cloud.cfg.d/{{ .SecretName }}.cfg init
+              CLOUD_INIT_VERSION=$(cloud-init --version | awk '{print $2}')
+              # Compare the semver values of cloud-init versions to determine the correct command to run.
+              # This is required because the command line arguments for cloud-init changed in version 24.1, for details: https://github.com/canonical/cloud-init/releases/tag/24.1.
+              if [[ $(echo -e "24.0.0\n$CLOUD_INIT_VERSION" | sort -V | head -n1) = "24.0.0" ]]; then
+                  cloud-init init --file /etc/cloud/cloud.cfg.d/{{ .SecretName }}.cfg
+              else
+                  cloud-init --file /etc/cloud/cloud.cfg.d/{{ .SecretName }}.cfg init
+              fi
+
               systemctl daemon-reload
 
               # cloud-init should only run on the first boot. From this point forward we don't need cloud-init anymore.

diff --git a/deploy/osps/default/osp-centos.yaml b/deploy/osps/default/osp-centos.yaml
@@ -20,7 +20,7 @@ metadata:
 spec:
   osName: "centos"
   osVersion: "7.7"
-  version: "v1.2.4"
+  version: "v1.2.5"
   supportedCloudProviders:
     - name: "alibaba"
     - name: "aws"
@@ -95,7 +95,14 @@ spec:
 
               curl -s -k -v --header 'Authorization: Bearer {{ .Token }}' {{ .ServerURL }}/api/v1/namespaces/cloud-init-settings/secrets/{{ .SecretName }} | jq '.data["cloud-config"]' -r| base64 -d > /etc/cloud/cloud.cfg.d/{{ .SecretName }}.cfg
               cloud-init clean
-              cloud-init --file /etc/cloud/cloud.cfg.d/{{ .SecretName }}.cfg init
+              CLOUD_INIT_VERSION=$(cloud-init --version | awk '{print $2}')
+              # Compare the semver values of cloud-init versions to determine the correct command to run.
+              # This is required because the command line arguments for cloud-init changed in version 24.1, for details: https://github.com/canonical/cloud-init/releases/tag/24.1.
+              if [[ $(echo -e "24.0.0\n$CLOUD_INIT_VERSION" | sort -V | head -n1) = "24.0.0" ]]; then
+                  cloud-init init --file /etc/cloud/cloud.cfg.d/{{ .SecretName }}.cfg
+              else
+                  cloud-init --file /etc/cloud/cloud.cfg.d/{{ .SecretName }}.cfg init
+              fi
 
               systemctl daemon-reload
 

diff --git a/deploy/osps/default/osp-flatcar.yaml b/deploy/osps/default/osp-flatcar.yaml
@@ -21,7 +21,7 @@ spec:
   osName: flatcar
   ## Flatcar Stable (09/11/2021)
   osVersion: "2983.2.0"
-  version: "v1.2.4"
+  version: "v1.2.5"
   supportedCloudProviders:
     - name: "aws"
     - name: "azure"

diff --git a/deploy/osps/default/osp-rhel.yaml b/deploy/osps/default/osp-rhel.yaml
@@ -20,7 +20,7 @@ metadata:
 spec:
   osName: "rhel"
   osVersion: "8.5"
-  version: "v1.2.4"
+  version: "v1.2.5"
   supportedCloudProviders:
     - name: "aws"
     - name: "azure"
@@ -84,7 +84,14 @@ spec:
 
               curl -s -k -v --header 'Authorization: Bearer {{ .Token }}' {{ .ServerURL }}/api/v1/namespaces/cloud-init-settings/secrets/{{ .SecretName }} | jq '.data["cloud-config"]' -r| base64 -d > /etc/cloud/cloud.cfg.d/{{ .SecretName }}.cfg
               cloud-init clean
-              cloud-init --file /etc/cloud/cloud.cfg.d/{{ .SecretName }}.cfg init
+              CLOUD_INIT_VERSION=$(cloud-init --version | awk '{print $2}')
+              # Compare the semver values of cloud-init versions to determine the correct command to run.
+              # This is required because the command line arguments for cloud-init changed in version 24.1, for details: https://github.com/canonical/cloud-init/releases/tag/24.1.
+              if [[ $(echo -e "24.0.0\n$CLOUD_INIT_VERSION" | sort -V | head -n1) = "24.0.0" ]]; then
+                  cloud-init init --file /etc/cloud/cloud.cfg.d/{{ .SecretName }}.cfg
+              else
+                  cloud-init --file /etc/cloud/cloud.cfg.d/{{ .SecretName }}.cfg init
+              fi
 
               systemctl daemon-reload
 

diff --git a/deploy/osps/default/osp-rockylinux.yaml b/deploy/osps/default/osp-rockylinux.yaml
@@ -20,7 +20,7 @@ metadata:
 spec:
   osName: "rockylinux"
   osVersion: "8.6"
-  version: "v1.2.4"
+  version: "v1.2.5"
   supportedCloudProviders:
     - name: "aws"
     - name: "azure"
@@ -87,7 +87,14 @@ spec:
 
               curl -s -k -v --header 'Authorization: Bearer {{ .Token }}' {{ .ServerURL }}/api/v1/namespaces/cloud-init-settings/secrets/{{ .SecretName }} | jq '.data["cloud-config"]' -r| base64 -d > /etc/cloud/cloud.cfg.d/{{ .SecretName }}.cfg
               cloud-init clean
-              cloud-init --file /etc/cloud/cloud.cfg.d/{{ .SecretName }}.cfg init
+              CLOUD_INIT_VERSION=$(cloud-init --version | awk '{print $2}')
+              # Compare the semver values of cloud-init versions to determine the correct command to run.
+              # This is required because the command line arguments for cloud-init changed in version 24.1, for details: https://github.com/canonical/cloud-init/releases/tag/24.1.
+              if [[ $(echo -e "24.0.0\n$CLOUD_INIT_VERSION" | sort -V | head -n1) = "24.0.0" ]]; then
+                  cloud-init init --file /etc/cloud/cloud.cfg.d/{{ .SecretName }}.cfg
+              else
+                  cloud-init --file /etc/cloud/cloud.cfg.d/{{ .SecretName }}.cfg init
+              fi
 
               systemctl daemon-reload
 

diff --git a/deploy/osps/default/osp-ubuntu.yaml b/deploy/osps/default/osp-ubuntu.yaml
@@ -20,7 +20,7 @@ metadata:
 spec:
   osName: "ubuntu"
   osVersion: "20.04"
-  version: "v1.2.4"
+  version: "v1.2.5"
   supportedCloudProviders:
     - name: "alibaba"
     - name: "aws"
@@ -106,7 +106,15 @@ spec:
               echo "network: {config: disabled}" > /etc/cloud/cloud.cfg.d/99-custom-networking.cfg
               {{- end }}
 
-              cloud-init --file /etc/cloud/cloud.cfg.d/{{ .SecretName }}.cfg init
+              CLOUD_INIT_VERSION=$(cloud-init --version | awk '{print $2}')
+              # Compare the semver values of cloud-init versions to determine the correct command to run.
+              # This is required because the command line arguments for cloud-init changed in version 24.1, for details: https://github.com/canonical/cloud-init/releases/tag/24.1.
+              if [[ $(echo -e "24.0.0\n$CLOUD_INIT_VERSION" | sort -V | head -n1) = "24.0.0" ]]; then
+                  cloud-init init --file /etc/cloud/cloud.cfg.d/{{ .SecretName }}.cfg
+              else
+                  cloud-init --file /etc/cloud/cloud.cfg.d/{{ .SecretName }}.cfg init
+              fi
+
               systemctl daemon-reload
 
               {{- if eq .CloudProviderName "digitalocean" }}

diff --git a/pkg/controllers/osc/testdata/osc-kubelet-configuration-containerd.yaml b/pkg/controllers/osc/testdata/osc-kubelet-configuration-containerd.yaml
@@ -35,8 +35,14 @@ spec:
             && apt install -y curl jq\ncurl -s -k -v --header 'Authorization: Bearer
             top-secret'\thttps://foo.bar:6443/api/v1/namespaces/cloud-init-settings/secrets/kubelet-configuration-kube-system-provisioning-config
             | jq '.data[\"cloud-config\"]' -r| base64 -d > /etc/cloud/cloud.cfg.d/kubelet-configuration-kube-system-provisioning-config.cfg\ncloud-init
-            clean\n\ncloud-init --file /etc/cloud/cloud.cfg.d/kubelet-configuration-kube-system-provisioning-config.cfg
-            init\nsystemctl daemon-reload\n\nsystemctl daemon-reload\n\n# cloud-init
+            clean\n\nCLOUD_INIT_VERSION=$(cloud-init --version | awk '{print $2}')\n#
+            Compare the semver values of cloud-init versions to determine the correct
+            command to run.\n# This is required because the command line arguments
+            for cloud-init changed in version 24.1, for details: https://github.com/canonical/cloud-init/releases/tag/24.1.\nif
+            [[ $(echo -e \"24.0.0\\n$CLOUD_INIT_VERSION\" | sort -V | head -n1) =
+            \"24.0.0\" ]]; then\n    cloud-init init --file /etc/cloud/cloud.cfg.d/kubelet-configuration-kube-system-provisioning-config.cfg\nelse\n
+            \   cloud-init --file /etc/cloud/cloud.cfg.d/kubelet-configuration-kube-system-provisioning-config.cfg
+            init\nfi\n\nsystemctl daemon-reload\n\nsystemctl daemon-reload\n\n# cloud-init
             should only run on the first boot. From this point forward we don't need
             cloud-init anymore.\nsystemctl disable cloud-init\ntouch /etc/cloud/cloud-init.disabled\n#
             Bootstrap phase for the machine is complete.\ntouch /etc/bootstrap-complete\nsystemctl

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
@@ -50,7 +50,14 @@ spec:
 
             curl -s -k -v --header 'Authorization: Bearer top-secret' https://foo.bar:6443/api/v1/namespaces/cloud-init-settings/secrets/osp-rhel-azure-kube-system-provisioning-config | jq '.data["cloud-config"]' -r| base64 -d > /etc/cloud/cloud.cfg.d/osp-rhel-azure-kube-system-provisioning-config.cfg
             cloud-init clean
-            cloud-init --file /etc/cloud/cloud.cfg.d/osp-rhel-azure-kube-system-provisioning-config.cfg init
+            CLOUD_INIT_VERSION=$(cloud-init --version | awk '{print $2}')
+            # Compare the semver values of cloud-init versions to determine the correct command to run.
+            # This is required because the command line arguments for cloud-init changed in version 24.1, for details: https://github.com/canonical/cloud-init/releases/tag/24.1.
+            if [[ $(echo -e "24.0.0\n$CLOUD_INIT_VERSION" | sort -V | head -n1) = "24.0.0" ]]; then
+                cloud-init init --file /etc/cloud/cloud.cfg.d/osp-rhel-azure-kube-system-provisioning-config.cfg
+            else
+                cloud-init --file /etc/cloud/cloud.cfg.d/osp-rhel-azure-kube-system-provisioning-config.cfg init
+            fi
 
             systemctl daemon-reload
 

diff --git a/pkg/controllers/osc/testdata/osc-ubuntu-aws-containerd.yaml b/pkg/controllers/osc/testdata/osc-ubuntu-aws-containerd.yaml
@@ -35,8 +35,14 @@ spec:
             && apt install -y curl jq\ncurl -s -k -v --header 'Authorization: Bearer
             top-secret'\thttps://foo.bar:6443/api/v1/namespaces/cloud-init-settings/secrets/ubuntu-aws-kube-system-provisioning-config
             | jq '.data[\"cloud-config\"]' -r| base64 -d > /etc/cloud/cloud.cfg.d/ubuntu-aws-kube-system-provisioning-config.cfg\ncloud-init
-            clean\n\ncloud-init --file /etc/cloud/cloud.cfg.d/ubuntu-aws-kube-system-provisioning-config.cfg
-            init\nsystemctl daemon-reload\n\nsystemctl daemon-reload\n\n# cloud-init
+            clean\n\nCLOUD_INIT_VERSION=$(cloud-init --version | awk '{print $2}')\n#
+            Compare the semver values of cloud-init versions to determine the correct
+            command to run.\n# This is required because the command line arguments
+            for cloud-init changed in version 24.1, for details: https://github.com/canonical/cloud-init/releases/tag/24.1.\nif
+            [[ $(echo -e \"24.0.0\\n$CLOUD_INIT_VERSION\" | sort -V | head -n1) =
+            \"24.0.0\" ]]; then\n    cloud-init init --file /etc/cloud/cloud.cfg.d/ubuntu-aws-kube-system-provisioning-config.cfg\nelse\n
+            \   cloud-init --file /etc/cloud/cloud.cfg.d/ubuntu-aws-kube-system-provisioning-config.cfg
+            init\nfi\n\nsystemctl daemon-reload\n\nsystemctl daemon-reload\n\n# cloud-init
             should only run on the first boot. From this point forward we don't need
             cloud-init anymore.\nsystemctl disable cloud-init\ntouch /etc/cloud/cloud-init.disabled\n#
             Bootstrap phase for the machine is complete.\ntouch /etc/bootstrap-complete\nsystemctl

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
@@ -35,8 +35,14 @@ spec:
             && apt install -y curl jq\ncurl -s -k -v --header 'Authorization: Bearer
             top-secret'\thttps://foo.bar:6443/api/v1/namespaces/cloud-init-settings/secrets/ubuntu-aws-kube-system-provisioning-config
             | jq '.data[\"cloud-config\"]' -r| base64 -d > /etc/cloud/cloud.cfg.d/ubuntu-aws-kube-system-provisioning-config.cfg\ncloud-init
-            clean\n\ncloud-init --file /etc/cloud/cloud.cfg.d/ubuntu-aws-kube-system-provisioning-config.cfg
-            init\nsystemctl daemon-reload\n\nsystemctl daemon-reload\n\n# cloud-init
+            clean\n\nCLOUD_INIT_VERSION=$(cloud-init --version | awk '{print $2}')\n#
+            Compare the semver values of cloud-init versions to determine the correct
+            command to run.\n# This is required because the command line arguments
+            for cloud-init changed in version 24.1, for details: https://github.com/canonical/cloud-init/releases/tag/24.1.\nif
+            [[ $(echo -e \"24.0.0\\n$CLOUD_INIT_VERSION\" | sort -V | head -n1) =
+            \"24.0.0\" ]]; then\n    cloud-init init --file /etc/cloud/cloud.cfg.d/ubuntu-aws-kube-system-provisioning-config.cfg\nelse\n
+            \   cloud-init --file /etc/cloud/cloud.cfg.d/ubuntu-aws-kube-system-provisioning-config.cfg
+            init\nfi\n\nsystemctl daemon-reload\n\nsystemctl daemon-reload\n\n# cloud-init
             should only run on the first boot. From this point forward we don't need
             cloud-init anymore.\nsystemctl disable cloud-init\ntouch /etc/cloud/cloud-init.disabled\n#
             Bootstrap phase for the machine is complete.\ntouch /etc/bootstrap-complete\nsystemctl

diff --git a/pkg/controllers/osc/testdata/osc-ubuntu-aws-dualstack.yaml b/pkg/controllers/osc/testdata/osc-ubuntu-aws-dualstack.yaml
@@ -35,8 +35,14 @@ spec:
             && apt install -y curl jq\ncurl -s -k -v --header 'Authorization: Bearer
             top-secret'\thttps://foo.bar:6443/api/v1/namespaces/cloud-init-settings/secrets/ubuntu-aws-kube-system-provisioning-config
             | jq '.data[\"cloud-config\"]' -r| base64 -d > /etc/cloud/cloud.cfg.d/ubuntu-aws-kube-system-provisioning-config.cfg\ncloud-init
-            clean\n\ncloud-init --file /etc/cloud/cloud.cfg.d/ubuntu-aws-kube-system-provisioning-config.cfg
-            init\nsystemctl daemon-reload\n\nsystemctl daemon-reload\n\n# cloud-init
+            clean\n\nCLOUD_INIT_VERSION=$(cloud-init --version | awk '{print $2}')\n#
+            Compare the semver values of cloud-init versions to determine the correct
+            command to run.\n# This is required because the command line arguments
+            for cloud-init changed in version 24.1, for details: https://github.com/canonical/cloud-init/releases/tag/24.1.\nif
+            [[ $(echo -e \"24.0.0\\n$CLOUD_INIT_VERSION\" | sort -V | head -n1) =
+            \"24.0.0\" ]]; then\n    cloud-init init --file /etc/cloud/cloud.cfg.d/ubuntu-aws-kube-system-provisioning-config.cfg\nelse\n
+            \   cloud-init --file /etc/cloud/cloud.cfg.d/ubuntu-aws-kube-system-provisioning-config.cfg
+            init\nfi\n\nsystemctl daemon-reload\n\nsystemctl daemon-reload\n\n# cloud-init
             should only run on the first boot. From this point forward we don't need
             cloud-init anymore.\nsystemctl disable cloud-init\ntouch /etc/cloud/cloud-init.disabled\n#
             Bootstrap phase for the machine is complete.\ntouch /etc/bootstrap-complete\nsystemctl