From fba24a8e7157d8832c94481d58e02c88678073ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanislav=20L=C3=A1zni=C4=8Dka?= Date: Tue, 4 Nov 2025 10:11:31 +0100 Subject: [PATCH 1/3] node-conformance-e2e: finite wait for pod status MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Stanislav Láznička --- test/e2e_node/runtime_conformance_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/e2e_node/runtime_conformance_test.go b/test/e2e_node/runtime_conformance_test.go index 6a1989e1b8c..01e135e7e08 100644 --- a/test/e2e_node/runtime_conformance_test.go +++ b/test/e2e_node/runtime_conformance_test.go @@ -147,7 +147,7 @@ var _ = SIGDescribe("Container Runtime Conformance Test", func() { ginkgo.By("check the container status") var latestErr error - err = wait.PollUntilContextCancel(ctx, node.ContainerStatusPollInterval, true, func(ctx context.Context) (bool, error) { + err = wait.PollUntilContextTimeout(ctx, node.ContainerStatusPollInterval, node.ContainerStatusRetryTimeout, true, func(ctx context.Context) (bool, error) { if latestErr = checkContainerStatus(ctx); latestErr != nil { return false, nil } From a275785bd4f1bcc051d1d57c959174f7d306c2e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanislav=20L=C3=A1zni=C4=8Dka?= Date: Tue, 4 Nov 2025 11:55:48 +0100 Subject: [PATCH 2/3] node conformance e2e: log fake registry creds on test failure --- test/e2e/framework/registry/registry.go | 2 +- test/e2e_node/runtime_conformance_test.go | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/test/e2e/framework/registry/registry.go b/test/e2e/framework/registry/registry.go index 698a9dcbc4d..5682b78af99 100644 --- a/test/e2e/framework/registry/registry.go +++ b/test/e2e/framework/registry/registry.go @@ -137,7 +137,7 @@ func User1DockerSecret(registryAddress string) *v1.Secret { return &v1.Secret{ Type: v1.SecretTypeDockerConfigJson, Data: map[string][]byte{ - v1.DockerConfigJsonKey: fmt.Appendf(nil, dockerCredsFmt, "http://"+registryAddress, user1creds), + v1.DockerConfigJsonKey: fmt.Appendf(nil, dockerCredsFmt, registryAddress, user1creds), }, } } diff --git a/test/e2e_node/runtime_conformance_test.go b/test/e2e_node/runtime_conformance_test.go index 01e135e7e08..b40c6fd7320 100644 --- a/test/e2e_node/runtime_conformance_test.go +++ b/test/e2e_node/runtime_conformance_test.go @@ -154,6 +154,8 @@ var _ = SIGDescribe("Container Runtime Conformance Test", func() { return true, nil }) if err != nil { + credsContent, readErr := os.ReadFile(configFile) + framework.Logf("credentials read error: %v; credentials used:\n%v", readErr, credsContent) framework.Failf("Failed to read container status: %v; last observed error from wait loop: %v", err, latestErr) } }) From ed62db7acf382ba58d42827a3631feaa60bbb23b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanislav=20L=C3=A1zni=C4=8Dka?= Date: Tue, 4 Nov 2025 15:38:32 +0100 Subject: [PATCH 3/3] e2e registry: run as pods even in seemingly in-cluster pull tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Stanislav Láznička --- test/e2e/common/node/runtime.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/e2e/common/node/runtime.go b/test/e2e/common/node/runtime.go index 7dd432bcd12..19c54050615 100644 --- a/test/e2e/common/node/runtime.go +++ b/test/e2e/common/node/runtime.go @@ -263,7 +263,7 @@ while true; do sleep 1; done ginkgo.BeforeEach(func(ctx context.Context) { var err error - registryAddress, _, err = e2eregistry.SetupRegistry(ctx, f, false) + registryAddress, _, err = e2eregistry.SetupRegistry(ctx, f, true) framework.ExpectNoError(err) // we need to wait for the registry to be removed and so we need to delete the whole NS ourselves ginkgo.DeferCleanup(func(ctx context.Context) {