Remove apache and/or php volume (#14317)

Signed-off-by: Carlos Rodriguez Hernandez <crhernandez@bitnami.com>
This commit is contained in:
Carlos Rodríguez Hernández
2019-05-30 08:32:41 -07:00
committed by Kubernetes Prow Robot
parent 9d190f8775
commit 690c8d5cde
5 changed files with 3 additions and 50 deletions
+1 -1
View File
@@ -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:
+1 -4
View File
@@ -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.
-24
View File
@@ -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 -}}
@@ -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 -}}
+1 -12
View File
@@ -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: <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
opencart:
## opencart data Persistent Volume Storage Class
## If defined, storageClassName: <storageClass>