mirror of
https://github.com/helm/charts.git
synced 2026-08-23 22:37:45 +00:00
Remove apache and/or php volume (#14315)
Signed-off-by: Carlos Rodriguez Hernandez <crhernandez@bitnami.com>
This commit is contained in:
committed by
Kubernetes Prow Robot
parent
6e778f170d
commit
60ec66d77b
@@ -1,6 +1,6 @@
|
||||
apiVersion: v1
|
||||
name: osclass
|
||||
version: 4.3.2
|
||||
version: 4.4.0
|
||||
appVersion: 3.7.4
|
||||
description: Osclass is a php script that allows you to quickly create and manage
|
||||
your own free classifieds site.
|
||||
|
||||
@@ -72,9 +72,6 @@ The following table lists the configurable parameters of the Osclass chart and t
|
||||
| `serviceType` | Kubernetes Service type | `LoadBalancer` |
|
||||
| `resources` | CPU/Memory resource requests/limits | Memory: `512Mi`, CPU: `300m` |
|
||||
| `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.moodle.storageClass` | PVC Storage Class for OSClass volume | `nil` (uses alpha storage class annotation) |
|
||||
| `persistence.moodle.accessMode` | PVC Access Mode for OSClass volume | `ReadWriteOnce` |
|
||||
| `persistence.moodle.size` | PVC Storage Request for OSClass volume | `8Gi` |
|
||||
@@ -156,7 +153,7 @@ Bitnami will release a new chart updating its containers if a new version of the
|
||||
|
||||
## Persistence
|
||||
|
||||
The [Bitnami Osclass](https://github.com/bitnami/bitnami-docker-osclass) image stores the Osclass data and configurations at the `/bitnami/osclass` and `/bitnami/apache` paths of the container.
|
||||
The [Bitnami Osclass](https://github.com/bitnami/bitnami-docker-osclass) image stores the Osclass data and configurations at the `/bitnami/osclass` 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.
|
||||
|
||||
@@ -1,24 +0,0 @@
|
||||
{{- if .Values.persistence.enabled -}}
|
||||
kind: PersistentVolumeClaim
|
||||
apiVersion: v1
|
||||
metadata:
|
||||
name: {{ template "osclass.fullname" . }}-apache
|
||||
labels:
|
||||
app: {{ template "osclass.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 -}}
|
||||
@@ -131,8 +131,6 @@ spec:
|
||||
volumeMounts:
|
||||
- name: osclass-data
|
||||
mountPath: /bitnami/osclass
|
||||
- name: apache-data
|
||||
mountPath: /bitnami/apache
|
||||
{{- if .Values.metrics.enabled }}
|
||||
- name: metrics
|
||||
image: {{ template "osclass.metrics.image" . }}
|
||||
@@ -164,11 +162,4 @@ spec:
|
||||
{{- else }}
|
||||
emptyDir: {}
|
||||
{{- end }}
|
||||
- name: apache-data
|
||||
{{- if .Values.persistence.enabled }}
|
||||
persistentVolumeClaim:
|
||||
claimName: {{ template "osclass.fullname" . }}-apache
|
||||
{{- else }}
|
||||
emptyDir: {}
|
||||
{{- end }}
|
||||
{{- end -}}
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
image:
|
||||
registry: docker.io
|
||||
repository: bitnami/osclass
|
||||
tag: 3.7.4-debian-9-r251
|
||||
tag: 3.7.4-debian-9-r254
|
||||
## 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
|
||||
@@ -219,17 +219,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
|
||||
osclass:
|
||||
## osclass data Persistent Volume Storage Class
|
||||
## If defined, storageClassName: <storageClass>
|
||||
|
||||
Reference in New Issue
Block a user