Synchronize upstreamed folder to da2910073

2026-03-14 06:47:28 +08:00 · 2019-06-13 13:31:20 +00:00
parent 869878c217
commit 1142119c12
211 changed files with 1238 additions and 1026 deletions
--- a/upstreamed/phpbb/Chart.yaml
+++ b/upstreamed/phpbb/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: phpbb
-version: 4.3.3
+version: 4.4.3
 appVersion: 3.2.7
 description: Community forum that supports the notion of users and groups, file attachments, full-text search, notifications and more.
 keywords:
--- a/upstreamed/phpbb/OWNERS
+++ b/upstreamed/phpbb/OWNERS
@@ -3,10 +3,12 @@ approvers:
 - tompizmor
 - sameersbn
 - carrodher
+- javsalgar
 - juan131
 reviewers:
 - prydonius
 - tompizmor
 - sameersbn
 - carrodher
+- javsalgar
 - juan131
--- a/upstreamed/phpbb/README.md
+++ b/upstreamed/phpbb/README.md
@@ -54,7 +54,7 @@ The following table lists the configurable parameters of the phpBB chart and the
 | `image.registry`                  | phpBB image registry                  | `docker.io`                                             |
 | `image.repository`                | phpBB image name                      | `bitnami/phpbb`                                         |
 | `image.tag`                       | phpBB image tag                       | `{TAG_NAME}`                                            |
-| `image.pullPolicy`                | Image pull policy                     | `Always` if `imageTag` is `latest`, else `IfNotPresent` |
+| `image.pullPolicy`                | Image pull policy                     | `IfNotPresent`                                          |
 | `image.pullSecrets`               | Specify docker-registry secret names as an array            | `[]` (does not add image pull secrets to deployed pods)                                                   |
 | `phpbbUser`                       | User of the application               | `user`                                                  |
 | `phpbbPassword`                   | Application password                  | _random 10 character long alphanumeric string_          |
@@ -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.
--- a/upstreamed/phpbb/requirements.lock
+++ b/upstreamed/phpbb/requirements.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: mariadb
  repository: https://kubernetes-charts.storage.googleapis.com/
-  version: 5.2.3
+  version: 5.11.3
 digest: sha256:0593b73b2163fbbbae061de1aa2b8280d43f8a423a91e1c7375c0b6c86784b1c
-generated: 2018-11-20T10:22:49.801551704Z
+generated: 2019-06-10T03:12:01.703636225Z
--- a/upstreamed/phpbb/templates/NOTES.txt
+++ b/upstreamed/phpbb/templates/NOTES.txt
@@ -46,7 +46,7 @@ host. To configure phpBB to use and external database host:

 {{- end }}

-{{- if and (contains "bitnami/" .Values.image.repository) (not (.Values.image.tag | regexFind "-r\\d+$")) }}
+{{- if and (contains "bitnami/" .Values.image.repository) (not (.Values.image.tag | toString | regexFind "-r\\d+$|sha256:")) }}

 WARNING: Rolling tag detected ({{ .Values.image.repository }}:{{ .Values.image.tag }}), please note that it is strongly recommended to avoid using rolling tags in a production environment.
 +info https://docs.bitnami.com/containers/how-to/understand-rolling-tags-containers/
--- a/upstreamed/phpbb/templates/apache-pvc.yaml
+++ b/upstreamed/phpbb/templates/apache-pvc.yaml
@@ -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 -}}
--- a/upstreamed/phpbb/templates/deployment.yaml
+++ b/upstreamed/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 }}
--- a/upstreamed/phpbb/values.yaml
+++ b/upstreamed/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-r31
  ## 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: <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
  phpbb:
    ## phpbb data Persistent Volume Storage Class
    ## If defined, storageClassName: <storageClass>