Added scale up component for clair-postgres and clair-app resource

quay · Oct 4, 2024 · 2f22cbc · 2f22cbc
2 parents 04e7483 + e2ffefe
commit 2f22cbc
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 2 deletions.
diff --git a/kustomize/components/clairpgupgrade/scale-down-clair/clair-pg-scale-up.patch.yaml b/kustomize/components/clairpgupgrade/scale-down-clair/clair-pg-scale-up.patch.yaml
@@ -0,0 +1,6 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: clair-app
+spec:
+  replicas: 2
diff --git a/kustomize/components/clairpgupgrade/scale-down-clair/clair.deployment-scale-up.patch.yaml b/kustomize/components/clairpgupgrade/scale-down-clair/clair.deployment-scale-up.patch.yaml
@@ -0,0 +1,6 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: clair-postgres
+spec:
+  replicas: 2
diff --git a/kustomize/components/clairpgupgrade/scale-down-clair/kustomization.yaml b/kustomize/components/clairpgupgrade/scale-down-clair/kustomization.yaml
@@ -2,3 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1alpha1
 kind: Component
 patchesStrategicMerge:
   - ./clair.deployment.patch.yaml
+  - ./clair-pg-scale-up.patch.yaml
+  - ./clair.deployment-scale-up.patch.yaml
+components:
+  - ../base
diff --git a/pkg/kustomize/kustomize.go b/pkg/kustomize/kustomize.go
@@ -439,8 +439,6 @@ func KustomizationFor(
 	if ctx.NeedsClairPgUpgrade {
 		if v1.ComponentIsManaged(quay.Spec.Components, v1.ComponentClair) {
 			componentPaths = append(componentPaths, "../components/clairpgupgrade/scale-down-clair")
-			componentPaths = append(componentPaths, "../components/clairpgupgrade/base")
-			componentPaths = append(componentPaths, "../components/clairpgupgrade/scale-up-clair")
 		} else {
 			componentPaths = append(componentPaths, "../components/clairpgupgrade/base")
 		}