Merge branch 'main' into dev/466

charts/cloudnative-pg/Chart.yaml

@@ -18,12 +18,12 @@ name: cloudnative-pg
 description: CloudNativePG Operator Helm Chart
 icon: https://raw.githubusercontent.com/cloudnative-pg/artwork/main/cloudnativepg-logo.svg
 type: application
-version: "0.22.1"
+version: "0.23.0-rc1"
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning, they should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "1.24.1"
+appVersion: "1.25.0-rc1"
 sources:
   - https://github.com/cloudnative-pg/charts
 keywords:

charts/cloudnative-pg/README.md

@@ -1,6 +1,6 @@
 # cloudnative-pg
 
-![Version: 0.22.1](https://img.shields.io/badge/Version-0.22.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.24.1](https://img.shields.io/badge/AppVersion-1.24.1-informational?style=flat-square)
+![Version: 0.23.0-rc1](https://img.shields.io/badge/Version-0.23.0--rc1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.25.0-rc1](https://img.shields.io/badge/AppVersion-1.25.0--rc1-informational?style=flat-square)
 
 CloudNativePG Operator Helm Chart
 
@@ -30,10 +30,10 @@ CloudNativePG Operator Helm Chart
 | additionalEnv | list | `[]` | Array containing extra environment variables which can be templated. For example:  - name: RELEASE_NAME    value: "{{ .Release.Name }}"  - name: MY_VAR    value: "mySpecialKey" |
 | affinity | object | `{}` | Affinity for the operator to be installed. |
 | commonAnnotations | object | `{}` | Annotations to be added to all other resources. |
-| config | object | `{"clusterWide":true,"create":true,"data":{},"name":"cnpg-controller-manager-config","secret":false}` | Operator configuration. |
 | config.clusterWide | bool | `true` | This option determines if the operator is responsible for observing events across the entire Kubernetes cluster or if its focus should be narrowed down to the specific namespace within which it has been deployed. |
 | config.create | bool | `true` | Specifies whether the secret should be created. |
 | config.data | object | `{}` | The content of the configmap/secret, see https://cloudnative-pg.io/documentation/current/operator_conf/#available-options for all the available options. |
+| config.maxConcurrentReconciles | int | `10` | The maximum number of concurrent reconciles. Defaults to 10. |
 | config.name | string | `"cnpg-controller-manager-config"` | The name of the configmap/secret to use. |
 | config.secret | bool | `false` | Specifies whether it should be stored in a secret, instead of a configmap. |
 | containerSecurityContext | object | `{"allowPrivilegeEscalation":false,"capabilities":{"drop":["ALL"]},"readOnlyRootFilesystem":true,"runAsGroup":10001,"runAsUser":10001,"seccompProfile":{"type":"RuntimeDefault"}}` | Container Security Context. |

charts/cloudnative-pg/templates/_helpers.tpl

@@ -196,8 +196,11 @@ namespace scope or clusterwide
   resources:
   - backups
   - clusters
+  - databases
   - poolers
+  - publications
   - scheduledbackups
+  - subscriptions
   verbs:
   - create
   - delete
@@ -210,7 +213,10 @@ namespace scope or clusterwide
   - postgresql.cnpg.io
   resources:
   - backups/status
+  - databases/status
+  - publications/status
   - scheduledbackups/status
+  - subscriptions/status
   verbs:
   - get
   - patch

charts/cloudnative-pg/templates/deployment.yaml

@@ -33,7 +33,9 @@ spec:
   template:
     metadata:
       annotations:
+        checksum/rbac: {{ include (print $.Template.BasePath "/rbac.yaml") . | sha256sum }}
         checksum/config: {{ include (print $.Template.BasePath "/config.yaml") . | sha256sum }}
+        checksum/monitoring-config: {{ include (print $.Template.BasePath "/monitoring-configmap.yaml") . | sha256sum }}
       {{- with .Values.podAnnotations }}
         {{- toYaml . | nindent 8 }}
       {{- end }}
@@ -57,6 +59,7 @@ spec:
       - args:
         - controller
         - --leader-elect
+        - --max-concurrent-reconciles={{ .Values.config.maxConcurrentReconciles }}
         {{- if .Values.config.name }}
         {{- if not .Values.config.secret }}
         - --config-map-name={{ .Values.config.name }}

charts/cloudnative-pg/templates/rbac.yaml

@@ -128,8 +128,11 @@ rules:
   resources:
   - backups
   - clusters
+  - databases
   - poolers
+  - publications
   - scheduledbackups
+  - subscriptions
   verbs:
   - get
   - list
@@ -151,8 +154,11 @@ rules:
   resources:
   - backups
   - clusters
+  - databases
   - poolers
+  - publications
   - scheduledbackups
+  - subscriptions
   verbs:
   - create
   - delete

charts/cloudnative-pg/values.schema.json

@@ -26,6 +26,9 @@
                 "data": {
                     "type": "object"
                 },
+                "maxConcurrentReconciles": {
+                    "type": "integer"
+                },
                 "name": {
                     "type": "string"
                 },

charts/cloudnative-pg/values.yaml

@@ -51,7 +51,7 @@ webhook:
   readinessProbe:
     initialDelaySeconds: 3
 
-# -- Operator configuration.
+# Operator configuration.
 config:
   # -- Specifies whether the secret should be created.
   create: true
@@ -70,6 +70,8 @@ config:
   # INHERITED_ANNOTATIONS: categories
   # INHERITED_LABELS: environment, workload, app
   # WATCH_NAMESPACE: namespace-a,namespace-b
+  # -- The maximum number of concurrent reconciles. Defaults to 10.
+  maxConcurrentReconciles: 10
 
 # -- Additinal arguments to be added to the operator's args list.
 additionalArgs: []