From bee54ff340def96d776830d9274a4f277b3074a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Rodr=C3=ADguez=20Hern=C3=A1ndez?= Date: Thu, 30 May 2019 18:37:04 +0200 Subject: [PATCH] Remove apache and/or php volume (#14321) Signed-off-by: Carlos Rodriguez Hernandez --- stable/drupal/Chart.yaml | 2 +- stable/drupal/README.md | 8 +------- stable/drupal/templates/apache-pvc.yaml | 24 ------------------------ stable/drupal/templates/deployment.yaml | 13 ------------- stable/drupal/values.yaml | 16 +--------------- 5 files changed, 3 insertions(+), 60 deletions(-) delete mode 100644 stable/drupal/templates/apache-pvc.yaml diff --git a/stable/drupal/Chart.yaml b/stable/drupal/Chart.yaml index 420bbdb7c5..03e1db9322 100644 --- a/stable/drupal/Chart.yaml +++ b/stable/drupal/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: drupal -version: 3.2.8 +version: 3.3.0 appVersion: 8.7.2 description: One of the most versatile open source content management systems. keywords: diff --git a/stable/drupal/README.md b/stable/drupal/README.md index 68f0534435..b918b4484a 100644 --- a/stable/drupal/README.md +++ b/stable/drupal/README.md @@ -88,9 +88,6 @@ The following table lists the configurable parameters of the Drupal chart and th | `service.nodePorts.http` | Kubernetes http node port | `""` | | `service.nodePorts.https` | Kubernetes https node port | `""` | | `persistence.enabled` | Enable persistence using PVC | `true` | -| `persistence.apache.storageClass` | PVC Storage Class for Apache volume | `nil` (uses alpha storage class annotation) | -| `persistence.apache.accessMode` | PVC Access Mode for Apache volume | `ReadWriteOnce` | -| `persistence.apache.size` | PVC Storage Request for Apache volume | `1Gi` | | `persistence.drupal.storageClass` | PVC Storage Class for Drupal volume | `nil` (uses alpha storage class annotation) | | `persistence.drupal.accessMode` | PVC Access Mode for Drupal volume | `ReadWriteOnce` | | `persistence.drupal.existingClaim`| An Existing PVC name | `nil` | @@ -98,7 +95,6 @@ The following table lists the configurable parameters of the Drupal chart and th | `persistence.drupal.size` | PVC Storage Request for Drupal volume | `8Gi` | | `resources` | CPU/Memory resource requests/limits | Memory: `512Mi`, CPU: `300m` | | `volumeMounts.drupal.mountPath` | Drupal data volume mount path | `/bitnami/drupal` | -| `volumeMounts.apache.mountPath` | Apache data volume mount path | `/bitnami/apache` | | `podAnnotations` | Pod annotations | `{}` | | `metrics.enabled` | Start a side-car prometheus exporter | `false` | | `metrics.image.registry` | Apache exporter image registry | `docker.io` | @@ -153,9 +149,7 @@ helm install --name my-release -f values.yaml stable/drupal ## Persistence -The configured image must store Drupal data and Apache configurations in separate paths of the container. - -The [Bitnami Drupal](https://github.com/bitnami/bitnami-docker-drupal) image stores the Drupal data and Apache configurations at the `/bitnami/drupal` and `/bitnami/apache` paths of the container. If you wish to override the `image` value, and your image stores this data and configurations in different paths, you may specify these paths with `volumeMounts.drupal.mountPath` and `volumeMounts.apache.mountPath`. +The [Bitnami Drupal](https://github.com/bitnami/bitnami-docker-drupal) image stores the Drupal data at the `/bitnami/drupal` path of the container. If you wish to override the `image` value, and your image stores this data in different path, you may specify these paths with `volumeMounts.drupal.mountPath`. Persistent Volume Claims are used to keep the data across deployments. This is known to work in GCE, AWS, and minikube. See the [Configuration](#configuration) section to configure the PVC or to disable persistence. diff --git a/stable/drupal/templates/apache-pvc.yaml b/stable/drupal/templates/apache-pvc.yaml deleted file mode 100644 index d3a49f3c64..0000000000 --- a/stable/drupal/templates/apache-pvc.yaml +++ /dev/null @@ -1,24 +0,0 @@ -{{- if and .Values.persistence.enabled .Values.volumeMounts.apache.mountPath -}} -kind: PersistentVolumeClaim -apiVersion: v1 -metadata: - name: {{ template "drupal.fullname" . }}-apache - labels: - app: {{ template "drupal.fullname" . }} - chart: {{ template "drupal.chart" . }} - release: "{{ .Release.Name }}" - heritage: "{{ .Release.Service }}" -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/deployment.yaml b/stable/drupal/templates/deployment.yaml index c22aeec8b9..aa3cb76b6a 100644 --- a/stable/drupal/templates/deployment.yaml +++ b/stable/drupal/templates/deployment.yaml @@ -108,10 +108,6 @@ spec: volumeMounts: - name: drupal-data mountPath: {{ .Values.volumeMounts.drupal.mountPath }} - {{- if .Values.volumeMounts.apache.mountPath }} - - name: apache-data - mountPath: {{ .Values.volumeMounts.apache.mountPath }} - {{- end }} {{- if .Values.metrics.enabled }} - name: metrics image: {{ template "drupal.metrics.image" . }} @@ -143,12 +139,3 @@ spec: {{- else }} emptyDir: {} {{- end }} - {{- if .Values.volumeMounts.apache.mountPath }} - - name: apache-data - {{- if .Values.persistence.enabled }} - persistentVolumeClaim: - claimName: {{ template "drupal.fullname" . }}-apache - {{- else }} - emptyDir: {} - {{- end }} - {{- end }} diff --git a/stable/drupal/values.yaml b/stable/drupal/values.yaml index 76da2e67b0..7d803e7db9 100644 --- a/stable/drupal/values.yaml +++ b/stable/drupal/values.yaml @@ -13,7 +13,7 @@ image: registry: docker.io repository: bitnami/drupal - tag: 8.7.2-debian-9-r5 + tag: 8.7.2-debian-9-r8 ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images @@ -170,17 +170,6 @@ ingress: ## persistence: enabled: true - apache: - ## 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: "-" - accessMode: ReadWriteOnce - size: 1Gi drupal: ## drupal data Persistent Volume Storage Class ## If defined, storageClassName: @@ -216,13 +205,10 @@ resources: ## Configure volume mounts. This is useful for images whose data mount paths are ## different than the default. -## Setting volumeMounts.apache.mountPath to "" prevents Apache config mount. ## volumeMounts: drupal: mountPath: /bitnami/drupal - apache: - mountPath: /bitnami/apache ## Pass extra environment variables to the Drupal container. ##