Merge branch 'master' into PROJQUAY-6672

quay · Jul 11, 2024 · cd484e9 · cd484e9
2 parents 84e5ac2 + bf69ccb
commit cd484e9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/pkg/kustomize/kustomize.go b/pkg/kustomize/kustomize.go
@@ -436,7 +436,7 @@ func KustomizationFor(
 	}
 
 	if ctx.NeedsPgUpgrade {
-		componentPaths = append(componentPaths, "../components/pgupgrade/base")
+		componentPaths = append(componentPaths, "../components/pgupgrade")
 	}
 	if ctx.NeedsClairPgUpgrade {
 		if v1.ComponentIsManaged(quay.Spec.Components, v1.ComponentClair) {

diff --git a/pkg/kustomize/kustomize_test.go b/pkg/kustomize/kustomize_test.go
@@ -189,7 +189,7 @@ var kustomizationForTests = []struct {
 				"../components/clair",
 				"../components/redis",
 				"../components/postgres",
-				"../components/pgupgrade/base",
+				"../components/pgupgrade",
 			},
 			Images: []types.Image{
 				{Name: "quay.io/projectquay/quay", NewName: "quay", NewTag: "latest"},
@@ -224,7 +224,7 @@ var kustomizationForTests = []struct {
 			Components: []string{
 				"../components/redis",
 				"../components/postgres",
-				"../components/pgupgrade/base",
+				"../components/pgupgrade",
 			},
 			Images: []types.Image{
 				{Name: "quay.io/projectquay/quay", NewName: "quay", NewTag: "latest"},