From 5b548e07a852a25bd727d4a523a828c96f46f25c Mon Sep 17 00:00:00 2001 From: Marvin Beckers Date: Mon, 6 May 2024 16:25:49 +0200 Subject: [PATCH] [release/v1.5] Run `cloud-init init --local` once on Azure to get provider configuration set up properly (#390) * [release/v1.5] Run `cloud-init init --local` once on Azure to get provider configuration set up properly (#388) Signed-off-by: Marvin Beckers * [release/v1.5] Bump OSP version to 1.5.2 Signed-off-by: Marvin Beckers --------- Signed-off-by: Marvin Beckers --- deploy/osps/default/osp-amzn2.yaml | 2 +- deploy/osps/default/osp-centos.yaml | 2 +- deploy/osps/default/osp-flatcar-cloud-init.yaml | 2 +- deploy/osps/default/osp-flatcar.yaml | 2 +- deploy/osps/default/osp-rhel.yaml | 2 +- deploy/osps/default/osp-rockylinux.yaml | 2 +- deploy/osps/default/osp-ubuntu.yaml | 7 ++++++- 7 files changed, 12 insertions(+), 7 deletions(-) diff --git a/deploy/osps/default/osp-amzn2.yaml b/deploy/osps/default/osp-amzn2.yaml index 916417fe..977ba9f6 100644 --- 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.5.1" + version: "v1.5.2" provisioningUtility: "cloud-init" supportedCloudProviders: - name: "aws" diff --git a/deploy/osps/default/osp-centos.yaml b/deploy/osps/default/osp-centos.yaml index 998af0a3..456f9182 100644 --- 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.5.1" + version: "v1.5.2" provisioningUtility: "cloud-init" supportedCloudProviders: - name: "alibaba" diff --git a/deploy/osps/default/osp-flatcar-cloud-init.yaml b/deploy/osps/default/osp-flatcar-cloud-init.yaml index cdb60f5d..8689871e 100644 --- a/deploy/osps/default/osp-flatcar-cloud-init.yaml +++ b/deploy/osps/default/osp-flatcar-cloud-init.yaml @@ -21,7 +21,7 @@ spec: osName: flatcar ## Flatcar Stable (09/11/2021) osVersion: "2983.2.0" - version: "v1.5.1" + version: "v1.5.2" provisioningUtility: "cloud-init" supportedCloudProviders: - name: "anexia" diff --git a/deploy/osps/default/osp-flatcar.yaml b/deploy/osps/default/osp-flatcar.yaml index 667dd10a..b5d79e66 100644 --- 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.5.1" + version: "v1.5.2" provisioningUtility: "ignition" supportedCloudProviders: - name: "aws" diff --git a/deploy/osps/default/osp-rhel.yaml b/deploy/osps/default/osp-rhel.yaml index 02d3c975..0d27f095 100644 --- 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.5.1" + version: "v1.5.2" provisioningUtility: "cloud-init" supportedCloudProviders: - name: "aws" diff --git a/deploy/osps/default/osp-rockylinux.yaml b/deploy/osps/default/osp-rockylinux.yaml index d604489c..b1ff9de2 100644 --- 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.5.1" + version: "v1.5.2" provisioningUtility: "cloud-init" supportedCloudProviders: - name: "aws" diff --git a/deploy/osps/default/osp-ubuntu.yaml b/deploy/osps/default/osp-ubuntu.yaml index 574da3f8..004959e7 100644 --- 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.5.1" + version: "v1.5.2" provisioningUtility: "cloud-init" supportedCloudProviders: - name: "alibaba" @@ -102,6 +102,11 @@ 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 + {{- /* Azure's cloud-init provider integration has changed recently (end of April 2024) and now requires us to run this command below once to set some files up that seem required for another cloud-init run. */}} + {{- if (eq .CloudProviderName "azure") }} + cloud-init init --local + {{- end }} + {{- /* The default cloud-init configurations files have a bug on Digital Ocean that causes the machine to be in-accessible on the 2nd cloud-init and in case of Hetzner, ipv6 addresses are missing. Hence we disable network configuration. */}} {{- if (or (eq .CloudProviderName "digitalocean") (eq .CloudProviderName "hetzner")) }} rm /etc/netplan/50-cloud-init.yaml