From 9ef5c4e03a2f6c093805a219cfd3397452566003 Mon Sep 17 00:00:00 2001 From: Fabio Bertinatto Date: Wed, 8 Jun 2022 15:08:21 -0300 Subject: [PATCH] e2e: ensure single image for populator containers This is useful in environments where the Deployment image is replaced by another image from an internal registry (via fixture). In that case, the populator running in populate mode should use the same image as the populator running in controller mode. --- test/e2e/storage/testsuites/provisioning.go | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/test/e2e/storage/testsuites/provisioning.go b/test/e2e/storage/testsuites/provisioning.go index b083b029414..39f82172f49 100644 --- a/test/e2e/storage/testsuites/provisioning.go +++ b/test/e2e/storage/testsuites/provisioning.go @@ -301,20 +301,27 @@ func (p *provisioningTestSuite) DefineTests(driver storageframework.TestDriver, for i, container := range item.Spec.Template.Spec.Containers { switch container.Name { case "hello": - var found bool args := []string{} + var foundNS, foundImage bool for _, arg := range container.Args { if strings.HasPrefix(arg, "--namespace=") { args = append(args, fmt.Sprintf("--namespace=%s", popNamespace.Name)) - found = true + foundNS = true + } else if strings.HasPrefix(arg, "--image-name=") { + args = append(args, fmt.Sprintf("--image-name=%s", container.Image)) + foundImage = true } else { args = append(args, arg) } } - if !found { + if !foundNS { args = append(args, fmt.Sprintf("--namespace=%s", popNamespace.Name)) framework.Logf("container name: %s", container.Name) } + if !foundImage { + args = append(args, fmt.Sprintf("--image-name=%s", container.Image)) + framework.Logf("container image: %s", container.Image) + } container.Args = args item.Spec.Template.Spec.Containers[i] = container default: