diff --git a/stable/magento/Chart.yaml b/stable/magento/Chart.yaml index b0240cc259..bf2a15c78a 100644 --- a/stable/magento/Chart.yaml +++ b/stable/magento/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: magento -version: 5.0.4 +version: 5.1.0 appVersion: 2.3.1 description: A feature-rich flexible e-commerce solution. It includes transaction options, multi-store functionality, loyalty programs, product categorization and shopper filtering, promotion rules, and more. keywords: diff --git a/stable/magento/README.md b/stable/magento/README.md index 6daa8c955e..6e7e8cafd7 100644 --- a/stable/magento/README.md +++ b/stable/magento/README.md @@ -112,9 +112,6 @@ The following table lists the configurable parameters of the Magento chart and t | `readinessProbe.successThreshold` | Minimum consecutive successes for the probe | `1` | | `readinessProbe.failureThreshold` | Minimum consecutive failures for the probe | `3` | | `persistence.enabled` | Enable persistence using PVC | `true` | -| `persistence.apache.storageClass` | PVC Storage Class for Apache volume | `nil` (uses alpha storage annotation) | -| `persistence.apache.accessMode` | PVC Access Mode for Apache volume | `ReadWriteOnce` | -| `persistence.apache.size` | PVC Storage Request for Apache volume | `1Gi` | | `persistence.magento.storageClass` | PVC Storage Class for Magento volume | `nil` (uses alpha storage annotation) | | `persistence.magento.accessMode` | PVC Access Mode for Magento volume | `ReadWriteOnce` | | `persistence.magento.size` | PVC Storage Request for Magento volume | `8Gi` | @@ -175,7 +172,7 @@ Bitnami will release a new chart updating its containers if a new version of the ## Persistence -The [Bitnami Magento](https://github.com/bitnami/bitnami-docker-magento) image stores the Magento data and configurations at the `/bitnami/magento` and `/bitnami/apache` paths of the container. +The [Bitnami Magento](https://github.com/bitnami/bitnami-docker-magento) image stores the Magento data and configurations at the `/bitnami/magento` 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/magento/templates/apache-pvc.yaml b/stable/magento/templates/apache-pvc.yaml deleted file mode 100644 index dd60a5e16d..0000000000 --- a/stable/magento/templates/apache-pvc.yaml +++ /dev/null @@ -1,24 +0,0 @@ -{{- if .Values.persistence.enabled -}} -kind: PersistentVolumeClaim -apiVersion: v1 -metadata: - name: {{ template "magento.fullname" . }}-apache - labels: - app: {{ template "magento.fullname" . }} - chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" - 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/magento/templates/deployment.yaml b/stable/magento/templates/deployment.yaml index 5f657f07c2..1e2a59a511 100644 --- a/stable/magento/templates/deployment.yaml +++ b/stable/magento/templates/deployment.yaml @@ -153,8 +153,6 @@ spec: volumeMounts: - name: magento-data mountPath: /bitnami/magento - - name: apache-data - mountPath: /bitnami/apache {{- if .Values.metrics.enabled }} - name: metrics image: {{ template "magento.metrics.image" . }} @@ -186,11 +184,4 @@ spec: {{- else }} emptyDir: {} {{- end }} - - name: apache-data - {{- if .Values.persistence.enabled }} - persistentVolumeClaim: - claimName: {{ template "magento.fullname" . }}-apache - {{- else }} - emptyDir: {} - {{- end }} {{- end -}} diff --git a/stable/magento/values-production.yaml b/stable/magento/values-production.yaml index dd7cac3139..bcad8c8767 100644 --- a/stable/magento/values-production.yaml +++ b/stable/magento/values-production.yaml @@ -13,7 +13,7 @@ image: registry: docker.io repository: bitnami/magento - tag: 2.3.1-debian-9-r41 + tag: 2.3.1-debian-9-r44 ## Set to true if you would like to see extra information on logs ## It turns BASH and NAMI debugging in minideb ## ref: https://github.com/bitnami/minideb-extras/#turn-on-bash-debugging @@ -210,17 +210,6 @@ readinessProbe: ## 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 magento: ## magento data Persistent Volume Storage Class ## If defined, storageClassName: diff --git a/stable/magento/values.yaml b/stable/magento/values.yaml index 48df44d1ac..81b04972bf 100644 --- a/stable/magento/values.yaml +++ b/stable/magento/values.yaml @@ -13,7 +13,7 @@ image: registry: docker.io repository: bitnami/magento - tag: 2.3.1-debian-9-r41 + tag: 2.3.1-debian-9-r44 ## Set to true if you would like to see extra information on logs ## It turns BASH and NAMI debugging in minideb ## ref: https://github.com/bitnami/minideb-extras/#turn-on-bash-debugging @@ -210,17 +210,6 @@ readinessProbe: ## 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 magento: ## magento data Persistent Volume Storage Class ## If defined, storageClassName: