[stable/dokuwiki] Use storageClassName for dokuwiki. (#1988)

This commit is contained in:
Guang Ya Liu
2017-12-22 08:37:36 -08:00
committed by k8s-ci-robot
parent 2788aa9d45
commit 226a805be8
4 changed files with 29 additions and 19 deletions
+1 -1
View File
@@ -1,5 +1,5 @@
name: dokuwiki
version: 0.2.0
version: 0.2.1
description: DokuWiki is a standards-compliant, simple to use wiki optimized for creating
documentation. It is targeted at developer teams, workgroups, and small companies.
All data is stored in plain text files, so no database is required.
+7 -6
View File
@@ -8,16 +8,17 @@ metadata:
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
release: "{{ .Release.Name }}"
heritage: "{{ .Release.Service }}"
annotations:
{{- if .Values.persistence.apache.storageClass }}
volume.beta.kubernetes.io/storage-class: {{ .Values.persistence.apache.storageClass | quote }}
{{- else }}
volume.alpha.kubernetes.io/storage-class: default
{{- end }}
spec:
accessModes:
- {{ .Values.persistence.apache.accessMode | quote }}
resources:
requests:
storage: {{ .Values.persistence.apache.size | quote }}
{{- if .Values.persistence.apache.storageClass }}
{{- if (eq "-" .Values.persistence.apache.storageClass) }}
storageClassName: ""
{{- else }}
storageClassName: "{{ .Values.persistence.apache.storageClass }}"
{{- end }}
{{- end }}
{{- end -}}
+7 -6
View File
@@ -8,16 +8,17 @@ metadata:
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
release: "{{ .Release.Name }}"
heritage: "{{ .Release.Service }}"
annotations:
{{- if .Values.persistence.dokuwiki.storageClass }}
volume.beta.kubernetes.io/storage-class: {{ .Values.persistence.dokuwiki.storageClass | quote }}
{{- else }}
volume.alpha.kubernetes.io/storage-class: default
{{- end }}
spec:
accessModes:
- {{ .Values.persistence.dokuwiki.accessMode | quote }}
resources:
requests:
storage: {{ .Values.persistence.dokuwiki.size | quote }}
{{- if .Values.persistence.dokuwiki.storageClass }}
{{- if (eq "-" .Values.persistence.dokuwiki.storageClass) }}
storageClassName: ""
{{- else }}
storageClassName: "{{ .Values.persistence.dokuwiki.storageClass }}"
{{- end }}
{{- end }}
{{- end -}}
+14 -6
View File
@@ -45,17 +45,25 @@ serviceType: LoadBalancer
persistence:
enabled: true
apache:
## If defined, volume.beta.kubernetes.io/storage-class: <storageClass>
## Default: volume.alpha.kubernetes.io/storage-class: default
## apache data Persistent Volume Storage Class
## If defined, storageClassName: <storageClass>
## If set to "-", storageClassName: "", which disables dynamic provisioning
## If undefined (the default) or set to null, no storageClassName spec is
## set, choosing the default provisioner. (gp2 on AWS, standard on
## GKE, AWS & OpenStack)
##
# storageClass:
# storageClass: "-"
accessMode: ReadWriteOnce
size: 1Gi
dokuwiki:
## If defined, volume.beta.kubernetes.io/storage-class: <storageClass>
## Default: volume.alpha.kubernetes.io/storage-class: default
## dokuwiki data Persistent Volume Storage Class
## If defined, storageClassName: <storageClass>
## If set to "-", storageClassName: "", which disables dynamic provisioning
## If undefined (the default) or set to null, no storageClassName spec is
## set, choosing the default provisioner. (gp2 on AWS, standard on
## GKE, AWS & OpenStack)
##
# storageClass:
# storageClass: "-"
accessMode: ReadWriteOnce
size: 8Gi