Merge pull request #174 from bcgov/deployment-updates

Updating OpenShift deployments to reflect current state
bcgov · Feb 25, 2025 · 89d9480 · 89d9480
2 parents 6c2af9e + f86d78c
commit 89d9480
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 24 deletions.
diff --git a/openshift/app.cm.yaml b/openshift/app.cm.yaml
@@ -12,37 +12,27 @@ labels:
 metadata:
   name: "${REPO_NAME}-app-cm"
 objects:
-  - apiVersion: v1
-    kind: ConfigMap
+  - kind: ConfigMap
+    apiVersion: v1
+    metadata:
+      name: medis-etl-encryption
+    immutable: false
+    data:
+      hi-pub-key: |
+        ${PUBLIC_KEY}
+  - kind: ConfigMap
+    apiVersion: v1
     metadata:
       name: medis-etl-config
+    immutable: false
     data:
-      application.properties: |
-        # properties used in route
-        hostname = localhost
-        port = 8080
-
-        chefs.http.uri=https://submit.digital.gov.bc.ca/app/api/v1/forms/%s/export?format=json&type=submissions&minDate=%s&maxDate=%s
-
-        aims.username=2f173b2b-2f3a-407a-aecf-6b4bdc9431ae
-        aims.password=tbd
-
-        ltc.facility.username=e1f4761f-efdd-4529-805e-677d3ae21601
-        ltc.facility.password=tbd
-
-        ltc.staffing.username=16ce36ca-9b4b-4ec6-bb75-96c2e1f258bb
-        ltc.staffing.password=tbd
-
-        ltc.ytd.username=256760e7-6e8b-44c4-8b63-51fb72c8c2cf
-        ltc.ytd.password=tbd
-      log4j2.properties: |
+      log4j2.properties: |-
         appender.out.type = Console
         appender.out.name = out
         appender.out.layout.type = PatternLayout
         appender.out.layout.pattern = [%30.30t] %-30.30c{1} %-5p %m%n
         rootLogger.level = INFO
         rootLogger.appenderRef.out.ref = out
-    immutable: false
 parameters:
   - name: APP_NAME
     description: Application name
@@ -56,3 +46,7 @@ parameters:
     description: Application repository name
     displayName: Repository Name
     required: true
+  - name: PUBLIC_KEY
+    description: Public key for encryption
+    displayName: Public key
+    required: true
diff --git a/openshift/app.dc.yaml b/openshift/app.dc.yaml
@@ -80,8 +80,13 @@ objects:
             persistentVolumeClaim:
               claimName: medis-etl-pvc
           - name: medis-etl-config
-            configMap:
-              name: medis-etl-config
+            projected:
+              sources:
+                - secret:
+                    name: medis-etl-secrets
+                - configMap:
+                    name: medis-etl-config
+              defaultMode: 420
           - name: medis-etl-ssh
             secret:
               defaultMode: 400

diff --git a/openshift/app.secret.yaml b/openshift/app.secret.yaml
@@ -26,6 +26,29 @@ objects:
       name: "medis-etl-github-webhook-secret"
     data:
       WebHookSecretKey: "${TOKEN}"
+  - apiVersion: v1
+    kind: Secret
+    metadata:
+      name: medis-etl-secrets
+    data:
+      application.properties: |
+        # properties used in route
+        hostname = localhost
+        port = 8080
+
+        chefs.http.uri=https://submit.digital.gov.bc.ca/app/api/v1/forms/%s/export?format=json&type=submissions&minDate=%s&maxDate=%s
+
+        aims.username=2f173b2b-2f3a-407a-aecf-6b4bdc9431ae
+        aims.password=tbd
+
+        ltc.facility.username=e1f4761f-efdd-4529-805e-677d3ae21601
+        ltc.facility.password=tbd
+
+        ltc.staffing.username=16ce36ca-9b4b-4ec6-bb75-96c2e1f258bb
+        ltc.staffing.password=tbd
+
+        ltc.ytd.username=256760e7-6e8b-44c4-8b63-51fb72c8c2cf
+        ltc.ytd.password=tbd
 parameters:
   - name: TOKEN
     description: The token used to in the URL of Webhook.