Merge branch 'master' into master

2019-03-30 19:01:03 +08:00
parent 250933de73 5392478077
commit 1a56abed77
29 changed files with 2105 additions and 568 deletions
--- a/pkg/simple/client/k8s/k8sclient.go
+++ b/pkg/simple/client/k8s/k8sclient.go
@@ -34,12 +34,12 @@ var (
 	k8sClient      *kubernetes.Clientset
 	k8sClientOnce  sync.Once
 	KubeConfig     *rest.Config
-	masterURL       string
+	masterURL      string
 )

 func init() {
 	flag.StringVar(&kubeConfigFile, "kubeconfig", "", "path to kubeconfig file")
-	flag.StringVar(&masterURL, "master-url","", "kube-apiserver url, only needed when out of cluster")
+	flag.StringVar(&masterURL, "master-url", "", "kube-apiserver url, only needed when out of cluster")
 }

 func Client() *kubernetes.Clientset {