feat: allow simple pg_basebackup (#35)

SocialGouv · Aug 29, 2023 · 445ce56 · 445ce56
1 parent cb8506a
commit 445ce56
Show file tree

Hide file tree

Showing 6 changed files with 47 additions and 4 deletions.
diff --git a/charts/cnpg-cluster/templates/cluster.cnpg.yaml b/charts/cnpg-cluster/templates/cluster.cnpg.yaml
@@ -95,9 +95,9 @@ spec:
       recoveryTarget:
         targetTime: "{{ .Values.recovery.targetTime }}"
       {{- end }}
-    {{- else if (and .Values.replica.enabled .Values.replica.source) }}
+    {{- else if (and .Values.pg_basebackup.enabled .Values.pg_basebackup.source) }}
     pg_basebackup:
-      source: {{ .Values.replica.source }}
+      source: {{ .Values.pg_basebackup.source }}
     {{- else }}
     initdb:
       database: {{ .Values.dbName }}

diff --git a/charts/cnpg-cluster/tests/__snapshot__/cnpg-cluster_test.yaml.snap b/charts/cnpg-cluster/tests/__snapshot__/cnpg-cluster_test.yaml.snap
@@ -118,6 +118,19 @@ cluster with enabled backup and recovery:
     cluster:
       name: RELEASE-NAME-cnpg-cluster
     schedule: 1 2 3 * * 0
+cluster with pg_basebackup:
+  1: |
+    - connectionParameters:
+        dbname: app
+        host: some-host-to-replicate-from
+        user: postgres
+      name: source-cluster
+      password:
+        key: password
+        name: source-secret-for-source-replication
+  2: |
+    pg_basebackup:
+      source: source-cluster
 cluster with recovery enabled:
   1: |
     bootstrap:

diff --git a/charts/cnpg-cluster/tests/cnpg-cluster_test.yaml b/charts/cnpg-cluster/tests/cnpg-cluster_test.yaml
@@ -103,3 +103,13 @@ tests:
       - template: cluster.cnpg.yaml
         matchSnapshot:
           path: spec.replica
+  - it: cluster with pg_basebackup
+    values:
+      - ./values/pg_basebackup.yaml
+    asserts:
+      - template: cluster.cnpg.yaml
+        matchSnapshot:
+          path: spec.externalClusters
+      - template: cluster.cnpg.yaml
+        matchSnapshot:
+          path: spec.bootstrap
diff --git a/charts/cnpg-cluster/tests/values/pg_basebackup.yaml b/charts/cnpg-cluster/tests/values/pg_basebackup.yaml
@@ -0,0 +1,13 @@
+pg_basebackup:
+  enabled: true
+  source: source-cluster
+
+externalClusters:
+  - name: source-cluster
+    connectionParameters:
+      host: some-host-to-replicate-from
+      user: postgres
+      dbname: app
+    password:
+      name: source-secret-for-source-replication
+      key: password
diff --git a/charts/cnpg-cluster/tests/values/replication.yaml b/charts/cnpg-cluster/tests/values/replication.yaml
@@ -1,9 +1,11 @@
-imageName: ghcr.io/cloudnative-pg/postgis:14
-
 replica:
   enabled: true
   source: source-cluster
 
+pg_basebackup:
+  enabled: true
+  source: source-cluster
+
 externalClusters:
   - name: source-cluster
     connectionParameters:

diff --git a/charts/cnpg-cluster/values.yaml b/charts/cnpg-cluster/values.yaml
@@ -185,3 +185,8 @@ postInitApplicationSQLRefs:
   # secretRefs:
   # - name: post-init-sql-secret
   #   key: secret.sql
+
+#
+pg_basebackup:
+  enabled: false
+  source: