Revert "[postgres-operator] Update to v1.27.3 (#2226)"

This reverts commit c689367755, reversing
changes made to 7ab6283c14.

Signed-off-by: IvanHunters <xorokhotnikov@gmail.com>

packages/system/postgres-operator/Makefile

@@ -7,5 +7,5 @@ update:
 	rm -rf charts
 	helm repo add cnpg https://cloudnative-pg.github.io/charts
 	helm repo update cnpg
-	helm pull cnpg/cloudnative-pg --untar --untardir charts --version 0.26.1
+	helm pull cnpg/cloudnative-pg --untar --untardir charts
 	rm -rf charts/cloudnative-pg/charts

packages/system/postgres-operator/charts/cloudnative-pg/Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 1.27.1
+appVersion: 1.25.0
 dependencies:
 - alias: monitoring
   condition: monitoring.grafanaDashboard.create
@@ -22,4 +22,4 @@ name: cloudnative-pg
 sources:
 - https://github.com/cloudnative-pg/charts
 type: application
-version: 0.26.1
+version: 0.23.0

packages/system/postgres-operator/charts/cloudnative-pg/templates/NOTES.txt

@@ -1,5 +1,5 @@
 
-CloudNativePG operator should be installed in namespace "{{ include "cloudnative-pg.namespace" . }}".
+CloudNativePG operator should be installed in namespace "{{ .Release.Namespace }}".
 You can now create a PostgreSQL cluster with 3 nodes as follows:
 
 cat <<EOF | kubectl apply -f -
@@ -9,7 +9,7 @@ kind: Cluster
 metadata:
   name: cluster-example
   {{if not .Values.config.clusterWide  -}}
-  namespace: {{ include "cloudnative-pg.namespace" . }}
+  namespace: {{ .Release.Namespace }}
   {{- end }}
 spec:
   instances: 3

packages/system/postgres-operator/charts/cloudnative-pg/templates/_helpers.tpl

@@ -209,16 +209,6 @@ namespace scope or clusterwide
   - patch
   - update
   - watch
-- apiGroups:
-  - postgresql.cnpg.io
-  resources:
-  - failoverquorums
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - watch
 - apiGroups:
   - postgresql.cnpg.io
   resources:
@@ -251,7 +241,6 @@ namespace scope or clusterwide
   resources:
   - clusters/status
   - poolers/status
-  - failoverquorums/status
   verbs:
   - get
   - patch

packages/system/postgres-operator/charts/cloudnative-pg/templates/config.yaml

@@ -1,6 +1,5 @@
 #
-# Copyright © contributors to CloudNativePG, established as
-# CloudNativePG a Series of LF Projects, LLC.
+# Copyright The CloudNativePG Contributors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,8 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# SPDX-License-Identifier: Apache-2.0
-#
 {{- if .Values.config.create }}
 {{- if not .Values.config.secret }}
 apiVersion: v1

packages/system/postgres-operator/charts/cloudnative-pg/templates/deployment.yaml

@@ -1,6 +1,5 @@
 #
-# Copyright © contributors to CloudNativePG, established as
-# CloudNativePG a Series of LF Projects, LLC.
+# Copyright The CloudNativePG Contributors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,8 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# SPDX-License-Identifier: Apache-2.0
-#
 ---
 apiVersion: apps/v1
 kind: Deployment
@@ -33,10 +30,6 @@ spec:
   selector:
     matchLabels:
       {{- include "cloudnative-pg.selectorLabels" . | nindent 6 }}
-  {{- if .Values.updateStrategy }}
-  strategy:
-    {{- toYaml .Values.updateStrategy | nindent 4 }}
-  {{- end }}
   template:
     metadata:
       annotations:
@@ -91,7 +84,7 @@ spec:
           value: "{{ .Values.monitoringQueriesConfigMap.name }}"
         {{- if not .Values.config.clusterWide }}
         - name: WATCH_NAMESPACE
-          value: "{{ include "cloudnative-pg.namespace" . }}"
+          value: "{{ .Release.Namespace }}"
         {{- end }}
         {{- if .Values.additionalEnv }}
         {{- tpl (.Values.additionalEnv | toYaml) . | nindent 8 }}
@@ -126,17 +119,6 @@ spec:
           {{- toYaml .Values.resources | nindent 10 }}
         securityContext:
           {{- toYaml .Values.containerSecurityContext | nindent 10 }}
