Skip to content

Commit d22f12b

Browse files
rbjorklinrbjorklin
committed
fix: align test value declaration with chart changes
1 parent 53ee5aa commit d22f12b

File tree

1 file changed

+85
-53
lines changed

1 file changed

+85
-53
lines changed

‎test/e2e/helm_test.go‎

Lines changed: 85 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -148,13 +148,23 @@ var _ = Describe("Create a proper set of manifests when using helm charts", func
148148

149149
It("should deploy all providers with custom namespace and versions", func() {
150150
manifests, err := helmChart.Run(map[string]string{
151-
"configSecret.name": "test-secret-name",
152-
"configSecret.namespace": "test-secret-namespace",
153-
"core": "capi-custom-ns:cluster-api:v1.7.7",
154-
"controlPlane": "kubeadm-control-plane-custom-ns:kubeadm:v1.7.7",
155-
"bootstrap": "kubeadm-bootstrap-custom-ns:kubeadm:v1.7.7",
156-
"infrastructure": "capd-custom-ns:docker:v1.7.7",
157-
"addon": "helm-custom-ns:helm:v0.2.6",
151+
"configSecret.name": "test-secret-name",
152+
"configSecret.namespace": "test-secret-namespace",
153+
"core.name": "cluster-api",
154+
"core.namespace": "capi-custom-ns",
155+
"core.version": "v1.7.7",
156+
"controlPlane[0].name": "kubeadm",
157+
"controlPlane[0].namespace": "kubeadm-control-plane-custom-ns",
158+
"controlPlane[0].version": "v1.7.7",
159+
"bootstrap[0].name": "kubeadm",
160+
"bootstrap[0].namespace": "kubeadm-bootstrap-custom-ns",
161+
"bootstrap[0].version": "v1.7.7",
162+
"infrastructure[0].name": "docker",
163+
"infrastructure[0].namespace": "capd-custom-ns",
164+
"infrastructure[0].version": "v1.7.7",
165+
"addon[0].name": "helm",
166+
"addon[0].namespace": "helm-custom-ns",
167+
"addon[0].version": "v0.2.6",
158168
})
159169
Expect(err).ToNot(HaveOccurred())
160170
Expect(manifests).ToNot(BeEmpty())
@@ -165,13 +175,18 @@ var _ = Describe("Create a proper set of manifests when using helm charts", func
165175

166176
It("should deploy all providers with custom versions", func() {
167177
manifests, err := helmChart.Run(map[string]string{
168-
"configSecret.name": "test-secret-name",
169-
"configSecret.namespace": "test-secret-namespace",
170-
"core": "cluster-api:v1.7.7",
171-
"controlPlane": "kubeadm:v1.7.7",
172-
"bootstrap": "kubeadm:v1.7.7",
173-
"infrastructure": "docker:v1.7.7",
174-
"addon": "helm:v0.2.6",
178+
"configSecret.name": "test-secret-name",
179+
"configSecret.namespace": "test-secret-namespace",
180+
"core.name": "cluster-api",
181+
"core.version": "v1.7.7",
182+
"controlPlane[0].name": "kubeadm",
183+
"controlPlane[0].version": "v1.7.7",
184+
"bootstrap[0].name": "kubeadm",
185+
"bootstrap[0].version": "v1.7.7",
186+
"infrastructure[0].name": "docker",
187+
"infrastructure[0].version": "v1.7.7",
188+
"addon[0].name": "helm",
189+
"addon[0].version": "v0.2.6",
175190
})
176191
Expect(err).ToNot(HaveOccurred())
177192
Expect(manifests).ToNot(BeEmpty())
@@ -184,11 +199,11 @@ var _ = Describe("Create a proper set of manifests when using helm charts", func
184199
manifests, err := helmChart.Run(map[string]string{
185200
"configSecret.name": "test-secret-name",
186201
"configSecret.namespace": "test-secret-namespace",
187-
"core": "cluster-api",
188-
"controlPlane": "kubeadm",
189-
"bootstrap": "kubeadm",
190-
"infrastructure": "docker",
191-
"addon": "helm",
202+
"core.name": "cluster-api",
203+
"controlPlane[0].name": "kubeadm",
204+
"bootstrap[0].name": "kubeadm",
205+
"infrastructure[0].name": "docker",
206+
"addon[0].name": "helm",
192207
})
193208
Expect(err).ToNot(HaveOccurred())
194209
Expect(manifests).ToNot(BeEmpty())
@@ -201,7 +216,7 @@ var _ = Describe("Create a proper set of manifests when using helm charts", func
201216
manifests, err := helmChart.Run(map[string]string{
202217
"configSecret.name": "test-secret-name",
203218
"configSecret.namespace": "test-secret-namespace",
204-
"infrastructure": "docker",
219+
"infrastructure[0].name": "docker",
205220
})
206221
Expect(err).ToNot(HaveOccurred())
207222
Expect(manifests).ToNot(BeEmpty())
@@ -214,7 +229,7 @@ var _ = Describe("Create a proper set of manifests when using helm charts", func
214229
manifests, err := helmChart.Run(map[string]string{
215230
"configSecret.name": "test-secret-name",
216231
"configSecret.namespace": "test-secret-namespace",
217-
"bootstrap": "kubeadm",
232+
"bootstrap[0].name": "kubeadm",
218233
})
219234
Expect(err).ToNot(HaveOccurred())
220235
Expect(manifests).ToNot(BeEmpty())
@@ -227,7 +242,7 @@ var _ = Describe("Create a proper set of manifests when using helm charts", func
227242
manifests, err := helmChart.Run(map[string]string{
228243
"configSecret.name": "test-secret-name",
229244
"configSecret.namespace": "test-secret-namespace",
230-
"controlPlane": "kubeadm",
245+
"controlPlane[0].name": "kubeadm",
231246
})
232247
Expect(err).ToNot(HaveOccurred())
233248
Expect(manifests).ToNot(BeEmpty())
@@ -238,9 +253,14 @@ var _ = Describe("Create a proper set of manifests when using helm charts", func
238253

239254
It("should deploy multiple infra providers with custom namespace and versions", func() {
240255
manifests, err := helmChart.Run(map[string]string{
241-
"configSecret.name": "test-secret-name",
242-
"configSecret.namespace": "test-secret-namespace",
243-
"infrastructure": "capd-custom-ns:docker:v1.7.7;capz-custom-ns:azure:v1.10.0",
256+
"configSecret.name": "test-secret-name",
257+
"configSecret.namespace": "test-secret-namespace",
258+
"infrastructure[0].name": "docker",
259+
"infrastructure[0].namespace": "capd-custom-ns",
260+
"infrastructure[0].version": "v1.7.7",
261+
"infrastructure[1].name": "azure",
262+
"infrastructure[1].namespace": "capz-custom-ns",
263+
"infrastructure[1].version": "v1.10.0",
244264
})
245265
Expect(err).ToNot(HaveOccurred())
246266
Expect(manifests).ToNot(BeEmpty())
@@ -251,9 +271,14 @@ var _ = Describe("Create a proper set of manifests when using helm charts", func
251271

252272
It("should deploy multiple control plane providers with custom namespace and versions", func() {
253273
manifests, err := helmChart.Run(map[string]string{
254-
"configSecret.name": "test-secret-name",
255-
"configSecret.namespace": "test-secret-namespace",
256-
"controlPlane": "kubeadm-control-plane-custom-ns:kubeadm:v1.7.7;rke2-control-plane-custom-ns:rke2:v0.8.0",
274+
"configSecret.name": "test-secret-name",
275+
"configSecret.namespace": "test-secret-namespace",
276+
"controlPlane[0].name": "kubeadm",
277+
"controlPlane[0].namespace": "kubeadm-control-plane-custom-ns",
278+
"controlPlane[0].version": "v1.7.7",
279+
"controlPlane[1].name": "rke2",
280+
"controlPlane[1].namespace": "rke2-control-plane-custom-ns",
281+
"controlPlane[1].version": "v0.8.0",
257282
})
258283
Expect(err).ToNot(HaveOccurred())
259284
Expect(manifests).ToNot(BeEmpty())
@@ -266,7 +291,12 @@ var _ = Describe("Create a proper set of manifests when using helm charts", func
266291
manifests, err := helmChart.Run(map[string]string{
267292
"configSecret.name": "test-secret-name",
268293
"configSecret.namespace": "test-secret-namespace",
269-
"bootstrap": "kubeadm-bootstrap-custom-ns:kubeadm:v1.7.7;rke2-bootstrap-custom-ns:rke2:v0.8.0",
294+
"bootstrap[0].name": "kubeadm",
295+
"bootstrap[0].namespace": "kubeadm-bootstrap-custom-ns",
296+
"bootstrap[0].version": "v1.7.7",
297+
"bootstrap[1].name": "rke2",
298+
"bootstrap[1].namespace": "rke2-bootstrap-custom-ns",
299+
"bootstrap[1].version": "v0.8.0",
270300
})
271301
Expect(err).ToNot(HaveOccurred())
272302
Expect(manifests).ToNot(BeEmpty())
@@ -279,7 +309,7 @@ var _ = Describe("Create a proper set of manifests when using helm charts", func
279309
manifests, err := helmChart.Run(map[string]string{
280310
"configSecret.name": "test-secret-name",
281311
"configSecret.namespace": "test-secret-namespace",
282-
"addon": "helm",
312+
"addon[0].name": "helm",
283313
})
284314
Expect(err).ToNot(HaveOccurred())
285315
Expect(manifests).ToNot(BeEmpty())
@@ -292,8 +322,8 @@ var _ = Describe("Create a proper set of manifests when using helm charts", func
292322
manifests, err := helmChart.Run(map[string]string{
293323
"configSecret.name": "test-secret-name",
294324
"configSecret.namespace": "test-secret-namespace",
295-
"infrastructure": "docker",
296-
"addon": "helm",
325+
"infrastructure[0].name": "docker",
326+
"addon[0].name": "helm",
297327
})
298328
Expect(err).ToNot(HaveOccurred())
299329
Expect(manifests).ToNot(BeEmpty())
@@ -303,14 +333,16 @@ var _ = Describe("Create a proper set of manifests when using helm charts", func
303333
})
304334
It("should deploy core and infra with feature gates enabled", func() {
305335
manifests, err := helmChart.Run(map[string]string{
306-
"configSecret.name": "aws-variables",
307-
"configSecret.namespace": "default",
308-
"infrastructure": "aws:v2.4.0",
309-
"addon": "helm:",
310-
"image.manager.tag": "v0.9.1",
311-
"cert-manager.enabled": "false",
312-
"cert-manager.installCRDs": "false",
313-
"core": "cluster-api:v1.6.2",
336+
"configSecret.name": "aws-variables",
337+
"configSecret.namespace": "default",
338+
"infrastructure[0].name": "aws",
339+
"infrastructure[0].version": "v2.4.0",
340+
"addon[0].name": "helm",
341+
"image.manager.tag": "v0.9.1",
342+
"cert-manager.enabled": "false",
343+
"cert-manager.installCRDs": "false",
344+
"core.name": "cluster-api",
345+
"core.version": "v1.6.2",
314346
"manager.featureGates.core.ClusterTopology": "true",
315347
"manager.featureGates.core.MachinePool": "true",
316348
"manager.featureGates.aws.ClusterTopology": "true",
@@ -328,9 +360,9 @@ var _ = Describe("Create a proper set of manifests when using helm charts", func
328360
manifests, err := helmChart.Run(map[string]string{
329361
"configSecret.name": "test-secret-name",
330362
"configSecret.namespace": "test-secret-namespace",
331-
"core": "cluster-api",
332-
"infrastructure": "azure",
333-
"addon": "helm",
363+
"core.name": "cluster-api",
364+
"infrastructure[0].name": "azure",
365+
"addon[0].name": "helm",
334366
"manager.cert-manager.enabled": "false",
335367
"manager.cert-manager.installCRDs": "false",
336368
})
@@ -342,11 +374,11 @@ var _ = Describe("Create a proper set of manifests when using helm charts", func
342374
})
343375
It("should deploy all providers when manager is defined but another infrastructure spec field is defined", func() {
344376
manifests, err := helmChart.Run(map[string]string{
345-
"core": "cluster-api",
346-
"controlPlane": "kubeadm",
347-
"bootstrap": "kubeadm",
348-
"infrastructure": "docker",
349-
"addon": "helm",
377+
"core.name": "cluster-api",
378+
"controlPlane[0].name": "kubeadm",
379+
"bootstrap[0].name": "kubeadm",
380+
"infrastructure[0].name": "docker",
381+
"addon[0].name": "helm",
350382
"manager.featureGates.core.ClusterTopology": "true",
351383
"manager.featureGates.core.MachinePool": "true",
352384
})
@@ -358,11 +390,11 @@ var _ = Describe("Create a proper set of manifests when using helm charts", func
358390
})
359391
It("should deploy kubeadm control plane with manager specified", func() {
360392
manifests, err := helmChart.Run(map[string]string{
361-
"core": "cluster-api",
362-
"controlPlane": "kubeadm",
363-
"bootstrap": "kubeadm",
364-
"infrastructure": "docker",
365-
"addon": "helm",
393+
"core.name": "cluster-api",
394+
"controlPlane[0].name": "kubeadm",
395+
"bootstrap[0].name": "kubeadm",
396+
"infrastructure[0].name": "docker",
397+
"addon[0].name": "helm",
366398
"manager.featureGates.kubeadm.ClusterTopology": "true",
367399
"manager.featureGates.kubeadm.MachinePool": "true",
368400
})

0 commit comments

Comments
 (0)