diff --git a/bitnami/joomla/Chart.yaml b/bitnami/joomla/Chart.yaml index c5ad830f0..cde9a3fb7 100644 --- a/bitnami/joomla/Chart.yaml +++ b/bitnami/joomla/Chart.yaml @@ -27,4 +27,4 @@ name: joomla sources: - https://github.com/bitnami/bitnami-docker-joomla - https://www.joomla.org/ -version: 13.0.2 +version: 13.1.0 diff --git a/bitnami/joomla/README.md b/bitnami/joomla/README.md index ccb57e8c2..eee4731fb 100644 --- a/bitnami/joomla/README.md +++ b/bitnami/joomla/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,93 +70,96 @@ 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 Harbor resources (sub-charts are not considered). Evaluated as a template | `{}` | | `commonLabels` | Common labels to add to all Harbor resources (sub-charts are not considered). Evaluated as a template | `{}` | | `extraDeploy` | Array of extra objects to deploy with the release (evaluated as a template). | `[]` | + ### Joomla! parameters -| Name | Description | Value | -| --------------------------------------- | -------------------------------------------------------------------------------------------------------------------- | --------------------- | -| `image.registry` | Joomla! image registry | `docker.io` | -| `image.repository` | Joomla! Image name | `bitnami/joomla` | -| `image.tag` | Joomla! Image tag | `4.0.5-debian-10-r22` | -| `image.pullPolicy` | Joomla! image pull policy | `IfNotPresent` | -| `image.pullSecrets` | Specify docker-registry secret names as an array | `[]` | -| `image.debug` | Specify if debug logs should be enabled | `false` | -| `joomlaSkipInstall` | Skip Joomla! installation wizard. Useful for migrations and restoring from SQL dump | `no` | -| `joomlaUsername` | User of the application | `user` | -| `joomlaPassword` | Application password | `""` | -| `joomlaEmail` | Admin email | `user@example.com` | -| `allowEmptyPassword` | Allow DB blank passwords | `no` | -| `command` | Override default container command (useful when using custom images) | `[]` | -| `args` | Override default container args (useful when using custom images) | `[]` | -| `replicaCount` | Number of replicas (requires ReadWriteMany PVC support) | `1` | -| `hostAliases` | Deployment pod host aliases | `[]` | -| `updateStrategy.type` | Update strategy - only really applicable for deployments with RWO PVs attached | `RollingUpdate` | -| `extraEnvVars` | Extra environment variables | `[]` | -| `extraEnvVarsCM` | ConfigMap containing extra env vars | `""` | -| `extraEnvVarsSecret` | Secret containing extra env vars (in case of sensitive data) | `""` | -| `extraVolumes` | Array of extra volumes to be added to the deployment (evaluated as template). Requires setting `extraVolumeMounts` | `[]` | -| `extraVolumeMounts` | Array of extra volume mounts to be added to the container (evaluated as template). Normally used with `extraVolumes` | `[]` | -| `initContainers` | Add additional init containers to the pod (evaluated as a template) | `[]` | -| `sidecars` | Attach additional containers to the pod (evaluated as a template) | `[]` | -| `existingSecret` | Name of a secret with the application password | `""` | -| `smtpHost` | SMTP host | `""` | -| `smtpPort` | SMTP port | `""` | -| `smtpUser` | SMTP user | `""` | -| `smtpPassword` | SMTP password | `""` | -| `smtpProtocol` | SMTP Protocol (options: ssl,tls, nil) | `""` | -| `containerPorts` | Container ports | `{}` | -| `persistence.enabled` | Enable persistence using PVC | `true` | -| `persistence.storageClass` | PVC Storage Class for Joomla! volume | `""` | -| `persistence.accessModes` | PVC Access Mode for Joomla! volume | `["ReadWriteOnce"]` | -| `persistence.size` | PVC Storage Request for Joomla! volume | `8Gi` | -| `persistence.existingClaim` | An Existing PVC name | `""` | -| `persistence.hostPath` | Host mount path for Joomla! volume | `""` | -| `persistence.annotations` | Persistent Volume Claim annotations | `{}` | -| `podAffinityPreset` | Pod affinity preset. Ignored if `affinity` is set. Allowed values: `soft` or `hard` | `""` | -| `podAntiAffinityPreset` | Pod anti-affinity preset. Ignored if `affinity` is set. Allowed values: `soft` or `hard` | `soft` | -| `nodeAffinityPreset.type` | Node affinity preset type. Ignored if `affinity` is set. Allowed values: `soft` or `hard` | `""` | -| `nodeAffinityPreset.key` | Node label key to match Ignored if `affinity` is set. | `""` | -| `nodeAffinityPreset.values` | Node label values to match. Ignored if `affinity` is set. | `[]` | -| `affinity` | Affinity for pod assignment | `{}` | -| `nodeSelector` | Node labels for pod assignment | `{}` | -| `tolerations` | Tolerations for pod assignment | `[]` | -| `resources.limits` | The resources limits for the container | `{}` | -| `resources.requests` | The requested resources for the container | `{}` | -| `podSecurityContext.enabled` | Enable Joomla! pods' Security Context | `true` | -| `podSecurityContext.fsGroup` | Joomla! pods' group ID | `1001` | -| `containerSecurityContext.enabled` | Enable Joomla! containers' Security Context | `true` | -| `containerSecurityContext.runAsUser` | Joomla! containers' Security Context | `1001` | -| `containerSecurityContext.runAsNonRoot` | Set Joomla! container's Security Context runAsNonRoot | `true` | -| `startupProbe.enabled` | Enable startupProbe | `false` | -| `startupProbe.initialDelaySeconds` | Initial delay seconds for startupProbe | `600` | -| `startupProbe.periodSeconds` | Period seconds for startupProbe | `10` | -| `startupProbe.timeoutSeconds` | Timeout seconds for startupProbe | `5` | -| `startupProbe.failureThreshold` | Failure threshold for startupProbe | `6` | -| `startupProbe.successThreshold` | Success threshold for startupProbe | `1` | -| `livenessProbe.enabled` | Enable livenessProbe | `true` | -| `livenessProbe.initialDelaySeconds` | Initial delay seconds for livenessProbe | `600` | -| `livenessProbe.periodSeconds` | Period seconds for livenessProbe | `10` | -| `livenessProbe.timeoutSeconds` | Timeout seconds for livenessProbe | `5` | -| `livenessProbe.failureThreshold` | Failure threshold for livenessProbe | `6` | -| `livenessProbe.successThreshold` | Success threshold for livenessProbe | `1` | -| `readinessProbe.enabled` | Enable readinessProbe | `true` | -| `readinessProbe.initialDelaySeconds` | Initial delay seconds for readinessProbe | `30` | -| `readinessProbe.periodSeconds` | Period seconds for readinessProbe | `5` | -| `readinessProbe.timeoutSeconds` | Timeout seconds for readinessProbe | `3` | -| `readinessProbe.failureThreshold` | Failure threshold for readinessProbe | `6` | -| `readinessProbe.successThreshold` | Success threshold for readinessProbe | `1` | -| `customStartupProbe` | Override default startup probe | `{}` | -| `customLivenessProbe` | Override default liveness probe | `{}` | -| `customReadinessProbe` | Override default readiness probe | `{}` | -| `priorityClassName` | Define the priority class name to use for the joomla pods here. | `""` | -| `schedulerName` | Name of the k8s scheduler (other than default) | `""` | -| `topologySpreadConstraints` | Topology Spread Constraints for pod assignment | `[]` | -| `lifecycleHooks` | LifecycleHook to set additional configuration at startup Evaluated as a template | `{}` | -| `podAnnotations` | Pod annotations | `{}` | -| `podLabels` | Add additional labels to the pod (evaluated as a template) | `{}` | +| Name | Description | Value | +| --------------------------------------- | -------------------------------------------------------------------------------------------------------------------- | -------------------- | +| `image.registry` | Joomla! image registry | `docker.io` | +| `image.repository` | Joomla! Image name | `bitnami/joomla` | +| `image.tag` | Joomla! Image tag | `4.1.3-debian-10-r0` | +| `image.pullPolicy` | Joomla! image pull policy | `IfNotPresent` | +| `image.pullSecrets` | Specify docker-registry secret names as an array | `[]` | +| `image.debug` | Specify if debug logs should be enabled | `false` | +| `joomlaSkipInstall` | Skip Joomla! installation wizard. Useful for migrations and restoring from SQL dump | `no` | +| `joomlaUsername` | User of the application | `user` | +| `joomlaPassword` | Application password | `""` | +| `joomlaEmail` | Admin email | `user@example.com` | +| `allowEmptyPassword` | Allow DB blank passwords | `no` | +| `command` | Override default container command (useful when using custom images) | `[]` | +| `args` | Override default container args (useful when using custom images) | `[]` | +| `replicaCount` | Number of replicas (requires ReadWriteMany PVC support) | `1` | +| `hostAliases` | Deployment pod host aliases | `[]` | +| `updateStrategy.type` | Update strategy - only really applicable for deployments with RWO PVs attached | `RollingUpdate` | +| `extraEnvVars` | Extra environment variables | `[]` | +| `extraEnvVarsCM` | ConfigMap containing extra env vars | `""` | +| `extraEnvVarsSecret` | Secret containing extra env vars (in case of sensitive data) | `""` | +| `extraVolumes` | Array of extra volumes to be added to the deployment (evaluated as template). Requires setting `extraVolumeMounts` | `[]` | +| `extraVolumeMounts` | Array of extra volume mounts to be added to the container (evaluated as template). Normally used with `extraVolumes` | `[]` | +| `initContainers` | Add additional init containers to the pod (evaluated as a template) | `[]` | +| `sidecars` | Attach additional containers to the pod (evaluated as a template) | `[]` | +| `existingSecret` | Name of a secret with the application password | `""` | +| `smtpHost` | SMTP host | `""` | +| `smtpPort` | SMTP port | `""` | +| `smtpUser` | SMTP user | `""` | +| `smtpPassword` | SMTP password | `""` | +| `smtpProtocol` | SMTP Protocol (options: ssl,tls, nil) | `""` | +| `containerPorts` | Container ports | `{}` | +| `persistence.enabled` | Enable persistence using PVC | `true` | +| `persistence.storageClass` | PVC Storage Class for Joomla! volume | `""` | +| `persistence.accessModes` | PVC Access Mode for Joomla! volume | `["ReadWriteOnce"]` | +| `persistence.size` | PVC Storage Request for Joomla! volume | `8Gi` | +| `persistence.existingClaim` | An Existing PVC name | `""` | +| `persistence.hostPath` | Host mount path for Joomla! volume | `""` | +| `persistence.annotations` | Persistent Volume Claim annotations | `{}` | +| `podAffinityPreset` | Pod affinity preset. Ignored if `affinity` is set. Allowed values: `soft` or `hard` | `""` | +| `podAntiAffinityPreset` | Pod anti-affinity preset. Ignored if `affinity` is set. Allowed values: `soft` or `hard` | `soft` | +| `nodeAffinityPreset.type` | Node affinity preset type. Ignored if `affinity` is set. Allowed values: `soft` or `hard` | `""` | +| `nodeAffinityPreset.key` | Node label key to match Ignored if `affinity` is set. | `""` | +| `nodeAffinityPreset.values` | Node label values to match. Ignored if `affinity` is set. | `[]` | +| `affinity` | Affinity for pod assignment | `{}` | +| `nodeSelector` | Node labels for pod assignment | `{}` | +| `tolerations` | Tolerations for pod assignment | `[]` | +| `resources.limits` | The resources limits for the container | `{}` | +| `resources.requests` | The requested resources for the container | `{}` | +| `podSecurityContext.enabled` | Enable Joomla! pods' Security Context | `true` | +| `podSecurityContext.fsGroup` | Joomla! pods' group ID | `1001` | +| `containerSecurityContext.enabled` | Enable Joomla! containers' Security Context | `true` | +| `containerSecurityContext.runAsUser` | Joomla! containers' Security Context | `1001` | +| `containerSecurityContext.runAsNonRoot` | Set Joomla! container's Security Context runAsNonRoot | `true` | +| `startupProbe.enabled` | Enable startupProbe | `false` | +| `startupProbe.initialDelaySeconds` | Initial delay seconds for startupProbe | `600` | +| `startupProbe.periodSeconds` | Period seconds for startupProbe | `10` | +| `startupProbe.timeoutSeconds` | Timeout seconds for startupProbe | `5` | +| `startupProbe.failureThreshold` | Failure threshold for startupProbe | `6` | +| `startupProbe.successThreshold` | Success threshold for startupProbe | `1` | +| `livenessProbe.enabled` | Enable livenessProbe | `true` | +| `livenessProbe.initialDelaySeconds` | Initial delay seconds for livenessProbe | `600` | +| `livenessProbe.periodSeconds` | Period seconds for livenessProbe | `10` | +| `livenessProbe.timeoutSeconds` | Timeout seconds for livenessProbe | `5` | +| `livenessProbe.failureThreshold` | Failure threshold for livenessProbe | `6` | +| `livenessProbe.successThreshold` | Success threshold for livenessProbe | `1` | +| `readinessProbe.enabled` | Enable readinessProbe | `true` | +| `readinessProbe.initialDelaySeconds` | Initial delay seconds for readinessProbe | `30` | +| `readinessProbe.periodSeconds` | Period seconds for readinessProbe | `5` | +| `readinessProbe.timeoutSeconds` | Timeout seconds for readinessProbe | `3` | +| `readinessProbe.failureThreshold` | Failure threshold for readinessProbe | `6` | +| `readinessProbe.successThreshold` | Success threshold for readinessProbe | `1` | +| `customStartupProbe` | Override default startup probe | `{}` | +| `customLivenessProbe` | Override default liveness probe | `{}` | +| `customReadinessProbe` | Override default readiness probe | `{}` | +| `priorityClassName` | Define the priority class name to use for the joomla pods here. | `""` | +| `schedulerName` | Name of the k8s scheduler (other than default) | `""` | +| `topologySpreadConstraints` | Topology Spread Constraints for pod assignment | `[]` | +| `lifecycleHooks` | LifecycleHook to set additional configuration at startup Evaluated as a template | `{}` | +| `podAnnotations` | Pod annotations | `{}` | +| `podLabels` | Add additional labels to the pod (evaluated as a template) | `{}` | + ### Traffic Exposure Parameters @@ -187,6 +191,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 | @@ -210,6 +215,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_joomla` | + ### Metrics parameters | Name | Description | Value | @@ -217,12 +223,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 name | `bitnami/apache-exporter` | -| `metrics.image.tag` | Apache exporter image tag | `0.11.0-debian-10-r18` | +| `metrics.image.tag` | Apache exporter image tag | `0.11.0-debian-10-r141` | | `metrics.image.pullPolicy` | Image pull policy | `IfNotPresent` | | `metrics.image.pullSecrets` | Specify docker-registry secret names as an array | `[]` | | `metrics.resources` | Exporter resource requests/limit | `{}` | | `metrics.podAnnotations` | Additional annotations for Metrics exporter pod | `{}` | + ### NetworkPolicy parameters | Name | Description | Value | @@ -243,6 +250,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/joomla](https://github.com/bitnami/bitnami-docker-joomla). For more information please refer to the [bitnami/joomla](https://github.com/bitnami/bitnami-docker-joomla) image documentation. Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example, diff --git a/bitnami/joomla/templates/deployment.yaml b/bitnami/joomla/templates/deployment.yaml index 358af8d04..25dcfc87e 100644 --- a/bitnami/joomla/templates/deployment.yaml +++ b/bitnami/joomla/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: joomla {{- if .Values.commonLabels }} diff --git a/bitnami/joomla/templates/externaldb-secrets.yaml b/bitnami/joomla/templates/externaldb-secrets.yaml index bad8569a0..33f7ee535 100644 --- a/bitnami/joomla/templates/externaldb-secrets.yaml +++ b/bitnami/joomla/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: joomla {{- if .Values.commonLabels }} diff --git a/bitnami/joomla/templates/ingress.yaml b/bitnami/joomla/templates/ingress.yaml index c2996f044..e86ef34df 100644 --- a/bitnami/joomla/templates/ingress.yaml +++ b/bitnami/joomla/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: joomla {{- if .Values.commonLabels }} diff --git a/bitnami/joomla/templates/joomla-pvc.yaml b/bitnami/joomla/templates/joomla-pvc.yaml index c98c37130..cd2dbc3f8 100644 --- a/bitnami/joomla/templates/joomla-pvc.yaml +++ b/bitnami/joomla/templates/joomla-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: joomla {{- if .Values.commonLabels }} diff --git a/bitnami/joomla/templates/networkpolicy-backend-ingress.yaml b/bitnami/joomla/templates/networkpolicy-backend-ingress.yaml index 99ce711da..30f70bdda 100644 --- a/bitnami/joomla/templates/networkpolicy-backend-ingress.yaml +++ b/bitnami/joomla/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/joomla/templates/networkpolicy-egress.yaml b/bitnami/joomla/templates/networkpolicy-egress.yaml index d8b8242da..6a20f6bcc 100644 --- a/bitnami/joomla/templates/networkpolicy-egress.yaml +++ b/bitnami/joomla/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/joomla/templates/networkpolicy-ingress.yaml b/bitnami/joomla/templates/networkpolicy-ingress.yaml index 370e420b5..58769f811 100644 --- a/bitnami/joomla/templates/networkpolicy-ingress.yaml +++ b/bitnami/joomla/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/joomla/templates/secrets.yaml b/bitnami/joomla/templates/secrets.yaml index a63178f1f..0fbf0eeab 100644 --- a/bitnami/joomla/templates/secrets.yaml +++ b/bitnami/joomla/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: joomla {{- if .Values.commonLabels }} diff --git a/bitnami/joomla/templates/svc.yaml b/bitnami/joomla/templates/svc.yaml index 6cd9b1558..145150149 100644 --- a/bitnami/joomla/templates/svc.yaml +++ b/bitnami/joomla/templates/svc.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: Service metadata: name: {{ include "common.names.fullname" . }} - namespace: {{ .Release.Namespace | quote }} + namespace: {{ include "common.names.namespace" . | quote }} labels: {{- include "common.labels.standard" . | nindent 4 }} app.kubernetes.io/component: joomla {{- if .Values.commonLabels }} diff --git a/bitnami/joomla/templates/tls-secrets.yaml b/bitnami/joomla/templates/tls-secrets.yaml index 5175b2d72..d27854f92 100644 --- a/bitnami/joomla/templates/tls-secrets.yaml +++ b/bitnami/joomla/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: joomla {{- if $.Values.commonLabels }} diff --git a/bitnami/joomla/values.yaml b/bitnami/joomla/values.yaml index d60d5ca89..8e8ec7a66 100644 --- a/bitnami/joomla/values.yaml +++ b/bitnami/joomla/values.yaml @@ -29,6 +29,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 Harbor resources (sub-charts are not considered). Evaluated as a template ## commonAnnotations: {}