Keep working on environment secrets

bcgov · Mar 1, 2024 · 8879daf · 8879daf
1 parent 17ea3e1
commit 8879daf
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/.github/workflows/.deployer.yml b/.github/workflows/.deployer.yml
@@ -4,6 +4,10 @@ on:
   workflow_call:
     inputs:
       ### Required
+      oc_namespace:
+        description: OpenShift namespace
+        required: true
+        type: string
       release:
         description: Deployment release; usually repo-name-[PR|test|prod]
         required: true
@@ -56,9 +60,6 @@ on:
         value: ${{ jobs.deployer.outputs.triggered }}
 
     secrets:
-      oc_namespace:
-        description: OpenShift namespace
-        required: true
       oc_token:
         description: OpenShift token
         required: true
@@ -111,7 +112,7 @@ jobs:
     - run: |
         # OC Login
         oc login --token=${{ secrets.oc_token }} --server=${{ inputs.oc_server }}
-        oc project ${{ secrets.oc_namespace }} # Safeguard!
+        oc project ${{ inputs.oc_namespace }} # Safeguard!
 
     # Stop pre-existing deployments
     - run: |

diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml
@@ -34,10 +34,10 @@ jobs:
     needs: [vars]
     uses: ./.github/workflows/.deployer.yml
     secrets:
-      oc_namespace: ${{ vars.oc_namespace }}
       oc_token: ${{ secrets.oc_token }}
     with:
       environment: test
+      oc_namespace: ${{ vars.oc_namespace }}
       params: --set global.autoscaling=false
       release: test
       tag: ${{ needs.vars.outputs.pr }}