-        startupProbe:
-          {{- if .Values.webhook.startupProbe.failureThreshold }}
-          failureThreshold: {{ .Values.webhook.startupProbe.failureThreshold }}
-          {{- end }}
-          httpGet:
-            path: /readyz
-            port: {{ .Values.webhook.port }}
-            scheme: HTTPS
-          {{- if .Values.webhook.startupProbe.periodSeconds }}
-          periodSeconds: {{ .Values.webhook.startupProbe.periodSeconds }}
-          {{- end }}
         volumeMounts:
         - mountPath: /controller
           name: scratch-data
@@ -153,10 +135,6 @@ spec:
       nodeSelector:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- with .Values.topologySpreadConstraints }}
-      topologySpreadConstraints:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
       {{- with .Values.affinity }}
       affinity:
         {{- toYaml . | nindent 8 }}
@@ -173,3 +151,5 @@ spec:
           defaultMode: 420
           optional: true
           secretName: cnpg-webhook-cert
+
+

packages/system/postgres-operator/charts/cloudnative-pg/templates/monitoring-configmap.yaml

@@ -1,6 +1,5 @@
 #
-# Copyright © contributors to CloudNativePG, established as
-# CloudNativePG a Series of LF Projects, LLC.
+# Copyright The CloudNativePG Contributors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,8 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# SPDX-License-Identifier: Apache-2.0
-#
 ---
 apiVersion: v1
 kind: ConfigMap

packages/system/postgres-operator/charts/cloudnative-pg/templates/mutatingwebhookconfiguration.yaml

@@ -1,6 +1,5 @@
 #
-# Copyright © contributors to CloudNativePG, established as
-# CloudNativePG a Series of LF Projects, LLC.
+# Copyright The CloudNativePG Contributors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,8 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# SPDX-License-Identifier: Apache-2.0
-#
 {{- if .Values.webhook.mutating.create }}
 ---
 apiVersion: admissionregistration.k8s.io/v1
@@ -34,7 +31,7 @@ webhooks:
   clientConfig:
     service:
       name: {{ .Values.service.name }}
-      namespace: {{ include "cloudnative-pg.namespace" . }}
+      namespace: {{ .Release.Namespace }}
       path: /mutate-postgresql-cnpg-io-v1-backup
       port: {{ .Values.service.port }}
   failurePolicy: {{ .Values.webhook.mutating.failurePolicy }}
@@ -55,7 +52,7 @@ webhooks:
   clientConfig:
     service:
       name: {{ .Values.service.name }}
-      namespace: {{ include "cloudnative-pg.namespace" . }}
+      namespace: {{ .Release.Namespace }}
       path: /mutate-postgresql-cnpg-io-v1-cluster
       port: {{ .Values.service.port }}
   failurePolicy: {{ .Values.webhook.mutating.failurePolicy }}
@@ -76,28 +73,7 @@ webhooks:
   clientConfig:
     service:
       name: {{ .Values.service.name }}
-      namespace: {{ include "cloudnative-pg.namespace" . }}
-      path: /mutate-postgresql-cnpg-io-v1-database
-      port: {{ .Values.service.port }}
-  failurePolicy: {{ .Values.webhook.mutating.failurePolicy }}
-  name: mdatabase.cnpg.io
-  rules:
-  - apiGroups:
-    - postgresql.cnpg.io
-    apiVersions:
-    - v1
-    operations:
-    - CREATE
-    - UPDATE
-    resources:
-    - databases
-  sideEffects: None
-- admissionReviewVersions:
-  - v1
-  clientConfig:
-    service:
-      name: {{ .Values.service.name }}
-      namespace: {{ include "cloudnative-pg.namespace" . }}
+      namespace: {{ .Release.Namespace }}
       path: /mutate-postgresql-cnpg-io-v1-scheduledbackup
       port: {{ .Values.service.port }}
   failurePolicy: {{ .Values.webhook.mutating.failurePolicy }}

packages/system/postgres-operator/charts/cloudnative-pg/templates/podmonitor.yaml

@@ -1,6 +1,5 @@
 #
-# Copyright © contributors to CloudNativePG, established as
-# CloudNativePG a Series of LF Projects, LLC.
+# Copyright The CloudNativePG Contributors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,8 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# SPDX-License-Identifier: Apache-2.0
-#
 {{- if .Values.monitoring.podMonitorEnabled }}
 apiVersion: monitoring.coreos.com/v1
 kind: PodMonitor

packages/system/postgres-operator/charts/cloudnative-pg/templates/rbac.yaml

