From d7814ca7a7a8550de23d3b3eeb96e0bf438ee7ff Mon Sep 17 00:00:00 2001 From: bitnami-bot Date: Mon, 2 Sep 2019 14:35:03 +0000 Subject: [PATCH] Synchronize upstreamed folder to ef433f3a2 --- upstreamed/mongodb/Chart.yaml | 2 +- upstreamed/mongodb/README.md | 1 + upstreamed/mongodb/templates/statefulset-arbiter-rs.yaml | 4 ++-- upstreamed/mongodb/values-production.yaml | 2 ++ upstreamed/mongodb/values.yaml | 2 ++ upstreamed/suitecrm/Chart.yaml | 2 +- upstreamed/suitecrm/requirements.lock | 4 ++-- upstreamed/suitecrm/values.yaml | 4 ++-- 8 files changed, 13 insertions(+), 8 deletions(-) diff --git a/upstreamed/mongodb/Chart.yaml b/upstreamed/mongodb/Chart.yaml index 1ea6059c56..ed63fc3ebb 100644 --- a/upstreamed/mongodb/Chart.yaml +++ b/upstreamed/mongodb/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: mongodb -version: 7.2.5 +version: 7.2.6 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 22f09ef4cc..00414b1c21 100644 --- a/upstreamed/mongodb/README.md +++ b/upstreamed/mongodb/README.md @@ -102,6 +102,7 @@ The following table lists the configurable parameters of the MongoDB chart and t | `priorityClassName` | Pod priority class name | `` | | `nodeSelector` | Node labels for pod assignment | `{}` | | `affinity` | Affinity for pod assignment | `{}` | +| `affinityArbiter` | Affinity for arbiter pod assignment | `{}` | | `tolerations` | Toleration labels for pod assignment | `{}` | | `updateStrategy` | Statefulsets update strategy policy | `RollingUpdate` | | `securityContext.enabled` | Enable security context | `true` | diff --git a/upstreamed/mongodb/templates/statefulset-arbiter-rs.yaml b/upstreamed/mongodb/templates/statefulset-arbiter-rs.yaml index 653cc2963c..24861e29d6 100644 --- a/upstreamed/mongodb/templates/statefulset-arbiter-rs.yaml +++ b/upstreamed/mongodb/templates/statefulset-arbiter-rs.yaml @@ -46,9 +46,9 @@ spec: securityContext: fsGroup: {{ .Values.securityContext.fsGroup }} {{- end }} - {{- if .Values.affinity }} + {{- if .Values.affinityArbiter }} affinity: -{{ toYaml .Values.affinity | indent 8 }} +{{ toYaml .Values.affinityArbiter | indent 8 }} {{- end -}} {{- if .Values.nodeSelector }} nodeSelector: diff --git a/upstreamed/mongodb/values-production.yaml b/upstreamed/mongodb/values-production.yaml index 9e9293b0e2..f6c4de4750 100644 --- a/upstreamed/mongodb/values-production.yaml +++ b/upstreamed/mongodb/values-production.yaml @@ -209,6 +209,8 @@ nodeSelector: {} ## Affinity ## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity affinity: {} +# Define separate affinity for arbiter pod +affinityArbiter: {} ## Tolerations ## ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ diff --git a/upstreamed/mongodb/values.yaml b/upstreamed/mongodb/values.yaml index 0b5bbf7a07..652781e4f0 100644 --- a/upstreamed/mongodb/values.yaml +++ b/upstreamed/mongodb/values.yaml @@ -211,6 +211,8 @@ nodeSelector: {} ## Affinity ## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity affinity: {} +# Define separate affinity for arbiter pod +affinityArbiter: {} ## Tolerations ## ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ diff --git a/upstreamed/suitecrm/Chart.yaml b/upstreamed/suitecrm/Chart.yaml index 82e41d0491..6defa0e667 100644 --- a/upstreamed/suitecrm/Chart.yaml +++ b/upstreamed/suitecrm/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: suitecrm -version: 7.1.3 +version: 7.1.4 appVersion: 7.11.8 description: SuiteCRM is a completely open source enterprise-grade Customer Relationship Management (CRM) application. SuiteCRM is a software fork of the popular customer relationship management (CRM) system SugarCRM. keywords: diff --git a/upstreamed/suitecrm/requirements.lock b/upstreamed/suitecrm/requirements.lock index 7d63103afd..1493b8b681 100644 --- a/upstreamed/suitecrm/requirements.lock +++ b/upstreamed/suitecrm/requirements.lock @@ -1,6 +1,6 @@ dependencies: - name: mariadb repository: https://kubernetes-charts.storage.googleapis.com/ - version: 6.8.2 + version: 6.8.3 digest: sha256:a363428d6463718a9523a88c70e485218373e315f2979cb1bb17b034ec2be96a -generated: "2019-08-22T16:52:04.151008+02:00" +generated: 2019-09-02T07:23:12.447489132Z diff --git a/upstreamed/suitecrm/values.yaml b/upstreamed/suitecrm/values.yaml index aed63b70be..de9601309e 100644 --- a/upstreamed/suitecrm/values.yaml +++ b/upstreamed/suitecrm/values.yaml @@ -14,7 +14,7 @@ image: registry: docker.io repository: bitnami/suitecrm - tag: 7.11.8-debian-9-r0 + tag: 7.11.8-debian-9-r11 ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images @@ -261,7 +261,7 @@ metrics: image: registry: docker.io repository: bitnami/apache-exporter - tag: 0.7.0-debian-9-r33 + tag: 0.7.0-debian-9-r43 pullPolicy: IfNotPresent ## Optionally specify an array of imagePullSecrets. ## Secrets must be manually created in the namespace.