From 303448a162ea7ec3f00411686d4a34d4d30566bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Rodr=C3=ADguez=20Hern=C3=A1ndez?= Date: Thu, 30 May 2019 18:08:22 +0200 Subject: [PATCH] Remove apache and/or php volume (#14307) Signed-off-by: Carlos Rodriguez Hernandez --- stable/dokuwiki/Chart.yaml | 2 +- stable/dokuwiki/README.md | 5 +---- stable/dokuwiki/templates/apache-pvc.yaml | 24 ----------------------- stable/dokuwiki/templates/deployment.yaml | 9 --------- stable/dokuwiki/values.yaml | 13 +----------- 5 files changed, 3 insertions(+), 50 deletions(-) delete mode 100644 stable/dokuwiki/templates/apache-pvc.yaml diff --git a/stable/dokuwiki/Chart.yaml b/stable/dokuwiki/Chart.yaml index 2ef7a8194a..e5ea980c0b 100644 --- a/stable/dokuwiki/Chart.yaml +++ b/stable/dokuwiki/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: dokuwiki -version: 4.2.3 +version: 4.3.0 appVersion: 0.20180422.201901061035 description: DokuWiki is a standards-compliant, simple to use wiki optimized for creating documentation. It is targeted at developer teams, workgroups, and small companies. diff --git a/stable/dokuwiki/README.md b/stable/dokuwiki/README.md index 26a73f268e..f33aad8444 100644 --- a/stable/dokuwiki/README.md +++ b/stable/dokuwiki/README.md @@ -77,9 +77,6 @@ The following table lists the configurable parameters of the DokuWiki chart and | `ingress.secrets[0].certificate` | TLS Secret Certificate | `nil` | | `ingress.secrets[0].key` | TLS Secret Key | `nil` | | `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.dokuwiki.storageClass` | PVC Storage Class for DokuWiki volume | `nil` (uses alpha storage class annotation) | | `persistence.dokuwiki.accessMode` | PVC Access Mode for DokuWiki volume | `ReadWriteOnce` | | `persistence.dokuwiki.size` | PVC Storage Request for DokuWiki volume | `8Gi` | @@ -137,7 +134,7 @@ Bitnami will release a new chart updating its containers if a new version of the ## Persistence -The [Bitnami DokuWiki](https://github.com/bitnami/bitnami-docker-dokuwiki) image stores the DokuWiki data and configurations at the `/bitnami/dokuwiki` and `/bitnami/apache` paths of the container. +The [Bitnami DokuWiki](https://github.com/bitnami/bitnami-docker-dokuwiki) image stores the DokuWiki data and configurations at the `/bitnami/dokuwiki` path of the container. Persistent Volume Claims are used to keep the data across deployments. There is a [known issue](https://github.com/kubernetes/kubernetes/issues/39178) in Kubernetes Clusters with EBS in different availability zones. Ensure your cluster is configured properly to create Volumes in the same availability zone where the nodes are running. Kuberentes 1.12 solved this issue with the [Volume Binding Mode](https://kubernetes.io/docs/concepts/storage/storage-classes/#volume-binding-mode). diff --git a/stable/dokuwiki/templates/apache-pvc.yaml b/stable/dokuwiki/templates/apache-pvc.yaml deleted file mode 100644 index d675ad49d7..0000000000 --- a/stable/dokuwiki/templates/apache-pvc.yaml +++ /dev/null @@ -1,24 +0,0 @@ -{{- if .Values.persistence.enabled -}} -kind: PersistentVolumeClaim -apiVersion: v1 -metadata: - name: {{ template "dokuwiki.fullname" . }}-apache - labels: - app: {{ template "dokuwiki.name" . }} - chart: {{ template "dokuwiki.chart" . }} - release: {{ .Release.Name | quote }} - heritage: {{ .Release.Service | quote }} -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 | quote }} -{{- end }} -{{- end }} -{{- end -}} diff --git a/stable/dokuwiki/templates/deployment.yaml b/stable/dokuwiki/templates/deployment.yaml index e87356ba82..397c8742a5 100644 --- a/stable/dokuwiki/templates/deployment.yaml +++ b/stable/dokuwiki/templates/deployment.yaml @@ -95,8 +95,6 @@ spec: volumeMounts: - name: dokuwiki-data mountPath: /bitnami/dokuwiki - - name: apache-data - mountPath: /bitnami/apache {{- if .Values.metrics.enabled }} - name: metrics image: {{ template "dokuwiki.metrics.image" . }} @@ -128,10 +126,3 @@ spec: {{- else }} emptyDir: {} {{- end }} - - name: apache-data - {{- if .Values.persistence.enabled }} - persistentVolumeClaim: - claimName: {{ template "dokuwiki.fullname" . }}-apache - {{- else }} - emptyDir: {} - {{- end }} diff --git a/stable/dokuwiki/values.yaml b/stable/dokuwiki/values.yaml index f21ddb879c..aae578f7f8 100644 --- a/stable/dokuwiki/values.yaml +++ b/stable/dokuwiki/values.yaml @@ -13,7 +13,7 @@ image: registry: docker.io repository: bitnami/dokuwiki - tag: 0.20180422.201901061035-debian-9-r105 + tag: 0.20180422.201901061035-debian-9-r114 ## 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 @@ -130,17 +130,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 dokuwiki: ## Dokuwiki data Persistent Volume Storage Class ## If defined, storageClassName: