Merge branch 'main' into release-1.15.1

percona · Oct 24, 2024 · 150162a · 150162a
2 parents e23b948 + f4a8dd8
commit 150162a
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 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.16
+version: 1.3.17
 appVersion: "2.43.1"
 home: https://github.com/percona/pmm
 maintainers:

diff --git a/charts/pmm/README.md b/charts/pmm/README.md
@@ -60,7 +60,7 @@ It removes all of the resources associated with the last release of the chart as
 | --------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------ |
 | `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.create`       | If true then secret will be generated by Helm chart. Otherwise it is expected to be created by user and all of its keys will be mounted as env vars.                                                                               | `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/statefulset.yaml b/charts/pmm/templates/statefulset.yaml
@@ -42,7 +42,7 @@ spec:
       {{- end }}
       containers:
         - name: {{ .Chart.Name }}
-          
+
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
 
@@ -58,8 +58,12 @@ spec:
             - configMapRef:
                 name: {{ include "pmm.fullname" . }}
                 optional: true
-
-          # additional secrets that could be used for Grafana iDP 
+            {{ if not .Values.secret.create }}
+            - secretRef:
+                 name: {{ .Values.secret.name }}
+            {{ end }}
+          # additional secrets that could be used for Grafana iDP
+          {{ if .Values.secret.create }}
           env:
             - name: GF_AUTH_GENERIC_OAUTH_CLIENT_ID
               valueFrom:
@@ -79,6 +83,7 @@ spec:
                   name: {{ .Values.secret.name }}
                   key: PMM_ADMIN_PASSWORD
                   optional: true
+          {{ end }}
             - name: PMM_INSTALL_METHOD
               valueFrom:
                 fieldRef:
@@ -92,7 +97,7 @@ spec:
             httpGet:
               path: /v1/readyz
               port: http
-          {{- if .Values.readyProbeConf }} 
+          {{- if .Values.readyProbeConf }}
             {{- toYaml .Values.readyProbeConf | nindent 12 }}
           {{- end }}
           volumeMounts: