K8SPG-692: proper fix for patroni v4

https://perconadev.atlassian.net/browse/K8SPG-692
percona · Dec 16, 2024 · 5a8b225 · 5a8b225
1 parent 83fd40e
commit 5a8b225
Show file tree

Hide file tree

Showing 20 changed files with 249 additions and 177 deletions.
diff --git a/build/crd/percona/generated/pgv2.percona.com_perconapgclusters.yaml b/build/crd/percona/generated/pgv2.percona.com_perconapgclusters.yaml
@@ -17384,6 +17384,8 @@ spec:
             properties:
               host:
                 type: string
+              patroniVersion:
+                type: string
               pgbouncer:
                 properties:
                   ready:
@@ -17421,17 +17423,11 @@ spec:
                   size:
                     format: int32
                     type: integer
-                required:
-                - instances
-                - ready
-                - size
+                  version:
+                    type: integer
                 type: object
               state:
                 type: string
-            required:
-            - pgbouncer
-            - postgres
-            - state
             type: object
         required:
         - metadata

diff --git a/cmd/postgres-operator/main.go b/cmd/postgres-operator/main.go
@@ -26,8 +26,6 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 	"sigs.k8s.io/controller-runtime/pkg/manager"
 
-	//"github.com/percona/percona-postgresql-operator/internal/controller/pgupgrade"
-
 	"github.com/percona/percona-postgresql-operator/internal/controller/pgupgrade"
 	"github.com/percona/percona-postgresql-operator/internal/controller/postgrescluster"
 	"github.com/percona/percona-postgresql-operator/internal/controller/runtime"

diff --git a/config/crd/bases/pgv2.percona.com_perconapgclusters.yaml b/config/crd/bases/pgv2.percona.com_perconapgclusters.yaml
@@ -17790,6 +17790,8 @@ spec:
             properties:
               host:
                 type: string
+              patroniVersion:
+                type: string
               pgbouncer:
                 properties:
                   ready:
@@ -17827,17 +17829,11 @@ spec:
                   size:
                     format: int32
                     type: integer
-                required:
-                - instances
-                - ready
-                - size
+                  version:
+                    type: integer
                 type: object
               state:
                 type: string
-            required:
-            - pgbouncer
-            - postgres
-            - state
             type: object
         required:
         - metadata

diff --git a/config/rbac/cluster/role.yaml b/config/rbac/cluster/role.yaml
@@ -9,6 +9,7 @@ rules:
   resources:
   - configmaps
   - persistentvolumeclaims
+  - pods
   - secrets
   - serviceaccounts
   - services
@@ -46,16 +47,6 @@ rules:
   verbs:
   - create
   - patch
-- apiGroups:
-  - ''
-  resources:
-  - pods
-  verbs:
-  - delete
-  - get
-  - list
-  - patch
-  - watch
 - apiGroups:
   - apps
   resources:
@@ -158,6 +149,13 @@ rules:
   - get
   - list
   - watch
+- apiGroups:
+  - pgv2.percona.com
+  resources:
+  - pods
+  verbs:
+  - create
+  - delete
 - apiGroups:
   - policy
   resources:

diff --git a/config/rbac/namespace/role.yaml b/config/rbac/namespace/role.yaml
@@ -9,6 +9,7 @@ rules:
   resources:
   - configmaps
   - persistentvolumeclaims
+  - pods
   - secrets
   - serviceaccounts
   - services
@@ -46,16 +47,6 @@ rules:
   verbs:
   - create
   - patch
-- apiGroups:
-  - ''
-  resources:
-  - pods
-  verbs:
-  - delete
-  - get
-  - list
-  - patch
-  - watch
 - apiGroups:
   - apps
   resources:
@@ -158,6 +149,13 @@ rules:
   - get
   - list
   - watch
+- apiGroups:
+  - pgv2.percona.com
+  resources:
+  - pods
+  verbs:
+  - create
+  - delete
 - apiGroups:
   - policy
   resources:

diff --git a/deploy/bundle.yaml b/deploy/bundle.yaml
@@ -18083,6 +18083,8 @@ spec:
             properties:
               host:
                 type: string
+              patroniVersion:
+                type: string
               pgbouncer:
                 properties:
                   ready:
@@ -18120,17 +18122,11 @@ spec:
                   size:
                     format: int32
                     type: integer
-                required:
-                - instances
-                - ready
-                - size
+                  version:
+                    type: integer
                 type: object
               state:
                 type: string
