Added flag -tiller-namespace and environment TILLER_NAMESPACE (#1)

Added flag -tiller-namespace and environment TILLER_NAMESPACE
sstarcher · Jan 3, 2019 · 4aff6cf · 4aff6cf
1 parent 8df51d9
commit 4aff6cf
Show file tree

Hide file tree

Showing 7 changed files with 171 additions and 2 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/main.go b/main.go
@@ -3,11 +3,13 @@ package main
 import (
 	"fmt"
 	"time"
-
+	"flag"
 	"net/http"
 
 	"k8s.io/helm/pkg/helm"
 
+	"github.com/facebookgo/flagenv"
+
 	"k8s.io/helm/pkg/proto/hapi/release"
 
 	"github.com/prometheus/client_golang/prometheus"
@@ -28,7 +30,9 @@ var (
 
 	client = NewClient()
 
-	inClusterTiller = "tiller-deploy.kube-system:44134"
+	tillerNamespace = flag.String("tiller-namespace", "kube-system", "namespace of Tiller (default \"kube-system\")")
+
+	inClusterTiller = fmt.Sprintf("tiller-deploy.%s:44134", *tillerNamespace)
 	localTiller     = "127.0.0.1:44134"
 	statusCodes     = []release.Status_Code{
 		release.Status_UNKNOWN,
@@ -104,6 +108,8 @@ func helmStats() {
 }
 
 func main() {
+	flagenv.Parse()
+	flag.Parse()
 	go func() {
 		for {
 			helmStats()

diff --git a/vendor/github.com/facebookgo/flagenv/.travis.yml b/vendor/github.com/facebookgo/flagenv/.travis.yml
diff --git a/vendor/github.com/facebookgo/flagenv/README.md b/vendor/github.com/facebookgo/flagenv/README.md
diff --git a/vendor/github.com/facebookgo/flagenv/flagenv.go b/vendor/github.com/facebookgo/flagenv/flagenv.go
diff --git a/vendor/github.com/facebookgo/flagenv/license b/vendor/github.com/facebookgo/flagenv/license
diff --git a/vendor/github.com/facebookgo/flagenv/patents b/vendor/github.com/facebookgo/flagenv/patents