Mounting secrets for all controllers

cloudbees · May 21, 2024 · 939ad23 · 939ad23
1 parent f6eafc3
commit 939ad23
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 52 deletions.
diff --git a/blueprints/02-at-scale/casc/oc/items/items-root.yaml b/blueprints/02-at-scale/casc/oc/items/items-root.yaml
@@ -11,15 +11,6 @@ items:
         cpus: 1.0
         disk: 20
         storageClassName: "gp3"
-  # Casc, Non-HA
-  - kind: managedController
-    name: team-b
-    configuration:
-      kubernetes:
-        memory: 6144
-        cpus: 2.0
-        disk: 5
-        storageClassName: "gp3"
         yaml: |-
           ---
           apiVersion: "apps/v1"
@@ -32,25 +23,15 @@ items:
                     operator: "Equal"
                     value: "cb-apps"
                     effect: "NoSchedule"
-                  volumes:
-                  - name: cbci-secrets
-                    secret:
-                      secretName: cbci-secrets
-                  containers:
-                  - name: jenkins
-                    env:
-                    - name: SECRETS
-                      value: "/var/run/secrets/cbci"
-                    volumeMounts:
-                    - name: cbci-secrets
-                      mountPath: "/var/run/secrets/cbci"
-                      readOnly: true
-          ---
-          apiVersion: "v1"
-          kind: "Service"
-          metadata:
-            labels:
-              "cloudbees.prometheus": "true"
+  # Casc, Non-HA
+  - kind: managedController
+    name: team-b
+    configuration:
+      kubernetes:
+        memory: 6144
+        cpus: 2.0
+        disk: 5
+        storageClassName: "gp3"
     properties:
       - configurationAsCode:
           bundle: "s3/none-ha"
@@ -67,24 +48,6 @@ items:
             maxReplicas: 4
             replicas: 2
             targetCPUUtilizationPercentage: 50
-        yaml: |-
-          ---
-          apiVersion: "apps/v1"
-          kind: "Deployment"
-          spec:
-            template:
-                spec:
-                  tolerations:
-                  - key: "dedicated"
-                    operator: "Equal"
-                    value: "cb-apps"
-                    effect: "NoSchedule"
-          ---
-          apiVersion: "v1"
-          kind: "Service"
-          metadata:
-            labels:
-              "cloudbees.prometheus": "true"
     properties:
       - configurationAsCode:
           bundle: "s3/ha"
diff --git a/blueprints/02-at-scale/casc/oc/jcasc/main.yaml b/blueprints/02-at-scale/casc/oc/jcasc/main.yaml
@@ -56,9 +56,28 @@ masterprovisioning:
       kind: "StatefulSet"
       spec:
         template:
-            spec:
-              tolerations:
-              - key: "dedicated"
-                operator: "Equal"
-                value: "cb-apps"
-                effect: "NoSchedule"
+          spec:
+            tolerations:
+            - key: "dedicated"
+              operator: "Equal"
+              value: "cb-apps"
+              effect: "NoSchedule"
+            volumes:
+            - name: cbci-secrets
+              secret:
+                secretName: cbci-secrets
+            containers:
+            - name: jenkins
+              env:
+              - name: SECRETS
+                value: "/var/run/secrets/cbci"
+              volumeMounts:
+              - name: cbci-secrets
+                mountPath: "/var/run/secrets/cbci"
+                readOnly: true
+          ---
+          apiVersion: "v1"
+          kind: "Service"
+          metadata:
+            labels:
+              "cloudbees.prometheus": "true"