Use Kubernetes 1.21.1 toolchain (#608)

Signed-off-by: Tamal Saha <[email protected]>

cmd/kubectl-dba/main.go

@@ -23,16 +23,17 @@ import (
 
 	"kubedb.dev/cli/pkg/cmds"
 
-	"gomodules.xyz/kglog"
+	"gomodules.xyz/logs"
 	_ "k8s.io/client-go/plugin/pkg/client/auth"
 )
 
 func main() {
 	rand.Seed(time.Now().UnixNano())
-	kglog.InitLogs()
-	defer kglog.FlushLogs()
 
 	cmd := cmds.NewKubeDBCommand(os.Stdin, os.Stdout, os.Stderr)
+	logs.Init(cmd, false)
+	defer logs.FlushLogs()
+
 	if err := cmd.Execute(); err != nil {
 		os.Exit(1)
 	}

go.mod

@@ -4,23 +4,22 @@ go 1.15
 
 require (
 	github.com/fatih/camelcase v1.0.0
-	github.com/golang/glog v0.0.0-20210429001901-424d2337a529
 	github.com/spf13/cobra v1.1.3
-	gomodules.xyz/kglog v0.0.1
+	gomodules.xyz/logs v0.0.2
 	gomodules.xyz/pointer v0.0.0-20201105071923-daf60fa55209
 	gomodules.xyz/runtime v0.2.0
-	gomodules.xyz/x v0.0.4
-	k8s.io/api v0.21.0
-	k8s.io/apimachinery v0.21.0
-	k8s.io/cli-runtime v0.21.0
-	k8s.io/client-go v0.21.0
-	k8s.io/component-base v0.21.0
-	k8s.io/kubectl v0.21.0
-	kmodules.xyz/client-go v0.0.0-20210505231546-fa4fb8e1d04e
-	kmodules.xyz/custom-resources v0.0.0-20210504034124-54c54fcdb690
-	kmodules.xyz/monitoring-agent-api v0.0.0-20210504040241-261c2428d207
-	kubedb.dev/apimachinery v0.18.1-0.20210506003355-e982e5902ad2
-	stash.appscode.dev/apimachinery v0.13.1-0.20210505235659-974fc12c7593
+	gomodules.xyz/x v0.0.5
+	k8s.io/api v0.21.1
+	k8s.io/apimachinery v0.21.1
+	k8s.io/cli-runtime v0.21.1
+	k8s.io/client-go v0.21.1
+	k8s.io/klog/v2 v2.8.0
+	k8s.io/kubectl v0.21.1
+	kmodules.xyz/client-go v0.0.0-20210617233340-13d22e91512b
+	kmodules.xyz/custom-resources v0.0.0-20210618003440-c6bb400da153
+	kmodules.xyz/monitoring-agent-api v0.0.0-20210618110729-9cd872c66513
+	kubedb.dev/apimachinery v0.18.1-0.20210618122709-e98fb31f5dfb
+	stash.appscode.dev/apimachinery v0.14.1-0.20210618025054-0cae462d7e04
 )
 
 replace bitbucket.org/ww/goautoneg => gomodules.xyz/goautoneg v0.0.0-20120707110453-a547fc61f48d
@@ -91,8 +90,6 @@ replace github.com/googleapis/gnostic => github.com/googleapis/gnostic v0.4.1
 
 replace github.com/imdario/mergo => github.com/imdario/mergo v0.3.5
 
-replace github.com/jetstack/cert-manager => github.com/kmodules/cert-manager v1.3.1-0.20210429172957-c5436c14ce0e
-
 replace github.com/prometheus-operator/prometheus-operator => github.com/prometheus-operator/prometheus-operator v0.47.0
 
 replace github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring => github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.47.0
@@ -109,24 +106,22 @@ replace google.golang.org/grpc => google.golang.org/grpc v1.27.1
 
 replace helm.sh/helm/v3 => github.com/kubepack/helm/v3 v3.1.0-rc.1.0.20210503022716-7e2d4913a125
 
-replace k8s.io/api => k8s.io/api v0.21.0
+replace k8s.io/api => k8s.io/api v0.21.1
 
-replace k8s.io/apimachinery => github.com/kmodules/apimachinery v0.21.1-rc.0.0.20210405112358-ad4c2289ba4c
+replace k8s.io/apimachinery => github.com/kmodules/apimachinery v0.21.2-rc.0.0.20210617231004-332981b97d2d
 
-replace k8s.io/apiserver => github.com/kmodules/apiserver v0.21.1-0.20210427013338-53dee545b83c
+replace k8s.io/apiserver => github.com/kmodules/apiserver v0.21.2-0.20210617231348-daadbf0c8d5e
 
-replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.21.0
+replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.21.1
 
-replace k8s.io/client-go => k8s.io/client-go v0.21.0
+replace k8s.io/client-go => k8s.io/client-go v0.21.1
 
-replace k8s.io/component-base => k8s.io/component-base v0.21.0
+replace k8s.io/component-base => k8s.io/component-base v0.21.1
 
 replace k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7
 
-replace k8s.io/kubernetes => github.com/kmodules/kubernetes v1.22.0-alpha.0.0.20210427080452-22d2e66bae50
+replace k8s.io/kubernetes => github.com/kmodules/kubernetes v1.22.0-alpha.0.0.20210617232219-a432af45d932
 
 replace k8s.io/utils => k8s.io/utils v0.0.0-20201110183641-67b214c5f920
 
-replace kmodules.xyz/resource-metadata => kmodules.xyz/resource-metadata v0.5.0
-
 replace sigs.k8s.io/application => github.com/kmodules/application v0.8.4-0.20210427030912-90eeee3bc4ad

pkg/cmds/root.go

@@ -17,15 +17,12 @@ limitations under the License.
 package cmds
 
 import (
-	"flag"
 	"fmt"
 	"io"
 
 	"github.com/spf13/cobra"
-	"gomodules.xyz/kglog"
 	v "gomodules.xyz/x/version"
 	"k8s.io/cli-runtime/pkg/genericclioptions"
-	cliflag "k8s.io/component-base/cli/flag"
 	cmdutil "k8s.io/kubectl/pkg/cmd/util"
 	"k8s.io/kubectl/pkg/util/templates"
 	"kmodules.xyz/client-go/tools/cli"
@@ -48,19 +45,13 @@ func NewKubeDBCommand(in io.Reader, out, err io.Writer) *cobra.Command {
 	}
 
 	flags := rootCmd.PersistentFlags()
-	// Normalize all flags that are coming from other packages or pre-configurations
-	// a.k.a. change all "_" to "-". e.g. glog package
-	flags.SetNormalizeFunc(cliflag.WordSepNormalizeFunc)
+	flags.BoolVar(&cli.EnableAnalytics, "enable-analytics", cli.EnableAnalytics, "Send analytical events to Google Analytics")
 
 	kubeConfigFlags := genericclioptions.NewConfigFlags(true)
 	kubeConfigFlags.AddFlags(flags)
 	matchVersionKubeConfigFlags := cmdutil.NewMatchVersionFlags(kubeConfigFlags)
 	matchVersionKubeConfigFlags.AddFlags(flags)
 
-	flags.AddGoFlagSet(flag.CommandLine)
-	kglog.ParseFlags()
-	flags.BoolVar(&cli.EnableAnalytics, "enable-analytics", cli.EnableAnalytics, "Send analytical events to Google Analytics")
-
 	f := cmdutil.NewFactory(matchVersionKubeConfigFlags)
 
 	ioStreams := genericclioptions.IOStreams{In: in, Out: out, ErrOut: err}

pkg/describer/describer.go

@@ -30,7 +30,6 @@ import (
 	cs "kubedb.dev/apimachinery/client/clientset/versioned/typed/kubedb/v1alpha2"
 	"kubedb.dev/cli/pkg/events"
 
-	"github.com/golang/glog"
 	appsv1 "k8s.io/api/apps/v1"
 	core "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/meta"
@@ -43,6 +42,7 @@ import (
 	"k8s.io/client-go/kubernetes"
 	coreclient "k8s.io/client-go/kubernetes/typed/core/v1"
 	"k8s.io/client-go/rest"
+	"k8s.io/klog/v2"
 	"k8s.io/kubectl/pkg/describe"
 	meta_util "kmodules.xyz/client-go/meta"
 	appcat_cs "kmodules.xyz/custom-resources/client/clientset/versioned"
@@ -117,7 +117,7 @@ func describerMap(clientConfig *rest.Config) (map[schema.GroupKind]describe.Reso
 func DescriberFor(kind schema.GroupKind, clientConfig *rest.Config) (describe.ResourceDescriber, bool) {
 	describers, err := describerMap(clientConfig)
 	if err != nil {
-		glog.V(1).Info(err)
+		klog.V(1).Info(err)
 		return nil, false
 	}