@@ -1,6 +1,5 @@
 #
-# Copyright © contributors to CloudNativePG, established as
-# CloudNativePG a Series of LF Projects, LLC.
+# Copyright The CloudNativePG Contributors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,8 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# SPDX-License-Identifier: Apache-2.0
-#
 {{- if .Values.serviceAccount.create }}
 ---
 apiVersion: v1
@@ -70,7 +67,7 @@ roleRef:
 subjects:
 - kind: ServiceAccount
   name: {{ include "cloudnative-pg.serviceAccountName" . }}
-  namespace: {{ include "cloudnative-pg.namespace" . }}
+  namespace: {{ .Release.Namespace }}
 {{/*
 If we're doing a single-namespace installation
 we create a Role with the common rules for the operator,
@@ -111,7 +108,7 @@ roleRef:
 subjects:
 - kind: ServiceAccount
   name: {{ include "cloudnative-pg.serviceAccountName" . }}
-  namespace: {{ include "cloudnative-pg.namespace" . }}
+  namespace: {{ .Release.Namespace }}
 {{- end }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
@@ -131,14 +128,10 @@ rules:
   resources:
   - backups
   - clusters
-  - clusters/status
   - databases
-  - failoverquorums
   - poolers
   - publications
   - scheduledbackups
-  - imagecatalogs
-  - clusterimagecatalogs
   - subscriptions
   verbs:
   - get
@@ -161,14 +154,10 @@ rules:
   resources:
   - backups
   - clusters
-  - clusters/status
   - databases
-  - failoverquorums
   - poolers
   - publications
   - scheduledbackups
-  - imagecatalogs
-  - clusterimagecatalogs
   - subscriptions
   verbs:
   - create

packages/system/postgres-operator/charts/cloudnative-pg/templates/service.yaml

@@ -1,6 +1,5 @@
 #
-# Copyright © contributors to CloudNativePG, established as
-# CloudNativePG a Series of LF Projects, LLC.
+# Copyright The CloudNativePG Contributors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,8 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# SPDX-License-Identifier: Apache-2.0
-#
 ---
 apiVersion: v1
 kind: Service

packages/system/postgres-operator/charts/cloudnative-pg/templates/validatingwebhookconfiguration.yaml

@@ -1,6 +1,5 @@
 #
-# Copyright © contributors to CloudNativePG, established as
-# CloudNativePG a Series of LF Projects, LLC.
+# Copyright The CloudNativePG Contributors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,8 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# SPDX-License-Identifier: Apache-2.0
-#
 {{- if .Values.webhook.validating.create }}
 ---
 apiVersion: admissionregistration.k8s.io/v1
@@ -34,7 +31,7 @@ webhooks:
   clientConfig:
     service:
       name: {{ .Values.service.name }}
-      namespace: {{ include "cloudnative-pg.namespace" . }}
+      namespace: {{ .Release.Namespace }}
       path: /validate-postgresql-cnpg-io-v1-backup
       port: {{ .Values.service.port }}
   failurePolicy: {{ .Values.webhook.validating.failurePolicy }}
@@ -55,7 +52,7 @@ webhooks:
   clientConfig:
     service:
       name: {{ .Values.service.name }}
-      namespace: {{ include "cloudnative-pg.namespace" . }}
+      namespace: {{ .Release.Namespace }}
       path: /validate-postgresql-cnpg-io-v1-cluster
       port: {{ .Values.service.port }}
   failurePolicy: {{ .Values.webhook.validating.failurePolicy }}
@@ -76,7 +73,7 @@ webhooks:
   clientConfig:
     service:
       name: {{ .Values.service.name }}
-      namespace: {{ include "cloudnative-pg.namespace" . }}
+      namespace: {{ .Release.Namespace }}
       path: /validate-postgresql-cnpg-io-v1-scheduledbackup
       port: {{ .Values.service.port }}
   failurePolicy: {{ .Values.webhook.validating.failurePolicy }}
@@ -92,33 +89,12 @@ webhooks:
     resources:
     - scheduledbackups
   sideEffects: None
-- admissionReviewVersions:
-  - v1
-  clientConfig:
-    service:
-      name: {{ .Values.service.name }}
-      namespace: {{ include "cloudnative-pg.namespace" . }}
-      path: /validate-postgresql-cnpg-io-v1-database
-      port: {{ .Values.service.port }}
-  failurePolicy: {{ .Values.webhook.validating.failurePolicy }}
-  name: vdatabase.cnpg.io
-  rules:
-  - apiGroups:
-    - postgresql.cnpg.io
-    apiVersions:
-    - v1
-    operations:
-    - CREATE
-    - UPDATE
-    resources:
-    - databases
-  sideEffects: None
 - admissionReviewVersions:
     - v1
   clientConfig:
     service:
       name: {{ .Values.service.name }}
-      namespace: {{ include "cloudnative-pg.namespace" . }}
+      namespace: {{ .Release.Namespace }}
       path: /validate-postgresql-cnpg-io-v1-pooler
       port: {{ .Values.service.port }}
   failurePolicy: {{ .Values.webhook.validating.failurePolicy }}

packages/system/postgres-operator/charts/cloudnative-pg/values.schema.json

@@ -246,12 +246,6 @@
         "tolerations": {
             "type": "array"
         },
-        "topologySpreadConstraints": {
-            "type": "array"
-        },
-        "updateStrategy": {
-            "type": "object"
-        },
         "webhook": {
             "type": "object",
             "properties": {
@@ -285,17 +279,6 @@
                         }
                     }
                 },
-                "startupProbe": {
-                    "type": "object",
-                    "properties": {
-                        "failureThreshold": {
-                            "type": "integer"
-                        },
-                        "periodSeconds": {
-                            "type": "integer"
-                        }
-                    }
-                },
                 "validating": {
                     "type": "object",
                     "properties": {

packages/system/postgres-operator/charts/cloudnative-pg/values.yaml

@@ -1,6 +1,5 @@
 #
-# Copyright © contributors to CloudNativePG, established as
-# CloudNativePG a Series of LF Projects, LLC.
+# Copyright The CloudNativePG Contributors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,8 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# SPDX-License-Identifier: Apache-2.0
-#
 # Default values for CloudNativePG.
 # This is a YAML-formatted file.
 # Please declare variables to be passed to your templates.
@@ -36,15 +33,6 @@ namespaceOverride: ""
 hostNetwork: false
 dnsPolicy: ""
 
-# -- Update strategy for the operator.
-# ref: https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#strategy
-# For example:
-#  type: RollingUpdate
-#  rollingUpdate:
-#    maxSurge: 25%
-#    maxUnavailable: 25%
-updateStrategy: {}
-
 crds:
   # -- Specifies whether the CRDs should be created when installing the chart.
   create: true
@@ -62,9 +50,6 @@ webhook:
     initialDelaySeconds: 3
   readinessProbe:
     initialDelaySeconds: 3
-  startupProbe:
-    failureThreshold: 6
-    periodSeconds: 5
 
 # Operator configuration.
 config:
@@ -88,7 +73,7 @@ config:
   # -- The maximum number of concurrent reconciles. Defaults to 10.
   maxConcurrentReconciles: 10
 
-# -- Additional arguments to be added to the operator's args list.
+# -- Additinal arguments to be added to the operator's args list.
 additionalArgs: []
 
 # -- Array containing extra environment variables which can be templated.
@@ -167,9 +152,6 @@ resources: {}
 # -- Nodeselector for the operator to be installed.
 nodeSelector: {}
 
-# -- Topology Spread Constraints for the operator to be installed.
-topologySpreadConstraints: []
-
 # -- Tolerations for the operator to be installed.
 tolerations: []
 
@@ -655,35 +637,3 @@ monitoringQueriesConfigMap:
         - setting:
             usage: "GAUGE"
             description: "Setting value"
-
-    pg_extensions:
-      query: |
-        SELECT
-         current_database() as datname,
-         name as extname,
-         default_version,
-         installed_version,
-         CASE
-           WHEN default_version = installed_version THEN 0
-           ELSE 1
-        END AS update_available
-        FROM pg_catalog.pg_available_extensions
-        WHERE installed_version IS NOT NULL
-      metrics:
-        - datname:
-            usage: "LABEL"
-            description: "Name of the database"
-        - extname:
-            usage: "LABEL"
-            description: "Extension name"
-        - default_version:
-            usage: "LABEL"
-            description: "Default version"
-        - installed_version:
-            usage: "LABEL"
-            description: "Installed version"
-        - update_available:
-            usage: "GAUGE"
-            description: "An update is available"
-      target_databases:
-        - '*'

packages/system/postgres-operator/values.yaml

@@ -1,5 +1,3 @@
 cloudnative-pg:
   crds:
     create: true
-  image:
-    tag: "1.27.3"