Automatic merge from release/2.0.0 -> release/2.1.0

* commit 'db6e4d63a2611f90759521287ecc3fb5a82839d9':
  climc: kube cluster, node and service resource rename

pkg/mcclient/modules/k8s/cluster.go

@@ -9,7 +9,7 @@ var (
 )
 
 func init() {
-	Clusters = NewManager("cluster", "clusters",
+	Clusters = NewManager("kube_cluster", "kube_clusters",
 		NewResourceCols("mode", "k8s_version", "status", "api_endpoint"),
 		NewColumns())
 	modules.Register(Clusters)

pkg/mcclient/modules/k8s/node.go

@@ -9,6 +9,6 @@ var (
 )
 
 func init() {
-	Nodes = NewManager("node", "nodes", NewResourceCols("cluster", "roles", "address", "status"), NewColumns())
+	Nodes = NewManager("kube_node", "kube_nodes", NewResourceCols("cluster", "roles", "address", "status"), NewColumns())
 	modules.Register(Nodes)
 }

pkg/mcclient/modules/k8s/service.go

@@ -13,7 +13,7 @@ type ServiceManager struct {
 func init() {
 	Services = &ServiceManager{
 		ResourceManager: *NewManager(
-			"service", "services",
+			"k8s_service", "k8s_services",
 			NewNamespaceCols("clusterIP", "selector", "internalEndpoint", "externalEndpoints"),
 			NewClusterCols())}
 	modules.Register(Services)