Merge pull request #23 from small-hack/add-externalCluster

Add externalCluster field, remove testapp.namespace

Author: cloudymax

charts/cloudnative-pg-cluster/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: cnpg-cluster
 description: Create postgres tenant clusters managed by the CNPG Operator
 type: application
-version: 0.3.4
+version: 0.3.5
 
 maintainers:
   - name: "cloudymax"

charts/cloudnative-pg-cluster/README.md

@@ -1,6 +1,6 @@
 # cnpg-cluster
 
-![Version: 0.3.4](https://img.shields.io/badge/Version-0.3.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
+![Version: 0.3.5](https://img.shields.io/badge/Version-0.3.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
 
 Create postgres tenant clusters managed by the CNPG Operator
 
@@ -15,15 +15,15 @@ Create postgres tenant clusters managed by the CNPG Operator
 
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
-| backup.barmanObjectStore.destinationPath | string | `"backups"` |  |
+| backup.barmanObjectStore.destinationPath | string | `"s3://backups"` |  |
+| backup.barmanObjectStore.endpointURL | string | `"http://HOST:PORT"` |  |
 | backup.barmanObjectStore.s3Credentials.accessKeyId.key | string | `"ACCESS_KEY_ID"` | key in Kubernetes Secret to use for S3 access key ID |
 | backup.barmanObjectStore.s3Credentials.accessKeyId.name | string | `"aws-creds"` | existing Kubernetes Secret to use for S3 access key ID |
 | backup.barmanObjectStore.s3Credentials.secretAccessKey.key | string | `"ACCESS_SECRET_KEY"` | key in Kubernetes Secret to use for S3 secret key |
 | backup.barmanObjectStore.s3Credentials.secretAccessKey.name | string | `"aws-creds"` | existing Kubernetes Secret to use for S3 secret key |
 | backup.retentionPolicy | string | `"30d"` | how long to keep backups for |
 | bootstrap.initdb.database | string | `"app"` | initial database to create |
 | bootstrap.initdb.owner | string | `"app"` | owner of the initial database that is created above |
-| bootstrap.initdb.secret.name | string | `"app-secret"` |  |
 | certificates.client.clientCASecret | string | `""` | name of existing Kubernetes Secret for the postgresql client Certificate Authority cert, ignored if certificates.generate is true |
 | certificates.client.enabled | bool | `false` | enable using client certificates |
 | certificates.client.generate | bool | `false` | generate client certs using cert-manager. if true the following are ignored: certificates.clientCASecret, certificates.replicationTLSSecret |
@@ -43,9 +43,7 @@ Create postgres tenant clusters managed by the CNPG Operator
 | scheduledBackup.spec.cluster.name | string | `"pg-backup"` |  |
 | scheduledBackup.spec.schedule | string | `"0 0 0 * * *"` | crontab style schedule to run the backups |
 | storage.size | string | `"1Gi"` | how much storage to allocate to the postgresql cluster |
-| superuserSecret.name | string | `"superuser-secret"` |  |
 | testApp.enabled | bool | `false` |  |
-| testApp.namespace | string | `"default"` |  |
 
 ----------------------------------------------
 Autogenerated from chart metadata using [helm-docs v1.11.3](https://github.com/norwoodj/helm-docs/releases/v1.11.3)

charts/cloudnative-pg-cluster/templates/cnpg_cluster.yaml

@@ -11,6 +11,13 @@ spec:
     {{- toYaml . | nindent 4 }}
   {{- end }}
   {{- end }}
+  {{- if .Values.externalClusters }}
+  externalClusters:
+    {{- range $reg, $props := .Values.externalClusters }}
+    - name: {{ $props.name }}
+    {{- toYaml . | nindent 6 }}
+  {{- end }}
+  {{- end }}
   monitoring:
     enablePodMonitor: {{ .Values.monitoring.enablePodMonitor }}
   {{- with .Values.postgresql }}

charts/cloudnative-pg-cluster/templates/test-app.yaml

@@ -29,7 +29,7 @@ spec:
                 sslkey=/etc/secrets/app/tls.key
                 sslcert=/etc/secrets/app/tls.crt
                 sslrootcert=/etc/secrets/ca/ca.crt
-                host={{ .Values.name }}-rw.{{ .Values.testApp.namespace }}.svc
+                host={{ .Values.name }}-rw.{{ .Release.Namespace }}.svc
                 dbname={{ .Values.bootstrap.initdb.database }}
                 user={{ .Values.bootstrap.initdb.owner }}
                 sslmode=verify-full

charts/cloudnative-pg-cluster/values.yaml

@@ -2,26 +2,47 @@ name: "cnpg"
 
 instances: 3
 
-superuserSecret:
-  name: superuser-secret
-
 bootstrap:
   initdb:
     # -- initial database to create
     database: app
     # -- owner of the initial database that is created above
     owner: app
-    secret:
-      name: app-secret
+    # secret:
+    #  name: app-secret
     # list of SQL commands to run as part of the init scripts, example:
     # postInitSQL:
     #  - CREATE ROLE friend
+    # Specify an external cluster to bootstrap from
+    # recovery:
+    #  source: clusterBackup
+
+externalClusters: []
+#  # -- name of external/existing cluster
+#  - name: clusterBackup
+#    barmanObjectStore:
+#      destinationPath: "s3://backups"
+#      endpointURL: "http://HOST:PORT"
+#      s3Credentials:
+#        accessKeyId:
+#          # -- existing Kubernetes Secret to use for S3 access key ID
+#          name: "aws-creds"
+#          # -- key in Kubernetes Secret to use for S3 access key ID
+#          key: "ACCESS_KEY_ID"
+#        secretAccessKey:
+#          # -- existing Kubernetes Secret to use for S3 secret key
+#          name: "aws-creds"
+#          # -- key in Kubernetes Secret to use for S3 secret key
+#          key: "ACCESS_SECRET_KEY"
+#      wal:
+#        maxParallel: 8
 
 backup:
   # -- how long to keep backups for
   retentionPolicy: "30d"
   barmanObjectStore:
-    destinationPath: "backups"
+    destinationPath: "s3://backups"
+    endpointURL: "http://HOST:PORT"
     s3Credentials:
       accessKeyId:
         # -- existing Kubernetes Secret to use for S3 access key ID
@@ -96,5 +117,3 @@ testApp:
   # Populates user and DB from the Initdb owner and database values
   # Requires server, client, and user certificate generation to be enabled.
   enabled: false
-  ## -- namespace where the read-write postgres service exists
-  namespace: "default"