Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Render more mongodb shard templates #1941

Open
wants to merge 2 commits into
base: development/2.8
Choose a base branch
from
Open

Render more mongodb shard templates #1941

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6aaacd0
ZENKO-4641: render more mongodb shard manifests
rachedbenmustapha Sep 6, 2022
ad26314
ZENKO-4641: add shard selector to pvc templates
rachedbenmustapha Aug 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 17 additions & 1 deletion solution-base/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,14 @@ MONGODB_SINGLE_NODE_PATH=${ISO_ROOT}/deploy/mongodb-1-node.yaml
MONGODB_THREE_NODE_PATH=${ISO_ROOT}/deploy/mongodb-3-nodes.yaml
MONGODB_SHARDED_SINGLE_NODE_PATH=${ISO_ROOT}/deploy/mongodb-sharded-1-node.yaml
MONGODB_SHARDED_THREE_NODE_PATH=${ISO_ROOT}/deploy/mongodb-sharded-3-nodes.yaml
MONGODB_SHARDED_THREE_NODE_THREE_SHARDS_PATH=${ISO_ROOT}/deploy/mongodb-sharded-3-nodes-3-shards.yaml
MONGODB_SHARDED_SIX_NODE_PATH=${ISO_ROOT}/deploy/mongodb-sharded-6-nodes.yaml
MONGODB_SHARDED_SIX_NODE_THREE_SHARDS_PATH=${ISO_ROOT}/deploy/mongodb-sharded-6-nodes-3-shards.yaml
MONGODB_SHARDED_SIX_NODE_SIX_SHARDS_PATH=${ISO_ROOT}/deploy/mongodb-sharded-6-nodes-6-shards.yaml
Copy link
Contributor

@williamlardier williamlardier Dec 13, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shall we also consider 6 nodes 2 shards, i.e. one mongod instance running per server? (this is what is suggested today to avoid dividing the RAM available per shard)

MONGODB_SHARDED_NINE_NODE_PATH=${ISO_ROOT}/deploy/mongodb-sharded-9-nodes.yaml
MONGODB_SHARDED_NINE_NODE_THREE_SHARDS_PATH=${ISO_ROOT}/deploy/mongodb-sharded-9-nodes-3-shards.yaml
MONGODB_SHARDED_NINE_NODE_SIX_SHARDS_PATH=${ISO_ROOT}/deploy/mongodb-sharded-9-nodes-6-shards.yaml
MONGODB_SHARDED_NINE_NODE_NINE_SHARDS_PATH=${ISO_ROOT}/deploy/mongodb-sharded-9-nodes-9-shards.yaml

SOLUTION_ENV='SOLUTION_ENV'

Expand Down Expand Up @@ -201,7 +209,15 @@ function render_mongodb_sharded_yamls()
function mongodb_sharded_yamls()
{
render_mongodb_sharded_yamls "${MONGODB_SHARDED_SINGLE_NODE_PATH}" 1 1
render_mongodb_sharded_yamls "${MONGODB_SHARDED_THREE_NODE_PATH}" 1 3
render_mongodb_sharded_yamls "${MONGODB_SHARDED_THREE_NODE_PATH}" 1 3
render_mongodb_sharded_yamls "${MONGODB_SHARDED_THREE_NODE_THREE_SHARDS_PATH}" 3 3
render_mongodb_sharded_yamls "${MONGODB_SHARDED_SIX_NODE_PATH}" 1 6
render_mongodb_sharded_yamls "${MONGODB_SHARDED_SIX_NODE_THREE_SHARDS_PATH}" 3 6
render_mongodb_sharded_yamls "${MONGODB_SHARDED_SIX_NODE_SIX_SHARDS_PATH}" 6 6
render_mongodb_sharded_yamls "${MONGODB_SHARDED_NINE_NODE_PATH}" 1 9
render_mongodb_sharded_yamls "${MONGODB_SHARDED_NINE_NODE_THREE_SHARDS_PATH}" 3 9
render_mongodb_sharded_yamls "${MONGODB_SHARDED_NINE_NODE_SIX_SHARDS_PATH}" 6 9
render_mongodb_sharded_yamls "${MONGODB_SHARDED_NINE_NODE_NINE_SHARDS_PATH}" 9 9
}

function gen_manifest_yaml()
Expand Down
6 changes: 5 additions & 1 deletion solution-base/mongodb/charts/mongodb-sharded/templates/shard/shard-data-statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,11 @@ spec:
{{- end }}
{{- if $.Values.shardsvr.persistence.selector }}
selector:
{{ toYaml $.Values.shardsvr.persistence.selector | indent 10 }}
matchLabels:
{{- if gt $.Values.shards 1 }}
shard: {{ $i | quote }}
{{- end }}
{{ toYaml $.Values.shardsvr.persistence.selector.matchLabels | indent 12 }}
{{- end }}
resources:
requests:
Expand Down
25 changes: 7 additions & 18 deletions solution-base/mongodb/patches/mongodb-sharded-add-pv-selector.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,18 @@
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
index 6bd5b6cc..02fa0f39 100644
--- 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
@@ -366,6 +366,10 @@ spec:
{{- range .Values.configsvr.persistence.accessModes }}
- {{ . | quote }}
{{- end }}
+ {{- if .Values.configsvr.persistence.selector }}
+ selector:
+{{ toYaml .Values.configsvr.persistence.selector | indent 10 }}
+ {{- end }}
resources:
requests:
storage: {{ .Values.configsvr.persistence.size | quote }}
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
index 2dc362b4..6e29ad65 100644
index c24aaf5d..5c448f35 100644
--- 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
@@ -373,6 +373,10 @@ spec:
@@ -372,6 +373,14 @@ spec:
{{- range $.Values.shardsvr.persistence.accessModes }}
- {{ . | quote }}
{{- end }}
+ {{- if $.Values.shardsvr.persistence.selector }}
+ selector:
+{{ toYaml $.Values.shardsvr.persistence.selector | indent 10 }}
+ matchLabels:
+ {{- if gt $.Values.shards 1 }}
+ shard: {{ $i | quote }}
+ {{- end }}
+{{ toYaml $.Values.shardsvr.persistence.selector.matchLabels | indent 12 }}
+ {{- end }}
resources:
requests:
Expand Down