From b6b1229f31f3c8292053798093fcd0b1955c4e1d Mon Sep 17 00:00:00 2001
From: Kevin Leturc <kleturc@nuxeo.com>
Date: Mon, 25 May 2020 17:07:03 +0200
Subject: [PATCH] NXP-29156: Upgrade mongodb chart to bitnami one

---
 Jenkinsfile             | 3 ++-
 README.md               | 2 +-
 nuxeo/requirements.yaml | 4 ++--
 nuxeo/values.yaml       | 4 +++-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 21ff9a7..ab3214a 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -104,6 +104,7 @@ pipeline {
 
                 helm repo add kubernetes-charts https://kubernetes-charts.storage.googleapis.com/
                 helm repo add kubernetes-charts-incubator http://storage.googleapis.com/kubernetes-charts-incubator
+                helm repo add bitnami https://charts.bitnami.com/bitnami
 
                 helm dependency update ${CHART_NAME}
 
@@ -115,7 +116,7 @@ pipeline {
                 jx step helm install ${CHART_NAME} \
                   --name=${TEST_RELEASE} \
                   --namespace=${TEST_NAMESPACE} \
-                  --set=nuxeo.image.tag=11.1-SNAPSHOT # TODO remove when NXP-28504 is done and the latest tag (default) is available
+                  --set=nuxeo.image.tag=11.x # TODO remove when NXP-28504 is done and the latest tag (default) is available
               """
 
               // check deployment status, exits if not OK
diff --git a/README.md b/README.md
index 8f2f4f5..9762e25 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ Currently, there is a single version of this chart for all the versions of Nuxeo
 
 This chart has the following dependencies as subcharts:
 
-- [MongoDB](https://github.com/helm/charts/tree/master/stable/mongodb/values.yaml)
+- [MongoDB](https://github.com/bitnami/charts/blob/master/bitnami/mongodb/values.yaml)
 - [Postgresql](https://github.com/helm/charts/tree/master/stable/postgresql/values.yaml)
 - [Elasticsearch](https://github.com/helm/charts/tree/master/stable/elasticsearch/values.yaml)
 - [Kafka/ZooKeeper](https://github.com/helm/charts/tree/master/incubator/kafka/values.yaml)
diff --git a/nuxeo/requirements.yaml b/nuxeo/requirements.yaml
index 3803dd7..236f62a 100644
--- a/nuxeo/requirements.yaml
+++ b/nuxeo/requirements.yaml
@@ -14,8 +14,8 @@ dependencies:
     tags:
       - kafka
   - name: mongodb
-    version: ~7.8.0
-    repository: https://kubernetes-charts.storage.googleapis.com/
+    version: ~7.14.2
+    repository: https://charts.bitnami.com/bitnami
     condition: nuxeo.mongodb.deploy
     alias: mongodb
     tags:
diff --git a/nuxeo/values.yaml b/nuxeo/values.yaml
index 977fd39..8587167 100755
--- a/nuxeo/values.yaml
+++ b/nuxeo/values.yaml
@@ -73,8 +73,10 @@ nuxeo:
 ## Values overridden from the MongoDB chart: https://github.com/helm/charts/blob/master/stable/mongodb/values.yaml
 mongodb:
   image:
-    tag: "4.2.3"
+    tag: "4.2.7"
   usePassword: false
+  serviceAccount:
+    create: false
   persistence:
     enabled: false
   resources: