upstream/kubernetes
1
0
Fork 0
mirror of https://github.com/kubernetes/kubernetes.git synced 2026-05-28 04:04:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #135094 from stlaz/fix-node-conformance-failures

Browse source 
Fix failures in node-e2e image pull tests
This commit is contained in:
Kubernetes Prow Robot 2025-11-04 14:32:11 -08:00 committed by GitHub
commit dec78c833d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
test/e2e/common/node/runtime.go
View file

@ -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) {

2
test/e2e/framework/registry/registry.go
View file

@ -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),
},
}
}

4
test/e2e_node/runtime_conformance_test.go
View file

@ -147,13 +147,15 @@ 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
}
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)
}
})