From dec26e5d0b982905dde2a55fdf2285a7781a64cc Mon Sep 17 00:00:00 2001 From: Carlos Rodriguez Hernandez Date: Thu, 11 Oct 2018 15:23:40 +0000 Subject: [PATCH] Check if global is set --- bitnami/apache/templates/_helpers.tpl | 9 +++++---- bitnami/consul/templates/_helpers.tpl | 9 +++++---- bitnami/elasticsearch/templates/_helpers.tpl | 9 +++++---- bitnami/etcd/templates/_helpers.tpl | 9 +++++---- bitnami/external-dns/templates/_helpers.tpl | 9 +++++---- bitnami/jenkins/templates/_helpers.tpl | 9 +++++---- bitnami/kafka/templates/_helpers.tpl | 9 +++++---- bitnami/mean/templates/_helpers.tpl | 9 +++++---- bitnami/memcached/templates/_helpers.tpl | 9 +++++---- bitnami/metrics-server/templates/_helpers.tpl | 9 +++++---- bitnami/mysql/templates/_helpers.tpl | 9 +++++---- .../templates/_helpers.tpl | 9 +++++---- bitnami/nginx/templates/_helpers.tpl | 9 +++++---- bitnami/node/templates/_helpers.tpl | 9 +++++---- bitnami/postgresql/templates/_helpers.tpl | 9 +++++---- .../templates/_helpers.tpl | 18 ++++++++++-------- bitnami/tomcat/templates/_helpers.tpl | 9 +++++---- bitnami/wildfly/templates/_helpers.tpl | 9 +++++---- bitnami/zookeeper/templates/_helpers.tpl | 9 +++++---- 19 files changed, 100 insertions(+), 80 deletions(-) diff --git a/bitnami/apache/templates/_helpers.tpl b/bitnami/apache/templates/_helpers.tpl index 81cbf6c2e7..ce7932bfc4 100644 --- a/bitnami/apache/templates/_helpers.tpl +++ b/bitnami/apache/templates/_helpers.tpl @@ -19,10 +19,11 @@ We truncate at 24 chars because some Kubernetes name fields are limited to this Return the proper Apache image name */}} {{- define "apache.image" -}} -{{- if .Values.global.registry -}} - {{- $registryName := .Values.global.registry -}} -{{- else -}} - {{- $registryName := .Values.image.registry -}} +{{- $registryName := .Values.image.registry -}} +{{- if .Values.global }} + {{- if .Values.global.regristry }} + {{- $registryName := .Values.global.registry -}} + {{- end -}} {{- end -}} {{- $repositoryName := .Values.image.repository -}} {{- $tag := .Values.image.tag | toString -}} diff --git a/bitnami/consul/templates/_helpers.tpl b/bitnami/consul/templates/_helpers.tpl index 3d4c35965a..68a3aa41c4 100644 --- a/bitnami/consul/templates/_helpers.tpl +++ b/bitnami/consul/templates/_helpers.tpl @@ -26,10 +26,11 @@ Create chart name and version as used by the chart label. Return the proper Consul image name */}} {{- define "consul.image" -}} -{{- if .Values.global.registry -}} - {{- $registryName := .Values.global.registry -}} -{{- else -}} - {{- $registryName := .Values.image.registry -}} +{{- $registryName := .Values.image.registry -}} +{{- if .Values.global }} + {{- if .Values.global.regristry }} + {{- $registryName := .Values.global.registry -}} + {{- end -}} {{- end -}} {{- $repositoryName := .Values.image.repository -}} {{- $tag := .Values.image.tag | toString -}} diff --git a/bitnami/elasticsearch/templates/_helpers.tpl b/bitnami/elasticsearch/templates/_helpers.tpl index 53fc04453f..6eb16a397d 100644 --- a/bitnami/elasticsearch/templates/_helpers.tpl +++ b/bitnami/elasticsearch/templates/_helpers.tpl @@ -26,10 +26,11 @@ Create chart name and version as used by the chart label. Return the proper ES image name */}} {{- define "elasticsearch.image" -}} -{{- if .Values.global.registry -}} - {{- $registryName := .Values.global.registry -}} -{{- else -}} - {{- $registryName := .Values.image.registry -}} +{{- $registryName := .Values.image.registry -}} +{{- if .Values.global }} + {{- if .Values.global.regristry }} + {{- $registryName := .Values.global.registry -}} + {{- end -}} {{- end -}} {{- $repositoryName := .Values.image.repository -}} {{- $tag := .Values.image.tag | toString -}} diff --git a/bitnami/etcd/templates/_helpers.tpl b/bitnami/etcd/templates/_helpers.tpl index db1336ee09..4d15b8f910 100644 --- a/bitnami/etcd/templates/_helpers.tpl +++ b/bitnami/etcd/templates/_helpers.tpl @@ -26,10 +26,11 @@ Create chart name and version as used by the chart label. Return the proper etcd image name */}} {{- define "etcd.image" -}} -{{- if .Values.global.registry -}} - {{- $registryName := .Values.global.registry -}} -{{- else -}} - {{- $registryName := .Values.image.registry -}} +{{- $registryName := .Values.image.registry -}} +{{- if .Values.global }} + {{- if .Values.global.regristry }} + {{- $registryName := .Values.global.registry -}} + {{- end -}} {{- end -}} {{- $repositoryName := .Values.image.repository -}} {{- $tag := .Values.image.tag | toString -}} diff --git a/bitnami/external-dns/templates/_helpers.tpl b/bitnami/external-dns/templates/_helpers.tpl index 703deb8191..3dcb76f445 100644 --- a/bitnami/external-dns/templates/_helpers.tpl +++ b/bitnami/external-dns/templates/_helpers.tpl @@ -26,10 +26,11 @@ Create chart name and version as used by the chart label. Return the proper external-dns image name */}} {{- define "external-dns.image" -}} -{{- if .Values.global.registry -}} - {{- $registryName := .Values.global.registry -}} -{{- else -}} - {{- $registryName := .Values.image.registry -}} +{{- $registryName := .Values.image.registry -}} +{{- if .Values.global }} + {{- if .Values.global.regristry }} + {{- $registryName := .Values.global.registry -}} + {{- end -}} {{- end -}} {{- $repositoryName := .Values.image.repository -}} {{- $tag := .Values.image.tag | toString -}} diff --git a/bitnami/jenkins/templates/_helpers.tpl b/bitnami/jenkins/templates/_helpers.tpl index 51541cefee..71c91ab6bc 100644 --- a/bitnami/jenkins/templates/_helpers.tpl +++ b/bitnami/jenkins/templates/_helpers.tpl @@ -19,10 +19,11 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this Return the proper Jenkins image name */}} {{- define "jenkins.image" -}} -{{- if .Values.global.registry -}} - {{- $registryName := .Values.global.registry -}} -{{- else -}} - {{- $registryName := .Values.image.registry -}} +{{- $registryName := .Values.image.registry -}} +{{- if .Values.global }} + {{- if .Values.global.regristry }} + {{- $registryName := .Values.global.registry -}} + {{- end -}} {{- end -}} {{- $repositoryName := .Values.image.repository -}} {{- $tag := .Values.image.tag | toString -}} diff --git a/bitnami/kafka/templates/_helpers.tpl b/bitnami/kafka/templates/_helpers.tpl index 502effb762..04d368f4fb 100644 --- a/bitnami/kafka/templates/_helpers.tpl +++ b/bitnami/kafka/templates/_helpers.tpl @@ -26,10 +26,11 @@ Create chart name and version as used by the chart label. Return the proper Kafka image name */}} {{- define "kafka.image" -}} -{{- if .Values.global.registry -}} - {{- $registryName := .Values.global.registry -}} -{{- else -}} - {{- $registryName := .Values.image.registry -}} +{{- $registryName := .Values.image.registry -}} +{{- if .Values.global }} + {{- if .Values.global.regristry }} + {{- $registryName := .Values.global.registry -}} + {{- end -}} {{- end -}} {{- $repositoryName := .Values.image.repository -}} {{- $tag := .Values.image.tag | toString -}} diff --git a/bitnami/mean/templates/_helpers.tpl b/bitnami/mean/templates/_helpers.tpl index 719dfd1695..db388dacf3 100644 --- a/bitnami/mean/templates/_helpers.tpl +++ b/bitnami/mean/templates/_helpers.tpl @@ -45,10 +45,11 @@ Custom template to get proper service name Return the proper MEAN image name */}} {{- define "mean.image" -}} -{{- if .Values.global.registry -}} - {{- $registryName := .Values.global.registry -}} -{{- else -}} - {{- $registryName := .Values.image.registry -}} +{{- $registryName := .Values.image.registry -}} +{{- if .Values.global }} + {{- if .Values.global.regristry }} + {{- $registryName := .Values.global.registry -}} + {{- end -}} {{- end -}} {{- $repositoryName := .Values.image.repository -}} {{- $tag := .Values.image.tag | toString -}} diff --git a/bitnami/memcached/templates/_helpers.tpl b/bitnami/memcached/templates/_helpers.tpl index 4776848464..b66ff363aa 100644 --- a/bitnami/memcached/templates/_helpers.tpl +++ b/bitnami/memcached/templates/_helpers.tpl @@ -19,10 +19,11 @@ We truncate at 24 chars because some Kubernetes name fields are limited to this Return the proper Memcached image name */}} {{- define "memcached.image" -}} -{{- if .Values.global.registry -}} - {{- $registryName := .Values.global.registry -}} -{{- else -}} - {{- $registryName := .Values.image.registry -}} +{{- $registryName := .Values.image.registry -}} +{{- if .Values.global }} + {{- if .Values.global.regristry }} + {{- $registryName := .Values.global.registry -}} + {{- end -}} {{- end -}} {{- $repositoryName := .Values.image.repository -}} {{- $tag := .Values.image.tag | toString -}} diff --git a/bitnami/metrics-server/templates/_helpers.tpl b/bitnami/metrics-server/templates/_helpers.tpl index 37a84124b6..55d2d9cf7b 100644 --- a/bitnami/metrics-server/templates/_helpers.tpl +++ b/bitnami/metrics-server/templates/_helpers.tpl @@ -37,10 +37,11 @@ Create the name of the service account to use Return the proper metrics-server image name */}} {{- define "metrics-server.image" -}} -{{- if .Values.global.registry -}} - {{- $registryName := .Values.global.registry -}} -{{- else -}} - {{- $registryName := .Values.image.registry -}} +{{- $registryName := .Values.image.registry -}} +{{- if .Values.global }} + {{- if .Values.global.regristry }} + {{- $registryName := .Values.global.registry -}} + {{- end -}} {{- end -}} {{- $repositoryName := .Values.image.repository -}} {{- $tag := .Values.image.tag | toString -}} diff --git a/bitnami/mysql/templates/_helpers.tpl b/bitnami/mysql/templates/_helpers.tpl index 618bffc9a0..412296d205 100644 --- a/bitnami/mysql/templates/_helpers.tpl +++ b/bitnami/mysql/templates/_helpers.tpl @@ -32,10 +32,11 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this Return the proper MySQL image name */}} {{- define "mysql.image" -}} -{{- if .Values.global.registry -}} - {{- $registryName := .Values.global.registry -}} -{{- else -}} - {{- $registryName := .Values.image.registry -}} +{{- $registryName := .Values.image.registry -}} +{{- if .Values.global }} + {{- if .Values.global.regristry }} + {{- $registryName := .Values.global.registry -}} + {{- end -}} {{- end -}} {{- $repositoryName := .Values.image.repository -}} {{- $tag := .Values.image.tag | toString -}} diff --git a/bitnami/nginx-ingress-controller/templates/_helpers.tpl b/bitnami/nginx-ingress-controller/templates/_helpers.tpl index 30d66568bb..784cbbf651 100644 --- a/bitnami/nginx-ingress-controller/templates/_helpers.tpl +++ b/bitnami/nginx-ingress-controller/templates/_helpers.tpl @@ -62,10 +62,11 @@ Create the name of the service account to use Return the proper nginx-ingress-controller image name */}} {{- define "nginx-ingress-controller.image" -}} -{{- if .Values.global.registry -}} - {{- $registryName := .Values.global.registry -}} -{{- else -}} - {{- $registryName := .Values.image.registry -}} +{{- $registryName := .Values.image.registry -}} +{{- if .Values.global }} + {{- if .Values.global.regristry }} + {{- $registryName := .Values.global.registry -}} + {{- end -}} {{- end -}} {{- $repositoryName := .Values.image.repository -}} {{- $tag := .Values.image.tag | toString -}} diff --git a/bitnami/nginx/templates/_helpers.tpl b/bitnami/nginx/templates/_helpers.tpl index 0b3af9a8bc..1b12ad19b5 100644 --- a/bitnami/nginx/templates/_helpers.tpl +++ b/bitnami/nginx/templates/_helpers.tpl @@ -19,10 +19,11 @@ We truncate at 24 chars because some Kubernetes name fields are limited to this Return the proper NGINX image name */}} {{- define "nginx.image" -}} -{{- if .Values.global.registry -}} - {{- $registryName := .Values.global.registry -}} -{{- else -}} - {{- $registryName := .Values.image.registry -}} +{{- $registryName := .Values.image.registry -}} +{{- if .Values.global }} + {{- if .Values.global.regristry }} + {{- $registryName := .Values.global.registry -}} + {{- end -}} {{- end -}} {{- $repositoryName := .Values.image.repository -}} {{- $tag := .Values.image.tag | toString -}} diff --git a/bitnami/node/templates/_helpers.tpl b/bitnami/node/templates/_helpers.tpl index f261053535..fb9d6dd978 100644 --- a/bitnami/node/templates/_helpers.tpl +++ b/bitnami/node/templates/_helpers.tpl @@ -45,10 +45,11 @@ Custom template to get proper service name Return the proper Node image name */}} {{- define "node.image" -}} -{{- if .Values.global.registry -}} - {{- $registryName := .Values.global.registry -}} -{{- else -}} - {{- $registryName := .Values.image.registry -}} +{{- $registryName := .Values.image.registry -}} +{{- if .Values.global }} + {{- if .Values.global.regristry }} + {{- $registryName := .Values.global.registry -}} + {{- end -}} {{- end -}} {{- $repositoryName := .Values.image.repository -}} {{- $tag := .Values.image.tag | toString -}} diff --git a/bitnami/postgresql/templates/_helpers.tpl b/bitnami/postgresql/templates/_helpers.tpl index 8eb6131cc9..502c5bfecd 100644 --- a/bitnami/postgresql/templates/_helpers.tpl +++ b/bitnami/postgresql/templates/_helpers.tpl @@ -39,10 +39,11 @@ Create chart name and version as used by the chart label. Return the proper PostgreSQL image name */}} {{- define "postgresql.image" -}} -{{- if .Values.global.registry -}} - {{- $registryName := .Values.global.registry -}} -{{- else -}} - {{- $registryName := .Values.image.registry -}} +{{- $registryName := .Values.image.registry -}} +{{- if .Values.global }} + {{- if .Values.global.regristry }} + {{- $registryName := .Values.global.registry -}} + {{- end -}} {{- end -}} {{- $repositoryName := .Values.image.repository -}} {{- $tag := .Values.image.tag | toString -}} diff --git a/bitnami/tensorflow-inception/templates/_helpers.tpl b/bitnami/tensorflow-inception/templates/_helpers.tpl index e38e19fdab..19a8cb8c69 100644 --- a/bitnami/tensorflow-inception/templates/_helpers.tpl +++ b/bitnami/tensorflow-inception/templates/_helpers.tpl @@ -19,10 +19,11 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this Return the proper tensorflow-inception server image name */}} {{- define "tensorflow-inception.server.image" -}} -{{- if .Values.global.registry -}} - {{- $registryName := .Values.global.registry -}} -{{- else -}} - {{- $registryName := .Values.server.image.registry -}} +{{- $registryName := .Values.server.image.registry -}} +{{- if .Values.global }} + {{- if .Values.global.regristry }} + {{- $registryName := .Values.global.registry -}} + {{- end -}} {{- end -}} {{- $repositoryName := .Values.server.image.repository -}} {{- $tag := .Values.server.image.tag | toString -}} @@ -33,10 +34,11 @@ Return the proper tensorflow-inception server image name Return the proper tensorflow-inception client image name */}} {{- define "tensorflow-inception.client.image" -}} -{{- if .Values.global.registry -}} - {{- $registryName := .Values.global.registry -}} -{{- else -}} - {{- $registryName := .Values.client.image.registry -}} +{{- $registryName := .Values.client.image.registry -}} +{{- if .Values.global }} + {{- if .Values.global.regristry }} + {{- $registryName := .Values.global.registry -}} + {{- end -}} {{- end -}} {{- $repositoryName := .Values.client.image.repository -}} {{- $tag := .Values.client.image.tag | toString -}} diff --git a/bitnami/tomcat/templates/_helpers.tpl b/bitnami/tomcat/templates/_helpers.tpl index c1efa55f07..8c91414e08 100644 --- a/bitnami/tomcat/templates/_helpers.tpl +++ b/bitnami/tomcat/templates/_helpers.tpl @@ -19,10 +19,11 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this Return the proper Tomcat image name */}} {{- define "tomcat.image" -}} -{{- if .Values.global.registry -}} - {{- $registryName := .Values.global.registry -}} -{{- else -}} - {{- $registryName := .Values.image.registry -}} +{{- $registryName := .Values.image.registry -}} +{{- if .Values.global }} + {{- if .Values.global.regristry }} + {{- $registryName := .Values.global.registry -}} + {{- end -}} {{- end -}} {{- $repositoryName := .Values.image.repository -}} {{- $tag := .Values.image.tag | toString -}} diff --git a/bitnami/wildfly/templates/_helpers.tpl b/bitnami/wildfly/templates/_helpers.tpl index c5ba0e44d1..65bb2e9212 100644 --- a/bitnami/wildfly/templates/_helpers.tpl +++ b/bitnami/wildfly/templates/_helpers.tpl @@ -19,10 +19,11 @@ We truncate at 24 chars because some Kubernetes name fields are limited to this Return the proper Wildfly image name */}} {{- define "wildfly.image" -}} -{{- if .Values.global.registry -}} - {{- $registryName := .Values.global.registry -}} -{{- else -}} - {{- $registryName := .Values.image.registry -}} +{{- $registryName := .Values.image.registry -}} +{{- if .Values.global }} + {{- if .Values.global.regristry }} + {{- $registryName := .Values.global.registry -}} + {{- end -}} {{- end -}} {{- $repositoryName := .Values.image.repository -}} {{- $tag := .Values.image.tag | toString -}} diff --git a/bitnami/zookeeper/templates/_helpers.tpl b/bitnami/zookeeper/templates/_helpers.tpl index ef5b3298c7..b2765c6d5b 100644 --- a/bitnami/zookeeper/templates/_helpers.tpl +++ b/bitnami/zookeeper/templates/_helpers.tpl @@ -26,10 +26,11 @@ Create chart name and version as used by the chart label. Return the proper Zookeeper image name */}} {{- define "zookeeper.image" -}} -{{- if .Values.global.registry -}} - {{- $registryName := .Values.global.registry -}} -{{- else -}} - {{- $registryName := .Values.image.registry -}} +{{- $registryName := .Values.image.registry -}} +{{- if .Values.global }} + {{- if .Values.global.regristry }} + {{- $registryName := .Values.global.registry -}} + {{- end -}} {{- end -}} {{- $repositoryName := .Values.image.repository -}} {{- $tag := .Values.image.tag | toString -}}