Added parameters to Init job

bcgov · Oct 18, 2024 · ead24e2 · ead24e2
1 parent 88b309f
commit ead24e2
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 10 deletions.
diff --git a/.github/workflows/.deploy.yml b/.github/workflows/.deploy.yml
@@ -34,6 +34,10 @@ jobs:
           overwrite: true
           parameters:
             -p NAME_SUFFIX=${{ inputs.target }}
+            -p DB_PASSWORD=${{ secrets.DB_PASSWORD }}
+            -p DB_USER=${{ secrets.DB_USER }}
+            -p DB_NAME=${{ secrets.DB_NAME }}
+            -p DB_PORT=${{ secrets.DB_PORT }}
 
   database:
     name: Database
@@ -52,10 +56,6 @@ jobs:
           parameters:
             -p TAG=${{ inputs.tag }} 
             -p TARGET=${{ inputs.target }}
-            -p DB_PASSWORD=${{ secrets.DB_PASSWORD }}
-            -p DB_USER=${{ secrets.DB_USER }}
-            -p DB_NAME=${{ secrets.DB_NAME }}
-            -p DB_PORT=${{ secrets.DB_PORT }}
 
   # backend:
   #   name: Backend

diff --git a/common/openshift.init.yml b/common/openshift.init.yml
@@ -1,8 +1,8 @@
 apiVersion: v1
 kind: Template
 parameters:
-  - name: NAME_SUFFIX
-    required: true
+  # - name: NAME_SUFFIX
+    # required: true
   - name: DB_PASSWORD
     required: true
   - name: DB_USER

diff --git a/database/openshift.deploy.yml b/database/openshift.deploy.yml
@@ -16,10 +16,6 @@ parameters:
   - name: TARGET
     description: Deployment target; e.g. PR number, test or prod
     required: true
-  - name: DB_PASSWORD
-    description: Password for the PostgreSQL connection user.
-    from: "[a-zA-Z0-9]{16}"
-    generate: expression
 objects:
   - apiVersion: networking.k8s.io/v1
     kind: NetworkPolicy