[stable/dokuwiki] Implement again "Standardize 'fullname' and 'name' macros" (#15655)

This reverts commit 3e51dd5d3f.
Implement #15438 bumping a major version after #15609
Signed-off-by: Carlos Rodriguez Hernandez <crhernandez@bitnami.com>
This commit is contained in:
Carlos Rodríguez Hernández
2019-07-18 04:38:23 -07:00
committed by Kubernetes Prow Robot
parent da68ce0ca7
commit 498f0972fc
4 changed files with 19 additions and 1 deletions
+1 -1
View File
@@ -1,6 +1,6 @@
apiVersion: v1
name: dokuwiki
version: 4.3.4
version: 5.0.0
appVersion: 0.20180422.201901061035
description: DokuWiki is a standards-compliant, simple to use wiki optimized for creating
documentation. It is targeted at developer teams, workgroups, and small companies.
+2
View File
@@ -54,6 +54,8 @@ The following table lists the configurable parameters of the DokuWiki chart and
| `image.tag` | DokuWiki image tag | `{TAG_NAME}` |
| `image.pullPolicy` | Image pull policy | `Always` |
| `image.pullSecrets` | Specify docker-registry secret names as an array | `[]` (does not add image pull secrets to deployed pods) |
| `nameOverride` | String to partially override dokuwiki.fullname template with a string (will prepend the release name) | `nil` |
| `fullnameOverride` | String to fully override dokuwiki.fullname template with a string | `nil` |
| `dokuwikiUsername` | User of the application | `user` |
| `dokuwikiFullName` | User's full name | `User Name` |
| `dokuwikiPassword` | Application password | _random 10 character alphanumeric string_ |
+8
View File
@@ -11,9 +11,17 @@ 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 "dokuwiki.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,6 +26,14 @@ image:
# pullSecrets:
# - myRegistryKeySecretName
## String to partially override dokuwiki.fullname template (will maintain the release name)
##
# nameOverride:
## String to fully override dokuwiki.fullname template
##
# fullnameOverride:
## User of the application
## ref: https://github.com/bitnami/bitnami-docker-dokuwiki#environment-variables
##