From 1f876c27efcee5eeef44b616a630298369a60435 Mon Sep 17 00:00:00 2001 From: Marco Nenciarini Date: Fri, 10 Apr 2026 18:11:47 +0200 Subject: [PATCH] fix(e2e): use correct image name in kustomize overlay Closes #840 The e2e kustomize overlay matches docker.io/library/plugin-barman-cloud but the base kustomization at kubernetes/kustomization.yaml matches the bare plugin-barman-cloud name from kubernetes/deployment.yaml and replaces it with the GHCR image. Since the overlay name never matches, the locally-built image is never deployed and e2e tests always run against the main branch code from GHCR. Use the bare image name so the overlay rule overrides the base rule. Broken since b7daaac (#89) changed the base kustomization's newName from docker.io/library/plugin-barman-cloud to the GHCR image without updating the e2e overlay. Signed-off-by: Marco Nenciarini --- kubernetes/kustomization.yaml | 1 + test/e2e/e2e_suite_test.go | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/kubernetes/kustomization.yaml b/kubernetes/kustomization.yaml index b4ebc9e..eda8b8c 100644 --- a/kubernetes/kustomization.yaml +++ b/kubernetes/kustomization.yaml @@ -9,6 +9,7 @@ resources: - service.yaml - ../config/crd - ../config/rbac +# If you change newName, update the e2e overlay in test/e2e/e2e_suite_test.go too. images: - name: plugin-barman-cloud newName: ghcr.io/cloudnative-pg/plugin-barman-cloud-testing diff --git a/test/e2e/e2e_suite_test.go b/test/e2e/e2e_suite_test.go index 5baeff8..bbf7b90 100644 --- a/test/e2e/e2e_suite_test.go +++ b/test/e2e/e2e_suite_test.go @@ -58,9 +58,11 @@ var _ = SynchronizedBeforeSuite(func(ctx SpecContext) []byte { const barmanCloudKustomizationPath = "./kustomize/kubernetes/" barmanCloudKustomization := &kustomizeTypes.Kustomization{ Resources: []string{barmanCloudKustomizationPath}, + // Override the image from the base kustomization (kubernetes/kustomization.yaml) + // with the locally-built one. The Name must match the newName in the base. Images: []kustomizeTypes.Image{ { - Name: "docker.io/library/plugin-barman-cloud", + Name: "ghcr.io/cloudnative-pg/plugin-barman-cloud-testing", NewName: "registry.barman-cloud-plugin:5000/plugin-barman-cloud", NewTag: "testing", },