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.

Sign up for GitHub

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

Fix: prod parameters deployment and promote #133

Merged
merged 3 commits into from
Nov 7, 2023
Merged

Fix: prod parameters deployment and promote #133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ebc520a
fix: prod deployment
Nov 7, 2023
9454810
fix: promote variable and environments
Nov 7, 2023
6008d71
Merge branch 'main' into fix/prod-deployment
Nov 7, 2023
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
5 changes: 0 additions & 5 deletions .github/workflows/merge.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,14 +63,11 @@ jobs:
include:
- name: database
- name: backend
parameters:
-p PROMOTE=${{ github.repository }}/backend:test
verification_path: "actuator/health"
- name: frontend
parameters:
-p VITE_USER_POOLS_ID=${{ vars.VITE_USER_POOLS_ID }}
-p VITE_USER_POOLS_WEB_CLIENT_ID=${{ vars.VITE_USER_POOLS_WEB_CLIENT_ID }}
-p PROMOTE=${{ github.repository }}/frontend:test
steps:
- uses: bcgov-nr/[email protected]
with:
Expand Down Expand Up @@ -116,8 +113,6 @@ jobs:
include:
- name: database
- name: backend
parameters:
-p PROMOTE=${{ github.repository }}/backend:test
verification_path: "actuator/health"
- name: frontend
parameters:
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/pr-open.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,6 @@ jobs:
triggers: ('common/' 'database/' 'backend/' 'frontend/')
verification_path: /actuator/health
parameters:
-p PROMOTE=${{ github.repository }}/backend:${{ github.event.number }}
-p MIN_REPLICAS=1
-p MAX_REPLICAS=2
- name: frontend
Expand All @@ -106,7 +105,6 @@ jobs:
parameters:
-p VITE_USER_POOLS_ID=${{ vars.VITE_USER_POOLS_ID }}
-p VITE_USER_POOLS_WEB_CLIENT_ID=${{ vars.VITE_USER_POOLS_WEB_CLIENT_ID }}
-p PROMOTE=${{ github.repository }}/frontend:${{ github.event.number }}
-p MIN_REPLICAS=1
-p MAX_REPLICAS=2
steps:
Expand Down
5 changes: 1 addition & 4 deletions backend/openshift.deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,6 @@ parameters:
- name: ORG_NAME
description: Organization name, e.g. bcgov
value: bcgov
- name: PROMOTE
description: Image (namespace/name:tag) to promote/import
value: bcgov/quickstart-openshift-backends/backend:test
- name: DB_POOL_CONN_TIMEOUT
description: Maximum number of milliseconds that a client will wait for a connection from the pool.
value: "90000"
Expand All @@ -61,7 +58,7 @@ objects:
- name: "${IMAGE_TAG}"
from:
kind: DockerImage
name: "${REGISTRY}/${PROMOTE}"
name: ${REGISTRY}/${ORG_NAME}/${NAME}/${COMPONENT}:${ZONE}
referencePolicy:
type: Local
- apiVersion: v1
Expand Down
8 changes: 4 additions & 4 deletions frontend/openshift.deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ parameters:
- name: COMPONENT
description: Component name
value: frontend
- name: ORG_NAME
description: Organization name
value: bcgov
- name: ZONE
description: Deployment zone, e.g. pr-### or prod
required: true
Expand All @@ -35,9 +38,6 @@ parameters:
- name: REGISTRY
description: Container registry to import from (internal is image-registry.openshift-image-registry.svc:5000)
value: ghcr.io
- name: PROMOTE
description: Image (namespace/name:tag) to promote/import
value: bcgov/nr-silva/frontend:prod
- name: LOG_LEVEL
description: Caddy logging level DEBUG, INFO, WARN, ERROR, PANIC, and FATAL (https://github.com/caddyserver/caddy/blob/master/logging.go)
value: "info"
Expand All @@ -63,7 +63,7 @@ objects:
- name: ${IMAGE_TAG}
from:
kind: DockerImage
name: ${REGISTRY}/${PROMOTE}
name: ${REGISTRY}/${ORG_NAME}/${NAME}/${COMPONENT}:${ZONE}
referencePolicy:
type: Local
- apiVersion: v1
Expand Down