Skip to content

Commit 0aa2205

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request kubernetes-sigs#1936 from tormath1/tormath1/flatcar
test: bump Flatcar version
2 parents f6fb753 + 957c9fc commit 0aa2205

File tree

8 files changed

+32
-38
lines changed

8 files changed

+32
-38
lines changed

‎hack/ci/cloud-init/controller.yaml.tpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
IMAGE_URLS+="https://storage.googleapis.com/artifacts.k8s-staging-capi-openstack.appspot.com/test/cirros/2022-12-05/cirros-0.6.1-x86_64-disk.img,"
7171
IMAGE_URLS+="https://storage.googleapis.com/artifacts.k8s-staging-capi-openstack.appspot.com/test/ubuntu/2023-09-29/ubuntu-2204-kube-v1.27.2.img,"
7272
IMAGE_URLS+="https://storage.googleapis.com/artifacts.k8s-staging-capi-openstack.appspot.com/test/ubuntu/2024-01-10/ubuntu-2204-kube-v1.28.5.img,"
73-
IMAGE_URLS+="https://storage.googleapis.com/artifacts.k8s-staging-capi-openstack.appspot.com/test/flatcar/flatcar-stable-3760.2.0-kube-v1.28.5.img,"
73+
IMAGE_URLS+="https://storage.googleapis.com/artifacts.k8s-staging-capi-openstack.appspot.com/test/flatcar/flatcar-stable-3815.2.0-kube-v1.28.5.img,"
7474
IMAGE_URLS+="https://stable.release.flatcar-linux.net/amd64-usr/current/flatcar_production_openstack_image.img"
7575

7676
[[post-config|$NOVA_CONF]]

‎kustomize/v1alpha7/flatcar-sysext/patch-flatcar.yaml‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,12 @@ spec:
1818
nodeRegistration:
1919
name: $${COREOS_OPENSTACK_HOSTNAME}
2020
kubeletExtraArgs:
21-
provider-id: null
21+
provider-id: openstack:///$${COREOS_OPENSTACK_INSTANCE_UUID}
2222
initConfiguration:
2323
nodeRegistration:
2424
name: $${COREOS_OPENSTACK_HOSTNAME}
2525
kubeletExtraArgs:
26-
# Fixme(lentzi90): This is here just to override the value set in the default
27-
# kustomization. It will be replaced with a value that works for flatcar in
28-
# https://github.com/kubernetes-sigs/cluster-api-provider-openstack/pull/1564
29-
provider-id: null
26+
provider-id: openstack:///$${COREOS_OPENSTACK_INSTANCE_UUID}
3027
format: ignition
3128
ignition:
3229
containerLinuxConfig:
@@ -86,6 +83,7 @@ spec:
8683
EnvironmentFile=/run/metadata/flatcar
8784
preKubeadmCommands:
8885
- export COREOS_OPENSTACK_HOSTNAME=$${COREOS_OPENSTACK_HOSTNAME%.*}
86+
- export COREOS_OPENSTACK_INSTANCE_UUID=$${COREOS_OPENSTACK_INSTANCE_UUID}
8987
- envsubst < /etc/kubeadm.yml > /etc/kubeadm.yml.tmp
9088
- mv /etc/kubeadm.yml.tmp /etc/kubeadm.yml
9189
---
@@ -100,12 +98,10 @@ spec:
10098
nodeRegistration:
10199
name: $${COREOS_OPENSTACK_HOSTNAME}
102100
kubeletExtraArgs:
103-
# Fixme(lentzi90): This is here just to override the value set in the default
104-
# kustomization. It will be replaced with a value that works for flatcar in
105-
# https://github.com/kubernetes-sigs/cluster-api-provider-openstack/pull/1564
106-
provider-id: null
101+
provider-id: openstack:///$${COREOS_OPENSTACK_INSTANCE_UUID}
107102
preKubeadmCommands:
108103
- export COREOS_OPENSTACK_HOSTNAME=$${COREOS_OPENSTACK_HOSTNAME%.*}
104+
- export COREOS_OPENSTACK_INSTANCE_UUID=$${COREOS_OPENSTACK_INSTANCE_UUID}
109105
- envsubst < /etc/kubeadm.yml > /etc/kubeadm.yml.tmp
110106
- mv /etc/kubeadm.yml.tmp /etc/kubeadm.yml
111107
format: ignition

‎kustomize/v1alpha7/flatcar/patch-flatcar.yaml‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,12 @@ spec:
1818
nodeRegistration:
1919
name: $${COREOS_OPENSTACK_HOSTNAME}
2020
kubeletExtraArgs:
21-
provider-id: null
21+
provider-id: openstack:///$${COREOS_OPENSTACK_INSTANCE_UUID}
2222
initConfiguration:
2323
nodeRegistration:
2424
name: $${COREOS_OPENSTACK_HOSTNAME}
2525
kubeletExtraArgs:
26-
# Fixme(lentzi90): This is here just to override the value set in the default
27-
# kustomization. It will be replaced with a value that works for flatcar in
28-
# https://github.com/kubernetes-sigs/cluster-api-provider-openstack/pull/1564
29-
provider-id: null
26+
provider-id: openstack:///$${COREOS_OPENSTACK_INSTANCE_UUID}
3027
format: ignition
3128
ignition:
3229
containerLinuxConfig:
@@ -48,6 +45,7 @@ spec:
4845
EnvironmentFile=/run/metadata/flatcar
4946
preKubeadmCommands:
5047
- export COREOS_OPENSTACK_HOSTNAME=$${COREOS_OPENSTACK_HOSTNAME%.*}
48+
- export COREOS_OPENSTACK_INSTANCE_UUID=$${COREOS_OPENSTACK_INSTANCE_UUID}
5149
- envsubst < /etc/kubeadm.yml > /etc/kubeadm.yml.tmp
5250
- mv /etc/kubeadm.yml.tmp /etc/kubeadm.yml
5351
---
@@ -62,12 +60,10 @@ spec:
6260
nodeRegistration:
6361
name: $${COREOS_OPENSTACK_HOSTNAME}
6462
kubeletExtraArgs:
65-
# Fixme(lentzi90): This is here just to override the value set in the default
66-
# kustomization. It will be replaced with a value that works for flatcar in
67-
# https://github.com/kubernetes-sigs/cluster-api-provider-openstack/pull/1564
68-
provider-id: null
63+
provider-id: openstack:///$${COREOS_OPENSTACK_INSTANCE_UUID}
6964
preKubeadmCommands:
7065
- export COREOS_OPENSTACK_HOSTNAME=$${COREOS_OPENSTACK_HOSTNAME%.*}
66+
- export COREOS_OPENSTACK_INSTANCE_UUID=$${COREOS_OPENSTACK_INSTANCE_UUID}
7167
- envsubst < /etc/kubeadm.yml > /etc/kubeadm.yml.tmp
7268
- mv /etc/kubeadm.yml.tmp /etc/kubeadm.yml
7369
format: ignition

‎kustomize/v1beta1/flatcar-sysext/patch-flatcar.yaml‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,12 @@ spec:
1818
nodeRegistration:
1919
name: $${COREOS_OPENSTACK_HOSTNAME}
2020
kubeletExtraArgs:
21-
provider-id: null
21+
provider-id: openstack:///$${COREOS_OPENSTACK_INSTANCE_UUID}
2222
initConfiguration:
2323
nodeRegistration:
2424
name: $${COREOS_OPENSTACK_HOSTNAME}
2525
kubeletExtraArgs:
26-
# Fixme(lentzi90): This is here just to override the value set in the default
27-
# kustomization. It will be replaced with a value that works for flatcar in
28-
# https://github.com/kubernetes-sigs/cluster-api-provider-openstack/pull/1564
29-
provider-id: null
26+
provider-id: openstack:///$${COREOS_OPENSTACK_INSTANCE_UUID}
3027
format: ignition
3128
ignition:
3229
containerLinuxConfig:
@@ -86,6 +83,7 @@ spec:
8683
EnvironmentFile=/run/metadata/flatcar
8784
preKubeadmCommands:
8885
- export COREOS_OPENSTACK_HOSTNAME=$${COREOS_OPENSTACK_HOSTNAME%.*}
86+
- export COREOS_OPENSTACK_INSTANCE_UUID=$${COREOS_OPENSTACK_INSTANCE_UUID}
8987
- envsubst < /etc/kubeadm.yml > /etc/kubeadm.yml.tmp
9088
- mv /etc/kubeadm.yml.tmp /etc/kubeadm.yml
9189
---
@@ -100,12 +98,10 @@ spec:
10098
nodeRegistration:
10199
name: $${COREOS_OPENSTACK_HOSTNAME}
102100
kubeletExtraArgs:
103-
# Fixme(lentzi90): This is here just to override the value set in the default
104-
# kustomization. It will be replaced with a value that works for flatcar in
105-
# https://github.com/kubernetes-sigs/cluster-api-provider-openstack/pull/1564
106-
provider-id: null
101+
provider-id: openstack:///$${COREOS_OPENSTACK_INSTANCE_UUID}
107102
preKubeadmCommands:
108103
- export COREOS_OPENSTACK_HOSTNAME=$${COREOS_OPENSTACK_HOSTNAME%.*}
104+
- export COREOS_OPENSTACK_INSTANCE_UUID=$${COREOS_OPENSTACK_INSTANCE_UUID}
109105
- envsubst < /etc/kubeadm.yml > /etc/kubeadm.yml.tmp
110106
- mv /etc/kubeadm.yml.tmp /etc/kubeadm.yml
111107
format: ignition

‎kustomize/v1beta1/flatcar/patch-flatcar.yaml‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,12 @@ spec:
1818
nodeRegistration:
1919
name: $${COREOS_OPENSTACK_HOSTNAME}
2020
kubeletExtraArgs:
21-
provider-id: null
21+
provider-id: openstack:///$${COREOS_OPENSTACK_INSTANCE_UUID}
2222
initConfiguration:
2323
nodeRegistration:
2424
name: $${COREOS_OPENSTACK_HOSTNAME}
2525
kubeletExtraArgs:
26-
# Fixme(lentzi90): This is here just to override the value set in the default
27-
# kustomization. It will be replaced with a value that works for flatcar in
28-
# https://github.com/kubernetes-sigs/cluster-api-provider-openstack/pull/1564
29-
provider-id: null
26+
provider-id: openstack:///$${COREOS_OPENSTACK_INSTANCE_UUID}
3027
format: ignition
3128
ignition:
3229
containerLinuxConfig:
@@ -48,6 +45,7 @@ spec:
4845
EnvironmentFile=/run/metadata/flatcar
4946
preKubeadmCommands:
5047
- export COREOS_OPENSTACK_HOSTNAME=$${COREOS_OPENSTACK_HOSTNAME%.*}
48+
- export COREOS_OPENSTACK_INSTANCE_UUID=$${COREOS_OPENSTACK_INSTANCE_UUID}
5149
- envsubst < /etc/kubeadm.yml > /etc/kubeadm.yml.tmp
5250
- mv /etc/kubeadm.yml.tmp /etc/kubeadm.yml
5351
---
@@ -62,12 +60,10 @@ spec:
6260
nodeRegistration:
6361
name: $${COREOS_OPENSTACK_HOSTNAME}
6462
kubeletExtraArgs:
65-
# Fixme(lentzi90): This is here just to override the value set in the default
66-
# kustomization. It will be replaced with a value that works for flatcar in
67-
# https://github.com/kubernetes-sigs/cluster-api-provider-openstack/pull/1564
68-
provider-id: null
63+
provider-id: openstack:///$${COREOS_OPENSTACK_INSTANCE_UUID}
6964
preKubeadmCommands:
7065
- export COREOS_OPENSTACK_HOSTNAME=$${COREOS_OPENSTACK_HOSTNAME%.*}
66+
- export COREOS_OPENSTACK_INSTANCE_UUID=$${COREOS_OPENSTACK_INSTANCE_UUID}
7167
- envsubst < /etc/kubeadm.yml > /etc/kubeadm.yml.tmp
7268
- mv /etc/kubeadm.yml.tmp /etc/kubeadm.yml
7369
format: ignition

‎templates/cluster-template-flatcar-sysext.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,11 @@ spec:
7777
nodeRegistration:
7878
kubeletExtraArgs:
7979
cloud-provider: external
80+
provider-id: openstack:///$${COREOS_OPENSTACK_INSTANCE_UUID}
8081
name: $${COREOS_OPENSTACK_HOSTNAME}
8182
preKubeadmCommands:
8283
- export COREOS_OPENSTACK_HOSTNAME=$${COREOS_OPENSTACK_HOSTNAME%.*}
84+
- export COREOS_OPENSTACK_INSTANCE_UUID=$${COREOS_OPENSTACK_INSTANCE_UUID}
8385
- envsubst < /etc/kubeadm.yml > /etc/kubeadm.yml.tmp
8486
- mv /etc/kubeadm.yml.tmp /etc/kubeadm.yml
8587
---
@@ -201,14 +203,17 @@ spec:
201203
nodeRegistration:
202204
kubeletExtraArgs:
203205
cloud-provider: external
206+
provider-id: openstack:///$${COREOS_OPENSTACK_INSTANCE_UUID}
204207
name: $${COREOS_OPENSTACK_HOSTNAME}
205208
joinConfiguration:
206209
nodeRegistration:
207210
kubeletExtraArgs:
208211
cloud-provider: external
212+
provider-id: openstack:///$${COREOS_OPENSTACK_INSTANCE_UUID}
209213
name: $${COREOS_OPENSTACK_HOSTNAME}
210214
preKubeadmCommands:
211215
- export COREOS_OPENSTACK_HOSTNAME=$${COREOS_OPENSTACK_HOSTNAME%.*}
216+
- export COREOS_OPENSTACK_INSTANCE_UUID=$${COREOS_OPENSTACK_INSTANCE_UUID}
212217
- envsubst < /etc/kubeadm.yml > /etc/kubeadm.yml.tmp
213218
- mv /etc/kubeadm.yml.tmp /etc/kubeadm.yml
214219
machineTemplate:

‎templates/cluster-template-flatcar.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,11 @@ spec:
3939
nodeRegistration:
4040
kubeletExtraArgs:
4141
cloud-provider: external
42+
provider-id: openstack:///$${COREOS_OPENSTACK_INSTANCE_UUID}
4243
name: $${COREOS_OPENSTACK_HOSTNAME}
4344
preKubeadmCommands:
4445
- export COREOS_OPENSTACK_HOSTNAME=$${COREOS_OPENSTACK_HOSTNAME%.*}
46+
- export COREOS_OPENSTACK_INSTANCE_UUID=$${COREOS_OPENSTACK_INSTANCE_UUID}
4547
- envsubst < /etc/kubeadm.yml > /etc/kubeadm.yml.tmp
4648
- mv /etc/kubeadm.yml.tmp /etc/kubeadm.yml
4749
---
@@ -125,14 +127,17 @@ spec:
125127
nodeRegistration:
126128
kubeletExtraArgs:
127129
cloud-provider: external
130+
provider-id: openstack:///$${COREOS_OPENSTACK_INSTANCE_UUID}
128131
name: $${COREOS_OPENSTACK_HOSTNAME}
129132
joinConfiguration:
130133
nodeRegistration:
131134
kubeletExtraArgs:
132135
cloud-provider: external
136+
provider-id: openstack:///$${COREOS_OPENSTACK_INSTANCE_UUID}
133137
name: $${COREOS_OPENSTACK_HOSTNAME}
134138
preKubeadmCommands:
135139
- export COREOS_OPENSTACK_HOSTNAME=$${COREOS_OPENSTACK_HOSTNAME%.*}
140+
- export COREOS_OPENSTACK_INSTANCE_UUID=$${COREOS_OPENSTACK_INSTANCE_UUID}
136141
- envsubst < /etc/kubeadm.yml > /etc/kubeadm.yml.tmp
137142
- mv /etc/kubeadm.yml.tmp /etc/kubeadm.yml
138143
machineTemplate:

‎test/e2e/data/e2e_conf.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ variables:
214214
SSH_USER_MACHINE: "ubuntu"
215215
EXP_KUBEADM_BOOTSTRAP_FORMAT_IGNITION: "true"
216216
# The Flatcar image produced by the image-builder
217-
OPENSTACK_FLATCAR_IMAGE_NAME: "flatcar-stable-3760.2.0-kube-v1.28.5"
217+
OPENSTACK_FLATCAR_IMAGE_NAME: "flatcar-stable-3815.2.0-kube-v1.28.5"
218218
# A plain Flatcar from the Flatcar releases server
219219
FLATCAR_IMAGE_NAME: "flatcar_production_openstack_image"
220220

0 commit comments

Comments
 (0)