Skip to content

Commit de77fad

Browse files
Update patches
1 parent 6ec26ac commit de77fad

8 files changed

+80
-21
lines changed
Lines changed: 62 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,72 @@
11
diff --git a/solution-base/mongodb/charts/mongodb-sharded/values.yaml b/solution-base/mongodb/charts/mongodb-sharded/values.yaml
2-
index d934cc7b..83f60e80 100644
2+
index 92c89663..6bdc437b 100644
33
--- a/solution-base/mongodb/charts/mongodb-sharded/values.yaml
44
+++ b/solution-base/mongodb/charts/mongodb-sharded/values.yaml
5-
@@ -1768,7 +1768,7 @@ metrics:
5+
@@ -132,7 +132,7 @@ auth:
6+
existingSecret: ""
7+
## @param auth.usePasswordFiles Mount credentials as files instead of using environment variables
8+
##
9+
- usePasswordFiles: true
10+
+ usePasswordFiles: false
11+
## @param shards Number of shards to be created
12+
## ref: https://docs.mongodb.com/manual/core/sharded-cluster-shards/
13+
##
14+
@@ -273,7 +273,7 @@ volumePermissions:
15+
## @param volumePermissions.resourcesPreset Set container resources according to one common preset (allowed values: none, nano, micro, small, medium, large, xlarge, 2xlarge). This is ignored if volumePermissions.resources is set (volumePermissions.resources is recommended for production).
16+
## More information: https://github.com/bitnami/charts/blob/main/bitnami/common/templates/_resources.tpl#L15
17+
##
18+
- resourcesPreset: "nano"
19+
+ resourcesPreset: "none"
20+
## @param volumePermissions.resources Set container requests and limits for different resources like CPU or memory (essential for production workloads)
21+
## Example:
22+
## resources:
23+
@@ -418,7 +418,7 @@ configsvr:
24+
## @param configsvr.resourcesPreset Set container resources according to one common preset (allowed values: none, nano, micro, small, medium, large, xlarge, 2xlarge). This is ignored if configsvr.resources is set (configsvr.resources is recommended for production).
25+
## More information: https://github.com/bitnami/charts/blob/main/bitnami/common/templates/_resources.tpl#L15
26+
##
27+
- resourcesPreset: "small"
28+
+ resourcesPreset: "none"
29+
## @param configsvr.resources Set container requests and limits for different resources like CPU or memory (essential for production workloads)
30+
## Example:
31+
## resources:
32+
@@ -779,7 +779,7 @@ mongos:
33+
## @param mongos.resourcesPreset Set container resources according to one common preset (allowed values: none, nano, micro, small, medium, large, xlarge, 2xlarge). This is ignored if mongos.resources is set (mongos.resources is recommended for production).
34+
## More information: https://github.com/bitnami/charts/blob/main/bitnami/common/templates/_resources.tpl#L15
35+
##
36+
- resourcesPreset: "small"
37+
+ resourcesPreset: "none"
38+
## @param mongos.resources Set container requests and limits for different resources like CPU or memory (essential for production workloads)
39+
## Example:
40+
## resources:
41+
@@ -1136,7 +1136,7 @@ shardsvr:
42+
## @param shardsvr.dataNode.resourcesPreset Set container resources according to one common preset (allowed values: none, nano, micro, small, medium, large, xlarge, 2xlarge). This is ignored if shardsvr.dataNode.resources is set (shardsvr.dataNode.resources is recommended for production).
43+
## More information: https://github.com/bitnami/charts/blob/main/bitnami/common/templates/_resources.tpl#L15
44+
##
45+
- resourcesPreset: "medium"
46+
+ resourcesPreset: "none"
47+
## @param shardsvr.dataNode.resources Set container requests and limits for different resources like CPU or memory (essential for production workloads)
48+
## Example:
49+
## resources:
50+
@@ -1512,7 +1512,7 @@ shardsvr:
51+
## @param shardsvr.arbiter.resourcesPreset Set container resources according to one common preset (allowed values: none, nano, micro, small, medium, large, xlarge, 2xlarge). This is ignored if shardsvr.arbiter.resources is set (shardsvr.arbiter.resources is recommended for production).
52+
## More information: https://github.com/bitnami/charts/blob/main/bitnami/common/templates/_resources.tpl#L15
53+
##
54+
- resourcesPreset: "small"
55+
+ resourcesPreset: "none"
56+
## @param shardsvr.arbiter.resources Set container requests and limits for different resources like CPU or memory (essential for production workloads)
57+
## Example:
58+
## resources:
59+
@@ -1812,11 +1812,11 @@ metrics:
660
## @param metrics.extraArgs String with extra arguments to the metrics exporter
761
## ref: https://github.com/percona/mongodb_exporter/blob/main/main.go
862
##
963
- extraArgs: ""
1064
+ extraArgs: "--collector.diagnosticdata --collector.replicasetstatus --collector.dbstats --collector.topmetrics --compatible-mode"
11-
## @param metrics.resourcesPreset Set container resources according to one common preset (allowed values: none, nano, small, medium, large, xlarge, 2xlarge). This is ignored if metrics.resources is set (metrics.resources is recommended for production).
65+
## @param metrics.resourcesPreset Set container resources according to one common preset (allowed values: none, nano, micro, small, medium, large, xlarge, 2xlarge). This is ignored if metrics.resources is set (metrics.resources is recommended for production).
1266
## More information: https://github.com/bitnami/charts/blob/main/bitnami/common/templates/_resources.tpl#L15
1367
##
68+
- resourcesPreset: "nano"
69+
+ resourcesPreset: "none"
70+
## @param metrics.resources Set container requests and limits for different resources like CPU or memory (essential for production workloads)
71+
## Example:
72+
## resources:

solution-base/mongodb/patches/mongodb-sharded-add-configsvr-service.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/solution-base/mongodb/charts/mongodb-sharded/templates/_helpers.tpl b/solution-base/mongodb/charts/mongodb-sharded/templates/_helpers.tpl
2-
index 2929960d..cfd6ed45 100644
2+
index cb923aaa..8f9587d7 100644
33
--- a/solution-base/mongodb/charts/mongodb-sharded/templates/_helpers.tpl
44
+++ b/solution-base/mongodb/charts/mongodb-sharded/templates/_helpers.tpl
55
@@ -37,6 +37,10 @@ Usage:

solution-base/mongodb/patches/mongodb-sharded-add-pv-selector.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
diff --git a/solution-base/mongodb/charts/mongodb-sharded/templates/config-server/config-server-statefulset.yaml b/solution-base/mongodb/charts/mongodb-sharded/templates/config-server/config-server-statefulset.yaml
2-
index 091471e4..87057f69 100644
2+
index 3083dfed..a2f4cc8a 100644
33
--- a/solution-base/mongodb/charts/mongodb-sharded/templates/config-server/config-server-statefulset.yaml
44
+++ b/solution-base/mongodb/charts/mongodb-sharded/templates/config-server/config-server-statefulset.yaml
5-
@@ -445,6 +445,10 @@ spec:
5+
@@ -451,6 +451,10 @@ spec:
66
{{- range .Values.configsvr.persistence.accessModes }}
77
- {{ . | quote }}
88
{{- end }}
@@ -14,10 +14,10 @@ index 091471e4..87057f69 100644
1414
requests:
1515
storage: {{ .Values.configsvr.persistence.size | quote }}
1616
diff --git a/solution-base/mongodb/charts/mongodb-sharded/templates/shard/shard-data-statefulset.yaml b/solution-base/mongodb/charts/mongodb-sharded/templates/shard/shard-data-statefulset.yaml
17-
index 4fa00293..89883c12 100644
17+
index 46fbe695..3ca7a5b5 100644
1818
--- a/solution-base/mongodb/charts/mongodb-sharded/templates/shard/shard-data-statefulset.yaml
1919
+++ b/solution-base/mongodb/charts/mongodb-sharded/templates/shard/shard-data-statefulset.yaml
20-
@@ -452,6 +452,10 @@ spec:
20+
@@ -458,6 +458,10 @@ spec:
2121
{{- range $.Values.shardsvr.persistence.accessModes }}
2222
- {{ . | quote }}
2323
{{- end }}

solution-base/mongodb/patches/mongodb-sharded-fix-podmonitor.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/solution-base/mongodb/charts/mongodb-sharded/templates/shard/shard-data-podmonitor.yaml b/solution-base/mongodb/charts/mongodb-sharded/templates/shard/shard-data-podmonitor.yaml
2-
index d2c9c0cb..657764ac 100644
2+
index d3642ca2..dd3afaad 100644
33
--- a/solution-base/mongodb/charts/mongodb-sharded/templates/shard/shard-data-podmonitor.yaml
44
+++ b/solution-base/mongodb/charts/mongodb-sharded/templates/shard/shard-data-podmonitor.yaml
55
@@ -4,8 +4,7 @@ SPDX-License-Identifier: APACHE-2.0

