Skip to content

Commit

Permalink
Merge branch 'release/pacific-spiny-lumpsucker' into bug/CE-769-Able-…
Browse files Browse the repository at this point in the history
…to-Update-status-on-Pending-review-status
  • Loading branch information
barrfalk authored Jul 17, 2024
2 parents 90194b0 + 201e4dc commit 9e6b38e
Show file tree
Hide file tree
Showing 5 changed files with 97 additions and 72 deletions.
62 changes: 0 additions & 62 deletions .github/workflows/deploy-nats.yml

This file was deleted.

10 changes: 1 addition & 9 deletions .github/workflows/merge-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,6 @@ jobs:
uses: bcgov-nr/[email protected]

# https://github.com/bcgov/quickstart-openshift-helpers
deploy-test:
name: Deploy (test)
uses: bcgov/quickstart-openshift-helpers/.github/workflows/[email protected]
secrets:
oc_namespace: ${{ secrets.OC_NAMESPACE }}
oc_token: ${{ secrets.OC_TOKEN }}
with:
environment: test

deploy-prod:
name: Deploy (prod)
needs: [deploy-test, vars]
Expand All @@ -57,6 +48,7 @@ jobs:
--set global.autoscaling=true
--set frontend.pdb.enabled=true
--set backend.pdb.enabled=true

promote:
name: Promote Images
needs: [deploy-prod, vars]
Expand Down
62 changes: 62 additions & 0 deletions .github/workflows/merge-release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
name: Merge to Release

on:
push:
branches: [release/**]
paths-ignore:
- "*.md"
- ".github/**"
- ".github/graphics/**"
- "!.github/workflows/**"
workflow_dispatch:
inputs:
pr_no:
description: "PR-numbered container set to deploy"
type: number
required: true

concurrency:
# Do not interrupt previous workflows
group: ${{ github.workflow }}
cancel-in-progress: false

jobs:
vars:
name: Set Variables
outputs:
pr: ${{ steps.pr.outputs.pr }}
runs-on: ubuntu-22.04
timeout-minutes: 1
steps:
# Get PR number for squash merges to release
- name: PR Number
id: pr
uses: bcgov-nr/[email protected]

# https://github.com/bcgov/quickstart-openshift-helpers
deploy-test:
name: Deploy (test)
uses: bcgov/quickstart-openshift-helpers/.github/workflows/[email protected]
secrets:
oc_namespace: ${{ secrets.OC_NAMESPACE }}
oc_token: ${{ secrets.OC_TOKEN }}
with:
environment: test

promote:
name: Promote Images
needs: [deploy-test, vars]
runs-on: ubuntu-22.04
permissions:
packages: write
strategy:
matrix:
package: [migrations, backend, frontend, webeoc]
timeout-minutes: 1
steps:
- uses: shrink/actions-docker-registry-tag@v4
with:
registry: ghcr.io
repository: ${{ github.repository }}/${{ matrix.package }}
target: ${{ needs.vars.outputs.pr }}
tags: test
3 changes: 3 additions & 0 deletions charts/app/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ dependencies:
version: 15.5.13
repository: https://charts.bitnami.com/bitnami
alias: bitnami-pg
- name: nats
version: 1.1.12
repository: "https://nats-io.github.io/k8s/helm/charts/"
maintainers:
- name: Om Mishra
email: [email protected]
Expand Down
32 changes: 31 additions & 1 deletion charts/app/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,37 @@ backup:
cpu: 20m
memory: 128Mi

#-- the components of the application, backend.
# Deploys JetStream
nats:
enabled: true
config:
replicaCount: 1
resources:
requests:
cpu: 100m
memory: 100Mi
limits:
cpu: 200m
memory: 400Mi
jetstream:
enabled: true
fileStore:
pvc:
size: 200Mi
memoryStore:
enabled: true
maxSize: 250Mi
cluster:
enabled: true
natsBox:
enabled: false
persistence:
enabled: true
size: 200Mi
reloader:
enabled: false

#-- WebEOC Container
webeoc:
#-- enable or disable backend
enabled: true
Expand Down

0 comments on commit 9e6b38e

Please sign in to comment.