From e4f1dff4bea2494d69b0e6b7a9191bddd7fa807c Mon Sep 17 00:00:00 2001 From: Csaky Date: Fri, 18 Oct 2024 14:26:48 -0700 Subject: [PATCH] disable backups for dev and test --- .github/environments/values.dev.yaml | 4 ++++ .github/environments/values.test.yaml | 4 ++++ charts/coms/Chart.yaml | 4 ++-- charts/coms/values.yaml | 2 +- charts/postgres/Chart.yaml | 2 +- charts/postgres/templates/pgbackrest-s3-secret.yaml | 2 ++ 6 files changed, 14 insertions(+), 4 deletions(-) diff --git a/.github/environments/values.dev.yaml b/.github/environments/values.dev.yaml index 1b96a1ae..8ed080a8 100644 --- a/.github/environments/values.dev.yaml +++ b/.github/environments/values.dev.yaml @@ -50,3 +50,7 @@ postgres: limits: cpu: 100m memory: 512Mi + + # -------- backups --------- + pgBackRestConfig: + repos: ~ diff --git a/.github/environments/values.test.yaml b/.github/environments/values.test.yaml index ae9addc5..8cba8e68 100644 --- a/.github/environments/values.test.yaml +++ b/.github/environments/values.test.yaml @@ -50,3 +50,7 @@ postgres: limits: cpu: 100m memory: 512Mi + + # -------- backups --------- + pgBackRestConfig: + repos: ~ diff --git a/charts/coms/Chart.yaml b/charts/coms/Chart.yaml index 5f087b0a..de66ea46 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.4 +version: 0.1.5 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.4 + version: 0.1.5 repository: "file://../postgres" condition: postgres.enabled alias: postgres diff --git a/charts/coms/values.yaml b/charts/coms/values.yaml index 4cb6b496..329adf59 100644 --- a/charts/coms/values.yaml +++ b/charts/coms/values.yaml @@ -250,4 +250,4 @@ postgres: # -------- backups --------- pgBackRestConfig: - repos: {} + repos: ~ diff --git a/charts/postgres/Chart.yaml b/charts/postgres/Chart.yaml index 15cb7f03..62e563f0 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.4 +version: 0.1.5 appVersion: 5.6.0 diff --git a/charts/postgres/templates/pgbackrest-s3-secret.yaml b/charts/postgres/templates/pgbackrest-s3-secret.yaml index 6af963c6..6d41abf4 100644 --- a/charts/postgres/templates/pgbackrest-s3-secret.yaml +++ b/charts/postgres/templates/pgbackrest-s3-secret.yaml @@ -1,4 +1,5 @@ +{{- if .Values.pgBackRestConfig.repos }} {{- range $index, $repo := .Values.pgBackRestConfig.repos }} {{- if $repo.s3 }} {{- $secretExists := (lookup "v1" "Secret" $.Release.Namespace "pgbackrest-s3" ) }} @@ -20,3 +21,4 @@ stringData: {{- end }} {{- end }} {{- end }} +{{- end }}