working cli example for pod list, pod add and resources

Signed-off-by: Ken Sipe <[email protected]>

Author: kensipe

.gitignore

@@ -13,3 +13,5 @@
 
 # Dependency directories (remove the comment below to include it)
 # vendor/
+.DS_Store
+.idea/

Makefile

@@ -37,9 +37,6 @@ endif
 download:
 	go mod download
 
-.PHONY: prebuild
-prebuild: generate lint
-
 
 .PHONY: cli-fast
 # Build CLI but don't lint or run code generation first.
@@ -48,7 +45,7 @@ cli-fast:
 
 .PHONY: cli
 # Build CLI
-cli: prebuild cli-fast
+cli: cli-fast
 
 .PHONY: cli-clean
 # Clean CLI build

go.mod

@@ -7,9 +7,11 @@ require (
 	github.com/go-bindata/go-bindata v3.1.2+incompatible
 	github.com/gogo/protobuf v1.3.1 // indirect
 	github.com/googleapis/gnostic v0.3.1 // indirect
+	github.com/gosuri/uitable v0.0.4
 	github.com/imdario/mergo v0.3.7 // indirect
 	github.com/mattn/go-colorable v0.1.4 // indirect
 	github.com/mattn/go-isatty v0.0.10 // indirect
+	github.com/mattn/go-runewidth v0.0.8 // indirect
 	github.com/onsi/ginkgo v1.10.1 // indirect
 	github.com/onsi/gomega v1.7.1 // indirect
 	github.com/spf13/cobra v0.0.5
@@ -23,8 +25,10 @@ require (
 	gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
 	gopkg.in/yaml.v2 v2.2.7 // indirect
 	gopkg.in/yaml.v3 v3.0.0-20191106092431-e228e37189d3 // indirect
+	k8s.io/api v0.0.0-20191016110408-35e52d86657a
 	k8s.io/apiextensions-apiserver v0.0.0-20191016113550-5357c4baaf65
-	k8s.io/apimachinery v0.0.0-20191028221656-72ed19daf4bb // indirect
+	k8s.io/apimachinery v0.0.0-20191028221656-72ed19daf4bb
+	k8s.io/apiserver v0.0.0-20191016112112-5190913f932d
 	k8s.io/client-go v11.0.0+incompatible
 	k8s.io/code-generator v0.18.0-alpha.1.0.20191220033320-6b257a9d6f46
 	sigs.k8s.io/controller-tools v0.2.4

go.sum

@@ -179,6 +179,8 @@ github.com/googleapis/gnostic v0.3.1/go.mod h1:on+2t9HRStVgn95RSsFWFz+6Q0Snyqv1a
 github.com/gophercloud/gophercloud v0.1.0/go.mod h1:vxM41WHh5uqHVBMZHzuwNOHh8XEoIEcSTewFxm1c5g8=
 github.com/gorilla/websocket v1.4.0 h1:WDFjx/TMzVgy9VdMMQi2K2Emtwi2QcUQsztZ/zLaH/Q=
 github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
+github.com/gosuri/uitable v0.0.4 h1:IG2xLKRvErL3uhY6e1BylFzG+aJiwQviDDTfOKeKTpY=
+github.com/gosuri/uitable v0.0.4/go.mod h1:tKR86bXuXPZazfOTG1FIzvjIdXzd0mo4Vtn16vt0PJo=
 github.com/gregjones/httpcache v0.0.0-20170728041850-787624de3eb7 h1:6TSoaYExHper8PYsJu23GWVNOyYRCSnIFyxKgLSZ54w=
 github.com/gregjones/httpcache v0.0.0-20170728041850-787624de3eb7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
 github.com/grpc-ecosystem/go-grpc-middleware v0.0.0-20190222133341-cfaf5686ec79 h1:lR9ssWAqp9qL0bALxqEEkuudiP1eweOdv9jsRK3e7lE=
@@ -239,6 +241,8 @@ github.com/mattn/go-isatty v0.0.8 h1:HLtExJ+uU2HOZ+wI0Tt5DtUDrx8yhUqDcp7fYERX4CE
 github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mattn/go-isatty v0.0.10 h1:qxFzApOv4WsAL965uUPIsXzAKCZxN2p9UqdhFS4ZW10=
 github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84=
+github.com/mattn/go-runewidth v0.0.8 h1:3tS41NlGYSmhhe/8fhGRzc+z3AYCw1Fe1WAyLuujKs0=
+github.com/mattn/go-runewidth v0.0.8/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
 github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
 github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=

pkg/example/cmd/pod.go

@@ -11,6 +11,7 @@ This command consists of multiple sub-commands to interact with Pods.
 `
 
 const podExamples = `  kubectl example pod list [flags]
+  kubectl example pod list2 [flags]
   kubectl example pod add [name] [flags]
 `
 
@@ -25,6 +26,7 @@ func newPodCmd(out io.Writer) *cobra.Command {
 
 	cmd.AddCommand(newPodAddCmd(out))
 	cmd.AddCommand(newPodListCmd(out))
+	cmd.AddCommand(newPodList2Cmd(out))
 
 	return cmd
 }

pkg/example/cmd/pod_add.go

@@ -2,9 +2,14 @@ package cmd
 
 import (
 	"errors"
+	"fmt"
 	"io"
 
 	"github.com/spf13/cobra"
+	apiv1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+	"github.com/codementor/k8s-cli/pkg/example/env"
 )
 
 const (
@@ -15,14 +20,14 @@ const (
 )
 
 type podAddCmd struct {
-	interactive bool
-	out         io.Writer
+	image string
+	out   io.Writer
 }
 
 // newPodAddCmd adds a pod to the cluster
 func newPodAddCmd(out io.Writer) *cobra.Command {
 
-	pkg := &podAddCmd{out: out}
+	p := &podAddCmd{out: out}
 	cmd := &cobra.Command{
 		Use:     "add",
 		Short:   "adds a pod to the cluster",
@@ -32,26 +37,53 @@ func newPodAddCmd(out io.Writer) *cobra.Command {
 			if err := validateArgs(args); err != nil {
 				return err
 			}
-			if err := pkg.run(args); err != nil {
+			if err := p.run(args[0]); err != nil {
 				return err
 			}
 			return nil
 		},
 	}
 
 	f := cmd.Flags()
-	f.BoolVarP(&pkg.interactive, "interactive", "i", false, "Interactive mode.")
+	f.StringVar(&p.image, "image", "nginx", "image to be used in creation of pod")
 	return cmd
 }
 
 func validateArgs(args []string) error {
-	if len(args) == 1 {
-		return errors.New("expecting 1 argument - name of pod`")
+	if len(args) != 1 {
+		return errors.New("expecting 1 argument - name of pod")
 	}
 	return nil
+
 }
 
 // run returns the errors associated with cmd env
-func (pkg *podAddCmd) run(args []string) error {
+func (p *podAddCmd) run(name string) error {
+	client := env.NewClientSet(&Settings)
+
+	podsClient := client.CoreV1().Pods(apiv1.NamespaceDefault)
+
+	pod := &apiv1.Pod{
+		TypeMeta: metav1.TypeMeta{},
+		ObjectMeta: metav1.ObjectMeta{
+			Name:   name,
+			Labels: map[string]string{"app": "demo"},
+		},
+		Spec: apiv1.PodSpec{
+			Containers: []apiv1.Container{
+				{
+					Name:  name,
+					Image: p.image,
+				},
+			},
+		},
+	}
+
+	pp, err := podsClient.Create(pod)
+	if err != nil {
+		return err
+	}
+
+	fmt.Fprintf(p.out, "Pod %v created with rev: %v\n", pp.Name, pp.ResourceVersion)
 	return nil
 }

pkg/example/cmd/pod_list.go

@@ -1,9 +1,15 @@
 package cmd
 
 import (
+	"fmt"
 	"io"
 
 	"github.com/spf13/cobra"
+	apiv1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	v1 "k8s.io/apiserver/pkg/apis/example/v1"
+
+	"github.com/codementor/k8s-cli/pkg/example/env"
 )
 
 const (
@@ -14,8 +20,8 @@ const (
 )
 
 type podListCmd struct {
-	interactive bool
-	out         io.Writer
+	status bool
+	out    io.Writer
 }
 
 // newPodListCmd lists pods
@@ -27,20 +33,93 @@ func newPodListCmd(out io.Writer) *cobra.Command {
 		Short:   podListDesc,
 		Example: podListExample,
 		RunE: func(cmd *cobra.Command, args []string) error {
-			if err := pkg.run(args); err != nil {
+			if err := pkg.run(); err != nil {
+				return err
+			}
+			return nil
+		},
+	}
+
+	f := cmd.Flags()
+	f.BoolVarP(&pkg.status, "status", "i", true, "display status info")
+	return cmd
+}
+
+// newPodList2Cmd lists pods
+func newPodList2Cmd(out io.Writer) *cobra.Command {
+
+	pkg := &podListCmd{out: out}
+	cmd := &cobra.Command{
+		Use:     "list2",
+		Short:   podListDesc,
+		Example: podListExample,
+		RunE: func(cmd *cobra.Command, args []string) error {
+			if err := pkg.run2(); err != nil {
 				return err
 			}
 			return nil
 		},
 	}
 
 	f := cmd.Flags()
-	f.BoolVarP(&pkg.interactive, "interactive", "i", false, "Interactive mode.")
+	f.BoolVarP(&pkg.status, "status", "i", true, "display status info")
 	return cmd
 }
 
+// run 1st approach at list pods
+func (p *podListCmd) run() error {
 
-// run returns the errors associated with cmd env
-func (pkg *podListCmd) run(args []string) error {
+	client := env.NewClientSet(&Settings)
+	podsClient := client.CoreV1().Pods(apiv1.NamespaceDefault)
+
+	list, err := podsClient.List(metav1.ListOptions{})
+	if err != nil {
+		return err
+	}
+
+	if len(list.Items) == 0 {
+		fmt.Printf("no pods discovered\n")
+		return nil
+	}
+	for _, item := range list.Items {
+		if p.status {
+			fmt.Fprintf(p.out, "pod %v in namespace: %v, status: %v\n", item.Name, item.Namespace, item.Status.Phase)
+
+		} else {
+			fmt.Fprintf(p.out, "pod %v in namespace: %v\n", item.Name, item.Namespace)
+
+		}
+	}
+	return nil
+}
+
+// run2 2nd approach at list pods
+func (p *podListCmd) run2() error {
+
+	//REST Client approach
+
+	client := env.NewRestClient(&Settings)
+	result := &v1.PodList{}
+
+	err := client.Get().
+		Namespace(apiv1.NamespaceDefault).
+		Resource("pods").
+		Do().
+		Into(result)
+	if err != nil {
+		return err
+	}
+	if len(result.Items) == 0 {
+		fmt.Printf("no pods discovered\n")
+		return nil
+	}
+	for _, item := range result.Items {
+		if p.status {
+			fmt.Fprintf(p.out, "pod %v in namespace: %v, status: %v\n", item.Name, item.Namespace, item.Status.Phase)
+
+		} else {
+			fmt.Fprintf(p.out, "pod %v in namespace: %v\n", item.Name, item.Namespace)
+		}
+	}
 	return nil
 }

pkg/example/cmd/resources.go

@@ -0,0 +1,56 @@
+package cmd
+
+import (
+	"fmt"
+
+	"github.com/gosuri/uitable"
+	"github.com/spf13/cobra"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+	"github.com/codementor/k8s-cli/pkg/example/env"
+)
+
+var (
+	resourceExample = `  # Print the current api resources
+  kubectl example resources`
+)
+
+// newResourcesCmd returns list of kubernetes api-resources
+func newResourcesCmd() *cobra.Command {
+	versionCmd := &cobra.Command{
+		Use:     "resources",
+		Short:   "List Kubernetes API Resources",
+		Example: resourceExample,
+		RunE:    ResourcesCmd,
+	}
+
+	return versionCmd
+}
+
+// ResourcesCmd list api resources
+func ResourcesCmd(cmd *cobra.Command, args []string) error {
+	client := env.NewClientSet(&Settings)
+	lists, err := client.Discovery().ServerPreferredResources()
+	if err != nil {
+		return err
+	}
+
+	resources := []metav1.APIResource{}
+	for _, item := range lists {
+		if len(item.APIResources) == 0 {
+			continue
+		}
+		if err != nil {
+			continue
+		}
+
+		resources = append(resources, item.APIResources...)
+	}
+	table := uitable.New()
+	table.AddRow("Name", "Namespaced", "Kind")
+	for _, resource := range resources {
+		table.AddRow(resource.Name, resource.Namespaced, resource.Kind)
+	}
+	fmt.Print(table)
+	return nil
+}

pkg/example/cmd/root.go

@@ -6,9 +6,15 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/codementor/k8s-cli/pkg/example/clog"
+	"github.com/codementor/k8s-cli/pkg/example/env"
 	"github.com/codementor/k8s-cli/pkg/version"
 )
 
+var (
+	// Settings defines global flags and settings
+	Settings env.Settings
+)
+
 // NewExampleCmd creates a new root command for example CLI
 func NewExampleCmd() *cobra.Command {
 	cmd := &cobra.Command{
@@ -34,6 +40,7 @@ func NewExampleCmd() *cobra.Command {
 	// get api-resources
 	// get CRD?
 	cmd.AddCommand(newPodCmd(cmd.OutOrStdout()))
+	cmd.AddCommand(newResourcesCmd())
 	cmd.AddCommand(newVersionCmd())
 
 	initGlobalFlags(cmd, cmd.OutOrStdout())
@@ -43,5 +50,6 @@ func NewExampleCmd() *cobra.Command {
 
 func initGlobalFlags(cmd *cobra.Command, out io.Writer) {
 	flags := cmd.PersistentFlags()
+	Settings.AddFlags(flags)
 	clog.InitWithFlags(flags, out)
 }