Skip to content

Commit 5beac70

Browse files
authored
Merge branch 'main' into cloudnative-pg-release-documentation
2 parents 3aad716 + 4801848 commit 5beac70

File tree

10 files changed

+908
-22
lines changed

10 files changed

+908
-22
lines changed

charts/cloudnative-pg/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ name: cloudnative-pg
1818
description: CloudNativePG Operator Helm Chart
1919
icon: https://raw.githubusercontent.com/cloudnative-pg/artwork/main/cloudnativepg-logo.svg
2020
type: application
21-
version: "0.22.1"
21+
version: "0.23.0-rc1"
2222
# This is the version number of the application being deployed. This version number should be
2323
# incremented each time you make changes to the application. Versions are not expected to
2424
# follow Semantic Versioning, they should reflect the version the application is using.
2525
# It is recommended to use it with quotes.
26-
appVersion: "1.24.1"
26+
appVersion: "1.25.0-rc1"
2727
sources:
2828
- https://github.com/cloudnative-pg/charts
2929
keywords:

charts/cloudnative-pg/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# cloudnative-pg
22

3-
![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)
3+
![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)
44

55
CloudNativePG Operator Helm Chart
66

@@ -30,10 +30,10 @@ CloudNativePG Operator Helm Chart
3030
| additionalEnv | list | `[]` | Array containing extra environment variables which can be templated. For example: - name: RELEASE_NAME value: "{{ .Release.Name }}" - name: MY_VAR value: "mySpecialKey" |
3131
| affinity | object | `{}` | Affinity for the operator to be installed. |
3232
| commonAnnotations | object | `{}` | Annotations to be added to all other resources. |
33-
| config | object | `{"clusterWide":true,"create":true,"data":{},"name":"cnpg-controller-manager-config","secret":false}` | Operator configuration. |
3433
| 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. |
3534
| config.create | bool | `true` | Specifies whether the secret should be created. |
3635
| 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. |
36+
| config.maxConcurrentReconciles | int | `10` | The maximum number of concurrent reconciles. Defaults to 10. |
3737
| config.name | string | `"cnpg-controller-manager-config"` | The name of the configmap/secret to use. |
3838
| config.secret | bool | `false` | Specifies whether it should be stored in a secret, instead of a configmap. |
3939
| 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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,8 +196,11 @@ namespace scope or clusterwide
196196
resources:
197197
- backups
198198
- clusters
199+
- databases
199200
- poolers
201+
- publications
200202
- scheduledbackups
203+
- subscriptions
201204
verbs:
202205
- create
203206
- delete
@@ -210,7 +213,10 @@ namespace scope or clusterwide
210213
- postgresql.cnpg.io
211214
resources:
212215
- backups/status
216+
- databases/status
217+
- publications/status
213218
- scheduledbackups/status
219+
- subscriptions/status
214220
verbs:
215221
- get
216222
- patch

charts/cloudnative-pg/templates/crds/crds.yaml

Lines changed: 881 additions & 15 deletions
Large diffs are not rendered by default.

charts/cloudnative-pg/templates/deployment.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,9 @@ spec:
3333
template:
3434
metadata:
3535
annotations:
36+
checksum/rbac: {{ include (print $.Template.BasePath "/rbac.yaml") . | sha256sum }}
3637
checksum/config: {{ include (print $.Template.BasePath "/config.yaml") . | sha256sum }}
38+
checksum/monitoring-config: {{ include (print $.Template.BasePath "/monitoring-configmap.yaml") . | sha256sum }}
3739
{{- with .Values.podAnnotations }}
3840
{{- toYaml . | nindent 8 }}
3941
{{- end }}
@@ -57,6 +59,7 @@ spec:
5759
- args:
5860
- controller
5961
- --leader-elect
62+
- --max-concurrent-reconciles={{ .Values.config.maxConcurrentReconciles }}
6063
{{- if .Values.config.name }}
6164
{{- if not .Values.config.secret }}
6265
- --config-map-name={{ .Values.config.name }}

charts/cloudnative-pg/templates/rbac.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,11 @@ rules:
128128
resources:
129129
- backups
130130
- clusters
131+
- databases
131132
- poolers
133+
- publications
132134
- scheduledbackups
135+
- subscriptions
133136
verbs:
134137
- get
135138
- list
@@ -151,8 +154,11 @@ rules:
151154
resources:
152155
- backups
153156
- clusters
157+
- databases
154158
- poolers
159+
- publications
155160
- scheduledbackups
161+
- subscriptions
156162
verbs:
157163
- create
158164
- delete

charts/cloudnative-pg/values.schema.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@
2626
"data": {
2727
"type": "object"
2828
},
29+
"maxConcurrentReconciles": {
30+
"type": "integer"
31+
},
2932
"name": {
3033
"type": "string"
3134
},

charts/cloudnative-pg/values.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ webhook:
5151
readinessProbe:
5252
initialDelaySeconds: 3
5353

54-
# -- Operator configuration.
54+
# Operator configuration.
5555
config:
5656
# -- Specifies whether the secret should be created.
5757
create: true
@@ -70,6 +70,8 @@ config:
7070
# INHERITED_ANNOTATIONS: categories
7171
# INHERITED_LABELS: environment, workload, app
7272
# WATCH_NAMESPACE: namespace-a,namespace-b
73+
# -- The maximum number of concurrent reconciles. Defaults to 10.
74+
maxConcurrentReconciles: 10
7375

7476
# -- Additinal arguments to be added to the operator's args list.
7577
additionalArgs: []

charts/cluster/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ name: cluster
1818
description: Deploys and manages a CloudNativePG cluster and its associated resources.
1919
icon: https://raw.githubusercontent.com/cloudnative-pg/artwork/main/cloudnativepg-logo.svg
2020
type: application
21-
version: 0.1.2
21+
version: 0.1.3
2222
sources:
2323
- https://github.com/cloudnative-pg/charts
2424
keywords:

charts/cluster/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# cluster
22

3-
![Version: 0.1.2](https://img.shields.io/badge/Version-0.1.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
3+
![Version: 0.1.3](https://img.shields.io/badge/Version-0.1.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
44

55
> **Warning**
66
> ### This chart is under active development.

0 commit comments

Comments
 (0)