Merge pull request #120 from richardxz/master

change kubectl pods' namespace from kubesphere to kubesphere-controls，and ensure delete kubectl-rs when user is deleted
2018-06-26 16:32:54 +08:00
parent d41f26f92c 7dc16a532a
commit 54fbbe4a49
5 changed files with 29 additions and 11 deletions
--- a/pkg/models/controllers/namespaces.go
+++ b/pkg/models/controllers/namespaces.go
@@ -34,6 +34,7 @@ import (
 	"k8s.io/client-go/tools/cache"

 	"kubesphere.io/kubesphere/pkg/client"
+	"kubesphere.io/kubesphere/pkg/constants"
 	"kubesphere.io/kubesphere/pkg/options"
 )

@@ -42,7 +43,7 @@ const (
 	admin              = "admin"
 	editor             = "editor"
 	viewer             = "viewer"
-	kubectlNamespace   = "kubesphere"
+	kubectlNamespace   = constants.KubeSphereControlNameSpace
 	kubectlConfigKey   = "config"
 	openpitrix_runtime = "openpitrix_runtime"
 )