From 9593ffa947b5a79ed7429848d4c1f9c8e6bfacc1 Mon Sep 17 00:00:00 2001 From: jon-funk Date: Sun, 8 Dec 2024 10:16:24 -0800 Subject: [PATCH 1/4] fix: use namespace from vars in deploy (#805) --- .github/workflows/release-main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-main.yml b/.github/workflows/release-main.yml index 4aa5fbd02..27b79852c 100644 --- a/.github/workflows/release-main.yml +++ b/.github/workflows/release-main.yml @@ -70,7 +70,7 @@ jobs: needs: [vars] uses: bcgov/quickstart-openshift-helpers/.github/workflows/.deployer.yml@v0.8.3 secrets: - oc_namespace: ${{ secrets.OC_NAMESPACE }} + oc_namespace: ${{ vars.OC_NAMESPACE }} oc_token: ${{ secrets.OC_TOKEN }} with: environment: prod From fadc38f3cfc7c974630756d536781e4cec09d3c7 Mon Sep 17 00:00:00 2001 From: jon-funk Date: Sun, 8 Dec 2024 11:45:15 -0800 Subject: [PATCH 2/4] fix: switch to bearer token val (#806) --- .github/workflows/release-main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-main.yml b/.github/workflows/release-main.yml index 27b79852c..d74db230d 100644 --- a/.github/workflows/release-main.yml +++ b/.github/workflows/release-main.yml @@ -71,7 +71,7 @@ jobs: uses: bcgov/quickstart-openshift-helpers/.github/workflows/.deployer.yml@v0.8.3 secrets: oc_namespace: ${{ vars.OC_NAMESPACE }} - oc_token: ${{ secrets.OC_TOKEN }} + oc_token: ${{ secrets.OC_BEARER_TOKEN }} with: environment: prod tag: ${{ needs.vars.outputs.pr }} From 8906bf250866b566bfbb7cbb2f0d878ed43bff70 Mon Sep 17 00:00:00 2001 From: Derek Roberts Date: Mon, 9 Dec 2024 09:53:55 -0800 Subject: [PATCH 3/4] ci: secret/var consistency (#807) --- .github/workflows/pr-close.yml | 4 ++-- .github/workflows/release-main.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pr-close.yml b/.github/workflows/pr-close.yml index 2c40975b2..2cd4d8fb0 100644 --- a/.github/workflows/pr-close.yml +++ b/.github/workflows/pr-close.yml @@ -39,7 +39,7 @@ jobs: - uses: actions/checkout@v4 - run: ./.github/scripts/cleanup_nats_js.sh env: - OC_NAMESPACE: ${{ vars.OC_NAMESPACE }} + OC_NAMESPACE: ${{ secrets.OC_NAMESPACE }} OC_SERVER: ${{ vars.OC_SERVER }} OC_TOKEN: ${{ secrets.OC_TOKEN }} - PR_NUMBER: ${{ github.event.number }} \ No newline at end of file + PR_NUMBER: ${{ github.event.number }} diff --git a/.github/workflows/release-main.yml b/.github/workflows/release-main.yml index d74db230d..140e3884d 100644 --- a/.github/workflows/release-main.yml +++ b/.github/workflows/release-main.yml @@ -70,7 +70,7 @@ jobs: needs: [vars] uses: bcgov/quickstart-openshift-helpers/.github/workflows/.deployer.yml@v0.8.3 secrets: - oc_namespace: ${{ vars.OC_NAMESPACE }} + oc_namespace: ${{ secrets.OC_NAMESPACE }} oc_token: ${{ secrets.OC_BEARER_TOKEN }} with: environment: prod From 69930d9fedbbf153bd92b5b3418a0eb77063c6ec Mon Sep 17 00:00:00 2001 From: jon-funk Date: Tue, 10 Dec 2024 22:24:40 -0800 Subject: [PATCH 4/4] fix: remove pvc template change in prod pipeline (#813) --- .github/workflows/release-main.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/release-main.yml b/.github/workflows/release-main.yml index baeaf6d3d..70d89a78a 100644 --- a/.github/workflows/release-main.yml +++ b/.github/workflows/release-main.yml @@ -84,8 +84,6 @@ jobs: --set webeoc.pdb.enabled=true --set nats.config.cluster.replicas=3 --set nats.config.cluster.enabled=true - --set bitnami-pg.backup.cronjob.storage.size=512Mi - --set bitnami-pg.primary.persistence.size=512Mi --set backup.enabled=true --set backup.persistence.size=256Mi