[stable/mediawiki] Add global StorageClass to mediawiki (#16414)

Signed-off-by: Miguel A. Cabrera Minagorri <macabrera@bitnami.com>
This commit is contained in:
Miguel Ángel Cabrera Miñagorri
2019-08-20 02:53:44 -07:00
committed by Kubernetes Prow Robot
parent 742a8c6e6f
commit cb979ce368
5 changed files with 24 additions and 8 deletions
+1 -1
View File
@@ -1,6 +1,6 @@
apiVersion: v1
name: mediawiki
version: 8.0.1
version: 8.1.0
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/
+1
View File
@@ -51,6 +51,7 @@ The following table lists the configurable parameters of the MediaWiki chart and
|--------------------------------------|-------------------------------------------------------------|---------------------------------------------------------|
| `global.imageRegistry` | Global Docker image registry | `nil` |
| `global.imagePullSecrets` | Global Docker registry secret names as an array | `[]` (does not add image pull secrets to deployed pods) |
| `global.storageClass` | Global storage class for dynamic provisioning | `nil` |
| `image.registry` | MediaWiki image registry | `docker.io` |
| `image.repository` | MediaWiki Image name | `bitnami/mediawiki` |
| `image.tag` | MediaWiki Image tag | `{TAG_NAME}` |
+20
View File
@@ -118,3 +118,23 @@ imagePullSecrets:
{{- end }}
{{- end -}}
{{- end -}}
{{/*
Return the proper Storage Class
*/}}
{{- define "mediawiki.storageClass" -}}
{{- $storageClass := "" }}
{{- if .Values.persistence.storageClass -}}
{{- $storageClass = .Values.persistence.storageClass -}}
{{- end -}}
{{- if .Values.global -}}
{{- if .Values.global.storageClass -}}
{{- $storageClass = .Values.global.storageClass -}}
{{- end -}}
{{- end -}}
{{- if (eq "-" $storageClass) -}}
{{- printf "\"\"" -}}
{{- else }}
{{- printf "%s" $storageClass -}}
{{- end -}}
{{- end -}}
@@ -14,11 +14,5 @@ spec:
resources:
requests:
storage: {{ .Values.persistence.size | quote }}
{{- if .Values.persistence.storageClass }}
{{- if (eq "-" .Values.persistence.storageClass) }}
storageClassName: ""
{{- else }}
storageClassName: {{ .Values.persistence.storageClass | quote }}
{{- end }}
{{- end }}
storageClassName: {{ include "mediawiki.storageClass" . }}
{{- end -}}
+1
View File
@@ -6,6 +6,7 @@
# imageRegistry: myRegistryName
# imagePullSecrets:
# - myRegistryKeySecretName
# storageClass: myStorageClass
## Bitnami DokuWiki image version
## ref: https://hub.docker.com/r/bitnami/mediawiki/tags/