-            required:
-            - pgbouncer
-            - postgres
-            - state
             type: object
         required:
         - metadata
@@ -45447,6 +45443,7 @@ rules:
   resources:
   - configmaps
   - persistentvolumeclaims
+  - pods
   - secrets
   - serviceaccounts
   - services
@@ -45484,16 +45481,6 @@ rules:
   verbs:
   - create
   - patch
-- apiGroups:
-  - ""
-  resources:
-  - pods
-  verbs:
-  - delete
-  - get
-  - list
-  - patch
-  - watch
 - apiGroups:
   - apps
   resources:
@@ -45596,6 +45583,13 @@ rules:
   - get
   - list
   - watch
+- apiGroups:
+  - pgv2.percona.com
+  resources:
+  - pods
+  verbs:
+  - create
+  - delete
 - apiGroups:
   - policy
   resources:

diff --git a/deploy/crd.yaml b/deploy/crd.yaml
@@ -18083,6 +18083,8 @@ spec:
             properties:
               host:
                 type: string
+              patroniVersion:
+                type: string
               pgbouncer:
                 properties:
                   ready:
@@ -18120,17 +18122,11 @@ spec:
                   size:
                     format: int32
                     type: integer
-                required:
-                - instances
-                - ready
-                - size
+                  version:
+                    type: integer
                 type: object
               state:
                 type: string
-            required:
-            - pgbouncer
-            - postgres
-            - state
             type: object
         required:
         - metadata

diff --git a/deploy/cw-bundle.yaml b/deploy/cw-bundle.yaml
@@ -18083,6 +18083,8 @@ spec:
             properties:
               host:
                 type: string
+              patroniVersion:
+                type: string
               pgbouncer:
                 properties:
                   ready:
@@ -18120,17 +18122,11 @@ spec:
                   size:
                     format: int32
                     type: integer
-                required:
-                - instances
-                - ready
-                - size
+                  version:
+                    type: integer
                 type: object
               state:
                 type: string
-            required:
-            - pgbouncer
-            - postgres
-            - state
             type: object
         required:
         - metadata
@@ -45447,6 +45443,7 @@ rules:
   resources:
   - configmaps
   - persistentvolumeclaims
+  - pods
   - secrets
   - serviceaccounts
   - services
@@ -45484,16 +45481,6 @@ rules:
   verbs:
   - create
   - patch
-- apiGroups:
-  - ""
-  resources:
-  - pods
-  verbs:
-  - delete
-  - get
-  - list
-  - patch
-  - watch
 - apiGroups:
   - apps
   resources:
@@ -45596,6 +45583,13 @@ rules:
   - get
   - list
   - watch
+- apiGroups:
+  - pgv2.percona.com
+  resources:
+  - pods
+  verbs:
+  - create
+  - delete
 - apiGroups:
   - policy
   resources:

diff --git a/deploy/cw-rbac.yaml b/deploy/cw-rbac.yaml
@@ -13,6 +13,7 @@ rules:
   resources:
   - configmaps
   - persistentvolumeclaims
+  - pods
   - secrets
   - serviceaccounts
   - services
@@ -50,16 +51,6 @@ rules:
   verbs:
   - create
   - patch
-- apiGroups:
-  - ""
-  resources:
-  - pods
-  verbs:
-  - delete
-  - get
-  - list
-  - patch
-  - watch
 - apiGroups:
   - apps
   resources:
@@ -162,6 +153,13 @@ rules:
   - get
   - list
   - watch
+- apiGroups:
+  - pgv2.percona.com
+  resources:
+  - pods
+  verbs:
+  - create
+  - delete
 - apiGroups:
   - policy
   resources:

diff --git a/deploy/rbac.yaml b/deploy/rbac.yaml
@@ -13,6 +13,7 @@ rules:
   resources:
   - configmaps
   - persistentvolumeclaims
+  - pods
   - secrets
   - serviceaccounts
   - services
@@ -50,16 +51,6 @@ rules:
   verbs:
   - create
   - patch
-- apiGroups:
-  - ""
-  resources:
-  - pods
-  verbs:
-  - delete
-  - get
-  - list
-  - patch
-  - watch
 - apiGroups:
   - apps
   resources:
@@ -162,6 +153,13 @@ rules:
   - get
   - list
   - watch
+- apiGroups:
+  - pgv2.percona.com
+  resources:
+  - pods
+  verbs:
+  - create
+  - delete
 - apiGroups:
   - policy
   resources: