Merge branch 'main' into psmdb-operator-annotations-support

percona · Jan 30, 2024 · 85ae0f6 · 85ae0f6
2 parents 7c0559b + f5b644b
commit 85ae0f6
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 3 deletions.
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/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