Split out secrets for sync, drop port secret

bcgov · Aug 2, 2024 · 0c2170a · 0c2170a
1 parent 48f2670
commit 0c2170a
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 22 deletions.
diff --git a/common/openshift.init.yml b/common/openshift.init.yml
@@ -12,9 +12,6 @@ parameters:
   - name: ORACLE_HOST
     description: Oracle database host
     value: nrcdb03.bcgov
-  - name: ORACLE_PORT
-    description: Oracle database port
-    value: "1543"
   - name: ORACLE_SERVICE
     description: Oracle service name
     value: dbq01.nrs.bcgov
@@ -43,10 +40,18 @@ objects:
     stringData:
       oracle-host: ${ORACLE_HOST}
       oracle-password: ${ORACLE_PASSWORD}
-      oracle-port: ${ORACLE_PORT}
       oracle-service: ${ORACLE_SERVICE}
       oracle-user: ${ORACLE_USER}
       oracle-secret: ${ORACLE_CERT_SECRET}
+  - apiVersion: v1
+    kind: Secret
+    metadata:
+      name: ${NAME}-${ZONE}-sync
+      labels:
+        app: ${NAME}-${ZONE}
+    stringData:
+      oracle-host: ${ORACLE_HOST}
+      oracle-service: ${ORACLE_SERVICE}
       oracle-sync-password: ${ORACLE_SYNC_PASSWORD}
       oracle-sync-user: ${ORACLE_SYNC_USER}
   - apiVersion: v1

diff --git a/oracle-api/openshift.deploy.yml b/oracle-api/openshift.deploy.yml
@@ -44,6 +44,9 @@ parameters:
     description: Oracle API environment for OpenSearch. # One of: development, test, production
     required: false
     value: development
+  - name: DATABASE_PORT
+    description: Oracle database port
+    value: "1543"
   - name: ORACLEDB_KEYSTORE
     description: Keystore location path
   - name: AWS_COGNITO_ISSUER_URI
@@ -105,10 +108,7 @@ objects:
                       name: ${NAME}-${ZONE}-${COMPONENT}
                       key: oracle-secret
                 - name: DATABASE_PORT
-                  valueFrom:
-                    secretKeyRef:
-                      name: ${NAME}-${ZONE}-${COMPONENT}
-                      key: oracle-port
+                  value: ${DATABASE_PORT}
               volumeMounts:
                 - name: ${NAME}-${ZONE}-${COMPONENT}-certs
                   mountPath: /cert
@@ -136,10 +136,7 @@ objects:
                       name: ${NAME}-${ZONE}-${COMPONENT}
                       key: oracle-host
                 - name: DATABASE_PORT
-                  valueFrom:
-                    secretKeyRef:
-                      name: ${NAME}-${ZONE}-${COMPONENT}
-                      key: oracle-port
+                  value: ${DATABASE_PORT}
                 - name: SERVICE_NAME
                   valueFrom:
                     secretKeyRef:

diff --git a/sync/openshift.deploy.yml b/sync/openshift.deploy.yml
@@ -13,6 +13,9 @@ parameters:
   - name: APP
     description: Application/component name
     value: sync
+  - name: DATABASE_PORT
+    description: Oracle database port
+    value: "1543"
   - name: EXECUTION_ID
     description: Process execution ID for running ETL Tool
     value: "100"
@@ -90,11 +93,8 @@ objects:
                         secretKeyRef:
                           name: ${REPO}-${ZONE}-oracle-api
                           key: oracle-sync-password
-                    - name: ORACLE_PORT
-                      valueFrom:
-                        secretKeyRef:
-                          name: ${REPO}-${ZONE}-oracle-api
-                          key: oracle-port
+                    - name: DATABASE_PORT
+                      value: ${DATABASE_PORT}
                     - name: ORACLE_SERVICE
                       valueFrom:
                         secretKeyRef:
@@ -117,11 +117,8 @@ objects:
                         secretKeyRef:
                           name: ${REPO}-${ZONE}-database
                           key: database-password
-                    - name: POSTGRES_PORT
-                      valueFrom:
-                        secretKeyRef:
-                          name: ${REPO}-${ZONE}-database
-                          key: database-port
+                    - name: DATABASE_PORT
+                      value: ${DATABASE_PORT}
                     - name: POSTGRES_USER
                       valueFrom:
                         secretKeyRef: