Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use kubectl namespace for service #78

Merged
merged 1 commit into from
Jul 10, 2018
Merged

Use kubectl namespace for service #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions src/kubernetes/services.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand All @@ -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)
}
12 changes: 5 additions & 7 deletions src/kubernetes/services_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

Expand All @@ -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)
}

Expand Down