github/deprecated-helm-charts
1
0
Fork 0
mirror of https://github.com/helm/charts.git synced 2026-08-23 22:37:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

[stable/jasperreports] Add global 'imagePullSecrets' to overwrite any other existing one (#12094)

Browse Source 
* [stable/jasperreports] Add global 'imagePullSecrets' to overwrite any other existing one

Signed-off-by: Carlos Rodriguez Hernandez <crhernandez@bitnami.com>

* Fix typo and add var to the README

Signed-off-by: Carlos Rodriguez Hernandez <crhernandez@bitnami.com>

* Fix typo in helpers

Signed-off-by: Carlos Rodriguez Hernandez <crhernandez@bitnami.com>

* Remove unnecessary metrics conditions

Signed-off-by: Carlos Rodriguez Hernandez <crhernandez@bitnami.com>
This commit is contained in:
Carlos Rodríguez Hernández
2019-03-12 02:18:50 -07:00
committed by Kubernetes Prow Robot
parent b0d6e670ff
commit c6610bcb49
5 changed files with 39 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stable/jasperreports/Chart.yaml
+1 -1
View File
@@ -1,6 +1,6 @@
apiVersion: v1
name: jasperreports
version: 4.0.4
version: 4.1.0
appVersion: 7.1.1
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,
stable/jasperreports/README.md
+1
View File
@@ -50,6 +50,7 @@ The following table lists the configurable parameters of the JasperReports chart
| Parameter | Description | Default |
|-------------------------------|----------------------------------------------|----------------------------------------------------------|
| `global.imageRegistry` | Global Docker image registry | `nil` |
| `global.imagePullSecrets` | Global Docker registry secret names as an array | `[]` (does not add image pull secrets to deployed pods) |
| `image.registry` | JasperReports image registry | `docker.io` |
| `image.repository` | JasperReports Image name | `bitnami/jasperreports` |
| `image.tag` | JasperReports Image tag | `{VERSION}` |
stable/jasperreports/templates/_helpers.tpl
+29
View File
@@ -52,3 +52,32 @@ Also, we can't use a single if because lazy evaluation is not an option
{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
{{- end -}}
{{- end -}}
{{/*
Return the proper Docker Image Registry Secret Names
*/}}
{{- define "jasperreports.imagePullSecrets" -}}
{{/*
Helm 2.11 supports the assignment of a value to a variable defined in a different scope,
but Helm 2.9 and 2.10 does not support it, so we need to implement this if-else logic.
Also, we can not use a single if because lazy evaluation is not an option
*/}}
{{- if .Values.global }}
{{- if .Values.global.imagePullSecrets }}
imagePullSecrets:
{{- range .Values.global.imagePullSecrets }}
- name: {{ . }}
{{- end }}
{{- else if .Values.image.pullSecrets }}
imagePullSecrets:
{{- range .Values.image.pullSecrets }}
- name: {{ . }}
{{- end }}
{{- end -}}
{{- else if .Values.image.pullSecrets }}
imagePullSecrets:
{{- range .Values.image.pullSecrets }}
- name: {{ . }}
{{- end }}
{{- end -}}
{{- end -}}
stable/jasperreports/templates/deployment.yaml
+1 -6
View File
@@ -19,12 +19,7 @@ spec:
chart: "{{ template "jasperreports.chart" . }}"
release: {{ .Release.Name | quote }}
spec:
{{- if .Values.image.pullSecrets }}
imagePullSecrets:
{{- range .Values.image.pullSecrets }}
- name: {{ . }}
{{- end}}
{{- end }}
{{- include "jasperreports.imagePullSecrets" . | indent 6 }}
containers:
- name: {{ template "jasperreports.fullname" . }}
image: {{ template "jasperreports.image" . }}
stable/jasperreports/values.yaml
+7 -4
View File
@@ -1,8 +1,11 @@
## 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 Docker image parameters
## Please, note that this will override the image parameters, including dependencies, configured to use the global value
## Current available global Docker image parameters: imageRegistry and imagePullSecrets
##
# global:
# imageRegistry:
# imageRegistry: myRegistryName
# imagePullSecrets:
# - myRegistryKeySecretName
## Bitnami JasperReports image version
## ref: https://hub.docker.com/r/bitnami/dokuwiki/tags/
@@ -21,7 +24,7 @@ image:
## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
##
# pullSecrets:
# - myRegistrKeySecretName
# - myRegistryKeySecretName
## User of the application
## ref: https://github.com/bitnami/bitnami-docker-jasperreports#configuration