Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: test #2

Merged
merged 9 commits into from
Sep 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/.tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/demo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
target:
description: 'PR number to receive DEMO URL routing'
required: true
type: number
type: number

concurrency:
group: ${{ github.workflow }}
Expand All @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pr-open.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pr-validate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/scheduled.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion charts/app/templates/frontend/templates/ingress.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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: /
Expand Down
2 changes: 1 addition & 1 deletion charts/app/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion frontend/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<meta name="theme-color" content="#003366" />
<meta name="viewport" content="width=device-width,initial-scale=1.0" />
<link rel="icon" href="/favicon.ico" />
<title>QuickStart OpenShift</title>
<title>QSOS CLAB</title>
</head>
<body>
<div id="root"></div>
Expand Down
Loading