label support for ls, logs, top

Author: devonmoss

cmd/exec.go

@@ -31,12 +31,16 @@ Examples:
   # get output from an extended arg 'curl' command in all nginx pods
   ckube exec -a nginx -- curl https://google.com -v`,
 	Run: func(cmd *cobra.Command, args []string) {
+		if labels != "" {
+			fmt.Println("using labels for exec is not yet supported")
+			return
+		}
 		serviceName := args[0]
 		dashLength := cmd.ArgsLenAtDash()
 		if dashLength > 0 {
 			postDashArgs = args[dashLength:]
 		}
-		pods := util.GetServicePods(serviceName, namespace, context)
+		pods := util.GetServicePods(serviceName, namespace, context, labels)
 		cm := util.ColorManager{}
 		if len(pods) == 0 {
 			fmt.Println("No matching containers")
@@ -48,7 +52,7 @@ Examples:
 		}
 		if tty && stdin {
 			pod := pods[0]
-			cmdArgs := util.K8sCommandArgs([]string{"exec", "-it", pod}, namespace, context)
+			cmdArgs := util.K8sCommandArgs([]string{"exec", "-it", pod}, namespace, context, "")
 			if len(postDashArgs) > 0 {
 				cmdArgs = append(cmdArgs, "--")
 				cmdArgs = append(cmdArgs, postDashArgs...)
@@ -63,7 +67,7 @@ Examples:
 				wg.Add(1)
 				go func(p string) {
 					defer wg.Done()
-					cmdArgs := util.K8sCommandArgs([]string{"exec", p}, namespace, context)
+					cmdArgs := util.K8sCommandArgs([]string{"exec", p}, namespace, context, "")
 					if len(postDashArgs) > 0 {
 						cmdArgs = append(cmdArgs, "--")
 						cmdArgs = append(cmdArgs, postDashArgs...)

cmd/logs.go

@@ -24,15 +24,18 @@ Examples:
   # Begin streaming the logs for all pods that begin with 'c'
   ckube logs -f c`,
 	Run: func(cmd *cobra.Command, args []string) {
-		serviceName := args[0]
-		pods := util.GetServicePods(serviceName, namespace, context)
-		cm := util.ColorManager{}
+		var serviceName string
+		if len(args) > 0 {
+			serviceName = args[0]
+		}
 
+		pods := util.GetServicePods(serviceName, namespace, context, labels)
+		cm := util.ColorManager{}
 		c := make(chan string)
 		if len(pods) > 0 {
 			if follow {
 				for _, pod := range pods {
-					cmdArgs := util.K8sCommandArgs([]string{"logs", "-f", pod}, namespace, context)
+					cmdArgs := util.K8sCommandArgs([]string{"logs", "-f", pod}, namespace, context, "")
 					go util.StreamCommand(c, cm.GetPrefix(pod), "kubectl", cmdArgs...)
 				}
 				for {
@@ -49,7 +52,7 @@ Examples:
 					wg.Add(1)
 					go func(p string) {
 						defer wg.Done()
-						cmdArgs := util.K8sCommandArgs([]string{"logs", p}, namespace, context)
+						cmdArgs := util.K8sCommandArgs([]string{"logs", p}, namespace, context, "")
 						prefix := cm.GetPrefix(p)
 						logs := util.RunCommand("kubectl", cmdArgs...)
 						for _, line := range logs {

cmd/ls.go

@@ -21,7 +21,7 @@ Examples:
   # List all pods starting with 'nginx'
   ckube ls nginx`,
 	Run: func(cmd *cobra.Command, args []string) {
-		pods := util.RawK8sOutput(namespace, context, "get", "pods")
+		pods := util.RawK8sOutput(namespace, context, labels, "get", "pods")
 		if len(args) > 0 {
 			searchString := args[0]
 			pods = util.FilterOutput(pods, searchString, false)

cmd/root.go

@@ -13,6 +13,7 @@ var cfgFile string
 var namespace string
 var context string
 var kubeconfig string
+var labels string
 
 var RootCmd = &cobra.Command{
 	Use:   "ckube",
@@ -36,6 +37,7 @@ func init() {
 	RootCmd.PersistentFlags().StringVarP(&namespace, "namespace", "n", "", "the kubernetes namespace (defaults to value currently used by kubectl)")
 	RootCmd.PersistentFlags().StringVar(&context, "context", "", "the kubernetes context (defaults to value currently used by kubectl)")
 	RootCmd.PersistentFlags().StringVar(&kubeconfig, "kubeconfig", "", "path to kubeconfig file to use for CLI requests (defaults to $HOME/.kube/config)")
+	RootCmd.PersistentFlags().StringVarP(&labels, "labels", "l", "", "Selector (label query) to filter on, supports '=', '==', and '!='.(e.g. -l key1=value1,key2=value2)")
 }
 
 // initConfig reads in config file and ENV variables if set.

cmd/top.go

@@ -20,9 +20,9 @@ For example:
 	Run: func(cmd *cobra.Command, args []string) {
 		var pods []string
 		if len(args) > 0 {
-			pods = util.GetMatchingPods(args[0], namespace, context)
+			pods = util.GetMatchingPods(args[0], namespace, context, labels)
 		} else {
-			pods = util.GetPods(namespace, context)
+			pods = util.GetPods(namespace, context, labels)
 		}
 		oMan := &util.OutputManager{HeaderColumns:[]string{"NAME", "CPU(cores)", "MEMORY(bytes)"}}
 		if len(pods) > 0 {

util/cmd.go

@@ -9,6 +9,7 @@ import (
 )
 
 func RunCommand(name string, args ...string) []string {
+	//fmt.Printf("%v %v\n", name, args)
 	cmd := exec.Command(name, args...)
 
 	cmdOut, err := cmd.CombinedOutput()

util/k8s.go

@@ -52,22 +52,24 @@ func (o *OutputManager) tabbedString(output string) string {
 }
 
 
-func GetPods(namespace string, context string) []string {
+func GetPods(namespace string, context string, labels string) []string {
 	var pods []string
-	args := K8sCommandArgs([]string{"get", "pods"}, namespace, context)
+	args := K8sCommandArgs([]string{"get", "pods"}, namespace, context, labels)
 	cmdPods := RunCommand("kubectl", args...)
 
 	for _, podInfo := range cmdPods[1:] {
 		podSplit := strings.Split(podInfo, " ")
 		if len(podSplit) > 0 {
-			pods = append(pods, podSplit[0])
+			if podSplit[0] != "" {
+				pods = append(pods, podSplit[0])
+			}
 		}
 	}
 	return pods
 }
 
-func RawK8sOutput(namespace string, context string, args ...string) []string {
-	cmdArgs := K8sCommandArgs(args, namespace, context)
+func RawK8sOutput(namespace string, context string, labels string, args ...string) []string {
+	cmdArgs := K8sCommandArgs(args, namespace, context, labels)
 	output := RunCommand("kubectl", cmdArgs...)
 	return output
 }
@@ -91,33 +93,44 @@ func FilterOutput(lines []string, search string, stripHeader bool) []string {
 	return output
 }
 
-func GetServicePods(service string, namespace string, context string) []string {
+func GetServicePods(service string, namespace string, context string, labels string) []string {
 	var pods []string
-	for _, pod := range GetPods(namespace, context) {
+	allPods := GetPods(namespace, context, labels)
+	if service == "" {
+		return allPods
+	}
+	for _, pod := range allPods {
 		if strings.HasPrefix(pod, service) {
 			pods = append(pods, pod)
 		}
 	}
 	return pods
 }
 
-func GetMatchingPods(service string, namespace string, context string) []string {
+func GetMatchingPods(service string, namespace string, context string, labels string) []string {
 	var pods []string
-	for _, pod := range GetPods(namespace, context) {
+	allPods := GetPods(namespace, context, labels)
+	if service == "" {
+		return allPods
+	}
+	for _, pod := range GetPods(namespace, context, labels) {
 		if strings.Contains(pod, service) {
 			pods = append(pods, pod)
 		}
 	}
 	return pods
 }
 
-func K8sCommandArgs(args []string, namespace string, context string) []string {
+func K8sCommandArgs(args []string, namespace string, context string, labels string) []string {
 	if namespace != "" {
 		args = append(args, fmt.Sprintf("--namespace=%v", namespace))
 	}
 	if context != "" {
 		args = append(args, fmt.Sprintf("--context=%v", context))
 	}
+	if labels != "" {
+		args = append(args, fmt.Sprintf("--selector=%v", labels))
+	}
 	return args
 }