Merge pull request #27 from jouve/postgresql

[postgresql] bitnami/common 2.10.x

charts/postgresql/Chart.lock

@@ -1,6 +1,6 @@
 dependencies:
 - name: common
   repository: oci://registry-1.docker.io/bitnamicharts
-  version: 2.8.0
-digest: sha256:8ab32897fda14bd026e41d2e532e07b1ea04a31588031cd50aa06d31748d858a
-generated: "2023-08-21T11:11:19.253395+02:00"
+  version: 2.10.1
+digest: sha256:3f8cae6c1c6625ed483dbccffae6e274006e5bb3d79b2f1abba15c765d2b6a04
+generated: "2023-09-09T20:54:39.474212926+02:00"

charts/postgresql/Chart.yaml

@@ -1,13 +1,14 @@
 apiVersion: v2
 name: postgresql
 description: Deploy postgresql using cloudnative-pg operator
+icon: https://raw.githubusercontent.com/cloudnative-pg/artwork/main/cloudnativepg-logo.svg
 type: application
 keywords:
 - database
 - postgresql
 - cloudnative-pg
-version: 0.4.5
-appVersion: "15.3"
+version: 0.5.0
+appVersion: "15.4"
 dependencies:
 - name: common
   repository: oci://registry-1.docker.io/bitnamicharts
@@ -21,6 +22,6 @@ maintainers:
 annotations:
   artifacthub.io/images: |
     - name: postgresql
-      image: ghcr.io/cloudnative-pg/postgresql:15.3-4
+      image: ghcr.io/cloudnative-pg/postgresql:15.4-8
   artifacthub.io/recommendations: |
     - url: https://artifacthub.io/packages/helm/cloudnative-pg/cloudnative-pg

charts/postgresql/ci/backup-existing-values.yaml

@@ -0,0 +1,5 @@
+backup:
+  enabled: true
+  endpointURL: https://my.s3.local
+  s3:
+    existingSecret: foo

charts/postgresql/ci/backup-obc-values.yaml

@@ -0,0 +1,6 @@
+backup:
+  enabled: true
+  endpointURL: https://my.s3.local
+  s3:
+    objectBucketClaim:
+      enabled: true

charts/postgresql/ci/cert-manager-values.yaml

@@ -0,0 +1,2 @@
+certificates:
+  mode: cert-manager

charts/postgresql/ci/default-values.yaml

@@ -0,0 +1 @@
+{}

charts/postgresql/templates/backup/objectbucketclaim.yaml

@@ -4,12 +4,9 @@ kind: ObjectBucketClaim
 metadata:
   name: {{ template "common.names.fullname" . }}-backup
   namespace: {{ include "common.names.namespace" . | quote }}
