Remove default namespace

Former-commit-id: a43e08259dba1682b8151af87ae6f9eb2e8ec5e4 [formerly a43e08259dba1682b8151af87ae6f9eb2e8ec5e4 [formerly c6cd5bc]] Former-commit-id: 34228b870f1f9b75f6aad1a44339334637cd0543 Former-commit-id: 196cb26
linkernetworks · Jul 16, 2018 · cb49f29 · cb49f29
1 parent 619d222
commit cb49f29
Show file tree

Hide file tree

Showing 17 changed files with 13 additions and 76 deletions.
diff --git a/src/kubernetes/deployment.go b/src/kubernetes/deployment.go
@@ -7,23 +7,14 @@ import (
 
 //Get the external IP address of node
 func (kc *KubeCtl) CreateDeployment(deployment *appsv1.Deployment, namespace string) (*appsv1.Deployment, error) {
-	if namespace == "" {
-		namespace = kc.Namespace
-	}
 	return kc.Clientset.AppsV1().Deployments(namespace).Create(deployment)
 }
 
 func (kc *KubeCtl) GetDeployment(name string, namespace string) (*appsv1.Deployment, error) {
-	if namespace == "" {
-		namespace = kc.Namespace
-	}
 	return kc.Clientset.AppsV1().Deployments(namespace).Get(name, metav1.GetOptions{})
 }
 
 func (kc *KubeCtl) GetDeployments(namespace string) ([]*appsv1.Deployment, error) {
-	if namespace == "" {
-		namespace = kc.Namespace
-	}
 	deployments := []*appsv1.Deployment{}
 	deploymentsList, err := kc.Clientset.AppsV1().Deployments(namespace).List(metav1.ListOptions{})
 	if err != nil {
@@ -36,8 +27,5 @@ func (kc *KubeCtl) GetDeployments(namespace string) ([]*appsv1.Deployment, error
 }
 
 func (kc *KubeCtl) DeleteDeployment(name string, namespace string) error {
-	if namespace == "" {
-		namespace = kc.Namespace
-	}
 	return kc.Clientset.AppsV1().Deployments(namespace).Delete(name, &metav1.DeleteOptions{})
 }
diff --git a/src/kubernetes/deployment_test.go b/src/kubernetes/deployment_test.go
@@ -24,9 +24,8 @@ func init() {
 }
 
 func (suite *KubeCtlDeploymentTestSuite) SetupSuite() {
-	namespace := "default"
 	suite.fakeclient = fakeclientset.NewSimpleClientset()
-	suite.kubectl = New(suite.fakeclient, namespace)
+	suite.kubectl = New(suite.fakeclient)
 }
 
 func (suite *KubeCtlDeploymentTestSuite) TearDownSuite() {}

diff --git a/src/kubernetes/kubectl.go b/src/kubernetes/kubectl.go
@@ -10,17 +10,15 @@ import (
 */
 type KubeCtl struct {
 	Clientset kubernetes.Interface
-	Namespace string
 }
 
 /*
 	The API to New a kubectl object and you need to pass two parameters
 	1. The kubernetes clientset object from the client-go library. You can also use the fake-client for testing
 	2. The namespace of the kubernetes you want to manipulate
 */
-func New(clientset kubernetes.Interface, namespace string) *KubeCtl {
+func New(clientset kubernetes.Interface) *KubeCtl {
 	return &KubeCtl{
 		Clientset: clientset,
-		Namespace: namespace,
 	}
 }
diff --git a/src/kubernetes/kubectl_test.go b/src/kubernetes/kubectl_test.go
@@ -10,8 +10,6 @@ import (
 
 func TestNewKubeCtl(t *testing.T) {
 	clientset := fakeclientset.NewSimpleClientset()
-	namespace := "default"
-	kubectl := New(clientset, namespace)
-	assert.Equal(t, namespace, kubectl.Namespace)
+	kubectl := New(clientset)
 	assert.NotNil(t, kubectl)
 }
diff --git a/src/kubernetes/nodes_test.go b/src/kubernetes/nodes_test.go
@@ -18,8 +18,7 @@ type KubeCtlNodeTestSuite struct {
 
 func (suite *KubeCtlNodeTestSuite) SetupSuite() {
 	suite.fakeclient = fakeclientset.NewSimpleClientset()
-	namespace := "default"
-	suite.kubectl = New(suite.fakeclient, namespace)
+	suite.kubectl = New(suite.fakeclient)
 }
 
 func (suite *KubeCtlNodeTestSuite) TestGetNode() {

diff --git a/src/kubernetes/pods.go b/src/kubernetes/pods.go
@@ -7,17 +7,11 @@ import (
 
 //Get the pod object by the pod name
 func (kc *KubeCtl) GetPod(name string, namespace string) (*corev1.Pod, error) {
-	if namespace == "" {
-		namespace = kc.Namespace
-	}
 	return kc.Clientset.CoreV1().Pods(namespace).Get(name, metav1.GetOptions{})
 }
 
 //Get all pods from the k8s cluster
 func (kc *KubeCtl) GetPods(namespace string) ([]*corev1.Pod, error) {
-	if namespace == "" {
-		namespace = kc.Namespace
-	}
 	pods := []*corev1.Pod{}
 	podsList, err := kc.Clientset.CoreV1().Pods(namespace).List(metav1.ListOptions{})
 	if err != nil {
@@ -31,17 +25,11 @@ func (kc *KubeCtl) GetPods(namespace string) ([]*corev1.Pod, error) {
 
 //Create the pod by the pod object
 func (kc *KubeCtl) CreatePod(pod *corev1.Pod, namespace string) (*corev1.Pod, error) {
-	if namespace == "" {
-		namespace = kc.Namespace
-	}
 	return kc.Clientset.CoreV1().Pods(namespace).Create(pod)
 }
 
 //Delete the pod by the pod name
 func (kc *KubeCtl) DeletePod(name string, namespace string) error {
-	if namespace == "" {
-		namespace = kc.Namespace
-	}
 	options := metav1.DeleteOptions{}
 	return kc.Clientset.CoreV1().Pods(namespace).Delete(name, &options)
 }

diff --git a/src/kubernetes/pods_test.go b/src/kubernetes/pods_test.go
@@ -24,9 +24,8 @@ type KubeCtlPodTestSuite struct {
 }
 
 func (suite *KubeCtlPodTestSuite) SetupSuite() {
-	namespace := "default"
 	suite.fakeclient = fakeclientset.NewSimpleClientset()
-	suite.kubectl = New(suite.fakeclient, namespace)
+	suite.kubectl = New(suite.fakeclient)
 }
 
 func (suite *KubeCtlPodTestSuite) TestGetPod() {

diff --git a/src/kubernetes/pvc.go b/src/kubernetes/pvc.go
@@ -7,17 +7,11 @@ import (
 
 //Get the PVC object by the PVC name
 func (kc *KubeCtl) GetPVC(name string, namespace string) (*corev1.PersistentVolumeClaim, error) {
-	if namespace == "" {
-		namespace = kc.Namespace
-	}
 	return kc.Clientset.CoreV1().PersistentVolumeClaims(namespace).Get(name, metav1.GetOptions{})
 }
 
 //Get all PVCs from the k8s cluster
 func (kc *KubeCtl) GetPVCs(namespace string) ([]*corev1.PersistentVolumeClaim, error) {
-	if namespace == "" {
-		namespace = kc.Namespace
-	}
 	pvcs := []*corev1.PersistentVolumeClaim{}
 	pvcsList, err := kc.Clientset.CoreV1().PersistentVolumeClaims(namespace).List(metav1.ListOptions{})
 	if err != nil {
@@ -31,17 +25,11 @@ func (kc *KubeCtl) GetPVCs(namespace string) ([]*corev1.PersistentVolumeClaim, e
 
 //Create the PVC by the PVC object
 func (kc *KubeCtl) CreatePVC(pvc *corev1.PersistentVolumeClaim, namespace string) (*corev1.PersistentVolumeClaim, error) {
-	if namespace == "" {
-		namespace = kc.Namespace
-	}
 	return kc.Clientset.CoreV1().PersistentVolumeClaims(namespace).Create(pvc)
 }
 
 //Delete the PVC by the PVC name
 func (kc *KubeCtl) DeletePVC(name string, namespace string) error {
-	if namespace == "" {
-		namespace = kc.Namespace
-	}
 	options := metav1.DeleteOptions{}
 	return kc.Clientset.CoreV1().PersistentVolumeClaims(namespace).Delete(name, &options)
 }
diff --git a/src/kubernetes/pvc_test.go b/src/kubernetes/pvc_test.go
@@ -17,9 +17,8 @@ type KubeCtlPVCTestSuite struct {
 }
 
 func (suite *KubeCtlPVCTestSuite) SetupSuite() {
-	namespace := "default"
 	suite.fakeclient = fakeclientset.NewSimpleClientset()
-	suite.kubectl = New(suite.fakeclient, namespace)
+	suite.kubectl = New(suite.fakeclient)
 }
 
 func (suite *KubeCtlPVCTestSuite) TestGetPVC() {

diff --git a/src/kubernetes/services.go b/src/kubernetes/services.go
@@ -7,17 +7,11 @@ import (
 
 //Get the service object by the service name
 func (kc *KubeCtl) GetService(name string, namespace string) (*corev1.Service, error) {
-	if namespace == "" {
-		namespace = kc.Namespace
-	}
 	return kc.Clientset.CoreV1().Services(namespace).Get(name, metav1.GetOptions{})
 }
 
 //Get all services from the k8s cluster
 func (kc *KubeCtl) GetServices(namespace string) ([]*corev1.Service, error) {
-	if namespace == "" {
-		namespace = kc.Namespace
-	}
 	services := []*corev1.Service{}
 	servicesList, err := kc.Clientset.CoreV1().Services(namespace).List(metav1.ListOptions{})
 	if err != nil {
@@ -31,17 +25,11 @@ func (kc *KubeCtl) GetServices(namespace string) ([]*corev1.Service, error) {
 
 //Create the service by the service object
 func (kc *KubeCtl) CreateService(service *corev1.Service, namespace string) (*corev1.Service, error) {
-	if namespace == "" {
-		namespace = kc.Namespace
-	}
 	return kc.Clientset.CoreV1().Services(namespace).Create(service)
 }
 
 //Delete the service by the service name
 func (kc *KubeCtl) DeleteService(name string, namespace string) error {
-	if namespace == "" {
-		namespace = kc.Namespace
-	}
 	options := metav1.DeleteOptions{}
 	return kc.Clientset.CoreV1().Services(namespace).Delete(name, &options)
 }
diff --git a/src/kubernetes/services_test.go b/src/kubernetes/services_test.go
@@ -17,9 +17,8 @@ type KubeCtlServiceTestSuite struct {
 }
 
 func (suite *KubeCtlServiceTestSuite) SetupSuite() {
-	namespace := "default"
 	suite.fakeclient = fakeclientset.NewSimpleClientset()
-	suite.kubectl = New(suite.fakeclient, namespace)
+	suite.kubectl = New(suite.fakeclient)
 }
 
 func (suite *KubeCtlServiceTestSuite) TestGetService() {

diff --git a/src/kubernetes/storageclass_test.go b/src/kubernetes/storageclass_test.go
@@ -25,8 +25,7 @@ func init() {
 
 func (suite *KubeCtlStorageClassTestSuite) SetupSuite() {
 	suite.fakeclient = fakeclientset.NewSimpleClientset()
-	namespace := "default"
-	suite.kubectl = New(suite.fakeclient, namespace)
+	suite.kubectl = New(suite.fakeclient)
 }
 
 func (suite *KubeCtlStorageClassTestSuite) TearDownSuite() {}

diff --git a/src/networkcontroller/network_controller_test.go b/src/networkcontroller/network_controller_test.go
@@ -45,8 +45,7 @@ type NetworkControllerTestSuite struct {
 func (suite *NetworkControllerTestSuite) SetupSuite() {
 	// init fakeclient
 	fakeclient := fakeclientset.NewSimpleClientset()
-	namespace := "default"
-	suite.kubectl = kubernetes.New(fakeclient, namespace)
+	suite.kubectl = kubernetes.New(fakeclient)
 
 	//Create a fake clinet
 	//Init

diff --git a/src/networkprovider/ovs_netdev_test.go b/src/networkprovider/ovs_netdev_test.go
@@ -40,8 +40,7 @@ func (suite *OVSNetdevNetworkTestSuite) SetupSuite() {
 
 	// init fakeclient
 	fakeclient := fakeclientset.NewSimpleClientset()
-	namespace := "default"
-	suite.sp.KubeCtl = kc.New(fakeclient, namespace)
+	suite.sp.KubeCtl = kc.New(fakeclient)
 
 	// Create a fake clinet
 	// Initial nodes

diff --git a/src/networkprovider/ovs_system_test.go b/src/networkprovider/ovs_system_test.go
@@ -49,8 +49,7 @@ func (suite *OVSSystemNetworkTestSuite) SetupSuite() {
 
 	// init fakeclient
 	fakeclient := fakeclientset.NewSimpleClientset()
-	namespace := "default"
-	suite.sp.KubeCtl = kc.New(fakeclient, namespace)
+	suite.sp.KubeCtl = kc.New(fakeclient)
 
 	// Create a fake clinet
 	// Initial nodes

diff --git a/src/prometheuscontroller/expression.go b/src/prometheuscontroller/expression.go
@@ -207,7 +207,6 @@ 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, container.Detail.Namespace)
 	if err != nil {
 		return entity.ContainerMetrics{}, err
@@ -261,7 +260,6 @@ func GetService(sp *serviceprovider.Container, id string) (entity.ServiceMetrics
 	}
 
 	kc := sp.KubeCtl
-	kc.Namespace = service.Namespace
 	object, err := kc.GetService(service.ServiceName, service.Namespace)
 	if err != nil {
 		return entity.ServiceMetrics{}, err

diff --git a/src/serviceprovider/serviceprovider.go b/src/serviceprovider/serviceprovider.go
@@ -64,7 +64,7 @@ func New(cf config.Config) *Container {
 		Redis:      redisService,
 		Mongo:      mongo,
 		Prometheus: prometheus,
-		KubeCtl:    kubeCtl.New(clientset, "default"),
+		KubeCtl:    kubeCtl.New(clientset),
 		Validator:  validator.New(),
 	}
 
@@ -91,7 +91,7 @@ func NewForTesting(cf config.Config) *Container {
 		Redis:      redisService,
 		Mongo:      mongo,
 		Prometheus: prometheus,
-		KubeCtl:    kubeCtl.New(clientset, "default"),
+		KubeCtl:    kubeCtl.New(clientset),
 		Validator:  validator.New(),
 	}