Skip to content

Add pull secret credentials #254

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alicefr wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Add pull secret credentials #254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0c74f2f
Require E2E_NODE_IMAGE_UPDATE2_REF for EKS
alicefr Oct 22, 2026
00d071a
Support pre-built pull secret via E2E_NODE_PULL_SECRET
alicefr Oct 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@ EKS_NODE_IMAGE_UPDATE2_REF ?=
EKS_REGISTRY_HOST ?=
EKS_REGISTRY_USER ?=
EKS_REGISTRY_PASSWORD ?=
EKS_NODE_PULL_SECRET ?=

.PHONY: e2e-eks
e2e-eks: ## Run e2e tests against EKS. V=1 for verbose. RUN=<regex> to filter.
Expand All @@ -145,6 +146,7 @@ e2e-eks: ## Run e2e tests against EKS. V=1 for verbose. RUN=<regex> to filter.
E2E_REGISTRY_HOST="$(EKS_REGISTRY_HOST)" \
E2E_REGISTRY_USER="$(EKS_REGISTRY_USER)" \
E2E_REGISTRY_PASSWORD="$(EKS_REGISTRY_PASSWORD)" \
E2E_NODE_PULL_SECRET="$(EKS_NODE_PULL_SECRET)" \
ARTIFACTS="$(ARTIFACTS)" \
go test -timeout 30m -count=1 -parallel 2 $(if $(V),-v) $(if $(RUN),-run '$(RUN)') .

Expand Down
27 changes: 18 additions & 9 deletions test/e2e/e2eutil/env.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ func New(t *testing.T) *Env {
case "eks":
nodeImageRef = requireEnv(t, "E2E_NODE_IMAGE_REF")
updateRef = requireEnv(t, "E2E_NODE_IMAGE_UPDATE_REF")
update2Ref = os.Getenv("E2E_NODE_IMAGE_UPDATE2_REF")
update2Ref = requireEnv(t, "E2E_NODE_IMAGE_UPDATE2_REF")
registryHost = os.Getenv("E2E_REGISTRY_HOST")
if registryHost == "" {
registryHost = extractRegistryHost(updateRef)
Expand Down Expand Up @@ -358,13 +358,22 @@ func (e *Env) RegistryPassword() string {
func (e *Env) createNodePullSecret(t *testing.T) {
t.Helper()

authStr := base64.StdEncoding.EncodeToString(
[]byte(e.registryUser + ":" + e.registryPassword),
)
dockerCfg := fmt.Sprintf(
`{"auths":{%q:{"auth":"%s"}}}`,
e.registryHost, authStr,
)
var dockerCfgBytes []byte
if envSecret := os.Getenv("E2E_NODE_PULL_SECRET"); envSecret != "" {
var err error
dockerCfgBytes, err = base64.StdEncoding.DecodeString(envSecret)
if err != nil {
t.Fatalf("decoding E2E_NODE_PULL_SECRET: %v", err)
}
} else {
authStr := base64.StdEncoding.EncodeToString(
[]byte(e.registryUser + ":" + e.registryPassword),
)
dockerCfgBytes = []byte(fmt.Sprintf(
`{"auths":{%q:{"auth":"%s"}}}`,
e.registryHost, authStr,
))
}

secretName := e.testID + "-node-pull-secret"
secret := &corev1.Secret{
Expand All @@ -374,7 +383,7 @@ func (e *Env) createNodePullSecret(t *testing.T) {
},
Type: corev1.SecretTypeDockerConfigJson,
Data: map[string][]byte{
corev1.DockerConfigJsonKey: []byte(dockerCfg),
corev1.DockerConfigJsonKey: dockerCfgBytes,
},
}

Expand Down
Loading