diff --git a/bitnami/phpbb/Chart.yaml b/bitnami/phpbb/Chart.yaml index 03c68e58d..d50ac8e9c 100644 --- a/bitnami/phpbb/Chart.yaml +++ b/bitnami/phpbb/Chart.yaml @@ -26,4 +26,4 @@ name: phpbb sources: - https://github.com/bitnami/bitnami-docker-phpbb - https://www.phpbb.com/ -version: 12.0.1 +version: 12.1.0 diff --git a/bitnami/phpbb/README.md b/bitnami/phpbb/README.md index 21a29049e..c22fd8a1c 100644 --- a/bitnami/phpbb/README.md +++ b/bitnami/phpbb/README.md @@ -62,6 +62,7 @@ The command removes all the Kubernetes components associated with the chart and | `global.imagePullSecrets` | Global Docker registry secret names as an array | `[]` | | `global.storageClass` | Global StorageClass for Persistent Volume(s) | `""` | + ### Common parameters | Name | Description | Value | @@ -69,17 +70,19 @@ The command removes all the Kubernetes components associated with the chart and | `kubeVersion` | Force target Kubernetes version (using Helm capabilities if not set) | `""` | | `nameOverride` | String to partially override common.names.fullname template (will maintain the release name) | `""` | | `fullnameOverride` | String to fully override common.names.fullname template | `""` | +| `namespaceOverride` | String to fully override common.names.namespace | `""` | | `commonAnnotations` | Common annotations to add to all phpBB resources (sub-charts are not considered). Evaluated as a template | `{}` | | `commonLabels` | Common labels to add to all phpBB resources (sub-charts are not considered). Evaluated as a template | `{}` | | `extraDeploy` | Array of extra objects to deploy with the release (evaluated as a template) | `[]` | + ### phpBB parameters | Name | Description | Value | | --------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------- | | `image.registry` | phpBB image registry | `docker.io` | | `image.repository` | phpBB Image repository | `bitnami/phpbb` | -| `image.tag` | phpBB Image tag (immutable tags are recommended) | `3.3.5-debian-10-r92` | +| `image.tag` | phpBB Image tag (immutable tags are recommended) | `3.3.7-debian-10-r35` | | `image.pullPolicy` | phpBB image pull policy | `IfNotPresent` | | `image.pullSecrets` | Specify docker-registry secret names as an array | `[]` | | `image.debug` | Specify if debug logs should be enabled | `false` | @@ -106,7 +109,7 @@ The command removes all the Kubernetes components associated with the chart and | `volumePermissions.enabled` | Enable init container that changes volume permissions in the data directory (for cases where the default k8s `runAsUser` and `fsUser` values do not work) | `false` | | `volumePermissions.image.registry` | Init container volume-permissions image registry | `docker.io` | | `volumePermissions.image.repository` | Init container volume-permissions image repository | `bitnami/bitnami-shell` | -| `volumePermissions.image.tag` | Init container volume-permissions image tag (immutable tags are recommended) | `10-debian-10-r305` | +| `volumePermissions.image.tag` | Init container volume-permissions image tag (immutable tags are recommended) | `10-debian-10-r402` | | `volumePermissions.image.pullPolicy` | Init container volume-permissions image pull policy | `IfNotPresent` | | `volumePermissions.image.pullSecrets` | Specify docker-registry secret names as an array | `[]` | | `volumePermissions.resources.limits` | The resources limits for the container | `{}` | @@ -166,6 +169,7 @@ The command removes all the Kubernetes components associated with the chart and | `podAnnotations` | Pod annotations | `{}` | | `podLabels` | Pod extra labels | `{}` | + ### Traffic Exposure Parameters | Name | Description | Value | @@ -196,6 +200,7 @@ The command removes all the Kubernetes components associated with the chart and | `ingress.secrets` | If you're providing your own certificates, please use this to add the certificates as secrets | `[]` | | `ingress.ingressClassName` | IngressClass that will be be used to implement the Ingress (Kubernetes 1.18+) | `""` | + ### Database parameters | Name | Description | Value | @@ -219,6 +224,7 @@ The command removes all the Kubernetes components associated with the chart and | `externalDatabase.password` | Password for the above username | `""` | | `externalDatabase.database` | Name of the existing database | `bitnami_phpbb` | + ### Metrics parameters | Name | Description | Value | @@ -226,12 +232,13 @@ The command removes all the Kubernetes components associated with the chart and | `metrics.enabled` | Start a side-car prometheus exporter | `false` | | `metrics.image.registry` | Apache exporter image registry | `docker.io` | | `metrics.image.repository` | Apache exporter image repository | `bitnami/apache-exporter` | -| `metrics.image.tag` | Apache exporter image tag (immutable tags are recommended) | `0.11.0-debian-10-r23` | +| `metrics.image.tag` | Apache exporter image tag (immutable tags are recommended) | `0.11.0-debian-10-r122` | | `metrics.image.pullPolicy` | Image pull policy | `IfNotPresent` | | `metrics.image.pullSecrets` | Specify docker-registry secret names as an array | `[]` | | `metrics.resources` | Metrics exporter resource requests and limits | `{}` | | `metrics.podAnnotations` | Additional annotations for Metrics exporter pod | `{}` | + ### NetworkPolicy parameters | Name | Description | Value | @@ -252,6 +259,7 @@ The command removes all the Kubernetes components associated with the chart and | `networkPolicy.egressRules.denyConnectionsToExternal` | Enable egress rule that denies outgoing traffic outside the cluster, except for DNS (port 53). | `false` | | `networkPolicy.egressRules.customRules` | Custom network policy rule | `{}` | + The above parameters map to the env variables defined in [bitnami/phpbb](https://github.com/bitnami/bitnami-docker-phpbb). For more information please refer to the [bitnami/phpbb](https://github.com/bitnami/bitnami-docker-phpbb) image documentation. Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example, diff --git a/bitnami/phpbb/templates/NOTES.txt b/bitnami/phpbb/templates/NOTES.txt index 336133bed..f76ed51ac 100644 --- a/bitnami/phpbb/templates/NOTES.txt +++ b/bitnami/phpbb/templates/NOTES.txt @@ -20,23 +20,23 @@ APP VERSION: {{ .Chart.AppVersion }} {{- end }} {{- end }} {{- else if contains "NodePort" .Values.service.type }} - export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "common.names.fullname" . }}) - export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}") + export NODE_PORT=$(kubectl get --namespace {{ include "common.names.namespace" . }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "common.names.fullname" . }}) + export NODE_IP=$(kubectl get nodes --namespace {{ include "common.names.namespace" . }} -o jsonpath="{.items[0].status.addresses[0].address}") echo "phpBB URL: http://$NODE_IP:$NODE_PORT/" {{- else if contains "LoadBalancer" .Values.service.type }} ** Please ensure an external IP is associated to the {{ template "common.names.fullname" . }} service before proceeding ** -** Watch the status using: kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "common.names.fullname" . }} ** +** Watch the status using: kubectl get svc --namespace {{ include "common.names.namespace" . }} -w {{ template "common.names.fullname" . }} ** - export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "common.names.fullname" . }} --template "{{ "{{ range (index .status.loadBalancer.ingress 0) }}{{ . }}{{ end }}" }}") + export SERVICE_IP=$(kubectl get svc --namespace {{ include "common.names.namespace" . }} {{ template "common.names.fullname" . }} --template "{{ "{{ range (index .status.loadBalancer.ingress 0) }}{{ . }}{{ end }}" }}") {{- $port:=(coalesce .Values.service.ports.http .Values.service.port) | toString }} echo "phpBB URL: http://$SERVICE_IP{{- if ne $port "80" }}:{{ coalesce .Values.service.ports.http .Values.service.port }}{{ end }}/" {{- else if contains "ClusterIP" .Values.service.type }} - kubectl port-forward --namespace {{ .Release.Namespace }} svc/{{ template "common.names.fullname" . }} 8080:{{ coalesce .Values.service.ports.http .Values.service.port }} + kubectl port-forward --namespace {{ include "common.names.namespace" . }} svc/{{ template "common.names.fullname" . }} 8080:{{ coalesce .Values.service.ports.http .Values.service.port }} echo "phpBB URL: http://127.0.0.1:8080/" {{- end }} @@ -44,7 +44,7 @@ APP VERSION: {{ .Chart.AppVersion }} 2. Login with the following credentials echo Username: {{ .Values.phpbbUsername }} - echo Password: $(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "phpbb.secretName" . }} -o jsonpath="{.data.phpbb-password}" | base64 --decode) + echo Password: $(kubectl get secret --namespace {{ include "common.names.namespace" . }} {{ template "phpbb.secretName" . }} -o jsonpath="{.data.phpbb-password}" | base64 --decode) {{- else -}} @@ -57,7 +57,7 @@ host. To configure phpBB to use and external database host: 1. Complete your phpBB deployment by running: - helm upgrade --namespace {{ .Release.Namespace }} {{ .Release.Name }} --set service.type={{ .Values.service.type }},mariadb.enabled=false,externalDatabase.host=YOUR_EXTERNAL_DATABASE_HOST bitnami/phpbb + helm upgrade --namespace {{ include "common.names.namespace" . }} {{ .Release.Name }} --set service.type={{ .Values.service.type }},mariadb.enabled=false,externalDatabase.host=YOUR_EXTERNAL_DATABASE_HOST bitnami/phpbb {{- end }} diff --git a/bitnami/phpbb/templates/deployment.yaml b/bitnami/phpbb/templates/deployment.yaml index aa5b2db85..6d5e838ca 100644 --- a/bitnami/phpbb/templates/deployment.yaml +++ b/bitnami/phpbb/templates/deployment.yaml @@ -2,6 +2,7 @@ apiVersion: {{ include "common.capabilities.deployment.apiVersion" . }} kind: Deployment metadata: name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} labels: {{- include "common.labels.standard" . | nindent 4 }} app.kubernetes.io/component: phpbb {{- if .Values.commonLabels }} diff --git a/bitnami/phpbb/templates/externaldb-secrets.yaml b/bitnami/phpbb/templates/externaldb-secrets.yaml index 06e77fb46..986a72bbf 100644 --- a/bitnami/phpbb/templates/externaldb-secrets.yaml +++ b/bitnami/phpbb/templates/externaldb-secrets.yaml @@ -3,6 +3,7 @@ apiVersion: v1 kind: Secret metadata: name: {{ printf "%s-%s" .Release.Name "externaldb" }} + namespace: {{ include "common.names.namespace" . | quote }} labels: {{- include "common.labels.standard" . | nindent 4 }} app.kubernetes.io/component: phpbb {{- if .Values.commonLabels }} diff --git a/bitnami/phpbb/templates/ingress.yaml b/bitnami/phpbb/templates/ingress.yaml index 768978460..492194ecc 100644 --- a/bitnami/phpbb/templates/ingress.yaml +++ b/bitnami/phpbb/templates/ingress.yaml @@ -3,6 +3,7 @@ apiVersion: {{ include "common.capabilities.ingress.apiVersion" . }} kind: Ingress metadata: name: {{ include "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} labels: {{- include "common.labels.standard" . | nindent 4 }} app.kubernetes.io/component: phpbb {{- if .Values.commonLabels }} diff --git a/bitnami/phpbb/templates/networkpolicy-backend-ingress.yaml b/bitnami/phpbb/templates/networkpolicy-backend-ingress.yaml index 99ce711da..30f70bdda 100644 --- a/bitnami/phpbb/templates/networkpolicy-backend-ingress.yaml +++ b/bitnami/phpbb/templates/networkpolicy-backend-ingress.yaml @@ -3,6 +3,7 @@ apiVersion: {{ include "common.capabilities.networkPolicy.apiVersion" . }} kind: NetworkPolicy metadata: name: {{ printf "%s-backend" (include "common.names.fullname" .) }} + namespace: {{ include "common.names.namespace" . | quote }} labels: {{- include "common.labels.standard" . | nindent 4 }} {{- if .Values.commonLabels }} {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} diff --git a/bitnami/phpbb/templates/networkpolicy-egress.yaml b/bitnami/phpbb/templates/networkpolicy-egress.yaml index d8b8242da..6a20f6bcc 100644 --- a/bitnami/phpbb/templates/networkpolicy-egress.yaml +++ b/bitnami/phpbb/templates/networkpolicy-egress.yaml @@ -3,6 +3,7 @@ apiVersion: {{ include "common.capabilities.networkPolicy.apiVersion" . }} kind: NetworkPolicy metadata: name: {{ printf "%s-egress" (include "common.names.fullname" .) }} + namespace: {{ include "common.names.namespace" . | quote }} labels: {{- include "common.labels.standard" . | nindent 4 }} {{- if .Values.commonLabels }} {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} diff --git a/bitnami/phpbb/templates/networkpolicy-ingress.yaml b/bitnami/phpbb/templates/networkpolicy-ingress.yaml index 370e420b5..58769f811 100644 --- a/bitnami/phpbb/templates/networkpolicy-ingress.yaml +++ b/bitnami/phpbb/templates/networkpolicy-ingress.yaml @@ -3,6 +3,7 @@ apiVersion: {{ include "common.capabilities.networkPolicy.apiVersion" . }} kind: NetworkPolicy metadata: name: {{ printf "%s-ingress" (include "common.names.fullname" .) }} + namespace: {{ include "common.names.namespace" . | quote }} labels: {{- include "common.labels.standard" . | nindent 4 }} {{- if .Values.commonLabels }} {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} diff --git a/bitnami/phpbb/templates/phpbb-pvc.yaml b/bitnami/phpbb/templates/phpbb-pvc.yaml index 2a52889f3..ad6721a37 100644 --- a/bitnami/phpbb/templates/phpbb-pvc.yaml +++ b/bitnami/phpbb/templates/phpbb-pvc.yaml @@ -3,6 +3,7 @@ kind: PersistentVolumeClaim apiVersion: v1 metadata: name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} labels: {{- include "common.labels.standard" . | nindent 4 }} app.kubernetes.io/component: phpbb {{- if .Values.commonLabels }} diff --git a/bitnami/phpbb/templates/secrets.yaml b/bitnami/phpbb/templates/secrets.yaml index a74e15d2d..75a3a646f 100644 --- a/bitnami/phpbb/templates/secrets.yaml +++ b/bitnami/phpbb/templates/secrets.yaml @@ -3,6 +3,7 @@ apiVersion: v1 kind: Secret metadata: name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} labels: {{- include "common.labels.standard" . | nindent 4 }} app.kubernetes.io/component: phpbb {{- if .Values.commonLabels }} diff --git a/bitnami/phpbb/templates/svc.yaml b/bitnami/phpbb/templates/svc.yaml index 9a40f7f9c..38a2d8656 100644 --- a/bitnami/phpbb/templates/svc.yaml +++ b/bitnami/phpbb/templates/svc.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: Service metadata: name: {{ template "common.names.fullname" . }} - namespace: {{ .Release.Namespace | quote }} + namespace: {{ include "common.names.namespace" . | quote }} labels: {{- include "common.labels.standard" . | nindent 4 }} app.kubernetes.io/component: phpbb {{- if .Values.commonLabels }} diff --git a/bitnami/phpbb/templates/tls-secrets.yaml b/bitnami/phpbb/templates/tls-secrets.yaml index 059161846..8e8b62a9e 100644 --- a/bitnami/phpbb/templates/tls-secrets.yaml +++ b/bitnami/phpbb/templates/tls-secrets.yaml @@ -4,6 +4,7 @@ apiVersion: v1 kind: Secret metadata: name: {{ .name }} + namespace: {{ include "common.names.namespace" $ | quote }} labels: {{- include "common.labels.standard" $ | nindent 4 }} app.kubernetes.io/component: phpbb {{- if $.Values.commonLabels }} diff --git a/bitnami/phpbb/values.yaml b/bitnami/phpbb/values.yaml index acef05798..202306c33 100644 --- a/bitnami/phpbb/values.yaml +++ b/bitnami/phpbb/values.yaml @@ -27,6 +27,9 @@ nameOverride: "" ## @param fullnameOverride String to fully override common.names.fullname template ## fullnameOverride: "" +## @param namespaceOverride String to fully override common.names.namespace +## +namespaceOverride: "" ## @param commonAnnotations Common annotations to add to all phpBB resources (sub-charts are not considered). Evaluated as a template ## commonAnnotations: {}