Skip to content

Commit

Permalink
Merge branch 'main' into feat/ci/legacydb
Browse files Browse the repository at this point in the history
  • Loading branch information
paulushcgcj authored Aug 26, 2024
2 parents c55bb77 + bd26407 commit fb0d155
Show file tree
Hide file tree
Showing 82 changed files with 9,984 additions and 6,205 deletions.
38 changes: 19 additions & 19 deletions .github/workflows/merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: Deploys
uses: bcgov-nr/action-deployer-openshift@v2.3.0
uses: bcgov-nr/action-deployer-openshift@v3.0.0
with:
file: common/openshift.init.yml
oc_namespace: ${{ secrets.OC_NAMESPACE }}
Expand Down Expand Up @@ -113,7 +113,7 @@ jobs:
- uses: actions/checkout@v4

- name: Deploy Database Backup
uses: bcgov-nr/action-deployer-openshift@v2.3.0
uses: bcgov-nr/action-deployer-openshift@v3.0.0
with:
file: database/openshift.backup.yml
oc_namespace: ${{ secrets.OC_NAMESPACE }}
Expand All @@ -133,7 +133,7 @@ jobs:
oc create job --from=cronjob/${{ github.event.repository.name }}-${{ env.ZONE }}-database-backup ${{ github.event.repository.name }}-${{ env.ZONE }}-database-backup-$(date +%Y%m%d%H%M%S)
- name: Deploy Database
uses: bcgov-nr/action-deployer-openshift@v2.3.0
uses: bcgov-nr/action-deployer-openshift@v3.0.0
with:
file: database/openshift.deploy.yml
oc_namespace: ${{ secrets.OC_NAMESPACE }}
Expand All @@ -145,7 +145,7 @@ jobs:
-p PROMOTE=${{ github.repository }}/database:${{ env.ZONE }}

- name: Deploy Legacy
uses: bcgov-nr/action-deployer-openshift@v2.3.0
uses: bcgov-nr/action-deployer-openshift@v3.0.0
with:
file: legacy/openshift.deploy.yml
oc_namespace: ${{ secrets.OC_NAMESPACE }}
Expand All @@ -158,7 +158,7 @@ jobs:
-p PROMOTE=${{ github.repository }}/legacy:${{ env.ZONE }}

- name: Deploy Processor
uses: bcgov-nr/action-deployer-openshift@v2.3.0
uses: bcgov-nr/action-deployer-openshift@v3.0.0
with:
file: processor/openshift.deploy.yml
oc_namespace: ${{ secrets.OC_NAMESPACE }}
Expand All @@ -172,7 +172,7 @@ jobs:
-p BCREGISTRY_URI='https://bcregistry-prod.apigee.net'

- name: Deploy Backend ConfigMap
uses: bcgov-nr/action-deployer-openshift@v2.3.0
uses: bcgov-nr/action-deployer-openshift@v3.0.0
with:
file: backend/openshift.configmap.test.yml
oc_namespace: ${{ secrets.OC_NAMESPACE }}
Expand All @@ -183,7 +183,7 @@ jobs:
-p ZONE=${{ env.ZONE }}

- name: Deploy Backend
uses: bcgov-nr/action-deployer-openshift@v2.3.0
uses: bcgov-nr/action-deployer-openshift@v3.0.0
with:
file: backend/openshift.deploy.yml
oc_namespace: ${{ secrets.OC_NAMESPACE }}
Expand All @@ -201,7 +201,7 @@ jobs:
-p FRONTEND_URL=${{ env.URL }}

- name: Dev data replacement
uses: bcgov-nr/action-deployer-openshift@v2.3.0
uses: bcgov-nr/action-deployer-openshift@v3.0.0
with:
file: database/openshift.dev.yml
oc_namespace: ${{ secrets.OC_NAMESPACE }}
Expand All @@ -211,7 +211,7 @@ jobs:
parameters: -p ZONE=${{ env.ZONE }} -p NAME=${{ github.event.repository.name }}

- name: Deploy Frontend ConfigMap
uses: bcgov-nr/action-deployer-openshift@v2.3.0
uses: bcgov-nr/action-deployer-openshift@v3.0.0
with:
file: frontend/openshift.configmap.test.yml
oc_namespace: ${{ secrets.OC_NAMESPACE }}
Expand All @@ -222,7 +222,7 @@ jobs:
-p ZONE=${{ env.ZONE }}

- name: Deploy Frontend
uses: bcgov-nr/action-deployer-openshift@v2.3.0
uses: bcgov-nr/action-deployer-openshift@v3.0.0
with:
file: frontend/openshift.deploy.yml
oc_namespace: ${{ secrets.OC_NAMESPACE }}
Expand Down Expand Up @@ -273,7 +273,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: Deploys
uses: bcgov-nr/action-deployer-openshift@v2.3.0
uses: bcgov-nr/action-deployer-openshift@v3.0.0
with:
file: common/openshift.init.yml
oc_namespace: ${{ secrets.OC_NAMESPACE }}
Expand Down Expand Up @@ -313,7 +313,7 @@ jobs:
- uses: actions/checkout@v4

- name: Deploy Database Backup
uses: bcgov-nr/action-deployer-openshift@v2.3.0
uses: bcgov-nr/action-deployer-openshift@v3.0.0
with:
file: database/openshift.backup.yml
oc_namespace: ${{ secrets.OC_NAMESPACE }}
Expand All @@ -334,7 +334,7 @@ jobs:
oc create job --from=cronjob/${{ github.event.repository.name }}-${{ env.ZONE }}-database-backup ${{ github.event.repository.name }}-${{ env.ZONE }}-database-backup-$(date +%Y%m%d%H%M%S)
- name: Deploy Database
uses: bcgov-nr/action-deployer-openshift@v2.3.0
uses: bcgov-nr/action-deployer-openshift@v3.0.0
with:
file: database/openshift.deploy.yml
oc_namespace: ${{ secrets.OC_NAMESPACE }}
Expand All @@ -346,7 +346,7 @@ jobs:
-p PROMOTE=${{ github.repository }}/database:${{ env.PREV }}

- name: Deploy Legacy
uses: bcgov-nr/action-deployer-openshift@v2.3.0
uses: bcgov-nr/action-deployer-openshift@v3.0.0
with:
file: legacy/openshift.deploy.yml
oc_namespace: ${{ secrets.OC_NAMESPACE }}
Expand All @@ -359,7 +359,7 @@ jobs:
-p PROMOTE=${{ github.repository }}/legacy:${{ env.PREV }}

- name: Deploy Processor
uses: bcgov-nr/action-deployer-openshift@v2.3.0
uses: bcgov-nr/action-deployer-openshift@v3.0.0
with:
file: processor/openshift.deploy.yml
oc_namespace: ${{ secrets.OC_NAMESPACE }}
Expand All @@ -373,7 +373,7 @@ jobs:
-p BCREGISTRY_URI='https://bcregistry-prod.apigee.net'

- name: Deploy Backend ConfigMap
uses: bcgov-nr/action-deployer-openshift@v2.3.0
uses: bcgov-nr/action-deployer-openshift@v3.0.0
with:
file: backend/openshift.configmap.prod.yml
oc_namespace: ${{ secrets.OC_NAMESPACE }}
Expand All @@ -384,7 +384,7 @@ jobs:
-p ZONE=${{ env.ZONE }}

- name: Deploy Backend
uses: bcgov-nr/action-deployer-openshift@v2.3.0
uses: bcgov-nr/action-deployer-openshift@v3.0.0
with:
file: backend/openshift.deploy.yml
oc_namespace: ${{ secrets.OC_NAMESPACE }}
Expand All @@ -402,7 +402,7 @@ jobs:
-p FRONTEND_URL=${{ env.URL }}

- name: Deploy Frontend ConfigMap
uses: bcgov-nr/action-deployer-openshift@v2.3.0
uses: bcgov-nr/action-deployer-openshift@v3.0.0
with:
file: frontend/openshift.configmap.prod.yml
oc_namespace: ${{ secrets.OC_NAMESPACE }}
Expand All @@ -413,7 +413,7 @@ jobs:
-p ZONE=${{ env.ZONE }}

- name: Deploy Frontend
uses: bcgov-nr/action-deployer-openshift@v2.3.0
uses: bcgov-nr/action-deployer-openshift@v3.0.0
with:
file: frontend/openshift.deploy.yml
oc_namespace: ${{ secrets.OC_NAMESPACE }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-close.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ concurrency:
jobs:
cleanup:
name: Cleanup and Images
uses: bcgov/quickstart-openshift-helpers/.github/workflows/.pr-close.yml@v0.5.0
uses: bcgov/quickstart-openshift-helpers/.github/workflows/.pr-close.yml@v0.6.1
secrets:
oc_namespace: ${{ secrets.OC_NAMESPACE }}
oc_token: ${{ secrets.OC_TOKEN }}
Expand Down
22 changes: 11 additions & 11 deletions .github/workflows/pr-open.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
steps:
- uses: actions/checkout@v4

- uses: bcgov-nr/action-builder-ghcr@v2.1.0
- uses: bcgov-nr/action-builder-ghcr@v2.2.0
name: Build (${{ matrix.package }})
with:
package: ${{ matrix.package }}
Expand All @@ -74,7 +74,7 @@ jobs:
- uses: actions/checkout@v4

- name: Initializing Deployment
uses: bcgov-nr/action-deployer-openshift@v2.3.0
uses: bcgov-nr/action-deployer-openshift@v3.0.0
with:
file: common/openshift.init.yml
oc_namespace: ${{ secrets.OC_NAMESPACE }}
Expand Down Expand Up @@ -102,7 +102,7 @@ jobs:
-p CHES_MAIL_COPY=${{ secrets.CHES_MAIL_COPY }}

- name: Deploy Database Backup
uses: bcgov-nr/action-deployer-openshift@v2.3.0
uses: bcgov-nr/action-deployer-openshift@v3.0.0
with:
file: database/openshift.backup.yml
oc_namespace: ${{ secrets.OC_NAMESPACE }}
Expand All @@ -124,7 +124,7 @@ jobs:
${{ github.event.repository.name }}-${{ github.event.number }}-database-backup-$(date +%Y%m%d%H%M%S)
- name: Deploy Database
uses: bcgov-nr/action-deployer-openshift@v2.3.0
uses: bcgov-nr/action-deployer-openshift@v3.0.0
with:
file: database/openshift.deploy.yml
oc_namespace: ${{ secrets.OC_NAMESPACE }}
Expand All @@ -136,7 +136,7 @@ jobs:
-p PROMOTE=${{ github.repository }}/database:${{ github.event.number }}

- name: Deploy Legacy
uses: bcgov-nr/action-deployer-openshift@v2.3.0
uses: bcgov-nr/action-deployer-openshift@v3.0.0
with:
file: legacy/openshift.deploy.yml
oc_namespace: ${{ secrets.OC_NAMESPACE }}
Expand All @@ -149,7 +149,7 @@ jobs:
-p PROMOTE=${{ github.repository }}/legacy:${{ github.event.number }}

- name: Deploy Processor
uses: bcgov-nr/action-deployer-openshift@v2.3.0
uses: bcgov-nr/action-deployer-openshift@v3.0.0
with:
file: processor/openshift.deploy.yml
oc_namespace: ${{ secrets.OC_NAMESPACE }}
Expand All @@ -163,7 +163,7 @@ jobs:
-p BCREGISTRY_URI='https://bcregistry-prod.apigee.net'

- name: Deploy Backend ConfigMap
uses: bcgov-nr/action-deployer-openshift@v2.3.0
uses: bcgov-nr/action-deployer-openshift@v3.0.0
with:
file: backend/openshift.configmap.dev.yml
oc_namespace: ${{ secrets.OC_NAMESPACE }}
Expand All @@ -174,7 +174,7 @@ jobs:
-p ZONE=${{ github.event.number }}

- name: Deploy Backend
uses: bcgov-nr/action-deployer-openshift@v2.3.0
uses: bcgov-nr/action-deployer-openshift@v3.0.0
with:
file: backend/openshift.deploy.yml
oc_namespace: ${{ secrets.OC_NAMESPACE }}
Expand All @@ -192,7 +192,7 @@ jobs:
-p FRONTEND_URL=${{ needs.vars.outputs.url }}

- name: Dev data replacement
uses: bcgov-nr/action-deployer-openshift@v2.3.0
uses: bcgov-nr/action-deployer-openshift@v3.0.0
with:
file: database/openshift.dev.yml
oc_namespace: ${{ secrets.OC_NAMESPACE }}
Expand All @@ -202,7 +202,7 @@ jobs:
parameters: -p ZONE=${{ github.event.number }}

- name: Deploy Frontend ConfigMap
uses: bcgov-nr/action-deployer-openshift@v2.3.0
uses: bcgov-nr/action-deployer-openshift@v3.0.0
with:
file: frontend/openshift.configmap.dev.yml
oc_namespace: ${{ secrets.OC_NAMESPACE }}
Expand All @@ -213,7 +213,7 @@ jobs:
-p ZONE=${{ github.event.number }}

- name: Deploy Frontend
uses: bcgov-nr/action-deployer-openshift@v2.3.0
uses: bcgov-nr/action-deployer-openshift@v3.0.0
with:
file: frontend/openshift.deploy.yml
oc_namespace: ${{ secrets.OC_NAMESPACE }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-validate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
validate:
name: Validate PR
needs: [vars]
uses: bcgov/quickstart-openshift-helpers/.github/workflows/.pr-validate.yml@v0.5.0
uses: bcgov/quickstart-openshift-helpers/.github/workflows/.pr-validate.yml@v0.6.1
with:
markdown_links: |
Any successful deployments (not always required) will be available [here](https://${{ github.event.repository.name }}-${{ needs.vars.outputs.url }}-frontend.apps.silver.devops.gov.bc.ca/)
Expand Down
2 changes: 1 addition & 1 deletion backend/.mvn/wrapper/maven-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@
# under the License.
wrapperVersion=3.3.2
distributionType=only-script
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.7/apache-maven-3.9.7-bin.zip
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip
Loading

0 comments on commit fb0d155

Please sign in to comment.