From 494d953fd8a7b49078e11b29a6d8db873e780b80 Mon Sep 17 00:00:00 2001 From: AvivGuiser Date: Sat, 21 Sep 2024 13:28:40 +0300 Subject: [PATCH 1/7] add the option to load env from a external secet Signed-off-by: AvivGuiser --- charts/pmm/templates/statefulset.yaml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/charts/pmm/templates/statefulset.yaml b/charts/pmm/templates/statefulset.yaml index a310cfee..ef26732e 100644 --- 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 }} + - secretFef: + 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: From cf4f39666ad0bca508e01742268f91c93e0a677f Mon Sep 17 00:00:00 2001 From: AvivGuiser Date: Sat, 21 Sep 2024 13:32:17 +0300 Subject: [PATCH 2/7] fix typo Signed-off-by: AvivGuiser --- charts/pmm/templates/statefulset.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/pmm/templates/statefulset.yaml b/charts/pmm/templates/statefulset.yaml index ef26732e..36bd5143 100644 --- a/charts/pmm/templates/statefulset.yaml +++ b/charts/pmm/templates/statefulset.yaml @@ -59,7 +59,7 @@ spec: name: {{ include "pmm.fullname" . }} optional: true {{ if not .Values.secret.create }} - - secretFef: + - secretRef: name: {{ .Values.secret.name }} {{ end }} # additional secrets that could be used for Grafana iDP From 87bfabbe764ce7b7e28e9c4f4859b9a18b3f7785 Mon Sep 17 00:00:00 2001 From: AvivGuiser Date: Sat, 21 Sep 2024 13:33:39 +0300 Subject: [PATCH 3/7] bump chart version Signed-off-by: AvivGuiser --- charts/pmm/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/pmm/Chart.yaml b/charts/pmm/Chart.yaml index b54bd83e..2d6d9a47 100644 --- a/charts/pmm/Chart.yaml +++ b/charts/pmm/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 name: pmm description: A Helm chart for Percona Monitoring and Management (PMM) type: application -version: 1.3.16 -appVersion: "2.43.1" +version: 1.3.15 +appVersion: "2.42.0" home: https://github.com/percona/pmm maintainers: - name: tplavcic From fa0e62f05e38aad85c893eea65ef3d0d041b13cd Mon Sep 17 00:00:00 2001 From: AvivGuiser Date: Wed, 2 Oct 2024 15:10:49 +0300 Subject: [PATCH 4/7] bump chart Signed-off-by: AvivGuiser --- charts/pmm/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/pmm/Chart.yaml b/charts/pmm/Chart.yaml index 2d6d9a47..791d27b8 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.15 +version: 1.3.16 appVersion: "2.42.0" home: https://github.com/percona/pmm maintainers: From 34c148d3c81fc9802e73db517b4724eaddd80298 Mon Sep 17 00:00:00 2001 From: AvivGuiser Date: Wed, 2 Oct 2024 15:13:42 +0300 Subject: [PATCH 5/7] update README Signed-off-by: AvivGuiser --- charts/pmm/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/pmm/README.md b/charts/pmm/README.md index b1d90859..46f46367 100644 --- 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, | `{}` | From 7221aa7948a0956cef71a57aeb322cf1fcf8b3c2 Mon Sep 17 00:00:00 2001 From: AvivGuiser Date: Thu, 3 Oct 2024 14:39:46 +0300 Subject: [PATCH 6/7] bump chart Signed-off-by: AvivGuiser --- charts/pmm/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/pmm/Chart.yaml b/charts/pmm/Chart.yaml index 791d27b8..f64d435c 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.16 +version: 1.3.17 appVersion: "2.42.0" home: https://github.com/percona/pmm maintainers: From 999682221980478fd5e786b7969c1896ceb4ed76 Mon Sep 17 00:00:00 2001 From: Nurlan Moldomurov Date: Tue, 15 Oct 2024 18:00:36 +0300 Subject: [PATCH 7/7] Update charts/pmm/Chart.yaml --- charts/pmm/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/pmm/Chart.yaml b/charts/pmm/Chart.yaml index f64d435c..28c72a6a 100644 --- a/charts/pmm/Chart.yaml +++ b/charts/pmm/Chart.yaml @@ -3,7 +3,7 @@ name: pmm description: A Helm chart for Percona Monitoring and Management (PMM) type: application version: 1.3.17 -appVersion: "2.42.0" +appVersion: "2.43.1" home: https://github.com/percona/pmm maintainers: - name: tplavcic