From 3b4a2d649202789ae1c778cacb4f21ff88e9be15 Mon Sep 17 00:00:00 2001
From: Nurlan Moldomurov <bupychuk1989@gmail.com>
Date: Fri, 25 Oct 2024 16:06:48 +0300
Subject: [PATCH] PMM-7 Fix PMM Helm chart caused by recent changes (#396)

---
 charts/pmm/Chart.yaml                 |  2 +-
 charts/pmm/templates/statefulset.yaml | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/charts/pmm/Chart.yaml b/charts/pmm/Chart.yaml
index 28c72a6a..410eac38 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.17
+version: 1.3.18
 appVersion: "2.43.1"
 home: https://github.com/percona/pmm
 maintainers:
diff --git a/charts/pmm/templates/statefulset.yaml b/charts/pmm/templates/statefulset.yaml
index 36bd5143..2df1e16f 100644
--- a/charts/pmm/templates/statefulset.yaml
+++ b/charts/pmm/templates/statefulset.yaml
@@ -62,9 +62,13 @@ spec:
             - secretRef:
                  name: {{ .Values.secret.name }}
             {{ end }}
-          # additional secrets that could be used for Grafana iDP
-          {{ if .Values.secret.create }}
           env:
+            - name: PMM_INSTALL_METHOD
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.annotations['app.kubernetes.io/managed-by']
+            {{ if .Values.secret.create }}
+            # additional secrets that could be used for Grafana iDP
             - name: GF_AUTH_GENERIC_OAUTH_CLIENT_ID
               valueFrom:
                 secretKeyRef:
@@ -83,11 +87,7 @@ spec:
                   name: {{ .Values.secret.name }}
                   key: PMM_ADMIN_PASSWORD
                   optional: true
-          {{ end }}
-            - name: PMM_INSTALL_METHOD
-              valueFrom:
-                fieldRef:
-                  fieldPath: metadata.annotations['app.kubernetes.io/managed-by']
+            {{ end }}
           ports:
             - name: http
               containerPort: 80