From b06d41ddd353ee41abdf641942840c280342cbc2 Mon Sep 17 00:00:00 2001
From: bitnami-bot <containers-bot@bitnami.com>
Date: Fri, 30 Aug 2019 07:35:09 +0000
Subject: [PATCH] Synchronize upstreamed folder to c7f42545d

---
 upstreamed/kubewatch/Chart.yaml                          | 2 +-
 upstreamed/kubewatch/values.yaml                         | 2 +-
 upstreamed/mongodb/Chart.yaml                            | 2 +-
 upstreamed/mongodb/README.md                             | 1 +
 upstreamed/mongodb/templates/statefulset-arbiter-rs.yaml | 2 +-
 upstreamed/mongodb/values-production.yaml                | 3 +++
 upstreamed/mongodb/values.yaml                           | 3 +++
 7 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/upstreamed/kubewatch/Chart.yaml b/upstreamed/kubewatch/Chart.yaml
index 800184ecf..3abe3053a 100644
--- a/upstreamed/kubewatch/Chart.yaml
+++ b/upstreamed/kubewatch/Chart.yaml
@@ -1,5 +1,5 @@
 name: kubewatch
-version: 0.8.5
+version: 0.8.6
 apiVersion: v1
 appVersion: 0.0.4
 home: https://github.com/bitnami-labs/kubewatch
diff --git a/upstreamed/kubewatch/values.yaml b/upstreamed/kubewatch/values.yaml
index f236d3e7b..64ca0b620 100644
--- a/upstreamed/kubewatch/values.yaml
+++ b/upstreamed/kubewatch/values.yaml
@@ -49,7 +49,7 @@ resourcesToWatch:
 image:
   registry: "docker.io"
   repository: "bitnami/kubewatch"
-  tag: "0.0.4-debian-9-r269"
+  tag: "0.0.4-debian-9-r347"
   pullPolicy: "Always"
   ## Optionally specify an array of imagePullSecrets.
   ## Secrets must be manually created in the namespace.
diff --git a/upstreamed/mongodb/Chart.yaml b/upstreamed/mongodb/Chart.yaml
index ffcec3525..5dc6e6298 100644
--- a/upstreamed/mongodb/Chart.yaml
+++ b/upstreamed/mongodb/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: mongodb
-version: 7.2.3
+version: 7.2.4
 appVersion: 4.0.12
 description: NoSQL document-oriented database that stores JSON-like documents with dynamic schemas, simplifying the integration of data in content-driven applications.
 keywords:
diff --git a/upstreamed/mongodb/README.md b/upstreamed/mongodb/README.md
index f1e29853a..08a9bb584 100644
--- a/upstreamed/mongodb/README.md
+++ b/upstreamed/mongodb/README.md
@@ -98,6 +98,7 @@ The following table lists the configurable parameters of the MongoDB chart and t
 | `podAnnotations`                                   | Annotations to be added to pods                                                                                                                           | `{}`                                                     |
 | `podLabels`                                        | Additional labels for the pod(s).                                                                                                                         | `{}`                                                     |
 | `resources`                                        | Pod resources                                                                                                                                             | `{}`                                                     |
+| `resourcesArbiter`                                 | Pod resources for arbiter when replica set is enabled                                                                                                     | `{}`                                                     |
 | `priorityClassName`                                | Pod priority class name                                                                                                                                   | ``                                                       |
 | `nodeSelector`                                     | Node labels for pod assignment                                                                                                                            | `{}`                                                     |
 | `affinity`                                         | Affinity for pod assignment                                                                                                                               | `{}`                                                     |
diff --git a/upstreamed/mongodb/templates/statefulset-arbiter-rs.yaml b/upstreamed/mongodb/templates/statefulset-arbiter-rs.yaml
index 35ed641e9..653cc2963 100644
--- a/upstreamed/mongodb/templates/statefulset-arbiter-rs.yaml
+++ b/upstreamed/mongodb/templates/statefulset-arbiter-rs.yaml
@@ -157,7 +157,7 @@ spec:
               subPath: mongodb.conf
           {{- end }}
           resources:
-{{ toYaml .Values.resources | indent 12 }}
+{{ toYaml .Values.resourcesArbiter | indent 12 }}
       volumes:
       {{- if .Values.configmap }}
         - name: config
diff --git a/upstreamed/mongodb/values-production.yaml b/upstreamed/mongodb/values-production.yaml
index b1cd62aa9..b052811a7 100644
--- a/upstreamed/mongodb/values-production.yaml
+++ b/upstreamed/mongodb/values-production.yaml
@@ -188,6 +188,9 @@ podLabels: {}
 ## ref: http://kubernetes.io/docs/user-guide/compute-resources/
 ##
 resources: {}
+# Define separate resources per arbiter, which are less then primary or secondary
+# used only when replica set is enabled
+resourcesArbiter: {}
 # limits:
 #   cpu: 500m
 #   memory: 512Mi
diff --git a/upstreamed/mongodb/values.yaml b/upstreamed/mongodb/values.yaml
index a7595cc74..70ef0b935 100644
--- a/upstreamed/mongodb/values.yaml
+++ b/upstreamed/mongodb/values.yaml
@@ -190,6 +190,9 @@ podLabels: {}
 ## ref: http://kubernetes.io/docs/user-guide/compute-resources/
 ##
 resources: {}
+# Define separate resources per arbiter, which are less then primary or secondary
+# used only when replica set is enabled
+resourcesArbiter: {}
 # limits:
 #   cpu: 500m
 #   memory: 512Mi