From 9a666a1c3ecc3b9edcf40dcee293eab1a634cc65 Mon Sep 17 00:00:00 2001 From: drfaust92 Date: Wed, 30 Oct 2024 20:47:24 -0400 Subject: [PATCH 1/7] add mongo pmm params Signed-off-by: drfaust92 --- charts/psmdb-db/templates/cluster.yaml | 6 ++++++ charts/psmdb-db/values.yaml | 2 ++ 2 files changed, 8 insertions(+) diff --git a/charts/psmdb-db/templates/cluster.yaml b/charts/psmdb-db/templates/cluster.yaml index 6e188861..29e5176b 100644 --- a/charts/psmdb-db/templates/cluster.yaml +++ b/charts/psmdb-db/templates/cluster.yaml @@ -77,6 +77,12 @@ spec: enabled: {{ .Values.pmm.enabled }} image: "{{ .Values.pmm.image.repository }}:{{ .Values.pmm.image.tag }}" serverHost: {{ .Values.pmm.serverHost }} + {{- if .Values.pmm.mongodParams }} + mongodParams: {{ .Values.pmm.mongodParams }} + {{- end }} + {{- if .Values.pmm.mongosParams }} + mongosParams: {{ .Values.pmm.mongosParams }} + {{- end }} {{- if .Values.pmm.containerSecurityContext }} containerSecurityContext: {{ .Values.pmm.containerSecurityContext | toYaml | indent 6 }} diff --git a/charts/psmdb-db/values.yaml b/charts/psmdb-db/values.yaml index 417d1922..9476e41a 100644 --- a/charts/psmdb-db/values.yaml +++ b/charts/psmdb-db/values.yaml @@ -78,6 +78,8 @@ pmm: repository: percona/pmm-client tag: 2.42.0 serverHost: monitoring-service +# mongodParams: "" +# mongosParams: "" # containerSecurityContext: {} replsets: From b7a1fc5eb7defc4125cd788fd6ac65ea518a7e19 Mon Sep 17 00:00:00 2001 From: drfaust92 Date: Wed, 30 Oct 2024 20:52:58 -0400 Subject: [PATCH 2/7] add mongo pmm params Signed-off-by: drfaust92 --- charts/psmdb-db/README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/charts/psmdb-db/README.md b/charts/psmdb-db/README.md index 1c725bba..8a280c7f 100644 --- a/charts/psmdb-db/README.md +++ b/charts/psmdb-db/README.md @@ -76,7 +76,10 @@ The chart can be customized using the following configurable parameters: | `pmm.image.tag` | PMM Container image tag | `2.42.0` | | `pmm.serverHost` | PMM server related K8S service hostname | `monitoring-service` | | `pmm.containerSecurityContext` | Set the security context for PMM container | `{}` | -| | +| `pmm.mongodParams` | PMM mongod params | `""` | +| +| `pmm.mongosParams` | PMM mongos params | `""` | +| | `replsets.rs0.name` | ReplicaSet name | `rs0` | | `replsets.rs0.size` | ReplicaSet size (pod quantity) | `3` | | `replsets.rs0.terminationGracePeriodSeconds` | The amount of seconds Kubernetes will wait for a clean replica set Pods termination | `""` | From 3760f08bed86ac57632505ce66407246f69ecfa0 Mon Sep 17 00:00:00 2001 From: drfaust92 Date: Wed, 30 Oct 2024 20:53:52 -0400 Subject: [PATCH 3/7] add mongo pmm params Signed-off-by: drfaust92 --- charts/psmdb-db/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/psmdb-db/README.md b/charts/psmdb-db/README.md index 8a280c7f..7165f7ae 100644 --- a/charts/psmdb-db/README.md +++ b/charts/psmdb-db/README.md @@ -77,9 +77,9 @@ The chart can be customized using the following configurable parameters: | `pmm.serverHost` | PMM server related K8S service hostname | `monitoring-service` | | `pmm.containerSecurityContext` | Set the security context for PMM container | `{}` | | `pmm.mongodParams` | PMM mongod params | `""` | -| +| | | `pmm.mongosParams` | PMM mongos params | `""` | -| +| | | `replsets.rs0.name` | ReplicaSet name | `rs0` | | `replsets.rs0.size` | ReplicaSet size (pod quantity) | `3` | | `replsets.rs0.terminationGracePeriodSeconds` | The amount of seconds Kubernetes will wait for a clean replica set Pods termination | `""` | From 2b797258b5f9e5f2e58101a519d7832fb69966e7 Mon Sep 17 00:00:00 2001 From: drfaust92 Date: Wed, 30 Oct 2024 21:04:54 -0400 Subject: [PATCH 4/7] add mongo pmm resources Signed-off-by: drfaust92 --- charts/psmdb-db/README.md | 1 + charts/psmdb-db/templates/cluster.yaml | 4 ++++ charts/psmdb-db/values.yaml | 1 + 3 files changed, 6 insertions(+) diff --git a/charts/psmdb-db/README.md b/charts/psmdb-db/README.md index 7165f7ae..65396253 100644 --- a/charts/psmdb-db/README.md +++ b/charts/psmdb-db/README.md @@ -76,6 +76,7 @@ The chart can be customized using the following configurable parameters: | `pmm.image.tag` | PMM Container image tag | `2.42.0` | | `pmm.serverHost` | PMM server related K8S service hostname | `monitoring-service` | | `pmm.containerSecurityContext` | Set the security context for PMM container | `{}` | +| `pmm.resources` | Set resources for PMM container | `{}` | | `pmm.mongodParams` | PMM mongod params | `""` | | | | `pmm.mongosParams` | PMM mongos params | `""` | diff --git a/charts/psmdb-db/templates/cluster.yaml b/charts/psmdb-db/templates/cluster.yaml index 29e5176b..59ca721b 100644 --- a/charts/psmdb-db/templates/cluster.yaml +++ b/charts/psmdb-db/templates/cluster.yaml @@ -82,6 +82,10 @@ spec: {{- end }} {{- if .Values.pmm.mongosParams }} mongosParams: {{ .Values.pmm.mongosParams }} + {{- end }} + {{- if .Values.pmm.resources }} + resources: +{{ .Values.pmm.resources | toYaml | indent 6 }} {{- end }} {{- if .Values.pmm.containerSecurityContext }} containerSecurityContext: diff --git a/charts/psmdb-db/values.yaml b/charts/psmdb-db/values.yaml index 9476e41a..3894023d 100644 --- a/charts/psmdb-db/values.yaml +++ b/charts/psmdb-db/values.yaml @@ -80,6 +80,7 @@ pmm: serverHost: monitoring-service # mongodParams: "" # mongosParams: "" +# resources: {} # containerSecurityContext: {} replsets: From 910f2d7dc3c905cc0ac450791d1fcc32fbb208fe Mon Sep 17 00:00:00 2001 From: Ilia Lazebnik Date: Fri, 1 Nov 2024 20:00:37 -0400 Subject: [PATCH 5/7] bump chart version --- 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 e92d2bec..18d6c7cc 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.19 +version: 1.3.20 appVersion: "2.43.2" home: https://github.com/percona/pmm maintainers: From 37185c105b14a51407eb0f5b9e5307056d4b99a7 Mon Sep 17 00:00:00 2001 From: Ilia Lazebnik Date: Fri, 1 Nov 2024 20:02:11 -0400 Subject: [PATCH 6/7] Update 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 18d6c7cc..e92d2bec 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.20 +version: 1.3.19 appVersion: "2.43.2" home: https://github.com/percona/pmm maintainers: From dcc2e183044c5e3abcb59634d518c5a328e21f7e Mon Sep 17 00:00:00 2001 From: Ilia Lazebnik Date: Fri, 1 Nov 2024 20:03:22 -0400 Subject: [PATCH 7/7] Update Chart.yaml --- charts/psmdb-db/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/psmdb-db/Chart.yaml b/charts/psmdb-db/Chart.yaml index fd2c31e0..0e95231d 100644 --- a/charts/psmdb-db/Chart.yaml +++ b/charts/psmdb-db/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "1.17.0" description: A Helm chart for installing Percona Server MongoDB Cluster Databases using the PSMDB Operator. name: psmdb-db home: https://www.percona.com/doc/kubernetes-operator-for-psmongodb/index.html -version: 1.17.0 +version: 1.17.1 maintainers: - name: tplavcic email: tomislav.plavcic@percona.com