Skip to content

Commit fcbea21

Browse files
committed
Fix manifest generation errors
1 parent 62b48d8 commit fcbea21

File tree

8 files changed

+40
-20
lines changed

8 files changed

+40
-20
lines changed

test/e2e/data/infrastructure-cloudstack/v1beta1/bases/cluster-with-kcp.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,9 @@ metadata:
6666
spec:
6767
template:
6868
spec:
69-
offering: ${CLOUDSTACK_CONTROL_PLANE_MACHINE_OFFERING}
70-
template: ${CLOUDSTACK_TEMPLATE_NAME}
69+
offering:
70+
name: ${CLOUDSTACK_CONTROL_PLANE_MACHINE_OFFERING}
71+
template:
72+
name: ${CLOUDSTACK_TEMPLATE_NAME}
7173
sshKey: ${CLOUDSTACK_SSH_KEY_NAME}
7274
---

test/e2e/data/infrastructure-cloudstack/v1beta1/bases/md.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,10 @@ metadata:
2929
spec:
3030
template:
3131
spec:
32-
offering: ${CLOUDSTACK_WORKER_MACHINE_OFFERING}
33-
template: ${CLOUDSTACK_TEMPLATE_NAME}
32+
offering:
33+
name: ${CLOUDSTACK_WORKER_MACHINE_OFFERING}
34+
template:
35+
name: ${CLOUDSTACK_TEMPLATE_NAME}
3436
sshKey: ${CLOUDSTACK_SSH_KEY_NAME}
3537
---
3638
apiVersion: bootstrap.cluster.x-k8s.io/v1beta1

test/e2e/data/infrastructure-cloudstack/v1beta1/cluster-template-affinity-group-anti/md.yaml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,10 @@ metadata:
66
spec:
77
template:
88
spec:
9-
offering: ${CLOUDSTACK_CONTROL_PLANE_MACHINE_OFFERING}
10-
template: ${CLOUDSTACK_TEMPLATE_NAME}
9+
offering:
10+
name: ${CLOUDSTACK_CONTROL_PLANE_MACHINE_OFFERING}
11+
template:
12+
name: ${CLOUDSTACK_TEMPLATE_NAME}
1113
sshKey: ${CLOUDSTACK_SSH_KEY_NAME}
1214
affinity: anti
1315
---
@@ -18,7 +20,9 @@ metadata:
1820
spec:
1921
template:
2022
spec:
21-
offering: ${CLOUDSTACK_WORKER_MACHINE_OFFERING}
22-
template: ${CLOUDSTACK_TEMPLATE_NAME}
23+
offering:
24+
name: ${CLOUDSTACK_WORKER_MACHINE_OFFERING}
25+
template:
26+
name: ${CLOUDSTACK_TEMPLATE_NAME}
2327
sshKey: ${CLOUDSTACK_SSH_KEY_NAME}
2428
affinity: anti

test/e2e/data/infrastructure-cloudstack/v1beta1/cluster-template-affinity-group-pro/md.yaml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,10 @@ metadata:
66
spec:
77
template:
88
spec:
9-
offering: ${CLOUDSTACK_CONTROL_PLANE_MACHINE_OFFERING}
10-
template: ${CLOUDSTACK_TEMPLATE_NAME}
9+
offering:
10+
name: ${CLOUDSTACK_CONTROL_PLANE_MACHINE_OFFERING}
11+
template:
12+
name: ${CLOUDSTACK_TEMPLATE_NAME}
1113
sshKey: ${CLOUDSTACK_SSH_KEY_NAME}
1214
affinity: pro
1315
---
@@ -18,7 +20,9 @@ metadata:
1820
spec:
1921
template:
2022
spec:
21-
offering: ${CLOUDSTACK_WORKER_MACHINE_OFFERING}
22-
template: ${CLOUDSTACK_TEMPLATE_NAME}
23+
offering:
24+
name: ${CLOUDSTACK_WORKER_MACHINE_OFFERING}
25+
template:
26+
name: ${CLOUDSTACK_TEMPLATE_NAME}
2327
sshKey: ${CLOUDSTACK_SSH_KEY_NAME}
2428
affinity: pro

test/e2e/data/infrastructure-cloudstack/v1beta1/cluster-template-insufficient-compute-resources/md.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ metadata:
55
spec:
66
template:
77
spec:
8-
offering: ${CLOUDSTACK_EXTREMELY_LARGE_CONTROL_PLANE_MACHINE_OFFERING}
9-
template: ${CLOUDSTACK_TEMPLATE_NAME}
8+
offering:
9+
name: ${CLOUDSTACK_EXTREMELY_LARGE_CONTROL_PLANE_MACHINE_OFFERING}
10+
template:
11+
name: ${CLOUDSTACK_TEMPLATE_NAME}
1012
sshKey: ${CLOUDSTACK_SSH_KEY_NAME}

test/e2e/data/infrastructure-cloudstack/v1beta1/cluster-template-invalid-cp-offering/md.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ metadata:
55
spec:
66
template:
77
spec:
8-
offering: ${CLOUDSTACK_INVALID_CONTROL_PLANE_MACHINE_OFFERING}
9-
template: ${CLOUDSTACK_TEMPLATE_NAME}
8+
offering:
9+
name: ${CLOUDSTACK_INVALID_CONTROL_PLANE_MACHINE_OFFERING}
10+
template:
11+
name: ${CLOUDSTACK_TEMPLATE_NAME}
1012
sshKey: ${CLOUDSTACK_SSH_KEY_NAME}

test/e2e/data/infrastructure-cloudstack/v1beta1/cluster-template-invalid-template/md.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ metadata:
55
spec:
66
template:
77
spec:
8-
offering: ${CLOUDSTACK_CONTROL_PLANE_MACHINE_OFFERING}
9-
template: ${CLOUDSTACK_INVALID_TEMPLATE_NAME}
8+
offering:
9+
name: ${CLOUDSTACK_CONTROL_PLANE_MACHINE_OFFERING}
10+
template:
11+
name: ${CLOUDSTACK_INVALID_TEMPLATE_NAME}
1012
sshKey: ${CLOUDSTACK_SSH_KEY_NAME}

test/e2e/data/infrastructure-cloudstack/v1beta1/cluster-template-invalid-worker-offering/md.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ metadata:
55
spec:
66
template:
77
spec:
8-
offering: ${CLOUDSTACK_INVALID_WORKER_MACHINE_OFFERING}
9-
template: ${CLOUDSTACK_TEMPLATE_NAME}
8+
offering:
9+
name: ${CLOUDSTACK_INVALID_WORKER_MACHINE_OFFERING}
10+
template:
11+
name: ${CLOUDSTACK_TEMPLATE_NAME}
1012
sshKey: ${CLOUDSTACK_SSH_KEY_NAME}

0 commit comments

Comments
 (0)