pgupgrade: Fix clairpgupgrade path (PROJQUAY-7392)

- Fix kustomize path for clairpgupgrade when clair is managed/unmanaged
quay · Jul 2, 2024 · 5bb5acb · 5bb5acb
1 parent 62884a1
commit 5bb5acb
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/pkg/kustomize/kustomize.go b/pkg/kustomize/kustomize.go
@@ -434,14 +434,13 @@ func KustomizationFor(
 	}
 
 	if ctx.NeedsPgUpgrade {
-		if v1.ComponentIsManaged(quay.Spec.Components, v1.ComponentClair) {
-			componentPaths = append(componentPaths, "../components/pgupgrade/scale-down-clair")
-		} else {
-			componentPaths = append(componentPaths, "../components/pgupgrade/base")
-		}
+		componentPaths = append(componentPaths, "../components/pgupgrade/base")
 	}
 	if ctx.NeedsClairPgUpgrade {
-		componentPaths = append(componentPaths, "../components/clairpgupgrade")
+		if v1.ComponentIsManaged(quay.Spec.Components, v1.ComponentClair) {
+			componentPaths = append(componentPaths, "../components/clairpgupgrade/scale-down-clair")
+		}
+		componentPaths = append(componentPaths, "../components/clairpgupgrade/base")
 	}
 
 	images := []types.Image{}