From e3789dccc9c65ab17cebe803160bd5d87608a15e Mon Sep 17 00:00:00 2001 From: theburi Date: Tue, 2 Mar 2021 14:01:07 +0000 Subject: [PATCH] adding additional config --- charts/ent-operator-database/templates/database.yaml | 7 +++++++ charts/ent-operator-database/values.yaml | 3 +++ charts/ent-operator/values.yaml | 4 ++-- helpers/MongoDB-deploy.sh | 7 ++++++- 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/charts/ent-operator-database/templates/database.yaml b/charts/ent-operator-database/templates/database.yaml index d1ca330a..b04b2fe4 100644 --- a/charts/ent-operator-database/templates/database.yaml +++ b/charts/ent-operator-database/templates/database.yaml @@ -55,6 +55,13 @@ spec: # If you need to manage MongoDB users directly via the mongods, set this value to true ignoreUnknownUsers: false # default value false + + + additionalMongodConfig: +{{- with .Values.additionalMongodConfig }} +{{- toYaml . | nindent 4 }} +{{- end }} + {{- if .Values.externalConnectivity.enable }} externalConnectivity: {{- with .Values.externalConnectivity.replicaSetHorizons }} diff --git a/charts/ent-operator-database/values.yaml b/charts/ent-operator-database/values.yaml index 0dabb890..f338a15d 100644 --- a/charts/ent-operator-database/values.yaml +++ b/charts/ent-operator-database/values.yaml @@ -74,6 +74,9 @@ persistence: clusterName: cluster.local +additionalMongodConfig: + storageEngine: wiredTiger + # External connectivity configuration # https://docs.mongodb.com/kubernetes-operator/master/tutorial/connect-from-outside-k8s/ externalConnectivity: diff --git a/charts/ent-operator/values.yaml b/charts/ent-operator/values.yaml index dadd6908..7557084b 100644 --- a/charts/ent-operator/values.yaml +++ b/charts/ent-operator/values.yaml @@ -19,7 +19,7 @@ name: mongodb-enterprise-operator deployment_name: mongodb-enterprise-operator # Version of mongodb-enterprise-operator and mongodb-enterprise-database images -version: 1.9.1 +version: 1.9.2 # The Custom Resources that will be watched by the Operator. # Needs to be changed if only some of the CRDs are installed @@ -43,7 +43,7 @@ registry: operator: Image: quay.io/mongodb/mongodb-enterprise-operator - Tag: 1.9.1 + Tag: 1.9.2 database: Image: quay.io/mongodb/mongodb-enterprise-database diff --git a/helpers/MongoDB-deploy.sh b/helpers/MongoDB-deploy.sh index 57ea95fc..caab894b 100644 --- a/helpers/MongoDB-deploy.sh +++ b/helpers/MongoDB-deploy.sh @@ -69,4 +69,9 @@ kubectl create configmap opsmanager-configmap --from-literal=projectName=$MONGOD # Deploy HELM Chart pushd ../charts/ent-operator-database/ helm upgrade mongodb . --set opsManager.configMap=opsmanager-configmap --set opsManager.secretRef=opsmanager-org-access-key -n $MONGODB_NAMESPACE --create-namespace -i -popd \ No newline at end of file +popd + +until [ $(kubectl get mdb -n $MONGODB_NAMESPACE -o=jsonpath='{.items[0].status.phase}') = Running ]; +do +sleep 10s +done;