From 8d29495193adad9f4ac3990d9119a77f55ce53ad Mon Sep 17 00:00:00 2001 From: yunchen Date: Mon, 16 Jul 2018 06:58:36 +0000 Subject: [PATCH 1/3] Add default namespace --- src/kubernetes/deployment.go | 28 +++++++++++++++------ src/kubernetes/deployment_test.go | 18 +++++++------ src/kubernetes/pods.go | 28 +++++++++++++++------ src/kubernetes/pods_test.go | 17 +++++++------ src/kubernetes/pvc.go | 28 +++++++++++++++------ src/kubernetes/pvc_test.go | 14 ++++++----- src/kubernetes/services.go | 28 +++++++++++++++------ src/kubernetes/services_test.go | 14 ++++++----- src/pod/pod.go | 7 +++--- src/prometheuscontroller/expression.go | 4 +-- src/prometheuscontroller/expression_test.go | 12 ++++++--- src/storageprovider/nfs.go | 6 +++-- src/storageprovider/nfs_test.go | 8 +++--- src/volume/volume.go | 8 +++--- src/volume/volume_test.go | 12 +++++---- 15 files changed, 151 insertions(+), 81 deletions(-) diff --git a/src/kubernetes/deployment.go b/src/kubernetes/deployment.go index 9edd3ca6..5976f526 100644 --- a/src/kubernetes/deployment.go +++ b/src/kubernetes/deployment.go @@ -6,17 +6,26 @@ import ( ) //Get the external IP address of node -func (kc *KubeCtl) CreateDeployment(deployment *appsv1.Deployment) (*appsv1.Deployment, error) { - return kc.Clientset.AppsV1().Deployments(kc.Namespace).Create(deployment) +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) (*appsv1.Deployment, error) { - return kc.Clientset.AppsV1().Deployments(kc.Namespace).Get(name, metav1.GetOptions{}) +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() ([]*appsv1.Deployment, error) { +func (kc *KubeCtl) GetDeployments(namespace string) ([]*appsv1.Deployment, error) { + if namespace == "" { + namespace = kc.Namespace + } deployments := []*appsv1.Deployment{} - deploymentsList, err := kc.Clientset.AppsV1().Deployments(kc.Namespace).List(metav1.ListOptions{}) + deploymentsList, err := kc.Clientset.AppsV1().Deployments(namespace).List(metav1.ListOptions{}) if err != nil { return deployments, err } @@ -26,6 +35,9 @@ func (kc *KubeCtl) GetDeployments() ([]*appsv1.Deployment, error) { return deployments, nil } -func (kc *KubeCtl) DeleteDeployment(name string) error { - return kc.Clientset.AppsV1().Deployments(kc.Namespace).Delete(name, &metav1.DeleteOptions{}) +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 index f6de323e..6f1a21f2 100644 --- a/src/kubernetes/deployment_test.go +++ b/src/kubernetes/deployment_test.go @@ -24,13 +24,14 @@ func init() { } func (suite *KubeCtlDeploymentTestSuite) SetupSuite() { - suite.fakeclient = fakeclientset.NewSimpleClientset() namespace := "default" + suite.fakeclient = fakeclientset.NewSimpleClientset() suite.kubectl = New(suite.fakeclient, namespace) } func (suite *KubeCtlDeploymentTestSuite) TearDownSuite() {} func (suite *KubeCtlDeploymentTestSuite) TestCreateDeployment() { + namespace := "default" var replicas int32 replicas = 3 name := namesgenerator.GetRandomName(0) @@ -43,22 +44,23 @@ func (suite *KubeCtlDeploymentTestSuite) TestCreateDeployment() { }, Status: appsv1.DeploymentStatus{}, } - ret, err := suite.kubectl.CreateDeployment(&deployment) + ret, err := suite.kubectl.CreateDeployment(&deployment, namespace) suite.NoError(err) suite.NotNil(ret) - deploy, err := suite.kubectl.GetDeployment(name) + deploy, err := suite.kubectl.GetDeployment(name, namespace) suite.NoError(err) suite.NotNil(deploy) suite.Equal(replicas, *deploy.Spec.Replicas) - deploys, err := suite.kubectl.GetDeployments() + deploys, err := suite.kubectl.GetDeployments(namespace) suite.NoError(err) suite.NotNil(deploys) suite.Equal(replicas, *deploys[0].Spec.Replicas) } func (suite *KubeCtlDeploymentTestSuite) TestDeleteDeployment() { + namespace := "default" var replicas int32 replicas = 3 name := namesgenerator.GetRandomName(0) @@ -71,18 +73,18 @@ func (suite *KubeCtlDeploymentTestSuite) TestDeleteDeployment() { }, Status: appsv1.DeploymentStatus{}, } - ret, err := suite.kubectl.CreateDeployment(&deployment) + ret, err := suite.kubectl.CreateDeployment(&deployment, namespace) suite.NoError(err) suite.NotNil(ret) - deploy, err := suite.kubectl.GetDeployment(name) + deploy, err := suite.kubectl.GetDeployment(name, namespace) suite.NoError(err) suite.NotNil(deploy) suite.Equal(replicas, *deploy.Spec.Replicas) - err = suite.kubectl.DeleteDeployment(name) + err = suite.kubectl.DeleteDeployment(name, namespace) suite.NoError(err) - deploy, err = suite.kubectl.GetDeployment(name) + deploy, err = suite.kubectl.GetDeployment(name, namespace) suite.Error(err) suite.Nil(deploy) } diff --git a/src/kubernetes/pods.go b/src/kubernetes/pods.go index 71e32920..0688f512 100644 --- a/src/kubernetes/pods.go +++ b/src/kubernetes/pods.go @@ -6,14 +6,20 @@ import ( ) //Get the pod object by the pod name -func (kc *KubeCtl) GetPod(name string) (*corev1.Pod, error) { - return kc.Clientset.CoreV1().Pods(kc.Namespace).Get(name, metav1.GetOptions{}) +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() ([]*corev1.Pod, error) { +func (kc *KubeCtl) GetPods(namespace string) ([]*corev1.Pod, error) { + if namespace == "" { + namespace = kc.Namespace + } pods := []*corev1.Pod{} - podsList, err := kc.Clientset.CoreV1().Pods(kc.Namespace).List(metav1.ListOptions{}) + podsList, err := kc.Clientset.CoreV1().Pods(namespace).List(metav1.ListOptions{}) if err != nil { return pods, err } @@ -24,14 +30,20 @@ func (kc *KubeCtl) GetPods() ([]*corev1.Pod, error) { } //Create the pod by the pod object -func (kc *KubeCtl) CreatePod(pod *corev1.Pod) (*corev1.Pod, error) { - return kc.Clientset.CoreV1().Pods(kc.Namespace).Create(pod) +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) error { +func (kc *KubeCtl) DeletePod(name string, namespace string) error { + if namespace == "" { + namespace = kc.Namespace + } options := metav1.DeleteOptions{} - return kc.Clientset.CoreV1().Pods(kc.Namespace).Delete(name, &options) + return kc.Clientset.CoreV1().Pods(namespace).Delete(name, &options) } func (kc *KubeCtl) IsPodCompleted(pod *corev1.Pod) bool { diff --git a/src/kubernetes/pods_test.go b/src/kubernetes/pods_test.go index 1b4997b0..07a4b5ef 100644 --- a/src/kubernetes/pods_test.go +++ b/src/kubernetes/pods_test.go @@ -24,8 +24,8 @@ type KubeCtlPodTestSuite struct { } func (suite *KubeCtlPodTestSuite) SetupSuite() { - suite.fakeclient = fakeclientset.NewSimpleClientset() namespace := "default" + suite.fakeclient = fakeclientset.NewSimpleClientset() suite.kubectl = New(suite.fakeclient, namespace) } @@ -39,13 +39,14 @@ func (suite *KubeCtlPodTestSuite) TestGetPod() { _, err := suite.fakeclient.CoreV1().Pods(namespace).Create(&pod) suite.NoError(err) - result, err := suite.kubectl.GetPod("K8S-Pod-1") + result, err := suite.kubectl.GetPod("K8S-Pod-1", namespace) suite.NoError(err) suite.Equal(pod.GetName(), result.GetName()) } func (suite *KubeCtlPodTestSuite) TestGetPodFail() { - _, err := suite.kubectl.GetPod("Unknown_Name") + namespace := "default" + _, err := suite.kubectl.GetPod("Unknown_Name", namespace) suite.Error(err) } @@ -67,24 +68,26 @@ func (suite *KubeCtlPodTestSuite) TestGetPods() { _, err = suite.fakeclient.CoreV1().Pods(namespace).Create(&pod) suite.NoError(err) - pods, err := suite.kubectl.GetPods() + pods, err := suite.kubectl.GetPods(namespace) suite.NoError(err) suite.NotEqual(0, len(pods)) } func (suite *KubeCtlPodTestSuite) TestCreateDeletePod() { + namespace := "default" pod := corev1.Pod{ ObjectMeta: metav1.ObjectMeta{ Name: "K8S-Pod-4", }, } - _, err := suite.kubectl.CreatePod(&pod) + _, err := suite.kubectl.CreatePod(&pod, namespace) suite.NoError(err) - err = suite.kubectl.DeletePod("K8S-Pod-4") + err = suite.kubectl.DeletePod("K8S-Pod-4", namespace) suite.NoError(err) } func (suite *KubeCtlPodTestSuite) TestDoesPodCompleted() { + namespace := "default" pods := []corev1.Pod{ { ObjectMeta: metav1.ObjectMeta{ @@ -105,7 +108,7 @@ func (suite *KubeCtlPodTestSuite) TestDoesPodCompleted() { } for _, pod := range pods { - _, err := suite.kubectl.CreatePod(&pod) + _, err := suite.kubectl.CreatePod(&pod, namespace) suite.NoError(err) } diff --git a/src/kubernetes/pvc.go b/src/kubernetes/pvc.go index 9253052a..f87aeb48 100644 --- a/src/kubernetes/pvc.go +++ b/src/kubernetes/pvc.go @@ -6,14 +6,20 @@ import ( ) //Get the PVC object by the PVC name -func (kc *KubeCtl) GetPVC(name string) (*corev1.PersistentVolumeClaim, error) { - return kc.Clientset.CoreV1().PersistentVolumeClaims(kc.Namespace).Get(name, metav1.GetOptions{}) +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() ([]*corev1.PersistentVolumeClaim, error) { +func (kc *KubeCtl) GetPVCs(namespace string) ([]*corev1.PersistentVolumeClaim, error) { + if namespace == "" { + namespace = kc.Namespace + } pvcs := []*corev1.PersistentVolumeClaim{} - pvcsList, err := kc.Clientset.CoreV1().PersistentVolumeClaims(kc.Namespace).List(metav1.ListOptions{}) + pvcsList, err := kc.Clientset.CoreV1().PersistentVolumeClaims(namespace).List(metav1.ListOptions{}) if err != nil { return pvcs, err } @@ -24,12 +30,18 @@ func (kc *KubeCtl) GetPVCs() ([]*corev1.PersistentVolumeClaim, error) { } //Create the PVC by the PVC object -func (kc *KubeCtl) CreatePVC(pvc *corev1.PersistentVolumeClaim) (*corev1.PersistentVolumeClaim, error) { - return kc.Clientset.CoreV1().PersistentVolumeClaims(kc.Namespace).Create(pvc) +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) error { +func (kc *KubeCtl) DeletePVC(name string, namespace string) error { + if namespace == "" { + namespace = kc.Namespace + } options := metav1.DeleteOptions{} - return kc.Clientset.CoreV1().PersistentVolumeClaims(kc.Namespace).Delete(name, &options) + return kc.Clientset.CoreV1().PersistentVolumeClaims(namespace).Delete(name, &options) } diff --git a/src/kubernetes/pvc_test.go b/src/kubernetes/pvc_test.go index 85118d37..7b5e3c57 100644 --- a/src/kubernetes/pvc_test.go +++ b/src/kubernetes/pvc_test.go @@ -17,8 +17,8 @@ type KubeCtlPVCTestSuite struct { } func (suite *KubeCtlPVCTestSuite) SetupSuite() { - suite.fakeclient = fakeclientset.NewSimpleClientset() namespace := "default" + suite.fakeclient = fakeclientset.NewSimpleClientset() suite.kubectl = New(suite.fakeclient, namespace) } @@ -32,13 +32,14 @@ func (suite *KubeCtlPVCTestSuite) TestGetPVC() { _, err := suite.fakeclient.CoreV1().PersistentVolumeClaims(namespace).Create(&pvc) suite.NoError(err) - result, err := suite.kubectl.GetPVC("K8S-PVC-1") + result, err := suite.kubectl.GetPVC("K8S-PVC-1", namespace) suite.NoError(err) suite.Equal(pvc.GetName(), result.GetName()) } func (suite *KubeCtlPVCTestSuite) TestGetPVCFail() { - _, err := suite.kubectl.GetPVC("Unknown_Name") + namespace := "default" + _, err := suite.kubectl.GetPVC("Unknown_Name", namespace) suite.Error(err) } @@ -60,20 +61,21 @@ func (suite *KubeCtlPVCTestSuite) TestGetPVCs() { _, err = suite.fakeclient.CoreV1().PersistentVolumeClaims(namespace).Create(&pvc) suite.NoError(err) - pvcs, err := suite.kubectl.GetPVCs() + pvcs, err := suite.kubectl.GetPVCs(namespace) suite.NoError(err) suite.NotEqual(0, len(pvcs)) } func (suite *KubeCtlPVCTestSuite) TestCreateDeletePVC() { + namespace := "default" pvc := corev1.PersistentVolumeClaim{ ObjectMeta: metav1.ObjectMeta{ Name: "K8S-PVC-4", }, } - _, err := suite.kubectl.CreatePVC(&pvc) + _, err := suite.kubectl.CreatePVC(&pvc, namespace) suite.NoError(err) - err = suite.kubectl.DeletePVC("K8S-PVC-4") + err = suite.kubectl.DeletePVC("K8S-PVC-4", namespace) suite.NoError(err) } diff --git a/src/kubernetes/services.go b/src/kubernetes/services.go index 6c6d2235..dbca6bed 100644 --- a/src/kubernetes/services.go +++ b/src/kubernetes/services.go @@ -6,14 +6,20 @@ import ( ) //Get the service object by the service name -func (kc *KubeCtl) GetService(name string) (*corev1.Service, error) { - return kc.Clientset.CoreV1().Services(kc.Namespace).Get(name, metav1.GetOptions{}) +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() ([]*corev1.Service, error) { +func (kc *KubeCtl) GetServices(namespace string) ([]*corev1.Service, error) { + if namespace == "" { + namespace = kc.Namespace + } services := []*corev1.Service{} - servicesList, err := kc.Clientset.CoreV1().Services(kc.Namespace).List(metav1.ListOptions{}) + servicesList, err := kc.Clientset.CoreV1().Services(namespace).List(metav1.ListOptions{}) if err != nil { return services, err } @@ -24,12 +30,18 @@ func (kc *KubeCtl) GetServices() ([]*corev1.Service, error) { } //Create the service by the service object -func (kc *KubeCtl) CreateService(service *corev1.Service) (*corev1.Service, error) { - return kc.Clientset.CoreV1().Services(kc.Namespace).Create(service) +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) error { +func (kc *KubeCtl) DeleteService(name string, namespace string) error { + if namespace == "" { + namespace = kc.Namespace + } options := metav1.DeleteOptions{} - return kc.Clientset.CoreV1().Services(kc.Namespace).Delete(name, &options) + return kc.Clientset.CoreV1().Services(namespace).Delete(name, &options) } diff --git a/src/kubernetes/services_test.go b/src/kubernetes/services_test.go index 35106086..0802f526 100644 --- a/src/kubernetes/services_test.go +++ b/src/kubernetes/services_test.go @@ -17,8 +17,8 @@ type KubeCtlServiceTestSuite struct { } func (suite *KubeCtlServiceTestSuite) SetupSuite() { - suite.fakeclient = fakeclientset.NewSimpleClientset() namespace := "default" + suite.fakeclient = fakeclientset.NewSimpleClientset() suite.kubectl = New(suite.fakeclient, namespace) } @@ -32,13 +32,14 @@ func (suite *KubeCtlServiceTestSuite) TestGetService() { _, err := suite.fakeclient.CoreV1().Services(namespace).Create(&service) suite.NoError(err) - result, err := suite.kubectl.GetService("K8S-Service-1") + result, err := suite.kubectl.GetService("K8S-Service-1", namespace) suite.NoError(err) suite.Equal(service.GetName(), result.GetName()) } func (suite *KubeCtlServiceTestSuite) TestGetServiceFail() { - _, err := suite.kubectl.GetService("Unknown_Name") + namespace := "default" + _, err := suite.kubectl.GetService("Unknown_Name", namespace) suite.Error(err) } @@ -60,20 +61,21 @@ func (suite *KubeCtlServiceTestSuite) TestGetServices() { _, err = suite.fakeclient.CoreV1().Services(namespace).Create(&service) suite.NoError(err) - services, err := suite.kubectl.GetServices() + services, err := suite.kubectl.GetServices(namespace) 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) + _, err := suite.kubectl.CreateService(&service, namespace) suite.NoError(err) - err = suite.kubectl.DeleteService("K8S-Service-4") + err = suite.kubectl.DeleteService("K8S-Service-4", namespace) suite.NoError(err) } diff --git a/src/pod/pod.go b/src/pod/pod.go index f31a2906..55bc8c7b 100644 --- a/src/pod/pod.go +++ b/src/pod/pod.go @@ -80,7 +80,7 @@ func generateVolume(pod *entity.Pod, session *mongo.Session) ([]corev1.Volume, [ } func CreatePod(sp *serviceprovider.Container, pod *entity.Pod) error { - + namespace := "default" session := sp.Mongo.NewSession() defer session.Close() @@ -108,10 +108,11 @@ func CreatePod(sp *serviceprovider.Container, pod *entity.Pod) error { Volumes: volumes, }, } - _, err = sp.KubeCtl.CreatePod(&p) + _, err = sp.KubeCtl.CreatePod(&p, namespace) return err } func DeletePod(sp *serviceprovider.Container, podName string) error { - return sp.KubeCtl.DeletePod(podName) + namespace := "default" + return sp.KubeCtl.DeletePod(podName, namespace) } diff --git a/src/prometheuscontroller/expression.go b/src/prometheuscontroller/expression.go index 07b95bcc..94332ac8 100644 --- 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) + pod, err := kc.GetPod(container.Detail.Pod, "default") 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) + object, err := kc.GetService(service.ServiceName, "default") if err != nil { return entity.ServiceMetrics{}, err } diff --git a/src/prometheuscontroller/expression_test.go b/src/prometheuscontroller/expression_test.go index c5179cc9..f4646adc 100644 --- a/src/prometheuscontroller/expression_test.go +++ b/src/prometheuscontroller/expression_test.go @@ -69,7 +69,8 @@ func (suite *PrometheusExpressionTestSuite) TestListNodeNICs() { } func (suite *PrometheusExpressionTestSuite) TestGetPod() { - pods, err := suite.sp.KubeCtl.GetPods() + namespace := "default" + pods, err := suite.sp.KubeCtl.GetPods(namespace) suite.NoError(err) podName := pods[0].GetName() @@ -79,7 +80,8 @@ func (suite *PrometheusExpressionTestSuite) TestGetPod() { } func (suite *PrometheusExpressionTestSuite) TestGetContainer() { - pods, err := suite.sp.KubeCtl.GetPods() + namespace := "default" + pods, err := suite.sp.KubeCtl.GetPods(namespace) suite.NoError(err) containerName := pods[0].Status.ContainerStatuses[0].Name @@ -89,7 +91,8 @@ func (suite *PrometheusExpressionTestSuite) TestGetContainer() { } func (suite *PrometheusExpressionTestSuite) TestGetService() { - services, err := suite.sp.KubeCtl.GetServices() + namespace := "default" + services, err := suite.sp.KubeCtl.GetServices(namespace) suite.NoError(err) serviceName := services[0].GetName() @@ -99,7 +102,8 @@ func (suite *PrometheusExpressionTestSuite) TestGetService() { } func (suite *PrometheusExpressionTestSuite) TestGetController() { - deployments, err := suite.sp.KubeCtl.GetDeployments() + namespace := "default" + deployments, err := suite.sp.KubeCtl.GetDeployments(namespace) suite.NoError(err) deploymentName := deployments[0].GetName() diff --git a/src/storageprovider/nfs.go b/src/storageprovider/nfs.go index 1f6e15b3..f49d1f88 100644 --- a/src/storageprovider/nfs.go +++ b/src/storageprovider/nfs.go @@ -105,6 +105,7 @@ func getStorageClass(name string, provisioner string, storage *entity.Storage) * } func (nfs NFSStorageProvider) CreateStorage(sp *serviceprovider.Container, storage *entity.Storage) error { + namespace := "default" name := NFSProvisionerPrefix + storage.ID.Hex() storageClassName := NFSStorageClassPrefix + storage.ID.Hex() //Create deployment @@ -112,7 +113,7 @@ func (nfs NFSStorageProvider) CreateStorage(sp *serviceprovider.Container, stora //Create storageClass storageClass := getStorageClass(storageClassName, name, storage) storage.StorageClassName = storageClassName - if _, err := sp.KubeCtl.CreateDeployment(deployment); err != nil { + if _, err := sp.KubeCtl.CreateDeployment(deployment, namespace); err != nil { return err } _, err := sp.KubeCtl.CreateStorageClass(storageClass) @@ -120,6 +121,7 @@ func (nfs NFSStorageProvider) CreateStorage(sp *serviceprovider.Container, stora } func (nfs NFSStorageProvider) DeleteStorage(sp *serviceprovider.Container, storage *entity.Storage) error { + namespace := "default" deployName := NFSProvisionerPrefix + storage.ID.Hex() storageName := NFSStorageClassPrefix + storage.ID.Hex() @@ -140,5 +142,5 @@ func (nfs NFSStorageProvider) DeleteStorage(sp *serviceprovider.Container, stora return err } //Delete Deployment - return sp.KubeCtl.DeleteDeployment(deployName) + return sp.KubeCtl.DeleteDeployment(deployName, namespace) } diff --git a/src/storageprovider/nfs_test.go b/src/storageprovider/nfs_test.go index 9e94c1f4..5c55b8cd 100644 --- a/src/storageprovider/nfs_test.go +++ b/src/storageprovider/nfs_test.go @@ -75,6 +75,7 @@ func (suite *StorageTestSuite) TestValidateBeforeCreating() { } func (suite *StorageTestSuite) TestCreateStorage() { + namespace := "default" storage := entity.Storage{ ID: bson.NewObjectId(), Type: entity.NFSStorageType, @@ -89,12 +90,13 @@ func (suite *StorageTestSuite) TestCreateStorage() { err = sp.CreateStorage(suite.sp, &storage) suite.NoError(err) - deploy, err := suite.sp.KubeCtl.GetDeployment(NFSProvisionerPrefix + storage.ID.Hex()) + deploy, err := suite.sp.KubeCtl.GetDeployment(NFSProvisionerPrefix+storage.ID.Hex(), namespace) suite.NotNil(deploy) suite.NoError(err) } func (suite *StorageTestSuite) TestDeleteStorage() { + namespace := "default" storage := &entity.Storage{ ID: bson.NewObjectId(), Type: entity.NFSStorageType, @@ -109,14 +111,14 @@ func (suite *StorageTestSuite) TestDeleteStorage() { err = sp.CreateStorage(suite.sp, storage) suite.NoError(err) - deploy, err := suite.sp.KubeCtl.GetDeployment(NFSProvisionerPrefix + storage.ID.Hex()) + deploy, err := suite.sp.KubeCtl.GetDeployment(NFSProvisionerPrefix+storage.ID.Hex(), namespace) suite.NotNil(deploy) suite.NoError(err) err = sp.DeleteStorage(suite.sp, storage) suite.NoError(err) - deploy, err = suite.sp.KubeCtl.GetDeployment(NFSProvisionerPrefix + storage.ID.Hex()) + deploy, err = suite.sp.KubeCtl.GetDeployment(NFSProvisionerPrefix+storage.ID.Hex(), namespace) suite.Nil(deploy) suite.Error(err) } diff --git a/src/volume/volume.go b/src/volume/volume.go index cb958a1f..f68900be 100644 --- a/src/volume/volume.go +++ b/src/volume/volume.go @@ -42,6 +42,7 @@ func getStorageClassName(session *mongo.Session, storageName string) (string, er } func CreateVolume(sp *serviceprovider.Container, volume *entity.Volume) error { + namespace := "default" session := sp.Mongo.NewSession() defer session.Close() //fetch the db to get the storageName @@ -52,11 +53,12 @@ func CreateVolume(sp *serviceprovider.Container, volume *entity.Volume) error { name := volume.GetPVCName() pvc := getPVCInstance(volume, name, storageName) - _, err = sp.KubeCtl.CreatePVC(pvc) + _, err = sp.KubeCtl.CreatePVC(pvc, namespace) return err } func DeleteVolume(sp *serviceprovider.Container, volume *entity.Volume) error { + namespace := "default" //Check the pod session := sp.Mongo.NewSession() defer session.Close() @@ -70,7 +72,7 @@ func DeleteVolume(sp *serviceprovider.Container, volume *entity.Volume) error { usedPod := []string{} for _, pod := range pods { //Check the pod's status, report error if at least one pod is running. - currentPod, err := sp.KubeCtl.GetPod(pod.Name) + currentPod, err := sp.KubeCtl.GetPod(pod.Name, namespace) if err != nil { continue } @@ -84,5 +86,5 @@ func DeleteVolume(sp *serviceprovider.Container, volume *entity.Volume) error { return fmt.Errorf("delete the volume [%s] fail, since the followings pods still ust it: %s", volume.Name, podNames) } - return sp.KubeCtl.DeletePVC(volume.GetPVCName()) + return sp.KubeCtl.DeletePVC(volume.GetPVCName(), namespace) } diff --git a/src/volume/volume_test.go b/src/volume/volume_test.go index 18c6d6b4..e0c4952f 100644 --- a/src/volume/volume_test.go +++ b/src/volume/volume_test.go @@ -67,6 +67,7 @@ func (suite *VolumeTestSuite) TestGetStorageClassName() { } func (suite *VolumeTestSuite) TestCreateVolume() { + namespace := "default" session := suite.sp.Mongo.NewSession() defer session.Close() storage := entity.Storage{ @@ -88,14 +89,14 @@ func (suite *VolumeTestSuite) TestCreateVolume() { suite.NoError(err) name := volume.GetPVCName() - v, err := suite.sp.KubeCtl.GetPVC(name) + v, err := suite.sp.KubeCtl.GetPVC(name, namespace) suite.NoError(err) suite.NotNil(v) err = DeleteVolume(suite.sp, volume) suite.NoError(err) - v, err = suite.sp.KubeCtl.GetPVC(name) + v, err = suite.sp.KubeCtl.GetPVC(name, namespace) suite.Error(err) suite.Nil(v) } @@ -112,6 +113,7 @@ func (suite *VolumeTestSuite) TestCreateVolumeFail() { } func (suite *VolumeTestSuite) TestDeleteVolumeFail() { + namespace := "default" volume := &entity.Volume{ ID: bson.NewObjectId(), Name: namesgenerator.GetRandomName(0), @@ -154,7 +156,7 @@ func (suite *VolumeTestSuite) TestDeleteVolumeFail() { Status: corev1.PodStatus{ Phase: corev1.PodRunning, }, - }) + }, namespace) suite.sp.KubeCtl.CreatePod(&corev1.Pod{ ObjectMeta: metav1.ObjectMeta{ Name: pods[1].Name, @@ -162,7 +164,7 @@ func (suite *VolumeTestSuite) TestDeleteVolumeFail() { Status: corev1.PodStatus{ Phase: corev1.PodRunning, }, - }) + }, namespace) suite.sp.KubeCtl.CreatePod(&corev1.Pod{ ObjectMeta: metav1.ObjectMeta{ Name: namesgenerator.GetRandomName(0), @@ -170,7 +172,7 @@ func (suite *VolumeTestSuite) TestDeleteVolumeFail() { Status: corev1.PodStatus{ Phase: corev1.PodRunning, }, - }) + }, namespace) err := DeleteVolume(suite.sp, volume) suite.Error(err) From 7114668d535bda499025d581125a80ba09e2bdf8 Mon Sep 17 00:00:00 2001 From: yunchen Date: Mon, 16 Jul 2018 07:32:59 +0000 Subject: [PATCH 2/3] Remove set namespace --- src/kubernetes/kubectl.go | 4 ---- src/kubernetes/kubectl_test.go | 2 -- src/prometheuscontroller/expression.go | 4 ++-- src/prometheuscontroller/expression_test.go | 9 ++++----- 4 files changed, 6 insertions(+), 13 deletions(-) diff --git a/src/kubernetes/kubectl.go b/src/kubernetes/kubectl.go index 664c75da..2ab79b45 100644 --- 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 index 62501958..dff567b2 100644 --- 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 index 94332ac8..04ba4957 100644 --- 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 index f4646adc..e33bc4dd 100644 --- 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() From 07d8db197fb8f79e656d34bb8a8a747ef9ca5a75 Mon Sep 17 00:00:00 2001 From: yunchen Date: Mon, 16 Jul 2018 08:17:46 +0000 Subject: [PATCH 3/3] Remove default namespace --- src/kubernetes/deployment.go | 12 ------------ src/kubernetes/deployment_test.go | 3 +-- src/kubernetes/kubectl.go | 4 +--- src/kubernetes/kubectl_test.go | 4 +--- src/kubernetes/nodes_test.go | 3 +-- src/kubernetes/pods.go | 12 ------------ src/kubernetes/pods_test.go | 3 +-- src/kubernetes/pvc.go | 12 ------------ src/kubernetes/pvc_test.go | 3 +-- src/kubernetes/services.go | 12 ------------ src/kubernetes/services_test.go | 3 +-- src/kubernetes/storageclass_test.go | 3 +-- src/networkcontroller/network_controller_test.go | 3 +-- src/networkprovider/ovs_netdev_test.go | 3 +-- src/networkprovider/ovs_system_test.go | 3 +-- src/prometheuscontroller/expression.go | 2 -- src/serviceprovider/serviceprovider.go | 4 ++-- 17 files changed, 13 insertions(+), 76 deletions(-) diff --git a/src/kubernetes/deployment.go b/src/kubernetes/deployment.go index 5976f526..7304c5c7 100644 --- 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 index 6f1a21f2..22aebc94 100644 --- 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 index 2ab79b45..139da788 100644 --- a/src/kubernetes/kubectl.go +++ b/src/kubernetes/kubectl.go @@ -10,7 +10,6 @@ import ( */ type KubeCtl struct { Clientset kubernetes.Interface - Namespace string } /* @@ -18,9 +17,8 @@ type KubeCtl struct { 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 index dff567b2..c858e951 100644 --- 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 index 051b23a2..e495c88a 100644 --- 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 index 0688f512..971f845a 100644 --- 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 index 07a4b5ef..c65dbb0a 100644 --- 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 index f87aeb48..b7591eb3 100644 --- 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 index 7b5e3c57..96ae3206 100644 --- 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 index dbca6bed..f6153833 100644 --- 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 index 0802f526..c9000602 100644 --- 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 index 39304a05..3ac2037f 100644 --- 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 index c415497e..0326232d 100644 --- 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 index 210a3ca6..c502df6a 100644 --- 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 index a3878c1a..f5a432b4 100644 --- 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 index 04ba4957..d0f27ccb 100644 --- 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 index 5f38c38a..a70962dd 100644 --- 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(), }