From beafe2beb4cdd8f3ed758606b6030f7eecf930ef Mon Sep 17 00:00:00 2001 From: bitnami-bot Date: Tue, 8 Oct 2019 06:35:02 +0000 Subject: [PATCH] Synchronize upstreamed folder to 814a008e7 --- upstreamed/mediawiki/Chart.yaml | 4 ++-- upstreamed/mediawiki/requirements.lock | 4 ++-- upstreamed/mediawiki/values.yaml | 4 ++-- upstreamed/wordpress/Chart.yaml | 2 +- upstreamed/wordpress/templates/_helpers.tpl | 11 +++++++++++ upstreamed/wordpress/templates/ingress.yaml | 2 +- 6 files changed, 19 insertions(+), 8 deletions(-) mode change 100644 => 100755 upstreamed/wordpress/Chart.yaml mode change 100644 => 100755 upstreamed/wordpress/templates/_helpers.tpl mode change 100644 => 100755 upstreamed/wordpress/templates/ingress.yaml diff --git a/upstreamed/mediawiki/Chart.yaml b/upstreamed/mediawiki/Chart.yaml index f73ac8117..9f801feb7 100644 --- a/upstreamed/mediawiki/Chart.yaml +++ b/upstreamed/mediawiki/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 name: mediawiki -version: 8.2.5 -appVersion: 1.33.0 +version: 8.2.6 +appVersion: 1.33.1 description: Extremely powerful, scalable software and a feature-rich wiki implementation that uses PHP to process and display data stored in a database. home: http://www.mediawiki.org/ icon: https://bitnami.com/assets/stacks/mediawiki/img/mediawiki-stack-220x234.png diff --git a/upstreamed/mediawiki/requirements.lock b/upstreamed/mediawiki/requirements.lock index cdd7bc01f..68cb36343 100644 --- a/upstreamed/mediawiki/requirements.lock +++ b/upstreamed/mediawiki/requirements.lock @@ -1,6 +1,6 @@ dependencies: - name: mariadb repository: https://kubernetes-charts.storage.googleapis.com/ - version: 6.9.1 + version: 6.11.0 digest: sha256:bc40726b74587ca4fc92cff01759b61882e7d1454d6ee74db11787ad0d16063b -generated: "2019-09-20T15:10:37.826041+02:00" +generated: 2019-10-07T22:14:49.859183847Z diff --git a/upstreamed/mediawiki/values.yaml b/upstreamed/mediawiki/values.yaml index 49304aa68..2be383e2d 100644 --- a/upstreamed/mediawiki/values.yaml +++ b/upstreamed/mediawiki/values.yaml @@ -14,7 +14,7 @@ image: registry: docker.io repository: bitnami/mediawiki - tag: 1.33.0-debian-9-r67 + tag: 1.33.1-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 @@ -274,7 +274,7 @@ metrics: image: registry: docker.io repository: bitnami/apache-exporter - tag: 0.7.0-debian-9-r50 + tag: 0.7.0-debian-9-r78 pullPolicy: IfNotPresent ## Optionally specify an array of imagePullSecrets. ## Secrets must be manually created in the namespace. diff --git a/upstreamed/wordpress/Chart.yaml b/upstreamed/wordpress/Chart.yaml old mode 100644 new mode 100755 index a56d6d613..513c480b8 --- a/upstreamed/wordpress/Chart.yaml +++ b/upstreamed/wordpress/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: wordpress -version: 7.3.9 +version: 7.3.10 appVersion: 5.2.3 description: Web publishing platform for building blogs and websites. icon: https://bitnami.com/assets/stacks/wordpress/img/wordpress-stack-220x234.png diff --git a/upstreamed/wordpress/templates/_helpers.tpl b/upstreamed/wordpress/templates/_helpers.tpl old mode 100644 new mode 100755 index 36f2a8f62..062e46098 --- a/upstreamed/wordpress/templates/_helpers.tpl +++ b/upstreamed/wordpress/templates/_helpers.tpl @@ -159,3 +159,14 @@ but Helm 2.9 and 2.10 does not support it, so we need to implement this if-else {{- end -}} {{- end -}} {{- end -}} + +{{/* +Return the appropriate apiVersion for ingress. +*/}} +{{- define "wordpress.ingress.apiVersion" -}} +{{- if semverCompare "<1.14-0" .Capabilities.KubeVersion.GitVersion -}} +{{- print "extensions/v1beta1" -}} +{{- else -}} +{{- print "networking.k8s.io/v1beta1" -}} +{{- end -}} +{{- end -}} diff --git a/upstreamed/wordpress/templates/ingress.yaml b/upstreamed/wordpress/templates/ingress.yaml old mode 100644 new mode 100755 index fe2c24301..a9ec26ba9 --- a/upstreamed/wordpress/templates/ingress.yaml +++ b/upstreamed/wordpress/templates/ingress.yaml @@ -1,5 +1,5 @@ {{- if .Values.ingress.enabled }} -apiVersion: extensions/v1beta1 +apiVersion: {{ template "wordpress.ingress.apiVersion" . }} kind: Ingress metadata: name: {{ template "wordpress.fullname" . }}