Merge pull request #34 from ropable/master

Update Kustomize overlays, refactor base template
dbca-wa · Nov 6, 2023 · b941106 · b941106
2 parents fb3bb0a + 2e07501
commit b941106
Show file tree

Hide file tree

Showing 7 changed files with 174 additions and 69 deletions.
diff --git a/kustomize/README.md b/kustomize/README.md
@@ -5,10 +5,7 @@ Declarative management of SSS Healthcheck objects using Kustomize.
 # How to use
 
 Within an overlay directory, create a `.env` file to contain required secret
-values in the format KEY=value (i.e. `overlays/uat/.env`). Required values:
-
-    DATABASE_URL=value
-    SECRET_KEY=value
+values in the format KEY=value (i.e. `overlays/uat/.env`).
 
 Review the built resource output using `kustomize`:
 

diff --git a/kustomize/base/deployment.yaml b/kustomize/base/deployment.yaml
@@ -10,6 +10,7 @@ spec:
     spec:
       containers:
       - name: healthcheck
+        image: ghcr.io/dbca-wa/healthcheck
         env:
         - name: TZ
           value: "Australia/Perth"
@@ -45,5 +46,5 @@ spec:
           capabilities:
             drop:
               - ALL
-          readOnlyRootFilesystem: false
+          readOnlyRootFilesystem: true
       restartPolicy: Always
diff --git a/kustomize/overlays/prod/deployment_patch.yaml b/kustomize/overlays/prod/deployment_patch.yaml
@@ -15,5 +15,50 @@ spec:
     spec:
       containers:
       - name: healthcheck
-        image: ghcr.io/dbca-wa/healthcheck:1.1.10
         imagePullPolicy: IfNotPresent
+        env:
+        - name: AIRCRAFT_TRACKING_MAX_DELAY
+          valueFrom:
+            secretKeyRef:
+              name: healthcheck-env-prod
+              key: AIRCRAFT_TRACKING_MAX_DELAY
+        - name: BFRS_URL
+          valueFrom:
+            secretKeyRef:
+              name: healthcheck-env-prod
+              key: BFRS_URL
+        - name: CSW_API
+          valueFrom:
+            secretKeyRef:
+              name: healthcheck-env-prod
+              key: CSW_API
+        - name: DBCA_GOING_BUSHFIRES_URL
+          valueFrom:
+            secretKeyRef:
+              name: healthcheck-env-prod
+              key: DBCA_GOING_BUSHFIRES_URL
+        - name: KMI_URL
+          valueFrom:
+            secretKeyRef:
+              name: healthcheck-env-prod
+              key: KMI_URL
+        - name: RT_URL
+          valueFrom:
+            secretKeyRef:
+              name: healthcheck-env-prod
+              key: RT_URL
+        - name: USER_SSO
+          valueFrom:
+            secretKeyRef:
+              name: healthcheck-env-prod
+              key: USER_SSO
+        - name: PASS_SSO
+          valueFrom:
+            secretKeyRef:
+              name: healthcheck-env-prod
+              key: PASS_SSO
+        - name: TRACKING_POINTS_MAX_DELAY
+          valueFrom:
+            secretKeyRef:
+              name: healthcheck-env-prod
+              key: TRACKING_POINTS_MAX_DELAY
diff --git a/kustomize/overlays/prod/kustomization.yaml b/kustomize/overlays/prod/kustomization.yaml
@@ -2,18 +2,21 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 nameSuffix: -prod
 secretGenerator:
-- name: healthcheck-env
-  type: Opaque
-  envs:
-  - .env
+  - name: healthcheck-env
+    type: Opaque
+    envs:
+    - .env
 resources:
-- ../../base
-- ingress.yaml
-- pdb.yaml
+  - ../../base
+  - ingress.yaml
+  - pdb.yaml
 labels:
-- includeSelectors: true
-  pairs:
-    variant: prod
+  - includeSelectors: true
+    pairs:
+      variant: prod
+images:
+  - name: ghcr.io/dbca-wa/healthcheck
+    newTag: 1.1.12
 patches:
-- path: deployment_patch.yaml
-- path: service_patch.yaml
+  - path: deployment_patch.yaml
+  - path: service_patch.yaml
diff --git a/kustomize/overlays/uat/deployment_patch.yaml b/kustomize/overlays/uat/deployment_patch.yaml
@@ -15,5 +15,50 @@ spec:
     spec:
       containers:
       - name: healthcheck
-        image: ghcr.io/dbca-wa/healthcheck
         imagePullPolicy: Always
+        env:
+        - name: AIRCRAFT_TRACKING_MAX_DELAY
+          valueFrom:
+            secretKeyRef:
+              name: healthcheck-env-uat
+              key: AIRCRAFT_TRACKING_MAX_DELAY
+        - name: BFRS_URL
+          valueFrom:
+            secretKeyRef:
+              name: healthcheck-env-uat
+              key: BFRS_URL
+        - name: CSW_API
+          valueFrom:
+            secretKeyRef:
+              name: healthcheck-env-uat
+              key: CSW_API
+        - name: DBCA_GOING_BUSHFIRES_URL
+          valueFrom:
+            secretKeyRef:
+              name: healthcheck-env-uat
+              key: DBCA_GOING_BUSHFIRES_URL
+        - name: KMI_URL
+          valueFrom:
+            secretKeyRef:
+              name: healthcheck-env-uat
+              key: KMI_URL
+        - name: RT_URL
+          valueFrom:
+            secretKeyRef:
+              name: healthcheck-env-uat
+              key: RT_URL
+        - name: USER_SSO
+          valueFrom:
+            secretKeyRef:
+              name: healthcheck-env-uat
+              key: USER_SSO
+        - name: PASS_SSO
+          valueFrom:
+            secretKeyRef:
+              name: healthcheck-env-uat
+              key: PASS_SSO
+        - name: TRACKING_POINTS_MAX_DELAY
+          valueFrom:
+            secretKeyRef:
+              name: healthcheck-env-uat
+              key: TRACKING_POINTS_MAX_DELAY
diff --git a/kustomize/overlays/uat/kustomization.yaml b/kustomize/overlays/uat/kustomization.yaml
@@ -2,18 +2,18 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 nameSuffix: -uat
 secretGenerator:
-- name: healthcheck-env
-  type: Opaque
-  envs:
-  - .env
+  - name: healthcheck-env
+    type: Opaque
+    envs:
+    - .env
 resources:
-- ../../base
-- ingress.yaml
-- pdb.yaml
+  - ../../base
+  - ingress.yaml
+  - pdb.yaml
 labels:
-- includeSelectors: true
-  pairs:
-    variant: uat
+  - includeSelectors: true
+    pairs:
+      variant: uat
 patches:
-- path: deployment_patch.yaml
-- path: service_patch.yaml
+  - path: deployment_patch.yaml
+  - path: service_patch.yaml