Merge pull request #78 from linkernetworks/alex/removeServiceNamespace

Use kubectl namespace for service Former-commit-id: d10e222420c9ff55325c40e79e269571ccf6f420 [formerly d10e222420c9ff55325c40e79e269571ccf6f420 [formerly e28bf30]] Former-commit-id: 7d0f25843b8485a5700c9c8e930e6480b5b1022e Former-commit-id: fa0a5dc
linkernetworks · Jul 10, 2018 · 8da8290 · 8da8290
2 parents db13fe7 + 12a53ba
commit 8da8290
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 15 deletions.
diff --git a/src/kubernetes/services.go b/src/kubernetes/services.go
@@ -6,14 +6,14 @@ import (
 )
 
 //Get the service object by the service name
-func (kc *KubeCtl) GetService(name string, namespace string) (*corev1.Service, error) {
-	return kc.Clientset.CoreV1().Services(namespace).Get(name, metav1.GetOptions{})
+func (kc *KubeCtl) GetService(name string) (*corev1.Service, error) {
+	return kc.Clientset.CoreV1().Services(kc.Namespace).Get(name, metav1.GetOptions{})
 }
 
 //Get all services from the k8s cluster
-func (kc *KubeCtl) GetServices(namespace string) ([]*corev1.Service, error) {
+func (kc *KubeCtl) GetServices() ([]*corev1.Service, error) {
 	services := []*corev1.Service{}
-	servicesList, err := kc.Clientset.CoreV1().Services(namespace).List(metav1.ListOptions{})
+	servicesList, err := kc.Clientset.CoreV1().Services(kc.Namespace).List(metav1.ListOptions{})
 	if err != nil {
 		return services, err
 	}
@@ -24,12 +24,12 @@ 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) {
-	return kc.Clientset.CoreV1().Services(namespace).Create(service)
+func (kc *KubeCtl) CreateService(service *corev1.Service) (*corev1.Service, error) {
+	return kc.Clientset.CoreV1().Services(kc.Namespace).Create(service)
 }
 
 //Delete the service by the service name
-func (kc *KubeCtl) DeleteService(name string, namespace string) error {
+func (kc *KubeCtl) DeleteService(name string) error {
 	options := metav1.DeleteOptions{}
-	return kc.Clientset.CoreV1().Services(namespace).Delete(name, &options)
+	return kc.Clientset.CoreV1().Services(kc.Namespace).Delete(name, &options)
 }
diff --git a/src/kubernetes/services_test.go b/src/kubernetes/services_test.go
@@ -32,14 +32,13 @@ func (suite *KubeCtlServiceTestSuite) TestGetService() {
 	_, err := suite.fakeclient.CoreV1().Services(namespace).Create(&service)
 	suite.NoError(err)
 
-	result, err := suite.kubectl.GetService("K8S-Service-1", namespace)
+	result, err := suite.kubectl.GetService("K8S-Service-1")
 	suite.NoError(err)
 	suite.Equal(service.GetName(), result.GetName())
 }
 
 func (suite *KubeCtlServiceTestSuite) TestGetServiceFail() {
-	namespace := "Unknown_Namespace"
-	_, err := suite.kubectl.GetService("Unknown_Name", namespace)
+	_, err := suite.kubectl.GetService("Unknown_Name")
 	suite.Error(err)
 }
 
@@ -61,21 +60,20 @@ func (suite *KubeCtlServiceTestSuite) TestGetServices() {
 	_, err = suite.fakeclient.CoreV1().Services(namespace).Create(&service)
 	suite.NoError(err)
 
-	services, err := suite.kubectl.GetServices(namespace)
+	services, err := suite.kubectl.GetServices()
 	suite.NoError(err)
 	suite.NotEqual(0, len(services))
 }
 
 func (suite *KubeCtlServiceTestSuite) TestCreateDeleteService() {
-	namespace := "default"
 	service := corev1.Service{
 		ObjectMeta: metav1.ObjectMeta{
 			Name: "K8S-Service-4",
 		},
 	}
-	_, err := suite.kubectl.CreateService(&service, namespace)
+	_, err := suite.kubectl.CreateService(&service)
 	suite.NoError(err)
-	err = suite.kubectl.DeleteService("K8S-Service-4", namespace)
+	err = suite.kubectl.DeleteService("K8S-Service-4")
 	suite.NoError(err)
 }