refactor: Clean up log flag setup

Signed-off-by: Justin Toh <[email protected]>
futuretea · Oct 3, 2021 · 9df6f14 · 9df6f14
1 parent 9ee4162
commit 9df6f14
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 21 deletions.
diff --git a/cmd/kube-lineage/flags.go b/cmd/kube-lineage/flags.go
diff --git a/cmd/kube-lineage/main.go b/cmd/kube-lineage/main.go
@@ -1,6 +1,7 @@
 package main
 
 import (
+	"fmt"
 	"os"
 	"path/filepath"
 	"strings"
@@ -9,6 +10,7 @@ import (
 	"github.com/spf13/pflag"
 	"k8s.io/cli-runtime/pkg/genericclioptions"
 
+	"github.com/tohjustin/kube-lineage/internal/version"
 	"github.com/tohjustin/kube-lineage/pkg/cmd/helm"
 	"github.com/tohjustin/kube-lineage/pkg/cmd/lineage"
 )
@@ -26,8 +28,8 @@ func init() {
 func NewCmd(streams genericclioptions.IOStreams) *cobra.Command {
 	cmd := lineage.NewCmd(streams, rootCmdName, "")
 	cmd.AddCommand(helm.NewCmd(streams, "", rootCmdName))
-	addLogFlags(cmd)
-	addVersionFlags(cmd)
+	cmd.SetVersionTemplate("{{printf \"%s\" .Version}}\n")
+	cmd.Version = fmt.Sprintf("%#v", version.Get())
 	return cmd
 }
 

diff --git a/pkg/cmd/lineage/lineage.go b/pkg/cmd/lineage/lineage.go
@@ -25,6 +25,7 @@ import (
 	"k8s.io/kubectl/pkg/util/templates"
 
 	"github.com/tohjustin/kube-lineage/internal/graph"
+	"github.com/tohjustin/kube-lineage/internal/log"
 	lineageprinters "github.com/tohjustin/kube-lineage/internal/printers"
 )
 
@@ -149,6 +150,7 @@ func NewCmd(streams genericclioptions.IOStreams, name, parentCmdPath string) *co
 
 	o.ConfigFlags.AddFlags(cmd.Flags())
 	o.PrintFlags.AddFlags(cmd.Flags())
+	log.AddFlags(cmd.Flags())
 
 	return cmd
 }