From 5f983fa7e2d2510c2f3b0961f60fdfd0749af356 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Rodr=C3=ADguez=20Hern=C3=A1ndez?= Date: Tue, 16 Oct 2018 11:26:35 +0200 Subject: [PATCH] [stable/jasperreports] Add global registry option (#8466) * [stable/jasperreports] Add global registry option Signed-off-by: Carlos Rodriguez Hernandez * Update deps Signed-off-by: Carlos Rodriguez Hernandez --- stable/jasperreports/Chart.yaml | 2 +- stable/jasperreports/README.md | 1 + stable/jasperreports/requirements.lock | 4 ++-- stable/jasperreports/templates/_helpers.tpl | 23 +++++++++++++++++++ .../jasperreports/templates/deployment.yaml | 2 +- stable/jasperreports/values.yaml | 8 +++++++ 6 files changed, 36 insertions(+), 4 deletions(-) diff --git a/stable/jasperreports/Chart.yaml b/stable/jasperreports/Chart.yaml index 4ba784b24c..c1cf00d9dc 100644 --- a/stable/jasperreports/Chart.yaml +++ b/stable/jasperreports/Chart.yaml @@ -1,5 +1,5 @@ name: jasperreports -version: 3.0.3 +version: 3.1.0 appVersion: 7.1.0 description: The JasperReports server can be used as a stand-alone or embedded reporting and BI server that offers web-based reporting, analytic tools and visualization, diff --git a/stable/jasperreports/README.md b/stable/jasperreports/README.md index 42aac6131a..bde3363601 100644 --- a/stable/jasperreports/README.md +++ b/stable/jasperreports/README.md @@ -49,6 +49,7 @@ The following table lists the configurable parameters of the JasperReports chart | Parameter | Description | Default | |-------------------------------|----------------------------------------------|----------------------------------------------------------| +| `global.imageRegistry` | Global Docker image registry | `nil` | | `image.registry` | JasperReports image registry | `docker.io` | | `image.repository` | JasperReports Image name | `bitnami/jasperreports` | | `image.tag` | JasperReports Image tag | `{VERSION}` | diff --git a/stable/jasperreports/requirements.lock b/stable/jasperreports/requirements.lock index 2b5c4a4ebd..69f8a38081 100644 --- a/stable/jasperreports/requirements.lock +++ b/stable/jasperreports/requirements.lock @@ -1,6 +1,6 @@ dependencies: - name: mariadb repository: https://kubernetes-charts.storage.googleapis.com/ - version: 5.0.4 + version: 5.2.0 digest: sha256:0593b73b2163fbbbae061de1aa2b8280d43f8a423a91e1c7375c0b6c86784b1c -generated: 2018-09-25T11:30:38.012477426+02:00 +generated: 2018-10-16T08:48:01.960359+02:00 diff --git a/stable/jasperreports/templates/_helpers.tpl b/stable/jasperreports/templates/_helpers.tpl index faadb6d8d5..f6f27cda94 100644 --- a/stable/jasperreports/templates/_helpers.tpl +++ b/stable/jasperreports/templates/_helpers.tpl @@ -22,3 +22,26 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this {{- define "jasperreports.mariadb.fullname" -}} {{- printf "%s-%s" .Release.Name "mariadb" | trunc 63 | trimSuffix "-" -}} {{- end -}} + +{{/* +Return the proper Jasper Reports image name +*/}} +{{- define "jasperreports.image" -}} +{{- $registryName := .Values.image.registry -}} +{{- $repositoryName := .Values.image.repository -}} +{{- $tag := .Values.image.tag | toString -}} +{{/* +Helm 2.11 supports the assignment of a value to a variable defined in a different scope, +but Helm 2.9 and 2.10 doesn't support it, so we need to implement this if-else logic. +Also, we can't use a single if because lazy evaluation is not an option +*/}} +{{- if .Values.global }} + {{- if .Values.global.imageRegistry }} + {{- printf "%s/%s:%s" .Values.global.imageRegistry $repositoryName $tag -}} + {{- else -}} + {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}} + {{- end -}} +{{- else -}} + {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}} +{{- end -}} +{{- end -}} diff --git a/stable/jasperreports/templates/deployment.yaml b/stable/jasperreports/templates/deployment.yaml index d4ca76283d..b75d5df399 100644 --- a/stable/jasperreports/templates/deployment.yaml +++ b/stable/jasperreports/templates/deployment.yaml @@ -27,7 +27,7 @@ spec: {{- end }} containers: - name: {{ template "jasperreports.fullname" . }} - image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag }}" + image: {{ template "jasperreports.image" . }} imagePullPolicy: {{ .Values.image.pullPolicy | quote }} env: - name: ALLOW_EMPTY_PASSWORD diff --git a/stable/jasperreports/values.yaml b/stable/jasperreports/values.yaml index 55f1b25de5..724777798b 100644 --- a/stable/jasperreports/values.yaml +++ b/stable/jasperreports/values.yaml @@ -1,3 +1,9 @@ +## Global Docker image registry +## Please, note that this will override the image registry for all the images, including dependencies, configured to use the global value +## +# global: +# imageRegistry: + ## Bitnami JasperReports image version ## ref: https://hub.docker.com/r/bitnami/dokuwiki/tags/ ## @@ -70,6 +76,8 @@ externalDatabase: ## ## MariaDB chart configuration ## +## https://github.com/helm/charts/blob/master/stable/mariadb/values.yaml +## mariadb: ## Whether to deploy a mariadb server to satisfy the applications database requirements. To use an external database set this to false and configure the externalDatabase parameters enabled: true