Merge pull request #408 from keel-hq/feature/tiller_address_env

Feature/tiller address env

chart/keel/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 name: keel
 description: Open source, tool for automating Kubernetes deployment updates. Keel is stateless, robust and lightweight.
-version: 0.8.9
+version: 0.8.10
 # Note that we use appVersion to get images tag, so make sure this is correct.
 appVersion: 0.14.3-rc1
 keywords:

chart/keel/templates/deployment.yaml

@@ -65,6 +65,8 @@ spec:
               value: "1"
             - name: TILLER_NAMESPACE
               value: "{{ .Values.helmProvider.tillerNamespace }}"
+            - name: TILLER_ADDRESS
+              value: "{{ .Values.helmProvider.tillerAddress }}"
 {{- end }}
 {{- if .Values.gcr.enabled }}
             # Enable GCR with pub/sub support

chart/keel/values.yaml

@@ -19,6 +19,10 @@ polling:
 helmProvider:
   enabled: true
   tillerNamespace: "kube-system"
+  # optional Tiller address (if portforwarder tunnel doesn't work),
+  # if you are using default configuration, setting it to
+  # 'tiller-deploy.tiller.svc.cluster.local:44134' is usually fine
+  tillerAddress: ''
 
 # Google Container Registry
 # GCP Project ID

cmd/keel/main.go

@@ -303,24 +303,28 @@ func setupProviders(opts *ProviderOpts) (providers provider.Providers) {
 
 	if os.Getenv(EnvHelmProvider) == "1" || os.Getenv(EnvHelmProvider) == "true" {
 
+		var tillerAddr string
+
 		if os.Getenv(EnvHelmTillerAddress) != "" {
-			log.Warnf("Environment variable %s is deprecated, use %s environment variable to set tiller's namespace (defaults to 'kube-system')", EnvHelmTillerAddress, EnvHelmTillerNamespace)
+			tillerAddr = os.Getenv(EnvHelmTillerAddress)
+			log.Infof("Tiller address specified: %s", tillerAddr)
+		} else {
+			tillerNamespace := "kube-system"
+			if os.Getenv(EnvHelmTillerNamespace) != "" {
+				tillerNamespace = os.Getenv(EnvHelmTillerNamespace)
+			}
+
+			tillerTunnel, err := portforwarder.New(tillerNamespace, opts.k8sClient, opts.config)
+			if err != nil {
+				log.WithFields(log.Fields{
+					"error": err,
+				}).Fatal("failed to setup Tiller tunnel")
+			}
+
+			tillerAddr = fmt.Sprintf("127.0.0.1:%d", tillerTunnel.Local)
+			log.Infof("created local tunnel using local port: '%d'", tillerTunnel.Local)
 		}
 
-		tillerNamespace := "kube-system"
-		if os.Getenv(EnvHelmTillerNamespace) != "" {
-			tillerNamespace = os.Getenv(EnvHelmTillerNamespace)
-		}
-
-		tillerTunnel, err := portforwarder.New(tillerNamespace, opts.k8sClient, opts.config)
-		if err != nil {
-			log.WithFields(log.Fields{
-				"error": err,
-			}).Fatal("failed to setup Tiller tunnel")
-		}
-
-		tillerAddr := fmt.Sprintf("127.0.0.1:%d", tillerTunnel.Local)
-		log.Infof("created local tunnel using local port: '%d'", tillerTunnel.Local)
 		helmImplementer := helm.NewHelmImplementer(tillerAddr)
 		helmProvider := helm.NewProvider(helmImplementer, opts.sender, opts.approvalsManager)