From 4c36682e318efbf745875e12ebf1974dbf1ebdbf Mon Sep 17 00:00:00 2001 From: Roberto Date: Sun, 4 Nov 2018 22:16:14 +0100 Subject: [PATCH] mongodb-replicaset: added resources definition for initContainers (#8285) * Update mongodb-statefulset.yaml Signed-off-by: Roberto Previtera * Update values.yaml Signed-off-by: Roberto Previtera * added resources definition for initContainers Signed-off-by: Roberto Previtera * added resources definition for initContainers Signed-off-by: Roberto Previtera * version bump Signed-off-by: Roberto Previtera --- stable/mongodb-replicaset/Chart.yaml | 2 +- stable/mongodb-replicaset/README.md | 1 + .../mongodb-replicaset/templates/mongodb-statefulset.yaml | 7 +++++++ stable/mongodb-replicaset/values.yaml | 3 +++ 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/stable/mongodb-replicaset/Chart.yaml b/stable/mongodb-replicaset/Chart.yaml index fbc86c48e4..b3a197becc 100644 --- a/stable/mongodb-replicaset/Chart.yaml +++ b/stable/mongodb-replicaset/Chart.yaml @@ -1,6 +1,6 @@ name: mongodb-replicaset home: https://github.com/mongodb/mongo -version: 3.6.3 +version: 3.6.4 appVersion: 3.6 description: NoSQL document-oriented database that stores JSON-like documents with dynamic schemas, simplifying the integration of data in content-driven applications. diff --git a/stable/mongodb-replicaset/README.md b/stable/mongodb-replicaset/README.md index 53b0b56f98..4eea34bd56 100644 --- a/stable/mongodb-replicaset/README.md +++ b/stable/mongodb-replicaset/README.md @@ -55,6 +55,7 @@ The following table lists the configurable parameters of the mongodb chart and t | `tls.enabled` | Enable MongoDB TLS support including authentication | `false` | | `tls.cacert` | The CA certificate used for the members | Our self signed CA certificate | | `tls.cakey` | The CA key used for the members | Our key for the self signed CA certificate | +| `init.resources` | Pod resource requests and limits (for init containers) | `{}` | | `metrics.enabled` | Enable Prometheus compatible metrics for pods and replicasets | `false` | | `metrics.image.repository` | Image name for metrics exporter | `ssalaues/mongodb-exporter` | | `metrics.image.tag` | Image tag for metrics exporter | `0.6.1` | diff --git a/stable/mongodb-replicaset/templates/mongodb-statefulset.yaml b/stable/mongodb-replicaset/templates/mongodb-statefulset.yaml index 9fadb580d1..b6fca4daeb 100644 --- a/stable/mongodb-replicaset/templates/mongodb-statefulset.yaml +++ b/stable/mongodb-replicaset/templates/mongodb-statefulset.yaml @@ -76,6 +76,8 @@ spec: - name: keydir mountPath: /keydir-readonly {{- end }} + resources: +{{ toYaml .Values.init.resources | indent 12 }} - name: install image: "{{ .Values.installImage.repository }}:{{ .Values.installImage.tag }}" args: @@ -84,6 +86,8 @@ spec: volumeMounts: - name: workdir mountPath: /work-dir + resources: +{{ toYaml .Values.init.resources | indent 12 }} - name: bootstrap image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" command: @@ -113,6 +117,7 @@ spec: secretKeyRef: name: "{{ template "mongodb-replicaset.adminSecret" . }}" key: password + {{- if .Values.metrics.enabled }} - name: METRICS value: "true" @@ -137,6 +142,8 @@ spec: mountPath: /data/configdb - name: datadir mountPath: /data/db + resources: +{{ toYaml .Values.init.resources | indent 12 }} containers: - name: {{ template "mongodb-replicaset.name" . }} image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" diff --git a/stable/mongodb-replicaset/values.yaml b/stable/mongodb-replicaset/values.yaml index 8390ffd91b..485ddd4f0d 100644 --- a/stable/mongodb-replicaset/values.yaml +++ b/stable/mongodb-replicaset/values.yaml @@ -57,6 +57,9 @@ securityContext: fsGroup: 999 runAsNonRoot: true +init: + resources: {} + resources: {} # limits: # cpu: 500m