From 752172e76879321baf21c08b6dfe9377e63fa2b1 Mon Sep 17 00:00:00 2001 From: bitnami-bot Date: Tue, 10 Dec 2019 06:35:21 +0000 Subject: [PATCH] Synchronize upstreamed folder to 2f03b54df --- upstreamed/external-dns/Chart.yaml | 2 +- upstreamed/external-dns/README.md | 5 +++- .../external-dns/templates/deployment.yaml | 3 ++ .../external-dns/values-production.yaml | 4 +++ upstreamed/external-dns/values.yaml | 4 +++ upstreamed/mongodb/Chart.yaml | 2 +- upstreamed/mongodb/README.md | 29 ++++++++++--------- upstreamed/mongodb/templates/_helpers.tpl | 13 +++++++++ .../templates/deployment-standalone.yaml | 3 ++ .../templates/statefulset-arbiter-rs.yaml | 3 ++ .../templates/statefulset-primary-rs.yaml | 3 ++ .../templates/statefulset-secondary-rs.yaml | 3 ++ upstreamed/mongodb/values-production.yaml | 3 ++ upstreamed/mongodb/values.yaml | 3 ++ upstreamed/rabbitmq/Chart.yaml | 2 +- upstreamed/rabbitmq/templates/svc.yaml | 2 +- 16 files changed, 65 insertions(+), 19 deletions(-) diff --git a/upstreamed/external-dns/Chart.yaml b/upstreamed/external-dns/Chart.yaml index ae73e99e74..a115c704e8 100644 --- a/upstreamed/external-dns/Chart.yaml +++ b/upstreamed/external-dns/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: external-dns -version: 2.12.0 +version: 2.13.0 appVersion: 0.5.17 description: ExternalDNS is a Kubernetes addon that configures public DNS servers with information about exposed Kubernetes services to make them discoverable. keywords: diff --git a/upstreamed/external-dns/README.md b/upstreamed/external-dns/README.md index 003c1174c1..95a7d7a643 100644 --- a/upstreamed/external-dns/README.md +++ b/upstreamed/external-dns/README.md @@ -122,7 +122,10 @@ The following table lists the configurable parameters of the external-dns chart | `crd.apiversion` | Sets the API version for the CRD to watch | `""` | | `crd.kind` | Sets the kind for the CRD to watch | `""` | | `dryRun` | When enabled, prints DNS record changes rather than actually performing them (optional) | `false` | -| `logLevel` | Verbosity of the logs (options: panic, debug, info, warn, error, fatal) | `info` | +| `logLevel` | Verbosity of the logs (options: panic, debug, info, warn, error, fatal) | `info` + +| `logFormat` | Which format to output logs in (options: text, json) | `text` + | | `interval` | Interval update period to use | `1m` | | `istioIngressGateways` | The fully-qualified name of the Istio ingress gateway services . | `""` | | `policy` | Modify how DNS records are sychronized between sources and providers (options: sync, upsert-only ) | `upsert-only` | diff --git a/upstreamed/external-dns/templates/deployment.yaml b/upstreamed/external-dns/templates/deployment.yaml index d565e910c6..9cc9e8b65d 100755 --- a/upstreamed/external-dns/templates/deployment.yaml +++ b/upstreamed/external-dns/templates/deployment.yaml @@ -51,6 +51,9 @@ spec: {{- if .Values.logLevel }} - --log-level={{ .Values.logLevel }} {{- end }} + {{- if .Values.logFormat }} + - --log-format={{ .Values.logFormat }} + {{- end }} {{- if .Values.dryRun }} - --dry-run {{- end }} diff --git a/upstreamed/external-dns/values-production.yaml b/upstreamed/external-dns/values-production.yaml index 7b695c87c4..27bcb53975 100644 --- a/upstreamed/external-dns/values-production.yaml +++ b/upstreamed/external-dns/values-production.yaml @@ -250,6 +250,10 @@ interval: "1m" ## - panic, debug, info, warn, error, fatal ## logLevel: info +## Formats of the ExternalDNS logs. Available values are: +## - text, json +## +logFormat: text ## Modify how DNS records are sychronized between sources and providers (options: sync, upsert-only) ## policy: upsert-only diff --git a/upstreamed/external-dns/values.yaml b/upstreamed/external-dns/values.yaml index eb9806b03a..9ad34041c8 100644 --- a/upstreamed/external-dns/values.yaml +++ b/upstreamed/external-dns/values.yaml @@ -249,6 +249,10 @@ interval: "1m" ## - panic, debug, info, warn, error, fatal ## logLevel: info +## Formats of the ExternalDNS logs. Available values are: +## - text, json +## +logFormat: text ## Modify how DNS records are sychronized between sources and providers (options: sync, upsert-only) ## policy: upsert-only diff --git a/upstreamed/mongodb/Chart.yaml b/upstreamed/mongodb/Chart.yaml index 0820db7311..6e952f8262 100644 --- a/upstreamed/mongodb/Chart.yaml +++ b/upstreamed/mongodb/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: mongodb -version: 7.5.0 +version: 7.6.0 appVersion: 4.0.13 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 22d7c5e1a2..8f6865c8d2 100644 --- a/upstreamed/mongodb/README.md +++ b/upstreamed/mongodb/README.md @@ -48,10 +48,10 @@ The command removes all the Kubernetes components associated with the chart and The following table lists the configurable parameters of the MongoDB chart and their default values. | Parameter | Description | Default | -| -------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------- | +|----------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------| | `global.imageRegistry` | Global Docker image registry | `nil` | | `global.imagePullSecrets` | Global Docker registry secret names as an array | `[]` (does not add image pull secrets to deployed pods) | -| `global.storageClass` | Global storage class for dynamic provisioning | `nil` | +| `global.storageClass` | Global storage class for dynamic provisioning | `nil` | | `image.registry` | MongoDB image registry | `docker.io` | | `image.repository` | MongoDB Image name | `bitnami/mongodb` | | `image.tag` | MongoDB Image tag | `{TAG_NAME}` | @@ -63,7 +63,7 @@ The following table lists the configurable parameters of the MongoDB chart and t | `volumePermissions.enabled` | Enable init container that changes volume permissions in the data directory (for cases where the default k8s `runAsUser` and `fsUser` values do not work) | `false` | | `volumePermissions.image.registry` | Init container volume-permissions image registry | `docker.io` | | `volumePermissions.image.repository` | Init container volume-permissions image name | `bitnami/minideb` | -| `volumePermissions.image.tag` | Init container volume-permissions image tag | `stretch` | +| `volumePermissions.image.tag` | Init container volume-permissions image tag | `stretch` | | `volumePermissions.image.pullPolicy` | Init container volume-permissions image pull policy | `Always` | | `volumePermissions.resources` | Init container resource requests/limit | `nil` | | `clusterDomain` | Default Kubernetes cluster domain | `cluster.local` | @@ -78,7 +78,7 @@ The following table lists the configurable parameters of the MongoDB chart and t | `mongodbSystemLogVerbosity` | MongoDB systen log verbosity level | `0` | | `mongodbDisableSystemLog` | Whether to disable MongoDB system log or not | `false` | | `mongodbExtraFlags` | MongoDB additional command line flags | `[]` | -| `service.name` | Kubernetes service name | `nil` | +| `service.name` | Kubernetes service name | `nil` | | `service.annotations` | Kubernetes service annotations, evaluated as a template | `{}` | | `service.type` | Kubernetes Service type | `ClusterIP` | | `service.clusterIP` | Static clusterIP or None for headless services | `nil` | @@ -105,6 +105,7 @@ The following table lists the configurable parameters of the MongoDB chart and t | `resources` | Pod resources | `{}` | | `resourcesArbiter` | Pod resources for arbiter when replica set is enabled | `{}` | | `priorityClassName` | Pod priority class name | `` | +| `extraEnvVars` | Array containing extra env vars to be added to all pods in the cluster (evaluated as a template) | `nil` | | `nodeSelector` | Node labels for pod assignment | `{}` | | `affinity` | Affinity for pod assignment | `{}` | | `affinityArbiter` | Affinity for arbiter pod assignment | `{}` | @@ -137,16 +138,16 @@ The following table lists the configurable parameters of the MongoDB chart and t | `readinessProbe.successThreshold` | Minimum consecutive successes for the probe to be considered successful after having failed. | `1` | | `initConfigMap.name` | Custom config map with init scripts | `nil` | | `configmap` | MongoDB configuration file to be used | `nil` | -| `ingress.enabled` | Enable ingress controller resource | `false` | -| `ingress.certManager` | Add annotations for cert-manager | `false` | -| `ingress.annotations` | Ingress annotations | `[]` | -| `ingress.hosts[0].name` | Hostname to your MongoDB installation | `mongodb.local` | -| `ingress.hosts[0].path` | Path within the url structure | `/` | -| `ingress.tls[0].hosts[0]` | TLS hosts | `mongodb.local` | -| `ingress.tls[0].secretName` | TLS Secret (certificates) | `mongodb.local-tls` | -| `ingress.secrets[0].name` | TLS Secret Name | `nil` | -| `ingress.secrets[0].certificate` | TLS Secret Certificate | `nil` | -| `ingress.secrets[0].key` | TLS Secret Key | `nil` | +| `ingress.enabled` | Enable ingress controller resource | `false` | +| `ingress.certManager` | Add annotations for cert-manager | `false` | +| `ingress.annotations` | Ingress annotations | `[]` | +| `ingress.hosts[0].name` | Hostname to your MongoDB installation | `mongodb.local` | +| `ingress.hosts[0].path` | Path within the url structure | `/` | +| `ingress.tls[0].hosts[0]` | TLS hosts | `mongodb.local` | +| `ingress.tls[0].secretName` | TLS Secret (certificates) | `mongodb.local-tls` | +| `ingress.secrets[0].name` | TLS Secret Name | `nil` | +| `ingress.secrets[0].certificate` | TLS Secret Certificate | `nil` | +| `ingress.secrets[0].key` | TLS Secret Key | `nil` | | `metrics.enabled` | Start a side-car prometheus exporter | `false` | | `metrics.image.registry` | MongoDB exporter image registry | `docker.io` | | `metrics.image.repository` | MongoDB exporter image name | `bitnami/mongodb-exporter` | diff --git a/upstreamed/mongodb/templates/_helpers.tpl b/upstreamed/mongodb/templates/_helpers.tpl index 12046a6537..47f1bb2791 100644 --- a/upstreamed/mongodb/templates/_helpers.tpl +++ b/upstreamed/mongodb/templates/_helpers.tpl @@ -6,6 +6,19 @@ Expand the name of the chart. {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} {{- end -}} +{{/* +Renders a value that contains template. +Usage: +{{ include "mongodb.tplValue" ( dict "value" .Values.path.to.the.Value "context" $) }} +*/}} +{{- define "mongodb.tplValue" -}} + {{- if typeIs "string" .value }} + {{- tpl .value .context }} + {{- else }} + {{- tpl (.value | toYaml) .context }} + {{- end }} +{{- end -}} + {{/* Create a default fully qualified app name. We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). diff --git a/upstreamed/mongodb/templates/deployment-standalone.yaml b/upstreamed/mongodb/templates/deployment-standalone.yaml index 852b7de74e..58ad0c5624 100644 --- a/upstreamed/mongodb/templates/deployment-standalone.yaml +++ b/upstreamed/mongodb/templates/deployment-standalone.yaml @@ -138,6 +138,9 @@ spec: - name: MONGODB_EXTRA_FLAGS value: {{ .Values.mongodbExtraFlags | join " " | quote }} {{- end }} + {{- if .Values.extraEnvVars }} + {{- include "mongodb.tplValue" ( dict "value" .Values.extraEnvVars "context" $ ) | nindent 8 }} + {{- end }} ports: - name: mongodb containerPort: 27017 diff --git a/upstreamed/mongodb/templates/statefulset-arbiter-rs.yaml b/upstreamed/mongodb/templates/statefulset-arbiter-rs.yaml index 16ce79dc92..71a74f6304 100644 --- a/upstreamed/mongodb/templates/statefulset-arbiter-rs.yaml +++ b/upstreamed/mongodb/templates/statefulset-arbiter-rs.yaml @@ -137,6 +137,9 @@ spec: - name: MONGODB_EXTRA_FLAGS value: {{ .Values.mongodbExtraFlags | join " " | quote }} {{- end }} + {{- if .Values.extraEnvVars }} + {{- include "mongodb.tplValue" ( dict "value" .Values.extraEnvVars "context" $ ) | nindent 10 }} + {{- end }} {{- if .Values.livenessProbe.enabled }} livenessProbe: tcpSocket: diff --git a/upstreamed/mongodb/templates/statefulset-primary-rs.yaml b/upstreamed/mongodb/templates/statefulset-primary-rs.yaml index 153b14870b..854a954b04 100644 --- a/upstreamed/mongodb/templates/statefulset-primary-rs.yaml +++ b/upstreamed/mongodb/templates/statefulset-primary-rs.yaml @@ -167,6 +167,9 @@ spec: - name: MONGODB_EXTRA_FLAGS value: {{ .Values.mongodbExtraFlags | join " " | quote }} {{- end }} + {{- if .Values.extraEnvVars }} + {{- include "mongodb.tplValue" ( dict "value" .Values.extraEnvVars "context" $ ) | nindent 10 }} + {{- end }} {{- if .Values.livenessProbe.enabled }} livenessProbe: exec: diff --git a/upstreamed/mongodb/templates/statefulset-secondary-rs.yaml b/upstreamed/mongodb/templates/statefulset-secondary-rs.yaml index c94df3472d..a936663ce9 100644 --- a/upstreamed/mongodb/templates/statefulset-secondary-rs.yaml +++ b/upstreamed/mongodb/templates/statefulset-secondary-rs.yaml @@ -155,6 +155,9 @@ spec: - name: MONGODB_EXTRA_FLAGS value: {{ .Values.mongodbExtraFlags | join " " | quote }} {{- end }} + {{- if .Values.extraEnvVars }} + {{- include "mongodb.tplValue" ( dict "value" .Values.extraEnvVars "context" $ ) | nindent 10 }} + {{- end }} {{- if .Values.livenessProbe.enabled }} livenessProbe: exec: diff --git a/upstreamed/mongodb/values-production.yaml b/upstreamed/mongodb/values-production.yaml index c58e7dfd48..22d4c61153 100644 --- a/upstreamed/mongodb/values-production.yaml +++ b/upstreamed/mongodb/values-production.yaml @@ -43,6 +43,9 @@ image: ## # fullnameOverride: +# Add custom extra environment variables to all the MongoDB containers +# extraEnvVars: + ## Init containers parameters: ## volumePermissions: Change the owner and group of the persistent volume mountpoint to runAsUser:fsGroup values from the securityContext section. ## diff --git a/upstreamed/mongodb/values.yaml b/upstreamed/mongodb/values.yaml index 6c95af7ec5..18169b1f17 100644 --- a/upstreamed/mongodb/values.yaml +++ b/upstreamed/mongodb/values.yaml @@ -144,6 +144,9 @@ service: ## # loadBalancerSourceRanges: [] +# Add custom extra environment variables to all the MongoDB containers +# extraEnvVars: + ## Setting up replication ## ref: https://github.com/bitnami/bitnami-docker-mongodb#setting-up-a-replication # diff --git a/upstreamed/rabbitmq/Chart.yaml b/upstreamed/rabbitmq/Chart.yaml index c20d6458d0..52f1003559 100644 --- a/upstreamed/rabbitmq/Chart.yaml +++ b/upstreamed/rabbitmq/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: rabbitmq -version: 6.14.1 +version: 6.14.2 appVersion: 3.8.2 description: Open source message broker software that implements the Advanced Message Queuing Protocol (AMQP) keywords: diff --git a/upstreamed/rabbitmq/templates/svc.yaml b/upstreamed/rabbitmq/templates/svc.yaml index 3db21e3cc8..0d1df63da6 100644 --- a/upstreamed/rabbitmq/templates/svc.yaml +++ b/upstreamed/rabbitmq/templates/svc.yaml @@ -62,7 +62,7 @@ spec: {{- if .Values.metrics.enabled }} - name: metrics port: {{ .Values.metrics.port }} - targetPort: 9090 + targetPort: metrics {{- if (eq .Values.service.type "ClusterIP") }} nodePort: null {{- end }}