From 32b617f4531f597db47d5146d829dcbc5022b0d0 Mon Sep 17 00:00:00 2001 From: Om Mishra <32200996+mishraomp@users.noreply.github.com> Date: Thu, 12 Sep 2024 20:48:42 -0700 Subject: [PATCH 1/7] Update index.html --- frontend/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/index.html b/frontend/index.html index a9eb370..69aa295 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -7,7 +7,7 @@ - QuickStart OpenShift + QSOS CLAB
From 14519c7eb5226d3e9a4cd93ee2d342732d62e910 Mon Sep 17 00:00:00 2001 From: Om Mishra <32200996+mishraomp@users.noreply.github.com> Date: Thu, 12 Sep 2024 21:00:43 -0700 Subject: [PATCH 2/7] Update pr-open.yml --- .github/workflows/pr-open.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pr-open.yml b/.github/workflows/pr-open.yml index 64056d4..25cf77b 100644 --- a/.github/workflows/pr-open.yml +++ b/.github/workflows/pr-open.yml @@ -31,11 +31,11 @@ jobs: needs: [builds] uses: bcgov/quickstart-openshift-helpers/.github/workflows/.deployer.yml@v0.7.0 secrets: - oc_namespace: ${{ var.OC_NAMESPACE }} + oc_namespace: ${{ vars.OC_NAMESPACE }} oc_token: ${{ secrets.OC_TOKEN }} with: triggers: ('backend/' 'frontend/' 'migrations/') - oc_server: ${{ var.OC_SERVER }} + oc_server: ${{ vars.OC_SERVER }} params: --set global.secrets.persist=false From 12102e7fe44f0019c60f6dd5a314f09243ea8cb3 Mon Sep 17 00:00:00 2001 From: Om Mishra <32200996+mishraomp@users.noreply.github.com> Date: Thu, 12 Sep 2024 21:11:23 -0700 Subject: [PATCH 3/7] Update pr-validate.yml --- .github/workflows/pr-validate.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pr-validate.yml b/.github/workflows/pr-validate.yml index 48d6b68..a46772c 100644 --- a/.github/workflows/pr-validate.yml +++ b/.github/workflows/pr-validate.yml @@ -15,8 +15,8 @@ jobs: uses: bcgov/quickstart-openshift-helpers/.github/workflows/.pr-validate.yml@v0.7.0 with: markdown_links: | - - [Frontend](https://${{ github.event.repository.name }}-${{ github.event.number }}-frontend.apps.silver.devops.gov.bc.ca) - - [Backend](https://${{ github.event.repository.name }}-${{ github.event.number }}-frontend.apps.silver.devops.gov.bc.ca/api) + - [Frontend](https://${{ github.event.repository.name }}-${{ github.event.number }}-frontend.apps.clab.devops.gov.bc.ca) + - [Backend](https://${{ github.event.repository.name }}-${{ github.event.number }}-frontend.apps.clab.devops.gov.bc.ca/api) results: name: Validate Results From ce32e63661c612224d553b9125236c9b67f74e99 Mon Sep 17 00:00:00 2001 From: Om Mishra <32200996+mishraomp@users.noreply.github.com> Date: Thu, 12 Sep 2024 21:13:17 -0700 Subject: [PATCH 4/7] Update .tests.yml --- .github/workflows/.tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/.tests.yml b/.github/workflows/.tests.yml index cb126a4..6f629a5 100644 --- a/.github/workflows/.tests.yml +++ b/.github/workflows/.tests.yml @@ -16,7 +16,7 @@ on: type: string env: - DOMAIN: apps.silver.devops.gov.bc.ca + DOMAIN: apps.clab.devops.gov.bc.ca PREFIX: ${{ github.event.repository.name }}-${{ inputs.target }} jobs: From 5bbb965cc51cef0698039854826ee3a3688fc08a Mon Sep 17 00:00:00 2001 From: OMPRAKASH MISHRA Date: Fri, 13 Sep 2024 10:29:43 -0700 Subject: [PATCH 5/7] fix domain URL --- .github/workflows/demo.yml | 4 ++-- .github/workflows/scheduled.yml | 2 +- charts/app/values.yaml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/demo.yml b/.github/workflows/demo.yml index 57b91ac..0d448a5 100644 --- a/.github/workflows/demo.yml +++ b/.github/workflows/demo.yml @@ -8,7 +8,7 @@ on: target: description: 'PR number to receive DEMO URL routing' required: true - type: number + type: number concurrency: group: ${{ github.workflow }} @@ -20,7 +20,7 @@ jobs: if: ${{ github.event_name == 'workflow_dispatch' || github.event.label.name == 'demo' }} env: DEST: demo - DOMAIN: apps.silver.devops.gov.bc.ca + DOMAIN: apps.clab.devops.gov.bc.ca REPO: ${{ github.event.repository.name }} runs-on: ubuntu-latest steps: diff --git a/.github/workflows/scheduled.yml b/.github/workflows/scheduled.yml index 0d074aa..4028aa7 100644 --- a/.github/workflows/scheduled.yml +++ b/.github/workflows/scheduled.yml @@ -105,7 +105,7 @@ jobs: runs-on: ubuntu-latest name: ZAP Scans env: - DOMAIN: apps.silver.devops.gov.bc.ca + DOMAIN: apps.clab.devops.gov.bc.ca PREFIX: ${{ github.event.repository.name }}-test steps: - name: ZAP Scan diff --git a/charts/app/values.yaml b/charts/app/values.yaml index 3014589..ce22f5c 100644 --- a/charts/app/values.yaml +++ b/charts/app/values.yaml @@ -18,7 +18,7 @@ global: databaseName: ~ persist: true #-- domain of the application, it is required, apps.silver.devops.gov.bc.ca for silver cluster and apps.devops.gov.bc.ca for gold cluster - domain: "apps.silver.devops.gov.bc.ca" # it is apps.gold.devops.gov.bc.ca for gold cluster + domain: "apps.clab.devops.gov.bc.ca" # it is apps.gold.devops.gov.bc.ca for gold cluster #-- the database Alias gives a nice way to switch to different databases, crunchy, patroni ... etc. databaseAlias: bitnami-pg #-- the components of the application, backend. From 041102438dba2965133e5c205e6095d466c06ce9 Mon Sep 17 00:00:00 2001 From: OMPRAKASH MISHRA Date: Fri, 13 Sep 2024 10:31:38 -0700 Subject: [PATCH 6/7] fix domain URL Signed-off-by: OMPRAKASH MISHRA --- charts/app/templates/frontend/templates/ingress.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/app/templates/frontend/templates/ingress.yaml b/charts/app/templates/frontend/templates/ingress.yaml index 43ddd6a..0fb73c8 100644 --- a/charts/app/templates/frontend/templates/ingress.yaml +++ b/charts/app/templates/frontend/templates/ingress.yaml @@ -14,7 +14,7 @@ metadata: spec: ingressClassName: openshift-default rules: - - host: {{ include "frontend.fullname" . }}.{{ .Values.global.domain }} + - host: {{ include "frontend.fullname" . }}.{{ .Values.global.domain }} # make sure domain is correct http: paths: - path: / From 895c956c1e6e23c37624020b4e5b2ce311edccbc Mon Sep 17 00:00:00 2001 From: OMPRAKASH MISHRA Date: Fri, 13 Sep 2024 10:42:14 -0700 Subject: [PATCH 7/7] update to vars Signed-off-by: OMPRAKASH MISHRA --- .github/workflows/merge.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml index 9c8ba84..86a7268 100644 --- a/.github/workflows/merge.yml +++ b/.github/workflows/merge.yml @@ -38,7 +38,7 @@ jobs: name: Deploy (test) uses: bcgov/quickstart-openshift-helpers/.github/workflows/.deployer.yml@v0.7.0 secrets: - oc_namespace: ${{ secrets.OC_NAMESPACE }} + oc_namespace: ${{ vars.OC_NAMESPACE }} oc_token: ${{ secrets.OC_TOKEN }} with: environment: test @@ -48,7 +48,7 @@ jobs: needs: [deploy-test, vars] uses: bcgov/quickstart-openshift-helpers/.github/workflows/.deployer.yml@v0.7.0 secrets: - oc_namespace: ${{ secrets.OC_NAMESPACE }} + oc_namespace: ${{ vars.OC_NAMESPACE }} oc_token: ${{ secrets.OC_TOKEN }} with: environment: prod