Remove set namespace

linkernetworks · Jul 16, 2018 · a791c5d · a791c5d
1 parent 720c014
commit a791c5d
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 13 deletions.
diff --git a/src/kubernetes/kubectl.go b/src/kubernetes/kubectl.go
@@ -24,7 +24,3 @@ func New(clientset kubernetes.Interface, namespace string) *KubeCtl {
 		Namespace: namespace,
 	}
 }
-
-func (kc *KubeCtl) SetNamespace(namespace string) {
-	kc.Namespace = namespace
-}
diff --git a/src/kubernetes/kubectl_test.go b/src/kubernetes/kubectl_test.go
@@ -14,6 +14,4 @@ func TestNewKubeCtl(t *testing.T) {
 	kubectl := New(clientset, namespace)
 	assert.Equal(t, namespace, kubectl.Namespace)
 	assert.NotNil(t, kubectl)
-	// Change struct namespace field value
-	kubectl.SetNamespace("test")
 }
diff --git a/src/prometheuscontroller/expression.go b/src/prometheuscontroller/expression.go
@@ -208,7 +208,7 @@ func GetContainer(sp *serviceprovider.Container, id string) (entity.ContainerMet
 	// command
 	kc := sp.KubeCtl
 	kc.Namespace = container.Detail.Namespace
-	pod, err := kc.GetPod(container.Detail.Pod, "default")
+	pod, err := kc.GetPod(container.Detail.Pod, container.Detail.Namespace)
 	if err != nil {
 		return entity.ContainerMetrics{}, err
 	}
@@ -262,7 +262,7 @@ func GetService(sp *serviceprovider.Container, id string) (entity.ServiceMetrics
 
 	kc := sp.KubeCtl
 	kc.Namespace = service.Namespace
-	object, err := kc.GetService(service.ServiceName, "default")
+	object, err := kc.GetService(service.ServiceName, service.Namespace)
 	if err != nil {
 		return entity.ServiceMetrics{}, err
 	}

diff --git a/src/prometheuscontroller/expression_test.go b/src/prometheuscontroller/expression_test.go
@@ -24,7 +24,6 @@ type PrometheusExpressionTestSuite struct {
 func (suite *PrometheusExpressionTestSuite) SetupSuite() {
 	cf := config.MustRead("../../config/local.json")
 	suite.sp = serviceprovider.New(cf)
-	suite.sp.KubeCtl.SetNamespace("monitoring")
 }
 
 func (suite *PrometheusExpressionTestSuite) TearDownSuite() {
@@ -69,7 +68,7 @@ func (suite *PrometheusExpressionTestSuite) TestListNodeNICs() {
 }
 
 func (suite *PrometheusExpressionTestSuite) TestGetPod() {
-	namespace := "default"
+	namespace := "monitoring"
 	pods, err := suite.sp.KubeCtl.GetPods(namespace)
 	suite.NoError(err)
 	podName := pods[0].GetName()
@@ -80,7 +79,7 @@ func (suite *PrometheusExpressionTestSuite) TestGetPod() {
 }
 
 func (suite *PrometheusExpressionTestSuite) TestGetContainer() {
-	namespace := "default"
+	namespace := "monitoring"
 	pods, err := suite.sp.KubeCtl.GetPods(namespace)
 	suite.NoError(err)
 	containerName := pods[0].Status.ContainerStatuses[0].Name
@@ -91,7 +90,7 @@ func (suite *PrometheusExpressionTestSuite) TestGetContainer() {
 }
 
 func (suite *PrometheusExpressionTestSuite) TestGetService() {
-	namespace := "default"
+	namespace := "monitoring"
 	services, err := suite.sp.KubeCtl.GetServices(namespace)
 	suite.NoError(err)
 	serviceName := services[0].GetName()
@@ -102,7 +101,7 @@ func (suite *PrometheusExpressionTestSuite) TestGetService() {
 }
 
 func (suite *PrometheusExpressionTestSuite) TestGetController() {
-	namespace := "default"
+	namespace := "monitoring"
 	deployments, err := suite.sp.KubeCtl.GetDeployments(namespace)
 	suite.NoError(err)
 	deploymentName := deployments[0].GetName()