fix: crunchy templates issues

bcgov · Oct 21, 2024 · f580ce6 · f580ce6
1 parent 674592e
commit f580ce6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/charts/app/templates/crunchy-postgres/templates/PostgresCluster.yaml b/charts/app/templates/crunchy-postgres/templates/PostgresCluster.yaml
@@ -27,7 +27,7 @@ spec:
  repo2-s3-uri-style: path # This is mandatory since the backups are path based.
  repo2-path: {{ .Values.crunchy.clone.path }} # path to the backup where cluster will bootstrap from
  repo:
- name: repo2 # hardcoded since repo 2, it is always backed up to object storage.
+ name: repo1 # hardcoded since repo 1, it is always backed up to object storage.
  s3:
  bucket: {{ .Values.crunchy.pgBackRest.s3.bucket }}
  endpoint: {{ .Values.crunchy.pgBackRest.s3.endpoint }}
@@ -92,7 +92,7 @@ spec:
  matchLabels:
  postgres-operator.crunchydata.com/cluster:
  {{ template "crunchy-postgres.fullname" . }}
- postgres-operator.crunchydata.com/instance-set: {{ .Values.crunchy.instances.name }}-ha
+ postgres-operator.crunchydata.com/instance-set: {{ .Values.crunchy.instances.name }}
 
  users:
  - name: {{ .Values.global.config.dbName }}
@@ -125,8 +125,8 @@ spec:
  full: {{ .Values.crunchy.pgBackRest.s3.fullBackupSchedule }}
  incremental: {{ .Values.crunchy.pgBackRest.s3.incrementalBackupSchedule }}
  s3:
- bucket: {{ .Values.crunchy.pgBackRest.s3.bucket }}
- endpoint: {{ .Values.crunchy.pgBackRest.s3.endpoint }}
+ bucket: {{ .Values.crunchy.pgBackRest.s3.bucket | quote }}
+ endpoint: {{ .Values.crunchy.pgBackRest.s3.endpoint | quote }}
  region: "ca-central-1"
  - name: repo2
  schedules:
@@ -224,7 +224,7 @@ spec:
  labelSelector:
  matchLabels:
  postgres-operator.crunchydata.com/cluster:
- {{ .Values.crunchy.instances.name }}
+ {{ template "crunchy-postgres.fullname" . }}
  postgres-operator.crunchydata.com/role: pgbouncer
  {{- end }}
  {{- end }}
diff --git a/charts/app/values.yaml b/charts/app/values.yaml
@@ -159,15 +159,15 @@ crunchy: # enable it for TEST and PROD, for PR based pipelines simply use single
 
  pgBackRest:
  enabled: true
- backupPath: /backups/cluster/version
+ backupPath: /backups/test/cluster/version # change it for PROD, create values-prod.yaml
  clusterCounter: 1 # this is the number to identify what is the current counter for the cluster, each time it is cloned it should be incremented.
  image: artifacts.developer.gov.bc.ca/bcgov-docker-local/crunchy-pgbackrest:ubi8-2.49-0
  # If retention-full-type set to 'count' then the oldest backups will expire when the number of backups reach the number defined in retention
  # If retention-full-type set to 'time' then the number defined in retention will take that many days worth of full backups before expiration
  retentionFullType: count
  s3:
  retention: 7 # one weeks backup in object store.
- bucket: nrsitest
+ bucket: nrsitetst
  endpoint: nrs.objectstore.gov.bc.ca
  accessKey: ~
  secretKey: ~