github/deprecated-helm-charts
1
0
Fork 0
mirror of https://github.com/helm/charts.git synced 2026-08-23 22:37:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove apache and/or php volume (#14321)

Browse Source 
Signed-off-by: Carlos Rodriguez Hernandez <crhernandez@bitnami.com>
This commit is contained in:
Carlos Rodríguez Hernández
2019-05-30 09:37:03 -07:00
committed by Kubernetes Prow Robot
parent 60ec66d77b
commit bee54ff340
5 changed files with 3 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stable/drupal/Chart.yaml
+1 -1
View File
@@ -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:
stable/drupal/README.md
+1 -7
View File
@@ -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.
stable/drupal/templates/apache-pvc.yaml
-24
View File
@@ -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 -}}
stable/drupal/templates/deployment.yaml
-13
View File
@@ -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 }}
stable/drupal/values.yaml
+1 -15
View File
@@ -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: <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: "-"
accessMode: ReadWriteOnce
size: 1Gi
drupal:
## drupal data Persistent Volume Storage Class
## If defined, storageClassName: <storageClass>
@@ -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.
##