diff --git a/stable/phpbb/Chart.yaml b/stable/phpbb/Chart.yaml index 55dcf41b4d..801fcc3f89 100644 --- a/stable/phpbb/Chart.yaml +++ b/stable/phpbb/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: phpbb -version: 4.3.4 +version: 4.4.0 appVersion: 3.2.7 description: Community forum that supports the notion of users and groups, file attachments, full-text search, notifications and more. keywords: diff --git a/stable/phpbb/README.md b/stable/phpbb/README.md index ade4627090..ac5c3e8531 100644 --- a/stable/phpbb/README.md +++ b/stable/phpbb/README.md @@ -93,9 +93,6 @@ The following table lists the configurable parameters of the phpBB chart and the | `service.nodePorts.https` | Kubernetes https node port | `""` | | `service.loadBalancerIP` | LoadBalancer service IP | `""` | | `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.phpbb.storageClass` | PVC Storage Class for phpBB volume | `nil` (uses alpha storage class annotation) | | `persistence.phpbb.accessMode` | PVC Access Mode for phpBB volume | `ReadWriteOnce` | | `persistence.phpbb.size` | PVC Storage Request for phpBB volume | `8Gi` | @@ -138,7 +135,7 @@ Bitnami will release a new chart updating its containers if a new version of the ## Persistence -The [Bitnami phpBB](https://github.com/bitnami/bitnami-docker-phpbb) image stores the phpBB data and configurations at the `/bitnami/phpbb` and `/bitnami/apache` paths of the container. +The [Bitnami phpBB](https://github.com/bitnami/bitnami-docker-phpbb) image stores the phpBB data and configurations at the `/bitnami/phpbb` 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/phpbb/templates/apache-pvc.yaml b/stable/phpbb/templates/apache-pvc.yaml deleted file mode 100644 index 52773276b7..0000000000 --- a/stable/phpbb/templates/apache-pvc.yaml +++ /dev/null @@ -1,24 +0,0 @@ -{{- if .Values.persistence.enabled -}} -kind: PersistentVolumeClaim -apiVersion: v1 -metadata: - name: "{{ template "phpbb.fullname" . }}-apache" - labels: - app: "{{ template "phpbb.fullname" . }}" - chart: "{{ template "phpbb.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 }}" -{{- end }} -{{- end }} -{{- end -}} diff --git a/stable/phpbb/templates/deployment.yaml b/stable/phpbb/templates/deployment.yaml index 8b2500e0bc..5d11b656ec 100644 --- a/stable/phpbb/templates/deployment.yaml +++ b/stable/phpbb/templates/deployment.yaml @@ -128,8 +128,6 @@ spec: volumeMounts: - name: phpbb-data mountPath: /bitnami/phpbb - - name: apache-data - mountPath: /bitnami/apache {{- if .Values.metrics.enabled }} - name: metrics image: {{ template "phpbb.metrics.image" . }} @@ -161,11 +159,4 @@ spec: {{- else }} emptyDir: {} {{- end }} - - name: apache-data - {{- if .Values.persistence.enabled }} - persistentVolumeClaim: - claimName: "{{ template "phpbb.fullname" . }}-apache" - {{- else }} - emptyDir: {} - {{- end }} {{- end }} diff --git a/stable/phpbb/values.yaml b/stable/phpbb/values.yaml index 10a3a228c0..eab9f984a9 100644 --- a/stable/phpbb/values.yaml +++ b/stable/phpbb/values.yaml @@ -13,7 +13,7 @@ image: registry: docker.io repository: bitnami/phpbb - tag: 3.2.7-debian-9-r16 + tag: 3.2.7-debian-9-r19 ## 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 @@ -200,17 +200,6 @@ service: ## 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 phpbb: ## phpbb data Persistent Volume Storage Class ## If defined, storageClassName: