diff --git a/.github/actions/deploy-to-environment/action.yaml b/.github/actions/deploy-to-environment/action.yaml index a6a0f453..f2a77a72 100644 --- a/.github/actions/deploy-to-environment/action.yaml +++ b/.github/actions/deploy-to-environment/action.yaml @@ -52,7 +52,7 @@ runs: run: >- helm upgrade --install --debug --atomic ${{ inputs.job_name }} ${{ inputs.app_name }} --namespace ${{ inputs.namespace_prefix }}-${{ inputs.namespace_environment }} - --repo https://timcsaky.github.io/common-object-management-service + --repo https://bcgov.github.io/common-object-management-service --values ./.github/environments/values.${{ inputs.environment }}.yaml --set image.repository=ghcr.io/$OWNER_LC --set image.tag=sha-$(git rev-parse --short HEAD) diff --git a/.github/workflows/on-pr-closed.yaml b/.github/workflows/on-pr-closed.yaml index 1efbccb6..57621a7a 100644 --- a/.github/workflows/on-pr-closed.yaml +++ b/.github/workflows/on-pr-closed.yaml @@ -1,9 +1,9 @@ name: Pull Request Closed env: - ACRONYM: migrate + ACRONYM: coms APP_NAME: common-object-management-service - NAMESPACE_PREFIX: 1dca6b + NAMESPACE_PREFIX: bb17f9 on: pull_request: @@ -19,7 +19,7 @@ concurrency: jobs: remove-pr-dev: name: Remove PR build from dev namespace - # if: "! github.event.pull_request.head.repo.fork" + if: "! github.event.pull_request.head.repo.fork" environment: name: pr url: https://${{ env.ACRONYM }}-dev-pr-${{ github.event.number }}.apps.silver.devops.gov.bc.ca diff --git a/.github/workflows/on-pr-opened.yaml b/.github/workflows/on-pr-opened.yaml index 85972d50..5596b4eb 100644 --- a/.github/workflows/on-pr-opened.yaml +++ b/.github/workflows/on-pr-opened.yaml @@ -1,9 +1,9 @@ name: Pull Request Opened env: - ACRONYM: migrate + ACRONYM: coms APP_NAME: common-object-management-service - NAMESPACE_PREFIX: 1dca6b + NAMESPACE_PREFIX: bb17f9 on: pull_request: @@ -21,7 +21,7 @@ concurrency: jobs: build: name: Build & Push - # if: "! github.event.pull_request.head.repo.fork" + if: "! github.event.pull_request.head.repo.fork" runs-on: ubuntu-latest timeout-minutes: 10 steps: diff --git a/.github/workflows/on-push.yaml b/.github/workflows/on-push.yaml index 45b6877d..dac770f6 100644 --- a/.github/workflows/on-push.yaml +++ b/.github/workflows/on-push.yaml @@ -1,9 +1,9 @@ name: Push env: - ACRONYM: migrate + ACRONYM: coms APP_NAME: common-object-management-service - NAMESPACE_PREFIX: 1dca6b + NAMESPACE_PREFIX: bb17f9 on: push: diff --git a/charts/coms/Chart.yaml b/charts/coms/Chart.yaml index fce5df53..5f087b0a 100644 --- a/charts/coms/Chart.yaml +++ b/charts/coms/Chart.yaml @@ -3,7 +3,7 @@ name: common-object-management-service # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.1.2 +version: 0.1.4 kubeVersion: ">= 1.13.0" description: A microservice for managing access control to S3 Objects # A chart can be either an 'application' or a 'library' chart. @@ -28,7 +28,7 @@ sources: - https://github.com/bcgov/common-object-management-service dependencies: - name: postgrescluster - version: 0.1.2 + version: 0.1.4 repository: "file://../postgres" condition: postgres.enabled alias: postgres diff --git a/charts/coms/values.yaml b/charts/coms/values.yaml index b1893b73..4cb6b496 100644 --- a/charts/coms/values.yaml +++ b/charts/coms/values.yaml @@ -247,3 +247,7 @@ postgres: limits: cpu: 50m memory: 128Mi + + # -------- backups --------- + pgBackRestConfig: + repos: {} diff --git a/charts/postgres/Chart.yaml b/charts/postgres/Chart.yaml index 67c4f0fe..15cb7f03 100644 --- a/charts/postgres/Chart.yaml +++ b/charts/postgres/Chart.yaml @@ -3,5 +3,5 @@ name: postgrescluster description: A Helm chart for Kubernetes type: application # The version below should match the version on the PostgresCluster CRD -version: 0.1.2 +version: 0.1.4 appVersion: 5.6.0