From 525d87a5f9bca5b56ea0ae5d9dce7acf6488f887 Mon Sep 17 00:00:00 2001 From: ValClarkson Date: Fri, 19 Dec 2025 15:39:45 -0500 Subject: [PATCH 1/5] update installers for v5.8 PGO-2826 --- .../images-by-tag/kustomization.yaml | 53 +++++ .../single-namespace/kustomization.yaml | 27 +++ config/default/kustomization.yaml | 31 ++- config/manager/kustomization.yaml | 10 +- config/manager/kustomize_related_images.yaml | 12 ++ config/manager/manager.yaml | 59 ++++-- config/namespace/kustomization.yaml | 5 +- config/rbac/cluster/kustomization.yaml | 4 + config/rbac/cluster/role.yaml | 188 ++++++++++++++++++ config/rbac/cluster/role_binding.yaml | 12 ++ .../rbac/{ => cluster}/service_account.yaml | 0 config/rbac/kustomization.yaml | 2 +- config/rbac/namespace/kustomization.yaml | 4 + config/rbac/role.yaml | 20 +- config/rbac/role_binding.yaml | 2 +- config/rbac/service_acount.yaml | 5 + config/singlenamespace/kustomization.yaml | 0 17 files changed, 379 insertions(+), 55 deletions(-) create mode 100644 config/components/images-by-tag/kustomization.yaml create mode 100644 config/components/single-namespace/kustomization.yaml create mode 100644 config/manager/kustomize_related_images.yaml create mode 100644 config/rbac/cluster/kustomization.yaml create mode 100644 config/rbac/cluster/role.yaml create mode 100644 config/rbac/cluster/role_binding.yaml rename config/rbac/{ => cluster}/service_account.yaml (100%) create mode 100644 config/rbac/namespace/kustomization.yaml create mode 100644 config/rbac/service_acount.yaml create mode 100644 config/singlenamespace/kustomization.yaml diff --git a/config/components/images-by-tag/kustomization.yaml b/config/components/images-by-tag/kustomization.yaml new file mode 100644 index 0000000000..5339603fe2 --- /dev/null +++ b/config/components/images-by-tag/kustomization.yaml @@ -0,0 +1,53 @@ +kind: Component +images: +- name: image-pgadmin + newName: registry.developers.crunchydata.com/crunchydata/crunchy-pgadmin4 + newTag: ubi9-9.8-2550 +- name: image-pgbackrest + newName: registry.developers.crunchydata.com/crunchydata/crunchy-pgbackrest + newTag: ubi9-2.56.0-2550 +- name: image-pgbouncer + newName: registry.developers.crunchydata.com/crunchydata/crunchy-pgbouncer + newTag: ubi9-1.24-2550 +- name: image-postgres-exporter + newName: registry.developers.crunchydata.com/crunchydata/crunchy-postgres-exporter + newTag: ubi9-0.18.1-2550 +- name: image-postgres-operator-5.8 + newName: registry.developers.crunchydata.com/crunchydata/postgres-operator + newTag: ubi9-5.8.6-0 +- name: image-crunchy-postgres-15 + newName: registry.developers.crunchydata.com/crunchydata/crunchy-postgres + newTag: ubi9-15.15-2550 +- name: image-crunchy-postgres-16 + newName: registry.developers.crunchydata.com/crunchydata/crunchy-postgres + newTag: ubi9-16.11-2550 +- name: image-crunchy-postgres-17 + newName: registry.developers.crunchydata.com/crunchydata/crunchy-postgres + newTag: ubi9-17.7-2550 +- name: image-crunchy-postgres-18 + newName: registry.developers.crunchydata.com/crunchydata/crunchy-postgres + newTag: ubi9-18.1-2550 +- name: image-crunchy-upgrade + newName: registry.developers.crunchydata.com/crunchydata/crunchy-upgrade + newTag: ubi9-18.1-2550 +- name: image-crunchy-postgres-15-gis-3.3 + newName: registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis + newTag: ubi9-15.15-3.3-2550 +- name: image-crunchy-postgres-16-gis-3.3 + newName: registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis + newTag: ubi9-16.11-3.3-2550 +- name: image-crunchy-postgres-16-gis-3.4 + newName: registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis + newTag: ubi9-16.11-3.4-2550 +- name: image-crunchy-postgres-17-gis-3.4 + newName: registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis + newTag: ubi9-17.7-3.4-2550 +- name: image-crunchy-postgres-17-gis-3.5 + newName: registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis + newTag: ubi9-17.7-3.5-2550 +- name: image-crunchy-postgres-17-gis-3.6 + newName: registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis + newTag: ubi9-17.7-3.6-2550 +- name: image-crunchy-postgres-18-gis-3.6 + newName: registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis + newTag: ubi9-18.1-3.6-2550 \ No newline at end of file diff --git a/config/components/single-namespace/kustomization.yaml b/config/components/single-namespace/kustomization.yaml new file mode 100644 index 0000000000..07227cba8c --- /dev/null +++ b/config/components/single-namespace/kustomization.yaml @@ -0,0 +1,27 @@ +kind: Component + +patches: +- target: + kind: ClusterRole + patch: |- + - { op: replace, path: /kind, value: Role } +- target: + kind: ClusterRoleBinding + patch: |- + - { op: replace, path: /kind, value: RoleBinding } + - { op: replace, path: /roleRef/kind, value: Role } +- target: + kind: Deployment + patch: |- + kind: Deployment + metadata: { name: ignored } + spec: + template: + spec: + containers: + - name: operator + env: + - name: CPK_TARGET_NAMESPACE + valueFrom: { fieldRef: { apiVersion: v1, fieldPath: metadata.namespace } } + - name: PGO_TARGET_NAMESPACE + value: '$(CPK_TARGET_NAMESPACE)' \ No newline at end of file diff --git a/config/default/kustomization.yaml b/config/default/kustomization.yaml index 5611a50880..48876343e2 100644 --- a/config/default/kustomization.yaml +++ b/config/default/kustomization.yaml @@ -1,20 +1,37 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization namespace: postgres-operator labels: +- includeSelectors: false + includeTemplates: true + pairs: + app.kubernetes.io/name: pgo + app.kubernetes.io/version: 5.8.6 - includeSelectors: true + includeTemplates: true pairs: - # Note: this label differs from the label set in postgres-operator-examples postgres-operator.crunchydata.com/control-plane: postgres-operator resources: - ../crd -- ../rbac +- ../rbac/cluster - ../manager -images: -- name: postgres-operator - newName: registry.developers.crunchydata.com/crunchydata/postgres-operator - newTag: ubi9-5.8.6-0 +components: +- ../components/images-by-tag + +patches: +- patch: |- + apiVersion: apps/v1 + kind: Deployment + metadata: + name: pgo + spec: + template: + spec: + containers: + - name: operator + env: + - name: PGO_FEATURE_GATES + value: "" \ No newline at end of file diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index dfce22e6c5..a49690a178 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -1,5 +1,11 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization +configurations: + - kustomize_related_images.yaml + resources: -- manager.yaml + - manager.yaml + +images: + - name: postgres-operator + newName: image-postgres-operator-5.8 \ No newline at end of file diff --git a/config/manager/kustomize_related_images.yaml b/config/manager/kustomize_related_images.yaml new file mode 100644 index 0000000000..8f1733ea46 --- /dev/null +++ b/config/manager/kustomize_related_images.yaml @@ -0,0 +1,12 @@ +# This configures the built-in ImageTagTransformer to replace image identifiers +# in Deployment environment variables as well as image fields. +# +# See: https://kubectl.docs.kubernetes.io/references/kustomize/builtins/ + +images: +- group: apps + kind: Deployment + path: spec/template/spec/containers/env/value +- group: apps + kind: Deployment + path: spec/template/spec/containers/image \ No newline at end of file diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml index cd87dd1315..6db8c41c98 100644 --- a/config/manager/manager.yaml +++ b/config/manager/manager.yaml @@ -8,6 +8,7 @@ spec: strategy: { type: Recreate } template: spec: + serviceAccountName: pgo containers: - name: operator image: postgres-operator @@ -16,49 +17,65 @@ spec: value: kustomize - name: PGO_INSTALLER_ORIGIN value: postgres-operator-repo + - name: PGO_CONTROLLER_LEASE_NAME + value: cpk-leader-election-lease - name: PGO_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace + valueFrom: { fieldRef: { fieldPath: metadata.namespace } } - name: CRUNCHY_DEBUG value: "true" - name: RELATED_IMAGE_POSTGRES_15 - value: "registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi9-15.15-2550" + value: image-crunchy-postgres-15 - name: RELATED_IMAGE_POSTGRES_15_GIS_3.3 - value: "registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi9-15.15-3.3-2550" + value: image-crunchy-postgres-15-gis-3.3 - name: RELATED_IMAGE_POSTGRES_16 - value: "registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi9-16.11-2550" + value: image-crunchy-postgres-16 - name: RELATED_IMAGE_POSTGRES_16_GIS_3.3 - value: "registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi9-16.11-3.3-2550" + value: image-crunchy-postgres-16-gis-3.3 - name: RELATED_IMAGE_POSTGRES_16_GIS_3.4 - value: "registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi9-16.11-3.4-2550" + value: image-crunchy-postgres-16-gis-3.4 - name: RELATED_IMAGE_POSTGRES_17 - value: "registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi9-17.7-2550" + value: image-crunchy-postgres-17 - name: RELATED_IMAGE_POSTGRES_17_GIS_3.4 - value: "registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi9-17.7-3.4-2550" + value: image-crunchy-postgres-17-gis-3.4 - name: RELATED_IMAGE_POSTGRES_17_GIS_3.5 - value: "registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi9-17.7-3.5-2550" + value: image-crunchy-postgres-17-gis-3.5 - name: RELATED_IMAGE_POSTGRES_17_GIS_3.6 - value: "registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi9-17.7-3.6-2550" + value: image-crunchy-postgres-17-gis-3.6 - name: RELATED_IMAGE_POSTGRES_18 - value: "registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi9-18.1-2550" + value: image-crunchy-postgres-18 - name: RELATED_IMAGE_POSTGRES_18_GIS_3.6 - value: "registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi9-18.1-3.6-2550" + value: image-crunchy-postgres-18-gis-3.6 - name: RELATED_IMAGE_PGBACKREST - value: "registry.developers.crunchydata.com/crunchydata/crunchy-pgbackrest:ubi9-2.56.0-2550" + value: image-pgbackrest - name: RELATED_IMAGE_PGBOUNCER - value: "registry.developers.crunchydata.com/crunchydata/crunchy-pgbouncer:ubi9-1.25-2550" + value: image-pgbouncer - name: RELATED_IMAGE_PGEXPORTER - value: "registry.developers.crunchydata.com/crunchydata/crunchy-postgres-exporter:ubi9-0.18.1-2550" + value: image-postgres-exporter - name: RELATED_IMAGE_PGUPGRADE - value: "registry.developers.crunchydata.com/crunchydata/crunchy-upgrade:ubi9-18.1-2550" + value: image-crunchy-upgrade - name: RELATED_IMAGE_STANDALONE_PGADMIN - value: "registry.developers.crunchydata.com/crunchydata/crunchy-pgadmin4:ubi9-9.8-2550" + value: image-pgadmin - name: RELATED_IMAGE_COLLECTOR - value: "registry.developers.crunchydata.com/crunchydata/postgres-operator:ubi9-5.8.6-0" + value: image-postgres-operator-5.8 securityContext: + seccompProfile: + type: RuntimeDefault allowPrivilegeEscalation: false capabilities: { drop: [ALL] } readOnlyRootFilesystem: true runAsNonRoot: true - serviceAccountName: pgo + ports: + - containerPort: 8443 + name: metrics + livenessProbe: + httpGet: + path: /readyz + port: 8081 + initialDelaySeconds: 15 + periodSeconds: 20 + readinessProbe: + httpGet: + path: /healthz + port: 8081 + initialDelaySeconds: 5 + periodSeconds: 10 \ No newline at end of file diff --git a/config/namespace/kustomization.yaml b/config/namespace/kustomization.yaml index e06cce134a..9233397cfb 100644 --- a/config/namespace/kustomization.yaml +++ b/config/namespace/kustomization.yaml @@ -1,5 +1,2 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - resources: -- namespace.yaml +- namespace.yaml \ No newline at end of file diff --git a/config/rbac/cluster/kustomization.yaml b/config/rbac/cluster/kustomization.yaml new file mode 100644 index 0000000000..664fcac061 --- /dev/null +++ b/config/rbac/cluster/kustomization.yaml @@ -0,0 +1,4 @@ +resources: +- service_account.yaml +- role.yaml +- role_binding.yaml diff --git a/config/rbac/cluster/role.yaml b/config/rbac/cluster/role.yaml new file mode 100644 index 0000000000..9f2b7a60b7 --- /dev/null +++ b/config/rbac/cluster/role.yaml @@ -0,0 +1,188 @@ +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + name: postgres-operator +rules: +- apiGroups: + - "" + resources: + - configmaps + - persistentvolumeclaims + - secrets + - serviceaccounts + - services + verbs: + - create + - delete + - get + - list + - patch + - watch +- apiGroups: + - "" + resources: + - endpoints + verbs: + - create + - delete + - deletecollection + - get + - list + - patch + - watch +- apiGroups: + - "" + resources: + - endpoints/restricted + - pods/exec + verbs: + - create +- apiGroups: + - "" + resources: + - events + verbs: + - create + - patch +- apiGroups: + - "" + resources: + - pods + verbs: + - delete + - get + - list + - patch + - watch +- apiGroups: + - apps + resources: + - deployments + - statefulsets + verbs: + - create + - delete + - get + - list + - patch + - watch +- apiGroups: + - authentication.k8s.io + resources: + - tokenreviews + verbs: + - create +- apiGroups: + - authorization.k8s.io + resources: + - subjectaccessreviews + verbs: + - create +- apiGroups: + - batch + resources: + - cronjobs + - jobs + verbs: + - create + - delete + - get + - list + - patch + - watch +- apiGroups: + - coordination.k8s.io + resources: + - leases + verbs: + - create + - get + - update + - watch +- apiGroups: + - policy + resources: + - poddisruptionbudgets + verbs: + - create + - delete + - get + - list + - patch + - watch +- apiGroups: + - postgres-operator.crunchydata.com + resources: + - crunchybridgeclusters + verbs: + - get + - list + - patch + - update + - watch +- apiGroups: + - postgres-operator.crunchydata.com + resources: + - crunchybridgeclusters/finalizers + - crunchybridgeclusters/status + verbs: + - patch + - update +- apiGroups: + - postgres-operator.crunchydata.com + resources: + - pgadmins + - pgupgrades + verbs: + - get + - list + - watch +- apiGroups: + - postgres-operator.crunchydata.com + resources: + - pgadmins/finalizers + - pgupgrades/finalizers + - postgresclusters/finalizers + verbs: + - update +- apiGroups: + - postgres-operator.crunchydata.com + resources: + - pgadmins/status + - pgupgrades/status + - postgresclusters/status + verbs: + - patch +- apiGroups: + - postgres-operator.crunchydata.com + resources: + - postgresclusters + verbs: + - get + - list + - patch + - watch +- apiGroups: + - rbac.authorization.k8s.io + resources: + - rolebindings + - roles + verbs: + - create + - delete + - get + - list + - patch + - watch +- apiGroups: + - snapshot.storage.k8s.io + resources: + - volumesnapshots + verbs: + - create + - delete + - get + - list + - patch + - watch \ No newline at end of file diff --git a/config/rbac/cluster/role_binding.yaml b/config/rbac/cluster/role_binding.yaml new file mode 100644 index 0000000000..dc900ac769 --- /dev/null +++ b/config/rbac/cluster/role_binding.yaml @@ -0,0 +1,12 @@ +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + name: postgres-operator +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: postgres-operator +subjects: +- kind: ServiceAccount + name: pgo \ No newline at end of file diff --git a/config/rbac/service_account.yaml b/config/rbac/cluster/service_account.yaml similarity index 100% rename from config/rbac/service_account.yaml rename to config/rbac/cluster/service_account.yaml diff --git a/config/rbac/kustomization.yaml b/config/rbac/kustomization.yaml index 82cfb0841b..d31d770b82 100644 --- a/config/rbac/kustomization.yaml +++ b/config/rbac/kustomization.yaml @@ -4,4 +4,4 @@ kind: Kustomization resources: - service_account.yaml - role.yaml -- role_binding.yaml +- role_binding.yaml \ No newline at end of file diff --git a/config/rbac/namespace/kustomization.yaml b/config/rbac/namespace/kustomization.yaml new file mode 100644 index 0000000000..09c44caa5b --- /dev/null +++ b/config/rbac/namespace/kustomization.yaml @@ -0,0 +1,4 @@ +resources: +- ../cluster +components: +- ../../components/single-namespace \ No newline at end of file diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml index aa19cdacbf..e497cdf96f 100644 --- a/config/rbac/role.yaml +++ b/config/rbac/role.yaml @@ -111,24 +111,6 @@ rules: - list - patch - watch -- apiGroups: - - postgres-operator.crunchydata.com - resources: - - crunchybridgeclusters - verbs: - - get - - list - - patch - - update - - watch -- apiGroups: - - postgres-operator.crunchydata.com - resources: - - crunchybridgeclusters/finalizers - - crunchybridgeclusters/status - verbs: - - patch - - update - apiGroups: - postgres-operator.crunchydata.com resources: @@ -185,4 +167,4 @@ rules: - get - list - patch - - watch + - watch \ No newline at end of file diff --git a/config/rbac/role_binding.yaml b/config/rbac/role_binding.yaml index 584ec1668c..dc900ac769 100644 --- a/config/rbac/role_binding.yaml +++ b/config/rbac/role_binding.yaml @@ -9,4 +9,4 @@ roleRef: name: postgres-operator subjects: - kind: ServiceAccount - name: pgo + name: pgo \ No newline at end of file diff --git a/config/rbac/service_acount.yaml b/config/rbac/service_acount.yaml new file mode 100644 index 0000000000..96fbf430ad --- /dev/null +++ b/config/rbac/service_acount.yaml @@ -0,0 +1,5 @@ +--- +apiVersion: v1 +kind: ServiceAccount +metadata: + name: pgo \ No newline at end of file diff --git a/config/singlenamespace/kustomization.yaml b/config/singlenamespace/kustomization.yaml new file mode 100644 index 0000000000..e69de29bb2 From 22fb169262738627668c0571a75431c52a85c67a Mon Sep 17 00:00:00 2001 From: ValClarkson Date: Fri, 19 Dec 2025 16:01:48 -0500 Subject: [PATCH 2/5] update kustomize file --- config/singlenamespace/kustomization.yaml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/config/singlenamespace/kustomization.yaml b/config/singlenamespace/kustomization.yaml index e69de29bb2..c18cbad788 100644 --- a/config/singlenamespace/kustomization.yaml +++ b/config/singlenamespace/kustomization.yaml @@ -0,0 +1,23 @@ +kind: Kustomization + +namespace: postgres-operator + +labels: +- includeSelectors: false + includeTemplates: true + pairs: + app.kubernetes.io/name: pgo + app.kubernetes.io/version: 5.8.6 +- includeSelectors: true + includeTemplates: true + pairs: + postgres-operator.crunchydata.com/control-plane: postgres-operator + +resources: +- ../crd +- ../rbac/namespace +- ../manager + +components: +- ../components/images-by-tag +- ../components/single-namespace \ No newline at end of file From a5b7d7ce75ea805b4e775c9ef21be3877bd813d6 Mon Sep 17 00:00:00 2001 From: ValClarkson Date: Fri, 19 Dec 2025 16:10:32 -0500 Subject: [PATCH 3/5] adding new line to files --- config/components/images-by-tag/kustomization.yaml | 3 ++- config/components/single-namespace/kustomization.yaml | 3 ++- config/default/kustomization.yaml | 3 ++- config/manager/kustomization.yaml | 3 ++- config/manager/kustomize_related_images.yaml | 3 ++- config/manager/manager.yaml | 3 ++- config/namespace/kustomization.yaml | 3 ++- config/namespace/namespace.yaml | 1 + config/rbac/cluster/role.yaml | 4 +++- config/rbac/cluster/role_binding.yaml | 4 +++- config/rbac/cluster/service_account.yaml | 1 + config/rbac/namespace/kustomization.yaml | 2 +- config/rbac/role.yaml | 1 + config/rbac/role_binding.yaml | 3 ++- config/rbac/service_acount.yaml | 3 ++- config/singlenamespace/kustomization.yaml | 2 +- 16 files changed, 29 insertions(+), 13 deletions(-) diff --git a/config/components/images-by-tag/kustomization.yaml b/config/components/images-by-tag/kustomization.yaml index 5339603fe2..e062c7abf4 100644 --- a/config/components/images-by-tag/kustomization.yaml +++ b/config/components/images-by-tag/kustomization.yaml @@ -50,4 +50,5 @@ images: newTag: ubi9-17.7-3.6-2550 - name: image-crunchy-postgres-18-gis-3.6 newName: registry.developers.crunchydata.com/crunchydata/crunchy-postgres-gis - newTag: ubi9-18.1-3.6-2550 \ No newline at end of file + newTag: ubi9-18.1-3.6-2550 + \ No newline at end of file diff --git a/config/components/single-namespace/kustomization.yaml b/config/components/single-namespace/kustomization.yaml index 07227cba8c..a0dd7a0582 100644 --- a/config/components/single-namespace/kustomization.yaml +++ b/config/components/single-namespace/kustomization.yaml @@ -24,4 +24,5 @@ patches: - name: CPK_TARGET_NAMESPACE valueFrom: { fieldRef: { apiVersion: v1, fieldPath: metadata.namespace } } - name: PGO_TARGET_NAMESPACE - value: '$(CPK_TARGET_NAMESPACE)' \ No newline at end of file + value: '$(CPK_TARGET_NAMESPACE)' + \ No newline at end of file diff --git a/config/default/kustomization.yaml b/config/default/kustomization.yaml index 48876343e2..71391c93ed 100644 --- a/config/default/kustomization.yaml +++ b/config/default/kustomization.yaml @@ -34,4 +34,5 @@ patches: - name: operator env: - name: PGO_FEATURE_GATES - value: "" \ No newline at end of file + value: "" + \ No newline at end of file diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index a49690a178..8b743fc24e 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -8,4 +8,5 @@ resources: images: - name: postgres-operator - newName: image-postgres-operator-5.8 \ No newline at end of file + newName: image-postgres-operator-5.8 + \ No newline at end of file diff --git a/config/manager/kustomize_related_images.yaml b/config/manager/kustomize_related_images.yaml index 8f1733ea46..cca5a0847b 100644 --- a/config/manager/kustomize_related_images.yaml +++ b/config/manager/kustomize_related_images.yaml @@ -9,4 +9,5 @@ images: path: spec/template/spec/containers/env/value - group: apps kind: Deployment - path: spec/template/spec/containers/image \ No newline at end of file + path: spec/template/spec/containers/image + \ No newline at end of file diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml index 6db8c41c98..9c5259ae15 100644 --- a/config/manager/manager.yaml +++ b/config/manager/manager.yaml @@ -78,4 +78,5 @@ spec: path: /healthz port: 8081 initialDelaySeconds: 5 - periodSeconds: 10 \ No newline at end of file + periodSeconds: 10 + \ No newline at end of file diff --git a/config/namespace/kustomization.yaml b/config/namespace/kustomization.yaml index 9233397cfb..15d35a9ccc 100644 --- a/config/namespace/kustomization.yaml +++ b/config/namespace/kustomization.yaml @@ -1,2 +1,3 @@ resources: -- namespace.yaml \ No newline at end of file +- namespace.yaml + \ No newline at end of file diff --git a/config/namespace/namespace.yaml b/config/namespace/namespace.yaml index bfebd8ac2f..00d3fd4294 100644 --- a/config/namespace/namespace.yaml +++ b/config/namespace/namespace.yaml @@ -2,3 +2,4 @@ apiVersion: v1 kind: Namespace metadata: name: postgres-operator + \ No newline at end of file diff --git a/config/rbac/cluster/role.yaml b/config/rbac/cluster/role.yaml index 9f2b7a60b7..146fadee93 100644 --- a/config/rbac/cluster/role.yaml +++ b/config/rbac/cluster/role.yaml @@ -19,6 +19,7 @@ rules: - list - patch - watch + - apiGroups: - "" resources: @@ -185,4 +186,5 @@ rules: - get - list - patch - - watch \ No newline at end of file + - watch + \ No newline at end of file diff --git a/config/rbac/cluster/role_binding.yaml b/config/rbac/cluster/role_binding.yaml index dc900ac769..1af7cfea60 100644 --- a/config/rbac/cluster/role_binding.yaml +++ b/config/rbac/cluster/role_binding.yaml @@ -9,4 +9,6 @@ roleRef: name: postgres-operator subjects: - kind: ServiceAccount - name: pgo \ No newline at end of file + name: pgo + + \ No newline at end of file diff --git a/config/rbac/cluster/service_account.yaml b/config/rbac/cluster/service_account.yaml index 364f797171..3a20853040 100644 --- a/config/rbac/cluster/service_account.yaml +++ b/config/rbac/cluster/service_account.yaml @@ -3,3 +3,4 @@ apiVersion: v1 kind: ServiceAccount metadata: name: pgo + \ No newline at end of file diff --git a/config/rbac/namespace/kustomization.yaml b/config/rbac/namespace/kustomization.yaml index 09c44caa5b..0964e6ea11 100644 --- a/config/rbac/namespace/kustomization.yaml +++ b/config/rbac/namespace/kustomization.yaml @@ -1,4 +1,4 @@ resources: - ../cluster components: -- ../../components/single-namespace \ No newline at end of file +- ../../components/single-namespace diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml index e497cdf96f..8b1cbd15a7 100644 --- a/config/rbac/role.yaml +++ b/config/rbac/role.yaml @@ -19,6 +19,7 @@ rules: - list - patch - watch + - apiGroups: - "" resources: diff --git a/config/rbac/role_binding.yaml b/config/rbac/role_binding.yaml index dc900ac769..bdaf9d0637 100644 --- a/config/rbac/role_binding.yaml +++ b/config/rbac/role_binding.yaml @@ -9,4 +9,5 @@ roleRef: name: postgres-operator subjects: - kind: ServiceAccount - name: pgo \ No newline at end of file + name: pgo + \ No newline at end of file diff --git a/config/rbac/service_acount.yaml b/config/rbac/service_acount.yaml index 96fbf430ad..3a20853040 100644 --- a/config/rbac/service_acount.yaml +++ b/config/rbac/service_acount.yaml @@ -2,4 +2,5 @@ apiVersion: v1 kind: ServiceAccount metadata: - name: pgo \ No newline at end of file + name: pgo + \ No newline at end of file diff --git a/config/singlenamespace/kustomization.yaml b/config/singlenamespace/kustomization.yaml index c18cbad788..579a7f6edf 100644 --- a/config/singlenamespace/kustomization.yaml +++ b/config/singlenamespace/kustomization.yaml @@ -20,4 +20,4 @@ resources: components: - ../components/images-by-tag -- ../components/single-namespace \ No newline at end of file +- ../components/single-namespace From 1b72e8edf10f9ef71db2e633d970d1a762ea2f0e Mon Sep 17 00:00:00 2001 From: ValClarkson Date: Fri, 19 Dec 2025 16:13:21 -0500 Subject: [PATCH 4/5] one more spot --- config/singlenamespace/kustomization.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/config/singlenamespace/kustomization.yaml b/config/singlenamespace/kustomization.yaml index 579a7f6edf..9f77aaaac8 100644 --- a/config/singlenamespace/kustomization.yaml +++ b/config/singlenamespace/kustomization.yaml @@ -21,3 +21,4 @@ resources: components: - ../components/images-by-tag - ../components/single-namespace + From b08b5d820df0865b48196d34edd05bcf6efe170e Mon Sep 17 00:00:00 2001 From: ValClarkson Date: Fri, 19 Dec 2025 16:51:13 -0500 Subject: [PATCH 5/5] rbac update --- config/rbac/role.yaml | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml index 8b1cbd15a7..84b1d58611 100644 --- a/config/rbac/role.yaml +++ b/config/rbac/role.yaml @@ -19,7 +19,6 @@ rules: - list - patch - watch - - apiGroups: - "" resources: @@ -112,6 +111,24 @@ rules: - list - patch - watch +- apiGroups: + - postgres-operator.crunchydata.com + resources: + - crunchybridgeclusters + verbs: + - get + - list + - patch + - update + - watch +- apiGroups: + - postgres-operator.crunchydata.com + resources: + - crunchybridgeclusters/finalizers + - crunchybridgeclusters/status + verbs: + - patch + - update - apiGroups: - postgres-operator.crunchydata.com resources: @@ -168,4 +185,5 @@ rules: - get - list - patch - - watch \ No newline at end of file + - watch + \ No newline at end of file