Revert "[stable/mediawiki] Standardize 'fullname' and 'name' macros (#15442)" (#15611)

This reverts commit 0862313554.

Signed-off-by: Carlos Rodriguez Hernandez <crhernandez@bitnami.com>
This commit is contained in:
Carlos Rodríguez Hernández
2019-07-17 09:34:34 -07:00
committed by Kubernetes Prow Robot
parent 57286b2585
commit 04c497877f
4 changed files with 1 additions and 19 deletions
+1 -1
View File
@@ -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/
-2
View File
@@ -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` |
-8
View File
@@ -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.
-8
View File
@@ -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
##