-  labels: {{- include "common.labels.standard" . | nindent 4 }}
-    {{- if .Values.commonLabels }}
-    {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
-    {{- end }}
-  {{- if .Values.commonAnnotations }}
-  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+  labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" . ) | nindent 4 }}
+  {{- with .Values.commonAnnotations }}
+  annotations: {{- include "common.tplvalues.render" ( dict "value" . "context" $ ) | nindent 4 }}
   {{- end }}
 spec:
   bucketName: {{ if .Values.backup.bucketName }}{{ tpl .Values.backup.bucketName $ }}{{ else }}{{ include "common.names.namespace" . }}-{{ template "common.names.fullname" . }}-backup{{ end }}

charts/postgresql/templates/backup/role.yaml

@@ -4,12 +4,9 @@ kind: Role
 metadata:
   name: {{ template "common.names.fullname" . }}-backup
   namespace: {{ include "common.names.namespace" . | quote }}
-  labels: {{- include "common.labels.standard" . | nindent 4 }}
-    {{- if .Values.commonLabels }}
-    {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
-    {{- end }}
-  {{- if .Values.commonAnnotations }}
-  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+  labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" . ) | nindent 4 }}
+  {{- with .Values.commonAnnotations }}
+  annotations: {{- include "common.tplvalues.render" ( dict "value" . "context" $ ) | nindent 4 }}
   {{- end }}
 rules:
   - apiGroups:

charts/postgresql/templates/backup/rolebinding.yaml

@@ -4,12 +4,9 @@ kind: RoleBinding
 metadata:
   name: {{ template "common.names.fullname" . }}-backup
   namespace: {{ include "common.names.namespace" . | quote }}
-  labels: {{- include "common.labels.standard" . | nindent 4 }}
-    {{- if .Values.commonLabels }}
-    {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
-    {{- end }}
-  {{- if .Values.commonAnnotations }}
-  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+  labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" . ) | nindent 4 }}
+  {{- with .Values.commonAnnotations }}
+  annotations: {{- include "common.tplvalues.render" ( dict "value" . "context" $ ) | nindent 4 }}
   {{- end }}
 subjects:
   - kind: ServiceAccount

charts/postgresql/templates/backup/scheduledbackup.yaml

@@ -4,12 +4,9 @@ kind: ScheduledBackup
 metadata:
   name: {{ template "common.names.fullname" . }}-backup
   namespace: {{ include "common.names.namespace" . | quote }}
-  labels: {{- include "common.labels.standard" . | nindent 4 }}
-    {{- if .Values.commonLabels }}
-    {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
-    {{- end }}
-  {{- if .Values.commonAnnotations }}
-  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+  labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" . ) | nindent 4 }}
+  {{- with .Values.commonAnnotations }}
+  annotations: {{- include "common.tplvalues.render" ( dict "value" . "context" $ ) | nindent 4 }}
   {{- end }}
 spec:
   schedule: {{ .Values.backup.scheduled.schedule }}

charts/postgresql/templates/cert-manager/issuer.yaml

@@ -4,10 +4,7 @@ kind: Issuer
 metadata:
   name: {{ template "common.names.fullname" . }}
   namespace: {{ include "common.names.namespace" . | quote }}
-  labels: {{- include "common.labels.standard" . | nindent 4 }}
-    {{- with .Values.commonLabels }}
-    {{- include "common.tplvalues.render" ( dict "value" . "context" $ ) | nindent 4 }}
-    {{- end }}
+  labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" . ) | nindent 4 }}
   {{- with .Values.commonAnnotations }}
   annotations: {{- include "common.tplvalues.render" ( dict "value" . "context" $ ) | nindent 4 }}
   {{- end }}

charts/postgresql/templates/cert-manager/replication-certificate.yaml

@@ -4,10 +4,7 @@ kind: Certificate
 metadata:
   name: {{ template "common.names.fullname" . }}-replication
   namespace: {{ include "common.names.namespace" . | quote }}
-  labels: {{- include "common.labels.standard" . | nindent 4 }}
-    {{- with .Values.commonLabels }}
-    {{- include "common.tplvalues.render" ( dict "value" . "context" $ ) | nindent 4 }}
-    {{- end }}
+  labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" . ) | nindent 4 }}
   {{- with .Values.commonAnnotations }}
   annotations: {{- include "common.tplvalues.render" ( dict "value" . "context" $ ) | nindent 4 }}
   {{- end }}

charts/postgresql/templates/cert-manager/server-certificate.yaml

@@ -4,10 +4,7 @@ kind: Certificate
 metadata:
   name: {{ template "common.names.fullname" . }}-server
   namespace: {{ include "common.names.namespace" . | quote }}
-  labels: {{- include "common.labels.standard" . | nindent 4 }}
-    {{- with .Values.commonLabels }}
-    {{- include "common.tplvalues.render" ( dict "value" . "context" $ ) | nindent 4 }}
-    {{- end }}
+  labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" . ) | nindent 4 }}
   {{- with .Values.commonAnnotations }}
   annotations: {{- include "common.tplvalues.render" ( dict "value" . "context" $ ) | nindent 4 }}
   {{- end }}

charts/postgresql/templates/cluster.yaml

@@ -3,10 +3,7 @@ kind: Cluster
 metadata:
   name: {{ template "common.names.fullname" . }}
   namespace: {{ include "common.names.namespace" . | quote }}
-  labels: {{- include "common.labels.standard" . | nindent 4 }}
-    {{- with .Values.commonLabels }}
-    {{- include "common.tplvalues.render" ( dict "value" . "context" $ ) | nindent 4 }}
-    {{- end }}
+  labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" . ) | nindent 4 }}
   {{- with .Values.commonAnnotations }}
   annotations: {{- include "common.tplvalues.render" ( dict "value" . "context" $ ) | nindent 4 }}
   {{- end }}
@@ -38,7 +35,7 @@ spec:
   backup:
     barmanObjectStore:
       {{- if .Values.backup.s3.enabled }}
-      endpointURL: {{ .Values.backup.endpointURL }}
+      endpointURL: {{ .Values.backup.endpointURL | required "backup.endpointURL required when backup.s3 is enabled" }}
       {{- with .Values.backup.endpointCASecret }}
       endpointCA:
         name: {{ . }}
@@ -47,10 +44,10 @@ spec:
       destinationPath: s3://{{ with .Values.backup.s3.bucketName }}{{ . }}{{ else }}{{ include "common.names.namespace" . }}-{{ template "common.names.fullname" . }}-backup{{ end }}/
       s3Credentials:
         accessKeyId:
-          name: {{ if .Values.backup.s3.objectBucketClaim.enabled }}{{ template "common.names.fullname" . }}-backup{{ else }}{{ .Values.backup.s3.existingSecret }}{{ end }}
+          name: {{ if .Values.backup.s3.objectBucketClaim.enabled }}{{ template "common.names.fullname" . }}-backup{{ else }}{{ .Values.backup.s3.existingSecret | required "backup.s3.existingSecret required when backup.s3.bucketName and backup.s3.objectBucketClaim is not enabled" }}{{ end }}
           key: AWS_ACCESS_KEY_ID
         secretAccessKey:
-          name: {{ if .Values.backup.s3.objectBucketClaim.enabled }}{{ template "common.names.fullname" . }}-backup{{ else }}{{ .Values.backup.s3.existingSecret }}{{ end }}
+          name: {{ if .Values.backup.s3.objectBucketClaim.enabled }}{{ template "common.names.fullname" . }}-backup{{ else }}{{ .Values.backup.s3.existingSecret | required "backup.s3.existingSecret required when backup.s3.bucketName and backup.s3.objectBucketClaim is not enabled" }}{{ end }}
           key: AWS_SECRET_ACCESS_KEY
       {{- end }}
     retentionPolicy: {{ .Values.backup.retentionPolicy | quote }}

charts/postgresql/templates/networkpolicy.yaml

@@ -4,10 +4,7 @@ kind: NetworkPolicy
 metadata:
   name: {{ template "common.names.fullname" . }}
   namespace: {{ include "common.names.namespace" . | quote }}
-  labels: {{- include "common.labels.standard" . | nindent 4 }}
-    {{- with .Values.commonLabels }}
-    {{- include "common.tplvalues.render" ( dict "value" . "context" $ ) | nindent 4 }}
-    {{- end }}
+  labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" . ) | nindent 4 }}
   {{- with .Values.commonAnnotations }}
   annotations: {{- include "common.tplvalues.render" ( dict "value" . "context" $ ) | nindent 4 }}
   {{- end }}

charts/postgresql/values.yaml

@@ -39,7 +39,7 @@ affinity:
 image:
   registry: ghcr.io
   repository: cloudnative-pg/postgresql
-  tag: 15.3-4
+  tag: 15.4-8
   digest: ""
   ## Specify a imagePullPolicy
   ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'