From 013ba43bd7df0108fcfe4276cbafde93d10d6434 Mon Sep 17 00:00:00 2001 From: bitnami-bot Date: Thu, 3 Oct 2019 07:34:58 +0000 Subject: [PATCH] Synchronize upstreamed folder to dde0d33c3 --- upstreamed/drupal/Chart.yaml | 4 ++-- upstreamed/drupal/requirements.lock | 4 ++-- upstreamed/drupal/values.yaml | 4 ++-- upstreamed/external-dns/Chart.yaml | 2 +- upstreamed/external-dns/README.md | 6 +++--- .../external-dns/templates/clusterrole.yaml | 18 +++++++++++++++++- .../external-dns/templates/deployment.yaml | 8 +++----- upstreamed/external-dns/values-production.yaml | 4 +++- upstreamed/external-dns/values.yaml | 4 +++- upstreamed/rabbitmq/Chart.yaml | 4 ++-- upstreamed/rabbitmq/values-production.yaml | 4 ++-- upstreamed/rabbitmq/values.yaml | 4 ++-- 12 files changed, 42 insertions(+), 24 deletions(-) diff --git a/upstreamed/drupal/Chart.yaml b/upstreamed/drupal/Chart.yaml index 93a2ee323..b4570f450 100644 --- a/upstreamed/drupal/Chart.yaml +++ b/upstreamed/drupal/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 name: drupal -version: 5.2.4 -appVersion: 8.7.7 +version: 5.2.5 +appVersion: 8.7.8 description: One of the most versatile open source content management systems. keywords: - drupal diff --git a/upstreamed/drupal/requirements.lock b/upstreamed/drupal/requirements.lock index d4c487269..899444e31 100644 --- a/upstreamed/drupal/requirements.lock +++ b/upstreamed/drupal/requirements.lock @@ -1,6 +1,6 @@ dependencies: - name: mariadb repository: https://kubernetes-charts.storage.googleapis.com/ - version: 6.9.1 + version: 6.10.1 digest: sha256:a363428d6463718a9523a88c70e485218373e315f2979cb1bb17b034ec2be96a -generated: "2019-09-20T15:01:57.480311+02:00" +generated: 2019-10-02T22:32:28.544295072Z diff --git a/upstreamed/drupal/values.yaml b/upstreamed/drupal/values.yaml index 66f696311..1362d3d6f 100644 --- a/upstreamed/drupal/values.yaml +++ b/upstreamed/drupal/values.yaml @@ -14,7 +14,7 @@ image: registry: docker.io repository: bitnami/drupal - tag: 8.7.7-debian-9-r5 + tag: 8.7.8-debian-9-r0 ## 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 @@ -262,7 +262,7 @@ metrics: image: registry: docker.io repository: bitnami/apache-exporter - tag: 0.7.0-debian-9-r50 + tag: 0.7.0-debian-9-r73 pullPolicy: IfNotPresent ## Optionally specify an array of imagePullSecrets. ## Secrets must be manually created in the namespace. diff --git a/upstreamed/external-dns/Chart.yaml b/upstreamed/external-dns/Chart.yaml index 1fc5bc730..9785c010d 100644 --- a/upstreamed/external-dns/Chart.yaml +++ b/upstreamed/external-dns/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: external-dns -version: 2.6.4 +version: 2.6.5 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 3b3b19b90..a24d1bdd5 100644 --- a/upstreamed/external-dns/README.md +++ b/upstreamed/external-dns/README.md @@ -109,9 +109,9 @@ The following table lists the configurable parameters of the external-dns chart | `annotationFilter` | Filter sources managed by external-dns via annotation using label selector (optional) | `""` | | `domainFilters` | Limit possible target zones by domain suffixes (optional) | `[]` | | `zoneIdFilters` | Limit possible target zones by zone id (optional) | `[]` | -| `crd.create` | If true, create CRD ressource | `false` | -| `crd.apiversion` | Sets the API version for the CRD to watch | `"` | -| `crd.kind` | Sets the kind for the CRD to watch | `"` | +| `crd.create` | Install and use the integrated DNSEndpoint CRD | `false` | +| `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` | | `interval` | Interval update period to use | `1m` | diff --git a/upstreamed/external-dns/templates/clusterrole.yaml b/upstreamed/external-dns/templates/clusterrole.yaml index b231a05ee..b7e846ea1 100644 --- a/upstreamed/external-dns/templates/clusterrole.yaml +++ b/upstreamed/external-dns/templates/clusterrole.yaml @@ -32,19 +32,35 @@ rules: - get - list - watch +{{- if or .Values.crd.create .Values.crd.apiversion }} - apiGroups: + {{- if .Values.crd.create }} - externaldns.k8s.io + {{- else }} + - {{ $api := splitn "/" 2 .Values.crd.apiversion }}{{ $api._0 }} + {{- end }} resources: + {{- if .Values.crd.create }} - dnsendpoints + {{- else }} + - {{ printf "%ss" (.Values.crd.kind | lower) }} + {{- end }} verbs: - get - list - watch -{{- if .Values.crd.create }} - apiGroups: + {{- if .Values.crd.create }} - externaldns.k8s.io + {{- else }} + - {{ $api := splitn "/" 2 .Values.crd.apiversion }}{{ $api._0 }} + {{- end }} resources: + {{- if .Values.crd.create }} - dnsendpoints/status + {{- else }} + - {{ printf "%ss/status" (.Values.crd.kind | lower) }} + {{- end }} verbs: - update {{- end }} diff --git a/upstreamed/external-dns/templates/deployment.yaml b/upstreamed/external-dns/templates/deployment.yaml index 400fd545e..e89626fa0 100755 --- a/upstreamed/external-dns/templates/deployment.yaml +++ b/upstreamed/external-dns/templates/deployment.yaml @@ -78,13 +78,11 @@ spec: {{- if .Values.annotationFilter }} - --annotation-filter={{ .Values.annotationFilter }} {{- end }} - {{- if .Values.crd.create }} - {{- if .Values.crd.apiversion }} + {{- if .Values.crd.apiversion }} - --crd-source-apiversion={{ .Values.crd.apiversion }} - {{- end }} - {{- if .Values.crd.kind }} + {{- end }} + {{- if .Values.crd.kind }} - --crd-source-kind={{ .Values.crd.kind }} - {{- end }} {{- end }} {{- range .Values.istioIngressGateways }} - --istio-ingress-gateway={{ . }} diff --git a/upstreamed/external-dns/values-production.yaml b/upstreamed/external-dns/values-production.yaml index 30a9cf726..2dc9b18c2 100644 --- a/upstreamed/external-dns/values-production.yaml +++ b/upstreamed/external-dns/values-production.yaml @@ -283,10 +283,12 @@ podLabels: {} ## priorityClassName: "" -## Installs the DNSEndpoint CRD +## Options for the source type "crd" ## crd: + ## Install and use the integrated DNSEndpoint CRD create: false + ## Change these to use an external DNSEndpoint CRD (E.g. from kubefed) apiversion: "" kind: "" diff --git a/upstreamed/external-dns/values.yaml b/upstreamed/external-dns/values.yaml index 78e71654b..48c7fc2d7 100644 --- a/upstreamed/external-dns/values.yaml +++ b/upstreamed/external-dns/values.yaml @@ -283,10 +283,12 @@ podLabels: {} ## priorityClassName: "" -## Installs the DNSEndpoint CRD +## Options for the source type "crd" ## crd: + ## Install and use the integrated DNSEndpoint CRD create: false + ## Change these to use an external DNSEndpoint CRD (E.g. from kubefed) apiversion: "" kind: "" diff --git a/upstreamed/rabbitmq/Chart.yaml b/upstreamed/rabbitmq/Chart.yaml index 6d7c84b81..ec3ec6dcf 100644 --- a/upstreamed/rabbitmq/Chart.yaml +++ b/upstreamed/rabbitmq/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 name: rabbitmq -version: 6.8.0 -appVersion: 3.7.18 +version: 6.8.1 +appVersion: 3.7.19 description: Open source message broker software that implements the Advanced Message Queuing Protocol (AMQP) keywords: - rabbitmq diff --git a/upstreamed/rabbitmq/values-production.yaml b/upstreamed/rabbitmq/values-production.yaml index 4eb0b08e7..cb5a208f1 100644 --- a/upstreamed/rabbitmq/values-production.yaml +++ b/upstreamed/rabbitmq/values-production.yaml @@ -14,7 +14,7 @@ image: registry: docker.io repository: bitnami/rabbitmq - tag: 3.7.18-debian-9-r1 + tag: 3.7.19-debian-9-r0 ## set to true if you would like to see extra information on logs ## it turns BASH and NAMI debugging in minideb @@ -322,7 +322,7 @@ metrics: image: registry: docker.io repository: bitnami/rabbitmq-exporter - tag: 0.29.0-debian-9-r40 + tag: 0.29.0-debian-9-r55 pullPolicy: IfNotPresent ## Optionally specify an array of imagePullSecrets. ## Secrets must be manually created in the namespace. diff --git a/upstreamed/rabbitmq/values.yaml b/upstreamed/rabbitmq/values.yaml index 11cfc9bc3..95b78ee40 100644 --- a/upstreamed/rabbitmq/values.yaml +++ b/upstreamed/rabbitmq/values.yaml @@ -14,7 +14,7 @@ image: registry: docker.io repository: bitnami/rabbitmq - tag: 3.7.18-debian-9-r1 + tag: 3.7.19-debian-9-r0 ## set to true if you would like to see extra information on logs ## it turns BASH and NAMI debugging in minideb @@ -318,7 +318,7 @@ metrics: image: registry: docker.io repository: bitnami/rabbitmq-exporter - tag: 0.29.0-debian-9-r40 + tag: 0.29.0-debian-9-r55 pullPolicy: IfNotPresent ## Optionally specify an array of imagePullSecrets. ## Secrets must be manually created in the namespace.