Skip to content

Commit 645741c

Browse files
authored
Merge pull request #1916 from shiftstack/fixCloudname
🐛 ci: fix upgrades by dropping cloudName
2 parents c4fe920 + 412cae3 commit 645741c

File tree

2 files changed

+0
-12
lines changed

2 files changed

+0
-12
lines changed

test/e2e/data/kustomize/k8s-upgrade/upgrade-from-template.yaml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,7 @@ metadata:
66
spec:
77
template:
88
spec:
9-
cloudName: ${OPENSTACK_CLOUD}
109
flavor: ${OPENSTACK_CONTROL_PLANE_MACHINE_FLAVOR}
11-
identityRef:
12-
name: ${CLUSTER_NAME}-cloud-config
1310
image:
1411
name: ${OPENSTACK_IMAGE_NAME_UPGRADE_FROM}
1512
sshKeyName: ${OPENSTACK_SSH_KEY_NAME}
@@ -23,10 +20,7 @@ metadata:
2320
spec:
2421
template:
2522
spec:
26-
cloudName: ${OPENSTACK_CLOUD}
2723
flavor: ${OPENSTACK_NODE_MACHINE_FLAVOR}
28-
identityRef:
29-
name: ${CLUSTER_NAME}-cloud-config
3024
image:
3125
name: ${OPENSTACK_IMAGE_NAME_UPGRADE_FROM}
3226
sshKeyName: ${OPENSTACK_SSH_KEY_NAME}

test/e2e/data/kustomize/k8s-upgrade/upgrade-to-template.yaml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,7 @@ metadata:
1313
spec:
1414
template:
1515
spec:
16-
cloudName: ${OPENSTACK_CLOUD}
1716
flavor: ${OPENSTACK_CONTROL_PLANE_MACHINE_FLAVOR}
18-
identityRef:
19-
name: ${CLUSTER_NAME}-cloud-config
2017
image:
2118
name: ${OPENSTACK_IMAGE_NAME}
2219
sshKeyName: ${OPENSTACK_SSH_KEY_NAME}
@@ -32,10 +29,7 @@ metadata:
3229
spec:
3330
template:
3431
spec:
35-
cloudName: ${OPENSTACK_CLOUD}
3632
flavor: ${OPENSTACK_NODE_MACHINE_FLAVOR}
37-
identityRef:
38-
name: ${CLUSTER_NAME}-cloud-config
3933
image:
4034
name: ${OPENSTACK_IMAGE_NAME}
4135
sshKeyName: ${OPENSTACK_SSH_KEY_NAME}

0 commit comments

Comments
 (0)