IMPLEMENTS: RICPLT-1144: Support multiple Tillers

[it/dep.git] / ric-common / Common-Template / helm / ric-common / templates / _helmrepo.tpl

diff --git a/ric-common/Common-Template/helm/ric-common/templates/_helmrepo.tpl b/ric-common/Common-Template/helm/ric-common/templates/_helmrepo.tpl
index c662cf5..6d28d22 100644 (file)
--- a/ric-common/Common-Template/helm/ric-common/templates/_helmrepo.tpl
+++ b/ric-common/Common-Template/helm/ric-common/templates/_helmrepo.tpl
@@ -91,82 +91,6 @@
 {{- end -}}
 
 
-{{/*
-  Resolve the helm repository tiller service name.
-  The tiller should be installed by K8S system admin.
-  The value for .Values.helmRepositoryTiller is used by default,
-  unless either override mechanism is used.
-
-  - .Values.global.helmrepositoryTiller  : override default helm repository tiller
-  - .Values.helmRepositoryTillerOverride : override global and default helm repository tiller
-*/}}
-{{- define "common.helmrepositorytiller" -}}
-  {{- if .Values.helmRepositoryTillerOverride -}}
-    {{- printf "%s" .Values.helmRepositoryTillerOverride -}}
-  {{- else -}}
-    {{- if  .Values.global -}}
-      {{- if .Values.global.helmRepositoryTiller -}}
-        {{- printf "%s" .Values.global.helmRepositoryTiller -}}
-      {{- else -}}
-        {{- printf "%s" .Values.helmRepositoryTiller -}}
-      {{- end -}}
-    {{- else -}}
-      {{- printf "%s" .Values.helmRepositoryTiller -}}
-    {{- end -}}
-  {{- end -}}
-{{- end -}}
-
-
-{{/*
-  Resolve the helm repository tiller service namespace.
-  The tiller should be installed by K8S system admin.
-  The value for .Values.helmRepositoryTillerNamespace is used by default,
-  unless either override mechanism is used.
-
-  - .Values.global.helmrepositoryTillerNamespace  : override default helm repository tiller namespace
-  - .Values.helmRepositoryTillerNamespaceOverride : override global and default helm repository tiller namespace
-*/}}
-{{- define "common.helmrepositorytillernamespace" -}}
-  {{- if .Values.helmRepositoryTillerNamespaceOverride -}}
-    {{- printf "%s" .Values.helmRepositoryTillerNamespaceOverride -}}
-  {{- else -}}
-    {{- if  .Values.global -}}
-      {{- if .Values.global.helmRepositoryTillerNamespace -}}
-        {{- printf "%s" .Values.global.helmRepositoryTillerNamespace -}}
-      {{- else -}}
-        {{- printf "%s" .Values.helmRepositoryTillerNamespace -}}
-      {{- end -}}
-    {{- else -}}
-      {{- printf "%s" .Values.helmRepositoryTillerNamespace -}}
-    {{- end -}}
-  {{- end -}}
-{{- end -}}
-
-
-{{/*
-  Resolve the helm repository tiller service port.
-  The tiller should be installed by K8S system admin.
-  The value for .Values.helmRepositoryTillerPort is used by default,
-  unless either override mechanism is used.
-
-  - .Values.global.helmrepositoryTillerPort  : override default helm repository tiller port
-  - .Values.helmRepositoryTillerPortOverride : override global and default helm repository tiller port
-*/}}
-{{- define "common.helmrepositorytillerport" -}}
-  {{- if .Values.helmRepositoryTillerPortOverride -}}
-    {{- printf "%.0f" .Values.helmRepositoryTillerPortOverride -}}
-  {{- else -}}
-    {{- if  .Values.global -}}
-      {{- if .Values.global.helmRepositoryTillerPort -}}
-        {{- printf "%.0f" .Values.global.helmRepositoryTillerPort -}}
-      {{- else -}}
-        {{- printf "%.0f" .Values.helmRepositoryTillerPort -}}
-      {{- end -}}
-    {{- else -}}
-      {{- printf "%.0f" .Values.helmRepositoryTillerPort -}}
-    {{- end -}}
-  {{- end -}}
-{{- end -}}
 
 {{/*
 Generate certificates for the helm repo