diff --git a/stable/joomla/Chart.yaml b/stable/joomla/Chart.yaml index 6fee6cfd9f..a4694febf6 100644 --- a/stable/joomla/Chart.yaml +++ b/stable/joomla/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: joomla -version: 4.2.4 +version: 4.3.0 appVersion: 3.9.6 description: PHP content management system (CMS) for publishing web content keywords: diff --git a/stable/joomla/README.md b/stable/joomla/README.md index 32ea081795..ca05604724 100644 --- a/stable/joomla/README.md +++ b/stable/joomla/README.md @@ -95,9 +95,6 @@ The following table lists the configurable parameters of the Joomla! chart and t | `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 annotation) | -| `persistence.apache.accessMode` | PVC Access Mode for Apache volume | `ReadWriteOnce` | -| `persistence.apache.size` | PVC Storage Request for Apache volume | `1Gi` | | `persistence.joomla.storageClass` | PVC Storage Class for Joomla! volume | `nil` (uses alpha storage annotation) | | `persistence.joomla.accessMode` | PVC Access Mode for Joomla! volume | `ReadWriteOnce` | | `persistence.joomla.size` | PVC Storage Request for Joomla! volume | `8Gi` | @@ -155,7 +152,7 @@ Bitnami will release a new chart updating its containers if a new version of the ## Persistence -The [Bitnami Joomla!](https://github.com/bitnami/bitnami-docker-joomla) image stores the Joomla! data and configurations at the `/bitnami/joomla` and `/bitnami/apache` paths of the container. +The [Bitnami Joomla!](https://github.com/bitnami/bitnami-docker-joomla) image stores the Joomla! data and configurations at the `/bitnami/joomla` 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/joomla/templates/apache-pvc.yaml b/stable/joomla/templates/apache-pvc.yaml deleted file mode 100644 index 1c00b44db6..0000000000 --- a/stable/joomla/templates/apache-pvc.yaml +++ /dev/null @@ -1,24 +0,0 @@ -{{- if .Values.persistence.enabled -}} -kind: PersistentVolumeClaim -apiVersion: v1 -metadata: - name: {{ template "joomla.fullname" . }}-apache - labels: - app: {{ template "joomla.fullname" . }} - chart: {{ template "joomla.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/joomla/templates/deployment.yaml b/stable/joomla/templates/deployment.yaml index b75116083a..6fdf8e45b4 100644 --- a/stable/joomla/templates/deployment.yaml +++ b/stable/joomla/templates/deployment.yaml @@ -135,8 +135,6 @@ spec: volumeMounts: - name: joomla-data mountPath: /bitnami/joomla - - name: apache-data - mountPath: /bitnami/apache {{- if .Values.metrics.enabled }} - name: metrics image: {{ template "joomla.metrics.image" . }} @@ -168,13 +166,6 @@ spec: {{- else }} emptyDir: {} {{- end }} - - name: apache-data - {{- if .Values.persistence.enabled }} - persistentVolumeClaim: - claimName: {{ template "joomla.fullname" . }}-apache - {{- else }} - emptyDir: {} - {{- end }} {{- if .Values.nodeSelector }} nodeSelector: {{ toYaml .Values.nodeSelector | indent 8 }} diff --git a/stable/joomla/values.yaml b/stable/joomla/values.yaml index cd0846021d..0e7787652c 100644 --- a/stable/joomla/values.yaml +++ b/stable/joomla/values.yaml @@ -13,7 +13,7 @@ image: registry: docker.io repository: bitnami/joomla - tag: 3.9.6-debian-9-r9 + tag: 3.9.6-debian-9-r12 ## 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 @@ -216,17 +216,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 joomla: ## Joomla data Persistent Volume Storage Class ## If defined, storageClassName: