Skip to content

Commit 09512cc

Browse files
cberg-aotcberg-aot
authored
feat: gold dev (#2089)
1 parent 9dfbea4 commit 09512cc

File tree

6 files changed

+145
-30
lines changed

6 files changed

+145
-30
lines changed

‎.github/workflows/deploy.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ jobs:
159159
shell: bash
160160
run: |
161161
oc login --token=${{ secrets.oc_token }} --server=${{ secrets.oc_server }}
162-
oc project ${{ secrets.OC_NAMESPACE }} # Safeguard!
162+
oc project ${{ secrets.oc_namespace }} # Safeguard!
163163
164164
# Interrupt any previous jobs (status = pending-upgrade)
165165
PREVIOUS=$(helm status ${{ env.repo_release }} -o json | jq .info.status || true)
@@ -170,7 +170,7 @@ jobs:
170170
fi
171171
172172
# Clean previous image, if any
173-
if [[ ${{inputs.environment}} == 'dev' ]]; then
173+
if [[ ${{inputs.environment}} == *'dev'* ]]; then
174174
helm uninstall ${{ env.repo_release }} || true
175175
fi
176176

‎.github/workflows/gold-dev.yml‎

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
---
2+
name: Deploy Dev (Gold)
3+
4+
on:
5+
workflow_dispatch:
6+
inputs:
7+
tag:
8+
description: "Image tag to deploy"
9+
required: false
10+
type: string
11+
default: "latest"
12+
params:
13+
description: 'Extra parameters to pass to helm upgrade'
14+
default: ''
15+
required: false
16+
type: string
17+
workflow_call:
18+
inputs:
19+
tag:
20+
description: "Image tag to deploy"
21+
required: false
22+
type: string
23+
default: "latest"
24+
params:
25+
description: 'Extra parameters to pass to helm upgrade'
26+
default: ''
27+
required: false
28+
type: string
29+
jobs:
30+
deploy-gold-dev:
31+
name: Deploys Dev (Gold)
32+
uses: ./.github/workflows/deploy.yml
33+
secrets: inherit
34+
with:
35+
autoscaling: false
36+
environment: gold-dev
37+
release: ${{inputs.tag}}
38+
tag: ${{ inputs.tag }}
39+
triggers: '' #omit=always;
40+
params: |
41+
--set-string global.domain='apps.gold.devops.gov.bc.ca' \
42+
--set-string global.vault.authPath='auth/k8s-gold' \
43+
--set-string global.license='c3141c' \
44+
--set-string global.zone='dev' \
45+
--set-string global.vault.role='nonprod' \
46+
--set-string global.vault.zone='dev' \
47+
--set-json dops.containers[0].resources='{"limits": {"cpu": "1000m", "memory": "2000Mi"}, "requests": {"cpu": "25m", "memory": "50Mi"}}' \
48+
--set-json frontend.containers[0].resources='{"limits": {"cpu": "75m", "memory": "150Mi"}, "requests": {"cpu": "25m", "memory": "50Mi"}}' \
49+
--set-json scheduler.containers[0].resources='{"limits": {"cpu": "75m", "memory": "150Mi"}, "requests": {"cpu": "25m", "memory": "50Mi"}}' \
50+
--set-json policy.containers[0].resources='{"limits": {"cpu": "75m", "memory": "150Mi"}, "requests": {"cpu": "25m", "memory": "50Mi"}}' \
51+
--set-json vehicles.containers[0].resources='{"limits": {"cpu": "300m", "memory": "500Mi"}, "requests": {"cpu": "200m", "memory": "400Mi"}}' \
52+
--set-json public.containers[0].resources='{"limits": {"cpu": "75m", "memory": "150Mi"}, "requests": {"cpu": "25m", "memory": "50Mi"}}' \
53+
${{ inputs.params }} \
54+
55+
56+
deploy-golddr-dev:
57+
name: Deploys Dev (Golddr)
58+
uses: ./.github/workflows/deploy.yml
59+
secrets: inherit
60+
with:
61+
autoscaling: false
62+
environment: golddr-dev
63+
release: ${{inputs.tag}}
64+
tag: ${{ inputs.tag }}
65+
triggers: '' #omit=always;
66+
params: |
67+
--set-string global.domain='apps.golddr.devops.gov.bc.ca' \
68+
--set-string global.vault.authPath='auth/k8s-golddr' \
69+
--set-string global.license='c3141c' \
70+
--set-string global.zone='dev' \
71+
--set-string global.vault.role='nonprod' \
72+
--set-string global.vault.zone='dev' \
73+
--set-json dops.containers[0].resources='{"limits": {"cpu": "1000m", "memory": "2000Mi"}, "requests": {"cpu": "25m", "memory": "50Mi"}}' \
74+
--set-json frontend.containers[0].resources='{"limits": {"cpu": "75m", "memory": "150Mi"}, "requests": {"cpu": "25m", "memory": "50Mi"}}' \
75+
--set-json scheduler.containers[0].resources='{"limits": {"cpu": "75m", "memory": "150Mi"}, "requests": {"cpu": "25m", "memory": "50Mi"}}' \
76+
--set-json policy.containers[0].resources='{"limits": {"cpu": "75m", "memory": "150Mi"}, "requests": {"cpu": "25m", "memory": "50Mi"}}' \
77+
--set-json vehicles.containers[0].resources='{"limits": {"cpu": "300m", "memory": "500Mi"}, "requests": {"cpu": "200m", "memory": "400Mi"}}' \
78+
--set-json public.containers[0].resources='{"limits": {"cpu": "75m", "memory": "150Mi"}, "requests": {"cpu": "25m", "memory": "50Mi"}}' \
79+
${{ inputs.params }} \

‎.github/workflows/pr-close.yml‎

Lines changed: 28 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,38 @@ concurrency:
1010
cancel-in-progress: true
1111

1212
jobs:
13-
cleanup:
13+
cleanup-silver:
1414
name: Cleanup OpenShift and/or Promote Images
15-
uses: bcgov/quickstart-openshift-helpers/.github/workflows/.pr-close.yml@d9b3d32fb3f03c4699c2dce83ddfff042cd31a1f # v1.0.0
15+
uses: bcgov/quickstart-openshift-helpers/.github/workflows/.pr-close.yml@v1.0.0 # v1.0.0
1616
secrets:
1717
oc_namespace: ${{ secrets.OC_NAMESPACE }}
1818
oc_token: ${{ secrets.OC_TOKEN }}
19-
oc_server: ${{ vars.OC_SERVER }}
19+
oc_server: ${{ secrets.OC_SERVER }}
2020
with:
21+
environment: dev
22+
cleanup: helm
23+
packages: dops frontend scheduler vehicles policy public
24+
25+
cleanup-gold:
26+
name: Cleanup OpenShift and/or Promote Images
27+
uses: bcgov/quickstart-openshift-helpers/.github/workflows/.pr-close.yml@v1.0.0 # v1.0.0
28+
secrets:
29+
oc_namespace: ${{ secrets.OC_NAMESPACE }}
30+
oc_token: ${{ secrets.OC_TOKEN }}
31+
oc_server: ${{ secrets.OC_SERVER }}
32+
with:
33+
environment: gold-dev
34+
cleanup: helm
35+
packages: dops frontend scheduler vehicles policy public
36+
37+
cleanup-golddr:
38+
name: Cleanup OpenShift and/or Promote Images
39+
uses: bcgov/quickstart-openshift-helpers/.github/workflows/.pr-close.yml@v1.0.0 # v1.0.0
40+
secrets:
41+
oc_namespace: ${{ secrets.OC_NAMESPACE }}
42+
oc_token: ${{ secrets.OC_TOKEN }}
43+
oc_server: ${{ secrets.OC_SERVER }}
44+
with:
45+
environment: golddr-dev
2146
cleanup: helm
2247
packages: dops frontend scheduler vehicles policy public

‎.github/workflows/pr-open.yml‎

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,21 @@ jobs:
7575
triggers: '${{ matrix.package }}/' #omit to build everything
7676

7777
# https://github.com/bcgov/action-deployer-openshift
78-
deploys-dev:
79-
name: Deploys (Dev)
78+
deploys-silver-dev:
79+
name: Deploys (Silver Dev)
8080
needs: [builds, vars]
81-
uses: ./.github/workflows/dev.yml
81+
uses: ./.github/workflows/silver-dev.yml
82+
secrets: inherit
83+
with:
84+
tag: ${{ needs.vars.outputs.pr }}
85+
params: |
86+
--set-string global.env.pr_num='${{ needs.vars.outputs.pr }}' \
87+
--set-string global.env.release_num='${{ needs.vars.outputs.pr }}' \
88+
89+
deploys-gold-dev:
90+
name: Deploys (Gold Dev)
91+
needs: [builds, vars]
92+
uses: ./.github/workflows/gold-dev.yml
8293
secrets: inherit
8394
with:
8495
tag: ${{ needs.vars.outputs.pr }}

.github/workflows/dev.yml renamed to .github/workflows/silver-dev.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
name: Deploy Dev
2+
name: Deploy Dev (Silver)
33

44
on:
55
workflow_dispatch:
@@ -28,7 +28,7 @@ on:
2828
type: string
2929
jobs:
3030
deploy-dev:
31-
name: Deploys (DEV)
31+
name: Deploys Dev (Silver)
3232
uses: ./.github/workflows/deploy.yml
3333
secrets: inherit
3434
with:

‎charts/onroutebc/values.yaml‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ frontend:
3333
configmap:
3434
enabled: true
3535
data:
36-
ACCESS_API_URL: "https://{{.Release.Name}}-vehicles.apps.silver.devops.gov.bc.ca"
37-
PUBLIC_API_URL: "https://{{.Release.Name}}-public.apps.silver.devops.gov.bc.ca"
38-
POLICY_URL: "https://{{.Release.Name}}-policy.apps.silver.devops.gov.bc.ca"
36+
ACCESS_API_URL: "https://{{.Release.Name}}-vehicles.{{.Values.global.domain}}"
37+
PUBLIC_API_URL: "https://{{.Release.Name}}-public.{{.Values.global.domain}}"
38+
POLICY_URL: "https://{{.Release.Name}}-policy.{{.Values.global.domain}}"
3939
DEPLOY_ENVIRONMENT: "{{.Values.global.vault.zone}}"
4040
PR_NUM: "{{.Values.global.env.pr_num}}"
4141
RELEASE_NUM: "{{.Values.global.env.release_num}}"
@@ -137,7 +137,7 @@ frontend:
137137
route.openshift.io/termination: "edge"
138138
enabled: true
139139
hosts:
140-
- host: "{{.Release.Name}}-frontend.apps.silver.devops.gov.bc.ca"
140+
- host: "{{.Release.Name}}-frontend.{{.Values.global.domain}}"
141141
paths:
142142
- path: /
143143
pathType: ImplementationSpecific
@@ -188,11 +188,11 @@ vehicles:
188188
configmap:
189189
enabled: true
190190
data:
191-
DOPS_URL: "https://{{.Release.Name}}-dops.apps.silver.devops.gov.bc.ca"
192-
POLICY_URL: "https://{{.Release.Name}}-policy.apps.silver.devops.gov.bc.ca"
193-
FRONTEND_URL: "https://{{.Release.Name}}-frontend.apps.silver.devops.gov.bc.ca"
194-
ACCESS_API_URL: "https://{{.Release.Name}}-vehicles.apps.silver.devops.gov.bc.ca"
195-
PAYBC_REDIRECT: "https://{{.Release.Name}}-frontend.apps.silver.devops.gov.bc.ca/payment"
191+
DOPS_URL: "https://{{.Release.Name}}-dops.{{.Values.global.domain}}"
192+
POLICY_URL: "https://{{.Release.Name}}-policy.{{.Values.global.domain}}"
193+
FRONTEND_URL: "https://{{.Release.Name}}-frontend.{{.Values.global.domain}}"
194+
ACCESS_API_URL: "https://{{.Release.Name}}-vehicles.{{.Values.global.domain}}"
195+
PAYBC_REDIRECT: "https://{{.Release.Name}}-frontend.{{.Values.global.domain}}/payment"
196196
containers:
197197
- name: vehicles
198198
command:
@@ -289,7 +289,7 @@ vehicles:
289289
route.openshift.io/termination: "edge"
290290
enabled: true
291291
hosts:
292-
- host: "{{.Release.Name}}-vehicles.apps.silver.devops.gov.bc.ca"
292+
- host: "{{.Release.Name}}-vehicles.{{.Values.global.domain}}"
293293
paths:
294294
- path: /
295295
pathType: ImplementationSpecific
@@ -338,7 +338,7 @@ public:
338338
configmap:
339339
enabled: true
340340
data:
341-
FRONTEND_URL: "https://{{.Release.Name}}-frontend.apps.silver.devops.gov.bc.ca"
341+
FRONTEND_URL: "https://{{.Release.Name}}-frontend.{{.Values.global.domain}}"
342342
containers:
343343
- name: public
344344
command:
@@ -427,7 +427,7 @@ public:
427427
route.openshift.io/termination: "edge"
428428
enabled: true
429429
hosts:
430-
- host: "{{.Release.Name}}-public.apps.silver.devops.gov.bc.ca"
430+
- host: "{{.Release.Name}}-public.{{.Values.global.domain}}"
431431
paths:
432432
- path: /
433433
pathType: ImplementationSpecific
@@ -471,9 +471,9 @@ dops:
471471
configmap:
472472
enabled: true
473473
data:
474-
DOPS_URL: "https://{{.Release.Name}}-dops.apps.silver.devops.gov.bc.ca"
475-
FRONTEND_URL: "https://{{.Release.Name}}-frontend.apps.silver.devops.gov.bc.ca"
476-
ACCESS_API_URL: "https://{{.Release.Name}}-vehicles.apps.silver.devops.gov.bc.ca"
474+
DOPS_URL: "https://{{.Release.Name}}-dops.{{.Values.global.domain}}"
475+
FRONTEND_URL: "https://{{.Release.Name}}-frontend.{{.Values.global.domain}}"
476+
ACCESS_API_URL: "https://{{.Release.Name}}-vehicles.{{.Values.global.domain}}"
477477
containers:
478478
- name: dops
479479
command:
@@ -568,7 +568,7 @@ dops:
568568
route.openshift.io/termination: "edge"
569569
enabled: true
570570
hosts:
571-
- host: "{{.Release.Name}}-dops.apps.silver.devops.gov.bc.ca"
571+
- host: "{{.Release.Name}}-dops.{{.Values.global.domain}}"
572572
paths:
573573
- path: /
574574
pathType: ImplementationSpecific
@@ -617,7 +617,7 @@ scheduler:
617617
configmap:
618618
enabled: true
619619
data:
620-
ACCESS_API_URL: "https://{{.Release.Name}}-vehicles.apps.silver.devops.gov.bc.ca"
620+
ACCESS_API_URL: "https://{{.Release.Name}}-vehicles.{{.Values.global.domain}}"
621621
containers:
622622
- name: scheduler
623623
command:
@@ -679,7 +679,7 @@ scheduler:
679679
route.openshift.io/termination: "edge"
680680
enabled: true
681681
hosts:
682-
- host: "{{.Release.Name}}-scheduler.apps.silver.devops.gov.bc.ca"
682+
- host: "{{.Release.Name}}-scheduler.{{.Values.global.domain}}"
683683
paths:
684684
- path: /
685685
pathType: ImplementationSpecific
@@ -729,7 +729,7 @@ policy:
729729
configmap:
730730
enabled: true
731731
data:
732-
FRONTEND_URL: "https://{{.Release.Name}}-frontend.apps.silver.devops.gov.bc.ca"
732+
FRONTEND_URL: "https://{{.Release.Name}}-frontend.{{.Values.global.domain}}"
733733
containers:
734734
- name: policy
735735
command:
@@ -817,7 +817,7 @@ policy:
817817
route.openshift.io/termination: "edge"
818818
enabled: true
819819
hosts:
820-
- host: "{{.Release.Name}}-policy.apps.silver.devops.gov.bc.ca"
820+
- host: "{{.Release.Name}}-policy.{{.Values.global.domain}}"
821821
paths:
822822
- path: /
823823
pathType: ImplementationSpecific

0 commit comments

Comments
 (0)