Merge R3 into master

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

diff --git a/ric-common/Common-Template/helm/ric-common/templates/_helmtiller.tpl b/ric-common/Common-Template/helm/ric-common/templates/_tiller.tpl
similarity index 94%
rename from ric-common/Common-Template/helm/ric-common/templates/_helmtiller.tpl
rename to ric-common/Common-Template/helm/ric-common/templates/_tiller.tpl
index ce45577..d423c39 100644 (file)
--- a/ric-common/Common-Template/helm/ric-common/templates/_helmtiller.tpl
+++ b/ric-common/Common-Template/helm/ric-common/templates/_tiller.tpl
@@ -35,9 +35,9 @@
 
 {{- define "printer" -}}
   {{- $topctx := .ctx }}
-  {{- if hasKey $topctx.Values "global" }}
-    {{- if hasKey $topctx.Values.global "tillers" }}
-      {{- $ctx := index $topctx.Values.global.tillers .key -}}
+  {{- if hasKey $topctx.Values "common" }}
+    {{- if hasKey $topctx.Values.common "tillers" }}
+      {{- $ctx := index $topctx.Values.common.tillers .key -}}
       {{- if not (empty $ctx) -}}
         {{- $newctx := dict "ctx" $ctx "printkeys" .printkey -}}     
         {{- include "recursiveprinter" $newctx -}}
@@ -92,6 +92,7 @@
   {{- default false (include "printer" $newctx) -}}
 {{- end -}}
 
+
 {{- define "common.tillerHelmClientTLSSecret" -}}
   {{- $tlsverify := include "common.tillerTLSVerify" . }}
   {{- $tlsauthenticate := include "common.tillerTLSAuthenticate" . }}
@@ -105,8 +106,6 @@
 {{- end -}}
 
 
-
-
 {{- define "common.serviceaccountname.tiller" -}}
   {{- $name := ( include "common.tillerName" . ) -}}
   {{- printf "svcacct-tiller-%s" $name | trunc 63 | trimSuffix "-" -}}
@@ -122,9 +121,9 @@
 
 {{- define "common.servicename.tiller" -}}
   {{- $topctx := .ctx }}
-  {{- if hasKey $topctx.Values "global" }}
-    {{- if hasKey $topctx.Values.global "tillers" }}
-      {{- $ctx := index $topctx.Values.global.tillers .key -}}
+  {{- if hasKey $topctx.Values "common" }}
+    {{- if hasKey $topctx.Values.common "tillers" }}
+      {{- $ctx := index $topctx.Values.common.tillers .key -}}
       {{- if not (empty $ctx) -}}
         {{- if hasKey $ctx "name" -}}
           {{- $name := include "common.tillerName" . -}}