Synchronize upstreamed folder to 814a008e7

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

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

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.

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

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 -}}

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" . }}