From 7847a560cc5d40c6c1b142a6450e4b2ab3512cc3 Mon Sep 17 00:00:00 2001
From: Thomas Decaux <ebuildy@gmail.com>
Date: Mon, 29 Jan 2024 12:12:46 -0500
Subject: [PATCH] fix(pmm/secret): use Values.secret.annotations (#263)

* fix(pmm/secret): use Values.secret.annotations

* Add "secret.annotations" in values.yaml

* edit readme

* bump chart patch version
---
 charts/pmm/Chart.yaml            | 2 +-
 charts/pmm/README.md             | 1 +
 charts/pmm/templates/secret.yaml | 2 +-
 charts/pmm/values.yaml           | 2 ++
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/charts/pmm/Chart.yaml b/charts/pmm/Chart.yaml
index d9967ef6..f47183d3 100644
--- 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
index 2d543758..984587d9 100644
--- 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
index 50c827c8..040235f4 100644
--- 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
index d19f1f02..78990397 100644
--- 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