Merge pull request #12907 from chrischdi/pr-e2e-self-hosted-fix-preload

k8s-ci-robot · web-flow · commit 08b15d92faf7 · 2025-10-29T06:32:04.000-07:00
🌱 e2e: fix self-hosted to actually read DOCKER_PRELOAD_IMAGES from the e2e config
diff --git a/test/e2e/self_hosted.go b/test/e2e/self_hosted.go
@@ -161,7 +161,7 @@ func SelfHostedSpec(ctx context.Context, inputGetter func() SelfHostedSpecInput)
 		// controller images into the nodes.
 		if hasDockerInfrastructureProvider {
 			images := []string{}
-			if preloadList := strings.TrimSuffix(strings.TrimPrefix(clusterctlVariables["DOCKER_PRELOAD_IMAGES"], "["), "]"); preloadList != "" {
+			if preloadList := strings.TrimSuffix(strings.TrimPrefix(input.E2EConfig.GetVariableOrEmpty("DOCKER_PRELOAD_IMAGES"), "["), "]"); preloadList != "" {
 				images = strings.Split(preloadList, ",")
 			}
 			for _, image := range input.E2EConfig.Images {

Original file line number	Diff line number	Diff line change
`@@ -161,7 +161,7 @@ func SelfHostedSpec(ctx context.Context, inputGetter func() SelfHostedSpecInput)`
`161`	`161`	`// controller images into the nodes.`
`162`	`162`	`if hasDockerInfrastructureProvider {`
`163`	`163`	`images := []string{}`
`164`		`- if preloadList := strings.TrimSuffix(strings.TrimPrefix(clusterctlVariables["DOCKER_PRELOAD_IMAGES"], "["), "]"); preloadList != "" {`
	`164`	`+ if preloadList := strings.TrimSuffix(strings.TrimPrefix(input.E2EConfig.GetVariableOrEmpty("DOCKER_PRELOAD_IMAGES"), "["), "]"); preloadList != "" {`
`165`	`165`	`images = strings.Split(preloadList, ",")`
`166`	`166`	`}`
`167`	`167`	`for _, image := range input.E2EConfig.Images {`