Skip to content

Commit 30835b5

Browse files
committed
Move flatcar-sysext to v1alpha8
This was added via v1alpha7 but the latest api is v1alpha8 and to keep our CI consistent we will move the manifests to v1alpha8.
1 parent 7edf6a1 commit 30835b5

File tree

6 files changed

+26
-18
lines changed

6 files changed

+26
-18
lines changed

kustomize/v1alpha7/flatcar-sysext/patch-flatcar.yaml renamed to kustomize/v1alpha8/flatcar-sysext/patch-flatcar.yaml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha7
2+
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha8
33
kind: OpenStackCluster
44
metadata:
55
name: ${CLUSTER_NAME}
@@ -166,20 +166,22 @@ spec:
166166
[Service]
167167
EnvironmentFile=/run/metadata/flatcar
168168
---
169-
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha7
169+
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha8
170170
kind: OpenStackMachineTemplate
171171
metadata:
172172
name: ${CLUSTER_NAME}-md-0
173173
spec:
174174
template:
175175
spec:
176-
image: ${FLATCAR_IMAGE_NAME}
176+
image:
177+
name: ${FLATCAR_IMAGE_NAME}
177178
---
178-
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha7
179+
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha8
179180
kind: OpenStackMachineTemplate
180181
metadata:
181182
name: ${CLUSTER_NAME}-control-plane
182183
spec:
183184
template:
184185
spec:
185-
image: ${FLATCAR_IMAGE_NAME}
186+
image:
187+
name: ${FLATCAR_IMAGE_NAME}

kustomize/v1alpha8/flatcar/patch-flatcar.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,8 @@ metadata:
9797
spec:
9898
template:
9999
spec:
100-
image: ${OPENSTACK_FLATCAR_IMAGE_NAME}
100+
image:
101+
name: ${OPENSTACK_FLATCAR_IMAGE_NAME}
101102
---
102103
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha8
103104
kind: OpenStackMachineTemplate
@@ -106,4 +107,5 @@ metadata:
106107
spec:
107108
template:
108109
spec:
109-
image: ${OPENSTACK_FLATCAR_IMAGE_NAME}
110+
image:
111+
name: ${OPENSTACK_FLATCAR_IMAGE_NAME}

templates/cluster-template-flatcar-sysext.yaml

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ spec:
9898
kind: KubeadmControlPlane
9999
name: ${CLUSTER_NAME}-control-plane
100100
infrastructureRef:
101-
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha7
101+
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha8
102102
kind: OpenStackCluster
103103
name: ${CLUSTER_NAME}
104104
---
@@ -121,7 +121,7 @@ spec:
121121
clusterName: ${CLUSTER_NAME}
122122
failureDomain: ${OPENSTACK_FAILURE_DOMAIN}
123123
infrastructureRef:
124-
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha7
124+
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha8
125125
kind: OpenStackMachineTemplate
126126
name: ${CLUSTER_NAME}-md-0
127127
version: ${KUBERNETES_VERSION}
@@ -213,13 +213,13 @@ spec:
213213
- mv /etc/kubeadm.yml.tmp /etc/kubeadm.yml
214214
machineTemplate:
215215
infrastructureRef:
216-
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha7
216+
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha8
217217
kind: OpenStackMachineTemplate
218218
name: ${CLUSTER_NAME}-control-plane
219219
replicas: ${CONTROL_PLANE_MACHINE_COUNT}
220220
version: ${KUBERNETES_VERSION}
221221
---
222-
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha7
222+
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha8
223223
kind: OpenStackCluster
224224
metadata:
225225
name: ${CLUSTER_NAME}
@@ -234,7 +234,7 @@ spec:
234234
managedSecurityGroups: true
235235
nodeCidr: 10.6.0.0/24
236236
---
237-
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha7
237+
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha8
238238
kind: OpenStackMachineTemplate
239239
metadata:
240240
name: ${CLUSTER_NAME}-control-plane
@@ -246,10 +246,11 @@ spec:
246246
identityRef:
247247
kind: Secret
248248
name: ${CLUSTER_NAME}-cloud-config
249-
image: ${FLATCAR_IMAGE_NAME}
249+
image:
250+
name: ${FLATCAR_IMAGE_NAME}
250251
sshKeyName: ${OPENSTACK_SSH_KEY_NAME}
251252
---
252-
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha7
253+
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha8
253254
kind: OpenStackMachineTemplate
254255
metadata:
255256
name: ${CLUSTER_NAME}-md-0
@@ -261,5 +262,6 @@ spec:
261262
identityRef:
262263
kind: Secret
263264
name: ${CLUSTER_NAME}-cloud-config
264-
image: ${FLATCAR_IMAGE_NAME}
265+
image:
266+
name: ${FLATCAR_IMAGE_NAME}
265267
sshKeyName: ${OPENSTACK_SSH_KEY_NAME}

templates/cluster-template-flatcar.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,8 @@ spec:
170170
identityRef:
171171
kind: Secret
172172
name: ${CLUSTER_NAME}-cloud-config
173-
image: ${OPENSTACK_FLATCAR_IMAGE_NAME}
173+
image:
174+
name: ${OPENSTACK_FLATCAR_IMAGE_NAME}
174175
sshKeyName: ${OPENSTACK_SSH_KEY_NAME}
175176
---
176177
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha8
@@ -185,5 +186,6 @@ spec:
185186
identityRef:
186187
kind: Secret
187188
name: ${CLUSTER_NAME}-cloud-config
188-
image: ${OPENSTACK_FLATCAR_IMAGE_NAME}
189+
image:
190+
name: ${OPENSTACK_FLATCAR_IMAGE_NAME}
189191
sshKeyName: ${OPENSTACK_SSH_KEY_NAME}

test/e2e/data/kustomize/flatcar-sysext/kustomization.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
resources:
3-
- ../../../../../kustomize/v1alpha7/flatcar-sysext
3+
- ../../../../../kustomize/v1alpha8/flatcar-sysext
44

55
components:
66
- ../common-patches/cni

0 commit comments

Comments
 (0)