Merge branch 'main' into K8SPG-487

percona · Dec 23, 2024 · bbcf318 · bbcf318
2 parents c635811 + 2dddc34
commit bbcf318
Show file tree

Hide file tree

Showing 26 changed files with 67 additions and 318 deletions.
diff --git a/build/crd/percona/generated/pgv2.percona.com_perconapgclusters.yaml b/build/crd/percona/generated/pgv2.percona.com_perconapgclusters.yaml
@@ -56,6 +56,11 @@ spec:
             type: object
           spec:
             properties:
+              autoCreateUserSchema:
+                description: |-
+                  Whether or not the cluster has schemas automatically created for the user
+                  defined in `spec.users` for all of the databases listed for that user.
+                type: boolean
               backups:
                 description: PostgreSQL backup configuration
                 properties:

diff --git a/config/crd/bases/pgv2.percona.com_perconapgclusters.yaml b/config/crd/bases/pgv2.percona.com_perconapgclusters.yaml
@@ -462,6 +462,11 @@ spec:
             type: object
           spec:
             properties:
+              autoCreateUserSchema:
+                description: |-
+                  Whether or not the cluster has schemas automatically created for the user
+                  defined in `spec.users` for all of the databases listed for that user.
+                type: boolean
               backups:
                 description: PostgreSQL backup configuration
                 properties:

diff --git a/deploy/bundle.yaml b/deploy/bundle.yaml
@@ -755,6 +755,11 @@ spec:
             type: object
           spec:
             properties:
+              autoCreateUserSchema:
+                description: |-
+                  Whether or not the cluster has schemas automatically created for the user
+                  defined in `spec.users` for all of the databases listed for that user.
+                type: boolean
               backups:
                 description: PostgreSQL backup configuration
                 properties:

diff --git a/deploy/cr.yaml b/deploy/cr.yaml
@@ -33,6 +33,8 @@ spec:
 
 #  openshift: true
 
+#  autoCreateUserSchema: true
+
 #  users:
 #    - name: rhino
 #      databases:

diff --git a/deploy/crd.yaml b/deploy/crd.yaml
@@ -755,6 +755,11 @@ spec:
             type: object
           spec:
             properties:
+              autoCreateUserSchema:
+                description: |-
+                  Whether or not the cluster has schemas automatically created for the user
+                  defined in `spec.users` for all of the databases listed for that user.
+                type: boolean
               backups:
                 description: PostgreSQL backup configuration
                 properties:

diff --git a/deploy/cw-bundle.yaml b/deploy/cw-bundle.yaml
@@ -755,6 +755,11 @@ spec:
             type: object
           spec:
             properties:
+              autoCreateUserSchema:
+                description: |-
+                  Whether or not the cluster has schemas automatically created for the user
+                  defined in `spec.users` for all of the databases listed for that user.
+                type: boolean
               backups:
                 description: PostgreSQL backup configuration
                 properties:

diff --git a/e2e-tests/tests/upgrade-consistency/01-assert.yaml b/e2e-tests/tests/upgrade-consistency/01-assert.yaml
@@ -122,7 +122,7 @@ kind: PerconaPGCluster
 metadata:
   name: upgrade-consistency
 spec:
-  crVersion: 2.1.0
+  crVersion: 2.4.0
 status:
   pgbouncer:
     ready: 3

diff --git a/e2e-tests/tests/upgrade-consistency/01-create-cluster.yaml b/e2e-tests/tests/upgrade-consistency/01-create-cluster.yaml
@@ -10,5 +10,5 @@ commands:
 
       get_cr \
         | yq eval '
-            .spec.crVersion="2.1.0"' - \
+            .spec.crVersion="2.4.0"' - \
         | kubectl -n "${NAMESPACE}" apply -f -
diff --git a/e2e-tests/tests/upgrade-consistency/02-assert.yaml b/e2e-tests/tests/upgrade-consistency/02-assert.yaml
@@ -120,7 +120,7 @@ kind: PerconaPGCluster
 metadata:
   name: upgrade-consistency
 spec:
-  crVersion: 2.2.0
+  crVersion: 2.5.0
 status:
   pgbouncer:
     ready: 3

diff --git a/e2e-tests/tests/upgrade-consistency/02-patch-cluster.yaml b/e2e-tests/tests/upgrade-consistency/02-patch-cluster.yaml
@@ -10,7 +10,7 @@ commands:
 
       get_cr \
         | yq eval '
-            .spec.crVersion="2.2.0"' - \
+            .spec.crVersion="2.5.0"' - \
         | kubectl -n "${NAMESPACE}" apply -f -
 
       sleep 10
diff --git a/e2e-tests/tests/upgrade-consistency/03-assert.yaml b/e2e-tests/tests/upgrade-consistency/03-assert.yaml
@@ -120,7 +120,7 @@ kind: PerconaPGCluster
 metadata:
   name: upgrade-consistency
 spec:
-  crVersion: 2.3.0
+  crVersion: 2.6.0
 status:
   pgbouncer:
     ready: 3

diff --git a/e2e-tests/tests/upgrade-consistency/03-patch-cluster.yaml b/e2e-tests/tests/upgrade-consistency/03-patch-cluster.yaml
@@ -10,7 +10,7 @@ commands:
 
       get_cr \
         | yq eval '
-            .spec.crVersion="2.3.0"' - \
+            .spec.crVersion="2.6.0"' - \
         | kubectl -n "${NAMESPACE}" apply -f -
 
       sleep 10
diff --git a/e2e-tests/tests/upgrade-consistency/04-assert.yaml b/e2e-tests/tests/upgrade-consistency/04-assert.yaml
diff --git a/e2e-tests/tests/upgrade-consistency/04-patch-cluster.yaml b/e2e-tests/tests/upgrade-consistency/04-patch-cluster.yaml