Merge pull request #17 from voldemortensen/fix-deployments-nodes-services

fix deployments, nodes, and services commands, update deps

Author: voldemortensen

cmd/deployment.go

@@ -6,7 +6,6 @@ import (
 	"github.com/canopytax/ckube/util"
 	"github.com/manifoldco/promptui"
 	"github.com/spf13/cobra"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"strings"
 	"time"
 )
@@ -72,12 +71,7 @@ func printDeploymentView() {
 }
 
 func deploymentInfo() []DeploymentInfo {
-	clientset := util.GetClientset(kubeconfig)
-
-	depList, err := clientset.AppsV1beta2().Deployments(namespace).List(metav1.ListOptions{})
-	if err != nil {
-		panic(fmt.Errorf("error listing deployments: %v", err))
-	}
+	depList := util.GetDeploymentList(namespace, context, labels)
 
 	var deploymentInfos []DeploymentInfo
 	for _, deployment := range depList.Items {

cmd/nodes.go

@@ -10,7 +10,6 @@ import (
 	"github.com/fatih/color"
 	"github.com/spf13/cobra"
 	"k8s.io/api/core/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	_ "k8s.io/client-go/plugin/pkg/client/auth/gcp"
 )
 
@@ -28,7 +27,6 @@ var nodesCmd = &cobra.Command{
 func printNodeView() {
 	nodeMap := nodeMap()
 	for _, nodePodInfo := range nodeMap {
-		//fmt.Println(node)
 		printNodeInfo(nodePodInfo.Node)
 		w := tabwriter.NewWriter(os.Stdout, 0, 0, 1, ' ', tabwriter.StripEscape)
 		headerLine := fmt.Sprintf("\t%v\t%v\t%v\t%v\t%v\t", "NAME", "READY", "STATUS", "RESTARTS", "AGE")
@@ -81,17 +79,7 @@ func NewPodStatus(pod v1.Pod) PodStatus {
 }
 
 func nodeMap() map[string]NodePodInfo {
-	clientset := util.GetClientset(kubeconfig)
-
-	podList, err := clientset.CoreV1().Pods(namespace).List(metav1.ListOptions{})
-	if err != nil {
-		panic(fmt.Errorf("error listing pods: %v", err))
-	}
-
-	nodeList, err := clientset.CoreV1().Nodes().List(metav1.ListOptions{})
-	if err != nil {
-		panic(fmt.Errorf("error listing pods: %v", err))
-	}
+	podList := util.GetPodList(namespace, context, labels)
 
 	nodeMap := make(map[string][]v1.Pod)
 	for _, pod := range podList.Items {
@@ -102,6 +90,8 @@ func nodeMap() map[string]NodePodInfo {
 		}
 	}
 
+	nodeList := util.GetNodeList(context, labels)
+
 	nodePodMap := make(map[string]NodePodInfo)
 	for _, node := range nodeList.Items {
 		nodePodMap[node.Name] = NodePodInfo{Node: node, Pods: nodeMap[node.Name]}

cmd/service.go

@@ -7,7 +7,6 @@ import (
 	"github.com/manifoldco/promptui"
 	"github.com/spf13/cobra"
 	"k8s.io/api/core/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	_ "k8s.io/client-go/plugin/pkg/client/auth/gcp"
 )
 
@@ -18,9 +17,6 @@ var serviceCmd = &cobra.Command{
 	Short:   "Interactive view of your services",
 	Long:    `Shows an interactive view of your services`,
 	Run: func(cmd *cobra.Command, args []string) {
-		if namespace == "" {
-			namespace = "default"
-		}
 		showServiceView()
 	},
 }
@@ -53,22 +49,14 @@ func showServiceView() {
 }
 
 func getServiceInfo() []ServiceInfo {
-	clientset := util.GetClientset(kubeconfig)
-
-	serviceList, err := clientset.CoreV1().Services(namespace).List(metav1.ListOptions{})
-	if err != nil {
-		panic(fmt.Errorf("error listing services: %v", err))
-	}
+	serviceList := util.GetServiceList(namespace, context, labels)
 
 	var serviceInfos []ServiceInfo
 	for _, service := range serviceList.Items {
 		selector := service.Spec.Selector
 		if len(selector) > 0 {
+			podList := util.GetPodList(namespace, context, util.KeysString(selector))
 
-			podList, err := clientset.CoreV1().Pods(namespace).List(metav1.ListOptions{LabelSelector: util.KeysString(selector)})
-			if err != nil {
-				panic(fmt.Errorf("error listing pods: %v", err))
-			}
 			var podDetails []PodDetails
 			for _, pod := range podList.Items {
 				podDetails = append(podDetails, NewPodDetails(pod))

go.mod

@@ -3,65 +3,11 @@ module github.com/canopytax/ckube
 go 1.16
 
 require (
-	cloud.google.com/go v0.18.0 // indirect
-	github.com/BurntSushi/toml v0.4.1 // indirect
-	github.com/PuerkitoBio/purell v1.1.0 // indirect
-	github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
-	github.com/chzyer/logex v1.1.10 // indirect
-	github.com/chzyer/readline v0.0.0-20171208011716-f6d7a1f6fbf3 // indirect
-	github.com/chzyer/test v0.0.0-20210722231415-061457976a23 // indirect
-	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/emicklei/go-restful v2.4.0+incompatible // indirect
-	github.com/fatih/color v1.5.0
-	github.com/fsnotify/fsnotify v1.4.2 // indirect
-	github.com/ghodss/yaml v1.0.0 // indirect
-	github.com/go-openapi/jsonpointer v0.0.0-20170102174223-779f45308c19 // indirect
-	github.com/go-openapi/jsonreference v0.0.0-20161105162150-36d33bfe519e // indirect
-	github.com/go-openapi/spec v0.0.0-20171206193454-01738944bdee // indirect
-	github.com/go-openapi/swag v0.0.0-20171111214437-cf0bdb963811 // indirect
-	github.com/gogo/protobuf v0.0.0-20171007142547-342cbe0a0415 // indirect
-	github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b // indirect
-	github.com/golang/protobuf v0.0.0-20171113180720-1e59b77b52bf // indirect
-	github.com/google/btree v0.0.0-20161217183710-316fb6d3f031 // indirect
-	github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf // indirect
-	github.com/googleapis/gnostic v0.1.0 // indirect
-	github.com/gregjones/httpcache v0.0.0-20171119193500-2bcd89a1743f // indirect
-	github.com/hashicorp/hcl v0.0.0-20171017181929-23c074d0eceb // indirect
-	github.com/howeyc/gopass v0.0.0-20170109162249-bf9dde6d0d2c // indirect
-	github.com/imdario/mergo v0.0.0-20171009183408-7fe0c75c13ab // indirect
-	github.com/inconshreveable/mousetrap v1.0.0 // indirect
-	github.com/json-iterator/go v0.0.0-20171115153421-f7279a603ede // indirect
-	github.com/juju/ansiterm v0.0.0-20161107204639-35c59b9e0fe2 // indirect
-	github.com/juju/ratelimit v1.0.1 // indirect
-	github.com/lunixbochs/vtclean v0.0.0-20170504063817-d14193dfc626 // indirect
-	github.com/magiconair/properties v1.7.3 // indirect
-	github.com/mailru/easyjson v0.0.0-20171120080333-32fa128f234d // indirect
-	github.com/manifoldco/promptui v0.2.2-0.20171212205406-abacd3cb3a43
-	github.com/mattn/go-colorable v0.0.9 // indirect
-	github.com/mattn/go-isatty v0.0.3 // indirect
-	github.com/mitchellh/go-homedir v0.0.0-20161203194507-b8bc1bf76747
-	github.com/mitchellh/mapstructure v0.0.0-20171017171808-06020f85339e // indirect
-	github.com/pelletier/go-toml v1.0.1 // indirect
-	github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
-	github.com/spf13/afero v1.0.0 // indirect
-	github.com/spf13/cast v1.1.0 // indirect
-	github.com/spf13/cobra v0.0.1
-	github.com/spf13/jwalterweatherman v0.0.0-20170901151539-12bd96e66386 // indirect
-	github.com/spf13/pflag v1.0.0 // indirect
-	github.com/spf13/viper v1.0.0
-	github.com/stretchr/testify v1.7.0 // indirect
-	golang.org/x/crypto v0.0.0-20171128194009-94eea52f7b74 // indirect
-	golang.org/x/net v0.0.0-20171212005608-d866cfc389ce // indirect
-	golang.org/x/oauth2 v0.0.0-20180118004544-b28fcf2b08a1 // indirect
-	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
-	golang.org/x/sys v0.0.0-20171214072955-1d2aa6dbdea4 // indirect
-	golang.org/x/text v0.3.0 // indirect
-	google.golang.org/appengine v1.0.0 // indirect
-	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
-	gopkg.in/inf.v0 v0.9.0 // indirect
-	gopkg.in/yaml.v2 v2.0.0-20171116090243-287cf08546ab // indirect
-	k8s.io/api v0.0.0-20171214073027-400667919eb0
-	k8s.io/apimachinery v0.0.0-20171207040628-a04e753f5223
-	k8s.io/client-go v0.0.0-20171214154143-87887458218a
-	k8s.io/kube-openapi v0.0.0-20171212221656-b16ebc07f5ca // indirect
+	github.com/fatih/color v1.12.0
+	github.com/manifoldco/promptui v0.8.0
+	github.com/mitchellh/go-homedir v1.1.0
+	github.com/spf13/cobra v1.2.1
+	github.com/spf13/viper v1.8.1
+	k8s.io/api v0.20.10
+	k8s.io/client-go v0.20.10
 )