diff --git a/stable/opencart/Chart.yaml b/stable/opencart/Chart.yaml index 82aab370c1..8c81223097 100644 --- a/stable/opencart/Chart.yaml +++ b/stable/opencart/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: opencart -version: 4.4.3 +version: 4.5.0 appVersion: 3.0.3-2 description: A free and open source e-commerce platform for online merchants. It provides a professional and reliable foundation for a successful online store. keywords: diff --git a/stable/opencart/README.md b/stable/opencart/README.md index 981c5c6adc..87c2358b4b 100644 --- a/stable/opencart/README.md +++ b/stable/opencart/README.md @@ -96,9 +96,6 @@ The following table lists the configurable parameters of the OpenCart chart and | `mariadb.rootUser.password` | MariaDB admin password | `nil` | | `serviceType` | Kubernetes Service type | `LoadBalancer` | | `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.opencart.storageClass` | PVC Storage Class for OpenCart volume | `nil` (uses alpha storage class annotation) | | `persistence.opencart.accessMode` | PVC Access Mode for OpenCart volume | `ReadWriteOnce` | | `persistence.opencart.size` | PVC Storage Request for OpenCart volume | `8Gi` | @@ -155,7 +152,7 @@ Bitnami will release a new chart updating its containers if a new version of the ## Persistence -The [Bitnami OpenCart](https://github.com/bitnami/bitnami-docker-opencart) image stores the OpenCart data and configurations at the `/bitnami/opencart` and `/bitnami/apache` paths of the container. +The [Bitnami OpenCart](https://github.com/bitnami/bitnami-docker-opencart) image stores the OpenCart data and configurations at the `/bitnami/opencart` path of the container. 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/opencart/templates/apache-pvc.yaml b/stable/opencart/templates/apache-pvc.yaml deleted file mode 100644 index 10b25cd4c1..0000000000 --- a/stable/opencart/templates/apache-pvc.yaml +++ /dev/null @@ -1,24 +0,0 @@ -{{- if .Values.persistence.enabled -}} -kind: PersistentVolumeClaim -apiVersion: v1 -metadata: - name: {{ template "opencart.fullname" . }}-apache - labels: - app: {{ template "opencart.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/opencart/templates/deployment.yaml b/stable/opencart/templates/deployment.yaml index 1488b0e2ee..8b58883d76 100644 --- a/stable/opencart/templates/deployment.yaml +++ b/stable/opencart/templates/deployment.yaml @@ -124,8 +124,6 @@ spec: volumeMounts: - name: opencart-data mountPath: /bitnami/opencart - - name: apache-data - mountPath: /bitnami/apache {{- if .Values.metrics.enabled }} - name: metrics image: {{ template "opencart.metrics.image" . }} @@ -157,11 +155,4 @@ spec: {{- else }} emptyDir: {} {{- end }} - - name: apache-data - {{- if .Values.persistence.enabled }} - persistentVolumeClaim: - claimName: {{ template "opencart.fullname" . }}-apache - {{- else }} - emptyDir: {} - {{- end }} {{- end -}} diff --git a/stable/opencart/values.yaml b/stable/opencart/values.yaml index 87dbfca835..2338d2e1df 100644 --- a/stable/opencart/values.yaml +++ b/stable/opencart/values.yaml @@ -13,7 +13,7 @@ image: registry: docker.io repository: bitnami/opencart - tag: 3.0.3-2-debian-9-r30 + tag: 3.0.3-2-debian-9-r33 ## 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 @@ -204,17 +204,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 opencart: ## opencart data Persistent Volume Storage Class ## If defined, storageClassName: