treewide: switch to gomod and bump everything
This switches version resolution from fietsje to gomod and updates
all Go dependencies. It also bumps rules_go (required by gVisor) and
switches the Gazelle naming convention from go_default_xxx to the
standard Bazel convention of the default target having the package
name.
Since Kubernetes dropped upstream Bazel support and doesn't check in
all generated files I manually pregenerated the OpenAPI spec. This
should be fixed, but because of the already-huge scope of this CL
and the rebase complexity this is not in here.
Change-Id: Iec8ea613d06946882426c2f9fad5bda7e8aaf833
Reviewed-on: https://review.monogon.dev/c/monogon/+/639
Reviewed-by: Sergiusz Bazanski <serge@monogon.tech>
Reviewed-by: Leopold Schabel <leo@nexantic.com>
diff --git a/metropolis/cli/dbg/main.go b/metropolis/cli/dbg/main.go
index 99aff6c..c2c0cb9 100644
--- a/metropolis/cli/dbg/main.go
+++ b/metropolis/cli/dbg/main.go
@@ -26,12 +26,12 @@
"strings"
"time"
- "github.com/spf13/pflag"
"google.golang.org/grpc"
- cliflag "k8s.io/component-base/cli/flag"
+ "k8s.io/cli-runtime/pkg/genericclioptions"
+ "k8s.io/component-base/cli"
+ "k8s.io/kubectl/pkg/cmd"
"k8s.io/kubectl/pkg/cmd/plugin"
- "k8s.io/kubectl/pkg/util/logs"
- "k8s.io/kubernetes/pkg/kubectl/cmd"
+ "k8s.io/kubectl/pkg/cmd/util"
"source.monogon.dev/metropolis/pkg/logtree"
apb "source.monogon.dev/metropolis/proto/api"
@@ -168,14 +168,15 @@
// https://github.com/kubernetes/kubernetes/blob/master/cmd/kubectl/kubectl.go
os.Setenv("KUBECONFIG", kubeconfigFile.Name())
rand.Seed(time.Now().UnixNano())
- pflag.CommandLine.SetNormalizeFunc(cliflag.WordSepNormalizeFunc)
- pflag.CommandLine.AddGoFlagSet(flag.CommandLine)
- logs.InitLogs()
- defer logs.FlushLogs()
- command := cmd.NewDefaultKubectlCommandWithArgs(cmd.NewDefaultPluginHandler(plugin.ValidPluginFilenamePrefixes), os.Args[2:], os.Stdin, os.Stdout, os.Stderr)
- command.SetArgs(os.Args[2:])
- if err := command.Execute(); err != nil {
- os.Exit(1)
+ command := cmd.NewDefaultKubectlCommandWithArgs(cmd.KubectlOptions{
+ PluginHandler: cmd.NewDefaultPluginHandler(plugin.ValidPluginFilenamePrefixes),
+ Arguments: os.Args[2:],
+ ConfigFlags: genericclioptions.NewConfigFlags(true).WithDiscoveryBurst(300).WithDiscoveryQPS(50.0),
+ IOStreams: genericclioptions.IOStreams{In: os.Stdin, Out: os.Stdout, ErrOut: os.Stderr},
+ })
+ if err := cli.RunNoErrOutput(command); err != nil {
+ // Pretty-print the error and exit with an error.
+ util.CheckErr(err)
}
case "trace":
traceCmd.Parse(os.Args[2:])