From c10264fea67adfd3a3860a02a7e789f3fba920d3 Mon Sep 17 00:00:00 2001 From: bitnami-bot Date: Mon, 18 Feb 2019 12:36:30 +0000 Subject: [PATCH] Synchronize upstreamed folder to dab07b11a --- upstreamed/mongodb/Chart.yaml | 2 +- upstreamed/mongodb/README.md | 1 + upstreamed/mongodb/templates/deployment-standalone.yaml | 4 ++-- upstreamed/mongodb/templates/statefulset-primary-rs.yaml | 4 ++-- .../mongodb/templates/statefulset-secondary-rs.yaml | 4 ++-- upstreamed/mongodb/values-production.yaml | 3 +++ upstreamed/mongodb/values.yaml | 3 +++ upstreamed/postgresql/Chart.yaml | 2 +- upstreamed/postgresql/README.md | 4 ++++ upstreamed/postgresql/templates/statefulset-slaves.yaml | 7 +++++++ upstreamed/postgresql/templates/statefulset.yaml | 9 ++++++++- upstreamed/postgresql/values-production.yaml | 4 ++++ upstreamed/postgresql/values.yaml | 4 ++++ 13 files changed, 42 insertions(+), 9 deletions(-) diff --git a/upstreamed/mongodb/Chart.yaml b/upstreamed/mongodb/Chart.yaml index 7c4959385f..a23040ce26 100644 --- a/upstreamed/mongodb/Chart.yaml +++ b/upstreamed/mongodb/Chart.yaml @@ -1,5 +1,5 @@ name: mongodb -version: 5.3.4 +version: 5.4.0 appVersion: 4.0.6 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 0fefc6cc73..7f959ebc16 100644 --- a/upstreamed/mongodb/README.md +++ b/upstreamed/mongodb/README.md @@ -112,6 +112,7 @@ The following table lists the configurable parameters of the MongoDB chart and t | `metrics.image.pullPolicy` | Image pull policy | `IfNotPresent` | | `metrics.image.pullSecrets` | Specify docker-registry secret names as an array | `[]` (does not add image pull secrets to deployed pods) | | `metrics.podAnnotations` | Additional annotations for Metrics exporter pod | {} | +| `metrics.extraArgs` | String with extra arguments for the MongoDB Exporter | `` | | `metrics.resources` | Exporter resource requests/limit | Memory: `256Mi`, CPU: `100m` | | `metrics.serviceMonitor.enabled` | Create ServiceMonitor Resource for scraping metrics using PrometheusOperator | `false` | | `metrics.serviceMonitor.additionalLabels` | Used to pass Labels that are required by the Installed Prometheus Operator | {} | diff --git a/upstreamed/mongodb/templates/deployment-standalone.yaml b/upstreamed/mongodb/templates/deployment-standalone.yaml index e221f11717..6360b928de 100644 --- a/upstreamed/mongodb/templates/deployment-standalone.yaml +++ b/upstreamed/mongodb/templates/deployment-standalone.yaml @@ -165,9 +165,9 @@ spec: secretKeyRef: name: {{ if .Values.existingSecret }}{{ .Values.existingSecret }}{{- else }}{{ template "mongodb.fullname" . }}{{- end }} key: mongodb-root-password - command: [ 'sh', '-c', '/bin/mongodb_exporter --mongodb.uri mongodb://root:${MONGODB_ROOT_PASSWORD}@localhost:{{ .Values.service.port }}/admin' ] + command: [ 'sh', '-c', '/bin/mongodb_exporter --mongodb.uri mongodb://root:${MONGODB_ROOT_PASSWORD}@localhost:{{ .Values.service.port }}/admin {{ .Values.metrics.extraArgs }}' ] {{- else }} - command: [ 'sh', '-c', '/bin/mongodb_exporter --mongodb.uri mongodb://localhost:{{ .Values.service.port }}' ] + command: [ 'sh', '-c', '/bin/mongodb_exporter --mongodb.uri mongodb://localhost:{{ .Values.service.port }} {{ .Values.metrics.extraArgs }}' ] {{- end }} ports: - name: metrics diff --git a/upstreamed/mongodb/templates/statefulset-primary-rs.yaml b/upstreamed/mongodb/templates/statefulset-primary-rs.yaml index ad74455868..b32523699f 100644 --- a/upstreamed/mongodb/templates/statefulset-primary-rs.yaml +++ b/upstreamed/mongodb/templates/statefulset-primary-rs.yaml @@ -186,9 +186,9 @@ spec: secretKeyRef: name: {{ if .Values.existingSecret }}{{ .Values.existingSecret }}{{- else }}{{ template "mongodb.fullname" . }}{{- end }} key: mongodb-root-password - command: [ 'sh', '-c', '/bin/mongodb_exporter --mongodb.uri mongodb://root:${MONGODB_ROOT_PASSWORD}@localhost:{{ .Values.service.port }}/admin' ] + command: [ 'sh', '-c', '/bin/mongodb_exporter --mongodb.uri mongodb://root:${MONGODB_ROOT_PASSWORD}@localhost:{{ .Values.service.port }}/admin {{ .Values.metrics.extraArgs }}' ] {{- else }} - command: [ 'sh', '-c', '/bin/mongodb_exporter --mongodb.uri mongodb://localhost:{{ .Values.service.port }}' ] + command: [ 'sh', '-c', '/bin/mongodb_exporter --mongodb.uri mongodb://localhost:{{ .Values.service.port }} {{ .Values.metrics.extraArgs }}' ] {{- end }} ports: - name: metrics diff --git a/upstreamed/mongodb/templates/statefulset-secondary-rs.yaml b/upstreamed/mongodb/templates/statefulset-secondary-rs.yaml index 69910ab330..1ff5e6995d 100644 --- a/upstreamed/mongodb/templates/statefulset-secondary-rs.yaml +++ b/upstreamed/mongodb/templates/statefulset-secondary-rs.yaml @@ -170,9 +170,9 @@ spec: secretKeyRef: name: {{ if .Values.existingSecret }}{{ .Values.existingSecret }}{{- else }}{{ template "mongodb.fullname" . }}{{- end }} key: mongodb-root-password - command: [ 'sh', '-c', '/bin/mongodb_exporter --mongodb.uri mongodb://root:${MONGODB_ROOT_PASSWORD}@localhost:{{ .Values.service.port }}/admin' ] + command: [ 'sh', '-c', '/bin/mongodb_exporter --mongodb.uri mongodb://root:${MONGODB_ROOT_PASSWORD}@localhost:{{ .Values.service.port }}/admin {{ .Values.metrics.extraArgs }}' ] {{- else }} - command: [ 'sh', '-c', '/bin/mongodb_exporter --mongodb.uri mongodb://localhost:{{ .Values.service.port }}' ] + command: [ 'sh', '-c', '/bin/mongodb_exporter --mongodb.uri mongodb://localhost:{{ .Values.service.port }} {{ .Values.metrics.extraArgs }}' ] {{- end }} ports: - name: metrics diff --git a/upstreamed/mongodb/values-production.yaml b/upstreamed/mongodb/values-production.yaml index 5e357d9f6e..c3da0ec521 100644 --- a/upstreamed/mongodb/values-production.yaml +++ b/upstreamed/mongodb/values-production.yaml @@ -248,6 +248,9 @@ metrics: # pullSecrets: # - myRegistrKeySecretName + ## String with extra arguments to the metrics exporter + ## ref: https://github.com/dcu/mongodb_exporter/blob/master/mongodb_exporter.go + extraArgs: "" ## Metrics exporter resource requests and limits ## ref: http://kubernetes.io/docs/user-guide/compute-resources/ ## diff --git a/upstreamed/mongodb/values.yaml b/upstreamed/mongodb/values.yaml index d24a6527a1..fba5cda8cf 100644 --- a/upstreamed/mongodb/values.yaml +++ b/upstreamed/mongodb/values.yaml @@ -248,6 +248,9 @@ metrics: # pullSecrets: # - myRegistrKeySecretName + ## String with extra arguments to the metrics exporter + ## ref: https://github.com/dcu/mongodb_exporter/blob/master/mongodb_exporter.go + extraArgs: "" ## Metrics exporter resource requests and limits ## ref: http://kubernetes.io/docs/user-guide/compute-resources/ ## diff --git a/upstreamed/postgresql/Chart.yaml b/upstreamed/postgresql/Chart.yaml index 989d37be11..6ccd5e61cc 100644 --- a/upstreamed/postgresql/Chart.yaml +++ b/upstreamed/postgresql/Chart.yaml @@ -1,5 +1,5 @@ name: postgresql -version: 3.11.2 +version: 3.11.4 appVersion: 10.7.0 description: Chart for PostgreSQL, an object-relational database management system (ORDBMS) with an emphasis on extensibility and on standards-compliance. keywords: diff --git a/upstreamed/postgresql/README.md b/upstreamed/postgresql/README.md index e3a18cb039..6b4bd64f22 100644 --- a/upstreamed/postgresql/README.md +++ b/upstreamed/postgresql/README.md @@ -97,9 +97,13 @@ The following tables lists the configurable parameters of the PostgreSQL chart a | `master.nodeSelector` | Node labels for pod assignment (postgresql master) | `{}` | | `master.affinity` | Affinity labels for pod assignment (postgresql master) | `{}` | | `master.tolerations` | Toleration labels for pod assignment (postgresql master) | `[]` | +| `master.podAnnotations` | Map of annotations to add to the pods (postgresql master) | `{}` | +| `master.podLabels` | Map of labels to add to the pods (postgresql master) | `{}` | | `slave.nodeSelector` | Node labels for pod assignment (postgresql slave) | `{}` | | `slave.affinity` | Affinity labels for pod assignment (postgresql slave) | `{}` | | `slave.tolerations` | Toleration labels for pod assignment (postgresql slave) | `[]` | +| `slave.podAnnotations` | Map of annotations to add to the pods (postgresql slave) | `{}` | +| `slave.podLabels` | Map of labels to add to the pods (postgresql slave) | `{}` | | `terminationGracePeriodSeconds` | Seconds the pod needs to terminate gracefully | `nil` | | `resources` | CPU/Memory resource requests/limits | Memory: `256Mi`, CPU: `250m` | | `securityContext.enabled` | Enable security context | `true` | diff --git a/upstreamed/postgresql/templates/statefulset-slaves.yaml b/upstreamed/postgresql/templates/statefulset-slaves.yaml index 198d1ae841..186730f541 100644 --- a/upstreamed/postgresql/templates/statefulset-slaves.yaml +++ b/upstreamed/postgresql/templates/statefulset-slaves.yaml @@ -25,6 +25,13 @@ spec: release: {{ .Release.Name | quote }} heritage: {{ .Release.Service | quote }} role: slave +{{- with .Values.slavePod.labels }} +{{ toYaml . | indent 8 }} +{{- end }} +{{- with .Values.slavePod.annotations }} + annotations: +{{ toYaml . | indent 8 }} +{{- end }} spec: {{- if .Values.image.pullSecrets }} imagePullSecrets: diff --git a/upstreamed/postgresql/templates/statefulset.yaml b/upstreamed/postgresql/templates/statefulset.yaml index c966ffe9fa..2adc1f0844 100644 --- a/upstreamed/postgresql/templates/statefulset.yaml +++ b/upstreamed/postgresql/templates/statefulset.yaml @@ -26,6 +26,13 @@ spec: release: {{ .Release.Name | quote }} heritage: {{ .Release.Service | quote }} role: master +{{- with .Values.master.podLabels }} +{{ toYaml . | indent 8 }} +{{- end }} +{{- with .Values.master.podAnnotations }} + annotations: +{{ toYaml . | indent 8 }} +{{- end }} spec: {{- if or .Values.image.pullSecrets .Values.metrics.image.pullSecrets }} imagePullSecrets: @@ -188,7 +195,7 @@ spec: volumeMounts: {{- if or (.Files.Glob "files/docker-entrypoint-initdb.d/*.{sh,sql,sql.gz}") .Values.initdbScriptsConfigMap .Values.initdbScripts }} - name: custom-init-scripts - mountPath: /docker-entrypoint-initdb.d/configmap + mountPath: /docker-entrypoint-initdb.d/ {{- end }} {{- if .Values.initdbScriptsSecret }} - name: custom-init-scripts-secret diff --git a/upstreamed/postgresql/values-production.yaml b/upstreamed/postgresql/values-production.yaml index 29bbdf2d39..8b0efc09aa 100644 --- a/upstreamed/postgresql/values-production.yaml +++ b/upstreamed/postgresql/values-production.yaml @@ -206,6 +206,8 @@ master: nodeSelector: {} affinity: {} tolerations: [] + podLabels: {} + podAnnotations: {} ## ## PostgreSQL Slave parameters @@ -218,6 +220,8 @@ slave: nodeSelector: {} affinity: {} tolerations: [] + podLabels: {} + podAnnotations: {} ## Configure resource requests and limits ## ref: http://kubernetes.io/docs/user-guide/compute-resources/ diff --git a/upstreamed/postgresql/values.yaml b/upstreamed/postgresql/values.yaml index b2fa2d216e..352c906406 100644 --- a/upstreamed/postgresql/values.yaml +++ b/upstreamed/postgresql/values.yaml @@ -213,6 +213,8 @@ master: nodeSelector: {} affinity: {} tolerations: [] + podLabels: {} + podAnnotations: {} ## ## PostgreSQL Slave parameters @@ -225,6 +227,8 @@ slave: nodeSelector: {} affinity: {} tolerations: [] + podLabels: {} + podAnnotations: {} ## Configure resource requests and limits ## ref: http://kubernetes.io/docs/user-guide/compute-resources/