PMM-7 Fix PMM Helm chart caused by recent changes

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:

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