Merge branch 'main' into container-sec

percona · Jan 31, 2024 · 741213b · 741213b
2 parents 83bb716 + 9d9d3d1
commit 741213b
Show file tree

Hide file tree

Showing 10 changed files with 31 additions and 15 deletions.
diff --git a/charts/pg-db/Chart.yaml b/charts/pg-db/Chart.yaml
@@ -2,7 +2,7 @@ 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.2
+version: 2.3.3
 appVersion: 2.3.1
 home: https://docs.percona.com/percona-operator-for-postgresql/2.0/
 maintainers:

diff --git a/charts/pg-db/README.md b/charts/pg-db/README.md
@@ -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
@@ -282,7 +282,9 @@ 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.1
 #   imagePullPolicy: Always

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.1
+version: 1.15.2
 maintainers:
   - name: tplavcic
     email: [email protected]

diff --git a/charts/psmdb-operator/templates/deployment.yaml b/charts/psmdb-operator/templates/deployment.yaml
@@ -39,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:
@@ -65,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/pxc-db/Chart.yaml b/charts/pxc-db/Chart.yaml
@@ -3,7 +3,7 @@ appVersion: 1.13.0
 description: A Helm chart for installing Percona XtraDB Cluster Databases using the PXC Operator.
 name: pxc-db
 home: https://www.percona.com/doc/kubernetes-operator-for-pxc/kubernetes.html
-version: 1.13.4
+version: 1.13.6
 maintainers:
   - name: tplavcic
     email: [email protected]

diff --git a/charts/pxc-db/README.md b/charts/pxc-db/README.md
@@ -215,6 +215,8 @@ The chart can be customized using the following configurable parameters:
 | `pmm.serverUser`                    | Username for accessing PXC database internals                            | `admin`                                                                  |
 | `pmm.resources.requests`            | PMM Container resource requests                                          | `{"memory": "150M", "cpu": "300m"}`                                      |
 | `pmm.resources.limits`              | PMM Container resource limits                                            | `{}`                                                                     |
+| `pmm.pxcParams`                     | Additional parameters which will be passed to the [pmm-admin add mysql](https://docs.percona.com/percona-monitoring-and-management/setting-up/client/mysql.html#add-service) command for `pxc` Pods  | `""`                                                                     |
+| `pmm.proxysqlParams`                | Additional parameters which will be passed to the [pmm-admin add proxysql](https://docs.percona.com/percona-monitoring-and-management/setting-up/client/proxysql.html) command for `proxysql` Pods  | `""`                                                                     |
 | |
 | `backup.enabled`                    | Enables backups for PXC cluster                                          | `true`                                                                   |
 | `backup.allowParallel`              | Allow taking multiple backups in parallel                                | `true`                                                                   |

diff --git a/charts/pxc-db/templates/cluster.yaml b/charts/pxc-db/templates/cluster.yaml
@@ -473,6 +473,12 @@ spec:
     {{- end }}
     serverHost: {{ $pmm.serverHost }}
     serverUser: {{ $pmm.serverUser }}
+    {{- if $pmm.pxcParams }}
+    pxcParams: {{ $pmm.pxcParams }}
+    {{- end }}
+    {{- if $pmm.proxysqlParams }}
+    proxysqlParams: {{ $pmm.proxysqlParams }}
+    {{- end }}
     resources:
       requests:
 {{ tpl ($pmm.resources.requests | toYaml) $ | indent 8 }}

diff --git a/charts/pxc-db/templates/s3-secret.yaml b/charts/pxc-db/templates/s3-secret.yaml
@@ -5,7 +5,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: {{ include "pxc-database.fullname" $ }}-s3-{{ $key }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ $.Release.Namespace }}
   labels:
 {{ include "pxc-database.labels" $ | indent 4 }}
 type: Opaque

diff --git a/charts/pxc-db/values.yaml b/charts/pxc-db/values.yaml
@@ -477,6 +477,8 @@ pmm:
   imagePullSecrets: []
   serverHost: monitoring-service
   serverUser: admin
+  # pxcParams: "--disable-tablestats-limit=2000"
+  # proxysqlParams: "--custom-labels=CUSTOM-LABELS"
   resources:
     requests:
       memory: 150M