diff --git a/stable/joomla/Chart.yaml b/stable/joomla/Chart.yaml index 9eba60cf27..ddb88f907b 100644 --- a/stable/joomla/Chart.yaml +++ b/stable/joomla/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: joomla -version: 4.3.6 +version: 4.3.7 appVersion: 3.9.9 description: PHP content management system (CMS) for publishing web content keywords: diff --git a/stable/joomla/README.md b/stable/joomla/README.md index ca05604724..424c283eae 100644 --- a/stable/joomla/README.md +++ b/stable/joomla/README.md @@ -56,6 +56,8 @@ The following table lists the configurable parameters of the Joomla! chart and t | `image.tag` | Joomla! Image tag | `{TAG_NAME}` | | `image.pullPolicy` | Image pull policy | `Always` | | `image.pullSecrets` | Specify docker-registry secret names as an array | `[]` (does not add image pull secrets to deployed pods) | +| `nameOverride` | String to partially override joomla.fullname template with a string (will prepend the release name) | `nil` | +| `fullnameOverride` | String to fully override joomla.fullname template with a string | `nil` | | `joomlaUsername` | User of the application | `user` | | `joomlaPassword` | Application password | _random 10 character long alphanumeric string_ | | `joomlaEmail` | Admin email | `user@example.com` | diff --git a/stable/joomla/templates/_helpers.tpl b/stable/joomla/templates/_helpers.tpl index 9862ea7029..d81e51cd63 100644 --- a/stable/joomla/templates/_helpers.tpl +++ b/stable/joomla/templates/_helpers.tpl @@ -11,9 +11,17 @@ Create a default fully qualified app name. We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). */}} {{- define "joomla.fullname" -}} +{{- if .Values.fullnameOverride -}} +{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}} +{{- else -}} {{- $name := default .Chart.Name .Values.nameOverride -}} +{{- if contains $name .Release.Name -}} +{{- .Release.Name | trunc 63 | trimSuffix "-" -}} +{{- else -}} {{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} {{- end -}} +{{- end -}} +{{- end -}} {{/* Create chart name and version as used by the chart label. diff --git a/stable/joomla/values.yaml b/stable/joomla/values.yaml index f6e493516f..eef09990de 100644 --- a/stable/joomla/values.yaml +++ b/stable/joomla/values.yaml @@ -26,6 +26,14 @@ image: # pullSecrets: # - myRegistryKeySecretName +## String to partially override joomla.fullname template (will maintain the release name) +## +# nameOverride: + +## String to fully override joomla.fullname template +## +# fullnameOverride: + ## User of the application ## ref: https://github.com/bitnami/bitnami-docker-joomla#environment-variables ##