From aa7403c3727b5f51ca174328995f9855e354bfb3 Mon Sep 17 00:00:00 2001 From: Guangya Liu Date: Tue, 5 Sep 2017 12:16:57 +0800 Subject: [PATCH 1/2] [stable/drupal] Use storageClassName for drupal. --- stable/drupal/Chart.yaml | 2 +- stable/drupal/templates/apache-pvc.yaml | 13 +++++----- stable/drupal/templates/drupal-pvc.yaml | 15 ++++++------ stable/drupal/values.yaml | 32 +++++++++++++++++-------- 4 files changed, 37 insertions(+), 25 deletions(-) diff --git a/stable/drupal/Chart.yaml b/stable/drupal/Chart.yaml index bcca4065ee48..45dea07efe5c 100644 --- a/stable/drupal/Chart.yaml +++ b/stable/drupal/Chart.yaml @@ -1,5 +1,5 @@ name: drupal -version: 0.10.0 +version: 0.10.1 appVersion: 8.3.7 description: One of the most versatile open source content management systems. keywords: diff --git a/stable/drupal/templates/apache-pvc.yaml b/stable/drupal/templates/apache-pvc.yaml index de461a51c6c3..dd302f40bd63 100644 --- a/stable/drupal/templates/apache-pvc.yaml +++ b/stable/drupal/templates/apache-pvc.yaml @@ -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 -}} diff --git a/stable/drupal/templates/drupal-pvc.yaml b/stable/drupal/templates/drupal-pvc.yaml index 666299358335..39c2d1f7f0db 100644 --- a/stable/drupal/templates/drupal-pvc.yaml +++ b/stable/drupal/templates/drupal-pvc.yaml @@ -8,14 +8,6 @@ metadata: chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" release: "{{ .Release.Name }}" heritage: "{{ .Release.Service }}" - {{- if (not .Values.persistence.drupal.hostPath) }} - annotations: - {{- if .Values.persistence.drupal.storageClass }} - volume.beta.kubernetes.io/storage-class: {{ .Values.persistence.drupal.storageClass | quote }} - {{- else }} - volume.alpha.kubernetes.io/storage-class: default - {{- end }} - {{- end }} spec: {{- if .Values.persistence.drupal.hostPath }} storageClassName: "" @@ -25,4 +17,11 @@ spec: resources: requests: storage: {{ .Values.persistence.drupal.size | quote }} +{{- if and .Values.persistence.drupal.storageClass (not .Values.persistence.drupal.hostPath) -}} +{{- if (eq "-" .Values.persistence.drupal.storageClass) }} + storageClassName: "" +{{- else }} + storageClassName: "{{ .Values.persistence.drupal.storageClass }}" +{{- end }} +{{- end }} {{- end -}} diff --git a/stable/drupal/values.yaml b/stable/drupal/values.yaml index 92abb0065816..f96accac12ce 100644 --- a/stable/drupal/values.yaml +++ b/stable/drupal/values.yaml @@ -45,10 +45,14 @@ mariadb: ## persistence: enabled: true - ## If defined, volume.beta.kubernetes.io/storage-class: - ## Default: volume.alpha.kubernetes.io/storage-class: default + ## mariadb data Persistent Volume Storage Class + ## If defined, storageClassName: + ## 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 @@ -86,17 +90,25 @@ ingress: persistence: enabled: true apache: - ## If defined, volume.beta.kubernetes.io/storage-class: - ## Default: volume.alpha.kubernetes.io/storage-class: default + ## apache data Persistent Volume Storage Class + ## If defined, storageClassName: + ## 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 drupal: - ## If defined, volume.beta.kubernetes.io/storage-class: - ## Default: volume.alpha.kubernetes.io/storage-class: default + ## drupal data Persistent Volume Storage Class + ## If defined, storageClassName: + ## 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 @@ -155,4 +167,4 @@ readinessProbe: httpGet: path: /user/login port: http - initialDelaySeconds: 30 \ No newline at end of file + initialDelaySeconds: 30 From da62d369b2d2696aa9265adf6bd42439ae5fcf55 Mon Sep 17 00:00:00 2001 From: Guangya Liu Date: Tue, 3 Oct 2017 10:05:25 +0800 Subject: [PATCH 2/2] Updated mariadb dependency version. --- stable/drupal/requirements.lock | 6 +++--- stable/drupal/requirements.yaml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/stable/drupal/requirements.lock b/stable/drupal/requirements.lock index cddbbd16a0de..4c6ae0809b0c 100644 --- a/stable/drupal/requirements.lock +++ b/stable/drupal/requirements.lock @@ -1,6 +1,6 @@ dependencies: - name: mariadb repository: https://kubernetes-charts.storage.googleapis.com/ - version: 0.7.0 -digest: sha256:e1af13ac4ac21f67582006f12d2b4eb78a1a2a59b34338fac850f2bec0b08b41 -generated: 2017-08-09T22:52:48.218901909-04:00 + version: 1.0.5 +digest: sha256:08de643d4a3b2886a76b7f5da8ea7db20b7a69b8de1d04594862adfe4735993c +generated: 2017-10-03T10:05:16.672603874+08:00 diff --git a/stable/drupal/requirements.yaml b/stable/drupal/requirements.yaml index 4896aa89de36..0c14b5cd34c0 100644 --- a/stable/drupal/requirements.yaml +++ b/stable/drupal/requirements.yaml @@ -1,4 +1,4 @@ dependencies: - name: mariadb - version: 0.7.0 + version: 1.0.5 repository: https://kubernetes-charts.storage.googleapis.com/