diff --git a/stable/mediawiki/Chart.yaml b/stable/mediawiki/Chart.yaml index ac87fff843..75ec08b90b 100644 --- a/stable/mediawiki/Chart.yaml +++ b/stable/mediawiki/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: mediawiki -version: 6.3.7 +version: 6.3.8 appVersion: 1.33.0 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/ diff --git a/stable/mediawiki/README.md b/stable/mediawiki/README.md index 657c769810..d0d9b178cb 100644 --- a/stable/mediawiki/README.md +++ b/stable/mediawiki/README.md @@ -56,8 +56,6 @@ The following table lists the configurable parameters of the MediaWiki chart and | `image.tag` | MediaWiki Image tag | `{TAG_NAME}` | | `image.pullPolicy` | Image pull policy | `IfNotPresent` | | `image.pullSecrets` | Specify docker-registry secret names as an array | `[]` (does not add image pull secrets to deployed pods) | -| `nameOverride` | String to partially override mediawiki.fullname template with a string (will prepend the release name) | `nil` | -| `fullnameOverride` | String to fully override mediawiki.fullname template with a string | `nil` | | `mediawikiUser` | User of the application | `user` | | `mediawikiPassword` | Application password | _random 10 character long alphanumeric string_ | | `mediawikiEmail` | Admin email | `user@example.com` | diff --git a/stable/mediawiki/templates/_helpers.tpl b/stable/mediawiki/templates/_helpers.tpl index 3f75466fe0..57adf0e7ec 100644 --- a/stable/mediawiki/templates/_helpers.tpl +++ b/stable/mediawiki/templates/_helpers.tpl @@ -11,17 +11,9 @@ 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). */}} {{- define "mediawiki.fullname" -}} -{{- if .Values.fullnameOverride -}} -{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}} -{{- else -}} {{- $name := default .Chart.Name .Values.nameOverride -}} -{{- if contains $name .Release.Name -}} -{{- .Release.Name | trunc 63 | trimSuffix "-" -}} -{{- else -}} {{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} {{- end -}} -{{- end -}} -{{- end -}} {{/* Create chart name and version as used by the chart label. diff --git a/stable/mediawiki/values.yaml b/stable/mediawiki/values.yaml index 4660228b79..3685f6a024 100644 --- a/stable/mediawiki/values.yaml +++ b/stable/mediawiki/values.yaml @@ -26,14 +26,6 @@ image: # pullSecrets: # - myRegistryKeySecretName -## String to partially override mediawiki.fullname template (will maintain the release name) -## -# nameOverride: - -## String to fully override mediawiki.fullname template -## -# fullnameOverride: - ## User of the application ## ref: https://github.com/bitnami/bitnami-docker-mediawiki#environment-variables ##