solution-base/mongodb/patches/mongos-dep-sts.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/solution-base/mongodb/charts/mongodb-sharded/templates/mongos/mongos-dep-sts.yaml b/solution-base/mongodb/charts/mongodb-sharded/templates/mongos/mongos-dep-sts.yaml
2-
index 6b321eab..764c6b25 100644
2+
index 3d6a01cd..941642b4 100644
33
--- a/solution-base/mongodb/charts/mongodb-sharded/templates/mongos/mongos-dep-sts.yaml
44
+++ b/solution-base/mongodb/charts/mongodb-sharded/templates/mongos/mongos-dep-sts.yaml
55
@@ -93,6 +93,9 @@ spec:
@@ -21,7 +21,7 @@ index 6b321eab..764c6b25 100644
2121
- name: MONGODB_CFG_REPLICA_SET_NAME
2222
value: {{ include "mongodb-sharded.configServer.rsName" . }}
2323
- name: MONGODB_SYSTEM_LOG_VERBOSITY
24-
@@ -233,6 +236,8 @@ spec:
24+
@@ -232,6 +235,8 @@ spec:
2525
lifecycle: {{- include "common.tplvalues.render" (dict "value" .Values.mongos.lifecycleHooks "context" $) | nindent 12 }}
2626
{{- end }}
2727
volumeMounts:
@@ -30,7 +30,7 @@ index 6b321eab..764c6b25 100644
3030
- name: empty-dir
3131
mountPath: /tmp
3232
subPath: tmp-dir
33-
@@ -349,6 +354,9 @@ spec:
33+
@@ -350,6 +355,9 @@ spec:
3434
{{- include "common.tplvalues.render" ( dict "value" . "context" $ ) | nindent 8 }}
3535
{{- end }}
3636
volumes:
@@ -39,4 +39,4 @@ index 6b321eab..764c6b25 100644
3939
+ name: {{ include "common.names.fullname" . }}-replicaset-entrypoint
4040
- name: empty-dir
4141
emptyDir: {}
42-
{{- if .Values.auth.usePasswordFile }}
42+
{{- if .Values.auth.usePasswordFiles }}

