From de554abb4fd599ffa16a3cf918bd50a91c4d4dac Mon Sep 17 00:00:00 2001 From: Jonathan King Date: Wed, 3 Jul 2024 10:19:17 -0400 Subject: [PATCH] pgupgrade: Update pgupgrade path (PROJQUAY-7329) - Remove base from pgupgrade path to ensure that the file location is parsed properly by kustomize package --- pkg/kustomize/kustomize.go | 2 +- pkg/kustomize/kustomize_test.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/kustomize/kustomize.go b/pkg/kustomize/kustomize.go index ccb0f73be..b2d64c5f9 100644 --- a/pkg/kustomize/kustomize.go +++ b/pkg/kustomize/kustomize.go @@ -434,7 +434,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 index 47a072895..2ec37be44 100644 --- 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"},