Merge branch 'main' into patch-1

percona · Jan 31, 2024 · 4d22649 · 4d22649
2 parents db32922 + 437aef9
commit 4d22649
Show file tree

Hide file tree

Showing 18 changed files with 61 additions and 28 deletions.
diff --git a/charts/pg-db/Chart.yaml b/charts/pg-db/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: pg-db
 description: 'A Helm chart to deploy the PostgreSQL database with the Percona Operator for PostgreSQL'
 type: application
-version: 2.3.1
-appVersion: 2.3.0
+version: 2.3.3
+appVersion: 2.3.1
 home: https://docs.percona.com/percona-operator-for-postgresql/2.0/
 maintainers:
   - name: tplavcic

diff --git a/charts/pg-db/README.md b/charts/pg-db/README.md
@@ -24,17 +24,17 @@ To install the chart with the `pg` release name using a dedicated namespace (rec
 
 ```sh
 helm repo add percona https://percona.github.io/percona-helm-charts/
-helm install my-db percona/pg-db --version 2.3.0 --namespace my-namespace
+helm install my-db percona/pg-db --version 2.3.1 --namespace my-namespace
 ```
 
 The chart can be customized using the following configurable parameters:
 
 | Parameter                       | Description                                                                   | Default                                                     |
 | ------------------------------- | ------------------------------------------------------------------------------|-------------------------------------------------------------|
 | `finalizers`                     | Finalizers list                                                 | `{}`                                                        |
-| `crVersion`                     | CR Cluster Manifest version                                                   | `2.3.0`                                                     |
+| `crVersion`                     | CR Cluster Manifest version                                                   | `2.3.1`                                                     |
 | `repository`                     | PostgreSQL container image repository                                               | `percona/percona-postgresql-operator`                       |
-| `image`                     | Postgres image                                                  | `percona/percona-postgresql-operator:2.3.0-ppg16-postgres`  |
+| `image`                     | Postgres image                                                  | `percona/percona-postgresql-operator:2.3.1-ppg16-postgres`  |
 | `imagePullPolicy`                     | image Pull Policy                                                   | `Always`                                                    |
 | `port`                         | PostgreSQL port                                                    | `5432`                                                      |
 | `postgresVersion`                     | PostgreSQL container version tag                                       | `16`                                                        |
@@ -116,7 +116,7 @@ The chart can be customized using the following configurable parameters:
 | `backups.restore.enabled`                         |  Enables or disables restoring a previously made backup                                               | `false`                                                     |
 | `backups.restore.repoName`                         | Name of the pgBackRest repository that contains the backup to be restored                                                | `repo1`                                                     |
 | `backups.restore.options`                         | The pgBackRest command-line options for the pgBackRest restore command                                                | `--type=time`                                               |
-| `backups.pgbackrest.image`                     | Set this variable if you need to use a custom pgBackrest image                                        | `percona/percona-postresql-operator:2.3.0-ppg16-pgbackrest` |
+| `backups.pgbackrest.image`                     | Set this variable if you need to use a custom pgBackrest image                                        | `percona/percona-postresql-operator:2.3.1-ppg16-pgbackrest` |
 | `backups.repos.repo2.s3.bucket`                     | Storage bucket | ``                                                          |
 | `backups.repos.repo2.s3.region`                     |  S3-compatible storage name | ``                                                          |
 | `backups.repos.repo2.s3.endpoint`              | S3-compatible storage endpoint | ``                                                          |
@@ -150,7 +150,8 @@ The chart can be customized using the following configurable parameters:
 | `pmm.serverHost`           | PMM server related K8S service hostname              | `monitoring-service`                                        |
 | `pmm.resources.requests.memory`                    | Container resource request for RAM              | `200M`                                                      |
 | `pmm.resources.requests.cpu`                    | Container resource request for CPU              | `500m`                                                      |
-| `patroni.dynamicConfiguration`   | Add custom configuration for patroni                                          | `{}` |
+| `patroni.dynamicConfiguration.postgresql.parameters`                    | Custom PostgreSQL configuration options              | `{}` |
+| `patroni.dynamicConfiguration.postgresql.pg_hba`                    | PostgreSQL Host-Based Authentication section              | `{}` |
 | `extensions.image`               | Image for the custom PostgreSQL extension loader sidecar container            | `""` |
 | `extensions.imagePullPolicy`     | Policy for the custom extension sidecar container                             | `Always` |
 | `extensions.storage.type`        | The cloud storage type used for backups. Only s3 type is currently supported. | `""` |

diff --git a/charts/pg-db/values.yaml b/charts/pg-db/values.yaml
@@ -8,7 +8,7 @@ finalizers:
 # Set this if you want that operator deletes the ssl objects on cluster deletion
 #  - percona.com/delete-ssl
 
-crVersion: 2.3.0
+crVersion: 2.3.1
 repository: registry-1.percona.com/percona/percona-postgresql-operator
 image: ""
 imagePullPolicy: Always
@@ -282,9 +282,11 @@ pmm:
 #         max_worker_processes: 2
 #         shared_buffers: 1GB
 #         work_mem: 2MB
-#
+#       pg_hba:
+#       - host    all mytest 123.123.123.123/32 reject
+
 # extensions:
-#   image: percona/percona-postgresql-operator:2.3.0
+#   image: percona/percona-postgresql-operator:2.3.1
 #   imagePullPolicy: Always
 #   storage:
 #     type: s3

diff --git a/charts/pg-operator/Chart.yaml b/charts/pg-operator/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: pg-operator
 description: 'A Helm chart to deploy the Percona Operator for PostgreSQL'
 type: application
-version: 2.3.2
-appVersion: 2.3.0
+version: 2.3.3
+appVersion: 2.3.1
 home: https://docs.percona.com/percona-operator-for-postgresql/2.0/
 maintainers:
   - name: tplavcic

diff --git a/charts/pg-operator/README.md b/charts/pg-operator/README.md
@@ -35,7 +35,7 @@ Chart.
 
 | Parameter                       | Description                                                             | Default                                          |
 | ------------------------------- | ------------------------------------------------------------------------| -------------------------------------------------|
-| `image` | PG Operator Container image full path | `percona/percona-postgresql-operator:2.3.0` |
+| `image` | PG Operator Container image full path | `percona/percona-postgresql-operator:2.3.1` |
 | `imagePullPolicy` | PG Operator Container pull policy | `Always`|
 | `resources` | Resource requests and limits | `{}` |
 | `nodeSelector` | Labels for Pod assignment | `{}` |
@@ -49,7 +49,7 @@ Chart.
 To deploy Percona Operator for PostgreSQL cluster with disabled telemetry run the following command:
 
 ```sh
-helm install my-db percona/pg-db --version 2.3.0 --namespace my-namespace
+helm install my-db percona/pg-db --version 2.3.1 --namespace my-namespace
 ```
 
 See more about Percona Operator for PostgreSQL deployment in its chart [here](https://github.com/percona/percona-helm-charts/tree/main/charts/pg-db) or in the [Helm chart installation guide](https://www.percona.com/doc/kubernetes-operator-for-postgresql/helm.html).
diff --git a/charts/pmm/Chart.yaml b/charts/pmm/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: pmm
 description: A Helm chart for Percona Monitoring and Management (PMM)
 type: application
-version: 1.3.8
+version: 1.3.9
 appVersion: "2.41.0"
 home: https://github.com/percona/pmm
 maintainers:

diff --git a/charts/pmm/README.md b/charts/pmm/README.md
@@ -59,6 +59,7 @@ It removes all of the resources associated with the last release of the chart as
 | Name                  | Description                                                                                                                                                                        | Value        |
 | --------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------ |
 | `secret.name`         | Defines the name of the k8s secret that holds passwords and other secrets                                                                                                          | `pmm-secret` |
+| `secret.annotations`  | Defines the annotations of the k8s secret that holds passwords and other secrets                                                                                                   | `{}`         |
 | `secret.create`       | If true then secret will be generated by Helm chart. Otherwise it is expected to be created by user.                                                                               | `true`       |
 | `secret.pmm_password` | Initial PMM password - it changes only on the first deployment, ignored if PMM was already provisioned and just restarted. If PMM admin password is not set, it will be generated. | `""`         |
 | `certs`               | Optional certificates, if not provided PMM would use generated self-signed certificates,                                                                                           | `{}`         |

diff --git a/charts/pmm/templates/secret.yaml b/charts/pmm/templates/secret.yaml
@@ -5,7 +5,7 @@ metadata:
   name: {{ .Values.secret.name }}
   labels:
     {{- include "pmm.labels" . | nindent 4 }}
-  {{- with .Values.serviceAccount.annotations }}
+  {{- with .Values.secret.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}
   {{- end }}

diff --git a/charts/pmm/values.yaml b/charts/pmm/values.yaml
@@ -59,6 +59,8 @@ secret:
   ## @param secret.name Defines the name of the k8s secret that holds passwords and other secrets
   ##
   name: pmm-secret
+  ## @param secret.annotations -- Secret annotations configuration
+  annotations: {}
   ## @param secret.create If true then secret will be generated by Helm chart. Otherwise it is expected to be created by user.
   ##
   create: true

diff --git a/charts/psmdb-operator/Chart.yaml b/charts/psmdb-operator/Chart.yaml
@@ -3,7 +3,7 @@ appVersion: "1.15.0"
 description: A Helm chart for deploying the Percona Operator for MongoDB
 name: psmdb-operator
 home: https://docs.percona.com/percona-operator-for-mongodb/
-version: 1.15.0
+version: 1.15.2
 maintainers:
   - name: tplavcic
     email: [email protected]

diff --git a/charts/psmdb-operator/README.md b/charts/psmdb-operator/README.md
@@ -32,6 +32,8 @@ The chart can be customized using the following configurable parameters:
 | `image.pullSecrets`             | PSMDB Operator Pod pull secret                                                | `[]`                                      |
 | `replicaCount`                  | PSMDB Operator Pod quantity                                                   | `1`                                       |
 | `tolerations`                   | List of node taints to tolerate                                               | `[]`                                      |
+| `annotations`                   | PSMDB Operator Deployment annotations                                         | `{}`                                      |
+| `podAnnotations`                | PSMDB Operator Pod annotations                                                | `{}`                                      |
 | `resources`                     | Resource requests and limits                                                  | `{}`                                      |
 | `nodeSelector`                  | Labels for Pod assignment                                                     | `{}`                                      |
 | `podAnnotations`                | Annotations for pod                                                           | `{}`                                      |
@@ -40,6 +42,7 @@ The chart can be customized using the following configurable parameters:
 | `rbac.create`                   | If false RBAC will not be created. RBAC resources will need to be created manually  | `true`                              |
 | `securityContext`               | Container Security Context                                                    | `{}`                                      |
 | `serviceAccount.create`         | If false the ServiceAccounts will not be created. The ServiceAccounts must be created manually  | `true`                  |
+| `serviceAccount.annotations`    | PSMDB Operator ServiceAccount annotations                                     | `{}`                                      |
 | `logStructured`                 | Force PSMDB operator to print JSON-wrapped log messages                       | `false`                                   |
 | `logLevel`                      | PSMDB Operator logging level                                                  | `INFO`                                    |
 | `disableTelemetry`              | Disable sending PSMDB Operator telemetry data to Percona                      | `false`                                   |

diff --git a/charts/psmdb-operator/templates/deployment.yaml b/charts/psmdb-operator/templates/deployment.yaml
@@ -4,7 +4,11 @@ metadata:
   name: {{ include "psmdb-operator.fullname" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-{{ include "psmdb-operator.labels" . | indent 4 }}
+    {{- include "psmdb-operator.labels" . | nindent 4 }}
+  {{- with .Values.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
 spec:
   replicas: {{ .Values.replicaCount }}
   selector:
@@ -35,9 +39,12 @@ spec:
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           ports:
-          - containerPort: 60000
+          - containerPort: 8080
             protocol: TCP
             name: metrics
+          - containerPort: 8081
+            protocol: TCP
+            name: health
           command:
           - percona-server-mongodb-operator
           env:
@@ -61,14 +68,14 @@ spec:
               value: "{{ .Values.env.resyncPeriod }}"
             - name: DISABLE_TELEMETRY
               value: "{{ .Values.disableTelemetry }}"
-          # livenessProbe:
-          #   httpGet:
-          #     path: /
-          #     port: metrics
-          # readinessProbe:
-          #   httpGet:
-          #     path: /
-          #     port: metrics
+          livenessProbe:
+            httpGet:
+              path: /healthz
+              port: health
+          readinessProbe:
+            httpGet:
+              path: /healthz
+              port: health
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
       {{- with .Values.nodeSelector }}

diff --git a/charts/psmdb-operator/templates/role-binding.yaml b/charts/psmdb-operator/templates/role-binding.yaml
@@ -4,6 +4,10 @@ kind: ServiceAccount
 metadata:
   name: {{ include "psmdb-operator.fullname" . }}
   namespace: {{ .Release.Namespace }}
+  {{- with .Values.serviceAccount.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
 ---
 {{- end }}
 {{- if .Values.rbac.create }}

diff --git a/charts/psmdb-operator/values.yaml b/charts/psmdb-operator/values.yaml
@@ -31,7 +31,13 @@ rbac:
 serviceAccount:
   # serviceAccount.create: Whether to create the Service Accounts or not
   create: true
+  # annotations to add to the service account
+  annotations: {}
 
+# annotations to add to the operator deployment
+annotations: {}
+
+# annotations to add to the operator pod
 podAnnotations: {}
   # prometheus.io/scrape: "true"
   # prometheus.io/port: "8080"

diff --git a/charts/pxc-operator/Chart.yaml b/charts/pxc-operator/Chart.yaml
@@ -3,7 +3,7 @@ appVersion: 1.13.0
 description: A Helm chart for deploying the Percona Operator for MySQL (based on Percona XtraDB Cluster)
 name: pxc-operator
 home: https://docs.percona.com/percona-operator-for-mysql/pxc/
-version: 1.13.3
+version: 1.13.4
 maintainers:
   - name: tplavcic
     email: [email protected]

diff --git a/charts/pxc-operator/README.md b/charts/pxc-operator/README.md
@@ -32,6 +32,7 @@ The chart can be customized using the following configurable parameters:
 | `imagePullSecrets`              | PXC Operator Pod pull secret                                                                   | `[]`                                             |
 | `replicaCount`                  | PXC Operator Pod quantity                                                                      | `1`                                              |
 | `tolerations`                   | List of node taints to tolerate                                                                | `[]`                                             |
+| `podAnnotations`                | Operator Pod user-defined annotations                                                          | `{}`                                             |
 | `resources`                     | Resource requests and limits                                                                   | `{}`                                             |
 | `nodeSelector`                  | Labels for Pod assignment                                                                      | `{}`                                             |
 | `logStructured`                 | Force PXC operator to print JSON-wrapped log messages                                          | `false`                                          |

diff --git a/charts/pxc-operator/templates/deployment.yaml b/charts/pxc-operator/templates/deployment.yaml
@@ -19,6 +19,10 @@ spec:
     type: RollingUpdate
   template:
     metadata:
+    {{- with .Values.podAnnotations }}
+      annotations:
+        {{- toYaml . | nindent 8 }}
+    {{- end }}
       labels:
         app.kubernetes.io/component: operator
         app.kubernetes.io/name: {{ include "pxc-operator.name" . }}

diff --git a/charts/pxc-operator/values.yaml b/charts/pxc-operator/values.yaml
@@ -53,6 +53,8 @@ tolerations: []
 
 affinity: {}
 
+podAnnotations: {}
+
 logStructured: false
 logLevel: "INFO"
 disableTelemetry: false