Skip to content

Commit

Permalink
[release/v1.2] Run cloud-init init --local once on Azure to get pro…
Browse files Browse the repository at this point in the history
…vider configuration set up properly (#392)

* [release/v1.2] Run `cloud-init init --local` once on Azure to get provider configuration set up properly (#388)

Signed-off-by: Marvin Beckers <[email protected]>

* [release/v1.2] Bump OSP version to 1.2.6

Signed-off-by: Marvin Beckers <[email protected]>

---------

Signed-off-by: Marvin Beckers <[email protected]>
  • Loading branch information
embik authored May 6, 2024
1 parent a96954b commit ac68746
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 6 deletions.
2 changes: 1 addition & 1 deletion deploy/osps/default/osp-amzn2.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ metadata:
spec:
osName: "amzn2"
osVersion: "2.0"
version: "v1.2.5"
version: "v1.2.6"
supportedCloudProviders:
- name: "aws"

Expand Down
2 changes: 1 addition & 1 deletion deploy/osps/default/osp-centos.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ metadata:
spec:
osName: "centos"
osVersion: "7.7"
version: "v1.2.5"
version: "v1.2.6"
supportedCloudProviders:
- name: "alibaba"
- name: "aws"
Expand Down
2 changes: 1 addition & 1 deletion deploy/osps/default/osp-flatcar.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ spec:
osName: flatcar
## Flatcar Stable (09/11/2021)
osVersion: "2983.2.0"
version: "v1.2.5"
version: "v1.2.6"
supportedCloudProviders:
- name: "aws"
- name: "azure"
Expand Down
2 changes: 1 addition & 1 deletion deploy/osps/default/osp-rhel.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ metadata:
spec:
osName: "rhel"
osVersion: "8.5"
version: "v1.2.5"
version: "v1.2.6"
supportedCloudProviders:
- name: "aws"
- name: "azure"
Expand Down
2 changes: 1 addition & 1 deletion deploy/osps/default/osp-rockylinux.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ metadata:
spec:
osName: "rockylinux"
osVersion: "8.6"
version: "v1.2.5"
version: "v1.2.6"
supportedCloudProviders:
- name: "aws"
- name: "azure"
Expand Down
7 changes: 6 additions & 1 deletion deploy/osps/default/osp-ubuntu.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ metadata:
spec:
osName: "ubuntu"
osVersion: "20.04"
version: "v1.2.5"
version: "v1.2.6"
supportedCloudProviders:
- name: "alibaba"
- name: "aws"
Expand Down Expand Up @@ -100,6 +100,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
Expand Down

0 comments on commit ac68746

Please sign in to comment.