github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-26 13:07:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #110465 from bertinatto/e2e-populator-fix

Browse Source 
e2e: ensure single image for populator containers
This commit is contained in:
Kubernetes Prow Robot 2022-06-13 06:44:11 -07:00 committed by GitHub
commit 61a0ee5588
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
test/e2e/storage/testsuites/provisioning.go
View File

@ -301,20 +301,27 @@ func (p *provisioningTestSuite) DefineTests(driver storageframework.TestDriver,
for i, container := range item.Spec.Template.Spec.Containers { for i, container := range item.Spec.Template.Spec.Containers {
switch container.Name { switch container.Name {
case "hello": case "hello":
var found bool
args := []string{} args := []string{}
var foundNS, foundImage bool
for _, arg := range container.Args { for _, arg := range container.Args {
if strings.HasPrefix(arg, "--namespace=") { if strings.HasPrefix(arg, "--namespace=") {
args = append(args, fmt.Sprintf("--namespace=%s", popNamespace.Name)) 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 { } else {
args = append(args, arg) args = append(args, arg)
} }
} }
if !found { if !foundNS {
args = append(args, fmt.Sprintf("--namespace=%s", popNamespace.Name)) args = append(args, fmt.Sprintf("--namespace=%s", popNamespace.Name))
framework.Logf("container name: %s", container.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 container.Args = args
item.Spec.Template.Spec.Containers[i] = container item.Spec.Template.Spec.Containers[i] = container
default: default: