Merge branch 'quay:master' into master

quay · Oct 8, 2024 · b89b26b · b89b26b
2 parents f2c87cc + 83828f5
commit b89b26b
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 3 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,5 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1alpha1
 kind: Component
 patchesStrategicMerge:
   - ./clair.deployment.patch.yaml
-resources:
-  - "../base"
+  - ./clair-pg-scale-up.patch.yaml
+  - ./clair.deployment-scale-up.patch.yaml
+components:
+  - ../base
diff --git a/kustomize/components/mirror/mirror.deployment.yaml b/kustomize/components/mirror/mirror.deployment.yaml
@@ -49,6 +49,18 @@ spec:
                   name: extra-ca-certs      
               - secret:
                   name: quay-config-tls
+        - name: postgres-certs
+          projected:
+            sources:
+            - secret:
+                name: postgresql-ca
+                optional: true
+            - secret:
+                name: postgresql-client-certs
+                optional: true
+        - name: postgres-certs-store
+          emptyDir:
+            sizeLimit: 5Mi
       initContainers:
         - name: quay-mirror-init
           image: quay.io/projectquay/quay:latest
@@ -99,6 +111,10 @@ spec:
             - name: extra-ca-certs
               readOnly: true
               mountPath: /conf/stack/extra_ca_certs
+            - name: postgres-certs
+              mountPath: /run/secrets/postgresql
+            - name: postgres-certs-store
+              mountPath: /.postgresql
           resources:
             requests:
               cpu: 500m

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{}