Skip to content

Commit

Permalink
add support display running version
Browse files Browse the repository at this point in the history
Signed-off-by: zhaojizhuang <[email protected]>
  • Loading branch information
zhaojizhuang committed Aug 19, 2021
1 parent 1b51de3 commit 8c2fc33
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 7 deletions.
2 changes: 1 addition & 1 deletion internal/cli/cmd/cmd.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ func NewDefaultCiliumCommand() *cobra.Command {
return nil
}
switch cmd.Name() {
case "completion", "help", "version":
case "completion", "help":
return nil
}

Expand Down
22 changes: 16 additions & 6 deletions internal/cli/cmd/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,22 @@
package cmd

import (
"context"
"fmt"
"io"
"net/http"
"runtime"
"strings"

"github.com/cilium/cilium-cli/defaults"

"github.com/spf13/cobra"
)

// The following variables are set at compile time via LDFLAGS.
var (
// Version is the software version.
Version string
// namespace is the ns where cilium exists
namespace string
)

func getLatestStableVersion() string {
Expand All @@ -48,16 +49,25 @@ func getLatestStableVersion() string {
}

func newCmdVersion() *cobra.Command {
return &cobra.Command{
cmd := &cobra.Command{
Use: "version",
Short: "Display detailed version information",
Long: `Displays information about the version of this software.`,
Run: func(cmd *cobra.Command, _ []string) {
// TODO: add support for reporting the Cilium version running in
// the cluster, if any. See https://github.com/cilium/cilium-cli/issues/131
RunE: func(cmd *cobra.Command, args []string) error {
fmt.Printf("cilium-cli: %s compiled with %v on %v/%v\n", Version, runtime.Version(), runtime.GOOS, runtime.GOARCH)
fmt.Printf("cilium image (default): %s\n", defaults.Version)
fmt.Printf("cilium image (stable): %s\n", getLatestStableVersion())
version, err := k8sClient.GetRunningCiliumVersion(context.Background(), namespace)
if version == "" || err != nil {
fmt.Printf("cilium image (running): unknown. Unable to obtain cilium version, no cilium pods found in namespace %q\n", namespace)
} else {
fmt.Printf("cilium image (running): %s\n", version)
}
return nil
},
}

cmd.Flags().StringVar(&contextName, "context", "", "Kubernetes configuration context")
cmd.Flags().StringVarP(&namespace, "namespace", "n", "kube-system", "Namespace Cilium is running in")
return cmd
}

0 comments on commit 8c2fc33

Please sign in to comment.