From 601dbe3a76b6f533ce890938a0ef2e9e0d00f9d2 Mon Sep 17 00:00:00 2001 From: klaases <93291761+klaases@users.noreply.github.com> Date: Wed, 19 Jan 2022 12:16:32 -0800 Subject: [PATCH 01/38] Remove `(see NFS mounts)` as link no longer exists Fixes #12898 Correct documentation for macOS as Hyperkit is not supported on Linux. Before: HyperKit | Linux | Unsupported | (see NFS mounts) | After: HyperKit | macOS | Unsupported | | --- site/content/en/docs/handbook/mount.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/content/en/docs/handbook/mount.md b/site/content/en/docs/handbook/mount.md index 8a020a7d96..4aeefff1e8 100644 --- a/site/content/en/docs/handbook/mount.md +++ b/site/content/en/docs/handbook/mount.md @@ -74,7 +74,7 @@ Some hypervisors, have built-in host folder sharing. Driver mounts are reliable | VirtualBox | Windows | C://Users | /c/Users | | VMware Fusion | macOS | /Users | /mnt/hgfs/Users | | KVM | Linux | Unsupported | | -| HyperKit | Linux | Unsupported (see NFS mounts) | | +| HyperKit | macOS | Unsupported | | These mounts can be disabled by passing `--disable-driver-mounts` to `minikube start`. From 507019db3c82158da495ec54a0d530f9b2e78b58 Mon Sep 17 00:00:00 2001 From: klaases Date: Tue, 25 Jan 2022 12:08:15 -0800 Subject: [PATCH 02/38] Add hyperkit flags documentation. --- site/content/en/docs/handbook/mount.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/site/content/en/docs/handbook/mount.md b/site/content/en/docs/handbook/mount.md index 4aeefff1e8..b15f148f8b 100644 --- a/site/content/en/docs/handbook/mount.md +++ b/site/content/en/docs/handbook/mount.md @@ -74,10 +74,14 @@ Some hypervisors, have built-in host folder sharing. Driver mounts are reliable | VirtualBox | Windows | C://Users | /c/Users | | VMware Fusion | macOS | /Users | /mnt/hgfs/Users | | KVM | Linux | Unsupported | | -| HyperKit | macOS | Unsupported | | +| HyperKit | macOS | Supported | | These mounts can be disabled by passing `--disable-driver-mounts` to `minikube start`. +HyperKit mounts can use the following flags: +`--nfs-share=[]`: Local folders to share with Guest via NFS mounts +`--nfs-shares-root='/nfsshares'`: Where to root the NFS Shares, defaults to /nfsshares + ## File Sync See [File Sync]({{}}) From 513a757ca7b5cf3cf88be5494a897b091c5983d6 Mon Sep 17 00:00:00 2001 From: Tomohito YABU Date: Sat, 19 Mar 2022 10:15:37 +0900 Subject: [PATCH 03/38] Fix port validation error on specifying tcp/udp or range of ports. --- cmd/minikube/cmd/start.go | 21 +++---- cmd/minikube/cmd/start_test.go | 112 ++++++++++++++++++++++++++++----- 2 files changed, 107 insertions(+), 26 deletions(-) diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go index ee8483447f..911427b19e 100644 --- a/cmd/minikube/cmd/start.go +++ b/cmd/minikube/cmd/start.go @@ -34,6 +34,7 @@ import ( "github.com/Delta456/box-cli-maker/v2" "github.com/blang/semver/v4" + "github.com/docker/go-connections/nat" "github.com/docker/machine/libmachine/ssh" "github.com/google/go-containerregistry/pkg/authn" "github.com/google/go-containerregistry/pkg/name" @@ -1246,24 +1247,20 @@ func validateFlags(cmd *cobra.Command, drvName string) { // This function validates that the --ports are not below 1024 for the host and not outside range func validatePorts(ports []string) error { - for _, portDuplet := range ports { - parts := strings.Split(portDuplet, ":") - if len(parts) > 2 { - ip := parts[0] - if net.ParseIP(ip) == nil { - return errors.Errorf("Sorry, the IP address provided with --ports flag is invalid: %s", ip) - } - parts = parts[1:] - } - for i, port := range parts { - p, err := strconv.Atoi(port) + _, portBindingsMap, err := nat.ParsePortSpecs(ports) + if err != nil { + return errors.Errorf("Sorry, one of the ports provided with --ports flag is not valid %s (%v)", ports, err) + } + for _, portBindings := range portBindingsMap { + for _, portBinding := range portBindings { + p, err := strconv.Atoi(portBinding.HostPort) if err != nil { return errors.Errorf("Sorry, one of the ports provided with --ports flag is not valid %s", ports) } if p > 65535 || p < 1 { return errors.Errorf("Sorry, one of the ports provided with --ports flag is outside range %s", ports) } - if detect.IsMicrosoftWSL() && p < 1024 && i == 0 { + if detect.IsMicrosoftWSL() && p < 1024 { return errors.Errorf("Sorry, you cannot use privileged ports on the host (below 1024) %s", ports) } } diff --git a/cmd/minikube/cmd/start_test.go b/cmd/minikube/cmd/start_test.go index 5deda2938d..288fc5712f 100644 --- a/cmd/minikube/cmd/start_test.go +++ b/cmd/minikube/cmd/start_test.go @@ -462,40 +462,124 @@ func TestValidateRuntime(t *testing.T) { } func TestValidatePorts(t *testing.T) { + isMicrosoftWSL := detect.IsMicrosoftWSL() type portTest struct { + isTarget bool ports []string errorMsg string } var tests = []portTest{ { - ports: []string{"test:80"}, - errorMsg: "Sorry, one of the ports provided with --ports flag is not valid [test:80]", + isTarget: true, + ports: []string{"8080:80"}, + errorMsg: "", }, { + isTarget: true, + ports: []string{"8080:80/tcp", "8080:80/udp"}, + errorMsg: "", + }, + { + isTarget: true, + ports: []string{"test:8080"}, + errorMsg: "Sorry, one of the ports provided with --ports flag is not valid [test:8080] (Invalid hostPort: test)", + }, + { + isTarget: true, ports: []string{"0:80"}, errorMsg: "Sorry, one of the ports provided with --ports flag is outside range [0:80]", }, { - ports: []string{"8080:80", "6443:443"}, + isTarget: true, + ports: []string{"0:80/tcp"}, + errorMsg: "Sorry, one of the ports provided with --ports flag is outside range [0:80/tcp]", + }, + { + isTarget: true, + ports: []string{"65536:80/udp"}, + errorMsg: "Sorry, one of the ports provided with --ports flag is not valid [65536:80/udp] (Invalid hostPort: 65536)", + }, + { + isTarget: true, + ports: []string{"0-1:80-81/tcp"}, + errorMsg: "Sorry, one of the ports provided with --ports flag is outside range [0-1:80-81/tcp]", + }, + { + isTarget: true, + ports: []string{"0-1:80-81/udp"}, + errorMsg: "Sorry, one of the ports provided with --ports flag is outside range [0-1:80-81/udp]", + }, + { + isTarget: !isMicrosoftWSL, + ports: []string{"80:80", "1023-1025:8023-8025", "1023-1025:8023-8025/tcp", "1023-1025:8023-8025/udp"}, errorMsg: "", }, { - ports: []string{"127.0.0.1:80:80"}, - errorMsg: "", - }, - { - ports: []string{"1000.0.0.1:80:80"}, - errorMsg: "Sorry, the IP address provided with --ports flag is invalid: 1000.0.0.1", - }, - } - if detect.IsMicrosoftWSL() { - tests = append(tests, portTest{ + isTarget: isMicrosoftWSL, ports: []string{"80:80"}, errorMsg: "Sorry, you cannot use privileged ports on the host (below 1024) [80:80]", - }) + }, + { + isTarget: isMicrosoftWSL, + ports: []string{"1023-1025:8023-8025"}, + errorMsg: "Sorry, you cannot use privileged ports on the host (below 1024) [1023-1025:8023-8025]", + }, + { + isTarget: isMicrosoftWSL, + ports: []string{"1023-1025:8023-8025/tcp"}, + errorMsg: "Sorry, you cannot use privileged ports on the host (below 1024) [1023-1025:8023-8025/tcp]", + }, + { + isTarget: isMicrosoftWSL, + ports: []string{"1023-1025:8023-8025/udp"}, + errorMsg: "Sorry, you cannot use privileged ports on the host (below 1024) [1023-1025:8023-8025/udp]", + }, + { + isTarget: true, + ports: []string{"127.0.0.1:8080:80", "127.0.0.1:8081:80/tcp", "127.0.0.1:8081:80/udp", "127.0.0.1:8082-8083:8082-8083/tcp"}, + errorMsg: "", + }, + { + isTarget: true, + ports: []string{"1000.0.0.1:80:80"}, + errorMsg: "Sorry, one of the ports provided with --ports flag is not valid [1000.0.0.1:80:80] (Invalid ip address: 1000.0.0.1)", + }, + { + isTarget: !isMicrosoftWSL, + ports: []string{"127.0.0.1:80:80", "127.0.0.1:81:81/tcp", "127.0.0.1:81:81/udp", "127.0.0.1:82-83:82-83/tcp", "127.0.0.1:82-83:82-83/udp"}, + errorMsg: "", + }, + { + isTarget: isMicrosoftWSL, + ports: []string{"127.0.0.1:80:80"}, + errorMsg: "Sorry, you cannot use privileged ports on the host (below 1024) [127.0.0.1:80:80]", + }, + { + isTarget: isMicrosoftWSL, + ports: []string{"127.0.0.1:81:81/tcp"}, + errorMsg: "Sorry, you cannot use privileged ports on the host (below 1024) [127.0.0.1:81:81/tcp]", + }, + { + isTarget: isMicrosoftWSL, + ports: []string{"127.0.0.1:81:81/udp"}, + errorMsg: "Sorry, you cannot use privileged ports on the host (below 1024) [127.0.0.1:81:81/udp]", + }, + { + isTarget: isMicrosoftWSL, + ports: []string{"127.0.0.1:80-83:80-83/tcp"}, + errorMsg: "Sorry, you cannot use privileged ports on the host (below 1024) [127.0.0.1:80-83:80-83/tcp]", + }, + { + isTarget: isMicrosoftWSL, + ports: []string{"127.0.0.1:80-83:80-83/udp"}, + errorMsg: "Sorry, you cannot use privileged ports on the host (below 1024) [127.0.0.1:80-83:80-83/udp]", + }, } for _, test := range tests { t.Run(strings.Join(test.ports, ","), func(t *testing.T) { + if !test.isTarget { + return + } gotError := "" got := validatePorts(test.ports) if got != nil { From 1832ed6ff5e420b7c2f0e4fcda122dc70299dc83 Mon Sep 17 00:00:00 2001 From: Tomohito YABU Date: Wed, 23 Mar 2022 13:20:51 +0900 Subject: [PATCH 04/38] Update validatePorts function comment for goDoc. --- cmd/minikube/cmd/start.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go index 911427b19e..22e7002189 100644 --- a/cmd/minikube/cmd/start.go +++ b/cmd/minikube/cmd/start.go @@ -1245,7 +1245,7 @@ func validateFlags(cmd *cobra.Command, drvName string) { validateInsecureRegistry() } -// This function validates that the --ports are not below 1024 for the host and not outside range +// validatePorts validates that the --ports are not below 1024 for the host and not outside range func validatePorts(ports []string) error { _, portBindingsMap, err := nat.ParsePortSpecs(ports) if err != nil { From afb3956fdbde357e4baa0f8617bfd5a64bad6558 Mon Sep 17 00:00:00 2001 From: Tomohito YABU Date: Thu, 24 Mar 2022 09:33:55 +0900 Subject: [PATCH 05/38] Add comment to TestValidatePorts. --- cmd/minikube/cmd/start_test.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cmd/minikube/cmd/start_test.go b/cmd/minikube/cmd/start_test.go index 288fc5712f..0ce1ce971c 100644 --- a/cmd/minikube/cmd/start_test.go +++ b/cmd/minikube/cmd/start_test.go @@ -464,6 +464,8 @@ func TestValidateRuntime(t *testing.T) { func TestValidatePorts(t *testing.T) { isMicrosoftWSL := detect.IsMicrosoftWSL() type portTest struct { + // isTarget indicates whether or not the test case is covered + // because validatePorts behaves differently depending on whether process is running in WSL in windows or not. isTarget bool ports []string errorMsg string From 92ab555928875127fad560f303ea76688ea63ee8 Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Sat, 26 Mar 2022 23:20:12 +0900 Subject: [PATCH 06/38] Support rootless Podman driver, take 2 Usage: ``` minikube config set rootless true minikube start --driver=podman --container-runtime=(cri-o|containerd)` ``` Tested on Podman 4.0.2, Ubuntu 21.10. Needs cgroup v2 (as in Rootless Docker): https://rootlesscontaine.rs/getting-started/common/cgroup2/ See also `site/content/en/docs/drivers/includes/podman_usage.inc` Fix issue 8719 Fix issue 12460 Replace PR 12901 Changes from PR 12901: `rootless` is now a config property. In the previous PR, `--rootless` was implemented as a flag for `minikube start` Signed-off-by: Akihiro Suda --- cmd/minikube/cmd/config/config.go | 4 ++ cmd/minikube/cmd/root.go | 7 ++++ cmd/minikube/cmd/start_flags.go | 10 +++++ pkg/drivers/kic/oci/cli_runner.go | 37 +++++++++++++++++-- pkg/drivers/kic/oci/info.go | 8 ++-- pkg/drivers/kic/oci/oci.go | 4 +- pkg/minikube/config/config.go | 2 + pkg/minikube/constants/constants.go | 2 + pkg/minikube/registry/drvs/podman/podman.go | 5 ++- site/content/en/docs/drivers/docker.md | 3 ++ .../en/docs/drivers/includes/podman_usage.inc | 11 ++++++ 11 files changed, 83 insertions(+), 10 deletions(-) diff --git a/cmd/minikube/cmd/config/config.go b/cmd/minikube/cmd/config/config.go index 738ac8badc..6271fc0e0d 100644 --- a/cmd/minikube/cmd/config/config.go +++ b/cmd/minikube/cmd/config/config.go @@ -163,6 +163,10 @@ var settings = []Setting{ name: "native-ssh", set: SetBool, }, + { + name: config.Rootless, + set: SetBool, + }, } // ConfigCmd represents the config command diff --git a/cmd/minikube/cmd/root.go b/cmd/minikube/cmd/root.go index dd5d239a8e..870518cddc 100644 --- a/cmd/minikube/cmd/root.go +++ b/cmd/minikube/cmd/root.go @@ -72,6 +72,12 @@ var RootCmd = &cobra.Command{ out.WarningT("User name '{{.username}}' is not valid", out.V{"username": userName}) exit.Message(reason.Usage, "User name must be 60 chars or less.") } + // viper maps $MINIKUBE_ROOTLESS to "rootless" property automatically, but it does not do vice versa, + // so we map "rootless" property to $MINIKUBE_ROOTLESS expliclity here. + // $MINIKUBE_ROOTLESS is referred by KIC runner, which is decoupled from viper. + if viper.GetBool(config.Rootless) { + os.Setenv(constants.MinikubeRootlessEnv, "true") + } }, } @@ -206,6 +212,7 @@ func init() { RootCmd.PersistentFlags().StringP(config.ProfileName, "p", constants.DefaultClusterName, `The name of the minikube VM being used. This can be set to allow having multiple instances of minikube independently.`) RootCmd.PersistentFlags().StringP(configCmd.Bootstrapper, "b", "kubeadm", "The name of the cluster bootstrapper that will set up the Kubernetes cluster.") RootCmd.PersistentFlags().String(config.UserFlag, "", "Specifies the user executing the operation. Useful for auditing operations executed by 3rd party tools. Defaults to the operating system username.") + RootCmd.PersistentFlags().Bool(config.Rootless, false, "Force to use rootless driver (docker and podman driver only)") groups := templates.CommandGroups{ { diff --git a/cmd/minikube/cmd/start_flags.go b/cmd/minikube/cmd/start_flags.go index cbabf6d71a..e83a1f59ec 100644 --- a/cmd/minikube/cmd/start_flags.go +++ b/cmd/minikube/cmd/start_flags.go @@ -555,12 +555,22 @@ func generateNewConfigFromFlags(cmd *cobra.Command, k8sVersion string, rtime str exit.Message(reason.Usage, "Ensure your {{.driver_name}} is running and is healthy.", out.V{"driver_name": driver.FullName(drvName)}) } if si.Rootless { + out.Styled(style.Notice, "Using rootless {{.driver_name}} driver", out.V{"driver_name": driver.FullName(drvName)}) if cc.KubernetesConfig.ContainerRuntime == constants.Docker { exit.Message(reason.Usage, "--container-runtime must be set to \"containerd\" or \"cri-o\" for rootless") } // KubeletInUserNamespace feature gate is essential for rootless driver. // See https://kubernetes.io/docs/tasks/administer-cluster/kubelet-in-userns/ cc.KubernetesConfig.FeatureGates = addFeatureGate(cc.KubernetesConfig.FeatureGates, "KubeletInUserNamespace=true") + } else { + if oci.IsRootlessForced() { + if driver.IsDocker(drvName) { + exit.Message(reason.Usage, "Using rootless Docker driver was required, but the current Docker does not seem rootless. Try 'docker context use rootless' .") + } else { + exit.Message(reason.Usage, "Using rootless driver was required, but the current driver does not seem rootless") + } + } + out.Styled(style.Notice, "Using {{.driver_name}} driver with the root privilege", out.V{"driver_name": driver.FullName(drvName)}) } if si.StorageDriver == "btrfs" { klog.Info("auto-setting LocalStorageCapacityIsolation to false because using btrfs storage driver") diff --git a/pkg/drivers/kic/oci/cli_runner.go b/pkg/drivers/kic/oci/cli_runner.go index 9294eaeb59..9c39d61682 100644 --- a/pkg/drivers/kic/oci/cli_runner.go +++ b/pkg/drivers/kic/oci/cli_runner.go @@ -31,6 +31,7 @@ import ( "k8s.io/klog/v2" + "k8s.io/minikube/pkg/minikube/constants" "k8s.io/minikube/pkg/minikube/out" "k8s.io/minikube/pkg/minikube/style" ) @@ -72,10 +73,40 @@ func (rr RunResult) Output() string { return sb.String() } +// IsRootlessForced returns whether rootless mode is explicitly required. +func IsRootlessForced() bool { + s := os.Getenv(constants.MinikubeRootlessEnv) + if s == "" { + return false + } + v, err := strconv.ParseBool(s) + if err != nil { + klog.ErrorS(err, "failed to parse", "env", constants.MinikubeRootlessEnv, "value", s) + return false + } + return v +} + +type prefixCmdOptions struct { + sudoFlags []string +} + +type PrefixCmdOption func(*prefixCmdOptions) + +func WithSudoFlags(ss ...string) PrefixCmdOption { + return func(o *prefixCmdOptions) { + o.sudoFlags = ss + } +} + // PrefixCmd adds any needed prefix (such as sudo) to the command -func PrefixCmd(cmd *exec.Cmd) *exec.Cmd { - if cmd.Args[0] == Podman && runtime.GOOS == "linux" { // want sudo when not running podman-remote - cmdWithSudo := exec.Command("sudo", append([]string{"-n"}, cmd.Args...)...) +func PrefixCmd(cmd *exec.Cmd, opt ...PrefixCmdOption) *exec.Cmd { + var o prefixCmdOptions + for _, f := range opt { + f(&o) + } + if cmd.Args[0] == Podman && runtime.GOOS == "linux" && !IsRootlessForced() { // want sudo when not running podman-remote + cmdWithSudo := exec.Command("sudo", append(append([]string{"-n"}, o.sudoFlags...), cmd.Args...)...) cmdWithSudo.Env = cmd.Env cmdWithSudo.Dir = cmd.Dir cmdWithSudo.Stdin = cmd.Stdin diff --git a/pkg/drivers/kic/oci/info.go b/pkg/drivers/kic/oci/info.go index 23aff7296a..b8c7cf33ca 100644 --- a/pkg/drivers/kic/oci/info.go +++ b/pkg/drivers/kic/oci/info.go @@ -59,7 +59,7 @@ func CachedDaemonInfo(ociBin string) (SysInfo, error) { func DaemonInfo(ociBin string) (SysInfo, error) { if ociBin == Podman { p, err := podmanSystemInfo() - cachedSysInfo = &SysInfo{CPUs: p.Host.Cpus, TotalMemory: p.Host.MemTotal, OSType: p.Host.Os, Swarm: false, StorageDriver: p.Store.GraphDriverName} + cachedSysInfo = &SysInfo{CPUs: p.Host.Cpus, TotalMemory: p.Host.MemTotal, OSType: p.Host.Os, Swarm: false, Rootless: p.Host.Security.Rootless, StorageDriver: p.Store.GraphDriverName} return *cachedSysInfo, err } d, err := dockerSystemInfo() @@ -213,8 +213,10 @@ type podmanSysInfo struct { Hostname string `json:"hostname"` Kernel string `json:"kernel"` Os string `json:"os"` - Rootless bool `json:"rootless"` - Uptime string `json:"uptime"` + Security struct { + Rootless bool `json:"rootless"` + } `json:"security"` + Uptime string `json:"uptime"` } `json:"host"` Registries struct { Search []string `json:"search"` diff --git a/pkg/drivers/kic/oci/oci.go b/pkg/drivers/kic/oci/oci.go index fe54727e2d..91337ff82c 100644 --- a/pkg/drivers/kic/oci/oci.go +++ b/pkg/drivers/kic/oci/oci.go @@ -312,7 +312,7 @@ func createContainer(ociBin string, image string, opts ...createOpt) error { // to run nested container from privileged container in podman https://bugzilla.redhat.com/show_bug.cgi?id=1687713 // only add when running locally (linux), when running remotely it needs to be configured on server in libpod.conf - if ociBin == Podman && runtime.GOOS == "linux" { + if ociBin == Podman && runtime.GOOS == "linux" && !IsRootlessForced() { args = append(args, "--cgroup-manager", "cgroupfs") } @@ -342,7 +342,7 @@ func StartContainer(ociBin string, container string) error { // to run nested container from privileged container in podman https://bugzilla.redhat.com/show_bug.cgi?id=1687713 // only add when running locally (linux), when running remotely it needs to be configured on server in libpod.conf - if ociBin == Podman && runtime.GOOS == "linux" { + if ociBin == Podman && runtime.GOOS == "linux" && !IsRootlessForced() { args = append(args, "--cgroup-manager", "cgroupfs") } diff --git a/pkg/minikube/config/config.go b/pkg/minikube/config/config.go index aba63f0b97..d93352604c 100644 --- a/pkg/minikube/config/config.go +++ b/pkg/minikube/config/config.go @@ -44,6 +44,8 @@ const ( ProfileName = "profile" // UserFlag is the key for the global user flag (ex. --user=user1) UserFlag = "user" + // Rootless is the key for the global rootless parameter (boolean) + Rootless = "rootless" // AddonImages stores custom addon images config AddonImages = "addon-images" // AddonRegistries stores custom addon images config diff --git a/pkg/minikube/constants/constants.go b/pkg/minikube/constants/constants.go index 8eb3f72ccf..b22938943b 100644 --- a/pkg/minikube/constants/constants.go +++ b/pkg/minikube/constants/constants.go @@ -99,6 +99,8 @@ const ( TestDiskUsedEnv = "MINIKUBE_TEST_STORAGE_CAPACITY" // TestDiskAvailableEnv is used in integration tests for insufficient storage with 'minikube status' (in GiB) TestDiskAvailableEnv = "MINIKUBE_TEST_AVAILABLE_STORAGE" + // MinikubeRootlessEnv is used to force Rootless Docker/Podman driver + MinikubeRootlessEnv = "MINIKUBE_ROOTLESS" // scheduled stop constants diff --git a/pkg/minikube/registry/drvs/podman/podman.go b/pkg/minikube/registry/drvs/podman/podman.go index ad3e6afc42..00f0313d1c 100644 --- a/pkg/minikube/registry/drvs/podman/podman.go +++ b/pkg/minikube/registry/drvs/podman/podman.go @@ -113,7 +113,8 @@ func status() registry.State { cmd := exec.CommandContext(ctx, oci.Podman, "version", "--format", "{{.Server.Version}}") // Run with sudo on linux (local), otherwise podman-remote (as podman) if runtime.GOOS == "linux" { - cmd = exec.CommandContext(ctx, "sudo", "-k", "-n", oci.Podman, "version", "--format", "{{.Version}}") + cmd = exec.CommandContext(ctx, oci.Podman, "version", "--format", "{{.Version}}") + cmd = oci.PrefixCmd(cmd, oci.WithSudoFlags("-k")) cmd.Env = append(os.Environ(), "LANG=C", "LC_ALL=C") // sudo is localized } o, err := cmd.Output() @@ -151,7 +152,7 @@ func status() registry.State { newErr := fmt.Errorf(`%q %v: %s`, strings.Join(cmd.Args, " "), exitErr, stderr) if strings.Contains(stderr, "a password is required") && runtime.GOOS == "linux" { - return registry.State{Error: newErr, Installed: true, Healthy: false, Fix: fmt.Sprintf("Add your user to the 'sudoers' file: '%s ALL=(ALL) NOPASSWD: %s'", username, podman), Doc: "https://podman.io"} + return registry.State{Error: newErr, Installed: true, Healthy: false, Fix: fmt.Sprintf("Add your user to the 'sudoers' file: '%s ALL=(ALL) NOPASSWD: %s' , or run 'minikube config set rootless true'", username, podman), Doc: "https://podman.io"} } // Typical low-level errors from running podman-remote: diff --git a/site/content/en/docs/drivers/docker.md b/site/content/en/docs/drivers/docker.md index 8f312a983a..685802cccb 100644 --- a/site/content/en/docs/drivers/docker.md +++ b/site/content/en/docs/drivers/docker.md @@ -46,6 +46,9 @@ docker context use rootless minikube start --driver=docker --container-runtime=containerd ``` +Unlike Podman driver, it is not necessary to set the `rootless` property of minikube (`minikube config set rootless true`). +When the `rootless` property is explicitly set but the current Docker host is not rootless, minikube fails with an error. + The `--container-runtime` flag must be set to "containerd" or "cri-o". {{% /tab %}} {{% /tabs %}} diff --git a/site/content/en/docs/drivers/includes/podman_usage.inc b/site/content/en/docs/drivers/includes/podman_usage.inc index 309044c448..bb0395eacb 100644 --- a/site/content/en/docs/drivers/includes/podman_usage.inc +++ b/site/content/en/docs/drivers/includes/podman_usage.inc @@ -21,3 +21,14 @@ To make podman the default driver: ```shell minikube config set driver podman ``` + +## Rootless Podman + +By default, minikube executes Podman with `sudo`. +To use Podman without `sudo` (i.e., Rootless Podman), set the `rootless` property to `true`: + +```shell +minikube config set rootless true +``` + +See the [Rootless Docker](https://minikube.sigs.k8s.io/docs/drivers/docker/#rootless-docker) section for the requirements and the restrictions. From a439922dc11796ad4f897fd5a5f32375d97f0263 Mon Sep 17 00:00:00 2001 From: Ashwin Somasundara Date: Tue, 5 Apr 2022 08:52:24 -0400 Subject: [PATCH 07/38] Update windows kubectl alias documentation --- site/content/en/docs/handbook/kubectl.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/site/content/en/docs/handbook/kubectl.md b/site/content/en/docs/handbook/kubectl.md index 592706526a..d559dbadc1 100644 --- a/site/content/en/docs/handbook/kubectl.md +++ b/site/content/en/docs/handbook/kubectl.md @@ -51,10 +51,19 @@ ln -s $(which minikube) /usr/local/bin/kubectl {{% windowstab %}} You can also alias kubectl for easier usage. +Powershell. + ```shell function kubectl { minikube kubectl -- $args } ``` +Command Prompt. + +```shell +doskey kubectl=minikube kubectl $* +``` + + {{% /windowstab %}} {{% /tabs %}} From f3c47136b84fe7e4ab5483c2977ce0dd0bf65202 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Thu, 7 Apr 2022 02:48:43 +0430 Subject: [PATCH 08/38] output error details when minikube fails to start --- gui/window.cpp | 109 ++++++++++++++++++++++++++++++++++++++++++++----- gui/window.h | 1 + 2 files changed, 100 insertions(+), 10 deletions(-) diff --git a/gui/window.cpp b/gui/window.cpp index 1898b77e6e..cd47e0dd50 100644 --- a/gui/window.cpp +++ b/gui/window.cpp @@ -194,9 +194,14 @@ void Window::createTrayIcon() void Window::startMinikube() { - QStringList args = { "start", "-p", selectedCluster() }; - sendMinikubeCommand(args); + QString text; + QStringList args = { "start", "-p", selectedCluster(), "-o", "json" }; + bool success = sendMinikubeCommand(args, text); updateClusters(); + if (success) { + return; + } + outputFailedStart(text); } void Window::stopMinikube() @@ -415,18 +420,18 @@ bool Window::sendMinikubeCommand(QStringList cmds, QString &text) } QStringList arguments; arguments << cmds; - bool success; QProcess *process = new QProcess(this); process->start(program, arguments); this->setCursor(Qt::WaitCursor); - success = process->waitForFinished(300 * 1000); + bool timedOut = process->waitForFinished(300 * 1000); + int exitCode = process->exitCode(); + bool success = !timedOut && exitCode == 0; this->unsetCursor(); + text = process->readAllStandardOutput(); if (success) { - text = process->readAllStandardOutput(); } else { - qDebug() << process->readAllStandardOutput(); qDebug() << process->readAllStandardError(); } delete process; @@ -459,8 +464,13 @@ void Window::askName() int code = dialog.exec(); profile = profileField.text(); if (code == QDialog::Accepted) { - QStringList arg = { "start", "-p", profile }; - sendMinikubeCommand(arg); + QStringList arg = { "start", "-p", profile, "-o", "json" }; + QString text; + bool success = sendMinikubeCommand(arg, text); + if (success) { + return; + } + outputFailedStart(text); } else if (code == QDialog::Rejected) { askCustom(); } @@ -522,8 +532,87 @@ void Window::askCustom() "--cpus", QString::number(cpus), "--memory", - QString::number(memory) }; - sendMinikubeCommand(args); + QString::number(memory), + "-o", + "json" + }; + QString text; + bool success = sendMinikubeCommand(args, text); + if (success) { + return; + } + outputFailedStart(text); + } +} + +void Window::outputFailedStart(QString text) { + QStringList lines; +#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) + lines = text.split("\n", Qt::SkipEmptyParts); +#else + lines = text.split("\n", QString::SkipEmptyParts); +#endif + for (int i = 0; i < lines.size(); i++) { + QString line = lines.at(i); + QJsonParseError error; + QJsonDocument json = QJsonDocument::fromJson(line.toUtf8(), &error); + if (json.isNull() || !json.isObject()) { + continue; + } + QJsonObject par = json.object(); + QJsonObject data = par["data"].toObject(); + if (!data.contains("exitcode")) { + continue; + } + QString advice = data["advice"].toString(); + QString message = data["message"].toString(); + QString name = data["name"].toString(); + QString url = data["url"].toString(); + QString issues = data["issues"].toString(); + + QDialog dialog; + dialog.setWindowTitle(tr("minikube start failed")); + dialog.setWindowIcon(*trayIconIcon); + dialog.setFixedWidth(600); + dialog.setModal(true); + QFormLayout form(&dialog); + QLabel *errorCodeLabel = new QLabel(this); + errorCodeLabel->setWordWrap(true); + if (!name.isEmpty()) { + errorCodeLabel->setText("Error Code: " + name); + form.addRow(errorCodeLabel); + } + QLabel *adviceLabel = new QLabel(this); + adviceLabel->setWordWrap(true); + if (!advice.isEmpty()) { + adviceLabel->setText("Advice: " + advice); + form.addRow(adviceLabel); + } + QLabel *messageLabel = new QLabel(this); + messageLabel->setWordWrap(true); + if (!message.isEmpty()) { + messageLabel->setText("Error message: " + message); + form.addRow(messageLabel); + } + QLabel *urlLabel = new QLabel(this); + urlLabel->setOpenExternalLinks(true); + urlLabel->setWordWrap(true); + if (!url.isEmpty()) { + urlLabel->setText("Link to documentation: " + url + ""); + form.addRow(urlLabel); + } + QLabel *linkLabel = new QLabel(this); + linkLabel->setOpenExternalLinks(true); + urlLabel->setWordWrap(true); + if (!issues.isEmpty()) { + urlLabel->setText("Link to related issue: " + issues + ""); + form.addRow(urlLabel); + } + QDialogButtonBox buttonBox(Qt::Horizontal, &dialog); + buttonBox.addButton(QString(tr("OK")), QDialogButtonBox::AcceptRole); + connect(&buttonBox, &QDialogButtonBox::accepted, &dialog, &QDialog::accept); + form.addRow(&buttonBox); + dialog.exec(); } } diff --git a/gui/window.h b/gui/window.h index bed64c0dac..a3e0a5b7a3 100644 --- a/gui/window.h +++ b/gui/window.h @@ -122,6 +122,7 @@ private: void sshConsole(); void dashboardBrowser(); void checkForMinikube(); + void outputFailedStart(QString text); QPushButton *sshButton; QPushButton *dashboardButton; QProcess *dashboardProcess; From e4e3625216b6d1fd14df2a3b2792f8db9e4bf430 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Thu, 7 Apr 2022 02:58:18 +0430 Subject: [PATCH 09/38] refactored --- gui/window.cpp | 36 +++++++++++++++--------------------- gui/window.h | 3 ++- 2 files changed, 17 insertions(+), 22 deletions(-) diff --git a/gui/window.cpp b/gui/window.cpp index cd47e0dd50..6b0c897c36 100644 --- a/gui/window.cpp +++ b/gui/window.cpp @@ -98,7 +98,7 @@ Window::Window() connect(sshButton, &QAbstractButton::clicked, this, &Window::sshConsole); connect(dashboardButton, &QAbstractButton::clicked, this, &Window::dashboardBrowser); - connect(startButton, &QAbstractButton::clicked, this, &Window::startMinikube); + connect(startButton, &QAbstractButton::clicked, this, &Window::startSelectedMinikube); connect(stopButton, &QAbstractButton::clicked, this, &Window::stopMinikube); connect(deleteButton, &QAbstractButton::clicked, this, &Window::deleteMinikube); connect(refreshButton, &QAbstractButton::clicked, this, &Window::updateClusters); @@ -192,10 +192,11 @@ void Window::createTrayIcon() trayIcon->setIcon(*trayIconIcon); } -void Window::startMinikube() +void Window::startMinikube(QStringList moreArgs) { QString text; - QStringList args = { "start", "-p", selectedCluster(), "-o", "json" }; + QStringList args = { "start", "-o", "json" }; + args << moreArgs; bool success = sendMinikubeCommand(args, text); updateClusters(); if (success) { @@ -204,6 +205,12 @@ void Window::startMinikube() outputFailedStart(text); } +void Window::startSelectedMinikube() +{ + QStringList args = { "-p", selectedCluster() }; + return startMinikube(args); +} + void Window::stopMinikube() { QStringList args = { "stop", "-p", selectedCluster() }; @@ -464,13 +471,8 @@ void Window::askName() int code = dialog.exec(); profile = profileField.text(); if (code == QDialog::Accepted) { - QStringList arg = { "start", "-p", profile, "-o", "json" }; - QString text; - bool success = sendMinikubeCommand(arg, text); - if (success) { - return; - } - outputFailedStart(text); + QStringList args = { "-p", profile }; + startMinikube(args); } else if (code == QDialog::Rejected) { askCustom(); } @@ -522,8 +524,7 @@ void Window::askCustom() containerRuntimeComboBox->itemText(containerRuntimeComboBox->currentIndex()); cpus = cpuField.text().toInt(); memory = memoryField.text().toInt(); - QStringList args = { "start", - "-p", + QStringList args = { "-p", profile, "--driver", driver, @@ -532,16 +533,9 @@ void Window::askCustom() "--cpus", QString::number(cpus), "--memory", - QString::number(memory), - "-o", - "json" + QString::number(memory) }; - QString text; - bool success = sendMinikubeCommand(args, text); - if (success) { - return; - } - outputFailedStart(text); + startMinikube(args); } } diff --git a/gui/window.h b/gui/window.h index a3e0a5b7a3..99c52fbaa8 100644 --- a/gui/window.h +++ b/gui/window.h @@ -100,7 +100,8 @@ private: void createActionGroupBox(); void createActions(); void createTrayIcon(); - void startMinikube(); + void startMinikube(QStringList args); + void startSelectedMinikube(); void stopMinikube(); void deleteMinikube(); ClusterList getClusters(); From cb0b07e35ea070b7c985743c9909eb7cd34090ca Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Wed, 6 Apr 2022 15:32:17 -0700 Subject: [PATCH 10/38] format --- gui/window.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gui/window.cpp b/gui/window.cpp index 6b0c897c36..1fb95b5299 100644 --- a/gui/window.cpp +++ b/gui/window.cpp @@ -533,13 +533,13 @@ void Window::askCustom() "--cpus", QString::number(cpus), "--memory", - QString::number(memory) - }; + QString::number(memory) }; startMinikube(args); } } -void Window::outputFailedStart(QString text) { +void Window::outputFailedStart(QString text) +{ QStringList lines; #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) lines = text.split("\n", Qt::SkipEmptyParts); From 46f7fa73b09debe11ca24bd7e2e58b78131ad4d1 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Fri, 8 Apr 2022 11:43:14 -0700 Subject: [PATCH 11/38] make error message distinct --- gui/window.cpp | 63 +++++++++++++++++++++++++------------------------- gui/window.h | 2 ++ 2 files changed, 33 insertions(+), 32 deletions(-) diff --git a/gui/window.cpp b/gui/window.cpp index 1fb95b5299..a3d0a85836 100644 --- a/gui/window.cpp +++ b/gui/window.cpp @@ -79,6 +79,8 @@ #include #include #include +#include +#include #ifndef QT_NO_TERMWIDGET #include @@ -570,38 +572,20 @@ void Window::outputFailedStart(QString text) dialog.setFixedWidth(600); dialog.setModal(true); QFormLayout form(&dialog); - QLabel *errorCodeLabel = new QLabel(this); - errorCodeLabel->setWordWrap(true); - if (!name.isEmpty()) { - errorCodeLabel->setText("Error Code: " + name); - form.addRow(errorCodeLabel); - } - QLabel *adviceLabel = new QLabel(this); - adviceLabel->setWordWrap(true); - if (!advice.isEmpty()) { - adviceLabel->setText("Advice: " + advice); - form.addRow(adviceLabel); - } - QLabel *messageLabel = new QLabel(this); - messageLabel->setWordWrap(true); - if (!message.isEmpty()) { - messageLabel->setText("Error message: " + message); - form.addRow(messageLabel); - } - QLabel *urlLabel = new QLabel(this); - urlLabel->setOpenExternalLinks(true); - urlLabel->setWordWrap(true); - if (!url.isEmpty()) { - urlLabel->setText("Link to documentation: " + url + ""); - form.addRow(urlLabel); - } - QLabel *linkLabel = new QLabel(this); - linkLabel->setOpenExternalLinks(true); - urlLabel->setWordWrap(true); - if (!issues.isEmpty()) { - urlLabel->setText("Link to related issue: " + issues + ""); - form.addRow(urlLabel); - } + createLabel("Error Code", name, &form, false); + createLabel("Advice", advice, &form, false); + QLabel* errorMessage = createLabel("Error Message", message, &form, false); + errorMessage->setFont(QFont("Courier", 10)); + errorMessage->setStyleSheet("background-color:white;"); + createLabel("Link to documentation", url, &form, true); + createLabel("Link to related issue", issues, &form, true); + // Enabling once https://github.com/kubernetes/minikube/issues/13925 is fixed + // QLabel *fileLabel = new QLabel(this); + // fileLabel->setOpenExternalLinks(true); + // fileLabel->setWordWrap(true); + // QString logFile = QDir::homePath() + "/.minikube/logs/lastStart.txt"; + // fileLabel->setText("View log file"); + // form.addRow(fileLabel); QDialogButtonBox buttonBox(Qt::Horizontal, &dialog); buttonBox.addButton(QString(tr("OK")), QDialogButtonBox::AcceptRole); connect(&buttonBox, &QDialogButtonBox::accepted, &dialog, &QDialog::accept); @@ -610,6 +594,21 @@ void Window::outputFailedStart(QString text) } } +QLabel* Window::createLabel(QString title, QString text, QFormLayout *form, bool isLink) +{ + QLabel *label = new QLabel(this); + if (!text.isEmpty()) { + form->addRow(label); + } + if (isLink) { + label->setOpenExternalLinks(true); + text = "" + text + ""; + } + label->setWordWrap(true); + label->setText(title + ": " + text); + return label; +} + void Window::initMachine() { askName(); diff --git a/gui/window.h b/gui/window.h index 99c52fbaa8..0e7bccd0c0 100644 --- a/gui/window.h +++ b/gui/window.h @@ -55,6 +55,7 @@ #define WINDOW_H #include +#include #ifndef QT_NO_SYSTEMTRAYICON @@ -124,6 +125,7 @@ private: void dashboardBrowser(); void checkForMinikube(); void outputFailedStart(QString text); + QLabel* createLabel(QString title, QString text, QFormLayout *form, bool isLink); QPushButton *sshButton; QPushButton *dashboardButton; QProcess *dashboardProcess; From 83ba479c2fb35b18060ef7e527f73261c8efa1dc Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Fri, 8 Apr 2022 11:45:08 -0700 Subject: [PATCH 12/38] format --- gui/window.cpp | 4 ++-- gui/window.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gui/window.cpp b/gui/window.cpp index a3d0a85836..6a2af99395 100644 --- a/gui/window.cpp +++ b/gui/window.cpp @@ -574,7 +574,7 @@ void Window::outputFailedStart(QString text) QFormLayout form(&dialog); createLabel("Error Code", name, &form, false); createLabel("Advice", advice, &form, false); - QLabel* errorMessage = createLabel("Error Message", message, &form, false); + QLabel *errorMessage = createLabel("Error Message", message, &form, false); errorMessage->setFont(QFont("Courier", 10)); errorMessage->setStyleSheet("background-color:white;"); createLabel("Link to documentation", url, &form, true); @@ -594,7 +594,7 @@ void Window::outputFailedStart(QString text) } } -QLabel* Window::createLabel(QString title, QString text, QFormLayout *form, bool isLink) +QLabel *Window::createLabel(QString title, QString text, QFormLayout *form, bool isLink) { QLabel *label = new QLabel(this); if (!text.isEmpty()) { diff --git a/gui/window.h b/gui/window.h index 0e7bccd0c0..1c321edbde 100644 --- a/gui/window.h +++ b/gui/window.h @@ -125,7 +125,7 @@ private: void dashboardBrowser(); void checkForMinikube(); void outputFailedStart(QString text); - QLabel* createLabel(QString title, QString text, QFormLayout *form, bool isLink); + QLabel *createLabel(QString title, QString text, QFormLayout *form, bool isLink); QPushButton *sshButton; QPushButton *dashboardButton; QProcess *dashboardProcess; From ec3fcfd2eb237ab291b46141d6cd3271689c8110 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anders=20F=20Bj=C3=B6rklund?= Date: Wed, 12 Jan 2022 11:44:29 +0100 Subject: [PATCH 13/38] Upgrade falco-module to version 0.28.0 --- .../iso/minikube-iso/package/falco-module/falco-module.hash | 2 ++ deploy/iso/minikube-iso/package/falco-module/falco-module.mk | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/deploy/iso/minikube-iso/package/falco-module/falco-module.hash b/deploy/iso/minikube-iso/package/falco-module/falco-module.hash index 6944f25b5a..def5553268 100644 --- a/deploy/iso/minikube-iso/package/falco-module/falco-module.hash +++ b/deploy/iso/minikube-iso/package/falco-module/falco-module.hash @@ -5,8 +5,10 @@ sha256 b1c9884855d58be94a97b2e348bcdc7db995800f0405b0f4e9a7176ee2f094a7 0.21.0.t sha256 11890b1401c197c28ee0a70a364004f58f5ec5526365e9a283699a75e5662773 0.22.0.tar.gz sha256 ed991ffbece8f543f5dc6aa5a660ab1ed4bae771b6aa4930663a3902cc160ea3 0.23.0.tar.gz sha256 5703d724e0b2ce3b98208549ca9d1abdc9a0298a9abfd748b34863c0c4015dcf 0.24.0.tar.gz +sha256 1fa9c05e461817aa2542efa3b5e28e51a6caf02935dfc9d47271af79d5414947 0.28.0.tar.gz # sysdig sha256 6e477ac5fe9d3110b870bd4495f01541373a008c375a1934a2d1c46798b6bad6 146a431edf95829ac11bfd9c85ba3ef08789bffe.tar.gz sha256 1c69363e4c36cdaeed413c2ef557af53bfc4bf1109fbcb6d6e18dc40fe6ddec8 be1ea2d9482d0e6e2cb14a0fd7e08cbecf517f94.tar.gz sha256 766e8952a36a4198fd976b9d848523e6abe4336612188e4fc911e217d8e8a00d 96bd9bc560f67742738eb7255aeb4d03046b8045.tar.gz sha256 6c3f5f2d699c9540e281f50cbc5cb6b580f0fc689798bc65d4a77f57f932a71c 85c88952b018fdbce2464222c3303229f5bfcfad.tar.gz +sha256 9de717b3a4b611ea6df56afee05171860167112f74bb7717b394bcc88ac843cd 5c0b863ddade7a45568c0ac97d037422c9efb750.tar.gz diff --git a/deploy/iso/minikube-iso/package/falco-module/falco-module.mk b/deploy/iso/minikube-iso/package/falco-module/falco-module.mk index ececc2493d..66f570a720 100644 --- a/deploy/iso/minikube-iso/package/falco-module/falco-module.mk +++ b/deploy/iso/minikube-iso/package/falco-module/falco-module.mk @@ -4,7 +4,7 @@ # ######################################################################## -FALCO_MODULE_VERSION = 0.24.0 +FALCO_MODULE_VERSION = 0.28.0 FALCO_MODULE_SITE = https://github.com/falcosecurity/falco/archive FALCO_MODULE_SOURCE = $(FALCO_MODULE_VERSION).tar.gz FALCO_MODULE_DEPENDENCIES += ncurses libyaml @@ -12,7 +12,7 @@ FALCO_MODULE_LICENSE = Apache-2.0 FALCO_MODULE_LICENSE_FILES = COPYING # see cmake/modules/sysdig-repo/CMakeLists.txt -FALCO_MODULE_SYSDIG_VERSION = 85c88952b018fdbce2464222c3303229f5bfcfad +FALCO_MODULE_SYSDIG_VERSION = 5c0b863ddade7a45568c0ac97d037422c9efb750 FALCO_MODULE_EXTRA_DOWNLOADS = https://github.com/draios/sysdig/archive/${FALCO_MODULE_SYSDIG_VERSION}.tar.gz define FALCO_MODULE_SYSDIG_SRC From 279271ba60cb333f1938907fb729aff70084755a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anders=20F=20Bj=C3=B6rklund?= Date: Tue, 22 Feb 2022 20:22:40 +0100 Subject: [PATCH 14/38] Upgrade falco-module to version 0.31.0 --- .../package/falco-module/falco-module.hash | 4 ++++ .../package/falco-module/falco-module.mk | 14 +++++++------- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/deploy/iso/minikube-iso/package/falco-module/falco-module.hash b/deploy/iso/minikube-iso/package/falco-module/falco-module.hash index def5553268..f2a6b780fb 100644 --- a/deploy/iso/minikube-iso/package/falco-module/falco-module.hash +++ b/deploy/iso/minikube-iso/package/falco-module/falco-module.hash @@ -6,9 +6,13 @@ sha256 11890b1401c197c28ee0a70a364004f58f5ec5526365e9a283699a75e5662773 0.22.0.t sha256 ed991ffbece8f543f5dc6aa5a660ab1ed4bae771b6aa4930663a3902cc160ea3 0.23.0.tar.gz sha256 5703d724e0b2ce3b98208549ca9d1abdc9a0298a9abfd748b34863c0c4015dcf 0.24.0.tar.gz sha256 1fa9c05e461817aa2542efa3b5e28e51a6caf02935dfc9d47271af79d5414947 0.28.0.tar.gz +sha256 9d90a86752a700dad2d1ea888b2cd33cdc808621faa2b6300bb0463d404744fb 0.30.0.tar.gz +sha256 0c7d88bfa2ec8e17e6e27158fabfb1d05982ede3138138b44a0f3ac6ffba5545 0.31.0.tar.gz # sysdig sha256 6e477ac5fe9d3110b870bd4495f01541373a008c375a1934a2d1c46798b6bad6 146a431edf95829ac11bfd9c85ba3ef08789bffe.tar.gz sha256 1c69363e4c36cdaeed413c2ef557af53bfc4bf1109fbcb6d6e18dc40fe6ddec8 be1ea2d9482d0e6e2cb14a0fd7e08cbecf517f94.tar.gz sha256 766e8952a36a4198fd976b9d848523e6abe4336612188e4fc911e217d8e8a00d 96bd9bc560f67742738eb7255aeb4d03046b8045.tar.gz sha256 6c3f5f2d699c9540e281f50cbc5cb6b580f0fc689798bc65d4a77f57f932a71c 85c88952b018fdbce2464222c3303229f5bfcfad.tar.gz sha256 9de717b3a4b611ea6df56afee05171860167112f74bb7717b394bcc88ac843cd 5c0b863ddade7a45568c0ac97d037422c9efb750.tar.gz +# falcosecurity/libs +sha256 2cf44f06a282e8cee7aa1f775a08ea94c06e275faaf0636b21eb06af28cf4b3f 319368f1ad778691164d33d59945e00c5752cd27.tar.gz diff --git a/deploy/iso/minikube-iso/package/falco-module/falco-module.mk b/deploy/iso/minikube-iso/package/falco-module/falco-module.mk index 66f570a720..21ca5c77e2 100644 --- a/deploy/iso/minikube-iso/package/falco-module/falco-module.mk +++ b/deploy/iso/minikube-iso/package/falco-module/falco-module.mk @@ -4,22 +4,22 @@ # ######################################################################## -FALCO_MODULE_VERSION = 0.28.0 +FALCO_MODULE_VERSION = 0.31.0 FALCO_MODULE_SITE = https://github.com/falcosecurity/falco/archive FALCO_MODULE_SOURCE = $(FALCO_MODULE_VERSION).tar.gz FALCO_MODULE_DEPENDENCIES += ncurses libyaml FALCO_MODULE_LICENSE = Apache-2.0 FALCO_MODULE_LICENSE_FILES = COPYING -# see cmake/modules/sysdig-repo/CMakeLists.txt -FALCO_MODULE_SYSDIG_VERSION = 5c0b863ddade7a45568c0ac97d037422c9efb750 -FALCO_MODULE_EXTRA_DOWNLOADS = https://github.com/draios/sysdig/archive/${FALCO_MODULE_SYSDIG_VERSION}.tar.gz +# see cmake/modules/falcosecurity-libs.cmake +FALCO_MODULE_FALCOSECURITY_LIBS_VERSION = 319368f1ad778691164d33d59945e00c5752cd27 +FALCO_MODULE_EXTRA_DOWNLOADS = https://github.com/falcosecurity/libs/archive/$(FALCO_MODULE_FALCOSECURITY_LIBS_VERSION).tar.gz -define FALCO_MODULE_SYSDIG_SRC - sed -e 's|URL ".*"|URL "'$(FALCO_MODULE_DL_DIR)/$(FALCO_MODULE_SYSDIG_VERSION).tar.gz'"|' -i $(@D)/cmake/modules/sysdig-repo/CMakeLists.txt +define FALCO_MODULE_FALCOSECURITY_LIBS_SRC + sed -e 's|URL ".*"|URL "'$(FALCO_MODULE_DL_DIR)/$(FALCO_MODULE_FALCOSECURITY_LIBS_VERSION).tar.gz'"|' -i $(@D)/cmake/modules/falcosecurity-libs-repo/CMakeLists.txt endef -FALCO_MODULE_POST_EXTRACT_HOOKS += FALCO_MODULE_SYSDIG_SRC +FALCO_MODULE_POST_EXTRACT_HOOKS += FALCO_MODULE_FALCOSECURITY_LIBS_SRC FALCO_MODULE_CONF_OPTS = -DFALCO_VERSION=$(FALCO_MODULE_VERSION) FALCO_MODULE_CONF_OPTS += -DUSE_BUNDLED_DEPS=ON From 69fb8c243256d407402d754bfa562a38aa794129 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anders=20F=20Bj=C3=B6rklund?= Date: Sun, 10 Apr 2022 09:43:22 +0200 Subject: [PATCH 15/38] Upgrade falco-module to version 0.31.1 --- .../iso/minikube-iso/package/falco-module/falco-module.hash | 3 +++ deploy/iso/minikube-iso/package/falco-module/falco-module.mk | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/deploy/iso/minikube-iso/package/falco-module/falco-module.hash b/deploy/iso/minikube-iso/package/falco-module/falco-module.hash index f2a6b780fb..e39ff22cb3 100644 --- a/deploy/iso/minikube-iso/package/falco-module/falco-module.hash +++ b/deploy/iso/minikube-iso/package/falco-module/falco-module.hash @@ -8,6 +8,8 @@ sha256 5703d724e0b2ce3b98208549ca9d1abdc9a0298a9abfd748b34863c0c4015dcf 0.24.0.t sha256 1fa9c05e461817aa2542efa3b5e28e51a6caf02935dfc9d47271af79d5414947 0.28.0.tar.gz sha256 9d90a86752a700dad2d1ea888b2cd33cdc808621faa2b6300bb0463d404744fb 0.30.0.tar.gz sha256 0c7d88bfa2ec8e17e6e27158fabfb1d05982ede3138138b44a0f3ac6ffba5545 0.31.0.tar.gz +sha256 207b875c5b24717ecc9a5c288ff8df703d5d2a9ad00533f798d530e758f8ae42 0.31.1.tar.gz + # sysdig sha256 6e477ac5fe9d3110b870bd4495f01541373a008c375a1934a2d1c46798b6bad6 146a431edf95829ac11bfd9c85ba3ef08789bffe.tar.gz sha256 1c69363e4c36cdaeed413c2ef557af53bfc4bf1109fbcb6d6e18dc40fe6ddec8 be1ea2d9482d0e6e2cb14a0fd7e08cbecf517f94.tar.gz @@ -16,3 +18,4 @@ sha256 6c3f5f2d699c9540e281f50cbc5cb6b580f0fc689798bc65d4a77f57f932a71c 85c88952 sha256 9de717b3a4b611ea6df56afee05171860167112f74bb7717b394bcc88ac843cd 5c0b863ddade7a45568c0ac97d037422c9efb750.tar.gz # falcosecurity/libs sha256 2cf44f06a282e8cee7aa1f775a08ea94c06e275faaf0636b21eb06af28cf4b3f 319368f1ad778691164d33d59945e00c5752cd27.tar.gz +sha256 0f6dcdc3b94243c91294698ee343806539af81c5b33c60c6acf83fc1aa455e85 b7eb0dd65226a8dc254d228c8d950d07bf3521d2.tar.gz diff --git a/deploy/iso/minikube-iso/package/falco-module/falco-module.mk b/deploy/iso/minikube-iso/package/falco-module/falco-module.mk index 21ca5c77e2..5e7a4460f0 100644 --- a/deploy/iso/minikube-iso/package/falco-module/falco-module.mk +++ b/deploy/iso/minikube-iso/package/falco-module/falco-module.mk @@ -4,7 +4,7 @@ # ######################################################################## -FALCO_MODULE_VERSION = 0.31.0 +FALCO_MODULE_VERSION = 0.31.1 FALCO_MODULE_SITE = https://github.com/falcosecurity/falco/archive FALCO_MODULE_SOURCE = $(FALCO_MODULE_VERSION).tar.gz FALCO_MODULE_DEPENDENCIES += ncurses libyaml @@ -12,7 +12,7 @@ FALCO_MODULE_LICENSE = Apache-2.0 FALCO_MODULE_LICENSE_FILES = COPYING # see cmake/modules/falcosecurity-libs.cmake -FALCO_MODULE_FALCOSECURITY_LIBS_VERSION = 319368f1ad778691164d33d59945e00c5752cd27 +FALCO_MODULE_FALCOSECURITY_LIBS_VERSION = b7eb0dd65226a8dc254d228c8d950d07bf3521d2 FALCO_MODULE_EXTRA_DOWNLOADS = https://github.com/falcosecurity/libs/archive/$(FALCO_MODULE_FALCOSECURITY_LIBS_VERSION).tar.gz define FALCO_MODULE_FALCOSECURITY_LIBS_SRC From dfdf6e59b81c63589c2a396e2f8e7db5a4f4f875 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Sun, 10 Apr 2022 08:56:54 +0000 Subject: [PATCH 16/38] Updating ISO to v1.25.2-1649577058-13659 --- Makefile | 2 +- pkg/minikube/download/iso.go | 2 +- site/content/en/docs/commands/start.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 3ce64303a3..afd6088a99 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ KUBERNETES_VERSION ?= $(shell egrep "DefaultKubernetesVersion =" pkg/minikube/co KIC_VERSION ?= $(shell egrep "Version =" pkg/drivers/kic/types.go | cut -d \" -f2) # Default to .0 for higher cache hit rates, as build increments typically don't require new ISO versions -ISO_VERSION ?= v1.25.2-1648512003-13860 +ISO_VERSION ?= v1.25.2-1649577058-13659 # Dashes are valid in semver, but not Linux packaging. Use ~ to delimit alpha/beta DEB_VERSION ?= $(subst -,~,$(RAW_VERSION)) DEB_REVISION ?= 0 diff --git a/pkg/minikube/download/iso.go b/pkg/minikube/download/iso.go index 76e198391d..96f2312fd5 100644 --- a/pkg/minikube/download/iso.go +++ b/pkg/minikube/download/iso.go @@ -40,7 +40,7 @@ const fileScheme = "file" // DefaultISOURLs returns a list of ISO URL's to consult by default, in priority order func DefaultISOURLs() []string { v := version.GetISOVersion() - isoBucket := "minikube-builds/iso/13860" + isoBucket := "minikube-builds/iso/13659" return []string{ fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s.iso", isoBucket, v), fmt.Sprintf("https://github.com/kubernetes/minikube/releases/download/%s/minikube-%s.iso", v, v), diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index 51a34c33b3..a8be0ad0f7 100644 --- a/site/content/en/docs/commands/start.md +++ b/site/content/en/docs/commands/start.md @@ -69,7 +69,7 @@ minikube start [flags] --insecure-registry strings Insecure Docker registries to pass to the Docker daemon. The default service CIDR range will automatically be added. --install-addons If set, install addons. Defaults to true. (default true) --interactive Allow user prompts for more information (default true) - --iso-url strings Locations to fetch the minikube ISO from. (default [https://storage.googleapis.com/minikube-builds/iso/13860/minikube-v1.25.2-1648512003-13860.iso,https://github.com/kubernetes/minikube/releases/download/v1.25.2-1648512003-13860/minikube-v1.25.2-1648512003-13860.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.25.2-1648512003-13860.iso]) + --iso-url strings Locations to fetch the minikube ISO from. (default [https://storage.googleapis.com/minikube-builds/iso/13659/minikube-v1.25.2-1649577058-13659.iso,https://github.com/kubernetes/minikube/releases/download/v1.25.2-1649577058-13659/minikube-v1.25.2-1649577058-13659.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.25.2-1649577058-13659.iso]) --keep-context This will keep the existing kubectl context and will create a minikube context. --kubernetes-version string The Kubernetes version that the minikube VM will use (ex: v1.2.3, 'stable' for v1.23.5, 'latest' for v1.23.6-rc.0). Defaults to 'stable'. --kvm-gpu Enable experimental NVIDIA GPU support in minikube From ad79c6f7adfe69ac345bd83832ec3403fe10e654 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Apr 2022 18:04:53 +0000 Subject: [PATCH 17/38] Bump cloud.google.com/go/storage from 1.21.0 to 1.22.0 Bumps [cloud.google.com/go/storage](https://github.com/googleapis/google-cloud-go) from 1.21.0 to 1.22.0. - [Release notes](https://github.com/googleapis/google-cloud-go/releases) - [Changelog](https://github.com/googleapis/google-cloud-go/blob/main/CHANGES.md) - [Commits](https://github.com/googleapis/google-cloud-go/compare/spanner/v1.21.0...spanner/v1.22.0) --- updated-dependencies: - dependency-name: cloud.google.com/go/storage dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 9 +++++---- go.sum | 24 +++++++++++------------- 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/go.mod b/go.mod index 25292b1d0a..bb8c589b0f 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module k8s.io/minikube go 1.18 require ( - cloud.google.com/go/storage v1.21.0 + cloud.google.com/go/storage v1.22.0 contrib.go.opencensus.io/exporter/stackdriver v0.13.10 github.com/Delta456/box-cli-maker/v2 v2.2.2 github.com/GoogleCloudPlatform/docker-credential-gcr v0.0.0-20210713212222-faed5e8b8ca2 @@ -104,7 +104,7 @@ require ( require ( cloud.google.com/go v0.100.2 // indirect cloud.google.com/go/compute v1.5.0 // indirect - cloud.google.com/go/iam v0.1.1 // indirect + cloud.google.com/go/iam v0.3.0 // indirect cloud.google.com/go/monitoring v1.1.0 // indirect cloud.google.com/go/trace v1.0.0 // indirect git.sr.ht/~sbinet/gg v0.3.1 // indirect @@ -145,6 +145,7 @@ require ( github.com/google/gofuzz v1.1.0 // indirect github.com/googleapis/gax-go/v2 v2.2.0 // indirect github.com/googleapis/gnostic v0.5.5 // indirect + github.com/googleapis/go-type-adapters v1.0.0 // indirect github.com/gookit/color v1.4.2 // indirect github.com/hashicorp/go-cleanhttp v0.5.2 // indirect github.com/hashicorp/go-safetemp v1.0.0 // indirect @@ -198,9 +199,9 @@ require ( golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect google.golang.org/appengine v1.6.7 // indirect - google.golang.org/genproto v0.0.0-20220324131243-acbaeb5b85eb // indirect + google.golang.org/genproto v0.0.0-20220405205423-9d709892a2bf // indirect google.golang.org/grpc v1.45.0 // indirect - google.golang.org/protobuf v1.27.1 // indirect + google.golang.org/protobuf v1.28.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/ini.v1 v1.66.2 // indirect gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect diff --git a/go.sum b/go.sum index 136aba648b..1420ab3f4c 100644 --- a/go.sum +++ b/go.sum @@ -28,7 +28,6 @@ cloud.google.com/go v0.93.3/go.mod h1:8utlLll2EF5XMAV15woO4lSbWQlk8rer9aLOfLh7+Y cloud.google.com/go v0.94.1/go.mod h1:qAlAugsXlC+JWO+Bke5vCtc9ONxjQT3drlTTnAplMW4= cloud.google.com/go v0.97.0/go.mod h1:GF7l59pYBVlXQIBLx3a761cZ41F9bBH3JUlihCt2Udc= cloud.google.com/go v0.99.0/go.mod h1:w0Xx2nLzqWJPuozYQX+hFfCSI8WioryfRDzkoI/Y2ZA= -cloud.google.com/go v0.100.1/go.mod h1:fs4QogzfH5n2pBXBP9vRiU+eCny7lD2vmFZy79Iuw1U= cloud.google.com/go v0.100.2 h1:t9Iw5QH5v4XtlEQaCtUY7x6sCABps8sW0acw7e2WQ6Y= cloud.google.com/go v0.100.2/go.mod h1:4Xra9TjzAeYHrl5+oeLlzbM2k3mjVhZh4UqTZ//w99A= cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= @@ -45,8 +44,8 @@ cloud.google.com/go/compute v1.5.0/go.mod h1:9SMHyhJlzhlkJqrPAc839t2BZFTSk6Jdj6m cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqClKRT5SZwBmk= -cloud.google.com/go/iam v0.1.1 h1:4CapQyNFjiksks1/x7jsvsygFPhihslYk5GptIrlX68= -cloud.google.com/go/iam v0.1.1/go.mod h1:CKqrcnI/suGpybEHxZ7BMehL0oA4LpdyJdUlTl9jVMw= +cloud.google.com/go/iam v0.3.0 h1:exkAomrVUuzx9kWFI1wm3KI0uoDeUFPB4kKGzx6x+Gc= +cloud.google.com/go/iam v0.3.0/go.mod h1:XzJPvDayI+9zsASAFO68Hk07u3z+f+JrT2xXNdp4bnY= cloud.google.com/go/monitoring v1.1.0 h1:ZnyNdf/XRcynMmKzRSNTOdOyYPs6G7do1l2D2hIvIKo= cloud.google.com/go/monitoring v1.1.0/go.mod h1:L81pzz7HKn14QCMaCs6NTQkdBnE87TElyanS95vIcl4= cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= @@ -58,8 +57,8 @@ cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0Zeo cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= -cloud.google.com/go/storage v1.21.0 h1:HwnT2u2D309SFDHQII6m18HlrCi3jAXhUMTLOWXYH14= -cloud.google.com/go/storage v1.21.0/go.mod h1:XmRlxkgPjlBONznT2dDUU/5XlpU2OjMnKuqnZI01LAA= +cloud.google.com/go/storage v1.22.0 h1:NUV0NNp9nkBuW66BFRLuMgldN60C57ET3dhbwLIYio8= +cloud.google.com/go/storage v1.22.0/go.mod h1:GbaLEoMqbVm6sx3Z0R++gSiBlgMv6yUi2q1DeGFKQgE= cloud.google.com/go/trace v1.0.0 h1:laKx2y7IWMjguCe5zZx6n7qLtREk4kyE69SXVC0VSN8= cloud.google.com/go/trace v1.0.0/go.mod h1:4iErSByzxkyHWzzlAj63/Gmjz0NH1ASqhJguHpGcr6A= contrib.go.opencensus.io/exporter/stackdriver v0.13.10 h1:a9+GZPUe+ONKUwULjlEOucMMG0qfSCCenlji0Nhqbys= @@ -603,6 +602,8 @@ github.com/googleapis/gnostic v0.4.1/go.mod h1:LRhVm6pbyptWbWbuZ38d1eyptfvIytN3i github.com/googleapis/gnostic v0.5.1/go.mod h1:6U4PtQXGIEt/Z3h5MAT7FNofLnw9vXk2cUuW7uA/OeU= github.com/googleapis/gnostic v0.5.5 h1:9fHAtK0uDfpveeqqo1hkEZJcFvYXAiCN3UutL8F9xHw= github.com/googleapis/gnostic v0.5.5/go.mod h1:7+EbHbldMins07ALC74bsA81Ovc97DwqyJO1AENw9kA= +github.com/googleapis/go-type-adapters v1.0.0 h1:9XdMn+d/G57qq1s8dNc5IesGCXHf6V2HZ2JwRxfA2tA= +github.com/googleapis/go-type-adapters v1.0.0/go.mod h1:zHW75FOG2aur7gAO2B+MLby+cLsWGBF62rFAi7WjWO4= github.com/googleinterns/cloud-operations-api-mock v0.0.0-20200709193332-a1e58c29bdd3 h1:eHv/jVY/JNop1xg2J9cBb4EzyMpWZoNCP1BslSAIkOI= github.com/googleinterns/cloud-operations-api-mock v0.0.0-20200709193332-a1e58c29bdd3/go.mod h1:h/KNeRx7oYU4SpA4SoY7W2/NxDKEEVuwA6j9A27L4OI= github.com/gookit/color v1.4.2 h1:tXy44JFSFkKnELV6WaMo/lLfu/meqITX3iAV52do7lk= @@ -1605,11 +1606,9 @@ google.golang.org/api v0.58.0/go.mod h1:cAbP2FsxoGVNwtgNAmmn3y5G1TWAiVYRmg4yku3l google.golang.org/api v0.59.0/go.mod h1:sT2boj7M9YJxZzgeZqXogmhfmRWDtPzT31xkieUbuZU= google.golang.org/api v0.61.0/go.mod h1:xQRti5UdCmoCEqFxcz93fTl338AVqDgyaDRuOZ3hg9I= google.golang.org/api v0.63.0/go.mod h1:gs4ij2ffTRXwuzzgJl/56BdwJaA194ijkfn++9tDuPo= -google.golang.org/api v0.64.0/go.mod h1:931CdxA8Rm4t6zqTFGSsgwbAEZ2+GMYurbndwSimebM= google.golang.org/api v0.66.0/go.mod h1:I1dmXYpX7HGwz/ejRxwQp2qj5bFAz93HiCU1C1oYd9M= google.golang.org/api v0.67.0/go.mod h1:ShHKP8E60yPsKNw/w8w+VYaj9H6buA5UqDp8dhbQZ6g= google.golang.org/api v0.68.0/go.mod h1:sOM8pTpwgflXRhz+oC8H2Dr+UcbMqkPPWNJo88Q7TH8= -google.golang.org/api v0.69.0/go.mod h1:boanBiw+h5c3s+tBPgEzLDRHfFLWV0qXxRHz3ws7C80= google.golang.org/api v0.70.0/go.mod h1:Bs4ZM2HGifEvXwd50TtW70ovgJffJYw2oRCOFU/SkfA= google.golang.org/api v0.71.0/go.mod h1:4PyU6e6JogV1f9eA4voyrTY2batOLdgZ5qZ5HOCc4j8= google.golang.org/api v0.74.0 h1:ExR2D+5TYIrMphWgs5JCgwRhEDlPDXXrLwHHMgPHTXE= @@ -1667,6 +1666,7 @@ google.golang.org/genproto v0.0.0-20210222152913-aa3ee6e6a81c/go.mod h1:FWY/as6D google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210329143202-679c6ae281ee/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A= google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A= google.golang.org/genproto v0.0.0-20210513213006-bf773b8c8384/go.mod h1:P3QM42oQyzQSnHPnZ/vqoCdDmzH28fzWByN9asMeM8A= google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= @@ -1692,22 +1692,19 @@ google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1/go.mod h1:5CzLGKJ6 google.golang.org/genproto v0.0.0-20211206160659-862468c7d6e0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20211221195035-429b39de9b1c/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20211223182754-3ac035c7e7cb/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20220111164026-67b88f271998/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20220114231437-d2e6a121cae0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20220126215142-9970aeb2e350/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20220201184016-50beb8ab5c44/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20220204002441-d6cc3cc0770e/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20220207164111-0872dc986b00/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20220207185906-7721543eae58/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20220211171837-173942840c17/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= -google.golang.org/genproto v0.0.0-20220216160803-4663080d8bc8/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= google.golang.org/genproto v0.0.0-20220218161850-94dd64e39d7c/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= google.golang.org/genproto v0.0.0-20220222213610-43724f9ea8cf/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= google.golang.org/genproto v0.0.0-20220304144024-325a89244dc8/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= google.golang.org/genproto v0.0.0-20220310185008-1973136f34c6/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= -google.golang.org/genproto v0.0.0-20220324131243-acbaeb5b85eb h1:0m9wktIpOxGw+SSKmydXWB3Z3GTfcPP6+q75HCQa6HI= google.golang.org/genproto v0.0.0-20220324131243-acbaeb5b85eb/go.mod h1:hAL49I2IFola2sVEjAn7MEwsja0xp51I0tlGAf9hz4E= +google.golang.org/genproto v0.0.0-20220405205423-9d709892a2bf h1:JTjwKJX9erVpsw17w+OIPP7iAgEkN/r8urhWSunEDTs= +google.golang.org/genproto v0.0.0-20220405205423-9d709892a2bf/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= google.golang.org/grpc v0.0.0-20160317175043-d3ddb4469d5a/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= @@ -1754,8 +1751,9 @@ google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGj google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ= google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw= +google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= From 631589513e7c551f1a35a6fd19fbcba1aa1b15a2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Apr 2022 18:04:59 +0000 Subject: [PATCH 18/38] Bump github.com/cenkalti/backoff/v4 from 4.1.2 to 4.1.3 Bumps [github.com/cenkalti/backoff/v4](https://github.com/cenkalti/backoff) from 4.1.2 to 4.1.3. - [Release notes](https://github.com/cenkalti/backoff/releases) - [Commits](https://github.com/cenkalti/backoff/compare/v4.1.2...v4.1.3) --- updated-dependencies: - dependency-name: github.com/cenkalti/backoff/v4 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 25292b1d0a..dce882831a 100644 --- a/go.mod +++ b/go.mod @@ -14,7 +14,7 @@ require ( github.com/blang/semver/v4 v4.0.0 github.com/briandowns/spinner v1.11.1 github.com/c4milo/gotoolkit v0.0.0-20190525173301-67483a18c17a // indirect - github.com/cenkalti/backoff/v4 v4.1.2 + github.com/cenkalti/backoff/v4 v4.1.3 github.com/cheggaaa/pb/v3 v3.0.8 github.com/cloudevents/sdk-go/v2 v2.9.0 github.com/docker/docker v20.10.14+incompatible diff --git a/go.sum b/go.sum index 136aba648b..a10d5b775d 100644 --- a/go.sum +++ b/go.sum @@ -196,8 +196,8 @@ github.com/bugsnag/osext v0.0.0-20130617224835-0dd3f918b21b/go.mod h1:obH5gd0Bsq github.com/bugsnag/panicwrap v0.0.0-20151223152923-e2c28503fcd0/go.mod h1:D/8v3kj0zr8ZAKg1AQ6crr+5VwKN5eIywRkfhyM/+dE= github.com/c4milo/gotoolkit v0.0.0-20190525173301-67483a18c17a h1:+uvtaGSLJh0YpLLHCQ9F+UVGy4UOS542hsjj8wBjvH0= github.com/c4milo/gotoolkit v0.0.0-20190525173301-67483a18c17a/go.mod h1:txokOny9wavBtq2PWuHmj1P+eFwpCsj+gQeNNANChfU= -github.com/cenkalti/backoff/v4 v4.1.2 h1:6Yo7N8UP2K6LWZnW94DLVSSrbobcWdVzAYOisuDPIFo= -github.com/cenkalti/backoff/v4 v4.1.2/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw= +github.com/cenkalti/backoff/v4 v4.1.3 h1:cFAlzYUlVYDysBEH2T5hyJZMh3+5+WCBvSnK6Q8UtC4= +github.com/cenkalti/backoff/v4 v4.1.3/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/census-instrumentation/opencensus-proto v0.3.0 h1:t/LhUZLVitR1Ow2YOnduCsavhwFUklBMoGVYUCqmCqk= github.com/census-instrumentation/opencensus-proto v0.3.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= From 3876ed2b0afa588175420e6998c713df93af2339 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Apr 2022 18:05:19 +0000 Subject: [PATCH 19/38] Bump go.opentelemetry.io/otel/sdk from 1.6.1 to 1.6.3 Bumps [go.opentelemetry.io/otel/sdk](https://github.com/open-telemetry/opentelemetry-go) from 1.6.1 to 1.6.3. - [Release notes](https://github.com/open-telemetry/opentelemetry-go/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-go/blob/main/CHANGELOG.md) - [Commits](https://github.com/open-telemetry/opentelemetry-go/compare/v1.6.1...v1.6.3) --- updated-dependencies: - dependency-name: go.opentelemetry.io/otel/sdk dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 6 +++--- go.sum | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/go.mod b/go.mod index 25292b1d0a..1d8475d139 100644 --- a/go.mod +++ b/go.mod @@ -68,9 +68,9 @@ require ( github.com/spf13/viper v1.10.1 github.com/zchee/go-vmnet v0.0.0-20161021174912-97ebf9174097 go.opencensus.io v0.23.0 - go.opentelemetry.io/otel v1.6.1 - go.opentelemetry.io/otel/sdk v1.6.1 - go.opentelemetry.io/otel/trace v1.6.1 + go.opentelemetry.io/otel v1.6.3 + go.opentelemetry.io/otel/sdk v1.6.3 + go.opentelemetry.io/otel/trace v1.6.3 golang.org/x/build v0.0.0-20190927031335-2835ba2e683f golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 golang.org/x/exp v0.0.0-20210220032938-85be41e4509f diff --git a/go.sum b/go.sum index 136aba648b..ae091a75c5 100644 --- a/go.sum +++ b/go.sum @@ -1145,8 +1145,8 @@ go.opentelemetry.io/otel v0.20.0/go.mod h1:Y3ugLH2oa81t5QO+Lty+zXf8zC9L26ax4Nzox go.opentelemetry.io/otel v1.0.1/go.mod h1:OPEOD4jIT2SlZPMmwT6FqZz2C0ZNdQqiWcoK6M0SNFU= go.opentelemetry.io/otel v1.1.0/go.mod h1:7cww0OW51jQ8IaZChIEdqLwgh+44+7uiTdWsAL0wQpA= go.opentelemetry.io/otel v1.3.0/go.mod h1:PWIKzi6JCp7sM0k9yZ43VX+T345uNbAkDKwHVjb2PTs= -go.opentelemetry.io/otel v1.6.1 h1:6r1YrcTenBvYa1x491d0GGpTVBsNECmrc/K6b+zDeis= -go.opentelemetry.io/otel v1.6.1/go.mod h1:blzUabWHkX6LJewxvadmzafgh/wnvBSDBdOuwkAtrWQ= +go.opentelemetry.io/otel v1.6.3 h1:FLOfo8f9JzFVFVyU+MSRJc2HdEAXQgm7pIv2uFKRSZE= +go.opentelemetry.io/otel v1.6.3/go.mod h1:7BgNga5fNlF/iZjG06hM3yofffp0ofKCDwSXx1GC4dI= go.opentelemetry.io/otel/exporters/otlp v0.20.0/go.mod h1:YIieizyaN77rtLJra0buKiNBOm9XQfkPEKBeuhoMwAM= go.opentelemetry.io/otel/internal/metric v0.24.0 h1:O5lFy6kAl0LMWBjzy3k//M8VjEaTDWL9DPJuqZmWIAA= go.opentelemetry.io/otel/internal/metric v0.24.0/go.mod h1:PSkQG+KuApZjBpC6ea6082ZrWUUy/w132tJ/LOU3TXk= @@ -1156,16 +1156,16 @@ go.opentelemetry.io/otel/metric v0.24.0/go.mod h1:tpMFnCD9t+BEGiWY2bWF5+AwjuAdM0 go.opentelemetry.io/otel/oteltest v0.20.0/go.mod h1:L7bgKf9ZB7qCwT9Up7i9/pn0PWIa9FqQ2IQ8LoxiGnw= go.opentelemetry.io/otel/sdk v0.20.0/go.mod h1:g/IcepuwNsoiX5Byy2nNV0ySUF1em498m7hBWC279Yc= go.opentelemetry.io/otel/sdk v1.3.0/go.mod h1:rIo4suHNhQwBIPg9axF8V9CA72Wz2mKF1teNrup8yzs= -go.opentelemetry.io/otel/sdk v1.6.1 h1:ZmcNyMhcuAYIb/Nr6QhBPTMopMTbov/47wHt1gibkoY= -go.opentelemetry.io/otel/sdk v1.6.1/go.mod h1:IVYrddmFZ+eJqu2k38qD3WezFR2pymCzm8tdxyh3R4E= +go.opentelemetry.io/otel/sdk v1.6.3 h1:prSHYdwCQOX5DrsEzxowH3nLhoAzEBdZhvrR79scfLs= +go.opentelemetry.io/otel/sdk v1.6.3/go.mod h1:A4iWF7HTXa+GWL/AaqESz28VuSBIcZ+0CV+IzJ5NMiQ= go.opentelemetry.io/otel/sdk/export/metric v0.20.0/go.mod h1:h7RBNMsDJ5pmI1zExLi+bJK+Dr8NQCh0qGhm1KDnNlE= go.opentelemetry.io/otel/sdk/metric v0.20.0/go.mod h1:knxiS8Xd4E/N+ZqKmUPf3gTTZ4/0TjTXukfxjzSTpHE= go.opentelemetry.io/otel/trace v0.20.0/go.mod h1:6GjCW8zgDjwGHGa6GkyeB8+/5vjT16gUEi0Nf1iBdgw= go.opentelemetry.io/otel/trace v1.0.1/go.mod h1:5g4i4fKLaX2BQpSBsxw8YYcgKpMMSW3x7ZTuYBr3sUk= go.opentelemetry.io/otel/trace v1.1.0/go.mod h1:i47XtdcBQiktu5IsrPqOHe8w+sBmnLwwHt8wiUsWGTI= go.opentelemetry.io/otel/trace v1.3.0/go.mod h1:c/VDhno8888bvQYmbYLqe41/Ldmr/KKunbvWM4/fEjk= -go.opentelemetry.io/otel/trace v1.6.1 h1:f8c93l5tboBYZna1nWk0W9DYyMzJXDWdZcJZ0Kb400U= -go.opentelemetry.io/otel/trace v1.6.1/go.mod h1:RkFRM1m0puWIq10oxImnGEduNBzxiN7TXluRBtE+5j0= +go.opentelemetry.io/otel/trace v1.6.3 h1:IqN4L+5b0mPNjdXIiZ90Ni4Bl5BRkDQywePLWemd9bc= +go.opentelemetry.io/otel/trace v1.6.3/go.mod h1:GNJQusJlUgZl9/TQBPKU/Y/ty+0iVB5fjhKeJGZPGFs= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5/go.mod h1:nmDLcffg48OtT/PSW0Hg7FvpRQsQh5OSqIylirxKC7o= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= From 66845e2f91362e36e5ca3424290e80054bb990d5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Apr 2022 18:24:21 +0000 Subject: [PATCH 20/38] Bump peter-evans/create-pull-request from 4.0.1 to 4.0.2 Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from 4.0.1 to 4.0.2. - [Release notes](https://github.com/peter-evans/create-pull-request/releases) - [Commits](https://github.com/peter-evans/create-pull-request/compare/f1a7646cead32c950d90344a4fb5d4e926972a8f...bd72e1b7922d417764d27d30768117ad7da78a0e) --- updated-dependencies: - dependency-name: peter-evans/create-pull-request dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/docs.yml | 2 +- .github/workflows/leaderboard.yml | 2 +- .github/workflows/time-to-k8s.yml | 2 +- .github/workflows/update-golang-version.yml | 2 +- .github/workflows/update-golint-version.yml | 2 +- .github/workflows/update-k8s-versions.yml | 2 +- .github/workflows/update-kubadm-constants.yml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 69bbc9bb59..d0004044d2 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -29,7 +29,7 @@ jobs: echo "::set-output name=changes::$c" - name: Create PR if: ${{ steps.gendocs.outputs.changes != '' }} - uses: peter-evans/create-pull-request@f1a7646cead32c950d90344a4fb5d4e926972a8f + uses: peter-evans/create-pull-request@bd72e1b7922d417764d27d30768117ad7da78a0e with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: Update auto-generated docs and translations diff --git a/.github/workflows/leaderboard.yml b/.github/workflows/leaderboard.yml index defac3b945..f93ed160f0 100644 --- a/.github/workflows/leaderboard.yml +++ b/.github/workflows/leaderboard.yml @@ -32,7 +32,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.MINIKUBE_BOT_PAT }} - name: Create PR if: ${{ steps.leaderboard.outputs.changes != '' }} - uses: peter-evans/create-pull-request@f1a7646cead32c950d90344a4fb5d4e926972a8f + uses: peter-evans/create-pull-request@bd72e1b7922d417764d27d30768117ad7da78a0e with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: Update leaderboard diff --git a/.github/workflows/time-to-k8s.yml b/.github/workflows/time-to-k8s.yml index e7e1eadcb3..5af4ca818c 100644 --- a/.github/workflows/time-to-k8s.yml +++ b/.github/workflows/time-to-k8s.yml @@ -26,7 +26,7 @@ jobs: ./hack/benchmark/time-to-k8s/time-to-k8s.sh echo "::set-output name=version::$(minikube version --short)" - name: Create PR - uses: peter-evans/create-pull-request@f1a7646cead32c950d90344a4fb5d4e926972a8f + uses: peter-evans/create-pull-request@bd72e1b7922d417764d27d30768117ad7da78a0e with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: add time-to-k8s benchmark for ${{ steps.timeToK8sBenchmark.outputs.version }} diff --git a/.github/workflows/update-golang-version.yml b/.github/workflows/update-golang-version.yml index cd3ac21713..b7983e349a 100644 --- a/.github/workflows/update-golang-version.yml +++ b/.github/workflows/update-golang-version.yml @@ -26,7 +26,7 @@ jobs: echo "::set-output name=changes::$(git status --porcelain)" - name: Create PR if: ${{ steps.bumpGolang.outputs.changes != '' }} - uses: peter-evans/create-pull-request@f1a7646cead32c950d90344a4fb5d4e926972a8f + uses: peter-evans/create-pull-request@bd72e1b7922d417764d27d30768117ad7da78a0e with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: bump golang versions diff --git a/.github/workflows/update-golint-version.yml b/.github/workflows/update-golint-version.yml index ce7d850daa..a9ae17b165 100644 --- a/.github/workflows/update-golint-version.yml +++ b/.github/workflows/update-golint-version.yml @@ -26,7 +26,7 @@ jobs: echo "::set-output name=changes::$(git status --porcelain)" - name: Create PR if: ${{ steps.bumpGolint.outputs.changes != '' }} - uses: peter-evans/create-pull-request@f1a7646cead32c950d90344a4fb5d4e926972a8f + uses: peter-evans/create-pull-request@bd72e1b7922d417764d27d30768117ad7da78a0e with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: bump golint versions diff --git a/.github/workflows/update-k8s-versions.yml b/.github/workflows/update-k8s-versions.yml index 949f295d1b..5e51fa13c7 100644 --- a/.github/workflows/update-k8s-versions.yml +++ b/.github/workflows/update-k8s-versions.yml @@ -31,7 +31,7 @@ jobs: echo "::set-output name=changes::$c" - name: Create PR if: ${{ steps.bumpk8s.outputs.changes != '' }} - uses: peter-evans/create-pull-request@f1a7646cead32c950d90344a4fb5d4e926972a8f + uses: peter-evans/create-pull-request@bd72e1b7922d417764d27d30768117ad7da78a0e with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: bump default/newest kubernetes versions diff --git a/.github/workflows/update-kubadm-constants.yml b/.github/workflows/update-kubadm-constants.yml index 182fbe2bf3..d5d07992d9 100644 --- a/.github/workflows/update-kubadm-constants.yml +++ b/.github/workflows/update-kubadm-constants.yml @@ -29,7 +29,7 @@ jobs: echo "::set-output name=changes::$c" - name: Create PR if: ${{ steps.bumpKubAdmConsts.outputs.changes != '' }} - uses: peter-evans/create-pull-request@f1a7646cead32c950d90344a4fb5d4e926972a8f + uses: peter-evans/create-pull-request@bd72e1b7922d417764d27d30768117ad7da78a0e with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: update image constants for kubeadm images From 307b4db28e17ee768b47024399917977960c24b3 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Tue, 12 Apr 2022 18:21:28 +0000 Subject: [PATCH 21/38] Update auto-generated docs and translations --- site/content/en/docs/commands/addons.md | 8 ++++++++ site/content/en/docs/commands/cache.md | 6 ++++++ site/content/en/docs/commands/completion.md | 5 +++++ site/content/en/docs/commands/config.md | 8 ++++++++ site/content/en/docs/commands/cp.md | 1 + site/content/en/docs/commands/dashboard.md | 1 + site/content/en/docs/commands/delete.md | 1 + site/content/en/docs/commands/docker-env.md | 1 + site/content/en/docs/commands/help.md | 1 + site/content/en/docs/commands/image.md | 10 ++++++++++ site/content/en/docs/commands/ip.md | 1 + site/content/en/docs/commands/kubectl.md | 1 + site/content/en/docs/commands/logs.md | 1 + site/content/en/docs/commands/mount.md | 1 + site/content/en/docs/commands/node.md | 7 +++++++ site/content/en/docs/commands/options.md | 1 + site/content/en/docs/commands/pause.md | 1 + site/content/en/docs/commands/podman-env.md | 1 + site/content/en/docs/commands/profile.md | 3 +++ site/content/en/docs/commands/service.md | 3 +++ site/content/en/docs/commands/ssh-host.md | 1 + site/content/en/docs/commands/ssh-key.md | 1 + site/content/en/docs/commands/ssh.md | 1 + site/content/en/docs/commands/start.md | 1 + site/content/en/docs/commands/status.md | 1 + site/content/en/docs/commands/stop.md | 1 + site/content/en/docs/commands/tunnel.md | 1 + site/content/en/docs/commands/unpause.md | 1 + site/content/en/docs/commands/update-check.md | 1 + site/content/en/docs/commands/update-context.md | 1 + site/content/en/docs/commands/version.md | 1 + translations/de.json | 4 ++++ translations/es.json | 4 ++++ translations/fr.json | 4 ++++ translations/ja.json | 4 ++++ translations/ko.json | 4 ++++ translations/pl.json | 4 ++++ translations/ru.json | 4 ++++ translations/strings.txt | 4 ++++ translations/zh-CN.json | 4 ++++ 40 files changed, 109 insertions(+) diff --git a/site/content/en/docs/commands/addons.md b/site/content/en/docs/commands/addons.md index 61fe05929e..d7e2377f8c 100644 --- a/site/content/en/docs/commands/addons.md +++ b/site/content/en/docs/commands/addons.md @@ -31,6 +31,7 @@ minikube addons SUBCOMMAND [flags] --logtostderr log to standard error instead of files --one_output If true, only write logs to their native severity level (vs also writing to each lower severity level) -p, --profile string The name of the minikube VM being used. This can be set to allow having multiple instances of minikube independently. (default "minikube") + --rootless Force to use rootless driver (docker and podman driver only) --skip_headers If true, avoid header prefixes in the log messages --skip_log_headers If true, avoid headers when opening log files --stderrthreshold severity logs at or above this threshold go to stderr (default 2) @@ -65,6 +66,7 @@ minikube addons configure ADDON_NAME [flags] --logtostderr log to standard error instead of files --one_output If true, only write logs to their native severity level (vs also writing to each lower severity level) -p, --profile string The name of the minikube VM being used. This can be set to allow having multiple instances of minikube independently. (default "minikube") + --rootless Force to use rootless driver (docker and podman driver only) --skip_headers If true, avoid header prefixes in the log messages --skip_log_headers If true, avoid headers when opening log files --stderrthreshold severity logs at or above this threshold go to stderr (default 2) @@ -99,6 +101,7 @@ minikube addons disable ADDON_NAME [flags] --logtostderr log to standard error instead of files --one_output If true, only write logs to their native severity level (vs also writing to each lower severity level) -p, --profile string The name of the minikube VM being used. This can be set to allow having multiple instances of minikube independently. (default "minikube") + --rootless Force to use rootless driver (docker and podman driver only) --skip_headers If true, avoid header prefixes in the log messages --skip_log_headers If true, avoid headers when opening log files --stderrthreshold severity logs at or above this threshold go to stderr (default 2) @@ -148,6 +151,7 @@ minikube addons enable dashboard --logtostderr log to standard error instead of files --one_output If true, only write logs to their native severity level (vs also writing to each lower severity level) -p, --profile string The name of the minikube VM being used. This can be set to allow having multiple instances of minikube independently. (default "minikube") + --rootless Force to use rootless driver (docker and podman driver only) --skip_headers If true, avoid header prefixes in the log messages --skip_log_headers If true, avoid headers when opening log files --stderrthreshold severity logs at or above this threshold go to stderr (default 2) @@ -183,6 +187,7 @@ minikube addons help [command] [flags] --logtostderr log to standard error instead of files --one_output If true, only write logs to their native severity level (vs also writing to each lower severity level) -p, --profile string The name of the minikube VM being used. This can be set to allow having multiple instances of minikube independently. (default "minikube") + --rootless Force to use rootless driver (docker and podman driver only) --skip_headers If true, avoid header prefixes in the log messages --skip_log_headers If true, avoid headers when opening log files --stderrthreshold severity logs at or above this threshold go to stderr (default 2) @@ -223,6 +228,7 @@ minikube addons images ingress --logtostderr log to standard error instead of files --one_output If true, only write logs to their native severity level (vs also writing to each lower severity level) -p, --profile string The name of the minikube VM being used. This can be set to allow having multiple instances of minikube independently. (default "minikube") + --rootless Force to use rootless driver (docker and podman driver only) --skip_headers If true, avoid header prefixes in the log messages --skip_log_headers If true, avoid headers when opening log files --stderrthreshold severity logs at or above this threshold go to stderr (default 2) @@ -263,6 +269,7 @@ minikube addons list [flags] --logtostderr log to standard error instead of files --one_output If true, only write logs to their native severity level (vs also writing to each lower severity level) -p, --profile string The name of the minikube VM being used. This can be set to allow having multiple instances of minikube independently. (default "minikube") + --rootless Force to use rootless driver (docker and podman driver only) --skip_headers If true, avoid header prefixes in the log messages --skip_log_headers If true, avoid headers when opening log files --stderrthreshold severity logs at or above this threshold go to stderr (default 2) @@ -307,6 +314,7 @@ minikube addons open ADDON_NAME [flags] --logtostderr log to standard error instead of files --one_output If true, only write logs to their native severity level (vs also writing to each lower severity level) -p, --profile string The name of the minikube VM being used. This can be set to allow having multiple instances of minikube independently. (default "minikube") + --rootless Force to use rootless driver (docker and podman driver only) --skip_headers If true, avoid header prefixes in the log messages --skip_log_headers If true, avoid headers when opening log files --stderrthreshold severity logs at or above this threshold go to stderr (default 2) diff --git a/site/content/en/docs/commands/cache.md b/site/content/en/docs/commands/cache.md index bbb586c043..435dfbab60 100644 --- a/site/content/en/docs/commands/cache.md +++ b/site/content/en/docs/commands/cache.md @@ -27,6 +27,7 @@ Add, delete, or push a local image into minikube --logtostderr log to standard error instead of files --one_output If true, only write logs to their native severity level (vs also writing to each lower severity level) -p, --profile string The name of the minikube VM being used. This can be set to allow having multiple instances of minikube independently. (default "minikube") + --rootless Force to use rootless driver (docker and podman driver only) --skip_headers If true, avoid header prefixes in the log messages --skip_log_headers If true, avoid headers when opening log files --stderrthreshold severity logs at or above this threshold go to stderr (default 2) @@ -67,6 +68,7 @@ minikube cache add [flags] --logtostderr log to standard error instead of files --one_output If true, only write logs to their native severity level (vs also writing to each lower severity level) -p, --profile string The name of the minikube VM being used. This can be set to allow having multiple instances of minikube independently. (default "minikube") + --rootless Force to use rootless driver (docker and podman driver only) --skip_headers If true, avoid header prefixes in the log messages --skip_log_headers If true, avoid headers when opening log files --stderrthreshold severity logs at or above this threshold go to stderr (default 2) @@ -101,6 +103,7 @@ minikube cache delete [flags] --logtostderr log to standard error instead of files --one_output If true, only write logs to their native severity level (vs also writing to each lower severity level) -p, --profile string The name of the minikube VM being used. This can be set to allow having multiple instances of minikube independently. (default "minikube") + --rootless Force to use rootless driver (docker and podman driver only) --skip_headers If true, avoid header prefixes in the log messages --skip_log_headers If true, avoid headers when opening log files --stderrthreshold severity logs at or above this threshold go to stderr (default 2) @@ -136,6 +139,7 @@ minikube cache help [command] [flags] --logtostderr log to standard error instead of files --one_output If true, only write logs to their native severity level (vs also writing to each lower severity level) -p, --profile string The name of the minikube VM being used. This can be set to allow having multiple instances of minikube independently. (default "minikube") + --rootless Force to use rootless driver (docker and podman driver only) --skip_headers If true, avoid header prefixes in the log messages --skip_log_headers If true, avoid headers when opening log files --stderrthreshold severity logs at or above this threshold go to stderr (default 2) @@ -177,6 +181,7 @@ minikube cache list [flags] --logtostderr log to standard error instead of files --one_output If true, only write logs to their native severity level (vs also writing to each lower severity level) -p, --profile string The name of the minikube VM being used. This can be set to allow having multiple instances of minikube independently. (default "minikube") + --rootless Force to use rootless driver (docker and podman driver only) --skip_headers If true, avoid header prefixes in the log messages --skip_log_headers If true, avoid headers when opening log files --stderrthreshold severity logs at or above this threshold go to stderr (default 2) @@ -211,6 +216,7 @@ minikube cache reload [flags] --logtostderr log to standard error instead of files --one_output If true, only write logs to their native severity level (vs also writing to each lower severity level) -p, --profile string The name of the minikube VM being used. This can be set to allow having multiple instances of minikube independently. (default "minikube") + --rootless Force to use rootless driver (docker and podman driver only) --skip_headers If true, avoid header prefixes in the log messages --skip_log_headers If true, avoid headers when opening log files --stderrthreshold severity logs at or above this threshold go to stderr (default 2) diff --git a/site/content/en/docs/commands/completion.md b/site/content/en/docs/commands/completion.md index eb4d6511eb..9f8bfc557a 100644 --- a/site/content/en/docs/commands/completion.md +++ b/site/content/en/docs/commands/completion.md @@ -52,6 +52,7 @@ minikube completion SHELL [flags] --logtostderr log to standard error instead of files --one_output If true, only write logs to their native severity level (vs also writing to each lower severity level) -p, --profile string The name of the minikube VM being used. This can be set to allow having multiple instances of minikube independently. (default "minikube") + --rootless Force to use rootless driver (docker and podman driver only) --skip_headers If true, avoid header prefixes in the log messages --skip_log_headers If true, avoid headers when opening log files --stderrthreshold severity logs at or above this threshold go to stderr (default 2) @@ -86,6 +87,7 @@ minikube completion bash [flags] --logtostderr log to standard error instead of files --one_output If true, only write logs to their native severity level (vs also writing to each lower severity level) -p, --profile string The name of the minikube VM being used. This can be set to allow having multiple instances of minikube independently. (default "minikube") + --rootless Force to use rootless driver (docker and podman driver only) --skip_headers If true, avoid header prefixes in the log messages --skip_log_headers If true, avoid headers when opening log files --stderrthreshold severity logs at or above this threshold go to stderr (default 2) @@ -120,6 +122,7 @@ minikube completion fish [flags] --logtostderr log to standard error instead of files --one_output If true, only write logs to their native severity level (vs also writing to each lower severity level) -p, --profile string The name of the minikube VM being used. This can be set to allow having multiple instances of minikube independently. (default "minikube") + --rootless Force to use rootless driver (docker and podman driver only) --skip_headers If true, avoid header prefixes in the log messages --skip_log_headers If true, avoid headers when opening log files --stderrthreshold severity logs at or above this threshold go to stderr (default 2) @@ -155,6 +158,7 @@ minikube completion help [command] [flags] --logtostderr log to standard error instead of files --one_output If true, only write logs to their native severity level (vs also writing to each lower severity level) -p, --profile string The name of the minikube VM being used. This can be set to allow having multiple instances of minikube independently. (default "minikube") + --rootless Force to use rootless driver (docker and podman driver only) --skip_headers If true, avoid header prefixes in the log messages --skip_log_headers If true, avoid headers when opening log files --stderrthreshold severity logs at or above this threshold go to stderr (default 2) @@ -189,6 +193,7 @@ minikube completion zsh [flags] --logtostderr log to standard error instead of files --one_output If true, only write logs to their native severity level (vs also writing to each lower severity level) -p, --profile string The name of the minikube VM being used. This can be set to allow having multiple instances of minikube independently. (default "minikube") + --rootless Force to use rootless driver (docker and podman driver only) --skip_headers If true, avoid header prefixes in the log messages --skip_log_headers If true, avoid headers when opening log files --stderrthreshold severity logs at or above this threshold go to stderr (default 2) diff --git a/site/content/en/docs/commands/config.md b/site/content/en/docs/commands/config.md index 75f99b44e3..34f572b58b 100644 --- a/site/content/en/docs/commands/config.md +++ b/site/content/en/docs/commands/config.md @@ -39,6 +39,7 @@ Configurable fields: * cache * EmbedCerts * native-ssh + * rootless ```shell minikube config SUBCOMMAND [flags] @@ -58,6 +59,7 @@ minikube config SUBCOMMAND [flags] --logtostderr log to standard error instead of files --one_output If true, only write logs to their native severity level (vs also writing to each lower severity level) -p, --profile string The name of the minikube VM being used. This can be set to allow having multiple instances of minikube independently. (default "minikube") + --rootless Force to use rootless driver (docker and podman driver only) --skip_headers If true, avoid header prefixes in the log messages --skip_log_headers If true, avoid headers when opening log files --stderrthreshold severity logs at or above this threshold go to stderr (default 2) @@ -101,6 +103,7 @@ minikube config defaults PROPERTY_NAME [flags] --logtostderr log to standard error instead of files --one_output If true, only write logs to their native severity level (vs also writing to each lower severity level) -p, --profile string The name of the minikube VM being used. This can be set to allow having multiple instances of minikube independently. (default "minikube") + --rootless Force to use rootless driver (docker and podman driver only) --skip_headers If true, avoid header prefixes in the log messages --skip_log_headers If true, avoid headers when opening log files --stderrthreshold severity logs at or above this threshold go to stderr (default 2) @@ -135,6 +138,7 @@ minikube config get PROPERTY_NAME [flags] --logtostderr log to standard error instead of files --one_output If true, only write logs to their native severity level (vs also writing to each lower severity level) -p, --profile string The name of the minikube VM being used. This can be set to allow having multiple instances of minikube independently. (default "minikube") + --rootless Force to use rootless driver (docker and podman driver only) --skip_headers If true, avoid header prefixes in the log messages --skip_log_headers If true, avoid headers when opening log files --stderrthreshold severity logs at or above this threshold go to stderr (default 2) @@ -170,6 +174,7 @@ minikube config help [command] [flags] --logtostderr log to standard error instead of files --one_output If true, only write logs to their native severity level (vs also writing to each lower severity level) -p, --profile string The name of the minikube VM being used. This can be set to allow having multiple instances of minikube independently. (default "minikube") + --rootless Force to use rootless driver (docker and podman driver only) --skip_headers If true, avoid header prefixes in the log messages --skip_log_headers If true, avoid headers when opening log files --stderrthreshold severity logs at or above this threshold go to stderr (default 2) @@ -205,6 +210,7 @@ minikube config set PROPERTY_NAME PROPERTY_VALUE [flags] --logtostderr log to standard error instead of files --one_output If true, only write logs to their native severity level (vs also writing to each lower severity level) -p, --profile string The name of the minikube VM being used. This can be set to allow having multiple instances of minikube independently. (default "minikube") + --rootless Force to use rootless driver (docker and podman driver only) --skip_headers If true, avoid header prefixes in the log messages --skip_log_headers If true, avoid headers when opening log files --stderrthreshold severity logs at or above this threshold go to stderr (default 2) @@ -239,6 +245,7 @@ minikube config unset PROPERTY_NAME [flags] --logtostderr log to standard error instead of files --one_output If true, only write logs to their native severity level (vs also writing to each lower severity level) -p, --profile string The name of the minikube VM being used. This can be set to allow having multiple instances of minikube independently. (default "minikube") + --rootless Force to use rootless driver (docker and podman driver only) --skip_headers If true, avoid header prefixes in the log messages --skip_log_headers If true, avoid headers when opening log files --stderrthreshold severity logs at or above this threshold go to stderr (default 2) @@ -280,6 +287,7 @@ minikube config view [flags] --logtostderr log to standard error instead of files --one_output If true, only write logs to their native severity level (vs also writing to each lower severity level) -p, --profile string The name of the minikube VM being used. This can be set to allow having multiple instances of minikube independently. (default "minikube") + --rootless Force to use rootless driver (docker and podman driver only) --skip_headers If true, avoid header prefixes in the log messages --skip_log_headers If true, avoid headers when opening log files --stderrthreshold severity logs at or above this threshold go to stderr (default 2) diff --git a/site/content/en/docs/commands/cp.md b/site/content/en/docs/commands/cp.md index 89e1589979..959f5cb13d 100644 --- a/site/content/en/docs/commands/cp.md +++ b/site/content/en/docs/commands/cp.md @@ -36,6 +36,7 @@ minikube cp : :: --logtostderr log to standard error instead of files --one_output If true, only write logs to their native severity level (vs also writing to each lower severity level) -p, --profile string The name of the minikube VM being used. This can be set to allow having multiple instances of minikube independently. (default "minikube") + --rootless Force to use rootless driver (docker and podman driver only) --skip_headers If true, avoid header prefixes in the log messages --skip_log_headers If true, avoid headers when opening log files --stderrthreshold severity logs at or above this threshold go to stderr (default 2) diff --git a/site/content/en/docs/commands/node.md b/site/content/en/docs/commands/node.md index 0d31ca8fcd..3214262e0d 100644 --- a/site/content/en/docs/commands/node.md +++ b/site/content/en/docs/commands/node.md @@ -31,6 +31,7 @@ minikube node [flags] --logtostderr log to standard error instead of files --one_output If true, only write logs to their native severity level (vs also writing to each lower severity level) -p, --profile string The name of the minikube VM being used. This can be set to allow having multiple instances of minikube independently. (default "minikube") + --rootless Force to use rootless driver (docker and podman driver only) --skip_headers If true, avoid header prefixes in the log messages --skip_log_headers If true, avoid headers when opening log files --stderrthreshold severity logs at or above this threshold go to stderr (default 2) @@ -73,6 +74,7 @@ minikube node add [flags] --logtostderr log to standard error instead of files --one_output If true, only write logs to their native severity level (vs also writing to each lower severity level) -p, --profile string The name of the minikube VM being used. This can be set to allow having multiple instances of minikube independently. (default "minikube") + --rootless Force to use rootless driver (docker and podman driver only) --skip_headers If true, avoid header prefixes in the log messages --skip_log_headers If true, avoid headers when opening log files --stderrthreshold severity logs at or above this threshold go to stderr (default 2) @@ -107,6 +109,7 @@ minikube node delete [flags] --logtostderr log to standard error instead of files --one_output If true, only write logs to their native severity level (vs also writing to each lower severity level) -p, --profile string The name of the minikube VM being used. This can be set to allow having multiple instances of minikube independently. (default "minikube") + --rootless Force to use rootless driver (docker and podman driver only) --skip_headers If true, avoid header prefixes in the log messages --skip_log_headers If true, avoid headers when opening log files --stderrthreshold severity logs at or above this threshold go to stderr (default 2) @@ -142,6 +145,7 @@ minikube node help [command] [flags] --logtostderr log to standard error instead of files --one_output If true, only write logs to their native severity level (vs also writing to each lower severity level) -p, --profile string The name of the minikube VM being used. This can be set to allow having multiple instances of minikube independently. (default "minikube") + --rootless Force to use rootless driver (docker and podman driver only) --skip_headers If true, avoid header prefixes in the log messages --skip_log_headers If true, avoid headers when opening log files --stderrthreshold severity logs at or above this threshold go to stderr (default 2) @@ -176,6 +180,7 @@ minikube node list [flags] --logtostderr log to standard error instead of files --one_output If true, only write logs to their native severity level (vs also writing to each lower severity level) -p, --profile string The name of the minikube VM being used. This can be set to allow having multiple instances of minikube independently. (default "minikube") + --rootless Force to use rootless driver (docker and podman driver only) --skip_headers If true, avoid header prefixes in the log messages --skip_log_headers If true, avoid headers when opening log files --stderrthreshold severity logs at or above this threshold go to stderr (default 2) @@ -216,6 +221,7 @@ minikube node start [flags] --logtostderr log to standard error instead of files --one_output If true, only write logs to their native severity level (vs also writing to each lower severity level) -p, --profile string The name of the minikube VM being used. This can be set to allow having multiple instances of minikube independently. (default "minikube") + --rootless Force to use rootless driver (docker and podman driver only) --skip_headers If true, avoid header prefixes in the log messages --skip_log_headers If true, avoid headers when opening log files --stderrthreshold severity logs at or above this threshold go to stderr (default 2) @@ -250,6 +256,7 @@ minikube node stop [flags] --logtostderr log to standard error instead of files --one_output If true, only write logs to their native severity level (vs also writing to each lower severity level) -p, --profile string The name of the minikube VM being used. This can be set to allow having multiple instances of minikube independently. (default "minikube") + --rootless Force to use rootless driver (docker and podman driver only) --skip_headers If true, avoid header prefixes in the log messages --skip_log_headers If true, avoid headers when opening log files --stderrthreshold severity logs at or above this threshold go to stderr (default 2) diff --git a/site/content/en/docs/commands/options.md b/site/content/en/docs/commands/options.md index ba0f2f43a8..a640558c9a 100644 --- a/site/content/en/docs/commands/options.md +++ b/site/content/en/docs/commands/options.md @@ -31,6 +31,7 @@ minikube options [flags] --logtostderr log to standard error instead of files --one_output If true, only write logs to their native severity level (vs also writing to each lower severity level) -p, --profile string The name of the minikube VM being used. This can be set to allow having multiple instances of minikube independently. (default "minikube") + --rootless Force to use rootless driver (docker and podman driver only) --skip_headers If true, avoid header prefixes in the log messages --skip_log_headers If true, avoid headers when opening log files --stderrthreshold severity logs at or above this threshold go to stderr (default 2) diff --git a/site/content/en/docs/commands/pause.md b/site/content/en/docs/commands/pause.md index 0c93e86655..5c444c4548 100644 --- a/site/content/en/docs/commands/pause.md +++ b/site/content/en/docs/commands/pause.md @@ -39,6 +39,7 @@ minikube pause [flags] --logtostderr log to standard error instead of files --one_output If true, only write logs to their native severity level (vs also writing to each lower severity level) -p, --profile string The name of the minikube VM being used. This can be set to allow having multiple instances of minikube independently. (default "minikube") + --rootless Force to use rootless driver (docker and podman driver only) --skip_headers If true, avoid header prefixes in the log messages --skip_log_headers If true, avoid headers when opening log files --stderrthreshold severity logs at or above this threshold go to stderr (default 2) diff --git a/site/content/en/docs/commands/podman-env.md b/site/content/en/docs/commands/podman-env.md index 61084caa8e..e09a7cbf37 100644 --- a/site/content/en/docs/commands/podman-env.md +++ b/site/content/en/docs/commands/podman-env.md @@ -38,6 +38,7 @@ minikube podman-env [flags] --logtostderr log to standard error instead of files --one_output If true, only write logs to their native severity level (vs also writing to each lower severity level) -p, --profile string The name of the minikube VM being used. This can be set to allow having multiple instances of minikube independently. (default "minikube") + --rootless Force to use rootless driver (docker and podman driver only) --skip_headers If true, avoid header prefixes in the log messages --skip_log_headers If true, avoid headers when opening log files --stderrthreshold severity logs at or above this threshold go to stderr (default 2) diff --git a/site/content/en/docs/commands/profile.md b/site/content/en/docs/commands/profile.md index c004f419c5..5f222678e6 100644 --- a/site/content/en/docs/commands/profile.md +++ b/site/content/en/docs/commands/profile.md @@ -31,6 +31,7 @@ minikube profile [MINIKUBE_PROFILE_NAME]. You can return to the default minikub --logtostderr log to standard error instead of files --one_output If true, only write logs to their native severity level (vs also writing to each lower severity level) -p, --profile string The name of the minikube VM being used. This can be set to allow having multiple instances of minikube independently. (default "minikube") + --rootless Force to use rootless driver (docker and podman driver only) --skip_headers If true, avoid header prefixes in the log messages --skip_log_headers If true, avoid headers when opening log files --stderrthreshold severity logs at or above this threshold go to stderr (default 2) @@ -66,6 +67,7 @@ minikube profile help [command] [flags] --logtostderr log to standard error instead of files --one_output If true, only write logs to their native severity level (vs also writing to each lower severity level) -p, --profile string The name of the minikube VM being used. This can be set to allow having multiple instances of minikube independently. (default "minikube") + --rootless Force to use rootless driver (docker and podman driver only) --skip_headers If true, avoid header prefixes in the log messages --skip_log_headers If true, avoid headers when opening log files --stderrthreshold severity logs at or above this threshold go to stderr (default 2) @@ -107,6 +109,7 @@ minikube profile list [flags] --logtostderr log to standard error instead of files --one_output If true, only write logs to their native severity level (vs also writing to each lower severity level) -p, --profile string The name of the minikube VM being used. This can be set to allow having multiple instances of minikube independently. (default "minikube") + --rootless Force to use rootless driver (docker and podman driver only) --skip_headers If true, avoid header prefixes in the log messages --skip_log_headers If true, avoid headers when opening log files --stderrthreshold severity logs at or above this threshold go to stderr (default 2) diff --git a/site/content/en/docs/commands/service.md b/site/content/en/docs/commands/service.md index 1677e24b7a..7de3f08f83 100644 --- a/site/content/en/docs/commands/service.md +++ b/site/content/en/docs/commands/service.md @@ -43,6 +43,7 @@ minikube service [flags] SERVICE --logtostderr log to standard error instead of files --one_output If true, only write logs to their native severity level (vs also writing to each lower severity level) -p, --profile string The name of the minikube VM being used. This can be set to allow having multiple instances of minikube independently. (default "minikube") + --rootless Force to use rootless driver (docker and podman driver only) --skip_headers If true, avoid header prefixes in the log messages --skip_log_headers If true, avoid headers when opening log files --stderrthreshold severity logs at or above this threshold go to stderr (default 2) @@ -79,6 +80,7 @@ minikube service help [command] [flags] --logtostderr log to standard error instead of files --one_output If true, only write logs to their native severity level (vs also writing to each lower severity level) -p, --profile string The name of the minikube VM being used. This can be set to allow having multiple instances of minikube independently. (default "minikube") + --rootless Force to use rootless driver (docker and podman driver only) --skip_headers If true, avoid header prefixes in the log messages --skip_log_headers If true, avoid headers when opening log files --stderrthreshold severity logs at or above this threshold go to stderr (default 2) @@ -120,6 +122,7 @@ minikube service list [flags] --logtostderr log to standard error instead of files --one_output If true, only write logs to their native severity level (vs also writing to each lower severity level) -p, --profile string The name of the minikube VM being used. This can be set to allow having multiple instances of minikube independently. (default "minikube") + --rootless Force to use rootless driver (docker and podman driver only) --skip_headers If true, avoid header prefixes in the log messages --skip_log_headers If true, avoid headers when opening log files --stderrthreshold severity logs at or above this threshold go to stderr (default 2) diff --git a/site/content/en/docs/commands/ssh-host.md b/site/content/en/docs/commands/ssh-host.md index 6fc96e2fd6..0900dbbbdd 100644 --- a/site/content/en/docs/commands/ssh-host.md +++ b/site/content/en/docs/commands/ssh-host.md @@ -38,6 +38,7 @@ minikube ssh-host [flags] --logtostderr log to standard error instead of files --one_output If true, only write logs to their native severity level (vs also writing to each lower severity level) -p, --profile string The name of the minikube VM being used. This can be set to allow having multiple instances of minikube independently. (default "minikube") + --rootless Force to use rootless driver (docker and podman driver only) --skip_headers If true, avoid header prefixes in the log messages --skip_log_headers If true, avoid headers when opening log files --stderrthreshold severity logs at or above this threshold go to stderr (default 2) diff --git a/site/content/en/docs/commands/ssh-key.md b/site/content/en/docs/commands/ssh-key.md index 5125bc9520..935f2fc79c 100644 --- a/site/content/en/docs/commands/ssh-key.md +++ b/site/content/en/docs/commands/ssh-key.md @@ -37,6 +37,7 @@ minikube ssh-key [flags] --logtostderr log to standard error instead of files --one_output If true, only write logs to their native severity level (vs also writing to each lower severity level) -p, --profile string The name of the minikube VM being used. This can be set to allow having multiple instances of minikube independently. (default "minikube") + --rootless Force to use rootless driver (docker and podman driver only) --skip_headers If true, avoid header prefixes in the log messages --skip_log_headers If true, avoid headers when opening log files --stderrthreshold severity logs at or above this threshold go to stderr (default 2) diff --git a/site/content/en/docs/commands/ssh.md b/site/content/en/docs/commands/ssh.md index 3a04ac9c2b..906e805968 100644 --- a/site/content/en/docs/commands/ssh.md +++ b/site/content/en/docs/commands/ssh.md @@ -38,6 +38,7 @@ minikube ssh [flags] --logtostderr log to standard error instead of files --one_output If true, only write logs to their native severity level (vs also writing to each lower severity level) -p, --profile string The name of the minikube VM being used. This can be set to allow having multiple instances of minikube independently. (default "minikube") + --rootless Force to use rootless driver (docker and podman driver only) --skip_headers If true, avoid header prefixes in the log messages --skip_log_headers If true, avoid headers when opening log files --stderrthreshold severity logs at or above this threshold go to stderr (default 2) diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index a8be0ad0f7..168176bcb0 100644 --- a/site/content/en/docs/commands/start.md +++ b/site/content/en/docs/commands/start.md @@ -131,6 +131,7 @@ minikube start [flags] --logtostderr log to standard error instead of files --one_output If true, only write logs to their native severity level (vs also writing to each lower severity level) -p, --profile string The name of the minikube VM being used. This can be set to allow having multiple instances of minikube independently. (default "minikube") + --rootless Force to use rootless driver (docker and podman driver only) --skip_headers If true, avoid header prefixes in the log messages --skip_log_headers If true, avoid headers when opening log files --stderrthreshold severity logs at or above this threshold go to stderr (default 2) diff --git a/site/content/en/docs/commands/status.md b/site/content/en/docs/commands/status.md index 109948ab56..b2a4483e95 100644 --- a/site/content/en/docs/commands/status.md +++ b/site/content/en/docs/commands/status.md @@ -44,6 +44,7 @@ minikube status [flags] --logtostderr log to standard error instead of files --one_output If true, only write logs to their native severity level (vs also writing to each lower severity level) -p, --profile string The name of the minikube VM being used. This can be set to allow having multiple instances of minikube independently. (default "minikube") + --rootless Force to use rootless driver (docker and podman driver only) --skip_headers If true, avoid header prefixes in the log messages --skip_log_headers If true, avoid headers when opening log files --stderrthreshold severity logs at or above this threshold go to stderr (default 2) diff --git a/site/content/en/docs/commands/stop.md b/site/content/en/docs/commands/stop.md index a7f361f4ff..cfdc1bbbf6 100644 --- a/site/content/en/docs/commands/stop.md +++ b/site/content/en/docs/commands/stop.md @@ -41,6 +41,7 @@ minikube stop [flags] --logtostderr log to standard error instead of files --one_output If true, only write logs to their native severity level (vs also writing to each lower severity level) -p, --profile string The name of the minikube VM being used. This can be set to allow having multiple instances of minikube independently. (default "minikube") + --rootless Force to use rootless driver (docker and podman driver only) --skip_headers If true, avoid header prefixes in the log messages --skip_log_headers If true, avoid headers when opening log files --stderrthreshold severity logs at or above this threshold go to stderr (default 2) diff --git a/site/content/en/docs/commands/tunnel.md b/site/content/en/docs/commands/tunnel.md index 09d6f33402..74198bb272 100644 --- a/site/content/en/docs/commands/tunnel.md +++ b/site/content/en/docs/commands/tunnel.md @@ -37,6 +37,7 @@ minikube tunnel [flags] --logtostderr log to standard error instead of files --one_output If true, only write logs to their native severity level (vs also writing to each lower severity level) -p, --profile string The name of the minikube VM being used. This can be set to allow having multiple instances of minikube independently. (default "minikube") + --rootless Force to use rootless driver (docker and podman driver only) --skip_headers If true, avoid header prefixes in the log messages --skip_log_headers If true, avoid headers when opening log files --stderrthreshold severity logs at or above this threshold go to stderr (default 2) diff --git a/site/content/en/docs/commands/unpause.md b/site/content/en/docs/commands/unpause.md index 8b500164ab..fbe17a1ad6 100644 --- a/site/content/en/docs/commands/unpause.md +++ b/site/content/en/docs/commands/unpause.md @@ -43,6 +43,7 @@ minikube unpause [flags] --logtostderr log to standard error instead of files --one_output If true, only write logs to their native severity level (vs also writing to each lower severity level) -p, --profile string The name of the minikube VM being used. This can be set to allow having multiple instances of minikube independently. (default "minikube") + --rootless Force to use rootless driver (docker and podman driver only) --skip_headers If true, avoid header prefixes in the log messages --skip_log_headers If true, avoid headers when opening log files --stderrthreshold severity logs at or above this threshold go to stderr (default 2) diff --git a/site/content/en/docs/commands/update-check.md b/site/content/en/docs/commands/update-check.md index c1622413a2..dde834875e 100644 --- a/site/content/en/docs/commands/update-check.md +++ b/site/content/en/docs/commands/update-check.md @@ -31,6 +31,7 @@ minikube update-check [flags] --logtostderr log to standard error instead of files --one_output If true, only write logs to their native severity level (vs also writing to each lower severity level) -p, --profile string The name of the minikube VM being used. This can be set to allow having multiple instances of minikube independently. (default "minikube") + --rootless Force to use rootless driver (docker and podman driver only) --skip_headers If true, avoid header prefixes in the log messages --skip_log_headers If true, avoid headers when opening log files --stderrthreshold severity logs at or above this threshold go to stderr (default 2) diff --git a/site/content/en/docs/commands/update-context.md b/site/content/en/docs/commands/update-context.md index 459179bfce..afa140db35 100644 --- a/site/content/en/docs/commands/update-context.md +++ b/site/content/en/docs/commands/update-context.md @@ -32,6 +32,7 @@ minikube update-context [flags] --logtostderr log to standard error instead of files --one_output If true, only write logs to their native severity level (vs also writing to each lower severity level) -p, --profile string The name of the minikube VM being used. This can be set to allow having multiple instances of minikube independently. (default "minikube") + --rootless Force to use rootless driver (docker and podman driver only) --skip_headers If true, avoid header prefixes in the log messages --skip_log_headers If true, avoid headers when opening log files --stderrthreshold severity logs at or above this threshold go to stderr (default 2) diff --git a/site/content/en/docs/commands/version.md b/site/content/en/docs/commands/version.md index 92a1872f3f..b7babba989 100644 --- a/site/content/en/docs/commands/version.md +++ b/site/content/en/docs/commands/version.md @@ -39,6 +39,7 @@ minikube version [flags] --logtostderr log to standard error instead of files --one_output If true, only write logs to their native severity level (vs also writing to each lower severity level) -p, --profile string The name of the minikube VM being used. This can be set to allow having multiple instances of minikube independently. (default "minikube") + --rootless Force to use rootless driver (docker and podman driver only) --skip_headers If true, avoid header prefixes in the log messages --skip_log_headers If true, avoid headers when opening log files --stderrthreshold severity logs at or above this threshold go to stderr (default 2) diff --git a/translations/de.json b/translations/de.json index b8b0d58b06..6033756175 100644 --- a/translations/de.json +++ b/translations/de.json @@ -822,9 +822,13 @@ "Using image repository {{.name}}": "Verwenden des Image-Repositorys {{.name}}", "Using image {{.registry}}{{.image}}": "Verwende Image {{.registry}}{{.image}}", "Using image {{.registry}}{{.image}} (global image repository)": "Verwende das Image {{.registry}}{{.image}} (globale Image Repository)", + "Using rootless Docker driver was required, but the current Docker does not seem rootless. Try 'docker context use rootless' .": "", + "Using rootless driver was required, but the current driver does not seem rootless": "", + "Using rootless {{.driver_name}} driver": "", "Using the '{{.runtime}}' runtime with the 'none' driver is an untested configuration!": "Das Verwenden der '{{.runtime}}' Laufzeitumgebung mit dem 'none' Treiber ist eine ungetestete Konfiguration!", "Using the {{.driver}} driver based on existing profile": "Verwende den Treiber {{.driver}} basierend auf dem existierenden Profil", "Using the {{.driver}} driver based on user configuration": "Verwende den Treiber {{.driver}} basierend auf der Benutzer-Konfiguration", + "Using {{.driver_name}} driver with the root privilege": "", "VM driver is one of: %v": "VM-Treiber ist einer von: %v", "Valid components are: {{.valid_extra_opts}}": "Gültige Komponenten sind: {{.valid_extra_opts}}", "Validate your KVM networks. Run: virt-host-validate and then virsh net-list --all": "Validieren Sie ihre KVM Netzwerke. Führen Sie folgendes aus: virt-host-validate and then virsh net-list --all", diff --git a/translations/es.json b/translations/es.json index 1639b2136f..67b95eef17 100644 --- a/translations/es.json +++ b/translations/es.json @@ -827,9 +827,13 @@ "Using image repository {{.name}}": "Utilizando el repositorio de imágenes {{.name}}", "Using image {{.registry}}{{.image}}": "", "Using image {{.registry}}{{.image}} (global image repository)": "", + "Using rootless Docker driver was required, but the current Docker does not seem rootless. Try 'docker context use rootless' .": "", + "Using rootless driver was required, but the current driver does not seem rootless": "", + "Using rootless {{.driver_name}} driver": "", "Using the '{{.runtime}}' runtime with the 'none' driver is an untested configuration!": "", "Using the {{.driver}} driver based on existing profile": "", "Using the {{.driver}} driver based on user configuration": "", + "Using {{.driver_name}} driver with the root privilege": "", "VM driver is one of: %v": "El controlador de la VM es uno de los siguientes: %v", "Valid components are: {{.valid_extra_opts}}": "", "Validate your KVM networks. Run: virt-host-validate and then virsh net-list --all": "", diff --git a/translations/fr.json b/translations/fr.json index 028c57f2e9..c635f99034 100644 --- a/translations/fr.json +++ b/translations/fr.json @@ -790,9 +790,13 @@ "Using image repository {{.name}}": "Utilisation du dépôt d'images {{.name}}…", "Using image {{.registry}}{{.image}}": "Utilisation de l'image {{.registry}}{{.image}}", "Using image {{.registry}}{{.image}} (global image repository)": "Utilisation de l'image {{.registry}}{{.image}} (référentiel d'images global)", + "Using rootless Docker driver was required, but the current Docker does not seem rootless. Try 'docker context use rootless' .": "", + "Using rootless driver was required, but the current driver does not seem rootless": "", + "Using rootless {{.driver_name}} driver": "", "Using the '{{.runtime}}' runtime with the 'none' driver is an untested configuration!": "L'utilisation du runtime '{{.runtime}}' avec le pilote 'none' est une configuration non testée !", "Using the {{.driver}} driver based on existing profile": "Utilisation du pilote {{.driver}} basé sur le profil existant", "Using the {{.driver}} driver based on user configuration": "Utilisation du pilote {{.driver}} basé sur la configuration de l'utilisateur", + "Using {{.driver_name}} driver with the root privilege": "", "Valid components are: {{.valid_extra_opts}}": "Les composants valides sont : {{.valid_extra_opts}}", "Validate your KVM networks. Run: virt-host-validate and then virsh net-list --all": "Validez vos réseaux KVM. Exécutez : virt-host-validate puis virsh net-list --all", "Verify that your HTTP_PROXY and HTTPS_PROXY environment variables are set correctly.": "Vérifiez que vos variables d'environnement HTTP_PROXY et HTTPS_PROXY sont correctement définies.", diff --git a/translations/ja.json b/translations/ja.json index e13eb5c923..4e096f3e80 100644 --- a/translations/ja.json +++ b/translations/ja.json @@ -826,9 +826,13 @@ "Using image repository {{.name}}": "{{.name}} イメージリポジトリーを使用しています", "Using image {{.registry}}{{.image}}": "{{.registry}}{{.image}} イメージを使用しています", "Using image {{.registry}}{{.image}} (global image repository)": "{{.registry}}{{.image}} イメージ (グローバルイメージリポジトリー) を使用しています", + "Using rootless Docker driver was required, but the current Docker does not seem rootless. Try 'docker context use rootless' .": "", + "Using rootless driver was required, but the current driver does not seem rootless": "", + "Using rootless {{.driver_name}} driver": "", "Using the '{{.runtime}}' runtime with the 'none' driver is an untested configuration!": "' none' ドライバーでの '{{.runtime}}' ランタイム使用は、未テストの設定です！", "Using the {{.driver}} driver based on existing profile": "既存のプロファイルを元に、{{.driver}} ドライバーを使用します", "Using the {{.driver}} driver based on user configuration": "ユーザーの設定に基づいて {{.driver}} ドライバーを使用します", + "Using {{.driver_name}} driver with the root privilege": "", "VM driver is one of: %v": "VM ドライバーは次のいずれかです: %v", "Valid components are: {{.valid_extra_opts}}": "有効なコンポーネント: {{.valid_extra_opts}}", "Validate your KVM networks. Run: virt-host-validate and then virsh net-list --all": "virt-host-validate 実行後に virsh net-list --all を実行して KVM ネットワークを検証してください", diff --git a/translations/ko.json b/translations/ko.json index 026532b9a1..17f58969df 100644 --- a/translations/ko.json +++ b/translations/ko.json @@ -828,9 +828,13 @@ "Using image repository {{.name}}": "", "Using image {{.registry}}{{.image}}": "", "Using image {{.registry}}{{.image}} (global image repository)": "", + "Using rootless Docker driver was required, but the current Docker does not seem rootless. Try 'docker context use rootless' .": "", + "Using rootless driver was required, but the current driver does not seem rootless": "", + "Using rootless {{.driver_name}} driver": "", "Using the '{{.runtime}}' runtime with the 'none' driver is an untested configuration!": "", "Using the {{.driver}} driver based on existing profile": "기존 프로필에 기반하여 {{.driver}} 드라이버를 사용하는 중", "Using the {{.driver}} driver based on user configuration": "유저 환경 설정 정보에 기반하여 {{.driver}} 드라이버를 사용하는 중", + "Using {{.driver_name}} driver with the root privilege": "", "Valid components are: {{.valid_extra_opts}}": "", "Validate your KVM networks. Run: virt-host-validate and then virsh net-list --all": "", "Verify that your HTTP_PROXY and HTTPS_PROXY environment variables are set correctly.": "", diff --git a/translations/pl.json b/translations/pl.json index e81b0eda56..b27fbb927f 100644 --- a/translations/pl.json +++ b/translations/pl.json @@ -835,9 +835,13 @@ "Using image repository {{.name}}": "", "Using image {{.registry}}{{.image}}": "", "Using image {{.registry}}{{.image}} (global image repository)": "", + "Using rootless Docker driver was required, but the current Docker does not seem rootless. Try 'docker context use rootless' .": "", + "Using rootless driver was required, but the current driver does not seem rootless": "", + "Using rootless {{.driver_name}} driver": "", "Using the '{{.runtime}}' runtime with the 'none' driver is an untested configuration!": "", "Using the {{.driver}} driver based on existing profile": "", "Using the {{.driver}} driver based on user configuration": "", + "Using {{.driver_name}} driver with the root privilege": "", "VM driver is one of: %v": "Sterownik wirtualnej maszyny to jeden z: %v", "Valid components are: {{.valid_extra_opts}}": "", "Validate your KVM networks. Run: virt-host-validate and then virsh net-list --all": "", diff --git a/translations/ru.json b/translations/ru.json index 429ebd5483..9ba76b2dfe 100644 --- a/translations/ru.json +++ b/translations/ru.json @@ -765,9 +765,13 @@ "Using image repository {{.name}}": "", "Using image {{.registry}}{{.image}}": "Используется образ {{.registry}}{{.image}}", "Using image {{.registry}}{{.image}} (global image repository)": "", + "Using rootless Docker driver was required, but the current Docker does not seem rootless. Try 'docker context use rootless' .": "", + "Using rootless driver was required, but the current driver does not seem rootless": "", + "Using rootless {{.driver_name}} driver": "", "Using the '{{.runtime}}' runtime with the 'none' driver is an untested configuration!": "", "Using the {{.driver}} driver based on existing profile": "Используется драйвер {{.driver}} на основе существующего профиля", "Using the {{.driver}} driver based on user configuration": "Используется драйвер {{.driver}} на основе конфига пользователя", + "Using {{.driver_name}} driver with the root privilege": "", "Valid components are: {{.valid_extra_opts}}": "", "Validate your KVM networks. Run: virt-host-validate and then virsh net-list --all": "", "Verify that your HTTP_PROXY and HTTPS_PROXY environment variables are set correctly.": "", diff --git a/translations/strings.txt b/translations/strings.txt index 48c9f80a3a..db92ea2a11 100644 --- a/translations/strings.txt +++ b/translations/strings.txt @@ -765,9 +765,13 @@ "Using image repository {{.name}}": "", "Using image {{.registry}}{{.image}}": "", "Using image {{.registry}}{{.image}} (global image repository)": "", + "Using rootless Docker driver was required, but the current Docker does not seem rootless. Try 'docker context use rootless' .": "", + "Using rootless driver was required, but the current driver does not seem rootless": "", + "Using rootless {{.driver_name}} driver": "", "Using the '{{.runtime}}' runtime with the 'none' driver is an untested configuration!": "", "Using the {{.driver}} driver based on existing profile": "", "Using the {{.driver}} driver based on user configuration": "", + "Using {{.driver_name}} driver with the root privilege": "", "Valid components are: {{.valid_extra_opts}}": "", "Validate your KVM networks. Run: virt-host-validate and then virsh net-list --all": "", "Verify that your HTTP_PROXY and HTTPS_PROXY environment variables are set correctly.": "", diff --git a/translations/zh-CN.json b/translations/zh-CN.json index 82fa27097b..20a4266ed6 100644 --- a/translations/zh-CN.json +++ b/translations/zh-CN.json @@ -937,10 +937,14 @@ "Using image repository {{.name}}": "正在使用镜像存储库 {{.name}}", "Using image {{.registry}}{{.image}}": "", "Using image {{.registry}}{{.image}} (global image repository)": "", + "Using rootless Docker driver was required, but the current Docker does not seem rootless. Try 'docker context use rootless' .": "", + "Using rootless driver was required, but the current driver does not seem rootless": "", + "Using rootless {{.driver_name}} driver": "", "Using the '{{.runtime}}' runtime with the 'none' driver is an untested configuration!": "同时使用 'none' 驱动以及 '{{.runtime}}' 运行时是未经测试过的配置！", "Using the running {{.driver_name}} \"{{.profile_name}}\" VM ...": "使用正在运行的 {{.driver_name}} \"{{.profile_name}}\" 虚拟机", "Using the {{.driver}} driver based on existing profile": "根据现有的配置文件使用 {{.driver}} 驱动程序", "Using the {{.driver}} driver based on user configuration": "根据用户配置使用 {{.driver}} 驱动程序", + "Using {{.driver_name}} driver with the root privilege": "", "VM driver is one of: %v": "虚拟机驱动程序是以下项之一：%v", "VM is unable to access {{.repository}}, you may need to configure a proxy or set --image-repository": "虚拟机无权访问 {{.repository}}，或许您需要配置代理或者设置 --image-repository", "VM may be unable to resolve external DNS records": "虚拟机可能无法解析外部 DNS 记录", From b9c0b16fc45ffab6eebc7319d94fa03fe5b3d3b8 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Tue, 12 Apr 2022 13:19:29 -0700 Subject: [PATCH 22/38] fix logging when JSON output selected --- pkg/minikube/out/out.go | 11 +++++------ pkg/minikube/out/out_reason.go | 30 +++++++++++++++++++----------- 2 files changed, 24 insertions(+), 17 deletions(-) diff --git a/pkg/minikube/out/out.go b/pkg/minikube/out/out.go index df5d29b64c..5c9680efcd 100644 --- a/pkg/minikube/out/out.go +++ b/pkg/minikube/out/out.go @@ -94,6 +94,7 @@ func Step(st style.Enum, format string, a ...V) { outStyled, _ := stylized(st, useColor, format, a...) if JSON { register.PrintStep(outStyled) + klog.Info(outStyled) return } register.RecordStep(outStyled) @@ -154,7 +155,6 @@ func Infof(format string, a ...V) { outStyled, _ := stylized(style.Option, useColor, format, a...) if JSON { register.PrintInfo(outStyled) - return } String(outStyled) } @@ -163,8 +163,9 @@ func Infof(format string, a ...V) { func String(format string, a ...interface{}) { // Flush log buffer so that output order makes sense klog.Flush() + defer klog.Flush() - if silent { + if silent || JSON { klog.Infof(format, a...) return } @@ -212,10 +213,6 @@ func spinnerString(format string, a ...interface{}) { // Ln writes a basic formatted string with a newline to stdout func Ln(format string, a ...interface{}) { - if JSON { - klog.Warningf("please use out.T to log steps in JSON") - return - } String(format+"\n", a...) } @@ -229,6 +226,7 @@ func ErrT(st style.Enum, format string, a ...V) { func Err(format string, a ...interface{}) { if JSON { register.PrintError(format) + klog.Warningf(format, a...) return } register.RecordError(format) @@ -271,6 +269,7 @@ func WarningT(format string, a ...V) { } st, _ := stylized(style.Warning, useColor, format, a...) register.PrintWarning(st) + klog.Warning(st) return } ErrT(style.Warning, format, a...) diff --git a/pkg/minikube/out/out_reason.go b/pkg/minikube/out/out_reason.go index 7de54ca76b..bd1ec43e3d 100644 --- a/pkg/minikube/out/out_reason.go +++ b/pkg/minikube/out/out_reason.go @@ -20,6 +20,7 @@ package out import ( "strings" + "k8s.io/klog/v2" "k8s.io/minikube/pkg/minikube/out/register" "k8s.io/minikube/pkg/minikube/reason" "k8s.io/minikube/pkg/minikube/style" @@ -35,9 +36,8 @@ func Error(k reason.Kind, format string, a ...V) { "url": k.URL, "issues": strings.Join(k.IssueURLs(), ","), }) - } else { - displayText(k, format, a...) } + displayText(k, format, a...) } // WarnReason shows a warning reason @@ -45,9 +45,8 @@ func WarnReason(k reason.Kind, format string, a ...V) { if JSON { msg := Fmt(format, a...) register.PrintWarning(msg) - } else { - displayText(k, format, a...) } + displayText(k, format, a...) } // indentMultiLine indents a message if it contains multiple lines @@ -71,33 +70,42 @@ func displayText(k reason.Kind, format string, a ...V) { st = style.KnownIssue } - ErrT(st, format, a...) + determineOutput(st, format, a...) if k.Advice != "" { advice := indentMultiLine(Fmt(k.Advice, a...)) - ErrT(style.Tip, Fmt("Suggestion: {{.advice}}", V{"advice": advice})) + determineOutput(style.Tip, Fmt("Suggestion: {{.advice}}", V{"advice": advice})) } if k.URL != "" { - ErrT(style.Documentation, "Documentation: {{.url}}", V{"url": k.URL}) + determineOutput(style.Documentation, "Documentation: {{.url}}", V{"url": k.URL}) } issueURLs := k.IssueURLs() if len(issueURLs) == 1 { - ErrT(style.Issues, "Related issue: {{.url}}", V{"url": issueURLs[0]}) + determineOutput(style.Issues, "Related issue: {{.url}}", V{"url": issueURLs[0]}) } if len(issueURLs) > 1 { - ErrT(style.Issues, "Related issues:") + determineOutput(style.Issues, "Related issues:") for _, i := range issueURLs { - ErrT(style.Issue, "{{.url}}", V{"url": i}) + determineOutput(style.Issue, "{{.url}}", V{"url": i}) } } if k.NewIssueLink { - ErrT(style.Empty, "") + determineOutput(style.Empty, "") displayGitHubIssueMessage() } Ln("") } + +func determineOutput(st style.Enum, format string, a ...V) { + if !JSON { + ErrT(st, format, a...) + return + } + errStyled, _ := stylized(st, useColor, format, a...) + klog.Warning(errStyled) +} From d29aaf8672cdcc34b3333e3db731ca95892c7557 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 12 Apr 2022 20:19:46 +0000 Subject: [PATCH 23/38] Bump github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace Bumps [github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace](https://github.com/GoogleCloudPlatform/opentelemetry-operations-go) from 1.3.0 to 1.4.0. - [Release notes](https://github.com/GoogleCloudPlatform/opentelemetry-operations-go/releases) - [Commits](https://github.com/GoogleCloudPlatform/opentelemetry-operations-go/compare/v1.3.0...v1.4.0) --- updated-dependencies: - dependency-name: github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 4 ++-- go.sum | 39 ++++++--------------------------------- 2 files changed, 8 insertions(+), 35 deletions(-) diff --git a/go.mod b/go.mod index 9d9f5e2e46..da0bfc4cbc 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ require ( contrib.go.opencensus.io/exporter/stackdriver v0.13.10 github.com/Delta456/box-cli-maker/v2 v2.2.2 github.com/GoogleCloudPlatform/docker-credential-gcr v0.0.0-20210713212222-faed5e8b8ca2 - github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.3.0 + github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.4.0 github.com/Microsoft/hcsshim v0.8.17 // indirect github.com/Parallels/docker-machine-parallels/v2 v2.0.1 github.com/VividCortex/godaemon v1.0.0 @@ -106,7 +106,7 @@ require ( cloud.google.com/go/compute v1.5.0 // indirect cloud.google.com/go/iam v0.3.0 // indirect cloud.google.com/go/monitoring v1.1.0 // indirect - cloud.google.com/go/trace v1.0.0 // indirect + cloud.google.com/go/trace v1.2.0 // indirect git.sr.ht/~sbinet/gg v0.3.1 // indirect github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd // indirect diff --git a/go.sum b/go.sum index 68390dd110..c12dd0bcea 100644 --- a/go.sum +++ b/go.sum @@ -37,7 +37,6 @@ cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUM cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc= cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= cloud.google.com/go/compute v0.1.0/go.mod h1:GAesmwr110a34z04OlxYkATPBEfVhkymfTBXtfbBFow= -cloud.google.com/go/compute v1.2.0/go.mod h1:xlogom/6gr8RJGBe7nT2eGsQYAFUbbv8dbC29qE3Xmw= cloud.google.com/go/compute v1.3.0/go.mod h1:cCZiE1NHEtai4wiufUhW8I8S1JKkAnhnQJWM7YD99wM= cloud.google.com/go/compute v1.5.0 h1:b1zWmYuuHz7gO9kDcM/EpHGr06UgsYNRpNJzI2kFiLM= cloud.google.com/go/compute v1.5.0/go.mod h1:9SMHyhJlzhlkJqrPAc839t2BZFTSk6Jdj6mkzQJeu0M= @@ -59,8 +58,9 @@ cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RX cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= cloud.google.com/go/storage v1.22.0 h1:NUV0NNp9nkBuW66BFRLuMgldN60C57ET3dhbwLIYio8= cloud.google.com/go/storage v1.22.0/go.mod h1:GbaLEoMqbVm6sx3Z0R++gSiBlgMv6yUi2q1DeGFKQgE= -cloud.google.com/go/trace v1.0.0 h1:laKx2y7IWMjguCe5zZx6n7qLtREk4kyE69SXVC0VSN8= cloud.google.com/go/trace v1.0.0/go.mod h1:4iErSByzxkyHWzzlAj63/Gmjz0NH1ASqhJguHpGcr6A= +cloud.google.com/go/trace v1.2.0 h1:oIaB4KahkIUOpLSAAjEJ8y2desbjY/x/RfP4O3KAtTI= +cloud.google.com/go/trace v1.2.0/go.mod h1:Wc8y/uYyOhPy12KEnXG9XGrvfMz5F5SrYecQlbW1rwM= contrib.go.opencensus.io/exporter/stackdriver v0.13.10 h1:a9+GZPUe+ONKUwULjlEOucMMG0qfSCCenlji0Nhqbys= contrib.go.opencensus.io/exporter/stackdriver v0.13.10/go.mod h1:I5htMbyta491eUxufwwZPQdcKvvgzMB4O9ni41YnIM8= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= @@ -102,8 +102,8 @@ github.com/Delta456/box-cli-maker/v2 v2.2.2 h1:CpSLcPgi5pY4+arzpyuWN2+nU8gHqto2Y github.com/Delta456/box-cli-maker/v2 v2.2.2/go.mod h1:idItIMZeyx3bg73XwSgsLeZd+gdpD2IvGbR3FC8a9TU= github.com/GoogleCloudPlatform/docker-credential-gcr v0.0.0-20210713212222-faed5e8b8ca2 h1:rMamBsR6iCT9Y5m2Il6vFGJvY7FAgck4AoA/LobheKU= github.com/GoogleCloudPlatform/docker-credential-gcr v0.0.0-20210713212222-faed5e8b8ca2/go.mod h1:BB1eHdMLYEFuFdBlRMb0N7YGVdM5s6Pt0njxgvfbGGs= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.3.0 h1:JLLDOHEcoREA54hzOnjr8KQcZCvX0E8KhosjE0F1jaQ= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.3.0/go.mod h1:Pe8G2QFgCaohbU/zHRBjn0YaFh9z8/HtuEDh/Lyo04E= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.4.0 h1:0jFkxz0dzGjRZItXVhv9U4yJW7Xkr82b1vSUcnD2Zh0= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.4.0/go.mod h1:1KabLpTVwm4YmU74LP4uCrOSP176G5WTMgdvfrJKgLU= github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd h1:sjQovDkwrZp8u+gxLtPgKGjk5hCxuy2hrRejBTA9xFU= github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd/go.mod h1:64YHyfSL2R96J44Nlwm39UHepQbyR5q10x7iYa1ks2E= github.com/Microsoft/go-winio v0.4.11/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA= @@ -409,7 +409,6 @@ github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w= github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/felixge/httpsnoop v1.0.2 h1:+nS9g82KMXccJ/wp0zyRW9ZBHFETmMGtkk+2CTTrW4o= -github.com/felixge/httpsnoop v1.0.2/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= github.com/fogleman/gg v1.3.0/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k= github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= @@ -450,11 +449,9 @@ github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7 github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= github.com/go-logr/logr v0.4.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/logr v1.2.1/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0= github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/stdr v1.2.0/go.mod h1:YkVgnZu1ZjjL7xTxrfm/LLZBfkhTqSR1ydtm6jTKKwI= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-logr/zapr v1.2.0/go.mod h1:Qa4Bsj2Vb+FAVeAKsLD8RLQ+YRJB8YDmOAKxaBQf7Ro= @@ -605,7 +602,6 @@ github.com/googleapis/gnostic v0.5.5/go.mod h1:7+EbHbldMins07ALC74bsA81Ovc97Dwqy github.com/googleapis/go-type-adapters v1.0.0 h1:9XdMn+d/G57qq1s8dNc5IesGCXHf6V2HZ2JwRxfA2tA= github.com/googleapis/go-type-adapters v1.0.0/go.mod h1:zHW75FOG2aur7gAO2B+MLby+cLsWGBF62rFAi7WjWO4= github.com/googleinterns/cloud-operations-api-mock v0.0.0-20200709193332-a1e58c29bdd3 h1:eHv/jVY/JNop1xg2J9cBb4EzyMpWZoNCP1BslSAIkOI= -github.com/googleinterns/cloud-operations-api-mock v0.0.0-20200709193332-a1e58c29bdd3/go.mod h1:h/KNeRx7oYU4SpA4SoY7W2/NxDKEEVuwA6j9A27L4OI= github.com/gookit/color v1.4.2 h1:tXy44JFSFkKnELV6WaMo/lLfu/meqITX3iAV52do7lk= github.com/gookit/color v1.4.2/go.mod h1:fqRyamkC1W8uxl+lxCQxOT09l/vYfZ+QeiX3rKQHCoQ= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8= @@ -1140,31 +1136,20 @@ go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opentelemetry.io/contrib v0.20.0 h1:ubFQUn0VCZ0gPwIoJfBJVpeBlyRMxu8Mm/huKWYd9p0= go.opentelemetry.io/contrib v0.20.0/go.mod h1:G/EtFaa6qaN7+LxqfIAT3GiZa7Wv5DTBUzl5H4LY0Kc= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.20.0/go.mod h1:2AboqHi0CiIZU0qwhtUfCYD1GeUzvvIXWNkhDt7ZMG4= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.26.0 h1:sdwza9BScvbOFaZLhvKDQc54vQ8CWM8jD9BO2t+rP4E= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.26.0/go.mod h1:4vatbW3QwS11DK0H0SB7FR31/VbthXcYorswdkVXdyg= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.31.0 h1:woM+Mb4d0A+Dxa3rYPenSN5ZeS9qHUvE8rlObiLRXTY= go.opentelemetry.io/otel v0.20.0/go.mod h1:Y3ugLH2oa81t5QO+Lty+zXf8zC9L26ax4Nzoxm/dooo= -go.opentelemetry.io/otel v1.0.1/go.mod h1:OPEOD4jIT2SlZPMmwT6FqZz2C0ZNdQqiWcoK6M0SNFU= -go.opentelemetry.io/otel v1.1.0/go.mod h1:7cww0OW51jQ8IaZChIEdqLwgh+44+7uiTdWsAL0wQpA= -go.opentelemetry.io/otel v1.3.0/go.mod h1:PWIKzi6JCp7sM0k9yZ43VX+T345uNbAkDKwHVjb2PTs= go.opentelemetry.io/otel v1.6.3 h1:FLOfo8f9JzFVFVyU+MSRJc2HdEAXQgm7pIv2uFKRSZE= go.opentelemetry.io/otel v1.6.3/go.mod h1:7BgNga5fNlF/iZjG06hM3yofffp0ofKCDwSXx1GC4dI= go.opentelemetry.io/otel/exporters/otlp v0.20.0/go.mod h1:YIieizyaN77rtLJra0buKiNBOm9XQfkPEKBeuhoMwAM= -go.opentelemetry.io/otel/internal/metric v0.24.0 h1:O5lFy6kAl0LMWBjzy3k//M8VjEaTDWL9DPJuqZmWIAA= -go.opentelemetry.io/otel/internal/metric v0.24.0/go.mod h1:PSkQG+KuApZjBpC6ea6082ZrWUUy/w132tJ/LOU3TXk= go.opentelemetry.io/otel/metric v0.20.0/go.mod h1:598I5tYlH1vzBjn+BTuhzTCSb/9debfNp6R3s7Pr1eU= -go.opentelemetry.io/otel/metric v0.24.0 h1:Rg4UYHS6JKR1Sw1TxnI13z7q/0p/XAbgIqUTagvLJuU= -go.opentelemetry.io/otel/metric v0.24.0/go.mod h1:tpMFnCD9t+BEGiWY2bWF5+AwjuAdM0lSowQ4SBA3/K4= +go.opentelemetry.io/otel/metric v0.28.0 h1:o5YNh+jxACMODoAo1bI7OES0RUW4jAMae0Vgs2etWAQ= go.opentelemetry.io/otel/oteltest v0.20.0/go.mod h1:L7bgKf9ZB7qCwT9Up7i9/pn0PWIa9FqQ2IQ8LoxiGnw= go.opentelemetry.io/otel/sdk v0.20.0/go.mod h1:g/IcepuwNsoiX5Byy2nNV0ySUF1em498m7hBWC279Yc= -go.opentelemetry.io/otel/sdk v1.3.0/go.mod h1:rIo4suHNhQwBIPg9axF8V9CA72Wz2mKF1teNrup8yzs= go.opentelemetry.io/otel/sdk v1.6.3 h1:prSHYdwCQOX5DrsEzxowH3nLhoAzEBdZhvrR79scfLs= go.opentelemetry.io/otel/sdk v1.6.3/go.mod h1:A4iWF7HTXa+GWL/AaqESz28VuSBIcZ+0CV+IzJ5NMiQ= go.opentelemetry.io/otel/sdk/export/metric v0.20.0/go.mod h1:h7RBNMsDJ5pmI1zExLi+bJK+Dr8NQCh0qGhm1KDnNlE= go.opentelemetry.io/otel/sdk/metric v0.20.0/go.mod h1:knxiS8Xd4E/N+ZqKmUPf3gTTZ4/0TjTXukfxjzSTpHE= go.opentelemetry.io/otel/trace v0.20.0/go.mod h1:6GjCW8zgDjwGHGa6GkyeB8+/5vjT16gUEi0Nf1iBdgw= -go.opentelemetry.io/otel/trace v1.0.1/go.mod h1:5g4i4fKLaX2BQpSBsxw8YYcgKpMMSW3x7ZTuYBr3sUk= -go.opentelemetry.io/otel/trace v1.1.0/go.mod h1:i47XtdcBQiktu5IsrPqOHe8w+sBmnLwwHt8wiUsWGTI= -go.opentelemetry.io/otel/trace v1.3.0/go.mod h1:c/VDhno8888bvQYmbYLqe41/Ldmr/KKunbvWM4/fEjk= go.opentelemetry.io/otel/trace v1.6.3 h1:IqN4L+5b0mPNjdXIiZ90Ni4Bl5BRkDQywePLWemd9bc= go.opentelemetry.io/otel/trace v1.6.3/go.mod h1:GNJQusJlUgZl9/TQBPKU/Y/ty+0iVB5fjhKeJGZPGFs= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= @@ -1298,7 +1283,6 @@ golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/ golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200602114024-627f9648deb9/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= @@ -1466,10 +1450,7 @@ golang.org/x/sys v0.0.0-20211023085530-d6a326fbbf70/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220204135822-1c1b9b1eba6a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220207234003-57398862261d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220328115105-d36c6a25d886 h1:eJv7u3ksNXoLbGSKuv2s/SIO4tJVxc/A+MTpzxDgz/Q= @@ -1545,7 +1526,6 @@ golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roY golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200701151220-7cb253f4c4f8/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= @@ -1606,9 +1586,7 @@ google.golang.org/api v0.58.0/go.mod h1:cAbP2FsxoGVNwtgNAmmn3y5G1TWAiVYRmg4yku3l google.golang.org/api v0.59.0/go.mod h1:sT2boj7M9YJxZzgeZqXogmhfmRWDtPzT31xkieUbuZU= google.golang.org/api v0.61.0/go.mod h1:xQRti5UdCmoCEqFxcz93fTl338AVqDgyaDRuOZ3hg9I= google.golang.org/api v0.63.0/go.mod h1:gs4ij2ffTRXwuzzgJl/56BdwJaA194ijkfn++9tDuPo= -google.golang.org/api v0.66.0/go.mod h1:I1dmXYpX7HGwz/ejRxwQp2qj5bFAz93HiCU1C1oYd9M= google.golang.org/api v0.67.0/go.mod h1:ShHKP8E60yPsKNw/w8w+VYaj9H6buA5UqDp8dhbQZ6g= -google.golang.org/api v0.68.0/go.mod h1:sOM8pTpwgflXRhz+oC8H2Dr+UcbMqkPPWNJo88Q7TH8= google.golang.org/api v0.70.0/go.mod h1:Bs4ZM2HGifEvXwd50TtW70ovgJffJYw2oRCOFU/SkfA= google.golang.org/api v0.71.0/go.mod h1:4PyU6e6JogV1f9eA4voyrTY2batOLdgZ5qZ5HOCc4j8= google.golang.org/api v0.74.0 h1:ExR2D+5TYIrMphWgs5JCgwRhEDlPDXXrLwHHMgPHTXE= @@ -1650,7 +1628,6 @@ google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfG google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= -google.golang.org/genproto v0.0.0-20200605102947-12044bf5ea91/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= @@ -1692,12 +1669,8 @@ google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1/go.mod h1:5CzLGKJ6 google.golang.org/genproto v0.0.0-20211206160659-862468c7d6e0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20211221195035-429b39de9b1c/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20220114231437-d2e6a121cae0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20220126215142-9970aeb2e350/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20220201184016-50beb8ab5c44/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20220204002441-d6cc3cc0770e/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20220207164111-0872dc986b00/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20220207185906-7721543eae58/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20220218161850-94dd64e39d7c/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= google.golang.org/genproto v0.0.0-20220222213610-43724f9ea8cf/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= google.golang.org/genproto v0.0.0-20220304144024-325a89244dc8/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= From 6787bcf6b2bb9eefbfeef0e0d84479d274b1145a Mon Sep 17 00:00:00 2001 From: klaases Date: Tue, 12 Apr 2022 15:25:17 -0700 Subject: [PATCH 24/38] Advise user of --force option when using root --- cmd/minikube/cmd/start.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go index 228d6d4499..158b619660 100644 --- a/cmd/minikube/cmd/start.go +++ b/cmd/minikube/cmd/start.go @@ -941,7 +941,7 @@ func validateUser(drvName string) { return } - out.ErrT(style.Stopped, `The "{{.driver_name}}" driver should not be used with root privileges.`, out.V{"driver_name": drvName}) + out.ErrT(style.Stopped, `The "{{.driver_name}}" driver should not be used with root privileges. If you still wish to continue, use --force.`, out.V{"driver_name": drvName}) out.ErrT(style.Tip, "If you are running minikube within a VM, consider using --driver=none:") out.ErrT(style.Documentation, " {{.url}}", out.V{"url": "https://minikube.sigs.k8s.io/docs/reference/drivers/none/"}) From d5a3fc48fd201b305bbd92dd12d0bafa11bcba67 Mon Sep 17 00:00:00 2001 From: klaases Date: Tue, 12 Apr 2022 15:26:26 -0700 Subject: [PATCH 25/38] Adjust message for clarity --- cmd/minikube/cmd/start.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go index 158b619660..9b5033db51 100644 --- a/cmd/minikube/cmd/start.go +++ b/cmd/minikube/cmd/start.go @@ -941,7 +941,7 @@ func validateUser(drvName string) { return } - out.ErrT(style.Stopped, `The "{{.driver_name}}" driver should not be used with root privileges. If you still wish to continue, use --force.`, out.V{"driver_name": drvName}) + out.ErrT(style.Stopped, `The "{{.driver_name}}" driver should not be used with root privileges. If you wish to continue as root, use --force.`, out.V{"driver_name": drvName}) out.ErrT(style.Tip, "If you are running minikube within a VM, consider using --driver=none:") out.ErrT(style.Documentation, " {{.url}}", out.V{"url": "https://minikube.sigs.k8s.io/docs/reference/drivers/none/"}) From 818a60b8d726a9a0209c143aecc52b9ecd983646 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 12 Apr 2022 22:53:03 +0000 Subject: [PATCH 26/38] Bump contrib.go.opencensus.io/exporter/stackdriver Bumps [contrib.go.opencensus.io/exporter/stackdriver](https://github.com/census-ecosystem/opencensus-go-exporter-stackdriver) from 0.13.10 to 0.13.11. - [Release notes](https://github.com/census-ecosystem/opencensus-go-exporter-stackdriver/releases) - [Commits](https://github.com/census-ecosystem/opencensus-go-exporter-stackdriver/compare/v0.13.10...v0.13.11) --- updated-dependencies: - dependency-name: contrib.go.opencensus.io/exporter/stackdriver dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index da0bfc4cbc..5516cb0235 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.18 require ( cloud.google.com/go/storage v1.22.0 - contrib.go.opencensus.io/exporter/stackdriver v0.13.10 + contrib.go.opencensus.io/exporter/stackdriver v0.13.11 github.com/Delta456/box-cli-maker/v2 v2.2.2 github.com/GoogleCloudPlatform/docker-credential-gcr v0.0.0-20210713212222-faed5e8b8ca2 github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.4.0 diff --git a/go.sum b/go.sum index c12dd0bcea..fd94805176 100644 --- a/go.sum +++ b/go.sum @@ -61,8 +61,8 @@ cloud.google.com/go/storage v1.22.0/go.mod h1:GbaLEoMqbVm6sx3Z0R++gSiBlgMv6yUi2q cloud.google.com/go/trace v1.0.0/go.mod h1:4iErSByzxkyHWzzlAj63/Gmjz0NH1ASqhJguHpGcr6A= cloud.google.com/go/trace v1.2.0 h1:oIaB4KahkIUOpLSAAjEJ8y2desbjY/x/RfP4O3KAtTI= cloud.google.com/go/trace v1.2.0/go.mod h1:Wc8y/uYyOhPy12KEnXG9XGrvfMz5F5SrYecQlbW1rwM= -contrib.go.opencensus.io/exporter/stackdriver v0.13.10 h1:a9+GZPUe+ONKUwULjlEOucMMG0qfSCCenlji0Nhqbys= -contrib.go.opencensus.io/exporter/stackdriver v0.13.10/go.mod h1:I5htMbyta491eUxufwwZPQdcKvvgzMB4O9ni41YnIM8= +contrib.go.opencensus.io/exporter/stackdriver v0.13.11 h1:YzmWJ2OT2K3ouXyMm5FmFQPoDs5TfLjx6Xn5x5CLN0I= +contrib.go.opencensus.io/exporter/stackdriver v0.13.11/go.mod h1:I5htMbyta491eUxufwwZPQdcKvvgzMB4O9ni41YnIM8= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= dmitri.shuralyov.com/gpu/mtl v0.0.0-20201218220906-28db891af037/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= git.sr.ht/~sbinet/gg v0.3.1 h1:LNhjNn8DerC8f9DHLz6lS0YYul/b602DUxDgGkd/Aik= From 18d20407c6a56ba24892ac10b273d35d0211bfc7 Mon Sep 17 00:00:00 2001 From: Toshiaki Inukai Date: Fri, 25 Mar 2022 09:33:32 +0000 Subject: [PATCH 27/38] Improve description for minikube cache command --- cmd/minikube/cmd/cache.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/minikube/cmd/cache.go b/cmd/minikube/cmd/cache.go index efaab82972..dd06d215ea 100644 --- a/cmd/minikube/cmd/cache.go +++ b/cmd/minikube/cmd/cache.go @@ -38,8 +38,8 @@ const allFlag = "all" // cacheCmd represents the cache command var cacheCmd = &cobra.Command{ Use: "cache", - Short: "Add, delete, or push a local image into minikube", - Long: "Add, delete, or push a local image into minikube", + Short: "Manage cache for images", + Long: "Add an image into minikube as a local cache, or delete, reload the cached images", } // addCacheCmd represents the cache add command From de465088df019ccfc71e04242c62ca8843ff494f Mon Sep 17 00:00:00 2001 From: klaases Date: Thu, 14 Apr 2022 11:16:44 -0700 Subject: [PATCH 28/38] Tidy up GCP-Auth go code --- pkg/addons/addons_gcpauth.go | 54 +++++++++++++++++------------------- 1 file changed, 25 insertions(+), 29 deletions(-) diff --git a/pkg/addons/addons_gcpauth.go b/pkg/addons/addons_gcpauth.go index e1b329cbc1..ea7f92a7cf 100644 --- a/pkg/addons/addons_gcpauth.go +++ b/pkg/addons/addons_gcpauth.go @@ -28,10 +28,11 @@ import ( "time" gcr_config "github.com/GoogleCloudPlatform/docker-credential-gcr/config" - "github.com/pkg/errors" - "golang.org/x/oauth2/google" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + + "github.com/pkg/errors" + "golang.org/x/oauth2/google" "k8s.io/klog/v2" "k8s.io/minikube/pkg/minikube/assets" "k8s.io/minikube/pkg/minikube/config" @@ -49,10 +50,13 @@ const ( projectPath = "/var/lib/minikube/google_cloud_project" secretName = "gcp-auth" namespaceName = "gcp-auth" + + // readPermission correlates to read-only file system permissions + readPermission = "0444" ) // enableOrDisableGCPAuth enables or disables the gcp-auth addon depending on the val parameter -func enableOrDisableGCPAuth(cfg *config.ClusterConfig, name string, val string) error { +func enableOrDisableGCPAuth(cfg *config.ClusterConfig, name, val string) error { enable, err := strconv.ParseBool(val) if err != nil { return errors.Wrapf(err, "parsing bool: %s", name) @@ -86,8 +90,7 @@ func enableAddonGCPAuth(cfg *config.ClusterConfig) error { // Create a registry secret in every namespace we can find // Always create the pull secret, no matter where we are - err = createPullSecret(cfg, creds) - if err != nil { + if err := createPullSecret(cfg, creds); err != nil { return errors.Wrap(err, "pull secret") } @@ -98,29 +101,28 @@ func enableAddonGCPAuth(cfg *config.ClusterConfig) error { } if creds.JSON == nil { - out.WarningT("You have authenticated with a service account that does not have an associated JSON. The GCP Auth requires credentials with a JSON file to in order to continue. The image pull secret has been imported.") + out.WarningT("You have authenticated with a service account that does not have an associated JSON. The GCP Auth requires credentials with a JSON file in order to continue. The image pull secret has been imported.") return nil } // Actually copy the creds over - f := assets.NewMemoryAssetTarget(creds.JSON, credentialsPath, "0444") + f := assets.NewMemoryAssetTarget(creds.JSON, credentialsPath, readPermission) - err = r.Copy(f) - if err != nil { + if err := r.Copy(f); err != nil { return err } // First check if the project env var is explicitly set projectEnv := os.Getenv("GOOGLE_CLOUD_PROJECT") if projectEnv != "" { - f := assets.NewMemoryAssetTarget([]byte(projectEnv), projectPath, "0444") + f := assets.NewMemoryAssetTarget([]byte(projectEnv), projectPath, readPermission) return r.Copy(f) } - // We're currently assuming gcloud is installed and in the user's path + // We're currently assuming gCloud is installed and in the user's path proj, err := exec.Command("gcloud", "config", "get-value", "project").Output() if err == nil && len(proj) > 0 { - f := assets.NewMemoryAssetTarget(bytes.TrimSpace(proj), projectPath, "0444") + f := assets.NewMemoryAssetTarget(bytes.TrimSpace(proj), projectPath, readPermission) return r.Copy(f) } @@ -132,7 +134,7 @@ func enableAddonGCPAuth(cfg *config.ClusterConfig) error { or set the GOOGLE_CLOUD_PROJECT environment variable.`) // Copy an empty file in to avoid errors about missing files - emptyFile := assets.NewMemoryAssetTarget([]byte{}, projectPath, "0444") + emptyFile := assets.NewMemoryAssetTarget([]byte{}, projectPath, readPermission) return r.Copy(emptyFile) } @@ -155,7 +157,7 @@ func createPullSecret(cc *config.ClusterConfig, creds *google.Credentials) error return err } - dockercfg := "" + var dockercfg string registries := append(gcr_config.DefaultGCRRegistries[:], gcr_config.DefaultARRegistries[:]...) for _, reg := range registries { dockercfg += fmt.Sprintf(`"https://%s":{"username":"oauth2accesstoken","password":"%s","email":"none"},`, reg, token.AccessToken) @@ -289,8 +291,7 @@ func refreshExistingPods(cc *config.ClusterConfig) error { _, err = pods.Get(context.TODO(), p.Name, metav1.GetOptions{}) } - _, err = pods.Create(context.TODO(), &p, metav1.CreateOptions{}) - if err != nil { + if _, err := pods.Create(context.TODO(), &p, metav1.CreateOptions{}); err != nil { return err } } @@ -304,15 +305,14 @@ func disableAddonGCPAuth(cfg *config.ClusterConfig) error { r := cc.CP.Runner // Clean up the files generated when enabling the addon - creds := assets.NewMemoryAssetTarget([]byte{}, credentialsPath, "0444") + creds := assets.NewMemoryAssetTarget([]byte{}, credentialsPath, readPermission) err := r.Remove(creds) if err != nil { return err } - project := assets.NewMemoryAssetTarget([]byte{}, projectPath, "0444") - err = r.Remove(project) - if err != nil { + project := assets.NewMemoryAssetTarget([]byte{}, projectPath, readPermission) + if err := r.Remove(project); err != nil { return err } @@ -332,8 +332,7 @@ func disableAddonGCPAuth(cfg *config.ClusterConfig) error { continue } secrets := client.Secrets(n.Name) - err := secrets.Delete(context.TODO(), secretName, metav1.DeleteOptions{}) - if err != nil { + if err := secrets.Delete(context.TODO(), secretName, metav1.DeleteOptions{}); err != nil { klog.Infof("error deleting secret: %v", err) } @@ -347,8 +346,7 @@ func disableAddonGCPAuth(cfg *config.ClusterConfig) error { for i, ps := range sa.ImagePullSecrets { if ps.Name == secretName { sa.ImagePullSecrets = append(sa.ImagePullSecrets[:i], sa.ImagePullSecrets[i+1:]...) - _, err := serviceaccounts.Update(context.TODO(), &sa, metav1.UpdateOptions{}) - if err != nil { + if _, err := serviceaccounts.Update(context.TODO(), &sa, metav1.UpdateOptions{}); err != nil { return err } break @@ -360,7 +358,7 @@ func disableAddonGCPAuth(cfg *config.ClusterConfig) error { return nil } -func verifyGCPAuthAddon(cc *config.ClusterConfig, name string, val string) error { +func verifyGCPAuthAddon(cc *config.ClusterConfig, name, val string) error { enable, err := strconv.ParseBool(val) if err != nil { return errors.Wrapf(err, "parsing bool: %s", name) @@ -372,14 +370,12 @@ func verifyGCPAuthAddon(cc *config.ClusterConfig, name string, val string) error return ErrSkipThisAddon } - err = verifyAddonStatusInternal(cc, name, val, "gcp-auth") - if err != nil { + if err := verifyAddonStatusInternal(cc, name, val, "gcp-auth"); err != nil { return err } if Refresh { - err = refreshExistingPods(cc) - if err != nil { + if err := refreshExistingPods(cc); err != nil { return err } } From da5045c72d38f65193f962c38127074bdcac26aa Mon Sep 17 00:00:00 2001 From: klaases Date: Thu, 14 Apr 2022 11:41:15 -0700 Subject: [PATCH 29/38] Fix reference to gcloud --- pkg/addons/addons_gcpauth.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/addons/addons_gcpauth.go b/pkg/addons/addons_gcpauth.go index ea7f92a7cf..b69a7df27a 100644 --- a/pkg/addons/addons_gcpauth.go +++ b/pkg/addons/addons_gcpauth.go @@ -119,7 +119,7 @@ func enableAddonGCPAuth(cfg *config.ClusterConfig) error { return r.Copy(f) } - // We're currently assuming gCloud is installed and in the user's path + // We're currently assuming gcloud is installed and in the user's path proj, err := exec.Command("gcloud", "config", "get-value", "project").Output() if err == nil && len(proj) > 0 { f := assets.NewMemoryAssetTarget(bytes.TrimSpace(proj), projectPath, readPermission) From 2e59b351d691e0f9caf85279ce96e3076fa7c613 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Fri, 15 Apr 2022 00:41:45 +0000 Subject: [PATCH 30/38] Update auto-generated docs and translations --- translations/de.json | 2 ++ translations/es.json | 3 ++- translations/fr.json | 2 ++ translations/ja.json | 2 ++ translations/ko.json | 3 ++- translations/pl.json | 3 ++- translations/ru.json | 3 ++- translations/strings.txt | 3 ++- translations/zh-CN.json | 3 ++- 9 files changed, 18 insertions(+), 6 deletions(-) diff --git a/translations/de.json b/translations/de.json index 6033756175..3a0f010635 100644 --- a/translations/de.json +++ b/translations/de.json @@ -626,6 +626,7 @@ "Test docs have been saved at - {{.path}}": "Test Dokumentate wurden gespeichert in - {{.path}}", "The \"{{.driver_name}}\" driver requires root privileges. Please run minikube using 'sudo minikube --vm-driver={{.driver_name}}": "Der Treiber \"{{.driver_name}}\" benötigt Root-Rechte. Führen Sie minikube aus mit 'sudo minikube --vm-driver = {{.driver_name}}.", "The \"{{.driver_name}}\" driver should not be used with root privileges.": "Der Treiber \"{{.driver_name}}\" sollte nicht mit Root Privilegien gestartet werden.", + "The \"{{.driver_name}}\" driver should not be used with root privileges. If you wish to continue as root, use --force.": "", "The \"{{.name}}\" cluster has been deleted.": "Der Cluster \"{{.name}}\" wurde gelöscht.", "The \"{{.name}}\" cluster has been deleted.__1": "Der Cluster \"{{.name}}\" wurde gelöscht.", "The 'none' driver is designed for experts who need to integrate with an existing VM": "Der Treiber \"Keine\" ist für Experten designed, die mit einer existierenden VM integrieren müssen", @@ -862,6 +863,7 @@ "You cannot change the CPUs for an existing minikube cluster. Please first delete the cluster.": "Die Anzahl der CPUs eines existierenden Minikube Clusters kann nicht geändert werden. Bitte löschen Sie den Cluster zuerst.", "You cannot change the disk size for an existing minikube cluster. Please first delete the cluster.": "Die Plattengröße eines existierenden Minikube Clusters kann nicht geändert werden. Bitte löschen Sie den Cluster zuerst.", "You cannot change the memory size for an existing minikube cluster. Please first delete the cluster.": "Die Speichergröße eines existierenden Minikube Clusters kann nicht geändert werden. Bitte löschen Sie den Cluster zuerst.", + "You have authenticated with a service account that does not have an associated JSON. The GCP Auth requires credentials with a JSON file in order to continue. The image pull secret has been imported.": "", "You have authenticated with a service account that does not have an associated JSON. The GCP Auth requires credentials with a JSON file to in order to continue. The image pull secret has been imported.": "Sie haben sich mit einem Service Account authentifiziert, welcher kein zugehöriges JSON besitzt. GCP Auth benötigt Zugangsdaten in einer JSON-Datei um weitermachen zu können. Das Image Pull Secret wurde importiert.", "You have chosen to disable the CNI but the \\\"{{.name}}\\\" container runtime requires CNI": "Sie haben den CNI Treiber deaktiviert, aber die \\\"{{.name}}\\\" Container Laufzeitumgebung benötigt ein CNI", "You have selected \"virtualbox\" driver, but there are better options !\nFor better performance and support consider using a different driver: {{.drivers}}\n\nTo turn off this warning run:\n\n\t$ minikube config set WantVirtualBoxDriverWarning false\n\n\nTo learn more about on minikube drivers checkout https://minikube.sigs.k8s.io/docs/drivers/\nTo see benchmarks checkout https://minikube.sigs.k8s.io/docs/benchmarks/cpuusage/\n\n": "Sie haben den \"virtualbox\" Treiber ausgewählt, aber es existieren bessere Möglichkeiten !\nFür eine bessere Performanz und besseren Support erwägen Sie die Verwendung eines anderen Treibers: {{.drivers}}\n\nUm diese Warnung zu deaktivieren, führen Sie folgendes aus:\n\n\t$ minikube config set WantVirtualBoxDriverWarning false\n\n\nUm mehr über die Minikube-Treiber zu erfahren, lesen Sie https://minikube.sigs.k8s.io/docs/drivers/\nZu Benchmarks lesen Sie https://minikube.sigs.k8s.io/docs/benchmarks/cpuusage/\n\n", diff --git a/translations/es.json b/translations/es.json index 67b95eef17..7e034b806c 100644 --- a/translations/es.json +++ b/translations/es.json @@ -633,6 +633,7 @@ "Test docs have been saved at - {{.path}}": "", "The \"{{.driver_name}}\" driver requires root privileges. Please run minikube using 'sudo minikube --vm-driver={{.driver_name}}": "El controlador \"{{.driver_name}}\" requiere privilegios de raíz. Ejecuta minikube mediante sudo minikube --vm-driver={{.driver_name}}", "The \"{{.driver_name}}\" driver should not be used with root privileges.": "", + "The \"{{.driver_name}}\" driver should not be used with root privileges. If you wish to continue as root, use --force.": "", "The \"{{.name}}\" cluster has been deleted.": "Se ha eliminado el clúster \"{{.name}}\".", "The \"{{.name}}\" cluster has been deleted.__1": "Se ha eliminado el clúster \"{{.name}}\".", "The 'none' driver is designed for experts who need to integrate with an existing VM": "", @@ -866,7 +867,7 @@ "You cannot change the CPUs for an existing minikube cluster. Please first delete the cluster.": "", "You cannot change the disk size for an existing minikube cluster. Please first delete the cluster.": "", "You cannot change the memory size for an existing minikube cluster. Please first delete the cluster.": "", - "You have authenticated with a service account that does not have an associated JSON. The GCP Auth requires credentials with a JSON file to in order to continue. The image pull secret has been imported.": "", + "You have authenticated with a service account that does not have an associated JSON. The GCP Auth requires credentials with a JSON file in order to continue. The image pull secret has been imported.": "", "You have chosen to disable the CNI but the \\\"{{.name}}\\\" container runtime requires CNI": "", "You have selected \"virtualbox\" driver, but there are better options !\nFor better performance and support consider using a different driver: {{.drivers}}\n\nTo turn off this warning run:\n\n\t$ minikube config set WantVirtualBoxDriverWarning false\n\n\nTo learn more about on minikube drivers checkout https://minikube.sigs.k8s.io/docs/drivers/\nTo see benchmarks checkout https://minikube.sigs.k8s.io/docs/benchmarks/cpuusage/\n\n": "", "You may need to manually remove the \"{{.name}}\" VM from your hypervisor": "Puede que tengas que retirar manualmente la VM \"{{.name}}\" de tu hipervisor", diff --git a/translations/fr.json b/translations/fr.json index c635f99034..0bcb0ecbd3 100644 --- a/translations/fr.json +++ b/translations/fr.json @@ -611,6 +611,7 @@ "Target {{.path}} can not be empty": "La cible {{.path}} ne peut pas être vide", "Test docs have been saved at - {{.path}}": "Les documents de test ont été enregistrés à - {{.path}}", "The \"{{.driver_name}}\" driver should not be used with root privileges.": "Le pilote \"{{.driver_name}}\" ne doit pas être utilisé avec les privilèges root.", + "The \"{{.driver_name}}\" driver should not be used with root privileges. If you wish to continue as root, use --force.": "", "The 'none' driver is designed for experts who need to integrate with an existing VM": "Le pilote 'none' est conçu pour les experts qui doivent s'intégrer à une machine virtuelle existante", "The '{{.addonName}}' addon is enabled": "Le module '{{.addonName}}' est activé", "The '{{.driver}}' driver requires elevated permissions. The following commands will be executed:\\n\\n{{ .example }}\\n": "Le pilote '{{.driver}}' nécessite des autorisations élevées. Les commandes suivantes seront exécutées :\\n\\n{{ .example }}\\n", @@ -827,6 +828,7 @@ "You cannot change the CPUs for an existing minikube cluster. Please first delete the cluster.": "Vous ne pouvez pas modifier les processeurs d'un cluster minikube existant. Veuillez d'abord supprimer le cluster.", "You cannot change the disk size for an existing minikube cluster. Please first delete the cluster.": "Vous ne pouvez pas modifier la taille du disque pour un cluster minikube existant. Veuillez d'abord supprimer le cluster.", "You cannot change the memory size for an existing minikube cluster. Please first delete the cluster.": "Vous ne pouvez pas modifier la taille de la mémoire d'un cluster minikube existant. Veuillez d'abord supprimer le cluster.", + "You have authenticated with a service account that does not have an associated JSON. The GCP Auth requires credentials with a JSON file in order to continue. The image pull secret has been imported.": "", "You have authenticated with a service account that does not have an associated JSON. The GCP Auth requires credentials with a JSON file to in order to continue. The image pull secret has been imported.": "Vous vous êtes authentifié avec un compte de service qui n'a pas de JSON associé. L'authentification GCP nécessite des informations d'identification avec un fichier JSON pour continuer. Le secret d'extraction d'image a été importé.", "You have chosen to disable the CNI but the \\\"{{.name}}\\\" container runtime requires CNI": "Vous avez choisi de désactiver le CNI mais le runtime du conteneur \\\"{{.name}}\\\" nécessite CNI", "You have selected \"virtualbox\" driver, but there are better options !\nFor better performance and support consider using a different driver: {{.drivers}}\n\nTo turn off this warning run:\n\n\t$ minikube config set WantVirtualBoxDriverWarning false\n\n\nTo learn more about on minikube drivers checkout https://minikube.sigs.k8s.io/docs/drivers/\nTo see benchmarks checkout https://minikube.sigs.k8s.io/docs/benchmarks/cpuusage/\n\n": "Vous avez sélectionné le pilote \"virtualbox\", mais il existe de meilleures options !\nPour de meilleures performances et une meilleure assistance, envisagez d'utiliser un autre pilote: {{.drivers}}\n\nPour désactiver cet avertissement, exécutez :\n\n\t $ minikube config set WantVirtualBoxDriverWarning false\n\n\nPour en savoir plus sur les pilotes minikube, consultez https://minikube.sigs.k8s.io/docs/drivers/\nPour voir les benchmarks, consultez https://minikube.sigs.k8s. io/docs/benchmarks/cpuusage/\n\n", diff --git a/translations/ja.json b/translations/ja.json index 4e096f3e80..a8c62fbd5a 100644 --- a/translations/ja.json +++ b/translations/ja.json @@ -625,6 +625,7 @@ "Test docs have been saved at - {{.path}}": "テストドキュメントは {{.path}} に保存されました", "The \"{{.driver_name}}\" driver requires root privileges. Please run minikube using 'sudo minikube --vm-driver={{.driver_name}}": "「{{.driver_name}}」ドライバーにはルート権限が必要です。'sudo minikube --vm-driver={{.driver_name}}' を使用して minikube を実行してください", "The \"{{.driver_name}}\" driver should not be used with root privileges.": "「{{.driver_name}}」ドライバーは root 権限で使用すべきではありません。", + "The \"{{.driver_name}}\" driver should not be used with root privileges. If you wish to continue as root, use --force.": "", "The \"{{.name}}\" cluster has been deleted.": "「{{.name}}」クラスターが削除されました", "The \"{{.name}}\" cluster has been deleted.__1": "「{{.name}}」クラスターが削除されました", "The 'none' driver is designed for experts who need to integrate with an existing VM": "'none' ドライバーは既存 VM の統合が必要なエキスパートに向けて設計されています。", @@ -870,6 +871,7 @@ "You cannot change the CPUs for an existing minikube cluster. Please first delete the cluster.": "既存の minikube クラスターに対して、CPU を変更できません。最初にクラスターを削除してください。", "You cannot change the disk size for an existing minikube cluster. Please first delete the cluster.": "既存の minikube クラスターに対して、ディスクサイズを変更できません。最初にクラスターを削除してください。", "You cannot change the memory size for an existing minikube cluster. Please first delete the cluster.": "既存の minikube クラスターに対して、メモリサイズを変更できません。最初にクラスターを削除してください。", + "You have authenticated with a service account that does not have an associated JSON. The GCP Auth requires credentials with a JSON file in order to continue. The image pull secret has been imported.": "", "You have authenticated with a service account that does not have an associated JSON. The GCP Auth requires credentials with a JSON file to in order to continue. The image pull secret has been imported.": "関連する JSON がないサービスアカウントで認証しています。GCP Auth は、作業を続行するために JSON ファイル付きクレデンシャルを要求します。イメージ取得シークレットがインポートされました。", "You have chosen to disable the CNI but the \\\"{{.name}}\\\" container runtime requires CNI": "CNI 無効が選択されましたが、「{{.name}}」コンテナランタイムは CNI が必要です", "You have selected \"virtualbox\" driver, but there are better options !\nFor better performance and support consider using a different driver: {{.drivers}}\n\nTo turn off this warning run:\n\n\t$ minikube config set WantVirtualBoxDriverWarning false\n\n\nTo learn more about on minikube drivers checkout https://minikube.sigs.k8s.io/docs/drivers/\nTo see benchmarks checkout https://minikube.sigs.k8s.io/docs/benchmarks/cpuusage/\n\n": "「virtualbox」ドライバーが選択されましたが、より良い選択肢があります！\n性能と機能の向上のため、別のドライバー使用を検討してください: {{.drivers}}\n\nこの警告を表示させないためには、以下を実行してください:\n\n\t$ minikube config set WantVirtualBoxDriverWarning false\n\n\nminikube ドライバーについてもっと知るためには、https://minikube.sigs.k8s.io/docs/drivers/ を確認してください。\nベンチマークについては https://minikube.sigs.k8s.io/docs/benchmarks/cpuusage/ を確認してください\n\n", diff --git a/translations/ko.json b/translations/ko.json index 17f58969df..1003278cb3 100644 --- a/translations/ko.json +++ b/translations/ko.json @@ -649,6 +649,7 @@ "Test docs have been saved at - {{.path}}": "", "The \"{{.driver_name}}\" driver requires root privileges. Please run minikube using 'sudo minikube --driver={{.driver_name}}'.": "\"{{.driver_name}}\" 드라이버는 root 권한으로 실행되어야 합니다. minikube 를 다음과 같이 실행하세요 'sudo minikube --driver={{.driver_name}}'", "The \"{{.driver_name}}\" driver should not be used with root privileges.": "\"{{.driver_name}}\" 드라이버는 root 권한으로 실행되면 안 됩니다", + "The \"{{.driver_name}}\" driver should not be used with root privileges. If you wish to continue as root, use --force.": "", "The 'none' driver is designed for experts who need to integrate with an existing VM": "", "The '{{.addonName}}' addon is enabled": "'{{.addonName}}' 애드온이 활성화되었습니다", "The '{{.driver}}' driver requires elevated permissions. The following commands will be executed:\\n\\n{{ .example }}\\n": "", @@ -867,7 +868,7 @@ "You cannot change the CPUs for an existing minikube cluster. Please first delete the cluster.": "", "You cannot change the disk size for an existing minikube cluster. Please first delete the cluster.": "", "You cannot change the memory size for an existing minikube cluster. Please first delete the cluster.": "", - "You have authenticated with a service account that does not have an associated JSON. The GCP Auth requires credentials with a JSON file to in order to continue. The image pull secret has been imported.": "", + "You have authenticated with a service account that does not have an associated JSON. The GCP Auth requires credentials with a JSON file in order to continue. The image pull secret has been imported.": "", "You have chosen to disable the CNI but the \\\"{{.name}}\\\" container runtime requires CNI": "", "You have selected \"virtualbox\" driver, but there are better options !\nFor better performance and support consider using a different driver: {{.drivers}}\n\nTo turn off this warning run:\n\n\t$ minikube config set WantVirtualBoxDriverWarning false\n\n\nTo learn more about on minikube drivers checkout https://minikube.sigs.k8s.io/docs/drivers/\nTo see benchmarks checkout https://minikube.sigs.k8s.io/docs/benchmarks/cpuusage/\n\n": "", "You may need to manually remove the \"{{.name}}\" VM from your hypervisor": "", diff --git a/translations/pl.json b/translations/pl.json index b27fbb927f..a2e129e66e 100644 --- a/translations/pl.json +++ b/translations/pl.json @@ -649,6 +649,7 @@ "The \"{{.cluster_name}}\" cluster has been deleted.": "Klaster \"{{.cluster_name}}\" został usunięty", "The \"{{.driver_name}}\" driver requires root privileges. Please run minikube using 'sudo minikube --vm-driver={{.driver_name}}'.": "Sterownik \"{{.driver_name}}\" wymaga uprawnień root'a. Użyj 'sudo minikube --vm-driver={{.driver_name}}'", "The \"{{.driver_name}}\" driver should not be used with root privileges.": "", + "The \"{{.driver_name}}\" driver should not be used with root privileges. If you wish to continue as root, use --force.": "", "The \"{{.name}}\" cluster has been deleted.": "Klaster \"{{.name}}\" został usunięty.", "The 'none' driver is designed for experts who need to integrate with an existing VM": "", "The '{{.addonName}}' addon is enabled": "", @@ -876,7 +877,7 @@ "You cannot change the CPUs for an existing minikube cluster. Please first delete the cluster.": "", "You cannot change the disk size for an existing minikube cluster. Please first delete the cluster.": "", "You cannot change the memory size for an existing minikube cluster. Please first delete the cluster.": "", - "You have authenticated with a service account that does not have an associated JSON. The GCP Auth requires credentials with a JSON file to in order to continue. The image pull secret has been imported.": "", + "You have authenticated with a service account that does not have an associated JSON. The GCP Auth requires credentials with a JSON file in order to continue. The image pull secret has been imported.": "", "You have chosen to disable the CNI but the \\\"{{.name}}\\\" container runtime requires CNI": "", "You have selected \"virtualbox\" driver, but there are better options !\nFor better performance and support consider using a different driver: {{.drivers}}\n\nTo turn off this warning run:\n\n\t$ minikube config set WantVirtualBoxDriverWarning false\n\n\nTo learn more about on minikube drivers checkout https://minikube.sigs.k8s.io/docs/drivers/\nTo see benchmarks checkout https://minikube.sigs.k8s.io/docs/benchmarks/cpuusage/\n\n": "", "You may need to manually remove the \"{{.name}}\" VM from your hypervisor": "", diff --git a/translations/ru.json b/translations/ru.json index 9ba76b2dfe..20e96c5553 100644 --- a/translations/ru.json +++ b/translations/ru.json @@ -592,6 +592,7 @@ "Target {{.path}} can not be empty": "", "Test docs have been saved at - {{.path}}": "", "The \"{{.driver_name}}\" driver should not be used with root privileges.": "", + "The \"{{.driver_name}}\" driver should not be used with root privileges. If you wish to continue as root, use --force.": "", "The 'none' driver is designed for experts who need to integrate with an existing VM": "", "The '{{.addonName}}' addon is enabled": "", "The '{{.driver}}' driver requires elevated permissions. The following commands will be executed:\\n\\n{{ .example }}\\n": "", @@ -801,7 +802,7 @@ "You cannot change the CPUs for an existing minikube cluster. Please first delete the cluster.": "", "You cannot change the disk size for an existing minikube cluster. Please first delete the cluster.": "", "You cannot change the memory size for an existing minikube cluster. Please first delete the cluster.": "", - "You have authenticated with a service account that does not have an associated JSON. The GCP Auth requires credentials with a JSON file to in order to continue. The image pull secret has been imported.": "", + "You have authenticated with a service account that does not have an associated JSON. The GCP Auth requires credentials with a JSON file in order to continue. The image pull secret has been imported.": "", "You have chosen to disable the CNI but the \\\"{{.name}}\\\" container runtime requires CNI": "", "You have selected \"virtualbox\" driver, but there are better options !\nFor better performance and support consider using a different driver: {{.drivers}}\n\nTo turn off this warning run:\n\n\t$ minikube config set WantVirtualBoxDriverWarning false\n\n\nTo learn more about on minikube drivers checkout https://minikube.sigs.k8s.io/docs/drivers/\nTo see benchmarks checkout https://minikube.sigs.k8s.io/docs/benchmarks/cpuusage/\n\n": "", "You may need to manually remove the \"{{.name}}\" VM from your hypervisor": "", diff --git a/translations/strings.txt b/translations/strings.txt index db92ea2a11..98672b3c0a 100644 --- a/translations/strings.txt +++ b/translations/strings.txt @@ -592,6 +592,7 @@ "Target {{.path}} can not be empty": "", "Test docs have been saved at - {{.path}}": "", "The \"{{.driver_name}}\" driver should not be used with root privileges.": "", + "The \"{{.driver_name}}\" driver should not be used with root privileges. If you wish to continue as root, use --force.": "", "The 'none' driver is designed for experts who need to integrate with an existing VM": "", "The '{{.addonName}}' addon is enabled": "", "The '{{.driver}}' driver requires elevated permissions. The following commands will be executed:\\n\\n{{ .example }}\\n": "", @@ -801,7 +802,7 @@ "You cannot change the CPUs for an existing minikube cluster. Please first delete the cluster.": "", "You cannot change the disk size for an existing minikube cluster. Please first delete the cluster.": "", "You cannot change the memory size for an existing minikube cluster. Please first delete the cluster.": "", - "You have authenticated with a service account that does not have an associated JSON. The GCP Auth requires credentials with a JSON file to in order to continue. The image pull secret has been imported.": "", + "You have authenticated with a service account that does not have an associated JSON. The GCP Auth requires credentials with a JSON file in order to continue. The image pull secret has been imported.": "", "You have chosen to disable the CNI but the \\\"{{.name}}\\\" container runtime requires CNI": "", "You have selected \"virtualbox\" driver, but there are better options !\nFor better performance and support consider using a different driver: {{.drivers}}\n\nTo turn off this warning run:\n\n\t$ minikube config set WantVirtualBoxDriverWarning false\n\n\nTo learn more about on minikube drivers checkout https://minikube.sigs.k8s.io/docs/drivers/\nTo see benchmarks checkout https://minikube.sigs.k8s.io/docs/benchmarks/cpuusage/\n\n": "", "You may need to manually remove the \"{{.name}}\" VM from your hypervisor": "", diff --git a/translations/zh-CN.json b/translations/zh-CN.json index 20a4266ed6..804609078f 100644 --- a/translations/zh-CN.json +++ b/translations/zh-CN.json @@ -734,6 +734,7 @@ "Test docs have been saved at - {{.path}}": "", "The \"{{.driver_name}}\" driver requires root privileges. Please run minikube using 'sudo minikube --vm-driver={{.driver_name}}": "“{{.driver_name}}”驱动程序需要根权限。请使用“sudo minikube --vm-driver={{.driver_name}}”运行 minikube", "The \"{{.driver_name}}\" driver should not be used with root privileges.": "", + "The \"{{.driver_name}}\" driver should not be used with root privileges. If you wish to continue as root, use --force.": "", "The \"{{.name}}\" cluster has been deleted.": "“{{.name}}”集群已删除。", "The \"{{.name}}\" cluster has been deleted.__1": "“{{.name}}”集群已删除。", "The 'none' driver does not respect the --cpus flag": "'none' 驱动程序不遵循 --cpus 标志", @@ -985,7 +986,7 @@ "You cannot change the CPUs for an existing minikube cluster. Please first delete the cluster.": "", "You cannot change the disk size for an existing minikube cluster. Please first delete the cluster.": "", "You cannot change the memory size for an existing minikube cluster. Please first delete the cluster.": "", - "You have authenticated with a service account that does not have an associated JSON. The GCP Auth requires credentials with a JSON file to in order to continue. The image pull secret has been imported.": "", + "You have authenticated with a service account that does not have an associated JSON. The GCP Auth requires credentials with a JSON file in order to continue. The image pull secret has been imported.": "", "You have chosen to disable the CNI but the \\\"{{.name}}\\\" container runtime requires CNI": "", "You have selected \"virtualbox\" driver, but there are better options !\nFor better performance and support consider using a different driver: {{.drivers}}\n\nTo turn off this warning run:\n\n\t$ minikube config set WantVirtualBoxDriverWarning false\n\n\nTo learn more about on minikube drivers checkout https://minikube.sigs.k8s.io/docs/drivers/\nTo see benchmarks checkout https://minikube.sigs.k8s.io/docs/benchmarks/cpuusage/\n\n": "", "You may need to manually remove the \"{{.name}}\" VM from your hypervisor": "您可能需要从管理程序中手动移除“{{.name}}”虚拟机", From 7629745dd0ca1ce705f6260059a66c0b4bbb500a Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Fri, 15 Apr 2022 11:43:32 -0700 Subject: [PATCH 31/38] add basic view --- gui/cluster.h | 4 - gui/window.cpp | 238 ++++++++++++++++++++++++++++++++++--------------- gui/window.h | 107 ++++++++++++++-------- 3 files changed, 235 insertions(+), 114 deletions(-) diff --git a/gui/cluster.h b/gui/cluster.h index 9bb2a59edb..7e4b5fb82c 100644 --- a/gui/cluster.h +++ b/gui/cluster.h @@ -59,7 +59,6 @@ #include #include -//! [0] class Cluster { public: @@ -89,12 +88,10 @@ private: int m_cpus; int m_memory; }; -//! [0] typedef QList ClusterList; typedef QHash ClusterHash; -//! [1] class ClusterModel : public QAbstractListModel { Q_OBJECT @@ -115,6 +112,5 @@ public: private: ClusterList clusterList; }; -//! [1] #endif // CLUSTER_H diff --git a/gui/window.cpp b/gui/window.cpp index 6a2af99395..acd0e3487c 100644 --- a/gui/window.cpp +++ b/gui/window.cpp @@ -81,6 +81,7 @@ #include #include #include +#include #ifndef QT_NO_TERMWIDGET #include @@ -88,16 +89,82 @@ #include "qtermwidget.h" #endif -//! [0] Window::Window() { trayIconIcon = new QIcon(":/images/minikube.png"); checkForMinikube(); + isBasicView = true; + + stackedWidget = new QStackedWidget; + QVBoxLayout *layout = new QVBoxLayout; + dashboardProcess = 0; + createClusterGroupBox(); createActions(); createTrayIcon(); + createBasicView(); + createAdvancedView(); + trayIcon->show(); + updateButtons(); + layout->addWidget(stackedWidget); + setLayout(layout); + resize(200, 250); + + + setWindowTitle(tr("minikube")); + setWindowIcon(*trayIconIcon); +} + +void Window::createBasicView() +{ + basicStartButton = new QPushButton(tr("Start")); + basicStopButton = new QPushButton(tr("Stop")); + basicDeleteButton = new QPushButton(tr("Delete")); + basicRefreshButton = new QPushButton(tr("Refresh")); + basicSSHButton = new QPushButton(tr("SSH")); + basicDashboardButton = new QPushButton(tr("Dashboard")); + QPushButton *advancedViewButton = new QPushButton(tr("Advanced View")); + + QVBoxLayout *buttonLayout = new QVBoxLayout; + QGroupBox *catBox = new QGroupBox(tr("Clusters")); + catBox->setLayout(buttonLayout); + buttonLayout->addWidget(basicStartButton); + buttonLayout->addWidget(basicStopButton); + buttonLayout->addWidget(basicDeleteButton); + buttonLayout->addWidget(basicRefreshButton); + buttonLayout->addWidget(basicSSHButton); + buttonLayout->addWidget(basicDashboardButton); + buttonLayout->addWidget(advancedViewButton); + catBox->setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Ignored); + stackedWidget->addWidget(catBox); + + connect(basicSSHButton, &QAbstractButton::clicked, this, &Window::sshConsole); + connect(basicDashboardButton, &QAbstractButton::clicked, this, &Window::dashboardBrowser); + connect(basicStartButton, &QAbstractButton::clicked, this, &Window::startSelectedMinikube); + connect(basicStopButton, &QAbstractButton::clicked, this, &Window::stopMinikube); + connect(basicDeleteButton, &QAbstractButton::clicked, this, &Window::deleteMinikube); + connect(basicRefreshButton, &QAbstractButton::clicked, this, &Window::updateClusters); + connect(advancedViewButton, &QAbstractButton::clicked, this, &Window::toAdvancedView); +} + +void Window::toAdvancedView() +{ + isBasicView = false; + stackedWidget->setCurrentIndex(1); + resize(600, 400); +} + +void Window::toBasicView() +{ + isBasicView = true; + stackedWidget->setCurrentIndex(0); + resize(200, 250); +} + +void Window::createAdvancedView() +{ connect(sshButton, &QAbstractButton::clicked, this, &Window::sshConsole); connect(dashboardButton, &QAbstractButton::clicked, this, &Window::dashboardBrowser); connect(startButton, &QAbstractButton::clicked, this, &Window::startSelectedMinikube); @@ -107,30 +174,17 @@ Window::Window() connect(createButton, &QAbstractButton::clicked, this, &Window::initMachine); connect(trayIcon, &QSystemTrayIcon::messageClicked, this, &Window::messageClicked); - dashboardProcess = 0; - - QVBoxLayout *mainLayout = new QVBoxLayout; - mainLayout->addWidget(clusterGroupBox); - setLayout(mainLayout); - - trayIcon->show(); - - setWindowTitle(tr("minikube")); - setWindowIcon(*trayIconIcon); - resize(600, 400); + clusterGroupBox->setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Ignored); + stackedWidget->addWidget(clusterGroupBox); } -//! [0] -//! [1] void Window::setVisible(bool visible) { minimizeAction->setEnabled(visible); restoreAction->setEnabled(!visible); QDialog::setVisible(visible); } -//! [1] -//! [2] void Window::closeEvent(QCloseEvent *event) { #ifdef Q_OS_OSX @@ -148,16 +202,13 @@ void Window::closeEvent(QCloseEvent *event) event->ignore(); } } -//! [2] -//! [6] void Window::messageClicked() { QMessageBox::information(0, tr("Systray"), tr("Sorry, I already gave what help I could.\n" "Maybe you should try asking a human?")); } -//! [6] void Window::createActions() { @@ -240,15 +291,13 @@ ClusterList Window::getClusters() ClusterList clusters; QStringList args = { "profile", "list", "-o", "json" }; QString text; - bool success = sendMinikubeCommand(args, text); + sendMinikubeCommand(args, text); QStringList lines; - if (success) { #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) - lines = text.split("\n", Qt::SkipEmptyParts); + lines = text.split("\n", Qt::SkipEmptyParts); #else - lines = text.split("\n", QString::SkipEmptyParts); + lines = text.split("\n", QString::SkipEmptyParts); #endif - } for (int i = 0; i < lines.size(); i++) { QString line = lines.at(i); QJsonParseError error; @@ -257,58 +306,67 @@ ClusterList Window::getClusters() qDebug() << error.errorString(); continue; } - if (json.isObject()) { - QJsonObject par = json.object(); - QJsonArray a = par["valid"].toArray(); - for (int j = 0; j < a.size(); j++) { - QJsonObject obj = a[j].toObject(); - QString name; - if (obj.contains("Name")) { - name = obj["Name"].toString(); - } - if (name.isEmpty()) { - continue; - } - Cluster cluster(name); - if (obj.contains("Status")) { - QString status = obj["Status"].toString(); - cluster.setStatus(status); - } - if (!obj.contains("Config")) { - clusters << cluster; - continue; - } - QJsonObject config = obj["Config"].toObject(); - if (config.contains("CPUs")) { - int cpus = config["CPUs"].toInt(); - cluster.setCpus(cpus); - } - if (config.contains("Memory")) { - int memory = config["Memory"].toInt(); - cluster.setMemory(memory); - } - if (config.contains("Driver")) { - QString driver = config["Driver"].toString(); - cluster.setDriver(driver); - } - if (!config.contains("KubernetesConfig")) { - clusters << cluster; - continue; - } - QJsonObject k8sConfig = config["KubernetesConfig"].toObject(); - if (k8sConfig.contains("ContainerRuntime")) { - QString containerRuntime = k8sConfig["ContainerRuntime"].toString(); - cluster.setContainerRuntime(containerRuntime); - } - clusters << cluster; - } + if (!json.isObject()) { + continue; + } + QJsonObject par = json.object(); + QJsonArray a = par["valid"].toArray(); + QJsonArray b = par["invalid"].toArray(); + for (int i = 0; i < b.size(); i++) { + a.append(b[i]); + } + for (int i = 0; i < a.size(); i++) { + QJsonObject obj = a[i].toObject(); + Cluster cluster = createClusterObject(obj); + clusters << cluster; } } return clusters; } +Cluster Window::createClusterObject(QJsonObject obj) +{ + QString name; + if (obj.contains("Name")) { + name = obj["Name"].toString(); + } + Cluster cluster(name); + if (obj.contains("Status")) { + QString status = obj["Status"].toString(); + cluster.setStatus(status); + } + if (!obj.contains("Config")) { + return cluster; + } + QJsonObject config = obj["Config"].toObject(); + if (config.contains("CPUs")) { + int cpus = config["CPUs"].toInt(); + cluster.setCpus(cpus); + } + if (config.contains("Memory")) { + int memory = config["Memory"].toInt(); + cluster.setMemory(memory); + } + if (config.contains("Driver")) { + QString driver = config["Driver"].toString(); + cluster.setDriver(driver); + } + if (!config.contains("KubernetesConfig")) { + return cluster; + } + QJsonObject k8sConfig = config["KubernetesConfig"].toObject(); + if (k8sConfig.contains("ContainerRuntime")) { + QString containerRuntime = k8sConfig["ContainerRuntime"].toString(); + cluster.setContainerRuntime(containerRuntime); + } + return cluster; +} + QString Window::selectedCluster() { + if (isBasicView) { + return "minikube"; + } QModelIndex index = clusterListView->currentIndex(); QVariant variant = index.data(Qt::DisplayRole); if (variant.isNull()) { @@ -356,12 +414,13 @@ void Window::createClusterGroupBox() createButton = new QPushButton(tr("Create")); sshButton = new QPushButton(tr("SSH")); dashboardButton = new QPushButton(tr("Dashboard")); - - updateButtons(); + QPushButton *basicViewButton = new QPushButton(tr("Basic View")); + connect(basicViewButton, &QAbstractButton::clicked, this, &Window::toBasicView); QHBoxLayout *topButtonLayout = new QHBoxLayout; topButtonLayout->addWidget(createButton); topButtonLayout->addWidget(refreshButton); + topButtonLayout->addWidget(basicViewButton); topButtonLayout->addSpacing(340); QHBoxLayout *bottomButtonLayout = new QHBoxLayout; @@ -379,6 +438,40 @@ void Window::createClusterGroupBox() } void Window::updateButtons() +{ + if (isBasicView) { + updateBasicButtons(); + } else { + updateAdvancedButtons(); + } +} + +void Window::updateBasicButtons() +{ + Cluster *cluster = new Cluster(); + ClusterList list = getClusters(); + for (int i = 0; i < list.length(); i++) { + Cluster curr = list[i]; + if (curr.name() != "minikube") { + continue; + } + cluster = &curr; + break; + } + bool exists = cluster->name() == "minikube"; + bool isRunning = exists && cluster->status() == "Running"; + basicStartButton->setEnabled(isRunning == false); + basicStopButton->setEnabled(isRunning == true); + basicDeleteButton->setEnabled(exists == true); + basicDashboardButton->setEnabled(isRunning == true); +#if __linux__ + basicSSHButton->setEnabled(isRunning == true); +#else + basicSSHButton->setEnabled(false); +#endif +} + +void Window::updateAdvancedButtons() { QString cluster = selectedCluster(); if (cluster.isEmpty()) { @@ -441,6 +534,7 @@ bool Window::sendMinikubeCommand(QStringList cmds, QString &text) text = process->readAllStandardOutput(); if (success) { } else { + qDebug() << text; qDebug() << process->readAllStandardError(); } delete process; @@ -631,7 +725,7 @@ void Window::sshConsole() console->setTerminalFont(font); console->setColorScheme("Tango"); console->setShellProgram(program); - QStringList args = { "ssh" }; + QStringList args = { "ssh", "-p", selectedCluster() }; console->setArgs(args); console->startShellProgram(); diff --git a/gui/window.h b/gui/window.h index 1c321edbde..e3f8098cb4 100644 --- a/gui/window.h +++ b/gui/window.h @@ -56,6 +56,7 @@ #include #include +#include #ifndef QT_NO_SYSTEMTRAYICON @@ -79,7 +80,6 @@ QT_END_NAMESPACE #include "cluster.h" -//! [0] class Window : public QDialog { Q_OBJECT @@ -98,53 +98,84 @@ private slots: void dashboardClose(); private: - void createActionGroupBox(); - void createActions(); + // Tray icon void createTrayIcon(); - void startMinikube(QStringList args); - void startSelectedMinikube(); - void stopMinikube(); - void deleteMinikube(); - ClusterList getClusters(); - QString selectedCluster(); - void setSelectedCluster(QString cluster); - QTableView *clusterListView; - void createClusterGroupBox(); - QGroupBox *clusterGroupBox; - ClusterModel *clusterModel; - ClusterHash getClusterHash(); - bool sendMinikubeCommand(QStringList cmds); - bool sendMinikubeCommand(QStringList cmds, QString &text); - void updateClusters(); - void askCustom(); - void askName(); - QComboBox *driverComboBox; - QComboBox *containerRuntimeComboBox; - void initMachine(); - void sshConsole(); - void dashboardBrowser(); - void checkForMinikube(); - void outputFailedStart(QString text); - QLabel *createLabel(QString title, QString text, QFormLayout *form, bool isLink); - QPushButton *sshButton; - QPushButton *dashboardButton; - QProcess *dashboardProcess; + void createActions(); + QAction *minimizeAction; + QAction *restoreAction; + QAction *quitAction; + QSystemTrayIcon *trayIcon; + QMenu *trayIconMenu; + QIcon *trayIconIcon; + // Basic view + void createBasicView(); + void toBasicView(); + void updateBasicButtons(); + void basicStartMinikube(); + void basicStopMinikube(); + void basicDeleteMinikube(); + void basicRefreshMinikube(); + void basicSSHMinikube(); + void basicDashboardMinikube(); + QPushButton *basicStartButton; + QPushButton *basicStopButton; + QPushButton *basicDeleteButton; + QPushButton *basicRefreshButton; + QPushButton *basicSSHButton; + QPushButton *basicDashboardButton; + + // Advanced view + void createAdvancedView(); + void toAdvancedView(); + void createClusterGroupBox(); + void updateAdvancedButtons(); QPushButton *startButton; QPushButton *stopButton; QPushButton *deleteButton; QPushButton *refreshButton; QPushButton *createButton; + QPushButton *sshButton; + QPushButton *dashboardButton; + QGroupBox *clusterGroupBox; - QAction *minimizeAction; - QAction *restoreAction; - QAction *quitAction; + // Cluster table + QString selectedCluster(); + void setSelectedCluster(QString cluster); + ClusterHash getClusterHash(); + ClusterList getClusters(); + void updateClusters(); + ClusterModel *clusterModel; + QTableView *clusterListView; - QSystemTrayIcon *trayIcon; - QMenu *trayIconMenu; - QIcon *trayIconIcon; + + // Create cluster + void askCustom(); + void askName(); + QComboBox *driverComboBox; + QComboBox *containerRuntimeComboBox; + + // Commands + void startMinikube(QStringList args); + void startSelectedMinikube(); + void stopMinikube(); + void deleteMinikube(); + bool sendMinikubeCommand(QStringList cmds); + bool sendMinikubeCommand(QStringList cmds, QString &text); + void initMachine(); + void sshConsole(); + void dashboardBrowser(); + Cluster createClusterObject(QJsonObject obj); + QProcess *dashboardProcess; + + // Error messaging + void outputFailedStart(QString text); + QLabel *createLabel(QString title, QString text, QFormLayout *form, bool isLink); + + void checkForMinikube(); + QStackedWidget *stackedWidget; + bool isBasicView; }; -//! [0] #endif // QT_NO_SYSTEMTRAYICON From 4cf746311d4defa7a5203bef43f74211c8deb61c Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Fri, 15 Apr 2022 11:49:26 -0700 Subject: [PATCH 32/38] format --- gui/window.cpp | 1 - gui/window.h | 1 - 2 files changed, 2 deletions(-) diff --git a/gui/window.cpp b/gui/window.cpp index acd0e3487c..088771423f 100644 --- a/gui/window.cpp +++ b/gui/window.cpp @@ -112,7 +112,6 @@ Window::Window() setLayout(layout); resize(200, 250); - setWindowTitle(tr("minikube")); setWindowIcon(*trayIconIcon); } diff --git a/gui/window.h b/gui/window.h index e3f8098cb4..95fc57b80f 100644 --- a/gui/window.h +++ b/gui/window.h @@ -148,7 +148,6 @@ private: ClusterModel *clusterModel; QTableView *clusterListView; - // Create cluster void askCustom(); void askName(); From 45abbf745b3caf1cfb371811c1a4e570b6a33d6a Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Fri, 15 Apr 2022 11:53:19 -0700 Subject: [PATCH 33/38] remove groupbox label --- gui/window.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gui/window.cpp b/gui/window.cpp index acd0e3487c..b1df45a9dc 100644 --- a/gui/window.cpp +++ b/gui/window.cpp @@ -128,7 +128,7 @@ void Window::createBasicView() QPushButton *advancedViewButton = new QPushButton(tr("Advanced View")); QVBoxLayout *buttonLayout = new QVBoxLayout; - QGroupBox *catBox = new QGroupBox(tr("Clusters")); + QGroupBox *catBox = new QGroupBox(); catBox->setLayout(buttonLayout); buttonLayout->addWidget(basicStartButton); buttonLayout->addWidget(basicStopButton); From 6b7d4dda49f356e134584abd882eba8da227524e Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 18 Apr 2022 09:02:21 +0000 Subject: [PATCH 34/38] bump golang versions --- .github/workflows/build.yml | 2 +- .github/workflows/docs.yml | 2 +- .github/workflows/functional_verified.yml | 2 +- .github/workflows/leaderboard.yml | 2 +- .github/workflows/master.yml | 2 +- .github/workflows/pr.yml | 2 +- .github/workflows/time-to-k8s-public-chart.yml | 2 +- .github/workflows/time-to-k8s.yml | 2 +- .github/workflows/translations.yml | 2 +- .github/workflows/update-golang-version.yml | 2 +- .github/workflows/update-golint-version.yml | 2 +- .github/workflows/update-k8s-versions.yml | 2 +- .github/workflows/update-kubadm-constants.yml | 2 +- Makefile | 2 +- hack/jenkins/installers/check_install_golang.sh | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b79651aaa8..075d150bb6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,7 +12,7 @@ on: - "!deploy/iso/**" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.18' + GO_VERSION: '1.18.1' permissions: contents: read diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index d0004044d2..7e7e3b8667 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -6,7 +6,7 @@ on: - master env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.18' + GO_VERSION: '1.18.1' permissions: contents: read diff --git a/.github/workflows/functional_verified.yml b/.github/workflows/functional_verified.yml index 8d92994ccc..09c113d415 100644 --- a/.github/workflows/functional_verified.yml +++ b/.github/workflows/functional_verified.yml @@ -21,7 +21,7 @@ on: - deleted env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.18' + GO_VERSION: '1.18.1' permissions: contents: read diff --git a/.github/workflows/leaderboard.yml b/.github/workflows/leaderboard.yml index f93ed160f0..7ef9427dd6 100644 --- a/.github/workflows/leaderboard.yml +++ b/.github/workflows/leaderboard.yml @@ -7,7 +7,7 @@ on: release: types: [published] env: - GO_VERSION: '1.18' + GO_VERSION: '1.18.1' permissions: contents: read diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 005367b273..0ca6af5c87 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -14,7 +14,7 @@ on: - "!deploy/iso/**" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.18' + GO_VERSION: '1.18.1' permissions: contents: read diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 2e4edad5fc..023cacce10 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -12,7 +12,7 @@ on: - "!deploy/iso/**" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.18' + GO_VERSION: '1.18.1' permissions: contents: read diff --git a/.github/workflows/time-to-k8s-public-chart.yml b/.github/workflows/time-to-k8s-public-chart.yml index 44b42ca892..7cb7762df4 100644 --- a/.github/workflows/time-to-k8s-public-chart.yml +++ b/.github/workflows/time-to-k8s-public-chart.yml @@ -6,7 +6,7 @@ on: - cron: "0 2,14 * * *" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.18' + GO_VERSION: '1.18.1' permissions: contents: read diff --git a/.github/workflows/time-to-k8s.yml b/.github/workflows/time-to-k8s.yml index 5af4ca818c..b98d0ce9c6 100644 --- a/.github/workflows/time-to-k8s.yml +++ b/.github/workflows/time-to-k8s.yml @@ -5,7 +5,7 @@ on: types: [released] env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.18' + GO_VERSION: '1.18.1' permissions: contents: read diff --git a/.github/workflows/translations.yml b/.github/workflows/translations.yml index 34fadcc977..1681e0f6e8 100644 --- a/.github/workflows/translations.yml +++ b/.github/workflows/translations.yml @@ -6,7 +6,7 @@ on: - "translations/**" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.18' + GO_VERSION: '1.18.1' permissions: contents: read diff --git a/.github/workflows/update-golang-version.yml b/.github/workflows/update-golang-version.yml index b7983e349a..0e78ef9ad7 100644 --- a/.github/workflows/update-golang-version.yml +++ b/.github/workflows/update-golang-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 9 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.18' + GO_VERSION: '1.18.1' permissions: contents: read diff --git a/.github/workflows/update-golint-version.yml b/.github/workflows/update-golint-version.yml index a9ae17b165..f47f757760 100644 --- a/.github/workflows/update-golint-version.yml +++ b/.github/workflows/update-golint-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.18' + GO_VERSION: '1.18.1' permissions: contents: read diff --git a/.github/workflows/update-k8s-versions.yml b/.github/workflows/update-k8s-versions.yml index 5e51fa13c7..66642a1f71 100644 --- a/.github/workflows/update-k8s-versions.yml +++ b/.github/workflows/update-k8s-versions.yml @@ -6,7 +6,7 @@ on: - cron: "0 8 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.18' + GO_VERSION: '1.18.1' permissions: contents: read diff --git a/.github/workflows/update-kubadm-constants.yml b/.github/workflows/update-kubadm-constants.yml index d5d07992d9..c37e06824c 100644 --- a/.github/workflows/update-kubadm-constants.yml +++ b/.github/workflows/update-kubadm-constants.yml @@ -6,7 +6,7 @@ on: - cron: "0 6 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.18' + GO_VERSION: '1.18.1' permissions: contents: read diff --git a/Makefile b/Makefile index afd6088a99..313a85aaf7 100644 --- a/Makefile +++ b/Makefile @@ -33,7 +33,7 @@ RPM_REVISION ?= 0 # used by hack/jenkins/release_build_and_upload.sh and KVM_BUILD_IMAGE, see also BUILD_IMAGE below # update this only by running `make update-golang-version` -GO_VERSION ?= 1.18 +GO_VERSION ?= 1.18.1 # update this only by running `make update-golang-version` GO_K8S_VERSION_PREFIX ?= v1.24.0 diff --git a/hack/jenkins/installers/check_install_golang.sh b/hack/jenkins/installers/check_install_golang.sh index 10b1d1dcb5..37dea2c673 100755 --- a/hack/jenkins/installers/check_install_golang.sh +++ b/hack/jenkins/installers/check_install_golang.sh @@ -22,7 +22,7 @@ if (($# < 1)); then exit 1 fi -VERSION_TO_INSTALL=1.18 +VERSION_TO_INSTALL=1.18.1 INSTALL_PATH=${1} function current_arch() { From 8bc5aafa9d9a70ce652a91c86feb37796ab1d0a8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Apr 2022 18:05:05 +0000 Subject: [PATCH 35/38] Bump github.com/spf13/viper from 1.10.1 to 1.11.0 Bumps [github.com/spf13/viper](https://github.com/spf13/viper) from 1.10.1 to 1.11.0. - [Release notes](https://github.com/spf13/viper/releases) - [Commits](https://github.com/spf13/viper/compare/v1.10.1...v1.11.0) --- updated-dependencies: - dependency-name: github.com/spf13/viper dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 25 +++++++++++++------------ go.sum | 51 +++++++++++++++++++++++++++++++++++++-------------- 2 files changed, 50 insertions(+), 26 deletions(-) diff --git a/go.mod b/go.mod index 5516cb0235..bbb1baf68a 100644 --- a/go.mod +++ b/go.mod @@ -65,19 +65,19 @@ require ( github.com/shirou/gopsutil/v3 v3.22.3 github.com/spf13/cobra v1.4.0 github.com/spf13/pflag v1.0.5 - github.com/spf13/viper v1.10.1 + github.com/spf13/viper v1.11.0 github.com/zchee/go-vmnet v0.0.0-20161021174912-97ebf9174097 go.opencensus.io v0.23.0 go.opentelemetry.io/otel v1.6.3 go.opentelemetry.io/otel/sdk v1.6.3 go.opentelemetry.io/otel/trace v1.6.3 golang.org/x/build v0.0.0-20190927031335-2835ba2e683f - golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 + golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4 golang.org/x/exp v0.0.0-20210220032938-85be41e4509f golang.org/x/mod v0.5.1 - golang.org/x/oauth2 v0.0.0-20220309155454-6242fa91716a + golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c - golang.org/x/sys v0.0.0-20220328115105-d36c6a25d886 + golang.org/x/sys v0.0.0-20220412211240-33da011f77ad golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 golang.org/x/text v0.3.7 gonum.org/v1/plot v0.11.0 @@ -98,6 +98,7 @@ require ( require ( github.com/Xuanwo/go-locale v1.1.0 + github.com/docker/go-connections v0.4.0 github.com/santhosh-tekuri/jsonschema/v5 v5.0.0 ) @@ -126,7 +127,6 @@ require ( github.com/docker/cli v20.10.7+incompatible // indirect github.com/docker/distribution v2.7.1+incompatible // indirect github.com/docker/docker-credential-helpers v0.6.3 // indirect - github.com/docker/go-connections v0.4.0 // indirect github.com/evanphx/json-patch v4.12.0+incompatible // indirect github.com/fatih/color v1.13.0 // indirect github.com/fsnotify/fsnotify v1.5.1 // indirect @@ -143,7 +143,7 @@ require ( github.com/golang/snappy v0.0.3 // indirect github.com/google/go-querystring v1.0.0 // indirect github.com/google/gofuzz v1.1.0 // indirect - github.com/googleapis/gax-go/v2 v2.2.0 // indirect + github.com/googleapis/gax-go/v2 v2.3.0 // indirect github.com/googleapis/gnostic v0.5.5 // indirect github.com/googleapis/go-type-adapters v1.0.0 // indirect github.com/gookit/color v1.4.2 // indirect @@ -157,7 +157,7 @@ require ( github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.13.0 // indirect github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect - github.com/magiconair/properties v1.8.5 // indirect + github.com/magiconair/properties v1.8.6 // indirect github.com/mattn/go-colorable v0.1.12 // indirect github.com/mattn/go-runewidth v0.0.13 // indirect github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect @@ -174,6 +174,7 @@ require ( github.com/opencontainers/image-spec v1.0.1 // indirect github.com/opencontainers/runc v1.0.2 // indirect github.com/pelletier/go-toml v1.9.4 // indirect + github.com/pelletier/go-toml/v2 v2.0.0-beta.8 // indirect github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect github.com/prometheus/client_golang v1.11.0 // indirect github.com/prometheus/client_model v0.2.0 // indirect @@ -182,7 +183,7 @@ require ( github.com/rivo/uniseg v0.2.0 // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/sirupsen/logrus v1.8.1 // indirect - github.com/spf13/afero v1.6.0 // indirect + github.com/spf13/afero v1.8.2 // indirect github.com/spf13/cast v1.4.1 // indirect github.com/spf13/jwalterweatherman v1.1.0 // indirect github.com/subosito/gotenv v1.2.0 // indirect @@ -195,15 +196,15 @@ require ( go.uber.org/multierr v1.6.0 // indirect go.uber.org/zap v1.19.0 // indirect golang.org/x/image v0.0.0-20220302094943-723b81ca9867 // indirect - golang.org/x/net v0.0.0-20220325170049-de3da57026de // indirect + golang.org/x/net v0.0.0-20220412020605-290c469a71a5 // indirect golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect - golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect + golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f // indirect google.golang.org/appengine v1.6.7 // indirect - google.golang.org/genproto v0.0.0-20220405205423-9d709892a2bf // indirect + google.golang.org/genproto v0.0.0-20220407144326-9054f6ed7bac // indirect google.golang.org/grpc v1.45.0 // indirect google.golang.org/protobuf v1.28.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect - gopkg.in/ini.v1 v1.66.2 // indirect + gopkg.in/ini.v1 v1.66.4 // indirect gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect diff --git a/go.sum b/go.sum index fd94805176..eb8f6d1ee4 100644 --- a/go.sum +++ b/go.sum @@ -4,6 +4,7 @@ cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU= cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= +cloud.google.com/go v0.44.3/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc= cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0= cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To= @@ -17,6 +18,7 @@ cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOY cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY= cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI= cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk= +cloud.google.com/go v0.75.0/go.mod h1:VGuuCn7PG0dwsd5XPVm2Mm3wlh3EL55/79EKB6hlPTY= cloud.google.com/go v0.78.0/go.mod h1:QjdrLG0uq+YwhjoVOLsS1t7TW8fs36kLs4XO5R5ECHg= cloud.google.com/go v0.79.0/go.mod h1:3bzgcEeQlzbuEAYu4mrWhKqWjmpprinYgKJLgKHnbb8= cloud.google.com/go v0.81.0/go.mod h1:mk/AM35KwGk/Nm2YSeZbxXdrNK3KZOYHmLkOqC2V6E0= @@ -56,6 +58,7 @@ cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0Zeo cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= +cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo= cloud.google.com/go/storage v1.22.0 h1:NUV0NNp9nkBuW66BFRLuMgldN60C57ET3dhbwLIYio8= cloud.google.com/go/storage v1.22.0/go.mod h1:GbaLEoMqbVm6sx3Z0R++gSiBlgMv6yUi2q1DeGFKQgE= cloud.google.com/go/trace v1.0.0/go.mod h1:4iErSByzxkyHWzzlAj63/Gmjz0NH1ASqhJguHpGcr6A= @@ -574,6 +577,7 @@ github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hf github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= @@ -593,14 +597,16 @@ github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+ github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= github.com/googleapis/gax-go/v2 v2.1.0/go.mod h1:Q3nei7sK6ybPYH7twZdmQpAd1MKb7pfu6SK+H1/DsU0= github.com/googleapis/gax-go/v2 v2.1.1/go.mod h1:hddJymUZASv3XPyGkUpKj8pPO47Rmb0eJc8R6ouapiM= -github.com/googleapis/gax-go/v2 v2.2.0 h1:s7jOdKSaksJVOxE0Y/S32otcfiP+UQ0cL8/GTKaONwE= github.com/googleapis/gax-go/v2 v2.2.0/go.mod h1:as02EH8zWkzwUoLbBaFeQ+arQaj/OthfcblKl4IGNaM= +github.com/googleapis/gax-go/v2 v2.3.0 h1:nRJtk3y8Fm770D42QV6T90ZnvFZyk7agSo3Q+Z9p3WI= +github.com/googleapis/gax-go/v2 v2.3.0/go.mod h1:b8LNqSzNabLiUpXKkY7HAR5jr6bIT99EXz9pXxye9YM= github.com/googleapis/gnostic v0.4.1/go.mod h1:LRhVm6pbyptWbWbuZ38d1eyptfvIytN3ir6b65WBswg= github.com/googleapis/gnostic v0.5.1/go.mod h1:6U4PtQXGIEt/Z3h5MAT7FNofLnw9vXk2cUuW7uA/OeU= github.com/googleapis/gnostic v0.5.5 h1:9fHAtK0uDfpveeqqo1hkEZJcFvYXAiCN3UutL8F9xHw= github.com/googleapis/gnostic v0.5.5/go.mod h1:7+EbHbldMins07ALC74bsA81Ovc97DwqyJO1AENw9kA= github.com/googleapis/go-type-adapters v1.0.0 h1:9XdMn+d/G57qq1s8dNc5IesGCXHf6V2HZ2JwRxfA2tA= github.com/googleapis/go-type-adapters v1.0.0/go.mod h1:zHW75FOG2aur7gAO2B+MLby+cLsWGBF62rFAi7WjWO4= +github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g= github.com/googleinterns/cloud-operations-api-mock v0.0.0-20200709193332-a1e58c29bdd3 h1:eHv/jVY/JNop1xg2J9cBb4EzyMpWZoNCP1BslSAIkOI= github.com/gookit/color v1.4.2 h1:tXy44JFSFkKnELV6WaMo/lLfu/meqITX3iAV52do7lk= github.com/gookit/color v1.4.2/go.mod h1:fqRyamkC1W8uxl+lxCQxOT09l/vYfZ+QeiX3rKQHCoQ= @@ -631,7 +637,7 @@ github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/S github.com/hashicorp/go-getter v1.5.11 h1:wioTuNmaBU3IE9vdFtFMcmZWj0QzLc6DYaP6sNe5onY= github.com/hashicorp/go-getter v1.5.11/go.mod h1:9i48BP6wpWweI/0/+FBjqLrp9S8XtwUGjiu0QkWHEaY= github.com/hashicorp/go-hclog v0.9.2/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ= -github.com/hashicorp/go-hclog v1.0.0 h1:bkKf0BeBXcSYa7f5Fyi9gMuQ8gNsxeiNpZjR6VxNZeo= +github.com/hashicorp/go-hclog v1.2.0 h1:La19f8d7WIlm4ogzNHB0JGqs5AUDAZ2UfCY4sJXcJdM= github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= github.com/hashicorp/go-multierror v0.0.0-20161216184304-ed905158d874/go.mod h1:JMRHfdO9jKNzS/+BTlxCjKNQHg/jZAft8U7LloJvN7I= @@ -759,8 +765,9 @@ github.com/machine-drivers/docker-machine-driver-vmware v0.1.5/go.mod h1:dTnTzUH github.com/machine-drivers/machine v0.7.1-0.20211105063445-78a84df85426 h1:gVDPCmqwvHQ4ox/9svvnkomYJAAiV59smbPdTK4DIm4= github.com/machine-drivers/machine v0.7.1-0.20211105063445-78a84df85426/go.mod h1:79Uwa2hGd5S39LDJt58s8JZcIhGEK6pkq9bsuTbFWbk= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= -github.com/magiconair/properties v1.8.5 h1:b6kJs+EmPFMYGkow9GiUyCyOvIwYetYJ3fSaWak/Gls= github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= +github.com/magiconair/properties v1.8.6 h1:5ibWZ6iY0NctNGWo87LalDlEZ6R41TqbbDamhfG/Qzo= +github.com/magiconair/properties v1.8.6/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= @@ -917,6 +924,8 @@ github.com/pelletier/go-toml v1.8.1/go.mod h1:T2/BmBdy8dvIRq1a/8aqjN41wvWlN4lrap github.com/pelletier/go-toml v1.9.3/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= github.com/pelletier/go-toml v1.9.4 h1:tjENF6MfZAg8e4ZmZTeWaWiT2vXtsoO6+iuOjFhECwM= github.com/pelletier/go-toml v1.9.4/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= +github.com/pelletier/go-toml/v2 v2.0.0-beta.8 h1:dy81yyLYJDwMTifq24Oi/IslOslRrDSb3jwDggjz3Z0= +github.com/pelletier/go-toml/v2 v2.0.0-beta.8/go.mod h1:r9LEWfGN8R5k0VXJ+0BkIe7MYkRdwZOjgMj2KwnJFUo= github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2 h1:JhzVVoYvbOACxoUmOs6V/G4D5nPVUW73rKvXxP4XUJc= github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2/go.mod h1:iIss55rKnNBTvrwdmkUpLnDpZoAHvWaiq5+iMmen4AE= @@ -933,6 +942,7 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE github.com/pkg/profile v0.0.0-20161223203901-3a8809bd8a80 h1:DQFOykp5w+HOykOMzd2yOX5P6ty58Ggiu2rthHgcNQg= github.com/pkg/profile v0.0.0-20161223203901-3a8809bd8a80/go.mod h1:hJw3o1OdXxsrSjjVksARp5W95eeEaEfptyVZyv6JUPA= github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI= +github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= @@ -1025,8 +1035,9 @@ github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4k github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk= -github.com/spf13/afero v1.6.0 h1:xoax2sJ2DT8S8xA2paPFjDCScCNeWsg75VG0DLRreiY= github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= +github.com/spf13/afero v1.8.2 h1:xehSyVa0YnHWsJ49JFljMpg1HX19V6NDZ1fkm1Xznbo= +github.com/spf13/afero v1.8.2/go.mod h1:CtAatgMJh6bJEIs48Ay/FOnkljP3WeGUG0MC1RfAqwo= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cast v1.4.1 h1:s0hze+J0196ZfEMTs80N7UlFt0BDuQ7Q+JDnHiMWKdA= @@ -1048,8 +1059,8 @@ github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE= github.com/spf13/viper v1.8.1/go.mod h1:o0Pch8wJ9BVSWGQMbra6iw0oQ5oktSIBaujf1rJH9Ns= -github.com/spf13/viper v1.10.1 h1:nuJZuYpG7gTj/XqiUwg8bA0cp1+M2mC3J4g5luUYBKk= -github.com/spf13/viper v1.10.1/go.mod h1:IGlFPqhNAPKRxohIzWpI5QEy4kuI7tcl5WvR+8qy1rU= +github.com/spf13/viper v1.11.0 h1:7OX/1FS6n7jHD1zGrZTM7WtY13ZELRyosK4k93oPr44= +github.com/spf13/viper v1.11.0/go.mod h1:djo0X/bA5+tYVoCn+C7cAYJGcVn/qYLFTG8gdUsX7Zk= github.com/stefanberger/go-pkcs11uri v0.0.0-20201008174630-78d3cae3a980/go.mod h1:AO3tvPzVZ/ayst6UlUKUv6rcPQInYe3IknH3jYhAKu8= github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8= github.com/stretchr/objx v0.0.0-20180129172003-8a3f7159479f/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= @@ -1190,8 +1201,11 @@ golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= -golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 h1:HWj/xjIHfjYU5nVXpTM0s39J9CbLn7Cc5a7IC5rwsMQ= +golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4 h1:kUhD7nTDoI3fVd9G4ORWrbV5NY0liEs/Jg2pv5f+bBA= +golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -1303,8 +1317,9 @@ golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qx golang.org/x/net v0.0.0-20211209124913-491a49abca63/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= -golang.org/x/net v0.0.0-20220325170049-de3da57026de h1:pZB1TWnKi+o4bENlbzAgLrEbY4RMYmUIRobMcSmfeYc= golang.org/x/net v0.0.0-20220325170049-de3da57026de/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= +golang.org/x/net v0.0.0-20220412020605-290c469a71a5 h1:bRb386wvrE+oBNdF1d/Xh9mQrfQ4ecYhW5qJ5GvTGT4= +golang.org/x/net v0.0.0-20220412020605-290c469a71a5/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -1325,8 +1340,9 @@ golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f/go.mod h1:KelEdhl1UZF7XfJ golang.org/x/oauth2 v0.0.0-20211005180243-6b3c2da341f1/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= -golang.org/x/oauth2 v0.0.0-20220309155454-6242fa91716a h1:qfl7ob3DIEs3Ml9oLuPwY2N04gymzAW04WsUQHIClgM= golang.org/x/oauth2 v0.0.0-20220309155454-6242fa91716a/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= +golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 h1:OSnWWcOd/CtWQC2cYSBgbTSJv3ciqd8r54ySIW2y3RE= +golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= golang.org/x/perf v0.0.0-20180704124530-6e6d33e29852/go.mod h1:JLpeXjPJfIyPr5TlbXLkXWLhP8nz10XfvxElABhCtcw= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -1421,6 +1437,7 @@ golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -1453,8 +1470,9 @@ golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220328115105-d36c6a25d886 h1:eJv7u3ksNXoLbGSKuv2s/SIO4tJVxc/A+MTpzxDgz/Q= golang.org/x/sys v0.0.0-20220328115105-d36c6a25d886/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220412211240-33da011f77ad h1:ntjMns5wyP/fN65tdBD4g8J5w8n015+iIIs9rtjXkY0= +golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= @@ -1535,6 +1553,7 @@ golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4f golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= @@ -1546,8 +1565,9 @@ golang.org/x/tools v0.1.6-0.20210820212750-d4cc65f0b2ff/go.mod h1:YD9qOF0M9xpSpd golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f h1:GGU+dLjvlC3qDwqYgL6UgRmHXhOOgns0bZu2Ty5mm6U= +golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gonum.org/v1/gonum v0.11.0 h1:f1IJhK4Km5tBJmaiJXtk/PkL4cdVX6J+tGiM187uT5E= gonum.org/v1/plot v0.11.0 h1:z2ZkgNqW34d0oYUzd80RRlc0L9kWtenqK4kflZG1lGc= gonum.org/v1/plot v0.11.0/go.mod h1:fH9YnKnDKax0u5EzHVXvhN5HJwtMFWIOLNuhgUahbCQ= @@ -1639,7 +1659,9 @@ google.golang.org/genproto v0.0.0-20201110150050-8816d57aaa9a/go.mod h1:FWY/as6D google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210108203827-ffc7fda8c3d7/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210222152913-aa3ee6e6a81c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210226172003-ab064af71705/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= @@ -1676,8 +1698,9 @@ google.golang.org/genproto v0.0.0-20220222213610-43724f9ea8cf/go.mod h1:kGP+zUP2 google.golang.org/genproto v0.0.0-20220304144024-325a89244dc8/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= google.golang.org/genproto v0.0.0-20220310185008-1973136f34c6/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= google.golang.org/genproto v0.0.0-20220324131243-acbaeb5b85eb/go.mod h1:hAL49I2IFola2sVEjAn7MEwsja0xp51I0tlGAf9hz4E= -google.golang.org/genproto v0.0.0-20220405205423-9d709892a2bf h1:JTjwKJX9erVpsw17w+OIPP7iAgEkN/r8urhWSunEDTs= google.golang.org/genproto v0.0.0-20220405205423-9d709892a2bf/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= +google.golang.org/genproto v0.0.0-20220407144326-9054f6ed7bac h1:qSNTkEN+L2mvWcLgJOR+8bdHX9rN/IdU3A1Ghpfb1Rg= +google.golang.org/genproto v0.0.0-20220407144326-9054f6ed7bac/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= google.golang.org/grpc v0.0.0-20160317175043-d3ddb4469d5a/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= @@ -1744,8 +1767,8 @@ gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod h1:Xk6kEKp8OKb+X14hQBKW gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= gopkg.in/ini.v1 v1.62.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= -gopkg.in/ini.v1 v1.66.2 h1:XfR1dOYubytKy4Shzc2LHrrGhU0lDCfDGG1yLPmpgsI= -gopkg.in/ini.v1 v1.66.2/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= +gopkg.in/ini.v1 v1.66.4 h1:SsAcf+mM7mRZo2nJNGt8mZCjG8ZRaNGMURJw7BsIST4= +gopkg.in/ini.v1 v1.66.4/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 h1:VpOs+IwYnYBaFnrNAeB8UUWtL3vEUnzSCL1nVjPhqrw= gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA= gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k= From 575a6060f10697708915c1e563265b950a09169c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Apr 2022 18:05:18 +0000 Subject: [PATCH 36/38] Bump github.com/hashicorp/go-retryablehttp from 0.7.0 to 0.7.1 Bumps [github.com/hashicorp/go-retryablehttp](https://github.com/hashicorp/go-retryablehttp) from 0.7.0 to 0.7.1. - [Release notes](https://github.com/hashicorp/go-retryablehttp/releases) - [Commits](https://github.com/hashicorp/go-retryablehttp/compare/v0.7.0...v0.7.1) --- updated-dependencies: - dependency-name: github.com/hashicorp/go-retryablehttp dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 4 ++-- go.sum | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 5516cb0235..dbef5c86cb 100644 --- a/go.mod +++ b/go.mod @@ -28,7 +28,7 @@ require ( github.com/google/slowjam v1.0.0 github.com/google/uuid v1.3.0 github.com/hashicorp/go-getter v1.5.11 - github.com/hashicorp/go-retryablehttp v0.7.0 + github.com/hashicorp/go-retryablehttp v0.7.1 github.com/hectane/go-acl v0.0.0-20190604041725-da78bae5fc95 // indirect github.com/hooklift/assert v0.0.0-20170704181755-9d1defd6d214 // indirect github.com/hooklift/iso9660 v0.0.0-20170318115843-1cf07e5970d8 @@ -98,6 +98,7 @@ require ( require ( github.com/Xuanwo/go-locale v1.1.0 + github.com/docker/go-connections v0.4.0 github.com/santhosh-tekuri/jsonschema/v5 v5.0.0 ) @@ -126,7 +127,6 @@ require ( github.com/docker/cli v20.10.7+incompatible // indirect github.com/docker/distribution v2.7.1+incompatible // indirect github.com/docker/docker-credential-helpers v0.6.3 // indirect - github.com/docker/go-connections v0.4.0 // indirect github.com/evanphx/json-patch v4.12.0+incompatible // indirect github.com/fatih/color v1.13.0 // indirect github.com/fsnotify/fsnotify v1.5.1 // indirect diff --git a/go.sum b/go.sum index fd94805176..03cf053da9 100644 --- a/go.sum +++ b/go.sum @@ -636,8 +636,8 @@ github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjh github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= github.com/hashicorp/go-multierror v0.0.0-20161216184304-ed905158d874/go.mod h1:JMRHfdO9jKNzS/+BTlxCjKNQHg/jZAft8U7LloJvN7I= github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= -github.com/hashicorp/go-retryablehttp v0.7.0 h1:eu1EI/mbirUgP5C8hVsTNaGZreBDlYiwC1FZWkvQPQ4= -github.com/hashicorp/go-retryablehttp v0.7.0/go.mod h1:vAew36LZh98gCBJNLH42IQ1ER/9wtLZZ8meHqQvEYWY= +github.com/hashicorp/go-retryablehttp v0.7.1 h1:sUiuQAnLlbvmExtFQs72iFW/HXeUn8Z1aJLQ4LJJbTQ= +github.com/hashicorp/go-retryablehttp v0.7.1/go.mod h1:vAew36LZh98gCBJNLH42IQ1ER/9wtLZZ8meHqQvEYWY= github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU= github.com/hashicorp/go-safetemp v1.0.0 h1:2HR189eFNrjHQyENnQMMpCiBAsRxzbTMIgBhEyExpmo= github.com/hashicorp/go-safetemp v1.0.0/go.mod h1:oaerMy3BhqiTbVye6QuFhFtIceqFoDHxNAB65b+Rj1I= From 08682249a3e30bc1043599a28d020108be88e0a1 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Mon, 18 Apr 2022 15:53:51 -0700 Subject: [PATCH 37/38] add user flag to gui commands --- gui/window.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gui/window.cpp b/gui/window.cpp index 033309818d..5ca295c2a6 100644 --- a/gui/window.cpp +++ b/gui/window.cpp @@ -519,7 +519,7 @@ bool Window::sendMinikubeCommand(QStringList cmds, QString &text) if (program.isEmpty()) { return false; } - QStringList arguments; + QStringList arguments = { "--user", "minikube-gui" }; arguments << cmds; QProcess *process = new QProcess(this); From 5cce3963bc004b3d033081c7b67776ae64e19cec Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 18 Apr 2022 23:04:26 +0000 Subject: [PATCH 38/38] Update auto-generated docs and translations --- site/content/en/docs/commands/cache.md | 6 +++--- translations/de.json | 2 ++ translations/es.json | 2 ++ translations/fr.json | 2 ++ translations/ja.json | 2 ++ translations/ko.json | 2 ++ translations/pl.json | 2 ++ translations/ru.json | 3 ++- translations/strings.txt | 3 ++- translations/zh-CN.json | 3 ++- 10 files changed, 21 insertions(+), 6 deletions(-) diff --git a/site/content/en/docs/commands/cache.md b/site/content/en/docs/commands/cache.md index 435dfbab60..163210bcbf 100644 --- a/site/content/en/docs/commands/cache.md +++ b/site/content/en/docs/commands/cache.md @@ -1,17 +1,17 @@ --- title: "cache" description: > - Add, delete, or push a local image into minikube + Manage cache for images --- ## minikube cache -Add, delete, or push a local image into minikube +Manage cache for images ### Synopsis -Add, delete, or push a local image into minikube +Add an image into minikube as a local cache, or delete, reload the cached images ### Options inherited from parent commands diff --git a/translations/de.json b/translations/de.json index 3a0f010635..804158394b 100644 --- a/translations/de.json +++ b/translations/de.json @@ -40,6 +40,7 @@ "Access the Kubernetes dashboard running within the minikube cluster": "Zugriff auf das Kubernetes Dashboard, welches im Minikube Cluster läuft", "Access to ports below 1024 may fail on Windows with OpenSSH clients older than v8.1. For more information, see: https://minikube.sigs.k8s.io/docs/handbook/accessing/#access-to-ports-1024-on-windows-requires-root-permission": "", "Add SSH identity key to SSH authentication agent": "SSH Identitäts-Schlüssel zu SSH Authentifizierungs-Agenten hinzufügen", + "Add an image into minikube as a local cache, or delete, reload the cached images": "", "Add an image to local cache.": "Ein Image dem lokalen Cache hinzufügen.", "Add host key to SSH known_hosts file": "Einen Host-Schlüssel zur SSH known_hosts Datei hinzufügen", "Add image to cache for all running minikube clusters": "Ein Image zum Cache aller laufender Minikube Cluster hinzufügen", @@ -397,6 +398,7 @@ "Locations to fetch the minikube ISO from.": "Ort von dem das Minikube ISO geladen werden soll.", "Log into or run a command on a machine with SSH; similar to 'docker-machine ssh'.": "Einloggen oder einen Befehl auf der Maschine mit SSH ausführen; vergleichbar mit 'docker-machine ssh'.", "Log into the minikube environment (for debugging)": "In die Minikube Umgebung einloggen (fürs Debugging)", + "Manage cache for images": "", "Manage images": "Images verwalten", "Message Size: {{.size}}": "Message Größe: {{.size}}", "Minimum VirtualBox Version supported: {{.vers}}, current VirtualBox version: {{.cvers}}": "", diff --git a/translations/es.json b/translations/es.json index 7e034b806c..ba72e9494b 100644 --- a/translations/es.json +++ b/translations/es.json @@ -41,6 +41,7 @@ "Access the Kubernetes dashboard running within the minikube cluster": "Acceder al panel de Kubernetes que corre dentro del cluster minikube", "Access to ports below 1024 may fail on Windows with OpenSSH clients older than v8.1. For more information, see: https://minikube.sigs.k8s.io/docs/handbook/accessing/#access-to-ports-1024-on-windows-requires-root-permission": "", "Add SSH identity key to SSH authentication agent": "Agregar llave SSH al agente de autenticacion SSH", + "Add an image into minikube as a local cache, or delete, reload the cached images": "", "Add an image to local cache.": "Agregar una imagen al caché local", "Add host key to SSH known_hosts file": "Agregar la llave del host al fichero known_hosts", "Add image to cache for all running minikube clusters": "Agregar la imagen al cache para todos los cluster de minikube activos", @@ -406,6 +407,7 @@ "Locations to fetch the minikube ISO from.": "", "Log into or run a command on a machine with SSH; similar to 'docker-machine ssh'.": "", "Log into the minikube environment (for debugging)": "", + "Manage cache for images": "", "Manage images": "", "Message Size: {{.size}}": "", "Minimum VirtualBox Version supported: {{.vers}}, current VirtualBox version: {{.cvers}}": "", diff --git a/translations/fr.json b/translations/fr.json index 0bcb0ecbd3..704e9ec1cd 100644 --- a/translations/fr.json +++ b/translations/fr.json @@ -41,6 +41,7 @@ "Access the Kubernetes dashboard running within the minikube cluster": "Accéder au tableau de bord Kubernetes exécuté dans le cluster de minikube", "Access to ports below 1024 may fail on Windows with OpenSSH clients older than v8.1. For more information, see: https://minikube.sigs.k8s.io/docs/handbook/accessing/#access-to-ports-1024-on-windows-requires-root-permission": "Accéder aux ports inférieurs à 1024 peut échouer sur Windows avec les clients OpenSSH antérieurs à v8.1. Pour plus d'information, voir: https://minikube.sigs.k8s.io/docs/handbook/accessing/#access-to-ports-1024-on-windows-requires-root-permission", "Add SSH identity key to SSH authentication agent": "Ajouter la clé d'identité SSH à l'agent d'authentication SSH", + "Add an image into minikube as a local cache, or delete, reload the cached images": "", "Add an image to local cache.": "Ajouter une image au cache local.", "Add host key to SSH known_hosts file": "Ajouter la clé hôte au fichier SSH known_hosts", "Add image to cache for all running minikube clusters": "Ajouter l'image au cache pour tous les cluster minikube en fonctionnement", @@ -386,6 +387,7 @@ "Locations to fetch the minikube ISO from.": "Emplacements à partir desquels récupérer l'ISO minikube.", "Log into or run a command on a machine with SSH; similar to 'docker-machine ssh'.": "Connectez-vous ou exécutez une commande sur une machine avec SSH ; similaire à 'docker-machine ssh'.", "Log into the minikube environment (for debugging)": "Connectez-vous à l'environnement minikube (pour le débogage)", + "Manage cache for images": "", "Manage images": "Gérer les images", "Message Size: {{.size}}": "Taille du message : {{.size}}", "Minimum VirtualBox Version supported: {{.vers}}, current VirtualBox version: {{.cvers}}": "Version minimale de VirtualBox prise en charge : {{.vers}}, version actuelle de VirtualBox : {{.cvers}}", diff --git a/translations/ja.json b/translations/ja.json index a8c62fbd5a..0ae287adeb 100644 --- a/translations/ja.json +++ b/translations/ja.json @@ -42,6 +42,7 @@ "Access the Kubernetes dashboard running within the minikube cluster": "minikube クラスター内で動いている Kubernetes のダッシュボードにアクセスします", "Access to ports below 1024 may fail on Windows with OpenSSH clients older than v8.1. For more information, see: https://minikube.sigs.k8s.io/docs/handbook/accessing/#access-to-ports-1024-on-windows-requires-root-permission": "Windows で v8.1 より古い OpenSSH クライアントを使用している場合、1024 未満のポートへのアクセスに失敗することがあります。詳細はこちら: https://minikube.sigs.k8s.io/docs/handbook/accessing/#access-to-ports-1024-on-windows-requires-root-permission", "Add SSH identity key to SSH authentication agent": "SSH 認証エージェントに SSH 鍵を追加します", + "Add an image into minikube as a local cache, or delete, reload the cached images": "", "Add an image to local cache.": "イメージをローカルキャッシュに追加します。", "Add host key to SSH known_hosts file": "SSH known_hosts ファイルにホストキーを追加します", "Add image to cache for all running minikube clusters": "実行中のすべての minikube クラスターのキャッシュに、イメージを追加します", @@ -396,6 +397,7 @@ "Locations to fetch the minikube ISO from.": "minikube ISO の取得元", "Log into or run a command on a machine with SSH; similar to 'docker-machine ssh'.": "SSH を使ってマシンにログインしたりコマンドを実行します ('docker-machine ssh' と同様です)。", "Log into the minikube environment (for debugging)": "minikube の環境にログインします (デバッグ用)", + "Manage cache for images": "", "Manage images": "イメージを管理します", "Message Size: {{.size}}": "メッセージのサイズ: {{.size}}", "Minimum VirtualBox Version supported: {{.vers}}, current VirtualBox version: {{.cvers}}": "", diff --git a/translations/ko.json b/translations/ko.json index 1003278cb3..9d58f52743 100644 --- a/translations/ko.json +++ b/translations/ko.json @@ -43,6 +43,7 @@ "Access the Kubernetes dashboard running within the minikube cluster": "minikube 클러스터 내의 쿠버네티스 대시보드에 접근합니다", "Access to ports below 1024 may fail on Windows with OpenSSH clients older than v8.1. For more information, see: https://minikube.sigs.k8s.io/docs/handbook/accessing/#access-to-ports-1024-on-windows-requires-root-permission": "", "Add SSH identity key to SSH authentication agent": "SSH 인증 에이전트에 SSH ID 키 추가합니다", + "Add an image into minikube as a local cache, or delete, reload the cached images": "", "Add an image to local cache.": "로컬 캐시에 이미지를 추가합니다", "Add host key to SSH known_hosts file": "SSH known_hosts 파일에 호스트 키를 추가합니다", "Add image to cache for all running minikube clusters": "실행 중인 모든 미니큐브 클러스터의 캐시에 이미지를 추가합니다", @@ -421,6 +422,7 @@ "Locations to fetch the minikube ISO from.": "", "Log into or run a command on a machine with SSH; similar to 'docker-machine ssh'.": "", "Log into the minikube environment (for debugging)": "(디버깅을 위해) minikube 환경에 접속합니다", + "Manage cache for images": "", "Manage images": "", "Message Size: {{.size}}": "메시지 사이즈: {{.size}}", "Minikube is a CLI tool that provisions and manages single-node Kubernetes clusters optimized for development workflows.": "Minikube 는 개발용으로 최적화된 싱글 노드 쿠버네티스 클러스터 제공 및 관리 CLI 툴입니다", diff --git a/translations/pl.json b/translations/pl.json index a2e129e66e..7d14a11a93 100644 --- a/translations/pl.json +++ b/translations/pl.json @@ -42,6 +42,7 @@ "Access the Kubernetes dashboard running within the minikube cluster": "Dostęp do dashboardu uruchomionego w klastrze kubernetesa w minikube", "Access to ports below 1024 may fail on Windows with OpenSSH clients older than v8.1. For more information, see: https://minikube.sigs.k8s.io/docs/handbook/accessing/#access-to-ports-1024-on-windows-requires-root-permission": "", "Add SSH identity key to SSH authentication agent": "", + "Add an image into minikube as a local cache, or delete, reload the cached images": "", "Add an image to local cache.": "Dodaj obraz do lokalnego cache", "Add host key to SSH known_hosts file": "Dodaj klucz hosta do pliku known_hosts", "Add image to cache for all running minikube clusters": "Dodaj obraz do cache'a dla wszystkich uruchomionych klastrów minikube", @@ -412,6 +413,7 @@ "Log into or run a command on a machine with SSH; similar to 'docker-machine ssh'": "Zaloguj się i wykonaj polecenie w maszynie za pomocą ssh. Podobne do 'docker-machine ssh'", "Log into or run a command on a machine with SSH; similar to 'docker-machine ssh'.": "Zaloguj się i wykonaj polecenie w maszynie za pomocą ssh. Podobne do 'docker-machine ssh'", "Log into the minikube environment (for debugging)": "Zaloguj się do środowiska minikube (do debugowania)", + "Manage cache for images": "", "Manage images": "Zarządzaj obrazami", "Message Size: {{.size}}": "Rozmiar wiadomości: {{.size}}", "Minimum VirtualBox Version supported: {{.vers}}, current VirtualBox version: {{.cvers}}": "", diff --git a/translations/ru.json b/translations/ru.json index 20e96c5553..2b47f5047c 100644 --- a/translations/ru.json +++ b/translations/ru.json @@ -37,11 +37,11 @@ "Access the Kubernetes dashboard running within the minikube cluster": "", "Access to ports below 1024 may fail on Windows with OpenSSH clients older than v8.1. For more information, see: https://minikube.sigs.k8s.io/docs/handbook/accessing/#access-to-ports-1024-on-windows-requires-root-permission": "", "Add SSH identity key to SSH authentication agent": "", + "Add an image into minikube as a local cache, or delete, reload the cached images": "", "Add an image to local cache.": "", "Add host key to SSH known_hosts file": "", "Add image to cache for all running minikube clusters": "", "Add machine IP to NO_PROXY environment variable": "", - "Add, delete, or push a local image into minikube": "", "Add, remove, or list additional nodes": "", "Adding node {{.name}} to cluster {{.cluster}}": "", "Additional help topics": "", @@ -374,6 +374,7 @@ "Locations to fetch the minikube ISO from.": "", "Log into or run a command on a machine with SSH; similar to 'docker-machine ssh'.": "", "Log into the minikube environment (for debugging)": "", + "Manage cache for images": "", "Manage images": "", "Message Size: {{.size}}": "", "Minimum VirtualBox Version supported: {{.vers}}, current VirtualBox version: {{.cvers}}": "", diff --git a/translations/strings.txt b/translations/strings.txt index 98672b3c0a..8325e64994 100644 --- a/translations/strings.txt +++ b/translations/strings.txt @@ -37,11 +37,11 @@ "Access the Kubernetes dashboard running within the minikube cluster": "", "Access to ports below 1024 may fail on Windows with OpenSSH clients older than v8.1. For more information, see: https://minikube.sigs.k8s.io/docs/handbook/accessing/#access-to-ports-1024-on-windows-requires-root-permission": "", "Add SSH identity key to SSH authentication agent": "", + "Add an image into minikube as a local cache, or delete, reload the cached images": "", "Add an image to local cache.": "", "Add host key to SSH known_hosts file": "", "Add image to cache for all running minikube clusters": "", "Add machine IP to NO_PROXY environment variable": "", - "Add, delete, or push a local image into minikube": "", "Add, remove, or list additional nodes": "", "Adding node {{.name}} to cluster {{.cluster}}": "", "Additional help topics": "", @@ -374,6 +374,7 @@ "Locations to fetch the minikube ISO from.": "", "Log into or run a command on a machine with SSH; similar to 'docker-machine ssh'.": "", "Log into the minikube environment (for debugging)": "", + "Manage cache for images": "", "Manage images": "", "Message Size: {{.size}}": "", "Minimum VirtualBox Version supported: {{.vers}}, current VirtualBox version: {{.cvers}}": "", diff --git a/translations/zh-CN.json b/translations/zh-CN.json index 804609078f..893955fd13 100644 --- a/translations/zh-CN.json +++ b/translations/zh-CN.json @@ -49,12 +49,12 @@ "Access the Kubernetes dashboard running within the minikube cluster": "访问在 minikube 集群中运行的 kubernetes dashboard", "Access to ports below 1024 may fail on Windows with OpenSSH clients older than v8.1. For more information, see: https://minikube.sigs.k8s.io/docs/handbook/accessing/#access-to-ports-1024-on-windows-requires-root-permission": "", "Add SSH identity key to SSH authentication agent": "", + "Add an image into minikube as a local cache, or delete, reload the cached images": "", "Add an image to local cache.": "将 image 添加到本地缓存。", "Add host key to SSH known_hosts file": "", "Add image to cache for all running minikube clusters": "", "Add machine IP to NO_PROXY environment variable": "将机器IP添加到环境变量 NO_PROXY 中", "Add or delete an image from the local cache.": "在本地缓存中添加或删除 image。", - "Add, delete, or push a local image into minikube": "", "Add, remove, or list additional nodes": "", "Adding node {{.name}} to cluster {{.cluster}}": "添加节点 {{.name}} 至集群 {{.cluster}}", "Additional help topics": "其他帮助", @@ -483,6 +483,7 @@ "Locations to fetch the minikube ISO from.": "", "Log into or run a command on a machine with SSH; similar to 'docker-machine ssh'.": "", "Log into the minikube environment (for debugging)": "", + "Manage cache for images": "", "Manage images": "", "Message Size: {{.size}}": "", "Minikube is a CLI tool that provisions and manages single-node Kubernetes clusters optimized for development workflows.": "Minikube 是一个命令行工具，它提供和管理针对开发工作流程优化的单节点 Kubernetes 集群。",