solution-base/mongodb/patches/redirect-logs-to-stdout.patch

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/solution-base/mongodb/charts/mongodb-sharded/templates/_helpers.tpl b/solution-base/mongodb/charts/mongodb-sharded/templates/_helpers.tpl
2-
index cfd6ed45..4d6d13fc 100644
2+
index 8f9587d7..62b16d81 100644
33
--- a/solution-base/mongodb/charts/mongodb-sharded/templates/_helpers.tpl
44
+++ b/solution-base/mongodb/charts/mongodb-sharded/templates/_helpers.tpl
55
@@ -29,6 +29,33 @@ Usage:
@@ -37,7 +37,7 @@ index cfd6ed45..4d6d13fc 100644
3737
{{- if .Values.configsvr.external.host -}}
3838
{{- .Values.configsvr.external.host }}
3939
diff --git a/solution-base/mongodb/charts/mongodb-sharded/templates/config-server/config-server-statefulset.yaml b/solution-base/mongodb/charts/mongodb-sharded/templates/config-server/config-server-statefulset.yaml
40-
index 77b628c4..c3c3d30e 100644
40+
index da71ec47..d82fb6c8 100644
4141
--- a/solution-base/mongodb/charts/mongodb-sharded/templates/config-server/config-server-statefulset.yaml
4242
+++ b/solution-base/mongodb/charts/mongodb-sharded/templates/config-server/config-server-statefulset.yaml
4343
@@ -102,6 +102,7 @@ spec:
@@ -49,7 +49,7 @@ index 77b628c4..c3c3d30e 100644
4949
- name: mongodb
5050
image: {{ include "mongodb-sharded.image" . }}
5151
diff --git a/solution-base/mongodb/charts/mongodb-sharded/templates/mongos/mongos-dep-sts.yaml b/solution-base/mongodb/charts/mongodb-sharded/templates/mongos/mongos-dep-sts.yaml
52-
index 2d5aac4f..538fab11 100644
52+
index 941642b4..c72e394a 100644
5353
--- a/solution-base/mongodb/charts/mongodb-sharded/templates/mongos/mongos-dep-sts.yaml
5454
+++ b/solution-base/mongodb/charts/mongodb-sharded/templates/mongos/mongos-dep-sts.yaml
5555
@@ -85,6 +85,7 @@ spec:
@@ -61,7 +61,7 @@ index 2d5aac4f..538fab11 100644
6161
containers:
6262
- name: mongos
6363
diff --git a/solution-base/mongodb/charts/mongodb-sharded/templates/shard/shard-arbiter-statefulset.yaml b/solution-base/mongodb/charts/mongodb-sharded/templates/shard/shard-arbiter-statefulset.yaml
64-
index d5023a0d..08b16907 100644
64+
index d5df317d..6ebc9b3c 100644
6565
--- a/solution-base/mongodb/charts/mongodb-sharded/templates/shard/shard-arbiter-statefulset.yaml
6666
+++ b/solution-base/mongodb/charts/mongodb-sharded/templates/shard/shard-arbiter-statefulset.yaml
6767
@@ -84,6 +84,7 @@ spec:
@@ -73,7 +73,7 @@ index d5023a0d..08b16907 100644
7373
containers:
7474
- name: {{ printf "%s-arbiter" (include "common.names.fullname" $) }}
7575
diff --git a/solution-base/mongodb/charts/mongodb-sharded/templates/shard/shard-data-statefulset.yaml b/solution-base/mongodb/charts/mongodb-sharded/templates/shard/shard-data-statefulset.yaml
76-
index d34f51a0..7685106b 100644
76+
index 72265b3d..d6a593a6 100644
7777
--- a/solution-base/mongodb/charts/mongodb-sharded/templates/shard/shard-data-statefulset.yaml
7878
+++ b/solution-base/mongodb/charts/mongodb-sharded/templates/shard/shard-data-statefulset.yaml
7979
@@ -105,6 +105,7 @@ spec:

solution-base/mongodb/patches/replicaset-entrypoint-configmap.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/solution-base/mongodb/charts/mongodb-sharded/templates/replicaset-entrypoint-configmap.yaml b/solution-base/mongodb/charts/mongodb-sharded/templates/replicaset-entrypoint-configmap.yaml
2-
index 0427ec0c..dde278bd 100644
2+
index 29a3ca2c..efc39f08 100644
33
--- a/solution-base/mongodb/charts/mongodb-sharded/templates/replicaset-entrypoint-configmap.yaml
44
+++ b/solution-base/mongodb/charts/mongodb-sharded/templates/replicaset-entrypoint-configmap.yaml
55
@@ -13,6 +13,13 @@ metadata:

solution-base/mongodb/patches/statefulset-permissions.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/solution-base/mongodb/charts/mongodb-sharded/templates/config-server/config-server-statefulset.yaml b/solution-base/mongodb/charts/mongodb-sharded/templates/config-server/config-server-statefulset.yaml
2-
index 87057f69..202a5a30 100644
2+
index 3083dfed..da71ec47 100644
33
--- a/solution-base/mongodb/charts/mongodb-sharded/templates/config-server/config-server-statefulset.yaml
44
+++ b/solution-base/mongodb/charts/mongodb-sharded/templates/config-server/config-server-statefulset.yaml
55
@@ -78,14 +78,7 @@ spec:
@@ -19,7 +19,7 @@ index 87057f69..202a5a30 100644
1919
runAsUser: 0
2020
{{- if .Values.volumePermissions.resources }}
2121
diff --git a/solution-base/mongodb/charts/mongodb-sharded/templates/shard/shard-data-statefulset.yaml b/solution-base/mongodb/charts/mongodb-sharded/templates/shard/shard-data-statefulset.yaml
22-
index 89883c12..0e6ed5a0 100644
22+
index 46fbe695..72265b3d 100644
2323
--- a/solution-base/mongodb/charts/mongodb-sharded/templates/shard/shard-data-statefulset.yaml
2424
+++ b/solution-base/mongodb/charts/mongodb-sharded/templates/shard/shard-data-statefulset.yaml
2525
@@ -81,14 +81,7 @@ spec:

0 commit comments

Comments
 (0)