Fixing recursed accumulation of path for managed clair resources

quay · Oct 1, 2024 · 9bcd3ac · 9bcd3ac
1 parent 82188de
commit 9bcd3ac
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/kustomize/components/clairpgupgrade/scale-down-clair/kustomization.yaml b/kustomize/components/clairpgupgrade/scale-down-clair/kustomization.yaml
@@ -2,5 +2,5 @@ apiVersion: kustomize.config.k8s.io/v1alpha1
 kind: Component
 patchesStrategicMerge:
   - ./clair.deployment.patch.yaml
-resources:
-  - "../base"
+components:
+  - ../base
diff --git a/pkg/kustomize/kustomize.go b/pkg/kustomize/kustomize.go
@@ -439,8 +439,9 @@ func KustomizationFor(
 	if ctx.NeedsClairPgUpgrade {
 		if v1.ComponentIsManaged(quay.Spec.Components, v1.ComponentClair) {
 			componentPaths = append(componentPaths, "../components/clairpgupgrade/scale-down-clair")
+		} else {
+			componentPaths = append(componentPaths, "../components/clairpgupgrade/base")
 		}
-		componentPaths = append(componentPaths, "../components/clairpgupgrade/base")
 	}
 
 	images := []types.Image{}