From 92982c6dc3ad99c8f219f95e82214b3930859af8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=BE=99=E5=B3=B0?= Date: Sat, 17 Apr 2021 10:02:57 +0800 Subject: [PATCH 001/545] filemode value is not correct ,0o777 to 0777 --- cmd/minikube/cmd/root.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/minikube/cmd/root.go b/cmd/minikube/cmd/root.go index 5f63436e8b..8d755bb129 100644 --- a/cmd/minikube/cmd/root.go +++ b/cmd/minikube/cmd/root.go @@ -62,7 +62,7 @@ var RootCmd = &cobra.Command{ Long: `minikube provisions and manages local Kubernetes clusters optimized for development workflows.`, PersistentPreRun: func(cmd *cobra.Command, args []string) { for _, path := range dirs { - if err := os.MkdirAll(path, 0o777); err != nil { + if err := os.MkdirAll(path, 0777); err != nil { exit.Error(reason.HostHomeMkdir, "Error creating minikube directory", err) } } From cdab039184316f15cf83048dc7da978d517d82e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=BE=99=E5=B3=B0?= Date: Mon, 26 Apr 2021 08:59:38 +0800 Subject: [PATCH 002/545] Add Asset method --- pkg/minikube/assets/vm_assets.go | 20 ++++++++++++++++++++ pkg/minikube/translate/translate.go | 10 ++++++++++ 2 files changed, 30 insertions(+) diff --git a/pkg/minikube/assets/vm_assets.go b/pkg/minikube/assets/vm_assets.go index d453bf78b2..c9d242cd37 100644 --- a/pkg/minikube/assets/vm_assets.go +++ b/pkg/minikube/assets/vm_assets.go @@ -21,8 +21,11 @@ import ( "fmt" "html/template" "io" + "io/ioutil" "os" "path" + "runtime" + "strings" "time" "github.com/pkg/errors" @@ -291,3 +294,20 @@ func (m *BinAsset) Read(p []byte) (int, error) { func (m *BinAsset) Seek(offset int64, whence int) (int64, error) { return m.reader.Seek(offset, whence) } + +//Get file bytes from filePath +func Asset(sourcePath string) ([]byte, error) { + execDirAbsPath, err := os.Getwd() + if err != nil { + return nil, fmt.Errorf("getting exec dir abspath is error: %v", err) + } + if runtime.GOOS == "windows" { + replacePathDelimiter := strings.Replace(execDirAbsPath, "\\", "/", -1) + execDirAbsPath = replacePathDelimiter[:strings.Index(replacePathDelimiter, "minikube")+len("minikube")] + } + contents, err := ioutil.ReadFile(fmt.Sprintf("%s/%s", execDirAbsPath, sourcePath)) + if err != nil { + return nil, fmt.Errorf("asset %s can't read by error: %v", sourcePath, err) + } + return contents, nil +} diff --git a/pkg/minikube/translate/translate.go b/pkg/minikube/translate/translate.go index 892450e604..b245d260f8 100644 --- a/pkg/minikube/translate/translate.go +++ b/pkg/minikube/translate/translate.go @@ -19,6 +19,7 @@ package translate import ( "encoding/json" "fmt" + "io/ioutil" "path" "strings" @@ -124,3 +125,12 @@ func SetPreferredLanguage(s string) { func GetPreferredLanguage() language.Tag { return preferredLanguage } + +//Get translationFile bytes from filePath +func Asset(translationFile string) ([]byte,error){ + t, err := ioutil.ReadFile(translationFile) + if err != nil { + return nil, fmt.Errorf("asset %s can't read by error: %v", translationFile, err) + } + return t, nil +} From 3460e9e91a04706fa3478bb2de011746f83f3840 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=BE=99=E5=B3=B0?= Date: Mon, 26 Apr 2021 10:50:47 +0800 Subject: [PATCH 003/545] go-bindata tool generate file --- pkg/minikube/assets/vm_assets.go | 17 ----------------- pkg/minikube/translate/translate.go | 9 --------- 2 files changed, 26 deletions(-) diff --git a/pkg/minikube/assets/vm_assets.go b/pkg/minikube/assets/vm_assets.go index c9d242cd37..feb3336a8a 100644 --- a/pkg/minikube/assets/vm_assets.go +++ b/pkg/minikube/assets/vm_assets.go @@ -294,20 +294,3 @@ func (m *BinAsset) Read(p []byte) (int, error) { func (m *BinAsset) Seek(offset int64, whence int) (int64, error) { return m.reader.Seek(offset, whence) } - -//Get file bytes from filePath -func Asset(sourcePath string) ([]byte, error) { - execDirAbsPath, err := os.Getwd() - if err != nil { - return nil, fmt.Errorf("getting exec dir abspath is error: %v", err) - } - if runtime.GOOS == "windows" { - replacePathDelimiter := strings.Replace(execDirAbsPath, "\\", "/", -1) - execDirAbsPath = replacePathDelimiter[:strings.Index(replacePathDelimiter, "minikube")+len("minikube")] - } - contents, err := ioutil.ReadFile(fmt.Sprintf("%s/%s", execDirAbsPath, sourcePath)) - if err != nil { - return nil, fmt.Errorf("asset %s can't read by error: %v", sourcePath, err) - } - return contents, nil -} diff --git a/pkg/minikube/translate/translate.go b/pkg/minikube/translate/translate.go index b245d260f8..fd79188006 100644 --- a/pkg/minikube/translate/translate.go +++ b/pkg/minikube/translate/translate.go @@ -125,12 +125,3 @@ func SetPreferredLanguage(s string) { func GetPreferredLanguage() language.Tag { return preferredLanguage } - -//Get translationFile bytes from filePath -func Asset(translationFile string) ([]byte,error){ - t, err := ioutil.ReadFile(translationFile) - if err != nil { - return nil, fmt.Errorf("asset %s can't read by error: %v", translationFile, err) - } - return t, nil -} From 3389bacef0a64524f484dcdc4fd2b21336757b8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=BE=99=E5=B3=B0?= Date: Mon, 26 Apr 2021 13:59:35 +0800 Subject: [PATCH 004/545] remove unused package --- pkg/minikube/translate/translate.go | 1 - 1 file changed, 1 deletion(-) diff --git a/pkg/minikube/translate/translate.go b/pkg/minikube/translate/translate.go index fd79188006..892450e604 100644 --- a/pkg/minikube/translate/translate.go +++ b/pkg/minikube/translate/translate.go @@ -19,7 +19,6 @@ package translate import ( "encoding/json" "fmt" - "io/ioutil" "path" "strings" From 02c683641714ceff6a0474c34e4078d1987cd8dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=BE=99=E5=B3=B0?= Date: Mon, 26 Apr 2021 14:01:48 +0800 Subject: [PATCH 005/545] rm unused package --- pkg/minikube/assets/vm_assets.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkg/minikube/assets/vm_assets.go b/pkg/minikube/assets/vm_assets.go index feb3336a8a..d453bf78b2 100644 --- a/pkg/minikube/assets/vm_assets.go +++ b/pkg/minikube/assets/vm_assets.go @@ -21,11 +21,8 @@ import ( "fmt" "html/template" "io" - "io/ioutil" "os" "path" - "runtime" - "strings" "time" "github.com/pkg/errors" From fcd9d3fe0fbb026be07a07d5ccc9a14eda1d993c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=BE=99=E5=B3=B0?= Date: Mon, 26 Apr 2021 14:24:40 +0800 Subject: [PATCH 006/545] slice declaration: nil better than empty --- cmd/minikube/cmd/config/config.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/minikube/cmd/config/config.go b/cmd/minikube/cmd/config/config.go index bf2abd281c..c52d8da829 100644 --- a/cmd/minikube/cmd/config/config.go +++ b/cmd/minikube/cmd/config/config.go @@ -191,7 +191,7 @@ Configurable fields: ` + "\n\n" + configurableFields(), } func configurableFields() string { - fields := []string{} + var fields []string for _, s := range settings { fields = append(fields, " * "+s.name) } From 5e815615015359e8a24239219215558ac1182741 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anders=20F=20Bj=C3=B6rklund?= Date: Sun, 16 Jan 2022 22:24:50 +0100 Subject: [PATCH 007/545] Document container runtimes available --- site/content/en/docs/handbook/config.md | 7 +++--- site/content/en/docs/runtimes/_index.md | 26 +++++++++++++++++++++ site/content/en/docs/runtimes/containerd.md | 10 ++++++++ site/content/en/docs/runtimes/cri-o.md | 11 +++++++++ site/content/en/docs/runtimes/docker.md | 11 +++++++++ 5 files changed, 62 insertions(+), 3 deletions(-) create mode 100644 site/content/en/docs/runtimes/_index.md create mode 100644 site/content/en/docs/runtimes/containerd.md create mode 100644 site/content/en/docs/runtimes/cri-o.md create mode 100644 site/content/en/docs/runtimes/docker.md diff --git a/site/content/en/docs/handbook/config.md b/site/content/en/docs/handbook/config.md index b10533cc21..6b478327a3 100644 --- a/site/content/en/docs/handbook/config.md +++ b/site/content/en/docs/handbook/config.md @@ -95,10 +95,11 @@ The default container runtime in minikube is Docker. You can select it explicitl minikube start --container-runtime=docker ``` -Other options available are: +Options available are: -* [containerd](https://github.com/containerd/containerd) -* [cri-o](https://github.com/cri-o/cri-o) +* [containerd]({{}}) +* [cri-o]({{}}) +* [docker]({{}}) ## Environment variables diff --git a/site/content/en/docs/runtimes/_index.md b/site/content/en/docs/runtimes/_index.md new file mode 100644 index 0000000000..f14c104b1b --- /dev/null +++ b/site/content/en/docs/runtimes/_index.md @@ -0,0 +1,26 @@ +--- +title: "Runtimes" +linkTitle: "Runtimes" +weight: 8 +no_list: true +description: > + Configuring various container runtimes +aliases: + - /docs/reference/runtimes +--- +Kubernetes requires a container runtime to be installed. + +Here is what's supported: + +## containerd + +* [containerd]({{}}) + +## cri-o + +* [cri-o]({{}}) + +## docker + +* [docker]({{}}) + diff --git a/site/content/en/docs/runtimes/containerd.md b/site/content/en/docs/runtimes/containerd.md new file mode 100644 index 0000000000..d12fb89632 --- /dev/null +++ b/site/content/en/docs/runtimes/containerd.md @@ -0,0 +1,10 @@ +--- +title: "containerd" +aliases: + - /docs/reference/runtimes/containerd +--- + +Home page: + + + diff --git a/site/content/en/docs/runtimes/cri-o.md b/site/content/en/docs/runtimes/cri-o.md new file mode 100644 index 0000000000..b11953bb6a --- /dev/null +++ b/site/content/en/docs/runtimes/cri-o.md @@ -0,0 +1,11 @@ +--- +title: "cri-o" +aliases: + - /docs/reference/runtimes/cri-o +--- + +Home page: + +See also `minikube podman-env` + + diff --git a/site/content/en/docs/runtimes/docker.md b/site/content/en/docs/runtimes/docker.md new file mode 100644 index 0000000000..4b3f66adbf --- /dev/null +++ b/site/content/en/docs/runtimes/docker.md @@ -0,0 +1,11 @@ +--- +title: "docker" +aliases: + - /docs/reference/runtimes/docker +--- + +Home page: + +See also `minikube docker-env` + + From 0e81f07eaad58edf92d6eeb446e05722a076d409 Mon Sep 17 00:00:00 2001 From: Jack Zhang Date: Tue, 15 Mar 2022 11:14:55 +0800 Subject: [PATCH 008/545] use image loaded from cache --- pkg/minikube/node/cache.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkg/minikube/node/cache.go b/pkg/minikube/node/cache.go index 40432c7c03..fbd53889bf 100644 --- a/pkg/minikube/node/cache.go +++ b/pkg/minikube/node/cache.go @@ -136,6 +136,7 @@ func beginDownloadKicBaseImage(g *errgroup.Group, cc *config.ClusterConfig, down }() for _, img := range append([]string{baseImg}, kic.FallbackImages...) { var err error + var isFromCache bool if driver.IsDocker(cc.Driver) && download.ImageExistsInDaemon(img) && !downloadOnly { klog.Infof("%s exists in daemon, skipping load", img) @@ -161,20 +162,21 @@ func beginDownloadKicBaseImage(g *errgroup.Group, cc *config.ClusterConfig, down err = download.CacheToDaemon(img) if err == nil { klog.Infof("successfully loaded %s from cached tarball", img) - finalImg = img - return nil + isFromCache = true } } if driver.IsDocker(cc.Driver) { - klog.Infof("failed to load %s, will try remote image if available: %v", img, err) - klog.Infof("Downloading %s to local daemon", img) err = download.ImageToDaemon(img) if err == nil { klog.Infof("successfully downloaded %s", img) finalImg = img return nil + } else if isFromCache { + klog.Infof("use image loaded from cache %s", strings.Split(img, "@")[0]) + finalImg = strings.Split(img, "@")[0] + return nil } } klog.Infof("failed to download %s, will try fallback image if available: %v", img, err) From 8fb9165f829bfb265e351d590a6911d8745291e4 Mon Sep 17 00:00:00 2001 From: Alex Andrews Date: Tue, 19 Oct 2021 20:44:47 +0100 Subject: [PATCH 009/545] fix NixOS kernel modules path in podman driver --- pkg/drivers/kic/oci/oci.go | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/pkg/drivers/kic/oci/oci.go b/pkg/drivers/kic/oci/oci.go index 9516af6b6f..b02e0a53b0 100644 --- a/pkg/drivers/kic/oci/oci.go +++ b/pkg/drivers/kic/oci/oci.go @@ -108,6 +108,21 @@ func PrepareContainerNode(p CreateParams) error { return nil } +// kernelModulesPath checks for the existence of a known kernel modules directory, returning the +// first valid path +func kernelModulesPath() (string, error) { + paths := []string{ + "/lib/modules", + "/run/current-system/kernel-modules/lib/modules", // NixOS + } + for _, path := range paths { + if _, err := os.Stat(path); !os.IsNotExist(err) { + return path, nil + } + } + return "", errors.New("Unable to locate kernel modules") +} + // CreateContainerNode creates a new container node func CreateContainerNode(p CreateParams) error { // on windows os, if docker desktop is using Windows Containers. Exit early with error @@ -122,6 +137,12 @@ func CreateContainerNode(p CreateParams) error { } } + modulesPath, err := kernelModulesPath() + if err != nil { + klog.Errorf("error getting kernel modules path: %v", err) + return errors.Wrap(err, "kernel modules") + } + runArgs := []string{ "-d", // run the container detached "-t", // allocate a tty for entrypoint logs @@ -136,7 +157,7 @@ func CreateContainerNode(p CreateParams) error { "--tmpfs", "/run", // systemd wants a writable /run // logs,pods be stroed on filesystem vs inside container, // some k8s things want /lib/modules - "-v", "/lib/modules:/lib/modules:ro", + "-v", fmt.Sprintf("%s:/lib/modules:ro", modulesPath), "--hostname", p.Name, // make hostname match container name "--name", p.Name, // ... and set the container name "--label", fmt.Sprintf("%s=%s", CreatedByLabelKey, "true"), From e5d8c9d8ef38522247082963319860ad9cdfead8 Mon Sep 17 00:00:00 2001 From: Alex Andrews Date: Wed, 17 Nov 2021 22:03:39 +0000 Subject: [PATCH 010/545] move checkRunning out of CreateContainerNode --- pkg/drivers/kic/oci/oci.go | 48 ++++++++++++++++++++------------------ 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/pkg/drivers/kic/oci/oci.go b/pkg/drivers/kic/oci/oci.go index b02e0a53b0..6041c4ce62 100644 --- a/pkg/drivers/kic/oci/oci.go +++ b/pkg/drivers/kic/oci/oci.go @@ -123,6 +123,30 @@ func kernelModulesPath() (string, error) { return "", errors.New("Unable to locate kernel modules") } +func checkRunning(p CreateParams) func() error { + return func() error { + r, err := ContainerRunning(p.OCIBinary, p.Name) + if err != nil { + return fmt.Errorf("temporary error checking running for %q : %v", p.Name, err) + } + if !r { + return fmt.Errorf("temporary error created container %q is not running yet", p.Name) + } + s, err := ContainerStatus(p.OCIBinary, p.Name) + if err != nil { + return fmt.Errorf("temporary error checking status for %q : %v", p.Name, err) + } + if s != state.Running { + return fmt.Errorf("temporary error created container %q is not running yet", p.Name) + } + if !iptablesFileExists(p.OCIBinary, p.Name) { + return fmt.Errorf("iptables file doesn't exist, see #8179") + } + klog.Infof("the created container %q has a running status.", p.Name) + return nil + } +} + // CreateContainerNode creates a new container node func CreateContainerNode(p CreateParams) error { // on windows os, if docker desktop is using Windows Containers. Exit early with error @@ -247,29 +271,7 @@ func CreateContainerNode(p CreateParams) error { return errors.Wrap(err, "create container") } - checkRunning := func() error { - r, err := ContainerRunning(p.OCIBinary, p.Name) - if err != nil { - return fmt.Errorf("temporary error checking running for %q : %v", p.Name, err) - } - if !r { - return fmt.Errorf("temporary error created container %q is not running yet", p.Name) - } - s, err := ContainerStatus(p.OCIBinary, p.Name) - if err != nil { - return fmt.Errorf("temporary error checking status for %q : %v", p.Name, err) - } - if s != state.Running { - return fmt.Errorf("temporary error created container %q is not running yet", p.Name) - } - if !iptablesFileExists(p.OCIBinary, p.Name) { - return fmt.Errorf("iptables file doesn't exist, see #8179") - } - klog.Infof("the created container %q has a running status.", p.Name) - return nil - } - - if err := retry.Expo(checkRunning, 15*time.Millisecond, 25*time.Second); err != nil { + if err := retry.Expo(checkRunning(p), 15*time.Millisecond, 25*time.Second); err != nil { excerpt := LogContainerDebug(p.OCIBinary, p.Name) _, err := DaemonInfo(p.OCIBinary) if err != nil { From 1d35e4fcf9c08f3bcb7cde44e4ac5542113a5f2f Mon Sep 17 00:00:00 2001 From: Alex Andrews Date: Wed, 17 Nov 2021 22:50:28 +0000 Subject: [PATCH 011/545] return default kernel modules path if alternatives are not found --- pkg/drivers/kic/oci/oci.go | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/pkg/drivers/kic/oci/oci.go b/pkg/drivers/kic/oci/oci.go index 6041c4ce62..16572d2127 100644 --- a/pkg/drivers/kic/oci/oci.go +++ b/pkg/drivers/kic/oci/oci.go @@ -108,19 +108,18 @@ func PrepareContainerNode(p CreateParams) error { return nil } -// kernelModulesPath checks for the existence of a known kernel modules directory, returning the -// first valid path -func kernelModulesPath() (string, error) { +// kernelModulesPath checks for the existence of a known alternative kernel modules directory, +// returning the default if none are present +func kernelModulesPath() string { paths := []string{ - "/lib/modules", "/run/current-system/kernel-modules/lib/modules", // NixOS } for _, path := range paths { - if _, err := os.Stat(path); !os.IsNotExist(err) { - return path, nil + if _, err := os.Stat(path); err == nil { + return path } } - return "", errors.New("Unable to locate kernel modules") + return "/lib/modules" } func checkRunning(p CreateParams) func() error { @@ -161,12 +160,6 @@ func CreateContainerNode(p CreateParams) error { } } - modulesPath, err := kernelModulesPath() - if err != nil { - klog.Errorf("error getting kernel modules path: %v", err) - return errors.Wrap(err, "kernel modules") - } - runArgs := []string{ "-d", // run the container detached "-t", // allocate a tty for entrypoint logs @@ -181,7 +174,7 @@ func CreateContainerNode(p CreateParams) error { "--tmpfs", "/run", // systemd wants a writable /run // logs,pods be stroed on filesystem vs inside container, // some k8s things want /lib/modules - "-v", fmt.Sprintf("%s:/lib/modules:ro", modulesPath), + "-v", fmt.Sprintf("%s:/lib/modules:ro", kernelModulesPath()), "--hostname", p.Name, // make hostname match container name "--name", p.Name, // ... and set the container name "--label", fmt.Sprintf("%s=%s", CreatedByLabelKey, "true"), From 123c2bbf957db4b4a79ad9af5a72c39debd48329 Mon Sep 17 00:00:00 2001 From: Gimb0 <18228506+Gimb0@users.noreply.github.com> Date: Fri, 20 May 2022 23:29:02 +1000 Subject: [PATCH 012/545] Create showNotK8sVersionInfo function Create a showNotK8sVersionInfo func to output the runtime and runtime version --- pkg/minikube/node/config.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkg/minikube/node/config.go b/pkg/minikube/node/config.go index 5fd2394382..15fcd1f1da 100644 --- a/pkg/minikube/node/config.go +++ b/pkg/minikube/node/config.go @@ -51,6 +51,11 @@ func showVersionInfo(k8sVersion string, cr cruntime.Manager) { } } +func showNotK8sVersionInfo(cr cruntime.Manager) { + version, _ := cr.Version() + out.Step(cr.Style(), "Preparing {{.runtime}} {{.runtimeVersion}} ...", out.V{"runtime": cr.Name(), "runtimeVersion": version}) +} + // configureMounts configures any requested filesystem mounts func configureMounts(wg *sync.WaitGroup, cc config.ClusterConfig) { wg.Add(1) From b8b62b913107a8ff406e5af0a930bfba559906e8 Mon Sep 17 00:00:00 2001 From: Gimb0 <18228506+Gimb0@users.noreply.github.com> Date: Fri, 20 May 2022 23:37:38 +1000 Subject: [PATCH 013/545] Check compatibility and call func to output runtime When minikube is started without kubernetes, check runtime is compatible and if so call func to output runtime and runtime version --- pkg/minikube/node/start.go | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkg/minikube/node/start.go b/pkg/minikube/node/start.go index b721f04361..ceaf318837 100644 --- a/pkg/minikube/node/start.go +++ b/pkg/minikube/node/start.go @@ -97,7 +97,14 @@ func Start(starter Starter, apiServer bool) (*kubeconfig.Settings, error) { } if stopk8s { nv := semver.Version{Major: 0, Minor: 0, Patch: 0} - configureRuntimes(starter.Runner, *starter.Cfg, nv) + cr := configureRuntimes(starter.Runner, *starter.Cfg, nv) + + if err = cruntime.CheckCompatibility(cr); err != nil { + return nil, err + } + + showNotK8sVersionInfo(cr) + configureMounts(&wg, *starter.Cfg) return nil, config.Write(viper.GetString(config.ProfileName), starter.Cfg) } From 71baac336f0696fdabeca1eec99262c21a549e84 Mon Sep 17 00:00:00 2001 From: Gimb0 <18228506+Gimb0@users.noreply.github.com> Date: Fri, 20 May 2022 23:48:01 +1000 Subject: [PATCH 014/545] Remove machine name from output "Starting minikube without Kubernetes {Machine Name} in cluster {cluster}" doesn't make sense so removing the Machine name var from output. --- pkg/minikube/node/start.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/minikube/node/start.go b/pkg/minikube/node/start.go index ceaf318837..4eacfbb224 100644 --- a/pkg/minikube/node/start.go +++ b/pkg/minikube/node/start.go @@ -346,7 +346,7 @@ func Provision(cc *config.ClusterConfig, n *config.Node, apiServer bool, delOnFa // Be explicit with each case for the sake of translations if cc.KubernetesConfig.KubernetesVersion == constants.NoKubernetesVersion { - out.Step(style.ThumbsUp, "Starting minikube without Kubernetes {{.name}} in cluster {{.cluster}}", out.V{"name": name, "cluster": cc.Name}) + out.Step(style.ThumbsUp, "Starting minikube without Kubernetes in cluster {{.cluster}}", out.V{"cluster": cc.Name}) } else { if apiServer { out.Step(style.ThumbsUp, "Starting control plane node {{.name}} in cluster {{.cluster}}", out.V{"name": name, "cluster": cc.Name}) From 6364518066f0b59081be7e3e269fae24b6e5a948 Mon Sep 17 00:00:00 2001 From: Elias Koromilas Date: Thu, 26 May 2022 10:07:10 +0300 Subject: [PATCH 015/545] Add inaccel/fpga-operator addon Signed-off-by: Elias Koromilas --- cmd/minikube/cmd/config/addons_list_test.go | 2 +- deploy/addons/assets.go | 4 ++ deploy/addons/inaccel/README.md | 7 +++ deploy/addons/inaccel/fpga-operator.yaml.tmpl | 56 +++++++++++++++++++ pkg/addons/config.go | 5 ++ pkg/minikube/assets/addons.go | 11 ++++ pkg/minikube/detect/detect.go | 22 ++++++++ site/content/en/docs/contrib/tests.en.md | 3 + test/integration/addons_test.go | 40 +++++++++++++ test/integration/testdata/inaccel.yaml | 19 +++++++ 10 files changed, 168 insertions(+), 1 deletion(-) create mode 100644 deploy/addons/inaccel/README.md create mode 100644 deploy/addons/inaccel/fpga-operator.yaml.tmpl create mode 100644 test/integration/testdata/inaccel.yaml diff --git a/cmd/minikube/cmd/config/addons_list_test.go b/cmd/minikube/cmd/config/addons_list_test.go index 52afb8e37f..fc4ca0f91a 100644 --- a/cmd/minikube/cmd/config/addons_list_test.go +++ b/cmd/minikube/cmd/config/addons_list_test.go @@ -66,7 +66,7 @@ func TestAddonsList(t *testing.T) { Ambassador *interface{} `json:"ambassador"` } - b := make([]byte, 544) + b := make([]byte, 557) r, w, err := os.Pipe() if err != nil { t.Fatalf("failed to create pipe: %v", err) diff --git a/deploy/addons/assets.go b/deploy/addons/assets.go index 8a30f5d9f3..84b6b644d5 100644 --- a/deploy/addons/assets.go +++ b/deploy/addons/assets.go @@ -143,4 +143,8 @@ var ( // AliyunMirror assets for aliyun_mirror.json //go:embed aliyun_mirror.json AliyunMirror embed.FS + + // InAccelAssets assets for inaccel addon + //go:embed inaccel/fpga-operator.yaml.tmpl + InAccelAssets embed.FS ) diff --git a/deploy/addons/inaccel/README.md b/deploy/addons/inaccel/README.md new file mode 100644 index 0000000000..a8e24b3f9e --- /dev/null +++ b/deploy/addons/inaccel/README.md @@ -0,0 +1,7 @@ +### Documentation + +For detailed usage instructions visit: [docs.inaccel.com](https://docs.inaccel.com) + +### Support + +For more product information contact: info@inaccel.com diff --git a/deploy/addons/inaccel/fpga-operator.yaml.tmpl b/deploy/addons/inaccel/fpga-operator.yaml.tmpl new file mode 100644 index 0000000000..a20bbc7747 --- /dev/null +++ b/deploy/addons/inaccel/fpga-operator.yaml.tmpl @@ -0,0 +1,56 @@ +--- +apiVersion: v1 +kind: ConfigMap +metadata: + labels: + addonmanager.kubernetes.io/mode: Reconcile + kubernetes.io/minikube-addons: inaccel + name: inaccel-addon + namespace: kube-system +data: + disable.sh: | + #!/bin/sh -e + exec >/proc/1/fd/1 + echo "Disabling InAccel FPGA Operator" + helm uninstall inaccel --namespace kube-system + echo "InAccel is disabled" + enable.sh: | + #!/bin/sh -e + exec >/proc/1/fd/1 + echo "Enabling InAccel FPGA Operator" + helm install inaccel fpga-operator --namespace kube-system --repo https://setup.inaccel.com/helm + echo "InAccel is enabled" +--- +apiVersion: v1 +kind: Pod +metadata: + labels: + addonmanager.kubernetes.io/mode: Reconcile + kubernetes.io/minikube-addons: inaccel + name: inaccel-addon + namespace: kube-system +spec: + containers: + - command: + - sleep + - infinity + image: {{ .CustomRegistries.Helm3 | default .ImageRepository | default .Registries.Helm3 }}{{ .Images.Helm3 }} + lifecycle: + postStart: + exec: + command: + - /inaccel/enable.sh + preStop: + exec: + command: + - /inaccel/disable.sh + name: helm3 + volumeMounts: + - mountPath: /inaccel + name: inaccel-addon + readOnly: true + volumes: + - configMap: + defaultMode: 0777 + name: inaccel-addon + name: inaccel-addon diff --git a/pkg/addons/config.go b/pkg/addons/config.go index f464df25a4..81db657897 100644 --- a/pkg/addons/config.go +++ b/pkg/addons/config.go @@ -197,4 +197,9 @@ var Addons = []*Addon{ set: SetBool, callbacks: []setFn{EnableOrDisableAddon}, }, + { + name: "inaccel", + set: SetBool, + callbacks: []setFn{EnableOrDisableAddon}, + }, } diff --git a/pkg/minikube/assets/addons.go b/pkg/minikube/assets/addons.go index 8fbeb0b662..dbd4239a39 100755 --- a/pkg/minikube/assets/addons.go +++ b/pkg/minikube/assets/addons.go @@ -688,6 +688,17 @@ var Addons = map[string]*Addon{ }, false, "portainer", "portainer.io", map[string]string{ "Portainer": "portainer/portainer-ce:latest@sha256:4f126c5114b63e9d1bceb4b368944d14323329a9a0d4e7bb7eb53c9b7435d498", }, nil), + "inaccel": NewAddon([]*BinAsset{ + MustBinAsset(addons.InAccelAssets, + "inaccel/fpga-operator.yaml.tmpl", + vmpath.GuestAddonsDir, + "fpga-operator.yaml", + "0640"), + }, false, "inaccel", "InAccel ", map[string]string{ + "Helm3": "alpine/helm:3.9.0@sha256:9f4bf4d24241f983910550b1fe8688571cd684046500abe58cef14308f9cb19e", + }, map[string]string{ + "Helm3": "docker.io", + }), } // parseMapString creates a map based on `str` which is encoded as =,=,... diff --git a/pkg/minikube/detect/detect.go b/pkg/minikube/detect/detect.go index c5910efc59..23ebc31613 100644 --- a/pkg/minikube/detect/detect.go +++ b/pkg/minikube/detect/detect.go @@ -17,6 +17,7 @@ limitations under the License. package detect import ( + "io" "net/http" "os" "os/exec" @@ -67,6 +68,27 @@ func IsOnGCE() bool { return resp.Header.Get("Metadata-Flavor") == "Google" } +// IsOnAmazonEC2 determines whether minikube is currently running on Amazon EC2 +// and, if yes, on which instance type. +func IsOnAmazonEC2() (bool, string) { + resp, err := http.Get("http://instance-data.ec2.internal/latest/meta-data/instance-type") + if err != nil { + return false, "" + } + defer resp.Body.Close() + + if resp.StatusCode != http.StatusOK { + return true, "" + } + + instanceType, err := io.ReadAll(resp.Body) + if err != nil { + return true, "" + } + + return true, string(instanceType) +} + // IsCloudShell determines whether minikube is running inside CloudShell func IsCloudShell() bool { e := os.Getenv("CLOUD_SHELL") diff --git a/site/content/en/docs/contrib/tests.en.md b/site/content/en/docs/contrib/tests.en.md index cc1a736fa5..e763d4460c 100644 --- a/site/content/en/docs/contrib/tests.en.md +++ b/site/content/en/docs/contrib/tests.en.md @@ -42,6 +42,9 @@ tests the csi hostpath driver by creating a persistent volume, snapshotting it a #### validateGCPAuthAddon tests the GCP Auth addon with either phony or real credentials and makes sure the files are mounted into pods correctly +#### validateInAccelAddon +tests the InAccel addon by trying a vadd + ## TestCertOptions makes sure minikube certs respect the --apiserver-ips and --apiserver-names parameters diff --git a/test/integration/addons_test.go b/test/integration/addons_test.go index 7b85db6b33..b7d18b7f64 100644 --- a/test/integration/addons_test.go +++ b/test/integration/addons_test.go @@ -68,6 +68,8 @@ func TestAddons(t *testing.T) { args := append([]string{"start", "-p", profile, "--wait=true", "--memory=4000", "--alsologtostderr", "--addons=registry", "--addons=metrics-server", "--addons=volumesnapshots", "--addons=csi-hostpath-driver", "--addons=gcp-auth"}, StartArgs()...) if !NoneDriver() { // none driver does not support ingress args = append(args, "--addons=ingress", "--addons=ingress-dns") + } else if isOnAmazonEC2, instanceType := detect.IsOnAmazonEC2(); isOnAmazonEC2 && strings.HasPrefix(instanceType, "f1.") { + args = append(args, "--addons=inaccel") // inaccel supports only none driver } if !arm64Platform() { args = append(args, "--addons=helm-tiller") @@ -95,6 +97,7 @@ func TestAddons(t *testing.T) { {"HelmTiller", validateHelmTillerAddon}, {"Olm", validateOlmAddon}, {"CSI", validateCSIDriverAndSnapshots}, + {"InAccel", validateInAccelAddon}, } for _, tc := range tests { tc := tc @@ -708,3 +711,40 @@ func validateGCPAuthAddon(ctx context.Context, t *testing.T, profile string) { } } } + +// validateInAccelAddon tests the inaccel addon by trying a vadd +func validateInAccelAddon(ctx context.Context, t *testing.T, profile string) { + defer PostMortemLogs(t, profile) + + if !NoneDriver() { + t.Skipf("skipping: inaccel not supported") + } + + if isOnAmazonEC2, instanceType := detect.IsOnAmazonEC2(); !(isOnAmazonEC2 && strings.HasPrefix(instanceType, "f1.")) { + t.Skipf("skipping: not running on an Amazon EC2 f1 instance") + } + + // create sample pod + rr, err := Run(t, exec.CommandContext(ctx, "kubectl", "--context", profile, "create", "--filename", filepath.Join(*testdataDir, "inaccel.yaml"))) + if err != nil { + t.Fatalf("creating pod with %s failed: %v", rr.Command(), err) + } + + if _, err = Run(t, exec.CommandContext(ctx, "kubectl", "--context", profile, "wait", "--for", "condition=ready", "--timeout", "-1s", "pod/inaccel-vadd")); err != nil { + t.Fatalf("failed waiting for inaccel-vadd pod: %v", err) + } + + rr, err = Run(t, exec.CommandContext(ctx, "kubectl", "--context", profile, "logs", "--follow", "pod/inaccel-vadd")) + if err != nil { + t.Fatalf("%q failed: %v", rr.Command(), err) + } + if !strings.Contains(rr.Stdout.String(), "Test PASSED") { + t.Fatalf("expected inaccel-vadd logs to include: %q but got: %s", "Test PASSED", rr.Output()) + } + + // delete pod + rr, err = Run(t, exec.CommandContext(ctx, "kubectl", "--context", profile, "delete", "pod/inaccel-vadd")) + if err != nil { + t.Fatalf("deleting pod with %s failed: %v", rr.Command(), err) + } +} diff --git a/test/integration/testdata/inaccel.yaml b/test/integration/testdata/inaccel.yaml new file mode 100644 index 0000000000..b592e742e6 --- /dev/null +++ b/test/integration/testdata/inaccel.yaml @@ -0,0 +1,19 @@ +apiVersion: v1 +kind: Pod +metadata: + annotations: + inaccel/cli: | + bitstream install https://store.inaccel.com/artifactory/bitstreams/xilinx/aws-vu9p-f1/dynamic-shell/aws/vector/1/1addition + labels: + inaccel/fpga: enabled + name: inaccel-vadd +spec: + containers: + - image: inaccel/vadd + name: inaccel-vadd + resources: + limits: + xilinx/aws-vu9p-f1: 1 + nodeSelector: + xilinx/aws-vu9p-f1: dynamic-shell + restartPolicy: Never From bc133a95e67c6279d5ce071598ef77c645fe9f4b Mon Sep 17 00:00:00 2001 From: Sharif Elgamal Date: Thu, 26 May 2022 13:46:27 -0700 Subject: [PATCH 016/545] build conmon regardless of arch --- deploy/iso/minikube-iso/arch/x86_64/package/Config.in | 1 - deploy/iso/minikube-iso/package/Config.in | 1 + .../iso/minikube-iso/{arch/x86_64 => }/package/conmon/Config.in | 0 .../minikube-iso/{arch/x86_64 => }/package/conmon/conmon.hash | 0 .../iso/minikube-iso/{arch/x86_64 => }/package/conmon/conmon.mk | 0 5 files changed, 1 insertion(+), 1 deletion(-) rename deploy/iso/minikube-iso/{arch/x86_64 => }/package/conmon/Config.in (100%) rename deploy/iso/minikube-iso/{arch/x86_64 => }/package/conmon/conmon.hash (100%) rename deploy/iso/minikube-iso/{arch/x86_64 => }/package/conmon/conmon.mk (100%) diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/Config.in b/deploy/iso/minikube-iso/arch/x86_64/package/Config.in index 1766727bf7..77cac7b279 100644 --- a/deploy/iso/minikube-iso/arch/x86_64/package/Config.in +++ b/deploy/iso/minikube-iso/arch/x86_64/package/Config.in @@ -1,5 +1,4 @@ menu "System tools x86_64" - source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/conmon/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/buildkit-bin/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/runc-master/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/crio-bin/Config.in" diff --git a/deploy/iso/minikube-iso/package/Config.in b/deploy/iso/minikube-iso/package/Config.in index 3cb958fae6..a728dca904 100644 --- a/deploy/iso/minikube-iso/package/Config.in +++ b/deploy/iso/minikube-iso/package/Config.in @@ -1,4 +1,5 @@ menu "System tools" + source "$BR2_EXTERNAL_MINIKUBE_PATH/package/conmon/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/package/crun/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/package/automount/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/package/gluster/Config.in" diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/conmon/Config.in b/deploy/iso/minikube-iso/package/conmon/Config.in similarity index 100% rename from deploy/iso/minikube-iso/arch/x86_64/package/conmon/Config.in rename to deploy/iso/minikube-iso/package/conmon/Config.in diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/conmon/conmon.hash b/deploy/iso/minikube-iso/package/conmon/conmon.hash similarity index 100% rename from deploy/iso/minikube-iso/arch/x86_64/package/conmon/conmon.hash rename to deploy/iso/minikube-iso/package/conmon/conmon.hash diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/conmon/conmon.mk b/deploy/iso/minikube-iso/package/conmon/conmon.mk similarity index 100% rename from deploy/iso/minikube-iso/arch/x86_64/package/conmon/conmon.mk rename to deploy/iso/minikube-iso/package/conmon/conmon.mk From 31843939d8b8b7ce09e675c4754a17a662fa8807 Mon Sep 17 00:00:00 2001 From: simonren-tes Date: Fri, 27 May 2022 13:50:23 +0800 Subject: [PATCH 017/545] add bind address option for cmd tunnel --- cmd/minikube/cmd/tunnel.go | 4 +++- pkg/minikube/tunnel/kic/ssh_conn.go | 27 ++++++++++++++++++++------- pkg/minikube/tunnel/kic/ssh_tunnel.go | 8 +++++--- 3 files changed, 28 insertions(+), 11 deletions(-) diff --git a/cmd/minikube/cmd/tunnel.go b/cmd/minikube/cmd/tunnel.go index 8baa76a9df..734cd10c6c 100644 --- a/cmd/minikube/cmd/tunnel.go +++ b/cmd/minikube/cmd/tunnel.go @@ -41,6 +41,7 @@ import ( ) var cleanup bool +var bindAddress string // tunnelCmd represents the tunnel command var tunnelCmd = &cobra.Command{ @@ -93,7 +94,7 @@ var tunnelCmd = &cobra.Command{ sshKey := filepath.Join(localpath.MiniPath(), "machines", cname, "id_rsa") outputTunnelStarted() - kicSSHTunnel := kic.NewSSHTunnel(ctx, sshPort, sshKey, clientset.CoreV1(), clientset.NetworkingV1()) + kicSSHTunnel := kic.NewSSHTunnel(ctx, sshPort, sshKey, bindAddress, clientset.CoreV1(), clientset.NetworkingV1()) err = kicSSHTunnel.Start() if err != nil { exit.Error(reason.SvcTunnelStart, "error starting tunnel", err) @@ -119,4 +120,5 @@ func outputTunnelStarted() { func init() { tunnelCmd.Flags().BoolVarP(&cleanup, "cleanup", "c", true, "call with cleanup=true to remove old tunnels") + tunnelCmd.Flags().StringVar(&bindAddress, "bind-address", "", "set tunnel bind address, empty or `*' indicates that tunnel should be available for all interfaces") } diff --git a/pkg/minikube/tunnel/kic/ssh_conn.go b/pkg/minikube/tunnel/kic/ssh_conn.go index f7468aefde..c188bc270e 100644 --- a/pkg/minikube/tunnel/kic/ssh_conn.go +++ b/pkg/minikube/tunnel/kic/ssh_conn.go @@ -38,7 +38,7 @@ type sshConn struct { suppressStdOut bool } -func createSSHConn(name, sshPort, sshKey string, resourcePorts []int32, resourceIP string, resourceName string) *sshConn { +func createSSHConn(name, sshPort, sshKey, bindAddress string, resourcePorts []int32, resourceIP string, resourceName string) *sshConn { // extract sshArgs sshArgs := []string{ // TODO: document the options here @@ -53,12 +53,25 @@ func createSSHConn(name, sshPort, sshKey string, resourcePorts []int32, resource askForSudo := false var privilegedPorts []int32 for _, port := range resourcePorts { - arg := fmt.Sprintf( - "-L %d:%s:%d", - port, - resourceIP, - port, - ) + var arg string + if bindAddress == "" || bindAddress == "*" { + // bind on all interfaces + arg = fmt.Sprintf( + "-L %d:%s:%d", + port, + resourceIP, + port, + ) + } else { + // bind on specify address only + arg = fmt.Sprintf( + "-L %s:%d:%s:%d", + bindAddress, + port, + resourceIP, + port, + ) + } // check if any port is privileged if port < 1024 { diff --git a/pkg/minikube/tunnel/kic/ssh_tunnel.go b/pkg/minikube/tunnel/kic/ssh_tunnel.go index dafa3f94a9..bcc355c1bf 100644 --- a/pkg/minikube/tunnel/kic/ssh_tunnel.go +++ b/pkg/minikube/tunnel/kic/ssh_tunnel.go @@ -37,6 +37,7 @@ type SSHTunnel struct { ctx context.Context sshPort string sshKey string + bindAddress string v1Core typed_core.CoreV1Interface v1Networking typed_networking.NetworkingV1Interface LoadBalancerEmulator tunnel.LoadBalancerEmulator @@ -45,11 +46,12 @@ type SSHTunnel struct { } // NewSSHTunnel ... -func NewSSHTunnel(ctx context.Context, sshPort, sshKey string, v1Core typed_core.CoreV1Interface, v1Networking typed_networking.NetworkingV1Interface) *SSHTunnel { +func NewSSHTunnel(ctx context.Context, sshPort, sshKey, bindAddress string, v1Core typed_core.CoreV1Interface, v1Networking typed_networking.NetworkingV1Interface) *SSHTunnel { return &SSHTunnel{ ctx: ctx, sshPort: sshPort, sshKey: sshKey, + bindAddress: bindAddress, v1Core: v1Core, LoadBalancerEmulator: tunnel.NewLoadBalancerEmulator(v1Core), v1Networking: v1Networking, @@ -124,7 +126,7 @@ func (t *SSHTunnel) startConnection(svc v1.Service) { } // create new ssh conn - newSSHConn := createSSHConn(uniqName, t.sshPort, t.sshKey, resourcePorts, svc.Spec.ClusterIP, svc.Name) + newSSHConn := createSSHConn(uniqName, t.sshPort, t.sshKey, t.bindAddress, resourcePorts, svc.Spec.ClusterIP, svc.Name) t.conns[newSSHConn.name] = newSSHConn go func() { @@ -154,7 +156,7 @@ func (t *SSHTunnel) startConnectionIngress(ingress v1_networking.Ingress) { resourceIP := "127.0.0.1" // create new ssh conn - newSSHConn := createSSHConn(uniqName, t.sshPort, t.sshKey, resourcePorts, resourceIP, ingress.Name) + newSSHConn := createSSHConn(uniqName, t.sshPort, t.sshKey, t.bindAddress, resourcePorts, resourceIP, ingress.Name) t.conns[newSSHConn.name] = newSSHConn go func() { From 0520293e152b185e9edcf089dc78a6a44ca18343 Mon Sep 17 00:00:00 2001 From: Predrag Rogic Date: Sun, 13 Mar 2022 01:16:14 +0000 Subject: [PATCH 018/545] use release versions' tags insted of release tags --- go.mod | 1 - go.sum | 2 -- hack/preload-images/kubernetes.go | 2 +- hack/update/github.go | 12 ++++++------ pkg/minikube/constants/constants.go | 2 +- pkg/perf/monitor/github.go | 2 +- 6 files changed, 9 insertions(+), 12 deletions(-) diff --git a/go.mod b/go.mod index 46e0fce56e..99373ded78 100644 --- a/go.mod +++ b/go.mod @@ -24,7 +24,6 @@ require ( github.com/golang-collections/collections v0.0.0-20130729185459-604e922904d3 github.com/google/go-cmp v0.5.8 github.com/google/go-containerregistry v0.6.0 - github.com/google/go-github/v36 v36.0.0 github.com/google/slowjam v1.0.0 github.com/google/uuid v1.3.0 github.com/hashicorp/go-getter v1.5.11 diff --git a/go.sum b/go.sum index 095607fb3c..659e0af96d 100644 --- a/go.sum +++ b/go.sum @@ -574,8 +574,6 @@ github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN github.com/google/go-containerregistry v0.6.0 h1:niQ+8XD//kKgArIFwDVBXsWVWbde16LPdHMyNwSC8h4= github.com/google/go-containerregistry v0.6.0/go.mod h1:euCCtNbZ6tKqi1E72vwDj2xZcN5ttKpZLfa/wSo5iLw= github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ= -github.com/google/go-github/v36 v36.0.0 h1:ndCzM616/oijwufI7nBRa+5eZHLldT+4yIB68ib5ogs= -github.com/google/go-github/v36 v36.0.0/go.mod h1:LFlKC047IOqiglRGNqNb9s/iAPTnnjtlshm+bxp+kwk= github.com/google/go-github/v43 v43.0.0 h1:y+GL7LIsAIF2NZlJ46ZoC/D1W1ivZasT0lnWHMYPZ+U= github.com/google/go-github/v43 v43.0.0/go.mod h1:ZkTvvmCXBvsfPpTHXnH/d2hP9Y0cTbvN9kr5xqyXOIc= github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= diff --git a/hack/preload-images/kubernetes.go b/hack/preload-images/kubernetes.go index 2f895c11d5..df977a1d12 100644 --- a/hack/preload-images/kubernetes.go +++ b/hack/preload-images/kubernetes.go @@ -20,7 +20,7 @@ import ( "context" "strings" - "github.com/google/go-github/v36/github" + "github.com/google/go-github/v43/github" "k8s.io/klog/v2" ) diff --git a/hack/update/github.go b/hack/update/github.go index 50392f4c64..d2ed8221f1 100644 --- a/hack/update/github.go +++ b/hack/update/github.go @@ -26,7 +26,7 @@ import ( "golang.org/x/mod/semver" "golang.org/x/oauth2" - "github.com/google/go-github/v36/github" + "github.com/google/go-github/v43/github" "k8s.io/klog/v2" ) @@ -36,7 +36,7 @@ const ( ghListPerPage = 100 // ghSearchLimit limits the number of searched items to be <= N * ghListPerPage. - ghSearchLimit = 100 + ghSearchLimit = 300 ) var ( @@ -55,13 +55,13 @@ func ghCreatePR(ctx context.Context, owner, repo, base, branch, title string, is ghc := ghClient(ctx, token) // get base branch - baseBranch, _, err := ghc.Repositories.GetBranch(ctx, owner, repo, base) + baseBranch, _, err := ghc.Repositories.GetBranch(ctx, owner, repo, base, true) if err != nil { return nil, fmt.Errorf("unable to get base branch: %w", err) } // get base commit - baseCommit, _, err := ghc.Repositories.GetCommit(ctx, owner, repo, *baseBranch.Commit.SHA) + baseCommit, _, err := ghc.Repositories.GetCommit(ctx, owner, repo, *baseBranch.Commit.SHA, &github.ListOptions{PerPage: ghListPerPage}) if err != nil { return nil, fmt.Errorf("unable to get base commit: %w", err) } @@ -216,12 +216,12 @@ func GHReleases(ctx context.Context, owner, repo string) (stable, latest, edge s // walk through the paginated list of up to ghSearchLimit newest releases opts := &github.ListOptions{PerPage: ghListPerPage} for (opts.Page+1)*ghListPerPage <= ghSearchLimit { - rls, resp, err := ghc.Repositories.ListTags(ctx, owner, repo, opts) + rls, resp, err := ghc.Repositories.ListReleases(ctx, owner, repo, opts) if err != nil { return "", "", "", err } for _, rl := range rls { - ver := *rl.Name + ver := rl.GetTagName() if !semver.IsValid(ver) { continue } diff --git a/pkg/minikube/constants/constants.go b/pkg/minikube/constants/constants.go index 505b18e8a2..0ecfc1efb2 100644 --- a/pkg/minikube/constants/constants.go +++ b/pkg/minikube/constants/constants.go @@ -38,7 +38,7 @@ const ( // NOTE: You may need to update coreDNS & etcd versions in pkg/minikube/bootstrapper/images/images.go NewestKubernetesVersion = "v1.23.6" // OldestKubernetesVersion is the oldest Kubernetes version to test against - OldestKubernetesVersion = "v1.16.0" + OldestKubernetesVersion = "v1.17.0" // NoKubernetesVersion is the version used when users does NOT want to install kubernetes NoKubernetesVersion = "v0.0.0" diff --git a/pkg/perf/monitor/github.go b/pkg/perf/monitor/github.go index 7b77a96f04..6a614bd3f3 100644 --- a/pkg/perf/monitor/github.go +++ b/pkg/perf/monitor/github.go @@ -22,7 +22,7 @@ import ( "os" "time" - "github.com/google/go-github/v36/github" + "github.com/google/go-github/v43/github" "github.com/pkg/errors" "golang.org/x/oauth2" ) From e38b77d7c7774714ba6d3f54684e60ff367c9b82 Mon Sep 17 00:00:00 2001 From: Predrag Rogic Date: Sun, 20 Mar 2022 18:27:54 +0000 Subject: [PATCH 019/545] use release versions' tags insted of release tags --- pkg/minikube/constants/constants.go | 1 - 1 file changed, 1 deletion(-) diff --git a/pkg/minikube/constants/constants.go b/pkg/minikube/constants/constants.go index 0ecfc1efb2..f42a2143f1 100644 --- a/pkg/minikube/constants/constants.go +++ b/pkg/minikube/constants/constants.go @@ -32,7 +32,6 @@ var ( const ( // DefaultKubernetesVersion is the default Kubernetes version - // dont update till #10545 is solved DefaultKubernetesVersion = "v1.23.6" // NewestKubernetesVersion is the newest Kubernetes version to test against // NOTE: You may need to update coreDNS & etcd versions in pkg/minikube/bootstrapper/images/images.go From 1033e05218ea2b1cc314c5e71675edfc25b3d165 Mon Sep 17 00:00:00 2001 From: Predrag Rogic Date: Fri, 20 May 2022 17:43:31 +0100 Subject: [PATCH 020/545] keep OldestKubernetesVersion as-is --- pkg/minikube/constants/constants.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/minikube/constants/constants.go b/pkg/minikube/constants/constants.go index f42a2143f1..fcdb38c436 100644 --- a/pkg/minikube/constants/constants.go +++ b/pkg/minikube/constants/constants.go @@ -37,7 +37,7 @@ const ( // NOTE: You may need to update coreDNS & etcd versions in pkg/minikube/bootstrapper/images/images.go NewestKubernetesVersion = "v1.23.6" // OldestKubernetesVersion is the oldest Kubernetes version to test against - OldestKubernetesVersion = "v1.17.0" + OldestKubernetesVersion = "v1.16.0" // NoKubernetesVersion is the version used when users does NOT want to install kubernetes NoKubernetesVersion = "v0.0.0" From 5b8033631e58f059d62842bb50b84a3d11ebc1d7 Mon Sep 17 00:00:00 2001 From: Gimb0 <18228506+Gimb0@users.noreply.github.com> Date: Mon, 30 May 2022 21:25:43 +1000 Subject: [PATCH 021/545] Correct lint with gofmt -s Correct lint with gofmt -s pkg/minikube/node/start.go --- pkg/minikube/node/start.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/minikube/node/start.go b/pkg/minikube/node/start.go index 4eacfbb224..7d7532cf18 100644 --- a/pkg/minikube/node/start.go +++ b/pkg/minikube/node/start.go @@ -102,7 +102,7 @@ func Start(starter Starter, apiServer bool) (*kubeconfig.Settings, error) { if err = cruntime.CheckCompatibility(cr); err != nil { return nil, err } - + showNotK8sVersionInfo(cr) configureMounts(&wg, *starter.Cfg) From 3e984c3000c4d94788241c2616fd6ab3cf0170d6 Mon Sep 17 00:00:00 2001 From: Bradley S <18228506+Gimb0@users.noreply.github.com> Date: Mon, 30 May 2022 21:31:35 +1000 Subject: [PATCH 022/545] Rename func showNotK8sVersionInfo to showNoK8sVersionInfo Co-authored-by: Steven Powell <44844360+spowelljr@users.noreply.github.com> --- pkg/minikube/node/config.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/minikube/node/config.go b/pkg/minikube/node/config.go index 15fcd1f1da..36b4ebdba1 100644 --- a/pkg/minikube/node/config.go +++ b/pkg/minikube/node/config.go @@ -51,7 +51,7 @@ func showVersionInfo(k8sVersion string, cr cruntime.Manager) { } } -func showNotK8sVersionInfo(cr cruntime.Manager) { +func showNoK8sVersionInfo(cr cruntime.Manager) { version, _ := cr.Version() out.Step(cr.Style(), "Preparing {{.runtime}} {{.runtimeVersion}} ...", out.V{"runtime": cr.Name(), "runtimeVersion": version}) } From 09c1891fed65cd4d3738eff3fa8e711a90813580 Mon Sep 17 00:00:00 2001 From: Gimb0 <18228506+Gimb0@users.noreply.github.com> Date: Mon, 30 May 2022 21:37:21 +1000 Subject: [PATCH 023/545] Renamed func showNotK8sVersionInfo to showNoK8sVersionInfo --- pkg/minikube/node/start.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/minikube/node/start.go b/pkg/minikube/node/start.go index 7d7532cf18..00e6179121 100644 --- a/pkg/minikube/node/start.go +++ b/pkg/minikube/node/start.go @@ -103,7 +103,7 @@ func Start(starter Starter, apiServer bool) (*kubeconfig.Settings, error) { return nil, err } - showNotK8sVersionInfo(cr) + showNoK8sVersionInfo(cr) configureMounts(&wg, *starter.Cfg) return nil, config.Write(viper.GetString(config.ProfileName), starter.Cfg) From 6902580a35e9b3dfd18a0026291529dfe170f710 Mon Sep 17 00:00:00 2001 From: Sharif Elgamal Date: Tue, 31 May 2022 09:43:36 -0700 Subject: [PATCH 024/545] remove arch dep --- deploy/iso/minikube-iso/package/conmon/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/deploy/iso/minikube-iso/package/conmon/Config.in b/deploy/iso/minikube-iso/package/conmon/Config.in index 0022e24900..6d4df09cf9 100644 --- a/deploy/iso/minikube-iso/package/conmon/Config.in +++ b/deploy/iso/minikube-iso/package/conmon/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_CONMON bool "conmon" - depends on BR2_x86_64 depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS depends on BR2_TOOLCHAIN_HAS_THREADS From cd01efdf37b6cfb542e97aea283963a0c2e4f533 Mon Sep 17 00:00:00 2001 From: Sharif Elgamal Date: Tue, 31 May 2022 10:43:55 -0700 Subject: [PATCH 025/545] upgrade conmon to v2.0.24 --- cmd/minikube/cmd/start.go | 5 ----- deploy/iso/minikube-iso/package/conmon/conmon.hash | 1 + deploy/iso/minikube-iso/package/conmon/conmon.mk | 4 ++-- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go index d431edd0d5..ff6a2fad96 100644 --- a/cmd/minikube/cmd/start.go +++ b/cmd/minikube/cmd/start.go @@ -312,11 +312,6 @@ func provisionWithDriver(cmd *cobra.Command, ds registry.DriverState, existing * return node.Starter{}, errors.Wrap(err, "Failed to generate config") } - // Bail cleanly for qemu2 until implemented - if driver.IsVM(cc.Driver) && runtime.GOARCH == "arm64" && cc.KubernetesConfig.ContainerRuntime != "docker" { - exit.Message(reason.Unimplemented, "arm64 VM drivers do not currently support containerd or crio container runtimes. See https://github.com/kubernetes/minikube/issues/14146 for details.") - } - // This is about as far as we can go without overwriting config files if viper.GetBool(dryRun) { out.Step(style.DryRun, `dry-run validation complete!`) diff --git a/deploy/iso/minikube-iso/package/conmon/conmon.hash b/deploy/iso/minikube-iso/package/conmon/conmon.hash index 2180c0d189..09179132d1 100644 --- a/deploy/iso/minikube-iso/package/conmon/conmon.hash +++ b/deploy/iso/minikube-iso/package/conmon/conmon.hash @@ -8,3 +8,4 @@ sha256 93f7c127cb536fc60f4c08291fd34e99e492fdc6a36e6b0ddad97d868ecf10f7 29c33670 sha256 d82ad6c1e315f8310ed75fe6905f81dce61b61d55a156e9e04c9855e78e1e165 v2.0.6.tar.gz sha256 abe4e1cc02505c81857c1eeced008a24b4dd41659d42a1e3395754fb063aef36 v2.0.7.tar.gz sha256 a116b8422c65778bd677c29f55b3ceaae07d09da336f71bdc68fc7bb83d50e03 v2.0.17.tar.gz +sha256 e00bc44a8bd783fd417a5c90d3b8c15035ddc69b18350a31258e7f79aec8c697 v2.0.24.tar.gz diff --git a/deploy/iso/minikube-iso/package/conmon/conmon.mk b/deploy/iso/minikube-iso/package/conmon/conmon.mk index b38e4802f8..44a8535781 100644 --- a/deploy/iso/minikube-iso/package/conmon/conmon.mk +++ b/deploy/iso/minikube-iso/package/conmon/conmon.mk @@ -4,8 +4,8 @@ # ################################################################################ -CONMON_VERSION = v2.0.17 -CONMON_COMMIT = 41877362fc4685d55e0473d2e4a1cbe5e1debee0 +CONMON_VERSION = v2.0.24 +CONMON_COMMIT = 9cbc71d699291dfb14e7c1e348a0d48feff7a27d CONMON_SITE = https://github.com/containers/conmon/archive CONMON_SOURCE = $(CONMON_VERSION).tar.gz CONMON_LICENSE = Apache-2.0 From fd3f8d3b01dd509778233a6418cf7c45f22cb60f Mon Sep 17 00:00:00 2001 From: Sharif Elgamal Date: Tue, 31 May 2022 12:01:35 -0700 Subject: [PATCH 026/545] remove deprecated config --- .../arch/aarch64/package/crio-bin-aarch64/crio.conf | 9 --------- 1 file changed, 9 deletions(-) diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/crio-bin-aarch64/crio.conf b/deploy/iso/minikube-iso/arch/aarch64/package/crio-bin-aarch64/crio.conf index fafaed67bc..1aab1688e3 100644 --- a/deploy/iso/minikube-iso/arch/aarch64/package/crio-bin-aarch64/crio.conf +++ b/deploy/iso/minikube-iso/arch/aarch64/package/crio-bin-aarch64/crio.conf @@ -368,15 +368,6 @@ signature_policy = "" # ignore; the latter will ignore volumes entirely. image_volumes = "mkdir" -# List of registries to be used when pulling an unqualified image (e.g., -# "alpine:latest"). By default, registries is set to "docker.io" for -# compatibility reasons. Depending on your workload and usecase you may add more -# registries (e.g., "quay.io", "registry.fedoraproject.org", -# "registry.opensuse.org", etc.). -registries = [ - "docker.io" -] - # Temporary directory to use for storing big files big_files_temporary_dir = "" From bb1e25e79939f4d26435e0250299106b722fd979 Mon Sep 17 00:00:00 2001 From: Sharif Elgamal Date: Tue, 31 May 2022 14:50:58 -0700 Subject: [PATCH 027/545] build crio-bin in the same way for both arch --- .../arch/aarch64/package/Config.in | 1 - .../package/crio-bin-aarch64/Config.in | 20 - .../package/crio-bin-aarch64/crio-bin.mk | 79 ---- .../package/crio-bin-aarch64/crio.conf | 400 ----------------- .../arch/x86_64/package/Config.in | 1 - .../arch/x86_64/package/crio-bin/02-crio.conf | 8 - .../x86_64/package/crio-bin/conmon-config.h | 9 - .../x86_64/package/crio-bin/crio-bin.hash | 28 -- .../x86_64/package/crio-bin/crio-wipe.service | 20 - .../x86_64/package/crio-bin/crio.conf.default | 408 ------------------ .../arch/x86_64/package/crio-bin/crio.service | 29 -- .../arch/x86_64/package/crio-bin/policy.json | 7 - .../x86_64/package/crio-bin/registries.conf | 5 - deploy/iso/minikube-iso/package/Config.in | 1 + .../crio-bin}/02-crio.conf | 0 .../x86_64 => }/package/crio-bin/Config.in | 1 - .../crio-bin}/conmon-config.h | 0 .../crio-bin}/crio-bin.hash | 0 .../x86_64 => }/package/crio-bin/crio-bin.mk | 0 .../crio-bin}/crio-wipe.service | 0 .../x86_64 => }/package/crio-bin/crio.conf | 0 .../crio-bin}/crio.conf.default | 0 .../crio-bin}/crio.service | 0 .../crio-bin}/policy.json | 0 .../crio-bin}/registries.conf | 0 25 files changed, 1 insertion(+), 1016 deletions(-) delete mode 100644 deploy/iso/minikube-iso/arch/aarch64/package/crio-bin-aarch64/Config.in delete mode 100644 deploy/iso/minikube-iso/arch/aarch64/package/crio-bin-aarch64/crio-bin.mk delete mode 100644 deploy/iso/minikube-iso/arch/aarch64/package/crio-bin-aarch64/crio.conf delete mode 100644 deploy/iso/minikube-iso/arch/x86_64/package/crio-bin/02-crio.conf delete mode 100755 deploy/iso/minikube-iso/arch/x86_64/package/crio-bin/conmon-config.h delete mode 100644 deploy/iso/minikube-iso/arch/x86_64/package/crio-bin/crio-bin.hash delete mode 100644 deploy/iso/minikube-iso/arch/x86_64/package/crio-bin/crio-wipe.service delete mode 100644 deploy/iso/minikube-iso/arch/x86_64/package/crio-bin/crio.conf.default delete mode 100644 deploy/iso/minikube-iso/arch/x86_64/package/crio-bin/crio.service delete mode 100644 deploy/iso/minikube-iso/arch/x86_64/package/crio-bin/policy.json delete mode 100644 deploy/iso/minikube-iso/arch/x86_64/package/crio-bin/registries.conf rename deploy/iso/minikube-iso/{arch/aarch64/package/crio-bin-aarch64 => package/crio-bin}/02-crio.conf (100%) rename deploy/iso/minikube-iso/{arch/x86_64 => }/package/crio-bin/Config.in (96%) rename deploy/iso/minikube-iso/{arch/aarch64/package/crio-bin-aarch64 => package/crio-bin}/conmon-config.h (100%) rename deploy/iso/minikube-iso/{arch/aarch64/package/crio-bin-aarch64 => package/crio-bin}/crio-bin.hash (100%) rename deploy/iso/minikube-iso/{arch/x86_64 => }/package/crio-bin/crio-bin.mk (100%) rename deploy/iso/minikube-iso/{arch/aarch64/package/crio-bin-aarch64 => package/crio-bin}/crio-wipe.service (100%) rename deploy/iso/minikube-iso/{arch/x86_64 => }/package/crio-bin/crio.conf (100%) rename deploy/iso/minikube-iso/{arch/aarch64/package/crio-bin-aarch64 => package/crio-bin}/crio.conf.default (100%) rename deploy/iso/minikube-iso/{arch/aarch64/package/crio-bin-aarch64 => package/crio-bin}/crio.service (100%) rename deploy/iso/minikube-iso/{arch/aarch64/package/crio-bin-aarch64 => package/crio-bin}/policy.json (100%) rename deploy/iso/minikube-iso/{arch/aarch64/package/crio-bin-aarch64 => package/crio-bin}/registries.conf (100%) diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/Config.in b/deploy/iso/minikube-iso/arch/aarch64/package/Config.in index 784bb1155c..9fb1a28d80 100644 --- a/deploy/iso/minikube-iso/arch/aarch64/package/Config.in +++ b/deploy/iso/minikube-iso/arch/aarch64/package/Config.in @@ -1,7 +1,6 @@ menu "System tools aarch64" source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/buildkit-bin-aarch64/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/runc-master-aarch64/Config.in" - source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/crio-bin-aarch64/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/crictl-bin-aarch64/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/docker-bin-aarch64/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/cri-dockerd-aarch64/Config.in" diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/crio-bin-aarch64/Config.in b/deploy/iso/minikube-iso/arch/aarch64/package/crio-bin-aarch64/Config.in deleted file mode 100644 index 604df2cb40..0000000000 --- a/deploy/iso/minikube-iso/arch/aarch64/package/crio-bin-aarch64/Config.in +++ /dev/null @@ -1,20 +0,0 @@ -config BR2_PACKAGE_CRIO_BIN_AARCH64 - bool "crio-bin" - default y - depends on BR2_aarch64 - depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS - depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_USE_MMU # lvm2 - depends on !BR2_STATIC_LIBS # lvm2 - depends on !BR2_TOOLCHAIN_USES_MUSL # lvm2 - select BR2_PACKAGE_RUNC_MASTER - select BR2_PACKAGE_CRUN - select BR2_PACKAGE_CONMON - select BR2_PACKAGE_BTRFS_PROGS - select BR2_PACKAGE_LIBSECCOMP - select BR2_PACKAGE_LIBGPGME - select BR2_PACKAGE_LVM2 - select BR2_PACKAGE_LVM2_APP_LIBRARY - select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT - select BR2_PACKAGE_LIBGLIB2 diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/crio-bin-aarch64/crio-bin.mk b/deploy/iso/minikube-iso/arch/aarch64/package/crio-bin-aarch64/crio-bin.mk deleted file mode 100644 index 7348fbab4a..0000000000 --- a/deploy/iso/minikube-iso/arch/aarch64/package/crio-bin-aarch64/crio-bin.mk +++ /dev/null @@ -1,79 +0,0 @@ -################################################################################ -# -# cri-o -# -################################################################################ - -CRIO_BIN_AARCH64_VERSION = v1.22.3 -CRIO_BIN_AARCH64_COMMIT = d93b2dfb8d0f2ad0f8b9061d941e3b216baa5814 -CRIO_BIN_AARCH64_SITE = https://github.com/cri-o/cri-o/archive -CRIO_BIN_AARCH64_SOURCE = $(CRIO_BIN_AARCH64_VERSION).tar.gz -CRIO_BIN_AARCH64_DEPENDENCIES = host-go libgpgme -CRIO_BIN_AARCH64_GOPATH = $(@D)/_output -CRIO_BIN_AARCH64_ENV = \ - $(GO_TARGET_ENV) \ - CGO_ENABLED=1 \ - GO111MODULE=off \ - GOPATH="$(CRIO_BIN_AARCH64_GOPATH)" \ - PATH=$(CRIO_BIN_AARCH64_GOPATH)/bin:$(BR_PATH) \ - GOARCH=arm64 - - -define CRIO_BIN_AARCH64_USERS - - -1 crio-admin -1 - - - - - - - -1 crio -1 - - - - - -endef - -define CRIO_BIN_AARCH64_CONFIGURE_CMDS - mkdir -p $(CRIO_BIN_AARCH64_GOPATH)/src/github.com/cri-o - ln -sf $(@D) $(CRIO_BIN_AARCH64_GOPATH)/src/github.com/cri-o/cri-o - # disable the "automatic" go module detection - sed -e 's/go help mod/false/' -i $(@D)/Makefile -endef - -define CRIO_BIN_AARCH64_BUILD_CMDS - mkdir -p $(@D)/bin - $(CRIO_BIN_AARCH64_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) COMMIT_NO=$(CRIO_BIN_AARCH64_COMMIT) PREFIX=/usr binaries -endef - -define CRIO_BIN_AARCH64_INSTALL_TARGET_CMDS - mkdir -p $(TARGET_DIR)/usr/share/containers/oci/hooks.d - mkdir -p $(TARGET_DIR)/etc/containers/oci/hooks.d - mkdir -p $(TARGET_DIR)/etc/crio/crio.conf.d - - $(INSTALL) -Dm755 \ - $(@D)/bin/crio \ - $(TARGET_DIR)/usr/bin/crio - $(INSTALL) -Dm755 \ - $(@D)/bin/pinns \ - $(TARGET_DIR)/usr/bin/pinns - $(INSTALL) -Dm644 \ - $(CRIO_BIN_AARCH64_PKGDIR)/crio.conf \ - $(TARGET_DIR)/etc/crio/crio.conf - $(INSTALL) -Dm644 \ - $(CRIO_BIN_AARCH64_PKGDIR)/policy.json \ - $(TARGET_DIR)/etc/containers/policy.json - $(INSTALL) -Dm644 \ - $(CRIO_BIN_AARCH64_PKGDIR)/registries.conf \ - $(TARGET_DIR)/etc/containers/registries.conf - $(INSTALL) -Dm644 \ - $(CRIO_BIN_AARCH64_PKGDIR)/02-crio.conf \ - $(TARGET_DIR)/etc/crio/crio.conf.d/02-crio.conf - - mkdir -p $(TARGET_DIR)/etc/sysconfig - echo 'CRIO_OPTIONS="--log-level=debug"' > $(TARGET_DIR)/etc/sysconfig/crio -endef - -define CRIO_BIN_AARCH64_INSTALL_INIT_SYSTEMD - $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) install.systemd DESTDIR=$(TARGET_DIR) PREFIX=$(TARGET_DIR)/usr - $(INSTALL) -Dm644 \ - $(CRIO_BIN_AARCH64_PKGDIR)/crio.service \ - $(TARGET_DIR)/usr/lib/systemd/system/crio.service - $(INSTALL) -Dm644 \ - $(CRIO_BIN_AARCH64_PKGDIR)/crio-wipe.service \ - $(TARGET_DIR)/usr/lib/systemd/system/crio-wipe.service - $(call link-service,crio.service) - $(call link-service,crio-shutdown.service) -endef - -$(eval $(generic-package)) diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/crio-bin-aarch64/crio.conf b/deploy/iso/minikube-iso/arch/aarch64/package/crio-bin-aarch64/crio.conf deleted file mode 100644 index 1aab1688e3..0000000000 --- a/deploy/iso/minikube-iso/arch/aarch64/package/crio-bin-aarch64/crio.conf +++ /dev/null @@ -1,400 +0,0 @@ -# The CRI-O configuration file specifies all of the available configuration -# options and command-line flags for the crio(8) OCI Kubernetes Container Runtime -# daemon, but in a TOML format that can be more easily modified and versioned. -# -# Please refer to crio.conf(5) for details of all configuration options. - -# CRI-O supports partial configuration reload during runtime, which can be -# done by sending SIGHUP to the running process. Currently supported options -# are explicitly mentioned with: 'This option supports live configuration -# reload'. - -# CRI-O reads its storage defaults from the containers-storage.conf(5) file -# located at /etc/containers/storage.conf. Modify this storage configuration if -# you want to change the system's defaults. If you want to modify storage just -# for CRI-O, you can change the storage configuration options here. -[crio] - -# Path to the "root directory". CRI-O stores all of its data, including -# containers images, in this directory. -root = "/var/lib/containers/storage" - -# Path to the "run directory". CRI-O stores all of its state in this directory. -runroot = "/var/run/containers/storage" - -# Storage driver used to manage the storage of images and containers. Please -# refer to containers-storage.conf(5) to see all available storage drivers. -storage_driver = "overlay" - -# List to pass options to the storage driver. Please refer to -# containers-storage.conf(5) to see all available storage options. -#storage_option = [ -# "overlay.mountopt=nodev,metacopy=on", -#] - -# The default log directory where all logs will go unless directly specified by -# the kubelet. The log directory specified must be an absolute directory. -log_dir = "/var/log/crio/pods" - -# Location for CRI-O to lay down the temporary version file. -# It is used to check if crio wipe should wipe containers, which should -# always happen on a node reboot -version_file = "/var/run/crio/version" - -# Location for CRI-O to lay down the persistent version file. -# It is used to check if crio wipe should wipe images, which should -# only happen when CRI-O has been upgraded -version_file_persist = "/var/lib/crio/version" - -# The crio.api table contains settings for the kubelet/gRPC interface. -[crio.api] - -# Path to AF_LOCAL socket on which CRI-O will listen. -listen = "/var/run/crio/crio.sock" - -# IP address on which the stream server will listen. -stream_address = "127.0.0.1" - -# The port on which the stream server will listen. If the port is set to "0", then -# CRI-O will allocate a random free port number. -stream_port = "0" - -# Enable encrypted TLS transport of the stream server. -stream_enable_tls = false - -# Path to the x509 certificate file used to serve the encrypted stream. This -# file can change, and CRI-O will automatically pick up the changes within 5 -# minutes. -stream_tls_cert = "" - -# Path to the key file used to serve the encrypted stream. This file can -# change and CRI-O will automatically pick up the changes within 5 minutes. -stream_tls_key = "" - -# Path to the x509 CA(s) file used to verify and authenticate client -# communication with the encrypted stream. This file can change and CRI-O will -# automatically pick up the changes within 5 minutes. -stream_tls_ca = "" - -# Maximum grpc send message size in bytes. If not set or <=0, then CRI-O will default to 16 * 1024 * 1024. -grpc_max_send_msg_size = 16777216 - -# Maximum grpc receive message size. If not set or <= 0, then CRI-O will default to 16 * 1024 * 1024. -grpc_max_recv_msg_size = 16777216 - -# The crio.runtime table contains settings pertaining to the OCI runtime used -# and options for how to set up and manage the OCI runtime. -[crio.runtime] - -# A list of ulimits to be set in containers by default, specified as -# "=:", for example: -# "nofile=1024:2048" -# If nothing is set here, settings will be inherited from the CRI-O daemon -#default_ulimits = [ -#] - -# If true, the runtime will not use pivot_root, but instead use MS_MOVE. -no_pivot = false - -# decryption_keys_path is the path where the keys required for -# image decryption are stored. This option supports live configuration reload. -decryption_keys_path = "/etc/crio/keys/" - -# Path to the conmon binary, used for monitoring the OCI runtime. -# Will be searched for using $PATH if empty. -conmon = "/usr/libexec/crio/conmon" - -# Cgroup setting for conmon -conmon_cgroup = "system.slice" - -# Environment variable list for the conmon process, used for passing necessary -# environment variables to conmon or the runtime. -conmon_env = [ - "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin", -] - -# Additional environment variables to set for all the -# containers. These are overridden if set in the -# container image spec or in the container runtime configuration. -default_env = [ -] - -# If true, SELinux will be used for pod separation on the host. -selinux = false - -# Path to the seccomp.json profile which is used as the default seccomp profile -# for the runtime. If not specified, then the internal default seccomp profile -# will be used. This option supports live configuration reload. -seccomp_profile = "" - -# Changes the meaning of an empty seccomp profile. By default -# (and according to CRI spec), an empty profile means unconfined. -# This option tells CRI-O to treat an empty profile as the default profile, -# which might increase security. -seccomp_use_default_when_empty = false - -# Used to change the name of the default AppArmor profile of CRI-O. The default -# profile name is "crio-default". This profile only takes effect if the user -# does not specify a profile via the Kubernetes Pod's metadata annotation. If -# the profile is set to "unconfined", then this equals to disabling AppArmor. -# This option supports live configuration reload. -apparmor_profile = "crio-default" - -# Cgroup management implementation used for the runtime. -cgroup_manager = "systemd" - -# Specify whether the image pull must be performed in a separate cgroup. -separate_pull_cgroup = "" - -# List of default capabilities for containers. If it is empty or commented out, -# only the capabilities defined in the containers json file by the user/kube -# will be added. -default_capabilities = [ - "CHOWN", - "DAC_OVERRIDE", - "FSETID", - "FOWNER", - "SETGID", - "SETUID", - "SETPCAP", - "NET_BIND_SERVICE", - "KILL", -] - -# List of default sysctls. If it is empty or commented out, only the sysctls -# defined in the container json file by the user/kube will be added. -default_sysctls = [ -] - -# List of additional devices. specified as -# "::", for example: "--device=/dev/sdc:/dev/xvdc:rwm". -#If it is empty or commented out, only the devices -# defined in the container json file by the user/kube will be added. -additional_devices = [ -] - -# Path to OCI hooks directories for automatically executed hooks. If one of the -# directories does not exist, then CRI-O will automatically skip them. -hooks_dir = [ - "/usr/share/containers/oci/hooks.d", -] - -# Path to the file specifying the defaults mounts for each container. The -# format of the config is /SRC:/DST, one mount per line. Notice that CRI-O reads -# its default mounts from the following two files: -# -# 1) /etc/containers/mounts.conf (i.e., default_mounts_file): This is the -# override file, where users can either add in their own default mounts, or -# override the default mounts shipped with the package. -# -# 2) /usr/share/containers/mounts.conf: This is the default file read for -# mounts. If you want CRI-O to read from a different, specific mounts file, -# you can change the default_mounts_file. Note, if this is done, CRI-O will -# only add mounts it finds in this file. -# -#default_mounts_file = "" - -# Maximum number of processes allowed in a container. -pids_limit = 1024 - -# Maximum sized allowed for the container log file. Negative numbers indicate -# that no size limit is imposed. If it is positive, it must be >= 8192 to -# match/exceed conmon's read buffer. The file is truncated and re-opened so the -# limit is never exceeded. -log_size_max = -1 - -# Whether container output should be logged to journald in addition to the kuberentes log file -log_to_journald = false - -# Path to directory in which container exit files are written to by conmon. -container_exits_dir = "/var/run/crio/exits" - -# Path to directory for container attach sockets. -container_attach_socket_dir = "/var/run/crio" - -# The prefix to use for the source of the bind mounts. -bind_mount_prefix = "" - -# If set to true, all containers will run in read-only mode. -read_only = false - -# Changes the verbosity of the logs based on the level it is set to. Options -# are fatal, panic, error, warn, info, debug and trace. This option supports -# live configuration reload. -log_level = "info" - -# Filter the log messages by the provided regular expression. -# This option supports live configuration reload. -log_filter = "" - -# The UID mappings for the user namespace of each container. A range is -# specified in the form containerUID:HostUID:Size. Multiple ranges must be -# separated by comma. -uid_mappings = "" - -# The GID mappings for the user namespace of each container. A range is -# specified in the form containerGID:HostGID:Size. Multiple ranges must be -# separated by comma. -gid_mappings = "" - -# The minimal amount of time in seconds to wait before issuing a timeout -# regarding the proper termination of the container. The lowest possible -# value is 30s, whereas lower values are not considered by CRI-O. -ctr_stop_timeout = 30 - -# manage_ns_lifecycle determines whether we pin and remove namespaces -# and manage their lifecycle. -# This option is being deprecated, and will be unconditionally true in the future. -manage_ns_lifecycle = true - -# drop_infra_ctr determines whether CRI-O drops the infra container -# when a pod does not have a private PID namespace, and does not use -# a kernel separating runtime (like kata). -# It requires manage_ns_lifecycle to be true. -drop_infra_ctr = false - -# The directory where the state of the managed namespaces gets tracked. -# Only used when manage_ns_lifecycle is true. -namespaces_dir = "/var/run" - -# pinns_path is the path to find the pinns binary, which is needed to manage namespace lifecycle -pinns_path = "/usr/bin/pinns" - -# default_runtime is the _name_ of the OCI runtime to be used as the default. -# The name is matched against the runtimes map below. If this value is changed, -# the corresponding existing entry from the runtimes map below will be ignored. -default_runtime = "runc" - -# The "crio.runtime.runtimes" table defines a list of OCI compatible runtimes. -# The runtime to use is picked based on the runtime_handler provided by the CRI. -# If no runtime_handler is provided, the runtime will be picked based on the level -# of trust of the workload. Each entry in the table should follow the format: -# -#[crio.runtime.runtimes.runtime-handler] -# runtime_path = "/path/to/the/executable" -# runtime_type = "oci" -# runtime_root = "/path/to/the/root" -# privileged_without_host_devices = false -# allowed_annotations = [] -# Where: -# - runtime-handler: name used to identify the runtime -# - runtime_path (optional, string): absolute path to the runtime executable in -# the host filesystem. If omitted, the runtime-handler identifier should match -# the runtime executable name, and the runtime executable should be placed -# in $PATH. -# - runtime_type (optional, string): type of runtime, one of: "oci", "vm". If -# omitted, an "oci" runtime is assumed. -# - runtime_root (optional, string): root directory for storage of containers -# state. -# - privileged_without_host_devices (optional, bool): an option for restricting -# host devices from being passed to privileged containers. -# - allowed_annotations (optional, array of strings): an option for specifying -# a list of experimental annotations that this runtime handler is allowed to process. -# The currently recognized values are: -# "io.kubernetes.cri-o.userns-mode" for configuring a user namespace for the pod. -# "io.kubernetes.cri-o.Devices" for configuring devices for the pod. -# "io.kubernetes.cri-o.ShmSize" for configuring the size of /dev/shm. - - -[crio.runtime.runtimes.runc] -runtime_path = "/usr/bin/runc" -runtime_type = "oci" -runtime_root = "/run/runc" - - - - -# crun is a fast and lightweight fully featured OCI runtime and C library for -# running containers -#[crio.runtime.runtimes.crun] - -# Kata Containers is an OCI runtime, where containers are run inside lightweight -# VMs. Kata provides additional isolation towards the host, minimizing the host attack -# surface and mitigating the consequences of containers breakout. - -# Kata Containers with the default configured VMM -#[crio.runtime.runtimes.kata-runtime] - -# Kata Containers with the QEMU VMM -#[crio.runtime.runtimes.kata-qemu] - -# Kata Containers with the Firecracker VMM -#[crio.runtime.runtimes.kata-fc] - -# The crio.image table contains settings pertaining to the management of OCI images. -# -# CRI-O reads its configured registries defaults from the system wide -# containers-registries.conf(5) located in /etc/containers/registries.conf. If -# you want to modify just CRI-O, you can change the registries configuration in -# this file. Otherwise, leave insecure_registries and registries commented out to -# use the system's defaults from /etc/containers/registries.conf. -[crio.image] - -# Default transport for pulling images from a remote container storage. -default_transport = "docker://" - -# The path to a file containing credentials necessary for pulling images from -# secure registries. The file is similar to that of /var/lib/kubelet/config.json -global_auth_file = "" - -# The image used to instantiate infra containers. -# This option supports live configuration reload. -pause_image = "k8s.gcr.io/pause:3.2" - -# The path to a file containing credentials specific for pulling the pause_image from -# above. The file is similar to that of /var/lib/kubelet/config.json -# This option supports live configuration reload. -pause_image_auth_file = "" - -# The command to run to have a container stay in the paused state. -# When explicitly set to "", it will fallback to the entrypoint and command -# specified in the pause image. When commented out, it will fallback to the -# default: "/pause". This option supports live configuration reload. -pause_command = "/pause" - -# Path to the file which decides what sort of policy we use when deciding -# whether or not to trust an image that we've pulled. It is not recommended that -# this option be used, as the default behavior of using the system-wide default -# policy (i.e., /etc/containers/policy.json) is most often preferred. Please -# refer to containers-policy.json(5) for more details. -signature_policy = "" - -# List of registries to skip TLS verification for pulling images. Please -# consider configuring the registries via /etc/containers/registries.conf before -# changing them here. -#insecure_registries = "[]" - -# Controls how image volumes are handled. The valid values are mkdir, bind and -# ignore; the latter will ignore volumes entirely. -image_volumes = "mkdir" - -# Temporary directory to use for storing big files -big_files_temporary_dir = "" - -# The crio.network table containers settings pertaining to the management of -# CNI plugins. -[crio.network] - -# The default CNI network name to be selected. If not set or "", then -# CRI-O will pick-up the first one found in network_dir. -# cni_default_network = "" - -# Path to the directory where CNI configuration files are located. -network_dir = "/etc/cni/net.d/" - -# Paths to directories where CNI plugin binaries are located. -plugin_dirs = [ - "/opt/cni/bin/", -] - -# A necessary configuration for Prometheus based metrics retrieval -[crio.metrics] - -# Globally enable or disable metrics support. -enable_metrics = true - -# The port on which the metrics server will listen. -metrics_port = 9090 - -# Local socket path to bind the metrics server to -metrics_socket = "" diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/Config.in b/deploy/iso/minikube-iso/arch/x86_64/package/Config.in index 77cac7b279..6ec5a7e63b 100644 --- a/deploy/iso/minikube-iso/arch/x86_64/package/Config.in +++ b/deploy/iso/minikube-iso/arch/x86_64/package/Config.in @@ -1,7 +1,6 @@ menu "System tools x86_64" source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/buildkit-bin/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/runc-master/Config.in" - source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/crio-bin/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/crictl-bin/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/docker-bin/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/cri-dockerd/Config.in" diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/crio-bin/02-crio.conf b/deploy/iso/minikube-iso/arch/x86_64/package/crio-bin/02-crio.conf deleted file mode 100644 index cfeb6ed70b..0000000000 --- a/deploy/iso/minikube-iso/arch/x86_64/package/crio-bin/02-crio.conf +++ /dev/null @@ -1,8 +0,0 @@ -[crio.image] -# pause_image = "" - -[crio.network] -# cni_default_network = "" - -[crio.runtime] -# cgroup_manager = "" diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/crio-bin/conmon-config.h b/deploy/iso/minikube-iso/arch/x86_64/package/crio-bin/conmon-config.h deleted file mode 100755 index 1783492d0d..0000000000 --- a/deploy/iso/minikube-iso/arch/x86_64/package/crio-bin/conmon-config.h +++ /dev/null @@ -1,9 +0,0 @@ - -#if !defined(CONFIG_H) -#define CONFIG_H - -#define BUF_SIZE 8192 -#define STDIO_BUF_SIZE 8192 -#define DEFAULT_SOCKET_PATH "/var/run/crio" - -#endif // CONFIG_H diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/crio-bin/crio-bin.hash b/deploy/iso/minikube-iso/arch/x86_64/package/crio-bin/crio-bin.hash deleted file mode 100644 index 82c62806a8..0000000000 --- a/deploy/iso/minikube-iso/arch/x86_64/package/crio-bin/crio-bin.hash +++ /dev/null @@ -1,28 +0,0 @@ -sha256 d310d52706262009af886dbd3e8dcd09a339cdc3b57dc22a9121e6d6a87d2921 v1.8.4.tar.gz -sha256 9f79cee99e272c9cfc561ae31235d84d4da59fd5c8b3d3ab6623bf9a92d90c5a v1.10.0.tar.gz -sha256 09e53fd550f4f10108879131ee6b8ef1c367ce71a73dcf6350c4cc898751d8c1 v1.11.8.tar.gz -sha256 92588998dbb79002c38f65f84602b5659f0d0ef1cd36b1a568a2e40269b66816 v1.13.0.tar.gz -sha256 48e7cf64a757d62a3edf214e1b93b74d99f090ca924f956ede2494a260eab2db v1.13.1.tar.gz -sha256 7435c4745017f06c260973b049440d924efe65b0df008d14175dfb8f5e23b599 v1.14.0.tar.gz -sha256 1f6f72b1f89d4286b2d5b54a48f4d5ed4c0c01065d484635dcb343a706feb743 v1.14.1.tar.gz -sha256 f7041a92e2d3a4c341be8df58f1076ba57ecb5daa02b6c65e652530c5f242739 v1.15.0.tar.gz -sha256 6218a99877da9b9895e0088944731f5384803c15628d4b3c6b40ba1ddd39e052 v1.15.1.tar.gz -sha256 70d4c746fe207422c78420dc4239768f485eea639a38c993c02872ec6305dd1d v1.15.2.tar.gz -sha256 05f9614c4d5970b4662499b84c270b0ab953596ee863dcd09c9dc7a2d2f09789 v1.16.0.tar.gz -sha256 57e1ee990ef2d5af8b32c33a21b4998682608e3556dcf1d3349666f55e7d95b9 v1.16.1.tar.gz -sha256 23a797762e4544ee7c171ef138cfc1141a3f0acc2838d9965c2a58e53b16c3ae v1.17.0.tar.gz -sha256 7967e9218fdfb59d6005a9e19c1668469bc5566c2a35927cffe7de8656bb22c7 v1.17.1.tar.gz -sha256 336f5c275e260eaae8187e7250fb960441e8dc90615729354d3c04e699870982 v1.17.3.tar.gz -sha256 865ded95aceb3a33a391b252522682de6b37b39498704c490b3a321dbefaafcb v1.18.0.tar.gz -sha256 794ddc36c2a20fde91fc6cc2c6f02ebdaea85c69b51b67f3994090dbbdbc2a50 v1.18.1.tar.gz -sha256 25dc558fbabc987bd58c7eab5230121b258a7b0eb34a49dc6595f1c6f3969116 v1.18.2.tar.gz -sha256 d5c6442e3990938badc966cdd1eb9ebe2fc11345452c233aa0d87ca38fbeed81 v1.18.3.tar.gz -sha256 74a4e916acddc6cf47ab5752bdebb6732ce2c028505ef57b7edc21d2da9039b6 v1.18.4.tar.gz -sha256 fc8a8e61375e3ce30563eeb0fd6534c4f48fc20300a72e6ff51cc99cb2703516 v1.19.0.tar.gz -sha256 6165c5b8212ea03be2a465403177318bfe25a54c3e8d66d720344643913a0223 v1.19.1.tar.gz -sha256 76fd7543bc92d4364a11060f43a5131893a76c6e6e9d6de3a6bb6292c110b631 v1.20.0.tar.gz -sha256 36d9f4cf4966342e2d4099e44d8156c55c6a10745c67ce4f856aa9f6dcc2d9ba v1.20.2.tar.gz -sha256 bc53ea8977e252bd9812974c33ff654ee22076598e901464468c5c105a5ef773 v1.22.0.tar.gz -sha256 6e1c0e393cd16af907fabb24e4cc068e27c606c5f1071060d46efdcd29cb5c0d v1.22.1.tar.gz -sha256 34097a0f535aa79cf990aaee5d3ff6226663587b188cbee11089f120e7f869e4 v1.22.2.tar.gz -sha256 52836549cfa27a688659576be9266f4837357a6fa162b1d0a05fa8da62c724b3 v1.22.3.tar.gz diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/crio-bin/crio-wipe.service b/deploy/iso/minikube-iso/arch/x86_64/package/crio-bin/crio-wipe.service deleted file mode 100644 index 1389fa9e29..0000000000 --- a/deploy/iso/minikube-iso/arch/x86_64/package/crio-bin/crio-wipe.service +++ /dev/null @@ -1,20 +0,0 @@ -[Unit] -Description=CRI-O Auto Update Script -Before=crio.service -After=minikube-automount.service -Requires=minikube-automount.service -RequiresMountsFor=/var/lib/containers - -[Service] -EnvironmentFile=-/etc/sysconfig/crio -EnvironmentFile=-/etc/sysconfig/crio.minikube -EnvironmentFile=/var/run/minikube/env -ExecStart=/usr/bin/crio \ - $CRIO_OPTIONS \ - $CRIO_MINIKUBE_OPTIONS \ - wipe - -Type=oneshot - -[Install] -WantedBy=multi-user.target diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/crio-bin/crio.conf.default b/deploy/iso/minikube-iso/arch/x86_64/package/crio-bin/crio.conf.default deleted file mode 100644 index 25debfab9f..0000000000 --- a/deploy/iso/minikube-iso/arch/x86_64/package/crio-bin/crio.conf.default +++ /dev/null @@ -1,408 +0,0 @@ -# The CRI-O configuration file specifies all of the available configuration -# options and command-line flags for the crio(8) OCI Kubernetes Container Runtime -# daemon, but in a TOML format that can be more easily modified and versioned. -# -# Please refer to crio.conf(5) for details of all configuration options. - -# CRI-O supports partial configuration reload during runtime, which can be -# done by sending SIGHUP to the running process. Currently supported options -# are explicitly mentioned with: 'This option supports live configuration -# reload'. - -# CRI-O reads its storage defaults from the containers-storage.conf(5) file -# located at /etc/containers/storage.conf. Modify this storage configuration if -# you want to change the system's defaults. If you want to modify storage just -# for CRI-O, you can change the storage configuration options here. -[crio] - -# Path to the "root directory". CRI-O stores all of its data, including -# containers images, in this directory. -#root = "/var/lib/containers/storage" - -# Path to the "run directory". CRI-O stores all of its state in this directory. -#runroot = "/var/run/containers/storage" - -# Storage driver used to manage the storage of images and containers. Please -# refer to containers-storage.conf(5) to see all available storage drivers. -#storage_driver = "" - -# List to pass options to the storage driver. Please refer to -# containers-storage.conf(5) to see all available storage options. -#storage_option = [ -# "overlay.mountopt=nodev,metacopy=on", -#] - -# The default log directory where all logs will go unless directly specified by -# the kubelet. The log directory specified must be an absolute directory. -log_dir = "/var/log/crio/pods" - -# Location for CRI-O to lay down the temporary version file. -# It is used to check if crio wipe should wipe containers, which should -# always happen on a node reboot -version_file = "/var/run/crio/version" - -# Location for CRI-O to lay down the persistent version file. -# It is used to check if crio wipe should wipe images, which should -# only happen when CRI-O has been upgraded -version_file_persist = "/var/lib/crio/version" - -# The crio.api table contains settings for the kubelet/gRPC interface. -[crio.api] - -# Path to AF_LOCAL socket on which CRI-O will listen. -listen = "/var/run/crio/crio.sock" - -# IP address on which the stream server will listen. -stream_address = "127.0.0.1" - -# The port on which the stream server will listen. If the port is set to "0", then -# CRI-O will allocate a random free port number. -stream_port = "0" - -# Enable encrypted TLS transport of the stream server. -stream_enable_tls = false - -# Path to the x509 certificate file used to serve the encrypted stream. This -# file can change, and CRI-O will automatically pick up the changes within 5 -# minutes. -stream_tls_cert = "" - -# Path to the key file used to serve the encrypted stream. This file can -# change and CRI-O will automatically pick up the changes within 5 minutes. -stream_tls_key = "" - -# Path to the x509 CA(s) file used to verify and authenticate client -# communication with the encrypted stream. This file can change and CRI-O will -# automatically pick up the changes within 5 minutes. -stream_tls_ca = "" - -# Maximum grpc send message size in bytes. If not set or <=0, then CRI-O will default to 16 * 1024 * 1024. -grpc_max_send_msg_size = 16777216 - -# Maximum grpc receive message size. If not set or <= 0, then CRI-O will default to 16 * 1024 * 1024. -grpc_max_recv_msg_size = 16777216 - -# The crio.runtime table contains settings pertaining to the OCI runtime used -# and options for how to set up and manage the OCI runtime. -[crio.runtime] - -# A list of ulimits to be set in containers by default, specified as -# "=:", for example: -# "nofile=1024:2048" -# If nothing is set here, settings will be inherited from the CRI-O daemon -#default_ulimits = [ -#] - -# If true, the runtime will not use pivot_root, but instead use MS_MOVE. -no_pivot = false - -# decryption_keys_path is the path where the keys required for -# image decryption are stored. This option supports live configuration reload. -decryption_keys_path = "/etc/crio/keys/" - -# Path to the conmon binary, used for monitoring the OCI runtime. -# Will be searched for using $PATH if empty. -conmon = "" - -# Cgroup setting for conmon -conmon_cgroup = "system.slice" - -# Environment variable list for the conmon process, used for passing necessary -# environment variables to conmon or the runtime. -conmon_env = [ - "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin", -] - -# Additional environment variables to set for all the -# containers. These are overridden if set in the -# container image spec or in the container runtime configuration. -default_env = [ -] - -# If true, SELinux will be used for pod separation on the host. -selinux = false - -# Path to the seccomp.json profile which is used as the default seccomp profile -# for the runtime. If not specified, then the internal default seccomp profile -# will be used. This option supports live configuration reload. -seccomp_profile = "" - -# Changes the meaning of an empty seccomp profile. By default -# (and according to CRI spec), an empty profile means unconfined. -# This option tells CRI-O to treat an empty profile as the default profile, -# which might increase security. -seccomp_use_default_when_empty = false - -# Used to change the name of the default AppArmor profile of CRI-O. The default -# profile name is "crio-default". This profile only takes effect if the user -# does not specify a profile via the Kubernetes Pod's metadata annotation. If -# the profile is set to "unconfined", then this equals to disabling AppArmor. -# This option supports live configuration reload. -apparmor_profile = "crio-default" - -# Cgroup management implementation used for the runtime. -cgroup_manager = "systemd" - -# Specify whether the image pull must be performed in a separate cgroup. -separate_pull_cgroup = "" - -# List of default capabilities for containers. If it is empty or commented out, -# only the capabilities defined in the containers json file by the user/kube -# will be added. -default_capabilities = [ - "CHOWN", - "DAC_OVERRIDE", - "FSETID", - "FOWNER", - "SETGID", - "SETUID", - "SETPCAP", - "NET_BIND_SERVICE", - "KILL", -] - -# List of default sysctls. If it is empty or commented out, only the sysctls -# defined in the container json file by the user/kube will be added. -default_sysctls = [ -] - -# List of additional devices. specified as -# "::", for example: "--device=/dev/sdc:/dev/xvdc:rwm". -#If it is empty or commented out, only the devices -# defined in the container json file by the user/kube will be added. -additional_devices = [ -] - -# Path to OCI hooks directories for automatically executed hooks. If one of the -# directories does not exist, then CRI-O will automatically skip them. -hooks_dir = [ - "/usr/share/containers/oci/hooks.d", -] - -# Path to the file specifying the defaults mounts for each container. The -# format of the config is /SRC:/DST, one mount per line. Notice that CRI-O reads -# its default mounts from the following two files: -# -# 1) /etc/containers/mounts.conf (i.e., default_mounts_file): This is the -# override file, where users can either add in their own default mounts, or -# override the default mounts shipped with the package. -# -# 2) /usr/share/containers/mounts.conf: This is the default file read for -# mounts. If you want CRI-O to read from a different, specific mounts file, -# you can change the default_mounts_file. Note, if this is done, CRI-O will -# only add mounts it finds in this file. -# -#default_mounts_file = "" - -# Maximum number of processes allowed in a container. -pids_limit = 1024 - -# Maximum sized allowed for the container log file. Negative numbers indicate -# that no size limit is imposed. If it is positive, it must be >= 8192 to -# match/exceed conmon's read buffer. The file is truncated and re-opened so the -# limit is never exceeded. -log_size_max = -1 - -# Whether container output should be logged to journald in addition to the kuberentes log file -log_to_journald = false - -# Path to directory in which container exit files are written to by conmon. -container_exits_dir = "/var/run/crio/exits" - -# Path to directory for container attach sockets. -container_attach_socket_dir = "/var/run/crio" - -# The prefix to use for the source of the bind mounts. -bind_mount_prefix = "" - -# If set to true, all containers will run in read-only mode. -read_only = false - -# Changes the verbosity of the logs based on the level it is set to. Options -# are fatal, panic, error, warn, info, debug and trace. This option supports -# live configuration reload. -log_level = "info" - -# Filter the log messages by the provided regular expression. -# This option supports live configuration reload. -log_filter = "" - -# The UID mappings for the user namespace of each container. A range is -# specified in the form containerUID:HostUID:Size. Multiple ranges must be -# separated by comma. -uid_mappings = "" - -# The GID mappings for the user namespace of each container. A range is -# specified in the form containerGID:HostGID:Size. Multiple ranges must be -# separated by comma. -gid_mappings = "" - -# The minimal amount of time in seconds to wait before issuing a timeout -# regarding the proper termination of the container. The lowest possible -# value is 30s, whereas lower values are not considered by CRI-O. -ctr_stop_timeout = 30 - -# manage_ns_lifecycle determines whether we pin and remove namespaces -# and manage their lifecycle. -# This option is being deprecated, and will be unconditionally true in the future. -manage_ns_lifecycle = true - -# drop_infra_ctr determines whether CRI-O drops the infra container -# when a pod does not have a private PID namespace, and does not use -# a kernel separating runtime (like kata). -# It requires manage_ns_lifecycle to be true. -drop_infra_ctr = false - -# The directory where the state of the managed namespaces gets tracked. -# Only used when manage_ns_lifecycle is true. -namespaces_dir = "/var/run" - -# pinns_path is the path to find the pinns binary, which is needed to manage namespace lifecycle -pinns_path = "" - -# default_runtime is the _name_ of the OCI runtime to be used as the default. -# The name is matched against the runtimes map below. If this value is changed, -# the corresponding existing entry from the runtimes map below will be ignored. -default_runtime = "runc" - -# The "crio.runtime.runtimes" table defines a list of OCI compatible runtimes. -# The runtime to use is picked based on the runtime_handler provided by the CRI. -# If no runtime_handler is provided, the runtime will be picked based on the level -# of trust of the workload. Each entry in the table should follow the format: -# -#[crio.runtime.runtimes.runtime-handler] -# runtime_path = "/path/to/the/executable" -# runtime_type = "oci" -# runtime_root = "/path/to/the/root" -# privileged_without_host_devices = false -# allowed_annotations = [] -# Where: -# - runtime-handler: name used to identify the runtime -# - runtime_path (optional, string): absolute path to the runtime executable in -# the host filesystem. If omitted, the runtime-handler identifier should match -# the runtime executable name, and the runtime executable should be placed -# in $PATH. -# - runtime_type (optional, string): type of runtime, one of: "oci", "vm". If -# omitted, an "oci" runtime is assumed. -# - runtime_root (optional, string): root directory for storage of containers -# state. -# - privileged_without_host_devices (optional, bool): an option for restricting -# host devices from being passed to privileged containers. -# - allowed_annotations (optional, array of strings): an option for specifying -# a list of experimental annotations that this runtime handler is allowed to process. -# The currently recognized values are: -# "io.kubernetes.cri-o.userns-mode" for configuring a user namespace for the pod. -# "io.kubernetes.cri-o.Devices" for configuring devices for the pod. -# "io.kubernetes.cri-o.ShmSize" for configuring the size of /dev/shm. - - -[crio.runtime.runtimes.runc] -runtime_path = "" -runtime_type = "oci" -runtime_root = "/run/runc" - - - - -# crun is a fast and lightweight fully featured OCI runtime and C library for -# running containers -#[crio.runtime.runtimes.crun] - -# Kata Containers is an OCI runtime, where containers are run inside lightweight -# VMs. Kata provides additional isolation towards the host, minimizing the host attack -# surface and mitigating the consequences of containers breakout. - -# Kata Containers with the default configured VMM -#[crio.runtime.runtimes.kata-runtime] - -# Kata Containers with the QEMU VMM -#[crio.runtime.runtimes.kata-qemu] - -# Kata Containers with the Firecracker VMM -#[crio.runtime.runtimes.kata-fc] - -# The crio.image table contains settings pertaining to the management of OCI images. -# -# CRI-O reads its configured registries defaults from the system wide -# containers-registries.conf(5) located in /etc/containers/registries.conf. If -# you want to modify just CRI-O, you can change the registries configuration in -# this file. Otherwise, leave insecure_registries and registries commented out to -# use the system's defaults from /etc/containers/registries.conf. -[crio.image] - -# Default transport for pulling images from a remote container storage. -default_transport = "docker://" - -# The path to a file containing credentials necessary for pulling images from -# secure registries. The file is similar to that of /var/lib/kubelet/config.json -global_auth_file = "" - -# The image used to instantiate infra containers. -# This option supports live configuration reload. -pause_image = "k8s.gcr.io/pause:3.2" - -# The path to a file containing credentials specific for pulling the pause_image from -# above. The file is similar to that of /var/lib/kubelet/config.json -# This option supports live configuration reload. -pause_image_auth_file = "" - -# The command to run to have a container stay in the paused state. -# When explicitly set to "", it will fallback to the entrypoint and command -# specified in the pause image. When commented out, it will fallback to the -# default: "/pause". This option supports live configuration reload. -pause_command = "/pause" - -# Path to the file which decides what sort of policy we use when deciding -# whether or not to trust an image that we've pulled. It is not recommended that -# this option be used, as the default behavior of using the system-wide default -# policy (i.e., /etc/containers/policy.json) is most often preferred. Please -# refer to containers-policy.json(5) for more details. -signature_policy = "" - -# List of registries to skip TLS verification for pulling images. Please -# consider configuring the registries via /etc/containers/registries.conf before -# changing them here. -#insecure_registries = "[]" - -# Controls how image volumes are handled. The valid values are mkdir, bind and -# ignore; the latter will ignore volumes entirely. -image_volumes = "mkdir" - -# List of registries to be used when pulling an unqualified image (e.g., -# "alpine:latest"). By default, registries is set to "docker.io" for -# compatibility reasons. Depending on your workload and usecase you may add more -# registries (e.g., "quay.io", "registry.fedoraproject.org", -# "registry.opensuse.org", etc.). -#registries = [ -# ] - -# Temporary directory to use for storing big files -big_files_temporary_dir = "" - -# The crio.network table containers settings pertaining to the management of -# CNI plugins. -[crio.network] - -# The default CNI network name to be selected. If not set or "", then -# CRI-O will pick-up the first one found in network_dir. -# cni_default_network = "" - -# Path to the directory where CNI configuration files are located. -network_dir = "/etc/cni/net.d/" - -# Paths to directories where CNI plugin binaries are located. -plugin_dirs = [ - "/opt/cni/bin/", -] - -# A necessary configuration for Prometheus based metrics retrieval -[crio.metrics] - -# Globally enable or disable metrics support. -enable_metrics = false - -# The port on which the metrics server will listen. -metrics_port = 9090 - -# Local socket path to bind the metrics server to -metrics_socket = "" diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/crio-bin/crio.service b/deploy/iso/minikube-iso/arch/x86_64/package/crio-bin/crio.service deleted file mode 100644 index 30a794e597..0000000000 --- a/deploy/iso/minikube-iso/arch/x86_64/package/crio-bin/crio.service +++ /dev/null @@ -1,29 +0,0 @@ -[Unit] -Description=Container Runtime Interface for OCI (CRI-O) -Documentation=https://github.com/cri-o/cri-o -Wants=network-online.target -After=network-online.target minikube-automount.service -Requires=minikube-automount.service -After=crio-wipe.service -Requires=crio-wipe.service - -[Service] -Type=notify -EnvironmentFile=-/etc/sysconfig/crio -EnvironmentFile=-/etc/sysconfig/crio.minikube -EnvironmentFile=/var/run/minikube/env -Environment=GOTRACEBACK=crash -ExecStart=/usr/bin/crio \ - $CRIO_OPTIONS \ - $CRIO_MINIKUBE_OPTIONS -ExecReload=/bin/kill -s HUP $MAINPID -TasksMax=8192 -LimitNOFILE=1048576 -LimitNPROC=1048576 -LimitCORE=infinity -OOMScoreAdjust=-999 -TimeoutStartSec=0 -Restart=on-abnormal - -[Install] -WantedBy=multi-user.target diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/crio-bin/policy.json b/deploy/iso/minikube-iso/arch/x86_64/package/crio-bin/policy.json deleted file mode 100644 index 9333053f93..0000000000 --- a/deploy/iso/minikube-iso/arch/x86_64/package/crio-bin/policy.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "default": [ - { - "type": "insecureAcceptAnything" - } - ] -} diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/crio-bin/registries.conf b/deploy/iso/minikube-iso/arch/x86_64/package/crio-bin/registries.conf deleted file mode 100644 index 409f31d896..0000000000 --- a/deploy/iso/minikube-iso/arch/x86_64/package/crio-bin/registries.conf +++ /dev/null @@ -1,5 +0,0 @@ -[registries.search] -registries = ['docker.io'] - -[registries.insecure] -registries = [] diff --git a/deploy/iso/minikube-iso/package/Config.in b/deploy/iso/minikube-iso/package/Config.in index a728dca904..ae86fb3e26 100644 --- a/deploy/iso/minikube-iso/package/Config.in +++ b/deploy/iso/minikube-iso/package/Config.in @@ -1,5 +1,6 @@ menu "System tools" source "$BR2_EXTERNAL_MINIKUBE_PATH/package/conmon/Config.in" + source "$BR2_EXTERNAL_MINIKUBE_PATH/package/crio-bin/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/package/crun/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/package/automount/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/package/gluster/Config.in" diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/crio-bin-aarch64/02-crio.conf b/deploy/iso/minikube-iso/package/crio-bin/02-crio.conf similarity index 100% rename from deploy/iso/minikube-iso/arch/aarch64/package/crio-bin-aarch64/02-crio.conf rename to deploy/iso/minikube-iso/package/crio-bin/02-crio.conf diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/crio-bin/Config.in b/deploy/iso/minikube-iso/package/crio-bin/Config.in similarity index 96% rename from deploy/iso/minikube-iso/arch/x86_64/package/crio-bin/Config.in rename to deploy/iso/minikube-iso/package/crio-bin/Config.in index 68b666cdc5..a933e5cda8 100644 --- a/deploy/iso/minikube-iso/arch/x86_64/package/crio-bin/Config.in +++ b/deploy/iso/minikube-iso/package/crio-bin/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_CRIO_BIN bool "crio-bin" default y - depends on BR2_x86_64 depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS depends on BR2_TOOLCHAIN_HAS_THREADS diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/crio-bin-aarch64/conmon-config.h b/deploy/iso/minikube-iso/package/crio-bin/conmon-config.h similarity index 100% rename from deploy/iso/minikube-iso/arch/aarch64/package/crio-bin-aarch64/conmon-config.h rename to deploy/iso/minikube-iso/package/crio-bin/conmon-config.h diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/crio-bin-aarch64/crio-bin.hash b/deploy/iso/minikube-iso/package/crio-bin/crio-bin.hash similarity index 100% rename from deploy/iso/minikube-iso/arch/aarch64/package/crio-bin-aarch64/crio-bin.hash rename to deploy/iso/minikube-iso/package/crio-bin/crio-bin.hash diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/crio-bin/crio-bin.mk b/deploy/iso/minikube-iso/package/crio-bin/crio-bin.mk similarity index 100% rename from deploy/iso/minikube-iso/arch/x86_64/package/crio-bin/crio-bin.mk rename to deploy/iso/minikube-iso/package/crio-bin/crio-bin.mk diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/crio-bin-aarch64/crio-wipe.service b/deploy/iso/minikube-iso/package/crio-bin/crio-wipe.service similarity index 100% rename from deploy/iso/minikube-iso/arch/aarch64/package/crio-bin-aarch64/crio-wipe.service rename to deploy/iso/minikube-iso/package/crio-bin/crio-wipe.service diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/crio-bin/crio.conf b/deploy/iso/minikube-iso/package/crio-bin/crio.conf similarity index 100% rename from deploy/iso/minikube-iso/arch/x86_64/package/crio-bin/crio.conf rename to deploy/iso/minikube-iso/package/crio-bin/crio.conf diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/crio-bin-aarch64/crio.conf.default b/deploy/iso/minikube-iso/package/crio-bin/crio.conf.default similarity index 100% rename from deploy/iso/minikube-iso/arch/aarch64/package/crio-bin-aarch64/crio.conf.default rename to deploy/iso/minikube-iso/package/crio-bin/crio.conf.default diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/crio-bin-aarch64/crio.service b/deploy/iso/minikube-iso/package/crio-bin/crio.service similarity index 100% rename from deploy/iso/minikube-iso/arch/aarch64/package/crio-bin-aarch64/crio.service rename to deploy/iso/minikube-iso/package/crio-bin/crio.service diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/crio-bin-aarch64/policy.json b/deploy/iso/minikube-iso/package/crio-bin/policy.json similarity index 100% rename from deploy/iso/minikube-iso/arch/aarch64/package/crio-bin-aarch64/policy.json rename to deploy/iso/minikube-iso/package/crio-bin/policy.json diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/crio-bin-aarch64/registries.conf b/deploy/iso/minikube-iso/package/crio-bin/registries.conf similarity index 100% rename from deploy/iso/minikube-iso/arch/aarch64/package/crio-bin-aarch64/registries.conf rename to deploy/iso/minikube-iso/package/crio-bin/registries.conf From d1c261ee05ab845bb8ab990e686b7100784d5cf5 Mon Sep 17 00:00:00 2001 From: Sharif Elgamal Date: Tue, 31 May 2022 14:53:37 -0700 Subject: [PATCH 028/545] build cni the same way --- .../arch/aarch64/package/Config.in | 1 - .../aarch64/package/cni-aarch64/Config.in | 5 --- .../arch/aarch64/package/cni-aarch64/cni.mk | 45 ------------------- .../arch/x86_64/package/Config.in | 1 - .../arch/x86_64/package/cni/cni.hash | 6 --- deploy/iso/minikube-iso/package/Config.in | 1 + .../{arch/x86_64 => }/package/cni/Config.in | 1 - .../cni-aarch64 => package/cni}/cni.hash | 0 .../{arch/x86_64 => }/package/cni/cni.mk | 0 9 files changed, 1 insertion(+), 59 deletions(-) delete mode 100644 deploy/iso/minikube-iso/arch/aarch64/package/cni-aarch64/Config.in delete mode 100644 deploy/iso/minikube-iso/arch/aarch64/package/cni-aarch64/cni.mk delete mode 100644 deploy/iso/minikube-iso/arch/x86_64/package/cni/cni.hash rename deploy/iso/minikube-iso/{arch/x86_64 => }/package/cni/Config.in (81%) rename deploy/iso/minikube-iso/{arch/aarch64/package/cni-aarch64 => package/cni}/cni.hash (100%) rename deploy/iso/minikube-iso/{arch/x86_64 => }/package/cni/cni.mk (100%) diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/Config.in b/deploy/iso/minikube-iso/arch/aarch64/package/Config.in index 9fb1a28d80..3c1165eb42 100644 --- a/deploy/iso/minikube-iso/arch/aarch64/package/Config.in +++ b/deploy/iso/minikube-iso/arch/aarch64/package/Config.in @@ -4,7 +4,6 @@ menu "System tools aarch64" source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/crictl-bin-aarch64/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/docker-bin-aarch64/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/cri-dockerd-aarch64/Config.in" - source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/cni-aarch64/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/cni-plugins-aarch64/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/containerd-bin-aarch64/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/podman-aarch64/Config.in" diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/cni-aarch64/Config.in b/deploy/iso/minikube-iso/arch/aarch64/package/cni-aarch64/Config.in deleted file mode 100644 index 17fdabc16b..0000000000 --- a/deploy/iso/minikube-iso/arch/aarch64/package/cni-aarch64/Config.in +++ /dev/null @@ -1,5 +0,0 @@ -config BR2_PACKAGE_CNI_AARCH64 - bool "cni" - default y - depends on BR2_aarch64 - depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/cni-aarch64/cni.mk b/deploy/iso/minikube-iso/arch/aarch64/package/cni-aarch64/cni.mk deleted file mode 100644 index 5842a2f849..0000000000 --- a/deploy/iso/minikube-iso/arch/aarch64/package/cni-aarch64/cni.mk +++ /dev/null @@ -1,45 +0,0 @@ -################################################################################ -# -# cni -# -################################################################################ - -CNI_AARCH64_VERSION = v0.7.1 -CNI_AARCH64_SITE = https://github.com/containernetworking/cni/archive -CNI_AARCH64_SOURCE = $(CNI_AARCH64_VERSION).tar.gz -CNI_AARCH64_LICENSE = Apache-2.0 -CNI_AARCH64_LICENSE_FILES = LICENSE - -CNI_AARCH64_DEPENDENCIES = host-go - -CNI_AARCH64_GOPATH = $(@D)/_output -CNI_AARCH64_MAKE_ENV = \ - $(GO_TARGET_ENV) \ - CGO_ENABLED=0 \ - GO111MODULE=off \ - GOPATH="$(CNI_AARCH64_GOPATH)" \ - PATH=$(CNI_AARCH64_GOPATH)/bin:$(BR_PATH) \ - GOARCH=arm64 - -CNI_AARCH64_BUILDFLAGS = -a --ldflags '-extldflags \"-static\"' - -define CNI_AARCH64_CONFIGURE_CMDS - mkdir -p $(CNI_AARCH64_GOPATH)/src/github.com/containernetworking - ln -sf $(@D) $(CNI_AARCH64_GOPATH)/src/github.com/containernetworking/cni -endef - -define CNI_AARCH64_BUILD_CMDS - (cd $(@D); $(CNI_AARCH64_MAKE_ENV) go build -o bin/cnitool $(CNI_AARCH64_BUILDFLAGS) ./cnitool) -endef - -define CNI_AARCH64_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0755 \ - $(@D)/bin/cnitool \ - $(TARGET_DIR)/opt/cni/bin/cnitool - - ln -sf \ - ../../opt/cni/bin/cnitool \ - $(TARGET_DIR)/usr/bin/cnitool -endef - -$(eval $(generic-package)) diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/Config.in b/deploy/iso/minikube-iso/arch/x86_64/package/Config.in index 6ec5a7e63b..40f07e968d 100644 --- a/deploy/iso/minikube-iso/arch/x86_64/package/Config.in +++ b/deploy/iso/minikube-iso/arch/x86_64/package/Config.in @@ -4,7 +4,6 @@ menu "System tools x86_64" source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/crictl-bin/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/docker-bin/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/cri-dockerd/Config.in" - source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/cni/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/cni-plugins/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/containerd-bin/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/podman/Config.in" diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/cni/cni.hash b/deploy/iso/minikube-iso/arch/x86_64/package/cni/cni.hash deleted file mode 100644 index f8b1c8278f..0000000000 --- a/deploy/iso/minikube-iso/arch/x86_64/package/cni/cni.hash +++ /dev/null @@ -1,6 +0,0 @@ -sha256 b1ae09833a238c51161918a8849031efdb46cf0068ea5b752e362d9836e2af7d cni-v0.3.0.tgz -sha256 84c9a0a41b59211d560bef14bf3f53bb370156f9ac7762270b3848fed96e1be8 cni-v0.4.0.tgz -sha256 a7f84a742c8f3a95843b3cc636444742554a4853835649ec371a07c841daebab cni-amd64-v0.6.0.tgz -sha256 802f4a002b4eb774624a9dc1c859d3c9926eb2d862e66a673fc99cfc8bcd7494 v0.6.0.tar.gz -sha256 78d57477d6b0ab9dc4d75ce9f275302d2f379206b5326503e57d9c08b76484c1 v0.7.0.tar.gz -sha256 4517eabfd65aea2012dc48d057bf889a0a41ed9837387d95cd1e36c0dbddcfd4 v0.7.1.tar.gz diff --git a/deploy/iso/minikube-iso/package/Config.in b/deploy/iso/minikube-iso/package/Config.in index ae86fb3e26..c2d0bb6746 100644 --- a/deploy/iso/minikube-iso/package/Config.in +++ b/deploy/iso/minikube-iso/package/Config.in @@ -2,6 +2,7 @@ menu "System tools" source "$BR2_EXTERNAL_MINIKUBE_PATH/package/conmon/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/package/crio-bin/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/package/crun/Config.in" + source "$BR2_EXTERNAL_MINIKUBE_PATH/package/cni/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/package/automount/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/package/gluster/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/package/falco-module/Config.in" diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/cni/Config.in b/deploy/iso/minikube-iso/package/cni/Config.in similarity index 81% rename from deploy/iso/minikube-iso/arch/x86_64/package/cni/Config.in rename to deploy/iso/minikube-iso/package/cni/Config.in index b711219701..dd6c4fcd39 100644 --- a/deploy/iso/minikube-iso/arch/x86_64/package/cni/Config.in +++ b/deploy/iso/minikube-iso/package/cni/Config.in @@ -1,5 +1,4 @@ config BR2_PACKAGE_CNI bool "cni" default y - depends on BR2_x86_64 depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/cni-aarch64/cni.hash b/deploy/iso/minikube-iso/package/cni/cni.hash similarity index 100% rename from deploy/iso/minikube-iso/arch/aarch64/package/cni-aarch64/cni.hash rename to deploy/iso/minikube-iso/package/cni/cni.hash diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/cni/cni.mk b/deploy/iso/minikube-iso/package/cni/cni.mk similarity index 100% rename from deploy/iso/minikube-iso/arch/x86_64/package/cni/cni.mk rename to deploy/iso/minikube-iso/package/cni/cni.mk From 83f8b005b9b7c4fda19a8b07c1e685adb098a845 Mon Sep 17 00:00:00 2001 From: Sharif Elgamal Date: Tue, 31 May 2022 14:56:01 -0700 Subject: [PATCH 029/545] build cri-dockerd the same way --- .../arch/aarch64/package/Config.in | 1 - .../package/cri-dockerd-aarch64/Config.in | 8 --- .../cri-dockerd-aarch64/cri-dockerd.mk | 49 ------------------- .../arch/x86_64/package/Config.in | 1 - .../package/cri-dockerd/cri-dockerd.hash | 3 -- deploy/iso/minikube-iso/package/Config.in | 1 + .../x86_64 => }/package/cri-dockerd/Config.in | 1 - .../cri-dockerd}/cri-dockerd.hash | 0 .../package/cri-dockerd/cri-dockerd.mk | 0 9 files changed, 1 insertion(+), 63 deletions(-) delete mode 100644 deploy/iso/minikube-iso/arch/aarch64/package/cri-dockerd-aarch64/Config.in delete mode 100644 deploy/iso/minikube-iso/arch/aarch64/package/cri-dockerd-aarch64/cri-dockerd.mk delete mode 100644 deploy/iso/minikube-iso/arch/x86_64/package/cri-dockerd/cri-dockerd.hash rename deploy/iso/minikube-iso/{arch/x86_64 => }/package/cri-dockerd/Config.in (91%) rename deploy/iso/minikube-iso/{arch/aarch64/package/cri-dockerd-aarch64 => package/cri-dockerd}/cri-dockerd.hash (100%) rename deploy/iso/minikube-iso/{arch/x86_64 => }/package/cri-dockerd/cri-dockerd.mk (100%) diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/Config.in b/deploy/iso/minikube-iso/arch/aarch64/package/Config.in index 3c1165eb42..4032822f5a 100644 --- a/deploy/iso/minikube-iso/arch/aarch64/package/Config.in +++ b/deploy/iso/minikube-iso/arch/aarch64/package/Config.in @@ -3,7 +3,6 @@ menu "System tools aarch64" source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/runc-master-aarch64/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/crictl-bin-aarch64/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/docker-bin-aarch64/Config.in" - source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/cri-dockerd-aarch64/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/cni-plugins-aarch64/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/containerd-bin-aarch64/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/podman-aarch64/Config.in" diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/cri-dockerd-aarch64/Config.in b/deploy/iso/minikube-iso/arch/aarch64/package/cri-dockerd-aarch64/Config.in deleted file mode 100644 index ee257ae4f7..0000000000 --- a/deploy/iso/minikube-iso/arch/aarch64/package/cri-dockerd-aarch64/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_CRI_DOCKERD_AARCH64 - bool "cri-dockerd" - default y - depends on BR2_aarch64 - depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS - depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS - depends on BR2_TOOLCHAIN_HAS_THREADS - select BR2_PACKAGE_DOCKER_BIN diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/cri-dockerd-aarch64/cri-dockerd.mk b/deploy/iso/minikube-iso/arch/aarch64/package/cri-dockerd-aarch64/cri-dockerd.mk deleted file mode 100644 index 0ab94ba0e8..0000000000 --- a/deploy/iso/minikube-iso/arch/aarch64/package/cri-dockerd-aarch64/cri-dockerd.mk +++ /dev/null @@ -1,49 +0,0 @@ -################################################################################ -# -# cri-dockerd -# -################################################################################ - -# As of 2022-02-03 -CRI_DOCKERD_AARCH64_VER = 0.2.0 -CRI_DOCKERD_AARCH64_REV = a4d1895 -CRI_DOCKERD_AARCH64_VERSION = a4d1895a2659ea9974bd7528a706592ab8b74181 -CRI_DOCKERD_AARCH64_SITE = https://github.com/Mirantis/cri-dockerd/archive -CRI_DOCKERD_AARCH64_SOURCE = $(CRI_DOCKERD_AARCH64_VERSION).tar.gz - -CRI_DOCKERD_AARCH64_DEPENDENCIES = host-go - -CRI_DOCKERD_AARCH64_GOPATH = $(@D)/_output -CRI_DOCKERD_AARCH64_ENV = \ - $(GO_TARGET_ENV) \ - CGO_ENABLED=0 \ - GO111MODULE=on \ - GOPATH="$(CRI_DOCKERD_AARCH64_GOPATH)" \ - PATH=$(CRI_DOCKERD_AARCH64_GOPATH)/bin:$(BR_PATH) \ - GOARCH=arm64 - -CRI_DOCKERD_AARCH64_COMPILE_SRC = $(CRI_DOCKERD_AARCH64_GOPATH)/src/github.com/Mirantis/cri-dockerd -CRI_DOCKERD_AARCH64_BUILDFLAGS = "-ldflags '-X github.com/Mirantis/cri-dockerd/version.Version=$(CRI_DOCKERD_AARCH64_VER) -X github.com/Mirantis/cri-dockerd/version.GitCommit=$(CRI_DOCKERD_AARCH64_REV)'" - -# If https://github.com/Mirantis/cri-dockerd/blob/master/packaging/Makefile changes, then this will almost certainly need to change -# This uses the static make target at the top level Makefile, since that builds everything, then picks out the arm64 binary -define CRI_DOCKERD_AARCH64_BUILD_CMDS - $(CRI_DOCKERD_AARCH64_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) LDFLAGS=$(CRI_DOCKERD_AARCH64_BUILDFLAGS) GO_VERSION=$(GO_VERSION) -C $(@D) VERSION=$(CRI_DOCKERD_AARCH64_VER) REVISION=$(CRI_DOCKERD_AARCH64_REV) static -endef - -define CRI_DOCKERD_AARCH64_INSTALL_TARGET_CMDS - $(INSTALL) -Dm755 \ - $(@D)/packaging/static/build/arm/cri-dockerd/cri-dockerd \ - $(TARGET_DIR)/usr/bin/cri-dockerd -endef - -define CRI_DOCKERD_AARCH64_INSTALL_INIT_SYSTEMD - $(INSTALL) -Dm644 \ - $(@D)/packaging/systemd/cri-docker.service \ - $(TARGET_DIR)/usr/lib/systemd/system/cri-docker.service - $(INSTALL) -Dm644 \ - $(@D)/packaging/systemd/cri-docker.socket \ - $(TARGET_DIR)/usr/lib/systemd/system/cri-docker.socket -endef - -$(eval $(generic-package)) diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/Config.in b/deploy/iso/minikube-iso/arch/x86_64/package/Config.in index 40f07e968d..346abe596b 100644 --- a/deploy/iso/minikube-iso/arch/x86_64/package/Config.in +++ b/deploy/iso/minikube-iso/arch/x86_64/package/Config.in @@ -3,7 +3,6 @@ menu "System tools x86_64" source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/runc-master/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/crictl-bin/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/docker-bin/Config.in" - source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/cri-dockerd/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/cni-plugins/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/containerd-bin/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/podman/Config.in" diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/cri-dockerd/cri-dockerd.hash b/deploy/iso/minikube-iso/arch/x86_64/package/cri-dockerd/cri-dockerd.hash deleted file mode 100644 index 1693e1b9d4..0000000000 --- a/deploy/iso/minikube-iso/arch/x86_64/package/cri-dockerd/cri-dockerd.hash +++ /dev/null @@ -1,3 +0,0 @@ -sha256 4acd7605a0cb95a6ad50314d1f2497b92ee0f07382062d0c18a5434c1a3b9513 542e27dee12db61d6e96d2a83a20359474a5efa2.tar.gz -sha256 b2a082a8846ac74b8482ee6353d480cea0dec017bbec2b59b16e3f91efa2f5ca eb0c48ef49856f7d098ec005ddebcae197e08e49.tar.gz -sha256 ceb99430633f75f354c0e9fea1f3cf0e5138ac5ee3c2691a1a70811fd2feeeef a4d1895a2659ea9974bd7528a706592ab8b74181.tar.gz diff --git a/deploy/iso/minikube-iso/package/Config.in b/deploy/iso/minikube-iso/package/Config.in index c2d0bb6746..663e4d1c95 100644 --- a/deploy/iso/minikube-iso/package/Config.in +++ b/deploy/iso/minikube-iso/package/Config.in @@ -3,6 +3,7 @@ menu "System tools" source "$BR2_EXTERNAL_MINIKUBE_PATH/package/crio-bin/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/package/crun/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/package/cni/Config.in" + source "$BR2_EXTERNAL_MINIKUBE_PATH/package/cri-dockerd/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/package/automount/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/package/gluster/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/package/falco-module/Config.in" diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/cri-dockerd/Config.in b/deploy/iso/minikube-iso/package/cri-dockerd/Config.in similarity index 91% rename from deploy/iso/minikube-iso/arch/x86_64/package/cri-dockerd/Config.in rename to deploy/iso/minikube-iso/package/cri-dockerd/Config.in index 460971d045..57d2e21825 100644 --- a/deploy/iso/minikube-iso/arch/x86_64/package/cri-dockerd/Config.in +++ b/deploy/iso/minikube-iso/package/cri-dockerd/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_CRI_DOCKERD bool "cri-dockerd" default y - depends on BR2_x86_64 depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS depends on BR2_TOOLCHAIN_HAS_THREADS diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/cri-dockerd-aarch64/cri-dockerd.hash b/deploy/iso/minikube-iso/package/cri-dockerd/cri-dockerd.hash similarity index 100% rename from deploy/iso/minikube-iso/arch/aarch64/package/cri-dockerd-aarch64/cri-dockerd.hash rename to deploy/iso/minikube-iso/package/cri-dockerd/cri-dockerd.hash diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/cri-dockerd/cri-dockerd.mk b/deploy/iso/minikube-iso/package/cri-dockerd/cri-dockerd.mk similarity index 100% rename from deploy/iso/minikube-iso/arch/x86_64/package/cri-dockerd/cri-dockerd.mk rename to deploy/iso/minikube-iso/package/cri-dockerd/cri-dockerd.mk From a0c00f4810ac316d5787e1cb30ab05069c8a61ad Mon Sep 17 00:00:00 2001 From: Sharif Elgamal Date: Tue, 31 May 2022 14:58:54 -0700 Subject: [PATCH 030/545] build podman the same way --- .../arch/aarch64/package/Config.in | 1 - .../aarch64/package/podman-aarch64/Config.in | 12 ---- .../aarch64/package/podman-aarch64/podman.mk | 71 ------------------- .../arch/x86_64/package/Config.in | 1 - .../arch/x86_64/package/podman/override.conf | 4 -- .../arch/x86_64/package/podman/podman.conf | 1 - .../arch/x86_64/package/podman/podman.hash | 6 -- deploy/iso/minikube-iso/package/Config.in | 1 + deploy/iso/minikube-iso/package/cni/cni.mk | 1 - .../package/cri-dockerd/cri-dockerd.mk | 1 - .../x86_64 => }/package/podman/Config.in | 0 .../podman}/override.conf | 0 .../podman}/podman.conf | 0 .../podman}/podman.hash | 0 .../x86_64 => }/package/podman/podman.mk | 0 15 files changed, 1 insertion(+), 98 deletions(-) delete mode 100644 deploy/iso/minikube-iso/arch/aarch64/package/podman-aarch64/Config.in delete mode 100644 deploy/iso/minikube-iso/arch/aarch64/package/podman-aarch64/podman.mk delete mode 100644 deploy/iso/minikube-iso/arch/x86_64/package/podman/override.conf delete mode 100644 deploy/iso/minikube-iso/arch/x86_64/package/podman/podman.conf delete mode 100644 deploy/iso/minikube-iso/arch/x86_64/package/podman/podman.hash rename deploy/iso/minikube-iso/{arch/x86_64 => }/package/podman/Config.in (100%) rename deploy/iso/minikube-iso/{arch/aarch64/package/podman-aarch64 => package/podman}/override.conf (100%) rename deploy/iso/minikube-iso/{arch/aarch64/package/podman-aarch64 => package/podman}/podman.conf (100%) rename deploy/iso/minikube-iso/{arch/aarch64/package/podman-aarch64 => package/podman}/podman.hash (100%) rename deploy/iso/minikube-iso/{arch/x86_64 => }/package/podman/podman.mk (100%) diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/Config.in b/deploy/iso/minikube-iso/arch/aarch64/package/Config.in index 4032822f5a..0a9522067e 100644 --- a/deploy/iso/minikube-iso/arch/aarch64/package/Config.in +++ b/deploy/iso/minikube-iso/arch/aarch64/package/Config.in @@ -5,5 +5,4 @@ menu "System tools aarch64" source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/docker-bin-aarch64/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/cni-plugins-aarch64/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/containerd-bin-aarch64/Config.in" - source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/podman-aarch64/Config.in" endmenu diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/podman-aarch64/Config.in b/deploy/iso/minikube-iso/arch/aarch64/package/podman-aarch64/Config.in deleted file mode 100644 index 8358742471..0000000000 --- a/deploy/iso/minikube-iso/arch/aarch64/package/podman-aarch64/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -config BR2_PACKAGE_PODMAN_AARCH64 - bool "podman" - default y - depends on BR2_aarch64 - depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS - depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS - depends on BR2_TOOLCHAIN_HAS_THREADS - select BR2_PACKAGE_RUNC_MASTER - select BR2_PACKAGE_CRUN - select BR2_PACKAGE_CONMON - select BR2_PACKAGE_LIBSECCOMP - select BR2_PACKAGE_LIBGPGME diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/podman-aarch64/podman.mk b/deploy/iso/minikube-iso/arch/aarch64/package/podman-aarch64/podman.mk deleted file mode 100644 index e708873dac..0000000000 --- a/deploy/iso/minikube-iso/arch/aarch64/package/podman-aarch64/podman.mk +++ /dev/null @@ -1,71 +0,0 @@ -PODMAN_AARCH64_VERSION = v3.4.2 -PODMAN_AARCH64_COMMIT = 2ad1fd3555de12de34e20898cc2ef901f08fe5ed -PODMAN_AARCH64_SITE = https://github.com/containers/podman/archive -PODMAN_AARCH64_SOURCE = $(PODMAN_AARCH64_VERSION).tar.gz -PODMAN_AARCH64_LICENSE = Apache-2.0 -PODMAN_AARCH64_LICENSE_FILES = LICENSE - -PODMAN_AARCH64_DEPENDENCIES = host-go -ifeq ($(BR2_INIT_SYSTEMD),y) -# need libsystemd for journal -PODMAN_AARCH64_DEPENDENCIES += systemd -endif - -PODMAN_AARCH64_GOPATH = $(@D)/_output -PODMAN_AARCH64_BIN_ENV = \ - $(GO_TARGET_ENV) \ - CGO_ENABLED=1 \ - GOPATH="$(PODMAN_AARCH64_GOPATH)" \ - PATH=$(PODMAN_AARCH64_GOPATH)/bin:$(BR_PATH) \ - GOARCH=arm64 - - -define PODMAN_AARCH64_USERS - - -1 podman -1 - - - - - -endef - -define PODMAN_AARCH64_MOD_VENDOR_MAKEFILE - # "build flag -mod=vendor only valid when using modules" - sed -e 's|-mod=vendor ||' -i $(@D)/Makefile -endef - -PODMAN_AARCH64_POST_EXTRACT_HOOKS += PODMAN_AARCH64_MOD_VENDOR_MAKEFILE - -define PODMAN_AARCH64_CONFIGURE_CMDS - mkdir -p $(PODMAN_AARCH64_GOPATH) && mv $(@D)/vendor $(PODMAN_AARCH64_GOPATH)/src - - mkdir -p $(PODMAN_AARCH64_GOPATH)/src/github.com/containers - ln -sf $(@D) $(PODMAN_AARCH64_GOPATH)/src/github.com/containers/podman - - ln -sf $(@D) $(PODMAN_AARCH64_GOPATH)/src/github.com/containers/podman/v2 -endef - -define PODMAN_AARCH64_BUILD_CMDS - mkdir -p $(@D)/bin - $(PODMAN_AARCH64_BIN_ENV) CIRRUS_TAG=$(PODMAN_AARCH64_VERSION) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) GIT_COMMIT=$(PODMAN_AARCH64_COMMIT) PREFIX=/usr podman -endef - -define PODMAN_AARCH64_INSTALL_TARGET_CMDS - $(INSTALL) -Dm755 $(@D)/bin/podman $(TARGET_DIR)/usr/bin/podman - $(INSTALL) -d -m 755 $(TARGET_DIR)/etc/cni/net.d/ - $(INSTALL) -m 644 $(@D)/cni/87-podman-bridge.conflist $(TARGET_DIR)/etc/cni/net.d/87-podman-bridge.conflist -endef - -define PODMAN_AARCH64_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 644 \ - $(@D)/contrib/systemd/system/podman.service \ - $(TARGET_DIR)/usr/lib/systemd/system/podman.service - $(INSTALL) -D -m 644 \ - $(@D)/contrib/systemd/system/podman.socket \ - $(TARGET_DIR)/usr/lib/systemd/system/podman.socket - - # Allow running podman-remote as a user in the group "podman" - $(INSTALL) -D -m 644 \ - $(PODMAN_AARCH64_PKGDIR)/override.conf \ - $(TARGET_DIR)/usr/lib/systemd/system/podman.socket.d/override.conf - $(INSTALL) -D -m 644 \ - $(PODMAN_AARCH64_PKGDIR)/podman.conf \ - $(TARGET_DIR)/usr/lib/tmpfiles.d/podman.conf -endef - -$(eval $(generic-package)) diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/Config.in b/deploy/iso/minikube-iso/arch/x86_64/package/Config.in index 346abe596b..b5da5ebaa9 100644 --- a/deploy/iso/minikube-iso/arch/x86_64/package/Config.in +++ b/deploy/iso/minikube-iso/arch/x86_64/package/Config.in @@ -5,7 +5,6 @@ menu "System tools x86_64" source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/docker-bin/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/cni-plugins/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/containerd-bin/Config.in" - source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/podman/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/vbox-guest/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/hyperv-daemons/Config.in" endmenu diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/podman/override.conf b/deploy/iso/minikube-iso/arch/x86_64/package/podman/override.conf deleted file mode 100644 index b762370a4a..0000000000 --- a/deploy/iso/minikube-iso/arch/x86_64/package/podman/override.conf +++ /dev/null @@ -1,4 +0,0 @@ -[Socket] -SocketMode=0660 -SocketUser=root -SocketGroup=podman diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/podman/podman.conf b/deploy/iso/minikube-iso/arch/x86_64/package/podman/podman.conf deleted file mode 100644 index 8e31190ab8..0000000000 --- a/deploy/iso/minikube-iso/arch/x86_64/package/podman/podman.conf +++ /dev/null @@ -1 +0,0 @@ -d /run/podman 0770 root podman diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/podman/podman.hash b/deploy/iso/minikube-iso/arch/x86_64/package/podman/podman.hash deleted file mode 100644 index 27cdae3dfc..0000000000 --- a/deploy/iso/minikube-iso/arch/x86_64/package/podman/podman.hash +++ /dev/null @@ -1,6 +0,0 @@ -sha256 a16846fe076aaf2c9ea2e854c3baba9fb838d916be7fb4b5be332e6c92d907d4 v1.9.3.tar.gz -sha256 5ebaa6e0dbd7fd1863f70d2bc71dc8a94e195c3339c17e3cac4560c9ec5747f8 v2.1.1.tar.gz -sha256 ec5473e51fa28f29af323473fc484f742dc7df23d06d8ba9f217f13382893a71 v2.2.0.tar.gz -sha256 3212bad60d945c1169b27da03959f36d92d1d8964645c701a5a82a89118e96d1 v2.2.1.tar.gz -sha256 5a0d42e03d15e32c5c54a147da5ef1b8928ec00982ac9e3f1edc82c5e614b6d2 v3.1.2.tar.gz -sha256 b0c4f9a11eb500b1d440d5e51a6c0c632aa4ac458e2dc0362f50f999eb7fbf31 v3.4.2.tar.gz diff --git a/deploy/iso/minikube-iso/package/Config.in b/deploy/iso/minikube-iso/package/Config.in index 663e4d1c95..56b6bd1786 100644 --- a/deploy/iso/minikube-iso/package/Config.in +++ b/deploy/iso/minikube-iso/package/Config.in @@ -8,4 +8,5 @@ menu "System tools" source "$BR2_EXTERNAL_MINIKUBE_PATH/package/gluster/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/package/falco-module/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/package/scheduled-stop/Config.in" + source "$BR2_EXTERNAL_MINIKUBE_PATH/package/podman/Config.in" endmenu diff --git a/deploy/iso/minikube-iso/package/cni/cni.mk b/deploy/iso/minikube-iso/package/cni/cni.mk index 6e9aacd275..ad34064a7b 100644 --- a/deploy/iso/minikube-iso/package/cni/cni.mk +++ b/deploy/iso/minikube-iso/package/cni/cni.mk @@ -20,7 +20,6 @@ CNI_MAKE_ENV = \ GOPATH="$(CNI_GOPATH)" \ GOBIN="$(CNI_GOPATH)/bin" \ PATH=$(CNI_GOPATH)/bin:$(BR_PATH) \ - GOARCH=amd64 CNI_BUILDFLAGS = -a --ldflags '-extldflags \"-static\"' diff --git a/deploy/iso/minikube-iso/package/cri-dockerd/cri-dockerd.mk b/deploy/iso/minikube-iso/package/cri-dockerd/cri-dockerd.mk index f7a57a24b0..bbcddae26a 100644 --- a/deploy/iso/minikube-iso/package/cri-dockerd/cri-dockerd.mk +++ b/deploy/iso/minikube-iso/package/cri-dockerd/cri-dockerd.mk @@ -21,7 +21,6 @@ CRI_DOCKERD_ENV = \ GOPATH="$(CRI_DOCKERD_GOPATH)" \ GOBIN="$(CRI_DOCKERD_GOPATH)/bin" \ PATH=$(CRI_DOCKERD_GOPATH)/bin:$(BR_PATH) \ - GOARCH=amd64 CRI_DOCKERD_COMPILE_SRC = $(CRI_DOCKERD_GOPATH)/src/github.com/Mirantis/cri-dockerd CRI_DOCKERD_BUILDFLAGS = "-ldflags '-X github.com/Mirantis/cri-dockerd/version.Version=$(CRI_DOCKERD_VER) -X github.com/Mirantis/cri-dockerd/version.GitCommit=$(CRI_DOCKERD_REV)'" diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/podman/Config.in b/deploy/iso/minikube-iso/package/podman/Config.in similarity index 100% rename from deploy/iso/minikube-iso/arch/x86_64/package/podman/Config.in rename to deploy/iso/minikube-iso/package/podman/Config.in diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/podman-aarch64/override.conf b/deploy/iso/minikube-iso/package/podman/override.conf similarity index 100% rename from deploy/iso/minikube-iso/arch/aarch64/package/podman-aarch64/override.conf rename to deploy/iso/minikube-iso/package/podman/override.conf diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/podman-aarch64/podman.conf b/deploy/iso/minikube-iso/package/podman/podman.conf similarity index 100% rename from deploy/iso/minikube-iso/arch/aarch64/package/podman-aarch64/podman.conf rename to deploy/iso/minikube-iso/package/podman/podman.conf diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/podman-aarch64/podman.hash b/deploy/iso/minikube-iso/package/podman/podman.hash similarity index 100% rename from deploy/iso/minikube-iso/arch/aarch64/package/podman-aarch64/podman.hash rename to deploy/iso/minikube-iso/package/podman/podman.hash diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/podman/podman.mk b/deploy/iso/minikube-iso/package/podman/podman.mk similarity index 100% rename from deploy/iso/minikube-iso/arch/x86_64/package/podman/podman.mk rename to deploy/iso/minikube-iso/package/podman/podman.mk From e0ce53c41f9d58b50161e8f5c5a53ea5e2d91cb1 Mon Sep 17 00:00:00 2001 From: Sharif Elgamal Date: Tue, 31 May 2022 15:00:43 -0700 Subject: [PATCH 031/545] build runc the same way --- .../arch/aarch64/package/Config.in | 1 - .../package/runc-master-aarch64/Config.in | 18 -------- .../runc-master-aarch64/runc-master.mk | 45 ------------------- .../arch/x86_64/package/Config.in | 1 - .../package/runc-master/runc-master.hash | 16 ------- deploy/iso/minikube-iso/package/Config.in | 1 + .../x86_64 => }/package/runc-master/Config.in | 0 .../runc-master}/runc-master.hash | 0 .../package/runc-master/runc-master.mk | 0 9 files changed, 1 insertion(+), 81 deletions(-) delete mode 100644 deploy/iso/minikube-iso/arch/aarch64/package/runc-master-aarch64/Config.in delete mode 100644 deploy/iso/minikube-iso/arch/aarch64/package/runc-master-aarch64/runc-master.mk delete mode 100644 deploy/iso/minikube-iso/arch/x86_64/package/runc-master/runc-master.hash rename deploy/iso/minikube-iso/{arch/x86_64 => }/package/runc-master/Config.in (100%) rename deploy/iso/minikube-iso/{arch/aarch64/package/runc-master-aarch64 => package/runc-master}/runc-master.hash (100%) rename deploy/iso/minikube-iso/{arch/x86_64 => }/package/runc-master/runc-master.mk (100%) diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/Config.in b/deploy/iso/minikube-iso/arch/aarch64/package/Config.in index 0a9522067e..7d82e4feea 100644 --- a/deploy/iso/minikube-iso/arch/aarch64/package/Config.in +++ b/deploy/iso/minikube-iso/arch/aarch64/package/Config.in @@ -1,6 +1,5 @@ menu "System tools aarch64" source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/buildkit-bin-aarch64/Config.in" - source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/runc-master-aarch64/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/crictl-bin-aarch64/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/docker-bin-aarch64/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/cni-plugins-aarch64/Config.in" diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/runc-master-aarch64/Config.in b/deploy/iso/minikube-iso/arch/aarch64/package/runc-master-aarch64/Config.in deleted file mode 100644 index 8c1bf95cb0..0000000000 --- a/deploy/iso/minikube-iso/arch/aarch64/package/runc-master-aarch64/Config.in +++ /dev/null @@ -1,18 +0,0 @@ -config BR2_PACKAGE_RUNC_MASTER_AARCH64 - bool "runc-master" - default y - depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS - depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS - depends on BR2_TOOLCHAIN_HAS_THREADS - help - runC is a CLI tool for spawning and running containers - according to the OCP specification. - - This is just a newer build of runc than the buildroot version. - - https://github.com/opencontainers/runc - -comment "runc needs a toolchain w/ threads" - depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS && \ - BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS - depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/runc-master-aarch64/runc-master.mk b/deploy/iso/minikube-iso/arch/aarch64/package/runc-master-aarch64/runc-master.mk deleted file mode 100644 index eacfd46d42..0000000000 --- a/deploy/iso/minikube-iso/arch/aarch64/package/runc-master-aarch64/runc-master.mk +++ /dev/null @@ -1,45 +0,0 @@ -################################################################################ -# -# runc -# -################################################################################ - -# As of 2022-03-28, v1.1.1 -RUNC_MASTER_AARCH64_VERSION = 52de29d7e0f8c0899bd7efb8810dd07f0073fa87 -RUNC_MASTER_AARCH64_SITE = https://github.com/opencontainers/runc/archive -RUNC_MASTER_AARCH64_SOURCE = $(RUNC_MASTER_AARCH64_VERSION).tar.gz -RUNC_MASTER_AARCH64_LICENSE = Apache-2.0 -RUNC_MASTER_AARCH64_LICENSE_FILES = LICENSE - -RUNC_MASTER_AARCH64_DEPENDENCIES = host-go - -RUNC_MASTER_AARCH64_GOPATH = $(@D)/_output -RUNC_MASTER_AARCH64_MAKE_ENV = \ - $(GO_TARGET_ENV) \ - CGO_ENABLED=1 \ - GO111MODULE=off \ - GOPATH="$(RUNC_MASTER_AARCH64_GOPATH)" \ - PATH=$(RUNC_MASTER_AARCH64_GOPATH)/bin:$(BR_PATH) \ - GOARCH=arm64 - -RUNC_MASTER_AARCH64_COMPILE_SRC = $(RUNC_MASTER_AARCH64_GOPATH)/src/github.com/opencontainers/runc - -ifeq ($(BR2_PACKAGE_LIBSECCOMP),y) -RUNC_MASTER_AARCH64_GOTAGS += seccomp -RUNC_MASTER_AARCH64_DEPENDENCIES += libseccomp host-pkgconf -endif - -define RUNC_MASTER_AARCH64_CONFIGURE_CMDS - mkdir -p $(RUNC_MASTER_AARCH64_GOPATH)/src/github.com/opencontainers - ln -s $(@D) $(RUNC_MASTER_AARCH64_GOPATH)/src/github.com/opencontainers/runc -endef - -define RUNC_MASTER_AARCH64_BUILD_CMDS - PWD=$(RUNC_MASTER_AARCH64_COMPILE_SRC) $(RUNC_MASTER_AARCH64_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) BUILDTAGS="$(RUNC_MASTER_AARCH64_GOTAGS)" COMMIT_NO=$(RUNC_MASTER_AARCH64_VERSION) COMMIT=$(RUNC_MASTER_AARCH64_VERSION) PREFIX=/usr -endef - -define RUNC_MASTER_AARCH64_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0755 $(@D)/runc $(TARGET_DIR)/usr/bin/runc -endef - -$(eval $(generic-package)) diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/Config.in b/deploy/iso/minikube-iso/arch/x86_64/package/Config.in index b5da5ebaa9..ceea86d249 100644 --- a/deploy/iso/minikube-iso/arch/x86_64/package/Config.in +++ b/deploy/iso/minikube-iso/arch/x86_64/package/Config.in @@ -1,6 +1,5 @@ menu "System tools x86_64" source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/buildkit-bin/Config.in" - source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/runc-master/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/crictl-bin/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/docker-bin/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/cni-plugins/Config.in" diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/runc-master/runc-master.hash b/deploy/iso/minikube-iso/arch/x86_64/package/runc-master/runc-master.hash deleted file mode 100644 index fe79ecbc65..0000000000 --- a/deploy/iso/minikube-iso/arch/x86_64/package/runc-master/runc-master.hash +++ /dev/null @@ -1,16 +0,0 @@ -# Locally computed -sha256 fc780966c4d70c275a87930e93cda4210e63a490eabfb0fa5f2fe70be6dcdc58 0fdc908bf1ee7b7da85f9e5adbd1e256060f2486.tar.gz -sha256 9318fa9de6e3b2c89760f08d73bf718c97c93d683611716e024d2f3283c96d90 c1e454b2a1bfb0f0ebd9e621a1433f98f9a8d4b0.tar.gz -sha256 a960decadf6bd5d3cee1ca7b94455d37cc921c964061428bd9f3dd17a13c8bb3 6635b4f0c6af3810594d2770f662f34ddc15b40d.tar.gz -sha256 ad41ae930059fef18de1926cd78e00474c89290248fecdcc0e431c8aefee1deb 0a012df867a2d525f62a146d8ebdf2e6ab8a5ad5.tar.gz -sha256 e52c5d7365b2b9048f977bac8f06bf626dccb4d816d0947ec8523f543272f4ff 2b18fe1d885ee5083ef9f0838fee39b62d653e30.tar.gz -sha256 257ac2c2bbc9770998f31b73f587718848ebb09465ce2cd20fbac198ebd5726e 425e105d5a03fabd737a126ad93d62a9eeede87f.tar.gz -sha256 4ffe8323397d85dda7d5875fa6bdaf3f8c93592c1947dfa24a034719dc6f728e d736ef14f0288d6993a1845745d6756cfc9ddd5a.tar.gz -sha256 defe87a5f15edc54288d3261f5be28219b9b9d904d98c6020eb2e45400a04fb2 dc9208a3303feef5b3839f4323d9beb36df0a9dd.tar.gz -sha256 bfcbbcb12664d5f8c1b794f37a457a8db53291c82be5a3157d8efb91aab193bf ff819c7e9184c13b7c2607fe6c30ae19403a7aff.tar.gz -sha256 144973344b73627b5f69aa88b9e6655d692447ec317a0d5fa9777496a8ac186e 12644e614e25b05da6fd08a38ffa0cfe1903fdec.tar.gz -sha256 821ff8629329b4b7e4ccf24b5bf369c9739887736be30ba06a0d8053eb0e0b23 b9ee9c6314599f1b4a7f497e1f1f856fe433d3b7.tar.gz -sha256 50cc479cabf6e7edb9070a7c28b3460b0acc2a01650fc5934f5037cb96b9e2cf 4144b63817ebcc5b358fc2c8ef95f7cddd709aa7.tar.gz -sha256 1f47e3ff66cdcca1f890b15e74e884c4ff81d16d1044cc9900a1eb10cfb3d8e7 52b36a2dd837e8462de8e01458bf02cf9eea47dd.tar.gz -sha256 91525356b71fbf8e05deddc955d3f40e0d4aedcb15d26bdd2850a9986852ae5b f46b6ba2c9314cfc8caae24a32ec5fe9ef1059fe.tar.gz -sha256 49fbb25fda9fc416ec79a23e5382d504a8972a88247fe074f63ab71b6f38a0a0 52de29d7e0f8c0899bd7efb8810dd07f0073fa87.tar.gz diff --git a/deploy/iso/minikube-iso/package/Config.in b/deploy/iso/minikube-iso/package/Config.in index 56b6bd1786..317f31c94d 100644 --- a/deploy/iso/minikube-iso/package/Config.in +++ b/deploy/iso/minikube-iso/package/Config.in @@ -9,4 +9,5 @@ menu "System tools" source "$BR2_EXTERNAL_MINIKUBE_PATH/package/falco-module/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/package/scheduled-stop/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/package/podman/Config.in" + source "$BR2_EXTERNAL_MINIKUBE_PATH/package/runc-master/Config.in" endmenu diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/runc-master/Config.in b/deploy/iso/minikube-iso/package/runc-master/Config.in similarity index 100% rename from deploy/iso/minikube-iso/arch/x86_64/package/runc-master/Config.in rename to deploy/iso/minikube-iso/package/runc-master/Config.in diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/runc-master-aarch64/runc-master.hash b/deploy/iso/minikube-iso/package/runc-master/runc-master.hash similarity index 100% rename from deploy/iso/minikube-iso/arch/aarch64/package/runc-master-aarch64/runc-master.hash rename to deploy/iso/minikube-iso/package/runc-master/runc-master.hash diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/runc-master/runc-master.mk b/deploy/iso/minikube-iso/package/runc-master/runc-master.mk similarity index 100% rename from deploy/iso/minikube-iso/arch/x86_64/package/runc-master/runc-master.mk rename to deploy/iso/minikube-iso/package/runc-master/runc-master.mk From 7a0119d9cb90f592930b41eaa083d7fda697a150 Mon Sep 17 00:00:00 2001 From: Sharif Elgamal Date: Tue, 31 May 2022 15:04:54 -0700 Subject: [PATCH 032/545] select common packages for all arch --- deploy/iso/minikube-iso/package/podman/Config.in | 1 - deploy/iso/minikube-iso/package/runc-master/Config.in | 1 - 2 files changed, 2 deletions(-) diff --git a/deploy/iso/minikube-iso/package/podman/Config.in b/deploy/iso/minikube-iso/package/podman/Config.in index fbd71c5e13..db2942d134 100644 --- a/deploy/iso/minikube-iso/package/podman/Config.in +++ b/deploy/iso/minikube-iso/package/podman/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_PODMAN bool "podman" default y - depends on BR2_x86_64 depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS depends on BR2_TOOLCHAIN_HAS_THREADS diff --git a/deploy/iso/minikube-iso/package/runc-master/Config.in b/deploy/iso/minikube-iso/package/runc-master/Config.in index 7f085bc807..70b1caca28 100644 --- a/deploy/iso/minikube-iso/package/runc-master/Config.in +++ b/deploy/iso/minikube-iso/package/runc-master/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_RUNC_MASTER bool "runc-master" - depends on BR2_x86_64 depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS depends on BR2_TOOLCHAIN_HAS_THREADS From 9e78a3a817d4a9090208d1486316db872fb6294e Mon Sep 17 00:00:00 2001 From: Sharif Elgamal Date: Tue, 31 May 2022 17:32:36 -0700 Subject: [PATCH 033/545] dynamically supply GOARCH --- deploy/iso/minikube-iso/package/cni/cni.mk | 6 ++++++ .../iso/minikube-iso/package/cri-dockerd/cri-dockerd.mk | 6 ++++++ deploy/iso/minikube-iso/package/crio-bin/crio-bin.mk | 8 ++++++-- deploy/iso/minikube-iso/package/podman/podman.mk | 9 +++++++-- .../iso/minikube-iso/package/runc-master/runc-master.mk | 8 +++++++- 5 files changed, 32 insertions(+), 5 deletions(-) diff --git a/deploy/iso/minikube-iso/package/cni/cni.mk b/deploy/iso/minikube-iso/package/cni/cni.mk index ad34064a7b..a8eb1e9e3c 100644 --- a/deploy/iso/minikube-iso/package/cni/cni.mk +++ b/deploy/iso/minikube-iso/package/cni/cni.mk @@ -12,6 +12,11 @@ CNI_LICENSE_FILES = LICENSE CNI_DEPENDENCIES = host-go +CNI_GOARCH=amd64 +ifeq ($(BR2_aarch64),y) +CNI_GOARCH=arm64 +endif + CNI_GOPATH = $(@D)/_output CNI_MAKE_ENV = \ $(GO_TARGET_ENV) \ @@ -20,6 +25,7 @@ CNI_MAKE_ENV = \ GOPATH="$(CNI_GOPATH)" \ GOBIN="$(CNI_GOPATH)/bin" \ PATH=$(CNI_GOPATH)/bin:$(BR_PATH) \ + GOARCH=$(CNI_GOARCH) CNI_BUILDFLAGS = -a --ldflags '-extldflags \"-static\"' diff --git a/deploy/iso/minikube-iso/package/cri-dockerd/cri-dockerd.mk b/deploy/iso/minikube-iso/package/cri-dockerd/cri-dockerd.mk index bbcddae26a..c6908c282b 100644 --- a/deploy/iso/minikube-iso/package/cri-dockerd/cri-dockerd.mk +++ b/deploy/iso/minikube-iso/package/cri-dockerd/cri-dockerd.mk @@ -13,6 +13,11 @@ CRI_DOCKERD_SOURCE = $(CRI_DOCKERD_VERSION).tar.gz CRI_DOCKERD_DEPENDENCIES = host-go +CRI_DOCKERD_GOARCH=amd64 +ifeq ($(BR2_aarch64),y) +CRI_DOCKERD_GOARCH=arm64 +endif + CRI_DOCKERD_GOPATH = $(@D)/_output CRI_DOCKERD_ENV = \ $(GO_TARGET_ENV) \ @@ -21,6 +26,7 @@ CRI_DOCKERD_ENV = \ GOPATH="$(CRI_DOCKERD_GOPATH)" \ GOBIN="$(CRI_DOCKERD_GOPATH)/bin" \ PATH=$(CRI_DOCKERD_GOPATH)/bin:$(BR_PATH) \ + GOARCH=$(CRI_DOCKERD_GOARCH) CRI_DOCKERD_COMPILE_SRC = $(CRI_DOCKERD_GOPATH)/src/github.com/Mirantis/cri-dockerd CRI_DOCKERD_BUILDFLAGS = "-ldflags '-X github.com/Mirantis/cri-dockerd/version.Version=$(CRI_DOCKERD_VER) -X github.com/Mirantis/cri-dockerd/version.GitCommit=$(CRI_DOCKERD_REV)'" diff --git a/deploy/iso/minikube-iso/package/crio-bin/crio-bin.mk b/deploy/iso/minikube-iso/package/crio-bin/crio-bin.mk index 8d6bad04d6..dc66843c43 100644 --- a/deploy/iso/minikube-iso/package/crio-bin/crio-bin.mk +++ b/deploy/iso/minikube-iso/package/crio-bin/crio-bin.mk @@ -10,14 +10,18 @@ CRIO_BIN_SITE = https://github.com/cri-o/cri-o/archive CRIO_BIN_SOURCE = $(CRIO_BIN_VERSION).tar.gz CRIO_BIN_DEPENDENCIES = host-go libgpgme CRIO_BIN_GOPATH = $(@D)/_output +CRIO_BIN_GOARCH=amd64 +ifeq ($(BR2_aarch64),y) +CRIO_BIN_GOARCH=arm64 +endif CRIO_BIN_ENV = \ $(GO_TARGET_ENV) \ CGO_ENABLED=1 \ GO111MODULE=off \ GOPATH="$(CRIO_BIN_GOPATH)" \ GOBIN="$(CRIO_BIN_GOPATH)/bin" \ - PATH=$(CRIO_BIN_GOPATH)/bin:$(BR_PATH) - + PATH=$(CRIO_BIN_GOPATH)/bin:$(BR_PATH) \ + GOARCH=$(CRIO_BIN_GOARCH) define CRIO_BIN_USERS - -1 crio-admin -1 - - - - - diff --git a/deploy/iso/minikube-iso/package/podman/podman.mk b/deploy/iso/minikube-iso/package/podman/podman.mk index 5361066577..2be793e91e 100644 --- a/deploy/iso/minikube-iso/package/podman/podman.mk +++ b/deploy/iso/minikube-iso/package/podman/podman.mk @@ -11,14 +11,19 @@ ifeq ($(BR2_INIT_SYSTEMD),y) PODMAN_DEPENDENCIES += systemd endif +PODMAN_GOARCH=amd64 +ifeq ($(BR2_aarch64),y) +PODMAN_GOARCH=arm64 +endif + PODMAN_GOPATH = $(@D)/_output PODMAN_BIN_ENV = \ $(GO_TARGET_ENV) \ CGO_ENABLED=1 \ GOPATH="$(PODMAN_GOPATH)" \ GOBIN="$(PODMAN_GOPATH)/bin" \ - PATH=$(PODMAN_GOPATH)/bin:$(BR_PATH) - + PATH=$(PODMAN_GOPATH)/bin:$(BR_PATH) \ + GOARCH=$(PODMAN_GOARCH) define PODMAN_USERS - -1 podman -1 - - - - - diff --git a/deploy/iso/minikube-iso/package/runc-master/runc-master.mk b/deploy/iso/minikube-iso/package/runc-master/runc-master.mk index b183eb370e..d09652cc87 100644 --- a/deploy/iso/minikube-iso/package/runc-master/runc-master.mk +++ b/deploy/iso/minikube-iso/package/runc-master/runc-master.mk @@ -13,6 +13,11 @@ RUNC_MASTER_LICENSE_FILES = LICENSE RUNC_MASTER_DEPENDENCIES = host-go +RUNC_MASTER_GOARCH=amd64 +ifeq ($(BR2_aarch64),y) +RUNC_MASTER_GOARCH=arm64 +endif + RUNC_MASTER_GOPATH = $(@D)/_output RUNC_MASTER_MAKE_ENV = \ $(GO_TARGET_ENV) \ @@ -20,7 +25,8 @@ RUNC_MASTER_MAKE_ENV = \ GO111MODULE=off \ GOPATH="$(RUNC_MASTER_GOPATH)" \ GOBIN="$(RUNC_MASTER_GOPATH)/bin" \ - PATH=$(RUNC_MASTER_GOPATH)/bin:$(BR_PATH) + PATH=$(RUNC_MASTER_GOPATH)/bin:$(BR_PATH) \ + GOARCH=$(RUNC_MASTER_GOARCH) RUNC_MASTER_COMPILE_SRC = $(RUNC_MASTER_GOPATH)/src/github.com/opencontainers/runc From 4ba5162d01447d71a872c405fd781c259d509023 Mon Sep 17 00:00:00 2001 From: Sharif Elgamal Date: Tue, 31 May 2022 17:35:14 -0700 Subject: [PATCH 034/545] don't set GOBIN anymore --- deploy/iso/minikube-iso/package/cni/cni.mk | 1 - deploy/iso/minikube-iso/package/cri-dockerd/cri-dockerd.mk | 1 - deploy/iso/minikube-iso/package/crio-bin/crio-bin.mk | 1 - deploy/iso/minikube-iso/package/podman/podman.mk | 1 - deploy/iso/minikube-iso/package/runc-master/runc-master.mk | 1 - 5 files changed, 5 deletions(-) diff --git a/deploy/iso/minikube-iso/package/cni/cni.mk b/deploy/iso/minikube-iso/package/cni/cni.mk index a8eb1e9e3c..6e14ffd9a0 100644 --- a/deploy/iso/minikube-iso/package/cni/cni.mk +++ b/deploy/iso/minikube-iso/package/cni/cni.mk @@ -23,7 +23,6 @@ CNI_MAKE_ENV = \ CGO_ENABLED=0 \ GO111MODULE=off \ GOPATH="$(CNI_GOPATH)" \ - GOBIN="$(CNI_GOPATH)/bin" \ PATH=$(CNI_GOPATH)/bin:$(BR_PATH) \ GOARCH=$(CNI_GOARCH) diff --git a/deploy/iso/minikube-iso/package/cri-dockerd/cri-dockerd.mk b/deploy/iso/minikube-iso/package/cri-dockerd/cri-dockerd.mk index c6908c282b..f07dec38c7 100644 --- a/deploy/iso/minikube-iso/package/cri-dockerd/cri-dockerd.mk +++ b/deploy/iso/minikube-iso/package/cri-dockerd/cri-dockerd.mk @@ -24,7 +24,6 @@ CRI_DOCKERD_ENV = \ CGO_ENABLED=0 \ GO111MODULE=on \ GOPATH="$(CRI_DOCKERD_GOPATH)" \ - GOBIN="$(CRI_DOCKERD_GOPATH)/bin" \ PATH=$(CRI_DOCKERD_GOPATH)/bin:$(BR_PATH) \ GOARCH=$(CRI_DOCKERD_GOARCH) diff --git a/deploy/iso/minikube-iso/package/crio-bin/crio-bin.mk b/deploy/iso/minikube-iso/package/crio-bin/crio-bin.mk index dc66843c43..7e6c3b8679 100644 --- a/deploy/iso/minikube-iso/package/crio-bin/crio-bin.mk +++ b/deploy/iso/minikube-iso/package/crio-bin/crio-bin.mk @@ -19,7 +19,6 @@ CRIO_BIN_ENV = \ CGO_ENABLED=1 \ GO111MODULE=off \ GOPATH="$(CRIO_BIN_GOPATH)" \ - GOBIN="$(CRIO_BIN_GOPATH)/bin" \ PATH=$(CRIO_BIN_GOPATH)/bin:$(BR_PATH) \ GOARCH=$(CRIO_BIN_GOARCH) diff --git a/deploy/iso/minikube-iso/package/podman/podman.mk b/deploy/iso/minikube-iso/package/podman/podman.mk index 2be793e91e..8f1c29044c 100644 --- a/deploy/iso/minikube-iso/package/podman/podman.mk +++ b/deploy/iso/minikube-iso/package/podman/podman.mk @@ -21,7 +21,6 @@ PODMAN_BIN_ENV = \ $(GO_TARGET_ENV) \ CGO_ENABLED=1 \ GOPATH="$(PODMAN_GOPATH)" \ - GOBIN="$(PODMAN_GOPATH)/bin" \ PATH=$(PODMAN_GOPATH)/bin:$(BR_PATH) \ GOARCH=$(PODMAN_GOARCH) diff --git a/deploy/iso/minikube-iso/package/runc-master/runc-master.mk b/deploy/iso/minikube-iso/package/runc-master/runc-master.mk index d09652cc87..75ecfa9192 100644 --- a/deploy/iso/minikube-iso/package/runc-master/runc-master.mk +++ b/deploy/iso/minikube-iso/package/runc-master/runc-master.mk @@ -24,7 +24,6 @@ RUNC_MASTER_MAKE_ENV = \ CGO_ENABLED=1 \ GO111MODULE=off \ GOPATH="$(RUNC_MASTER_GOPATH)" \ - GOBIN="$(RUNC_MASTER_GOPATH)/bin" \ PATH=$(RUNC_MASTER_GOPATH)/bin:$(BR_PATH) \ GOARCH=$(RUNC_MASTER_GOARCH) From 2813810bbdaf2b91a45406724fce6184c60d5f30 Mon Sep 17 00:00:00 2001 From: simonren-tes Date: Wed, 1 Jun 2022 10:07:05 +0800 Subject: [PATCH 035/545] generate doc & opt option string --- cmd/minikube/cmd/tunnel.go | 2 +- site/content/en/docs/commands/tunnel.md | 3 ++- translations/de.json | 1 + translations/es.json | 1 + translations/fr.json | 1 + translations/ja.json | 1 + translations/ko.json | 1 + translations/pl.json | 1 + translations/ru.json | 1 + translations/strings.txt | 1 + translations/zh-CN.json | 1 + 11 files changed, 12 insertions(+), 2 deletions(-) diff --git a/cmd/minikube/cmd/tunnel.go b/cmd/minikube/cmd/tunnel.go index 734cd10c6c..4d53a45e71 100644 --- a/cmd/minikube/cmd/tunnel.go +++ b/cmd/minikube/cmd/tunnel.go @@ -120,5 +120,5 @@ func outputTunnelStarted() { func init() { tunnelCmd.Flags().BoolVarP(&cleanup, "cleanup", "c", true, "call with cleanup=true to remove old tunnels") - tunnelCmd.Flags().StringVar(&bindAddress, "bind-address", "", "set tunnel bind address, empty or `*' indicates that tunnel should be available for all interfaces") + tunnelCmd.Flags().StringVar(&bindAddress, "bind-address", "", "set tunnel bind address, empty or '*' indicates the tunnel should be available for all interfaces") } diff --git a/site/content/en/docs/commands/tunnel.md b/site/content/en/docs/commands/tunnel.md index 74198bb272..caea57de2c 100644 --- a/site/content/en/docs/commands/tunnel.md +++ b/site/content/en/docs/commands/tunnel.md @@ -20,7 +20,8 @@ minikube tunnel [flags] ### Options ``` - -c, --cleanup call with cleanup=true to remove old tunnels (default true) + --bind-address string set tunnel bind address, empty or '*' indicates the tunnel should be available for all interfaces + -c, --cleanup call with cleanup=true to remove old tunnels (default true) ``` ### Options inherited from parent commands diff --git a/translations/de.json b/translations/de.json index dc13eb9dd3..343276eabe 100644 --- a/translations/de.json +++ b/translations/de.json @@ -975,6 +975,7 @@ "retrieving node": "Ermittele Node", "scheduled stop is not supported on the none driver, skipping scheduling": "Das geplante Stoppen wird von none Treiber nicht unterstützt, überspringe Planung", "service {{.namespace_name}}/{{.service_name}} has no node port": "Service {{.namespace_name}}/{{.service_name}} hat keinen Node Port", + "set tunnel bind address, empty or '*' indicates the tunnel should be available for all interfaces": "", "stat failed": "state Fehler", "status json failure": "Status json Fehler", "status text failure": "Status text Fehler", diff --git a/translations/es.json b/translations/es.json index 62ac409130..541d84c219 100644 --- a/translations/es.json +++ b/translations/es.json @@ -975,6 +975,7 @@ "retrieving node": "", "scheduled stop is not supported on the none driver, skipping scheduling": "", "service {{.namespace_name}}/{{.service_name}} has no node port": "", + "set tunnel bind address, empty or '*' indicates the tunnel should be available for all interfaces": "", "stat failed": "", "status json failure": "", "status text failure": "", diff --git a/translations/fr.json b/translations/fr.json index 541597f76e..9c2e78dea7 100644 --- a/translations/fr.json +++ b/translations/fr.json @@ -941,6 +941,7 @@ "retrieving node": "récupération du nœud", "scheduled stop is not supported on the none driver, skipping scheduling": "l'arrêt programmé n'est pas pris en charge sur le pilote none, programmation non prise en compte", "service {{.namespace_name}}/{{.service_name}} has no node port": "le service {{.namespace_name}}/{{.service_name}} n'a pas de port de nœud", + "set tunnel bind address, empty or '*' indicates the tunnel should be available for all interfaces": "", "stat failed": "stat en échec", "status json failure": "état du JSON en échec", "status text failure": "état du texte en échec", diff --git a/translations/ja.json b/translations/ja.json index ca2561498d..ef7be7c865 100644 --- a/translations/ja.json +++ b/translations/ja.json @@ -993,6 +993,7 @@ "saving node": "ノードを保存しています", "scheduled stop is not supported on the none driver, skipping scheduling": "none ドライバーでは予定停止がサポートされていません (予約をスキップします)", "service {{.namespace_name}}/{{.service_name}} has no node port": "サービス {{.namespace_name}}/{{.service_name}} は NodePort がありません", + "set tunnel bind address, empty or '*' indicates the tunnel should be available for all interfaces": "", "startup failed": "起動に失敗しました", "stat failed": "stat に失敗しました", "status json failure": "status json に失敗しました", diff --git a/translations/ko.json b/translations/ko.json index 551947c123..2e6d4e6279 100644 --- a/translations/ko.json +++ b/translations/ko.json @@ -985,6 +985,7 @@ "retrieving node": "", "scheduled stop is not supported on the none driver, skipping scheduling": "", "service {{.namespace_name}}/{{.service_name}} has no node port": "", + "set tunnel bind address, empty or '*' indicates the tunnel should be available for all interfaces": "", "stat failed": "", "status json failure": "", "status text failure": "", diff --git a/translations/pl.json b/translations/pl.json index 7a6850d76b..2be80a3491 100644 --- a/translations/pl.json +++ b/translations/pl.json @@ -987,6 +987,7 @@ "retrieving node": "przywracanie węzła", "scheduled stop is not supported on the none driver, skipping scheduling": "", "service {{.namespace_name}}/{{.service_name}} has no node port": "", + "set tunnel bind address, empty or '*' indicates the tunnel should be available for all interfaces": "", "stat failed": "wykonanie komendy stat nie powiodło się", "status json failure": "", "status text failure": "", diff --git a/translations/ru.json b/translations/ru.json index b336a0e471..3c8921bb3d 100644 --- a/translations/ru.json +++ b/translations/ru.json @@ -909,6 +909,7 @@ "retrieving node": "", "scheduled stop is not supported on the none driver, skipping scheduling": "", "service {{.namespace_name}}/{{.service_name}} has no node port": "", + "set tunnel bind address, empty or '*' indicates the tunnel should be available for all interfaces": "", "stat failed": "", "status json failure": "", "status text failure": "", diff --git a/translations/strings.txt b/translations/strings.txt index c0e6441dc2..b220d02293 100644 --- a/translations/strings.txt +++ b/translations/strings.txt @@ -909,6 +909,7 @@ "retrieving node": "", "scheduled stop is not supported on the none driver, skipping scheduling": "", "service {{.namespace_name}}/{{.service_name}} has no node port": "", + "set tunnel bind address, empty or '*' indicates the tunnel should be available for all interfaces": "", "stat failed": "", "status json failure": "", "status text failure": "", diff --git a/translations/zh-CN.json b/translations/zh-CN.json index 390d7611eb..f9132bba93 100644 --- a/translations/zh-CN.json +++ b/translations/zh-CN.json @@ -1098,6 +1098,7 @@ "retrieving node": "", "scheduled stop is not supported on the none driver, skipping scheduling": "", "service {{.namespace_name}}/{{.service_name}} has no node port": "", + "set tunnel bind address, empty or '*' indicates the tunnel should be available for all interfaces": "", "stat failed": "", "status json failure": "", "status text failure": "", From 79da2bc9d6b33d9079952ad4f6b01c49de0da17e Mon Sep 17 00:00:00 2001 From: Sharif Elgamal Date: Thu, 2 Jun 2022 08:38:29 -0700 Subject: [PATCH 036/545] add cfs kernel modules for arm64 --- .../minikube-iso/board/minikube/aarch64/linux_aarch64_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/deploy/iso/minikube-iso/board/minikube/aarch64/linux_aarch64_defconfig b/deploy/iso/minikube-iso/board/minikube/aarch64/linux_aarch64_defconfig index 2d0a352999..f17189938b 100644 --- a/deploy/iso/minikube-iso/board/minikube/aarch64/linux_aarch64_defconfig +++ b/deploy/iso/minikube-iso/board/minikube/aarch64/linux_aarch64_defconfig @@ -1215,3 +1215,5 @@ CONFIG_DEBUG_KERNEL=y # CONFIG_DEBUG_PREEMPT is not set # CONFIG_FTRACE is not set CONFIG_MEMTEST=y +CONFIG_CFS_BANDWIDTH=y +CONFIG_FAIR_GROUP_SCHED=y From bc3517a78a92f8fb132cf46dcef7449385a66202 Mon Sep 17 00:00:00 2001 From: Sharif Elgamal Date: Thu, 2 Jun 2022 11:48:01 -0700 Subject: [PATCH 037/545] fix crio conf --- .../iso/minikube-iso/package/crio-bin/crio.conf | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/deploy/iso/minikube-iso/package/crio-bin/crio.conf b/deploy/iso/minikube-iso/package/crio-bin/crio.conf index fafaed67bc..70d28ffc17 100644 --- a/deploy/iso/minikube-iso/package/crio-bin/crio.conf +++ b/deploy/iso/minikube-iso/package/crio-bin/crio.conf @@ -28,9 +28,9 @@ storage_driver = "overlay" # List to pass options to the storage driver. Please refer to # containers-storage.conf(5) to see all available storage options. -#storage_option = [ -# "overlay.mountopt=nodev,metacopy=on", -#] +storage_option = [ + "overlay.mountopt=nodev,metacopy=on", +] # The default log directory where all logs will go unless directly specified by # the kubelet. The log directory specified must be an absolute directory. @@ -368,15 +368,6 @@ signature_policy = "" # ignore; the latter will ignore volumes entirely. image_volumes = "mkdir" -# List of registries to be used when pulling an unqualified image (e.g., -# "alpine:latest"). By default, registries is set to "docker.io" for -# compatibility reasons. Depending on your workload and usecase you may add more -# registries (e.g., "quay.io", "registry.fedoraproject.org", -# "registry.opensuse.org", etc.). -registries = [ - "docker.io" -] - # Temporary directory to use for storing big files big_files_temporary_dir = "" From 3ad46b43d4f0a6353e6784cb14d6b5d2521b7d49 Mon Sep 17 00:00:00 2001 From: Sharif Elgamal Date: Thu, 2 Jun 2022 11:53:24 -0700 Subject: [PATCH 038/545] adding more kernel modules --- .../board/minikube/aarch64/linux_aarch64_defconfig | 3 +++ 1 file changed, 3 insertions(+) diff --git a/deploy/iso/minikube-iso/board/minikube/aarch64/linux_aarch64_defconfig b/deploy/iso/minikube-iso/board/minikube/aarch64/linux_aarch64_defconfig index f17189938b..14b40c56ce 100644 --- a/deploy/iso/minikube-iso/board/minikube/aarch64/linux_aarch64_defconfig +++ b/deploy/iso/minikube-iso/board/minikube/aarch64/linux_aarch64_defconfig @@ -1217,3 +1217,6 @@ CONFIG_DEBUG_KERNEL=y CONFIG_MEMTEST=y CONFIG_CFS_BANDWIDTH=y CONFIG_FAIR_GROUP_SCHED=y +CONFIG_KVM=m +CONFIG_KVM_DEBUG_FS=y +CONFIG_KVM_ARM=m From b7b5395138ba7972ac52a1260acc2a5dcf6af576 Mon Sep 17 00:00:00 2001 From: Sharif Elgamal Date: Thu, 2 Jun 2022 13:07:18 -0700 Subject: [PATCH 039/545] turn off crio for qemu for now --- cmd/minikube/cmd/start.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go index d4cc015954..04e0bdfc78 100644 --- a/cmd/minikube/cmd/start.go +++ b/cmd/minikube/cmd/start.go @@ -312,6 +312,10 @@ func provisionWithDriver(cmd *cobra.Command, ds registry.DriverState, existing * return node.Starter{}, errors.Wrap(err, "Failed to generate config") } + if driver.IsVM(cc.Driver) && runtime.GOARCH == "arm64" && cc.KubernetesConfig.ContainerRuntime == "crio" { + exit.Message(reason.Unimplemented, "arm64 VM drivers do not currently support the crio container runtime. See https://github.com/kubernetes/minikube/issues/14146 for details.") + } + // This is about as far as we can go without overwriting config files if viper.GetBool(dryRun) { out.Step(style.DryRun, `dry-run validation complete!`) From f1f5c667c8ce7978717080a5c79dcf4217708c38 Mon Sep 17 00:00:00 2001 From: Sharif Elgamal Date: Thu, 2 Jun 2022 14:50:23 -0700 Subject: [PATCH 040/545] swap default for testing --- deploy/iso/minikube-iso/package/cri-dockerd/cri-dockerd.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deploy/iso/minikube-iso/package/cri-dockerd/cri-dockerd.mk b/deploy/iso/minikube-iso/package/cri-dockerd/cri-dockerd.mk index f07dec38c7..a9e20ced72 100644 --- a/deploy/iso/minikube-iso/package/cri-dockerd/cri-dockerd.mk +++ b/deploy/iso/minikube-iso/package/cri-dockerd/cri-dockerd.mk @@ -13,9 +13,9 @@ CRI_DOCKERD_SOURCE = $(CRI_DOCKERD_VERSION).tar.gz CRI_DOCKERD_DEPENDENCIES = host-go -CRI_DOCKERD_GOARCH=amd64 -ifeq ($(BR2_aarch64),y) CRI_DOCKERD_GOARCH=arm64 +ifeq ($(BR2_x86_64),y) +CRI_DOCKERD_GOARCH=amd64 endif CRI_DOCKERD_GOPATH = $(@D)/_output From 7ef37124d5a1aeb38899245e1281ec1b28c7952b Mon Sep 17 00:00:00 2001 From: Sharif Elgamal Date: Thu, 2 Jun 2022 17:41:15 -0700 Subject: [PATCH 041/545] revert cri-dockerd to old way, they're slightly different --- .../arch/aarch64/package/Config.in | 1 + .../package/cri-dockerd-aarch64/Config.in | 8 ++++ .../cri-dockerd-aarch64}/cri-dockerd.hash | 0 .../cri-dockerd-aarch64/cri-dockerd.mk | 46 +++++++++++++++++++ .../arch/x86_64/package/Config.in | 1 + .../x86_64}/package/cri-dockerd/Config.in | 1 + .../package/cri-dockerd/cri-dockerd.hash | 3 ++ .../package/cri-dockerd/cri-dockerd.mk | 8 +--- deploy/iso/minikube-iso/package/Config.in | 1 - 9 files changed, 61 insertions(+), 8 deletions(-) create mode 100644 deploy/iso/minikube-iso/arch/aarch64/package/cri-dockerd-aarch64/Config.in rename deploy/iso/minikube-iso/{package/cri-dockerd => arch/aarch64/package/cri-dockerd-aarch64}/cri-dockerd.hash (100%) create mode 100644 deploy/iso/minikube-iso/arch/aarch64/package/cri-dockerd-aarch64/cri-dockerd.mk rename deploy/iso/minikube-iso/{ => arch/x86_64}/package/cri-dockerd/Config.in (91%) create mode 100644 deploy/iso/minikube-iso/arch/x86_64/package/cri-dockerd/cri-dockerd.hash rename deploy/iso/minikube-iso/{ => arch/x86_64}/package/cri-dockerd/cri-dockerd.mk (93%) diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/Config.in b/deploy/iso/minikube-iso/arch/aarch64/package/Config.in index 7d82e4feea..893f76c20e 100644 --- a/deploy/iso/minikube-iso/arch/aarch64/package/Config.in +++ b/deploy/iso/minikube-iso/arch/aarch64/package/Config.in @@ -1,5 +1,6 @@ menu "System tools aarch64" source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/buildkit-bin-aarch64/Config.in" + source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/cri-dockerd-aarch64/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/crictl-bin-aarch64/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/docker-bin-aarch64/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/cni-plugins-aarch64/Config.in" diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/cri-dockerd-aarch64/Config.in b/deploy/iso/minikube-iso/arch/aarch64/package/cri-dockerd-aarch64/Config.in new file mode 100644 index 0000000000..5a4ecc3a14 --- /dev/null +++ b/deploy/iso/minikube-iso/arch/aarch64/package/cri-dockerd-aarch64/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_CRI_DOCKERD + bool "cri-dockerd" + default y + depends on BR2_aarch64 + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS + depends on BR2_TOOLCHAIN_HAS_THREADS + select BR2_PACKAGE_DOCKER_BIN diff --git a/deploy/iso/minikube-iso/package/cri-dockerd/cri-dockerd.hash b/deploy/iso/minikube-iso/arch/aarch64/package/cri-dockerd-aarch64/cri-dockerd.hash similarity index 100% rename from deploy/iso/minikube-iso/package/cri-dockerd/cri-dockerd.hash rename to deploy/iso/minikube-iso/arch/aarch64/package/cri-dockerd-aarch64/cri-dockerd.hash diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/cri-dockerd-aarch64/cri-dockerd.mk b/deploy/iso/minikube-iso/arch/aarch64/package/cri-dockerd-aarch64/cri-dockerd.mk new file mode 100644 index 0000000000..28c1076261 --- /dev/null +++ b/deploy/iso/minikube-iso/arch/aarch64/package/cri-dockerd-aarch64/cri-dockerd.mk @@ -0,0 +1,46 @@ +################################################################################ +# +# cri-dockerd +# +################################################################################ + +# As of 2022-02-03 +CRI_DOCKERD_VER = 0.2.0 +CRI_DOCKERD_REV = a4d1895 +CRI_DOCKERD_VERSION = a4d1895a2659ea9974bd7528a706592ab8b74181 +CRI_DOCKERD_SITE = https://github.com/Mirantis/cri-dockerd/archive +CRI_DOCKERD_SOURCE = $(CRI_DOCKERD_VERSION).tar.gz + +CRI_DOCKERD_DEPENDENCIES = host-go +CRI_DOCKERD_GOPATH = $(@D)/_output +CRI_DOCKERD_ENV = \ + $(GO_TARGET_ENV) \ + CGO_ENABLED=0 \ + GO111MODULE=on \ + GOPATH="$(CRI_DOCKERD_GOPATH)" \ + PATH=$(CRI_DOCKERD_GOPATH)/bin:$(BR_PATH) \ + GOARCH=arm64 + +CRI_DOCKERD_COMPILE_SRC = $(CRI_DOCKERD_GOPATH)/src/github.com/Mirantis/cri-dockerd +CRI_DOCKERD_BUILDFLAGS = "-ldflags '-X github.com/Mirantis/cri-dockerd/version.Version=$(CRI_DOCKERD_VER) -X github.com/Mirantis/cri-dockerd/version.GitCommit=$(CRI_DOCKERD_REV)'" + +define CRI_DOCKERD_BUILD_CMDS + $(CRI_DOCKERD_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) LDFLAGS=$(CRI_DOCKERD_BUILDFLAGS) GO_VERSION=$(GO_VERSION) -C $(@D) VERSION=$(CRI_DOCKERD_VER) REVISION=$(CRI_DOCKERD_REV) static +endef + +define CRI_DOCKERD_INSTALL_TARGET_CMDS + $(INSTALL) -Dm755 \ + $(@D)/packaging/static/build/arm/cri-dockerd/cri-dockerd \ + $(TARGET_DIR)/usr/bin/cri-dockerd +endef + +define CRI_DOCKERD_INSTALL_INIT_SYSTEMD + $(INSTALL) -Dm644 \ + $(@D)/packaging/systemd/cri-docker.service \ + $(TARGET_DIR)/usr/lib/systemd/system/cri-docker.service + $(INSTALL) -Dm644 \ + $(@D)/packaging/systemd/cri-docker.socket \ + $(TARGET_DIR)/usr/lib/systemd/system/cri-docker.socket +endef + +$(eval $(generic-package)) diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/Config.in b/deploy/iso/minikube-iso/arch/x86_64/package/Config.in index ceea86d249..ac1b922baf 100644 --- a/deploy/iso/minikube-iso/arch/x86_64/package/Config.in +++ b/deploy/iso/minikube-iso/arch/x86_64/package/Config.in @@ -1,5 +1,6 @@ menu "System tools x86_64" source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/buildkit-bin/Config.in" + source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/cri-dockerd/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/crictl-bin/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/docker-bin/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/cni-plugins/Config.in" diff --git a/deploy/iso/minikube-iso/package/cri-dockerd/Config.in b/deploy/iso/minikube-iso/arch/x86_64/package/cri-dockerd/Config.in similarity index 91% rename from deploy/iso/minikube-iso/package/cri-dockerd/Config.in rename to deploy/iso/minikube-iso/arch/x86_64/package/cri-dockerd/Config.in index 57d2e21825..460971d045 100644 --- a/deploy/iso/minikube-iso/package/cri-dockerd/Config.in +++ b/deploy/iso/minikube-iso/arch/x86_64/package/cri-dockerd/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_CRI_DOCKERD bool "cri-dockerd" default y + depends on BR2_x86_64 depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS depends on BR2_TOOLCHAIN_HAS_THREADS diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/cri-dockerd/cri-dockerd.hash b/deploy/iso/minikube-iso/arch/x86_64/package/cri-dockerd/cri-dockerd.hash new file mode 100644 index 0000000000..1693e1b9d4 --- /dev/null +++ b/deploy/iso/minikube-iso/arch/x86_64/package/cri-dockerd/cri-dockerd.hash @@ -0,0 +1,3 @@ +sha256 4acd7605a0cb95a6ad50314d1f2497b92ee0f07382062d0c18a5434c1a3b9513 542e27dee12db61d6e96d2a83a20359474a5efa2.tar.gz +sha256 b2a082a8846ac74b8482ee6353d480cea0dec017bbec2b59b16e3f91efa2f5ca eb0c48ef49856f7d098ec005ddebcae197e08e49.tar.gz +sha256 ceb99430633f75f354c0e9fea1f3cf0e5138ac5ee3c2691a1a70811fd2feeeef a4d1895a2659ea9974bd7528a706592ab8b74181.tar.gz diff --git a/deploy/iso/minikube-iso/package/cri-dockerd/cri-dockerd.mk b/deploy/iso/minikube-iso/arch/x86_64/package/cri-dockerd/cri-dockerd.mk similarity index 93% rename from deploy/iso/minikube-iso/package/cri-dockerd/cri-dockerd.mk rename to deploy/iso/minikube-iso/arch/x86_64/package/cri-dockerd/cri-dockerd.mk index a9e20ced72..501fc49fbe 100644 --- a/deploy/iso/minikube-iso/package/cri-dockerd/cri-dockerd.mk +++ b/deploy/iso/minikube-iso/arch/x86_64/package/cri-dockerd/cri-dockerd.mk @@ -12,12 +12,6 @@ CRI_DOCKERD_SITE = https://github.com/Mirantis/cri-dockerd/archive CRI_DOCKERD_SOURCE = $(CRI_DOCKERD_VERSION).tar.gz CRI_DOCKERD_DEPENDENCIES = host-go - -CRI_DOCKERD_GOARCH=arm64 -ifeq ($(BR2_x86_64),y) -CRI_DOCKERD_GOARCH=amd64 -endif - CRI_DOCKERD_GOPATH = $(@D)/_output CRI_DOCKERD_ENV = \ $(GO_TARGET_ENV) \ @@ -25,7 +19,7 @@ CRI_DOCKERD_ENV = \ GO111MODULE=on \ GOPATH="$(CRI_DOCKERD_GOPATH)" \ PATH=$(CRI_DOCKERD_GOPATH)/bin:$(BR_PATH) \ - GOARCH=$(CRI_DOCKERD_GOARCH) + GOARCH=amd64 CRI_DOCKERD_COMPILE_SRC = $(CRI_DOCKERD_GOPATH)/src/github.com/Mirantis/cri-dockerd CRI_DOCKERD_BUILDFLAGS = "-ldflags '-X github.com/Mirantis/cri-dockerd/version.Version=$(CRI_DOCKERD_VER) -X github.com/Mirantis/cri-dockerd/version.GitCommit=$(CRI_DOCKERD_REV)'" diff --git a/deploy/iso/minikube-iso/package/Config.in b/deploy/iso/minikube-iso/package/Config.in index 317f31c94d..95dd099b86 100644 --- a/deploy/iso/minikube-iso/package/Config.in +++ b/deploy/iso/minikube-iso/package/Config.in @@ -3,7 +3,6 @@ menu "System tools" source "$BR2_EXTERNAL_MINIKUBE_PATH/package/crio-bin/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/package/crun/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/package/cni/Config.in" - source "$BR2_EXTERNAL_MINIKUBE_PATH/package/cri-dockerd/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/package/automount/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/package/gluster/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/package/falco-module/Config.in" From a1be91347651a502a28d469270d0e6ea5b22ece0 Mon Sep 17 00:00:00 2001 From: Sharif Elgamal Date: Thu, 2 Jun 2022 17:44:44 -0700 Subject: [PATCH 042/545] fix aarch mk file --- .../package/cri-dockerd-aarch64/Config.in | 2 +- .../cri-dockerd-aarch64/cri-dockerd.mk | 32 +++++++++---------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/cri-dockerd-aarch64/Config.in b/deploy/iso/minikube-iso/arch/aarch64/package/cri-dockerd-aarch64/Config.in index 5a4ecc3a14..ee257ae4f7 100644 --- a/deploy/iso/minikube-iso/arch/aarch64/package/cri-dockerd-aarch64/Config.in +++ b/deploy/iso/minikube-iso/arch/aarch64/package/cri-dockerd-aarch64/Config.in @@ -1,4 +1,4 @@ -config BR2_PACKAGE_CRI_DOCKERD +config BR2_PACKAGE_CRI_DOCKERD_AARCH64 bool "cri-dockerd" default y depends on BR2_aarch64 diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/cri-dockerd-aarch64/cri-dockerd.mk b/deploy/iso/minikube-iso/arch/aarch64/package/cri-dockerd-aarch64/cri-dockerd.mk index 28c1076261..05816af10d 100644 --- a/deploy/iso/minikube-iso/arch/aarch64/package/cri-dockerd-aarch64/cri-dockerd.mk +++ b/deploy/iso/minikube-iso/arch/aarch64/package/cri-dockerd-aarch64/cri-dockerd.mk @@ -5,36 +5,36 @@ ################################################################################ # As of 2022-02-03 -CRI_DOCKERD_VER = 0.2.0 -CRI_DOCKERD_REV = a4d1895 -CRI_DOCKERD_VERSION = a4d1895a2659ea9974bd7528a706592ab8b74181 -CRI_DOCKERD_SITE = https://github.com/Mirantis/cri-dockerd/archive -CRI_DOCKERD_SOURCE = $(CRI_DOCKERD_VERSION).tar.gz +CRI_DOCKERD_AARCH64_VER = 0.2.0 +CRI_DOCKERD_AARCH64_REV = a4d1895 +CRI_DOCKERD_AARCH64_VERSION = a4d1895a2659ea9974bd7528a706592ab8b74181 +CRI_DOCKERD_AARCH64_SITE = https://github.com/Mirantis/cri-dockerd/archive +CRI_DOCKERD_AARCH64_SOURCE = $(CRI_DOCKERD_AARCH64_VERSION).tar.gz -CRI_DOCKERD_DEPENDENCIES = host-go -CRI_DOCKERD_GOPATH = $(@D)/_output -CRI_DOCKERD_ENV = \ +CRI_DOCKERD_AARCH64_DEPENDENCIES = host-go +CRI_DOCKERD_AARCH64_GOPATH = $(@D)/_output +CRI_DOCKERD_AARCH64_ENV = \ $(GO_TARGET_ENV) \ CGO_ENABLED=0 \ GO111MODULE=on \ - GOPATH="$(CRI_DOCKERD_GOPATH)" \ - PATH=$(CRI_DOCKERD_GOPATH)/bin:$(BR_PATH) \ + GOPATH="$(CRI_DOCKERD_AARCH64_GOPATH)" \ + PATH=$(CRI_DOCKERD_AARCH64_GOPATH)/bin:$(BR_PATH) \ GOARCH=arm64 -CRI_DOCKERD_COMPILE_SRC = $(CRI_DOCKERD_GOPATH)/src/github.com/Mirantis/cri-dockerd -CRI_DOCKERD_BUILDFLAGS = "-ldflags '-X github.com/Mirantis/cri-dockerd/version.Version=$(CRI_DOCKERD_VER) -X github.com/Mirantis/cri-dockerd/version.GitCommit=$(CRI_DOCKERD_REV)'" +CRI_DOCKERD_AARCH64_COMPILE_SRC = $(CRI_DOCKERD_AARCH64_GOPATH)/src/github.com/Mirantis/cri-dockerd +CRI_DOCKERD_AARCH64_BUILDFLAGS = "-ldflags '-X github.com/Mirantis/cri-dockerd/version.Version=$(CRI_DOCKERD_AARCH64_VER) -X github.com/Mirantis/cri-dockerd/version.GitCommit=$(CRI_DOCKERD_AARCH64_REV)'" -define CRI_DOCKERD_BUILD_CMDS - $(CRI_DOCKERD_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) LDFLAGS=$(CRI_DOCKERD_BUILDFLAGS) GO_VERSION=$(GO_VERSION) -C $(@D) VERSION=$(CRI_DOCKERD_VER) REVISION=$(CRI_DOCKERD_REV) static +define CRI_DOCKERD_AARCH64_BUILD_CMDS + $(CRI_DOCKERD_AARCH64_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) LDFLAGS=$(CRI_DOCKERD_AARCH64_BUILDFLAGS) GO_VERSION=$(GO_VERSION) -C $(@D) VERSION=$(CRI_DOCKERD_AARCH64_VER) REVISION=$(CRI_DOCKERD_AARCH64_REV) static endef -define CRI_DOCKERD_INSTALL_TARGET_CMDS +define CRI_DOCKERD_AARCH64_INSTALL_TARGET_CMDS $(INSTALL) -Dm755 \ $(@D)/packaging/static/build/arm/cri-dockerd/cri-dockerd \ $(TARGET_DIR)/usr/bin/cri-dockerd endef -define CRI_DOCKERD_INSTALL_INIT_SYSTEMD +define CRI_DOCKERD_AARCH64_INSTALL_INIT_SYSTEMD $(INSTALL) -Dm644 \ $(@D)/packaging/systemd/cri-docker.service \ $(TARGET_DIR)/usr/lib/systemd/system/cri-docker.service From eb26a8d69bd3a5b31102737a4c826c1064446bf1 Mon Sep 17 00:00:00 2001 From: Sharif Elgamal Date: Thu, 2 Jun 2022 17:46:54 -0700 Subject: [PATCH 043/545] add comment back --- .../arch/aarch64/package/cri-dockerd-aarch64/cri-dockerd.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/cri-dockerd-aarch64/cri-dockerd.mk b/deploy/iso/minikube-iso/arch/aarch64/package/cri-dockerd-aarch64/cri-dockerd.mk index 05816af10d..f4af4616b3 100644 --- a/deploy/iso/minikube-iso/arch/aarch64/package/cri-dockerd-aarch64/cri-dockerd.mk +++ b/deploy/iso/minikube-iso/arch/aarch64/package/cri-dockerd-aarch64/cri-dockerd.mk @@ -24,6 +24,8 @@ CRI_DOCKERD_AARCH64_ENV = \ CRI_DOCKERD_AARCH64_COMPILE_SRC = $(CRI_DOCKERD_AARCH64_GOPATH)/src/github.com/Mirantis/cri-dockerd CRI_DOCKERD_AARCH64_BUILDFLAGS = "-ldflags '-X github.com/Mirantis/cri-dockerd/version.Version=$(CRI_DOCKERD_AARCH64_VER) -X github.com/Mirantis/cri-dockerd/version.GitCommit=$(CRI_DOCKERD_AARCH64_REV)'" +# If https://github.com/Mirantis/cri-dockerd/blob/master/packaging/Makefile changes, then this will almost certainly need to change +# This uses the static make target at the top level Makefile, since that builds everything, then picks out the arm64 binary define CRI_DOCKERD_AARCH64_BUILD_CMDS $(CRI_DOCKERD_AARCH64_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) LDFLAGS=$(CRI_DOCKERD_AARCH64_BUILDFLAGS) GO_VERSION=$(GO_VERSION) -C $(@D) VERSION=$(CRI_DOCKERD_AARCH64_VER) REVISION=$(CRI_DOCKERD_AARCH64_REV) static endef From b9cfb1b3d5286ae126739cbc398ba4a6f3f0502a Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Fri, 3 Jun 2022 03:14:04 +0000 Subject: [PATCH 044/545] Updating ISO to v1.26.0-1654217465-14265 --- 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 346dfd0614..66636790e2 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.26.0-1653677468-13807 +ISO_VERSION ?= v1.26.0-1654217465-14265 # 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 dcbe6c9089..3b597e7f5c 100644 --- a/pkg/minikube/download/iso.go +++ b/pkg/minikube/download/iso.go @@ -41,7 +41,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/13807" + isoBucket := "minikube-builds/iso/14265" return []string{ fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s-%s.iso", isoBucket, v, runtime.GOARCH), fmt.Sprintf("https://github.com/kubernetes/minikube/releases/download/%s/minikube-%s-%s.iso", v, v, runtime.GOARCH), diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index 920810ebd1..487d97cf5e 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/13807/minikube-v1.26.0-1653677468-13807-amd64.iso,https://github.com/kubernetes/minikube/releases/download/v1.26.0-1653677468-13807/minikube-v1.26.0-1653677468-13807-amd64.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.26.0-1653677468-13807-amd64.iso,https://storage.googleapis.com/minikube-builds/iso/13807/minikube-v1.26.0-1653677468-13807.iso,https://github.com/kubernetes/minikube/releases/download/v1.26.0-1653677468-13807/minikube-v1.26.0-1653677468-13807.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.26.0-1653677468-13807.iso]) + --iso-url strings Locations to fetch the minikube ISO from. (default [https://storage.googleapis.com/minikube-builds/iso/14265/minikube-v1.26.0-1654217465-14265-amd64.iso,https://github.com/kubernetes/minikube/releases/download/v1.26.0-1654217465-14265/minikube-v1.26.0-1654217465-14265-amd64.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.26.0-1654217465-14265-amd64.iso,https://storage.googleapis.com/minikube-builds/iso/14265/minikube-v1.26.0-1654217465-14265.iso,https://github.com/kubernetes/minikube/releases/download/v1.26.0-1654217465-14265/minikube-v1.26.0-1654217465-14265.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.26.0-1654217465-14265.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.6, 'latest' for v1.23.6). Defaults to 'stable'. --kvm-gpu Enable experimental NVIDIA GPU support in minikube From b8c432c4d23a953cfcfb34e14d97145abfeb4663 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Fri, 3 Jun 2022 17:03:25 +0000 Subject: [PATCH 045/545] Update auto-generated docs and translations --- site/content/en/docs/contrib/tests.en.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/site/content/en/docs/contrib/tests.en.md b/site/content/en/docs/contrib/tests.en.md index cc1a736fa5..ab19ee6f6a 100644 --- a/site/content/en/docs/contrib/tests.en.md +++ b/site/content/en/docs/contrib/tests.en.md @@ -446,6 +446,8 @@ verifies the docker/podman driver works with a custom subnet ## TestingKicBaseImage will return true if the integraiton test is running against a passed --base-image flag +## TestMinikubeProfile + ## TestMountStart tests using the mount command on start From 06890031b5015c4a69aa3d863196b56683665945 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anders=20F=20Bj=C3=B6rklund?= Date: Sat, 4 Jun 2022 09:53:19 +0200 Subject: [PATCH 046/545] Fix compilation of minikube gui on qt5 --- gui/commandrunner.cpp | 1 + gui/updater.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/gui/commandrunner.cpp b/gui/commandrunner.cpp index 53f6ec9d2d..6989e89d6a 100644 --- a/gui/commandrunner.cpp +++ b/gui/commandrunner.cpp @@ -5,6 +5,7 @@ #include #include #include +#include CommandRunner::CommandRunner(QDialog *parent) { diff --git a/gui/updater.cpp b/gui/updater.cpp index e39a1d5278..20317cbbf6 100644 --- a/gui/updater.cpp +++ b/gui/updater.cpp @@ -49,7 +49,7 @@ static void logUpdateCheck() return; } QTextStream stream(&file); - stream << QDateTime::currentDateTime().toString() << Qt::endl; + stream << QDateTime::currentDateTime().toString() << "\n"; } void Updater::checkForUpdates() From 216b63060fe97434f968046daa77daf3aefcc00e Mon Sep 17 00:00:00 2001 From: Nils Fahldieck Date: Mon, 9 May 2022 20:19:03 +0200 Subject: [PATCH 047/545] Add doc URL to the addon list table --- cmd/minikube/cmd/config/addons_list.go | 12 ++-- cmd/minikube/cmd/config/addons_list_test.go | 10 ++-- pkg/minikube/assets/addons.go | 64 +++++++++++---------- 3 files changed, 46 insertions(+), 40 deletions(-) diff --git a/cmd/minikube/cmd/config/addons_list.go b/cmd/minikube/cmd/config/addons_list.go index a76b9768c8..80cc5511bd 100644 --- a/cmd/minikube/cmd/config/addons_list.go +++ b/cmd/minikube/cmd/config/addons_list.go @@ -105,9 +105,9 @@ var printAddonsList = func(cc *config.ClusterConfig) { table.SetBorders(tablewriter.Border{Left: true, Top: true, Right: true, Bottom: true}) table.SetCenterSeparator("|") if cc == nil { - table.SetHeader([]string{"Addon Name", "Maintainer"}) + table.SetHeader([]string{"Addon Name", "Maintainer", "Docs"}) } else { - table.SetHeader([]string{"Addon Name", "Profile", "Status", "Maintainer"}) + table.SetHeader([]string{"Addon Name", "Profile", "Status", "Maintainer", "Docs"}) } for _, addonName := range addonNames { @@ -116,12 +116,16 @@ var printAddonsList = func(cc *config.ClusterConfig) { if maintainer == "" { maintainer = "unknown (third-party)" } + docs := addonBundle.Docs + if docs == "" { + docs = "n/a" + } if cc == nil { - tData = append(tData, []string{addonName, maintainer}) + tData = append(tData, []string{addonName, maintainer, docs}) continue } enabled := addonBundle.IsEnabled(cc) - tData = append(tData, []string{addonName, cc.Name, fmt.Sprintf("%s %s", stringFromStatus(enabled), iconFromStatus(enabled)), maintainer}) + tData = append(tData, []string{addonName, cc.Name, fmt.Sprintf("%s %s", stringFromStatus(enabled), iconFromStatus(enabled)), maintainer, docs}) } table.AppendBulk(tData) diff --git a/cmd/minikube/cmd/config/addons_list_test.go b/cmd/minikube/cmd/config/addons_list_test.go index 52afb8e37f..1e91c74c3e 100644 --- a/cmd/minikube/cmd/config/addons_list_test.go +++ b/cmd/minikube/cmd/config/addons_list_test.go @@ -51,11 +51,11 @@ func TestAddonsList(t *testing.T) { got += buf.Text() } // The lines we pull should look something like - // |-----------------------------|-----------------------| - // | ADDON NAME | MAINTAINER | - // |-----------------------------|-----------------------| - // which has 9 pipes - expected := 9 + // |------------|------------|------| + // | ADDON NAME | MAINTAINER | DOCS | + // |------------|------------|------| + // which has 12 pipes + expected := 12 if pipeCount != expected { t.Errorf("Expected header to have %d pipes; got = %d: %q", expected, pipeCount, got) } diff --git a/pkg/minikube/assets/addons.go b/pkg/minikube/assets/addons.go index bc4b4a6cc7..f0d926c618 100755 --- a/pkg/minikube/assets/addons.go +++ b/pkg/minikube/assets/addons.go @@ -39,6 +39,7 @@ type Addon struct { enabled bool addonName string Maintainer string + Docs string Images map[string]string // Registries currently only shows the default registry of images @@ -52,12 +53,13 @@ type NetworkInfo struct { } // NewAddon creates a new Addon -func NewAddon(assets []*BinAsset, enabled bool, addonName string, maintainer string, images map[string]string, registries map[string]string) *Addon { +func NewAddon(assets []*BinAsset, enabled bool, addonName string, maintainer string, docs string, images map[string]string, registries map[string]string) *Addon { a := &Addon{ Assets: assets, enabled: enabled, addonName: addonName, Maintainer: maintainer, + Docs: docs, Images: images, Registries: registries, } @@ -116,7 +118,7 @@ var Addons = map[string]*Addon{ "0640"), // GuestPersistentDir - }, false, "auto-pause", "google", map[string]string{ + }, false, "auto-pause", "google", "", map[string]string{ "AutoPauseHook": "k8s-minikube/auto-pause-hook:v0.0.2@sha256:c76be418df5ca9c66d0d11c2c68461acbf4072c1cdfc17e64729c5ef4d5a4128", }, map[string]string{ "AutoPauseHook": "gcr.io", @@ -133,7 +135,7 @@ var Addons = map[string]*Addon{ MustBinAsset(addons.DashboardAssets, "dashboard/dashboard-sa.yaml", vmpath.GuestAddonsDir, "dashboard-sa.yaml", "0640"), MustBinAsset(addons.DashboardAssets, "dashboard/dashboard-secret.yaml", vmpath.GuestAddonsDir, "dashboard-secret.yaml", "0640"), MustBinAsset(addons.DashboardAssets, "dashboard/dashboard-svc.yaml", vmpath.GuestAddonsDir, "dashboard-svc.yaml", "0640"), - }, false, "dashboard", "kubernetes", map[string]string{ + }, false, "dashboard", "kubernetes", "https://minikube.sigs.k8s.io/docs/handbook/dashboard/", map[string]string{ "Dashboard": "kubernetesui/dashboard:v2.6.0@sha256:4af9580485920635d888efe1eddbd67e12f9d5d84dba87100e93feb4e46636b3", "MetricsScraper": "kubernetesui/metrics-scraper:v1.0.8@sha256:76049887f07a0476dc93efc2d3569b9529bf982b22d29f356092ce206e98765c", }, nil), @@ -143,21 +145,21 @@ var Addons = map[string]*Addon{ vmpath.GuestAddonsDir, "storageclass.yaml", "0640"), - }, true, "default-storageclass", "kubernetes", nil, nil), + }, true, "default-storageclass", "kubernetes", "", nil, nil), "pod-security-policy": NewAddon([]*BinAsset{ MustBinAsset(addons.PodSecurityPolicyAssets, "pod-security-policy/pod-security-policy.yaml.tmpl", vmpath.GuestAddonsDir, "pod-security-policy.yaml", "0640"), - }, false, "pod-security-policy", "", nil, nil), + }, false, "pod-security-policy", "", "", nil, nil), "storage-provisioner": NewAddon([]*BinAsset{ MustBinAsset(addons.StorageProvisionerAssets, "storage-provisioner/storage-provisioner.yaml.tmpl", vmpath.GuestAddonsDir, "storage-provisioner.yaml", "0640"), - }, true, "storage-provisioner", "google", map[string]string{ + }, true, "storage-provisioner", "google", "", map[string]string{ "StorageProvisioner": fmt.Sprintf("k8s-minikube/storage-provisioner:%s", version.GetStorageProvisionerVersion()), }, map[string]string{ "StorageProvisioner": "gcr.io", @@ -183,7 +185,7 @@ var Addons = map[string]*Addon{ vmpath.GuestAddonsDir, "storage-provisioner-glusterfile.yaml", "0640"), - }, false, "storage-provisioner-gluster", "", map[string]string{ + }, false, "storage-provisioner-gluster", "", "", map[string]string{ "Heketi": "heketi/heketi:10@sha256:76d5a6a3b7cf083d1e99efa1c15abedbc5c8b73bef3ade299ce9a4c16c9660f8", "GlusterfileProvisioner": "gluster/glusterfile-provisioner:latest@sha256:9961a35cb3f06701958e202324141c30024b195579e5eb1704599659ddea5223", "GlusterfsServer": "nixpanic/glusterfs-server:pr_fake-disk@sha256:3c58ae9d4e2007758954879d3f4095533831eb757c64ca6a0e32d1fc53fb6034", @@ -221,7 +223,7 @@ var Addons = map[string]*Addon{ vmpath.GuestAddonsDir, "kibana-svc.yaml", "0640"), - }, false, "efk", "third-party (elastic)", map[string]string{ + }, false, "efk", "third-party (elastic)", "", map[string]string{ "Elasticsearch": "elasticsearch:v5.6.2@sha256:7e95b32a7a2aad0c0db5c881e4a1ce8b7e53236144ae9d9cfb5fbe5608af4ab2", "FluentdElasticsearch": "fluentd-elasticsearch:v2.0.2@sha256:d0480bbf2d0de2344036fa3f7034cf7b4b98025a89c71d7f1f1845ac0e7d5a97", "Alpine": "alpine:3.6@sha256:66790a2b79e1ea3e1dabac43990c54aca5d1ddf268d9a5a0285e4167c8b24475", @@ -237,7 +239,7 @@ var Addons = map[string]*Addon{ vmpath.GuestAddonsDir, "ingress-deploy.yaml", "0640"), - }, false, "ingress", "", map[string]string{ + }, false, "ingress", "", "", map[string]string{ // https://github.com/kubernetes/ingress-nginx/blob/6d9a39eda7b180f27b34726d7a7a96d73808ce75/deploy/static/provider/kind/deploy.yaml#L417 "IngressController": "ingress-nginx/controller:v1.2.0@sha256:d8196e3bc1e72547c5dec66d6556c0ff92a23f6d0919b206be170bc90d5f9185", // https://github.com/kubernetes/ingress-nginx/blob/fc38b9f2aa2d68ee00c417cf97e727b77a00c175/deploy/static/provider/kind/deploy.yaml#L621 @@ -253,7 +255,7 @@ var Addons = map[string]*Addon{ vmpath.GuestAddonsDir, "istio-operator.yaml", "0640"), - }, false, "istio-provisioner", "third-party (istio)", map[string]string{ + }, false, "istio-provisioner", "third-party (istio)", "", map[string]string{ "IstioOperator": "istio/operator:1.12.2@sha256:42c7609872882cb88728a1592561b4046dac6d05b6002cbdc815b84c86a24f08", }, nil), "istio": NewAddon([]*BinAsset{ @@ -262,14 +264,14 @@ var Addons = map[string]*Addon{ vmpath.GuestAddonsDir, "istio-default-profile.yaml", "0640"), - }, false, "istio", "third-party (istio)", nil, nil), + }, false, "istio", "third-party (istio)", "", nil, nil), "kong": NewAddon([]*BinAsset{ MustBinAsset(addons.KongAssets, "kong/kong-ingress-controller.yaml.tmpl", vmpath.GuestAddonsDir, "kong-ingress-controller.yaml", "0640"), - }, false, "kong", "third-party (Kong HQ)", map[string]string{ + }, false, "kong", "third-party (Kong HQ)", "https://minikube.sigs.k8s.io/docs/handbook/addons/kong-ingress/", map[string]string{ "Kong": "kong:2.7@sha256:4d3e93207305ace881fe9e95ac27717b6fbdd9e0ec1873c34e94908a4f4c9335", "KongIngress": "kong/kubernetes-ingress-controller:2.1.1@sha256:60e4102ab2da7f61e9c478747f0762d06a6166b5f300526b237ed7354c3cb4c8", }, nil), @@ -279,7 +281,7 @@ var Addons = map[string]*Addon{ vmpath.GuestAddonsDir, "pod.yaml", "0640"), - }, false, "kubevirt", "third-party (kubevirt)", map[string]string{ + }, false, "kubevirt", "third-party (kubevirt)", "", map[string]string{ "Kubectl": "bitnami/kubectl:1.17@sha256:de642e973d3d0ef60e4d0a1f92286a9fdae245535c5990d4762bbe86fcf95887", }, nil), "metrics-server": NewAddon([]*BinAsset{ @@ -303,7 +305,7 @@ var Addons = map[string]*Addon{ vmpath.GuestAddonsDir, "metrics-server-service.yaml", "0640"), - }, false, "metrics-server", "kubernetes", map[string]string{ + }, false, "metrics-server", "kubernetes", "", map[string]string{ "MetricsServer": "metrics-server/metrics-server:v0.6.1@sha256:5ddc6458eb95f5c70bd13fdab90cbd7d6ad1066e5b528ad1dcb28b76c5fb2f00", }, map[string]string{ "MetricsServer": "k8s.gcr.io", @@ -319,7 +321,7 @@ var Addons = map[string]*Addon{ vmpath.GuestAddonsDir, "olm.yaml", "0640"), - }, false, "olm", "third-party (operator framework)", map[string]string{ + }, false, "olm", "third-party (operator framework)", "", map[string]string{ "OLM": "operator-framework/olm@sha256:e74b2ac57963c7f3ba19122a8c31c9f2a0deb3c0c5cac9e5323ccffd0ca198ed", // operator-framework/community-operators was deprecated: https://github.com/operator-framework/community-operators#repository-is-obsolete; switching to OperatorHub.io instead "UpstreamCommunityOperators": "operatorhubio/catalog@sha256:e08a1cd21fe72dd1be92be738b4bf1515298206dac5479c17a4b3ed119e30bd4", @@ -343,7 +345,7 @@ var Addons = map[string]*Addon{ vmpath.GuestAddonsDir, "registry-proxy.yaml", "0640"), - }, false, "registry", "google", map[string]string{ + }, false, "registry", "google", "", map[string]string{ "Registry": "registry:2.7.1@sha256:d5459fcb27aecc752520df4b492b08358a1912fcdfa454f7d2101d4b09991daa", "KubeRegistryProxy": "google_containers/kube-registry-proxy:0.4@sha256:1040f25a5273de0d72c54865a8efd47e3292de9fb8e5353e3fa76736b854f2da", }, map[string]string{ @@ -355,7 +357,7 @@ var Addons = map[string]*Addon{ vmpath.GuestAddonsDir, "registry-creds-rc.yaml", "0640"), - }, false, "registry-creds", "third-party (upmc enterprises)", map[string]string{ + }, false, "registry-creds", "third-party (upmc enterprises)", "", map[string]string{ "RegistryCreds": "upmcenterprises/registry-creds:1.10@sha256:93a633d4f2b76a1c66bf19c664dbddc56093a543de6d54320f19f585ccd7d605", }, nil), "registry-aliases": NewAddon([]*BinAsset{ @@ -384,7 +386,7 @@ var Addons = map[string]*Addon{ vmpath.GuestAddonsDir, "patch-coredns-job.yaml", "0640"), - }, false, "registry-aliases", "", map[string]string{ + }, false, "registry-aliases", "", "", map[string]string{ "CoreDNSPatcher": "rhdevelopers/core-dns-patcher@sha256:9220ff32f690c3d889a52afb59ca6fcbbdbd99e5370550cc6fd249adea8ed0a9", "Alpine": "alpine:3.11@sha256:0bd0e9e03a022c3b0226667621da84fc9bf562a9056130424b5bfbd8bcb0397f", "Pause": "google_containers/pause:3.1@sha256:f78411e19d84a252e53bff71a4407a5686c46983a2c2eeed83929b888179acea", @@ -398,7 +400,7 @@ var Addons = map[string]*Addon{ vmpath.GuestAddonsDir, "freshpod-rc.yaml", "0640"), - }, false, "freshpod", "google", map[string]string{ + }, false, "freshpod", "google", "", map[string]string{ "FreshPod": "google-samples/freshpod:v0.0.1@sha256:b9efde5b509da3fd2959519c4147b653d0c5cefe8a00314e2888e35ecbcb46f9", }, map[string]string{ "FreshPod": "gcr.io", @@ -409,7 +411,7 @@ var Addons = map[string]*Addon{ vmpath.GuestAddonsDir, "nvidia-driver-installer.yaml", "0640"), - }, false, "nvidia-driver-installer", "google", map[string]string{ + }, false, "nvidia-driver-installer", "google", "", map[string]string{ "NvidiaDriverInstaller": "minikube-nvidia-driver-installer:e2d9b43228decf5d6f7dce3f0a85d390f138fa01", "Pause": "pause:2.0@sha256:9ce5316f9752b8347484ab0f6778573af15524124d52b93230b9a0dcc987e73e", }, map[string]string{ @@ -422,7 +424,7 @@ var Addons = map[string]*Addon{ vmpath.GuestAddonsDir, "nvidia-gpu-device-plugin.yaml", "0640"), - }, false, "nvidia-gpu-device-plugin", "third-party (nvidia)", map[string]string{ + }, false, "nvidia-gpu-device-plugin", "third-party (nvidia)", "", map[string]string{ "NvidiaDevicePlugin": "nvidia-gpu-device-plugin@sha256:4b036e8844920336fa48f36edeb7d4398f426d6a934ba022848deed2edbf09aa", }, map[string]string{ "NvidiaDevicePlugin": "k8s.gcr.io", @@ -438,7 +440,7 @@ var Addons = map[string]*Addon{ vmpath.GuestAddonsDir, "logviewer-rbac.yaml", "0640"), - }, false, "logviewer", "", map[string]string{ + }, false, "logviewer", "", "", map[string]string{ "LogViewer": "ivans3/minikube-log-viewer:latest@sha256:75854f45305cc47d17b04c6c588fa60777391761f951e3a34161ddf1f1b06405", }, nil), "gvisor": NewAddon([]*BinAsset{ @@ -457,7 +459,7 @@ var Addons = map[string]*Addon{ vmpath.GuestGvisorDir, constants.GvisorConfigTomlTargetName, "0640"), - }, false, "gvisor", "google", map[string]string{ + }, false, "gvisor", "google", "", map[string]string{ "GvisorAddon": "k8s-minikube/gvisor-addon:3@sha256:23eb17d48a66fc2b09c31454fb54ecae520c3e9c9197ef17fcb398b4f31d505a", }, map[string]string{ "GvisorAddon": "gcr.io", @@ -478,7 +480,7 @@ var Addons = map[string]*Addon{ vmpath.GuestAddonsDir, "helm-tiller-svc.yaml", "0640"), - }, false, "helm-tiller", "third-party (helm)", map[string]string{ + }, false, "helm-tiller", "third-party (helm)", "", map[string]string{ "Tiller": "helm/tiller:v2.17.0@sha256:4c43eb385032945cad047d2350e4945d913b90b3ab43ee61cecb32a495c6df0f", }, map[string]string{ // GCR is deprecated in helm @@ -491,7 +493,7 @@ var Addons = map[string]*Addon{ vmpath.GuestAddonsDir, "ingress-dns-pod.yaml", "0640"), - }, false, "ingress-dns", "google", map[string]string{ + }, false, "ingress-dns", "google", "https://minikube.sigs.k8s.io/docs/handbook/addons/ingress-dns/", map[string]string{ "IngressDNS": "k8s-minikube/minikube-ingress-dns:0.0.2@sha256:4abe27f9fc03fedab1d655e2020e6b165faf3bf6de1088ce6cf215a75b78f05f", }, map[string]string{ "IngressDNS": "gcr.io", @@ -507,7 +509,7 @@ var Addons = map[string]*Addon{ vmpath.GuestAddonsDir, "metallb-config.yaml", "0640"), - }, false, "metallb", "third-party (metallb)", map[string]string{ + }, false, "metallb", "third-party (metallb)", "", map[string]string{ "Speaker": "metallb/speaker:v0.9.6@sha256:c66585a805bed1a3b829d8fb4a4aab9d87233497244ebff96f1b88f1e7f8f991", "Controller": "metallb/controller:v0.9.6@sha256:fbfdb9d3f55976b0ee38f3309d83a4ca703efcf15d6ca7889cd8189142286502", }, nil), @@ -527,7 +529,7 @@ var Addons = map[string]*Addon{ vmpath.GuestAddonsDir, "ambassadorinstallation.yaml", "0640"), - }, false, "ambassador", "third-party (ambassador)", map[string]string{ + }, false, "ambassador", "third-party (ambassador)", "", map[string]string{ "AmbassadorOperator": "datawire/ambassador-operator:v1.2.3@sha256:492f33e0828a371aa23331d75c11c251b21499e31287f026269e3f6ec6da34ed", }, map[string]string{ "AmbassadorOperator": "quay.io", @@ -548,7 +550,7 @@ var Addons = map[string]*Addon{ vmpath.GuestAddonsDir, "gcp-auth-webhook.yaml", "0640"), - }, false, "gcp-auth", "google", map[string]string{ + }, false, "gcp-auth", "google", "https://minikube.sigs.k8s.io/docs/handbook/addons/gcp-auth/", map[string]string{ "KubeWebhookCertgen": "k8s.gcr.io/ingress-nginx/kube-webhook-certgen:v1.0@sha256:f3b6b39a6062328c095337b4cadcefd1612348fdd5190b1dcbcb9b9e90bd8068", "GCPAuthWebhook": "k8s-minikube/gcp-auth-webhook:v0.0.8@sha256:26c7b2454f1c946d7c80839251d939606620f37c2f275be2796c1ffd96c438f6", }, map[string]string{ @@ -587,7 +589,7 @@ var Addons = map[string]*Addon{ vmpath.GuestAddonsDir, "volume-snapshot-controller-deployment.yaml", "0640"), - }, false, "volumesnapshots", "kubernetes", map[string]string{ + }, false, "volumesnapshots", "kubernetes", "", map[string]string{ "SnapshotController": "sig-storage/snapshot-controller:v4.0.0@sha256:00fcc441ea9f72899c25eed61d602272a2a58c5f0014332bdcb5ac24acef08e4", }, map[string]string{ "SnapshotController": "k8s.gcr.io", @@ -658,7 +660,7 @@ var Addons = map[string]*Addon{ vmpath.GuestAddonsDir, "csi-hostpath-storageclass.yaml", "0640"), - }, false, "csi-hostpath-driver", "kubernetes", map[string]string{ + }, false, "csi-hostpath-driver", "kubernetes", "", map[string]string{ "Attacher": "sig-storage/csi-attacher:v3.1.0@sha256:50c3cfd458fc8e0bf3c8c521eac39172009382fc66dc5044a330d137c6ed0b09", "HostMonitorAgent": "sig-storage/csi-external-health-monitor-agent:v0.2.0@sha256:c20d4a4772599e68944452edfcecc944a1df28c19e94b942d526ca25a522ea02", "HostMonitorController": "sig-storage/csi-external-health-monitor-controller:v0.2.0@sha256:14988b598a180cc0282f3f4bc982371baf9a9c9b80878fb385f8ae8bd04ecf16", @@ -685,7 +687,7 @@ var Addons = map[string]*Addon{ vmpath.GuestAddonsDir, "portainer.yaml", "0640"), - }, false, "portainer", "portainer.io", map[string]string{ + }, false, "portainer", "portainer.io", "", map[string]string{ "Portainer": "portainer/portainer-ce:latest@sha256:4f126c5114b63e9d1bceb4b368944d14323329a9a0d4e7bb7eb53c9b7435d498", }, nil), } From 967b4399932e401be5d62bc4eb7af605c74e64fa Mon Sep 17 00:00:00 2001 From: Nils Fahldieck Date: Tue, 10 May 2022 09:11:38 +0200 Subject: [PATCH 048/545] Use "3rd party (maintainer)" across all strings --- cmd/minikube/cmd/config/addons_list.go | 2 +- pkg/minikube/assets/addons.go | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/cmd/minikube/cmd/config/addons_list.go b/cmd/minikube/cmd/config/addons_list.go index 80cc5511bd..a63413192a 100644 --- a/cmd/minikube/cmd/config/addons_list.go +++ b/cmd/minikube/cmd/config/addons_list.go @@ -114,7 +114,7 @@ var printAddonsList = func(cc *config.ClusterConfig) { addonBundle := assets.Addons[addonName] maintainer := addonBundle.Maintainer if maintainer == "" { - maintainer = "unknown (third-party)" + maintainer = "3rd party (unknown)" } docs := addonBundle.Docs if docs == "" { diff --git a/pkg/minikube/assets/addons.go b/pkg/minikube/assets/addons.go index f0d926c618..ac670bdfa1 100755 --- a/pkg/minikube/assets/addons.go +++ b/pkg/minikube/assets/addons.go @@ -223,7 +223,7 @@ var Addons = map[string]*Addon{ vmpath.GuestAddonsDir, "kibana-svc.yaml", "0640"), - }, false, "efk", "third-party (elastic)", "", map[string]string{ + }, false, "efk", "3rd party (elastic)", "", map[string]string{ "Elasticsearch": "elasticsearch:v5.6.2@sha256:7e95b32a7a2aad0c0db5c881e4a1ce8b7e53236144ae9d9cfb5fbe5608af4ab2", "FluentdElasticsearch": "fluentd-elasticsearch:v2.0.2@sha256:d0480bbf2d0de2344036fa3f7034cf7b4b98025a89c71d7f1f1845ac0e7d5a97", "Alpine": "alpine:3.6@sha256:66790a2b79e1ea3e1dabac43990c54aca5d1ddf268d9a5a0285e4167c8b24475", @@ -255,7 +255,7 @@ var Addons = map[string]*Addon{ vmpath.GuestAddonsDir, "istio-operator.yaml", "0640"), - }, false, "istio-provisioner", "third-party (istio)", "", map[string]string{ + }, false, "istio-provisioner", "3rd party (istio)", "", map[string]string{ "IstioOperator": "istio/operator:1.12.2@sha256:42c7609872882cb88728a1592561b4046dac6d05b6002cbdc815b84c86a24f08", }, nil), "istio": NewAddon([]*BinAsset{ @@ -264,14 +264,14 @@ var Addons = map[string]*Addon{ vmpath.GuestAddonsDir, "istio-default-profile.yaml", "0640"), - }, false, "istio", "third-party (istio)", "", nil, nil), + }, false, "istio", "3rd party (istio)", "", nil, nil), "kong": NewAddon([]*BinAsset{ MustBinAsset(addons.KongAssets, "kong/kong-ingress-controller.yaml.tmpl", vmpath.GuestAddonsDir, "kong-ingress-controller.yaml", "0640"), - }, false, "kong", "third-party (Kong HQ)", "https://minikube.sigs.k8s.io/docs/handbook/addons/kong-ingress/", map[string]string{ + }, false, "kong", "3rd party (Kong HQ)", "https://minikube.sigs.k8s.io/docs/handbook/addons/kong-ingress/", map[string]string{ "Kong": "kong:2.7@sha256:4d3e93207305ace881fe9e95ac27717b6fbdd9e0ec1873c34e94908a4f4c9335", "KongIngress": "kong/kubernetes-ingress-controller:2.1.1@sha256:60e4102ab2da7f61e9c478747f0762d06a6166b5f300526b237ed7354c3cb4c8", }, nil), @@ -281,7 +281,7 @@ var Addons = map[string]*Addon{ vmpath.GuestAddonsDir, "pod.yaml", "0640"), - }, false, "kubevirt", "third-party (kubevirt)", "", map[string]string{ + }, false, "kubevirt", "3rd party (kubevirt)", "", map[string]string{ "Kubectl": "bitnami/kubectl:1.17@sha256:de642e973d3d0ef60e4d0a1f92286a9fdae245535c5990d4762bbe86fcf95887", }, nil), "metrics-server": NewAddon([]*BinAsset{ @@ -321,7 +321,7 @@ var Addons = map[string]*Addon{ vmpath.GuestAddonsDir, "olm.yaml", "0640"), - }, false, "olm", "third-party (operator framework)", "", map[string]string{ + }, false, "olm", "3rd party (operator framework)", "", map[string]string{ "OLM": "operator-framework/olm@sha256:e74b2ac57963c7f3ba19122a8c31c9f2a0deb3c0c5cac9e5323ccffd0ca198ed", // operator-framework/community-operators was deprecated: https://github.com/operator-framework/community-operators#repository-is-obsolete; switching to OperatorHub.io instead "UpstreamCommunityOperators": "operatorhubio/catalog@sha256:e08a1cd21fe72dd1be92be738b4bf1515298206dac5479c17a4b3ed119e30bd4", @@ -357,7 +357,7 @@ var Addons = map[string]*Addon{ vmpath.GuestAddonsDir, "registry-creds-rc.yaml", "0640"), - }, false, "registry-creds", "third-party (upmc enterprises)", "", map[string]string{ + }, false, "registry-creds", "3rd party (upmc enterprises)", "", map[string]string{ "RegistryCreds": "upmcenterprises/registry-creds:1.10@sha256:93a633d4f2b76a1c66bf19c664dbddc56093a543de6d54320f19f585ccd7d605", }, nil), "registry-aliases": NewAddon([]*BinAsset{ @@ -424,7 +424,7 @@ var Addons = map[string]*Addon{ vmpath.GuestAddonsDir, "nvidia-gpu-device-plugin.yaml", "0640"), - }, false, "nvidia-gpu-device-plugin", "third-party (nvidia)", "", map[string]string{ + }, false, "nvidia-gpu-device-plugin", "3rd party (nvidia)", "", map[string]string{ "NvidiaDevicePlugin": "nvidia-gpu-device-plugin@sha256:4b036e8844920336fa48f36edeb7d4398f426d6a934ba022848deed2edbf09aa", }, map[string]string{ "NvidiaDevicePlugin": "k8s.gcr.io", @@ -480,7 +480,7 @@ var Addons = map[string]*Addon{ vmpath.GuestAddonsDir, "helm-tiller-svc.yaml", "0640"), - }, false, "helm-tiller", "third-party (helm)", "", map[string]string{ + }, false, "helm-tiller", "3rd party (helm)", "", map[string]string{ "Tiller": "helm/tiller:v2.17.0@sha256:4c43eb385032945cad047d2350e4945d913b90b3ab43ee61cecb32a495c6df0f", }, map[string]string{ // GCR is deprecated in helm @@ -509,7 +509,7 @@ var Addons = map[string]*Addon{ vmpath.GuestAddonsDir, "metallb-config.yaml", "0640"), - }, false, "metallb", "third-party (metallb)", "", map[string]string{ + }, false, "metallb", "3rd party (metallb)", "", map[string]string{ "Speaker": "metallb/speaker:v0.9.6@sha256:c66585a805bed1a3b829d8fb4a4aab9d87233497244ebff96f1b88f1e7f8f991", "Controller": "metallb/controller:v0.9.6@sha256:fbfdb9d3f55976b0ee38f3309d83a4ca703efcf15d6ca7889cd8189142286502", }, nil), @@ -529,7 +529,7 @@ var Addons = map[string]*Addon{ vmpath.GuestAddonsDir, "ambassadorinstallation.yaml", "0640"), - }, false, "ambassador", "third-party (ambassador)", "", map[string]string{ + }, false, "ambassador", "3rd party (ambassador)", "", map[string]string{ "AmbassadorOperator": "datawire/ambassador-operator:v1.2.3@sha256:492f33e0828a371aa23331d75c11c251b21499e31287f026269e3f6ec6da34ed", }, map[string]string{ "AmbassadorOperator": "quay.io", From b6239e67246644167ae90dca2e0fda920e4e279b Mon Sep 17 00:00:00 2001 From: Nils Fahldieck Date: Tue, 10 May 2022 09:12:32 +0200 Subject: [PATCH 049/545] Add additional links to addons' docs --- pkg/minikube/assets/addons.go | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/pkg/minikube/assets/addons.go b/pkg/minikube/assets/addons.go index ac670bdfa1..06cd86fa30 100755 --- a/pkg/minikube/assets/addons.go +++ b/pkg/minikube/assets/addons.go @@ -145,7 +145,7 @@ var Addons = map[string]*Addon{ vmpath.GuestAddonsDir, "storageclass.yaml", "0640"), - }, true, "default-storageclass", "kubernetes", "", nil, nil), + }, true, "default-storageclass", "kubernetes", "https://minikube.sigs.k8s.io/docs/handbook/persistent_volumes/", nil, nil), "pod-security-policy": NewAddon([]*BinAsset{ MustBinAsset(addons.PodSecurityPolicyAssets, "pod-security-policy/pod-security-policy.yaml.tmpl", @@ -239,7 +239,7 @@ var Addons = map[string]*Addon{ vmpath.GuestAddonsDir, "ingress-deploy.yaml", "0640"), - }, false, "ingress", "", "", map[string]string{ + }, false, "ingress", "", "https://kubernetes.io/docs/tasks/access-application-cluster/ingress-minikube/", map[string]string{ // https://github.com/kubernetes/ingress-nginx/blob/6d9a39eda7b180f27b34726d7a7a96d73808ce75/deploy/static/provider/kind/deploy.yaml#L417 "IngressController": "ingress-nginx/controller:v1.2.0@sha256:d8196e3bc1e72547c5dec66d6556c0ff92a23f6d0919b206be170bc90d5f9185", // https://github.com/kubernetes/ingress-nginx/blob/fc38b9f2aa2d68ee00c417cf97e727b77a00c175/deploy/static/provider/kind/deploy.yaml#L621 @@ -255,7 +255,7 @@ var Addons = map[string]*Addon{ vmpath.GuestAddonsDir, "istio-operator.yaml", "0640"), - }, false, "istio-provisioner", "3rd party (istio)", "", map[string]string{ + }, false, "istio-provisioner", "3rd party (istio)", "https://istio.io/latest/docs/setup/platform-setup/minikube/", map[string]string{ "IstioOperator": "istio/operator:1.12.2@sha256:42c7609872882cb88728a1592561b4046dac6d05b6002cbdc815b84c86a24f08", }, nil), "istio": NewAddon([]*BinAsset{ @@ -264,7 +264,7 @@ var Addons = map[string]*Addon{ vmpath.GuestAddonsDir, "istio-default-profile.yaml", "0640"), - }, false, "istio", "3rd party (istio)", "", nil, nil), + }, false, "istio", "3rd party (istio)", "https://istio.io/latest/docs/setup/platform-setup/minikube/", nil, nil), "kong": NewAddon([]*BinAsset{ MustBinAsset(addons.KongAssets, "kong/kong-ingress-controller.yaml.tmpl", @@ -281,7 +281,7 @@ var Addons = map[string]*Addon{ vmpath.GuestAddonsDir, "pod.yaml", "0640"), - }, false, "kubevirt", "3rd party (kubevirt)", "", map[string]string{ + }, false, "kubevirt", "3rd party (kubevirt)", "https://minikube.sigs.k8s.io/docs/tutorials/kubevirt/", map[string]string{ "Kubectl": "bitnami/kubectl:1.17@sha256:de642e973d3d0ef60e4d0a1f92286a9fdae245535c5990d4762bbe86fcf95887", }, nil), "metrics-server": NewAddon([]*BinAsset{ @@ -357,7 +357,7 @@ var Addons = map[string]*Addon{ vmpath.GuestAddonsDir, "registry-creds-rc.yaml", "0640"), - }, false, "registry-creds", "3rd party (upmc enterprises)", "", map[string]string{ + }, false, "registry-creds", "3rd party (upmc enterprises)", "https://minikube.sigs.k8s.io/docs/handbook/registry/", map[string]string{ "RegistryCreds": "upmcenterprises/registry-creds:1.10@sha256:93a633d4f2b76a1c66bf19c664dbddc56093a543de6d54320f19f585ccd7d605", }, nil), "registry-aliases": NewAddon([]*BinAsset{ @@ -400,7 +400,7 @@ var Addons = map[string]*Addon{ vmpath.GuestAddonsDir, "freshpod-rc.yaml", "0640"), - }, false, "freshpod", "google", "", map[string]string{ + }, false, "freshpod", "google", "https://github.com/GoogleCloudPlatform/freshpod", map[string]string{ "FreshPod": "google-samples/freshpod:v0.0.1@sha256:b9efde5b509da3fd2959519c4147b653d0c5cefe8a00314e2888e35ecbcb46f9", }, map[string]string{ "FreshPod": "gcr.io", @@ -411,7 +411,7 @@ var Addons = map[string]*Addon{ vmpath.GuestAddonsDir, "nvidia-driver-installer.yaml", "0640"), - }, false, "nvidia-driver-installer", "google", "", map[string]string{ + }, false, "nvidia-driver-installer", "google", "https://minikube.sigs.k8s.io/docs/tutorials/nvidia_gpu/", map[string]string{ "NvidiaDriverInstaller": "minikube-nvidia-driver-installer:e2d9b43228decf5d6f7dce3f0a85d390f138fa01", "Pause": "pause:2.0@sha256:9ce5316f9752b8347484ab0f6778573af15524124d52b93230b9a0dcc987e73e", }, map[string]string{ @@ -424,7 +424,7 @@ var Addons = map[string]*Addon{ vmpath.GuestAddonsDir, "nvidia-gpu-device-plugin.yaml", "0640"), - }, false, "nvidia-gpu-device-plugin", "3rd party (nvidia)", "", map[string]string{ + }, false, "nvidia-gpu-device-plugin", "3rd party (nvidia)", "https://minikube.sigs.k8s.io/docs/tutorials/nvidia_gpu/", map[string]string{ "NvidiaDevicePlugin": "nvidia-gpu-device-plugin@sha256:4b036e8844920336fa48f36edeb7d4398f426d6a934ba022848deed2edbf09aa", }, map[string]string{ "NvidiaDevicePlugin": "k8s.gcr.io", @@ -459,7 +459,7 @@ var Addons = map[string]*Addon{ vmpath.GuestGvisorDir, constants.GvisorConfigTomlTargetName, "0640"), - }, false, "gvisor", "google", "", map[string]string{ + }, false, "gvisor", "google", "https://github.com/kubernetes/minikube/blob/master/deploy/addons/gvisor/README.md", map[string]string{ "GvisorAddon": "k8s-minikube/gvisor-addon:3@sha256:23eb17d48a66fc2b09c31454fb54ecae520c3e9c9197ef17fcb398b4f31d505a", }, map[string]string{ "GvisorAddon": "gcr.io", @@ -480,7 +480,7 @@ var Addons = map[string]*Addon{ vmpath.GuestAddonsDir, "helm-tiller-svc.yaml", "0640"), - }, false, "helm-tiller", "3rd party (helm)", "", map[string]string{ + }, false, "helm-tiller", "3rd party (helm)", "https://v2.helm.sh/docs/using_helm/", map[string]string{ "Tiller": "helm/tiller:v2.17.0@sha256:4c43eb385032945cad047d2350e4945d913b90b3ab43ee61cecb32a495c6df0f", }, map[string]string{ // GCR is deprecated in helm @@ -529,7 +529,7 @@ var Addons = map[string]*Addon{ vmpath.GuestAddonsDir, "ambassadorinstallation.yaml", "0640"), - }, false, "ambassador", "3rd party (ambassador)", "", map[string]string{ + }, false, "ambassador", "3rd party (ambassador)", "https://minikube.sigs.k8s.io/docs/tutorials/ambassador_ingress_controller/", map[string]string{ "AmbassadorOperator": "datawire/ambassador-operator:v1.2.3@sha256:492f33e0828a371aa23331d75c11c251b21499e31287f026269e3f6ec6da34ed", }, map[string]string{ "AmbassadorOperator": "quay.io", @@ -589,7 +589,7 @@ var Addons = map[string]*Addon{ vmpath.GuestAddonsDir, "volume-snapshot-controller-deployment.yaml", "0640"), - }, false, "volumesnapshots", "kubernetes", "", map[string]string{ + }, false, "volumesnapshots", "kubernetes", "https://minikube.sigs.k8s.io/docs/tutorials/volume_snapshots_and_csi/", map[string]string{ "SnapshotController": "sig-storage/snapshot-controller:v4.0.0@sha256:00fcc441ea9f72899c25eed61d602272a2a58c5f0014332bdcb5ac24acef08e4", }, map[string]string{ "SnapshotController": "k8s.gcr.io", @@ -660,7 +660,7 @@ var Addons = map[string]*Addon{ vmpath.GuestAddonsDir, "csi-hostpath-storageclass.yaml", "0640"), - }, false, "csi-hostpath-driver", "kubernetes", "", map[string]string{ + }, false, "csi-hostpath-driver", "kubernetes", "https://minikube.sigs.k8s.io/docs/tutorials/volume_snapshots_and_csi/", map[string]string{ "Attacher": "sig-storage/csi-attacher:v3.1.0@sha256:50c3cfd458fc8e0bf3c8c521eac39172009382fc66dc5044a330d137c6ed0b09", "HostMonitorAgent": "sig-storage/csi-external-health-monitor-agent:v0.2.0@sha256:c20d4a4772599e68944452edfcecc944a1df28c19e94b942d526ca25a522ea02", "HostMonitorController": "sig-storage/csi-external-health-monitor-controller:v0.2.0@sha256:14988b598a180cc0282f3f4bc982371baf9a9c9b80878fb385f8ae8bd04ecf16", From 8be1b154ae31afc7f13b5a3085554c4a3eaf43ba Mon Sep 17 00:00:00 2001 From: Nils Fahldieck Date: Fri, 27 May 2022 17:45:11 +0200 Subject: [PATCH 050/545] Print doc only with enabled option --- cmd/minikube/cmd/config/addons_list.go | 39 +++++++++++++-------- cmd/minikube/cmd/config/addons_list_test.go | 12 +++---- 2 files changed, 31 insertions(+), 20 deletions(-) diff --git a/cmd/minikube/cmd/config/addons_list.go b/cmd/minikube/cmd/config/addons_list.go index a63413192a..a084e1835b 100644 --- a/cmd/minikube/cmd/config/addons_list.go +++ b/cmd/minikube/cmd/config/addons_list.go @@ -36,6 +36,7 @@ import ( ) var addonListOutput string +var addonPrintDocs bool // AddonListTemplate represents the addon list template type AddonListTemplate struct { @@ -58,7 +59,7 @@ var addonsListCmd = &cobra.Command{ } switch strings.ToLower(addonListOutput) { case "list": - printAddonsList(cc) + printAddonsList(cc, addonPrintDocs) case "json": printAddonsJSON(cc) default: @@ -68,13 +69,8 @@ var addonsListCmd = &cobra.Command{ } func init() { - addonsListCmd.Flags().StringVarP( - &addonListOutput, - "output", - "o", - "list", - `minikube addons list --output OUTPUT. json, list`) - + addonsListCmd.Flags().StringVarP(&addonListOutput, "output", "o", "list", "minikube addons list --output OUTPUT. json, list") + addonsListCmd.Flags().BoolVarP(&addonPrintDocs, "docs", "d", false, "If true, print web links to addons' documentation.") AddonsCmd.AddCommand(addonsListCmd) } @@ -92,7 +88,7 @@ var stringFromStatus = func(addonStatus bool) string { return "disabled" } -var printAddonsList = func(cc *config.ClusterConfig) { +var printAddonsList = func(cc *config.ClusterConfig, printDocs bool) { addonNames := make([]string, 0, len(assets.Addons)) for addonName := range assets.Addons { addonNames = append(addonNames, addonName) @@ -104,11 +100,17 @@ var printAddonsList = func(cc *config.ClusterConfig) { table.SetAutoFormatHeaders(true) table.SetBorders(tablewriter.Border{Left: true, Top: true, Right: true, Bottom: true}) table.SetCenterSeparator("|") + + var tHeader []string if cc == nil { - table.SetHeader([]string{"Addon Name", "Maintainer", "Docs"}) + tHeader = []string{"Addon Name", "Maintainer"} } else { - table.SetHeader([]string{"Addon Name", "Profile", "Status", "Maintainer", "Docs"}) + tHeader = []string{"Addon Name", "Profile", "Status", "Maintainer"} } + if printDocs { + tHeader = append(tHeader, "Docs") + } + table.SetHeader(tHeader) for _, addonName := range addonNames { addonBundle := assets.Addons[addonName] @@ -121,11 +123,20 @@ var printAddonsList = func(cc *config.ClusterConfig) { docs = "n/a" } if cc == nil { - tData = append(tData, []string{addonName, maintainer, docs}) + if printDocs { + tData = append(tData, []string{addonName, maintainer, docs}) + } else { + tData = append(tData, []string{addonName, maintainer}) + } continue + } else { + enabled := addonBundle.IsEnabled(cc) + if printDocs { + tData = append(tData, []string{addonName, cc.Name, fmt.Sprintf("%s %s", stringFromStatus(enabled), iconFromStatus(enabled)), maintainer, docs}) + } else { + tData = append(tData, []string{addonName, cc.Name, fmt.Sprintf("%s %s", stringFromStatus(enabled), iconFromStatus(enabled)), maintainer}) + } } - enabled := addonBundle.IsEnabled(cc) - tData = append(tData, []string{addonName, cc.Name, fmt.Sprintf("%s %s", stringFromStatus(enabled), iconFromStatus(enabled)), maintainer, docs}) } table.AppendBulk(tData) diff --git a/cmd/minikube/cmd/config/addons_list_test.go b/cmd/minikube/cmd/config/addons_list_test.go index 1e91c74c3e..a6618c28c7 100644 --- a/cmd/minikube/cmd/config/addons_list_test.go +++ b/cmd/minikube/cmd/config/addons_list_test.go @@ -35,7 +35,7 @@ func TestAddonsList(t *testing.T) { old := os.Stdout defer func() { os.Stdout = old }() os.Stdout = w - printAddonsList(nil) + printAddonsList(nil, false) if err := w.Close(); err != nil { t.Fatalf("failed to close pipe: %v", err) } @@ -51,11 +51,11 @@ func TestAddonsList(t *testing.T) { got += buf.Text() } // The lines we pull should look something like - // |------------|------------|------| - // | ADDON NAME | MAINTAINER | DOCS | - // |------------|------------|------| - // which has 12 pipes - expected := 12 + // |------------|------------| + // | ADDON NAME | MAINTAINER | + // |------------|------------| + // which has 9 pipes + expected := 9 if pipeCount != expected { t.Errorf("Expected header to have %d pipes; got = %d: %q", expected, pipeCount, got) } From e3e7c72a3a140659a8fe529642230e5b376cc6ff Mon Sep 17 00:00:00 2001 From: Nils Fahldieck Date: Fri, 27 May 2022 23:53:44 +0200 Subject: [PATCH 051/545] Capitalize addon maintainers Co-authored-by: Steven Powell <44844360+spowelljr@users.noreply.github.com> --- pkg/minikube/assets/addons.go | 48 +++++++++++++++++------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/pkg/minikube/assets/addons.go b/pkg/minikube/assets/addons.go index 06cd86fa30..fe4b672cdf 100755 --- a/pkg/minikube/assets/addons.go +++ b/pkg/minikube/assets/addons.go @@ -118,7 +118,7 @@ var Addons = map[string]*Addon{ "0640"), // GuestPersistentDir - }, false, "auto-pause", "google", "", map[string]string{ + }, false, "auto-pause", "Google", "", map[string]string{ "AutoPauseHook": "k8s-minikube/auto-pause-hook:v0.0.2@sha256:c76be418df5ca9c66d0d11c2c68461acbf4072c1cdfc17e64729c5ef4d5a4128", }, map[string]string{ "AutoPauseHook": "gcr.io", @@ -135,7 +135,7 @@ var Addons = map[string]*Addon{ MustBinAsset(addons.DashboardAssets, "dashboard/dashboard-sa.yaml", vmpath.GuestAddonsDir, "dashboard-sa.yaml", "0640"), MustBinAsset(addons.DashboardAssets, "dashboard/dashboard-secret.yaml", vmpath.GuestAddonsDir, "dashboard-secret.yaml", "0640"), MustBinAsset(addons.DashboardAssets, "dashboard/dashboard-svc.yaml", vmpath.GuestAddonsDir, "dashboard-svc.yaml", "0640"), - }, false, "dashboard", "kubernetes", "https://minikube.sigs.k8s.io/docs/handbook/dashboard/", map[string]string{ + }, false, "dashboard", "Kubernetes", "https://minikube.sigs.k8s.io/docs/handbook/dashboard/", map[string]string{ "Dashboard": "kubernetesui/dashboard:v2.6.0@sha256:4af9580485920635d888efe1eddbd67e12f9d5d84dba87100e93feb4e46636b3", "MetricsScraper": "kubernetesui/metrics-scraper:v1.0.8@sha256:76049887f07a0476dc93efc2d3569b9529bf982b22d29f356092ce206e98765c", }, nil), @@ -145,7 +145,7 @@ var Addons = map[string]*Addon{ vmpath.GuestAddonsDir, "storageclass.yaml", "0640"), - }, true, "default-storageclass", "kubernetes", "https://minikube.sigs.k8s.io/docs/handbook/persistent_volumes/", nil, nil), + }, true, "default-storageclass", "Kubernetes", "https://minikube.sigs.k8s.io/docs/handbook/persistent_volumes/", nil, nil), "pod-security-policy": NewAddon([]*BinAsset{ MustBinAsset(addons.PodSecurityPolicyAssets, "pod-security-policy/pod-security-policy.yaml.tmpl", @@ -159,7 +159,7 @@ var Addons = map[string]*Addon{ vmpath.GuestAddonsDir, "storage-provisioner.yaml", "0640"), - }, true, "storage-provisioner", "google", "", map[string]string{ + }, true, "storage-provisioner", "Google", "", map[string]string{ "StorageProvisioner": fmt.Sprintf("k8s-minikube/storage-provisioner:%s", version.GetStorageProvisionerVersion()), }, map[string]string{ "StorageProvisioner": "gcr.io", @@ -223,7 +223,7 @@ var Addons = map[string]*Addon{ vmpath.GuestAddonsDir, "kibana-svc.yaml", "0640"), - }, false, "efk", "3rd party (elastic)", "", map[string]string{ + }, false, "efk", "3rd party (Elastic)", "", map[string]string{ "Elasticsearch": "elasticsearch:v5.6.2@sha256:7e95b32a7a2aad0c0db5c881e4a1ce8b7e53236144ae9d9cfb5fbe5608af4ab2", "FluentdElasticsearch": "fluentd-elasticsearch:v2.0.2@sha256:d0480bbf2d0de2344036fa3f7034cf7b4b98025a89c71d7f1f1845ac0e7d5a97", "Alpine": "alpine:3.6@sha256:66790a2b79e1ea3e1dabac43990c54aca5d1ddf268d9a5a0285e4167c8b24475", @@ -255,7 +255,7 @@ var Addons = map[string]*Addon{ vmpath.GuestAddonsDir, "istio-operator.yaml", "0640"), - }, false, "istio-provisioner", "3rd party (istio)", "https://istio.io/latest/docs/setup/platform-setup/minikube/", map[string]string{ + }, false, "istio-provisioner", "3rd party (Istio)", "https://istio.io/latest/docs/setup/platform-setup/minikube/", map[string]string{ "IstioOperator": "istio/operator:1.12.2@sha256:42c7609872882cb88728a1592561b4046dac6d05b6002cbdc815b84c86a24f08", }, nil), "istio": NewAddon([]*BinAsset{ @@ -264,7 +264,7 @@ var Addons = map[string]*Addon{ vmpath.GuestAddonsDir, "istio-default-profile.yaml", "0640"), - }, false, "istio", "3rd party (istio)", "https://istio.io/latest/docs/setup/platform-setup/minikube/", nil, nil), + }, false, "istio", "3rd party (Istio)", "https://istio.io/latest/docs/setup/platform-setup/minikube/", nil, nil), "kong": NewAddon([]*BinAsset{ MustBinAsset(addons.KongAssets, "kong/kong-ingress-controller.yaml.tmpl", @@ -281,7 +281,7 @@ var Addons = map[string]*Addon{ vmpath.GuestAddonsDir, "pod.yaml", "0640"), - }, false, "kubevirt", "3rd party (kubevirt)", "https://minikube.sigs.k8s.io/docs/tutorials/kubevirt/", map[string]string{ + }, false, "kubevirt", "3rd party (KubeVirt)", "https://minikube.sigs.k8s.io/docs/tutorials/kubevirt/", map[string]string{ "Kubectl": "bitnami/kubectl:1.17@sha256:de642e973d3d0ef60e4d0a1f92286a9fdae245535c5990d4762bbe86fcf95887", }, nil), "metrics-server": NewAddon([]*BinAsset{ @@ -305,7 +305,7 @@ var Addons = map[string]*Addon{ vmpath.GuestAddonsDir, "metrics-server-service.yaml", "0640"), - }, false, "metrics-server", "kubernetes", "", map[string]string{ + }, false, "metrics-server", "Kubernetes", "", map[string]string{ "MetricsServer": "metrics-server/metrics-server:v0.6.1@sha256:5ddc6458eb95f5c70bd13fdab90cbd7d6ad1066e5b528ad1dcb28b76c5fb2f00", }, map[string]string{ "MetricsServer": "k8s.gcr.io", @@ -321,7 +321,7 @@ var Addons = map[string]*Addon{ vmpath.GuestAddonsDir, "olm.yaml", "0640"), - }, false, "olm", "3rd party (operator framework)", "", map[string]string{ + }, false, "olm", "3rd party (Operator Framework)", "", map[string]string{ "OLM": "operator-framework/olm@sha256:e74b2ac57963c7f3ba19122a8c31c9f2a0deb3c0c5cac9e5323ccffd0ca198ed", // operator-framework/community-operators was deprecated: https://github.com/operator-framework/community-operators#repository-is-obsolete; switching to OperatorHub.io instead "UpstreamCommunityOperators": "operatorhubio/catalog@sha256:e08a1cd21fe72dd1be92be738b4bf1515298206dac5479c17a4b3ed119e30bd4", @@ -345,7 +345,7 @@ var Addons = map[string]*Addon{ vmpath.GuestAddonsDir, "registry-proxy.yaml", "0640"), - }, false, "registry", "google", "", map[string]string{ + }, false, "registry", "Google", "", map[string]string{ "Registry": "registry:2.7.1@sha256:d5459fcb27aecc752520df4b492b08358a1912fcdfa454f7d2101d4b09991daa", "KubeRegistryProxy": "google_containers/kube-registry-proxy:0.4@sha256:1040f25a5273de0d72c54865a8efd47e3292de9fb8e5353e3fa76736b854f2da", }, map[string]string{ @@ -357,7 +357,7 @@ var Addons = map[string]*Addon{ vmpath.GuestAddonsDir, "registry-creds-rc.yaml", "0640"), - }, false, "registry-creds", "3rd party (upmc enterprises)", "https://minikube.sigs.k8s.io/docs/handbook/registry/", map[string]string{ + }, false, "registry-creds", "3rd party (UPMC Enterprises)", "https://minikube.sigs.k8s.io/docs/handbook/registry/", map[string]string{ "RegistryCreds": "upmcenterprises/registry-creds:1.10@sha256:93a633d4f2b76a1c66bf19c664dbddc56093a543de6d54320f19f585ccd7d605", }, nil), "registry-aliases": NewAddon([]*BinAsset{ @@ -400,7 +400,7 @@ var Addons = map[string]*Addon{ vmpath.GuestAddonsDir, "freshpod-rc.yaml", "0640"), - }, false, "freshpod", "google", "https://github.com/GoogleCloudPlatform/freshpod", map[string]string{ + }, false, "freshpod", "Google", "https://github.com/GoogleCloudPlatform/freshpod", map[string]string{ "FreshPod": "google-samples/freshpod:v0.0.1@sha256:b9efde5b509da3fd2959519c4147b653d0c5cefe8a00314e2888e35ecbcb46f9", }, map[string]string{ "FreshPod": "gcr.io", @@ -411,7 +411,7 @@ var Addons = map[string]*Addon{ vmpath.GuestAddonsDir, "nvidia-driver-installer.yaml", "0640"), - }, false, "nvidia-driver-installer", "google", "https://minikube.sigs.k8s.io/docs/tutorials/nvidia_gpu/", map[string]string{ + }, false, "nvidia-driver-installer", "Google", "https://minikube.sigs.k8s.io/docs/tutorials/nvidia_gpu/", map[string]string{ "NvidiaDriverInstaller": "minikube-nvidia-driver-installer:e2d9b43228decf5d6f7dce3f0a85d390f138fa01", "Pause": "pause:2.0@sha256:9ce5316f9752b8347484ab0f6778573af15524124d52b93230b9a0dcc987e73e", }, map[string]string{ @@ -424,7 +424,7 @@ var Addons = map[string]*Addon{ vmpath.GuestAddonsDir, "nvidia-gpu-device-plugin.yaml", "0640"), - }, false, "nvidia-gpu-device-plugin", "3rd party (nvidia)", "https://minikube.sigs.k8s.io/docs/tutorials/nvidia_gpu/", map[string]string{ + }, false, "nvidia-gpu-device-plugin", "3rd party (Nvidia)", "https://minikube.sigs.k8s.io/docs/tutorials/nvidia_gpu/", map[string]string{ "NvidiaDevicePlugin": "nvidia-gpu-device-plugin@sha256:4b036e8844920336fa48f36edeb7d4398f426d6a934ba022848deed2edbf09aa", }, map[string]string{ "NvidiaDevicePlugin": "k8s.gcr.io", @@ -459,7 +459,7 @@ var Addons = map[string]*Addon{ vmpath.GuestGvisorDir, constants.GvisorConfigTomlTargetName, "0640"), - }, false, "gvisor", "google", "https://github.com/kubernetes/minikube/blob/master/deploy/addons/gvisor/README.md", map[string]string{ + }, false, "gvisor", "Google", "https://github.com/kubernetes/minikube/blob/master/deploy/addons/gvisor/README.md", map[string]string{ "GvisorAddon": "k8s-minikube/gvisor-addon:3@sha256:23eb17d48a66fc2b09c31454fb54ecae520c3e9c9197ef17fcb398b4f31d505a", }, map[string]string{ "GvisorAddon": "gcr.io", @@ -480,7 +480,7 @@ var Addons = map[string]*Addon{ vmpath.GuestAddonsDir, "helm-tiller-svc.yaml", "0640"), - }, false, "helm-tiller", "3rd party (helm)", "https://v2.helm.sh/docs/using_helm/", map[string]string{ + }, false, "helm-tiller", "3rd party (Helm)", "https://v2.helm.sh/docs/using_helm/", map[string]string{ "Tiller": "helm/tiller:v2.17.0@sha256:4c43eb385032945cad047d2350e4945d913b90b3ab43ee61cecb32a495c6df0f", }, map[string]string{ // GCR is deprecated in helm @@ -493,7 +493,7 @@ var Addons = map[string]*Addon{ vmpath.GuestAddonsDir, "ingress-dns-pod.yaml", "0640"), - }, false, "ingress-dns", "google", "https://minikube.sigs.k8s.io/docs/handbook/addons/ingress-dns/", map[string]string{ + }, false, "ingress-dns", "Google", "https://minikube.sigs.k8s.io/docs/handbook/addons/ingress-dns/", map[string]string{ "IngressDNS": "k8s-minikube/minikube-ingress-dns:0.0.2@sha256:4abe27f9fc03fedab1d655e2020e6b165faf3bf6de1088ce6cf215a75b78f05f", }, map[string]string{ "IngressDNS": "gcr.io", @@ -509,7 +509,7 @@ var Addons = map[string]*Addon{ vmpath.GuestAddonsDir, "metallb-config.yaml", "0640"), - }, false, "metallb", "3rd party (metallb)", "", map[string]string{ + }, false, "metallb", "3rd party (MetalLB)", "", map[string]string{ "Speaker": "metallb/speaker:v0.9.6@sha256:c66585a805bed1a3b829d8fb4a4aab9d87233497244ebff96f1b88f1e7f8f991", "Controller": "metallb/controller:v0.9.6@sha256:fbfdb9d3f55976b0ee38f3309d83a4ca703efcf15d6ca7889cd8189142286502", }, nil), @@ -529,7 +529,7 @@ var Addons = map[string]*Addon{ vmpath.GuestAddonsDir, "ambassadorinstallation.yaml", "0640"), - }, false, "ambassador", "3rd party (ambassador)", "https://minikube.sigs.k8s.io/docs/tutorials/ambassador_ingress_controller/", map[string]string{ + }, false, "ambassador", "3rd party (Ambassador)", "https://minikube.sigs.k8s.io/docs/tutorials/ambassador_ingress_controller/", map[string]string{ "AmbassadorOperator": "datawire/ambassador-operator:v1.2.3@sha256:492f33e0828a371aa23331d75c11c251b21499e31287f026269e3f6ec6da34ed", }, map[string]string{ "AmbassadorOperator": "quay.io", @@ -550,7 +550,7 @@ var Addons = map[string]*Addon{ vmpath.GuestAddonsDir, "gcp-auth-webhook.yaml", "0640"), - }, false, "gcp-auth", "google", "https://minikube.sigs.k8s.io/docs/handbook/addons/gcp-auth/", map[string]string{ + }, false, "gcp-auth", "Google", "https://minikube.sigs.k8s.io/docs/handbook/addons/gcp-auth/", map[string]string{ "KubeWebhookCertgen": "k8s.gcr.io/ingress-nginx/kube-webhook-certgen:v1.0@sha256:f3b6b39a6062328c095337b4cadcefd1612348fdd5190b1dcbcb9b9e90bd8068", "GCPAuthWebhook": "k8s-minikube/gcp-auth-webhook:v0.0.8@sha256:26c7b2454f1c946d7c80839251d939606620f37c2f275be2796c1ffd96c438f6", }, map[string]string{ @@ -589,7 +589,7 @@ var Addons = map[string]*Addon{ vmpath.GuestAddonsDir, "volume-snapshot-controller-deployment.yaml", "0640"), - }, false, "volumesnapshots", "kubernetes", "https://minikube.sigs.k8s.io/docs/tutorials/volume_snapshots_and_csi/", map[string]string{ + }, false, "volumesnapshots", "Kubernetes", "https://minikube.sigs.k8s.io/docs/tutorials/volume_snapshots_and_csi/", map[string]string{ "SnapshotController": "sig-storage/snapshot-controller:v4.0.0@sha256:00fcc441ea9f72899c25eed61d602272a2a58c5f0014332bdcb5ac24acef08e4", }, map[string]string{ "SnapshotController": "k8s.gcr.io", @@ -660,7 +660,7 @@ var Addons = map[string]*Addon{ vmpath.GuestAddonsDir, "csi-hostpath-storageclass.yaml", "0640"), - }, false, "csi-hostpath-driver", "kubernetes", "https://minikube.sigs.k8s.io/docs/tutorials/volume_snapshots_and_csi/", map[string]string{ + }, false, "csi-hostpath-driver", "Kubernetes", "https://minikube.sigs.k8s.io/docs/tutorials/volume_snapshots_and_csi/", map[string]string{ "Attacher": "sig-storage/csi-attacher:v3.1.0@sha256:50c3cfd458fc8e0bf3c8c521eac39172009382fc66dc5044a330d137c6ed0b09", "HostMonitorAgent": "sig-storage/csi-external-health-monitor-agent:v0.2.0@sha256:c20d4a4772599e68944452edfcecc944a1df28c19e94b942d526ca25a522ea02", "HostMonitorController": "sig-storage/csi-external-health-monitor-controller:v0.2.0@sha256:14988b598a180cc0282f3f4bc982371baf9a9c9b80878fb385f8ae8bd04ecf16", @@ -687,7 +687,7 @@ var Addons = map[string]*Addon{ vmpath.GuestAddonsDir, "portainer.yaml", "0640"), - }, false, "portainer", "portainer.io", "", map[string]string{ + }, false, "portainer", "Portainer.io", "", map[string]string{ "Portainer": "portainer/portainer-ce:latest@sha256:4f126c5114b63e9d1bceb4b368944d14323329a9a0d4e7bb7eb53c9b7435d498", }, nil), } From fa3ec1433f8b0fafb1a5495d97edf621134e1897 Mon Sep 17 00:00:00 2001 From: Nils Fahldieck Date: Sat, 28 May 2022 01:39:18 +0200 Subject: [PATCH 052/545] Add test for disabled/enabled docs --- cmd/minikube/cmd/config/addons_list_test.go | 75 ++++++++++++--------- 1 file changed, 43 insertions(+), 32 deletions(-) diff --git a/cmd/minikube/cmd/config/addons_list_test.go b/cmd/minikube/cmd/config/addons_list_test.go index a6618c28c7..5aca69e349 100644 --- a/cmd/minikube/cmd/config/addons_list_test.go +++ b/cmd/minikube/cmd/config/addons_list_test.go @@ -27,39 +27,50 @@ import ( ) func TestAddonsList(t *testing.T) { - t.Run("NonExistingClusterTable", func(t *testing.T) { - r, w, err := os.Pipe() - if err != nil { - t.Fatalf("failed to create pipe: %v", err) - } - old := os.Stdout - defer func() { os.Stdout = old }() - os.Stdout = w - printAddonsList(nil, false) - if err := w.Close(); err != nil { - t.Fatalf("failed to close pipe: %v", err) - } - buf := bufio.NewScanner(r) - pipeCount := 0 - got := "" - // Pull the first 3 lines from stdout - for i := 0; i < 3; i++ { - if !buf.Scan() { - t.Fatalf("failed to read stdout") + tests := []struct { + name string + printDocs bool + want int + }{ + {"DisabledDocs", false, 9}, + {"EnabledDocs", true, 12}, + } + + for _, tt := range tests { + t.Run("NonExistingClusterTable"+tt.name, func(t *testing.T) { + r, w, err := os.Pipe() + if err != nil { + t.Fatalf("failed to create pipe: %v", err) } - pipeCount += strings.Count(buf.Text(), "|") - got += buf.Text() - } - // The lines we pull should look something like - // |------------|------------| - // | ADDON NAME | MAINTAINER | - // |------------|------------| - // which has 9 pipes - expected := 9 - if pipeCount != expected { - t.Errorf("Expected header to have %d pipes; got = %d: %q", expected, pipeCount, got) - } - }) + old := os.Stdout + defer func() { os.Stdout = old }() + os.Stdout = w + printAddonsList(nil, tt.printDocs) + if err := w.Close(); err != nil { + t.Fatalf("failed to close pipe: %v", err) + } + buf := bufio.NewScanner(r) + pipeCount := 0 + got := "" + // Pull the first 3 lines from stdout + for i := 0; i < 3; i++ { + if !buf.Scan() { + t.Fatalf("failed to read stdout") + } + pipeCount += strings.Count(buf.Text(), "|") + got += buf.Text() + } + // The lines we pull should look something like + // |------------|------------|(------|) + // | ADDON NAME | MAINTAINER |( DOCS |) + // |------------|------------|(------|) + // which has 9 or 12 pipes + expected := tt.want + if pipeCount != expected { + t.Errorf("Expected header to have %d pipes; got = %d: %q", expected, pipeCount, got) + } + }) + } t.Run("NonExistingClusterJSON", func(t *testing.T) { type addons struct { From ce08c0bcee417f6180ecbdbed4c2e8a249b6f42a Mon Sep 17 00:00:00 2001 From: Nils Fahldieck Date: Mon, 30 May 2022 10:19:07 +0200 Subject: [PATCH 053/545] Conditionally append docs to tData --- cmd/minikube/cmd/config/addons_list.go | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/cmd/minikube/cmd/config/addons_list.go b/cmd/minikube/cmd/config/addons_list.go index a084e1835b..95fa31c2f3 100644 --- a/cmd/minikube/cmd/config/addons_list.go +++ b/cmd/minikube/cmd/config/addons_list.go @@ -95,12 +95,12 @@ var printAddonsList = func(cc *config.ClusterConfig, printDocs bool) { } sort.Strings(addonNames) - var tData [][]string table := tablewriter.NewWriter(os.Stdout) table.SetAutoFormatHeaders(true) table.SetBorders(tablewriter.Border{Left: true, Top: true, Right: true, Bottom: true}) table.SetCenterSeparator("|") + // Create table header var tHeader []string if cc == nil { tHeader = []string{"Addon Name", "Maintainer"} @@ -112,6 +112,9 @@ var printAddonsList = func(cc *config.ClusterConfig, printDocs bool) { } table.SetHeader(tHeader) + // Create table data + var tData [][]string + var temp []string for _, addonName := range addonNames { addonBundle := assets.Addons[addonName] maintainer := addonBundle.Maintainer @@ -123,23 +126,18 @@ var printAddonsList = func(cc *config.ClusterConfig, printDocs bool) { docs = "n/a" } if cc == nil { - if printDocs { - tData = append(tData, []string{addonName, maintainer, docs}) - } else { - tData = append(tData, []string{addonName, maintainer}) - } - continue + temp = []string{addonName, maintainer} } else { enabled := addonBundle.IsEnabled(cc) - if printDocs { - tData = append(tData, []string{addonName, cc.Name, fmt.Sprintf("%s %s", stringFromStatus(enabled), iconFromStatus(enabled)), maintainer, docs}) - } else { - tData = append(tData, []string{addonName, cc.Name, fmt.Sprintf("%s %s", stringFromStatus(enabled), iconFromStatus(enabled)), maintainer}) - } + temp = []string{addonName, cc.Name, fmt.Sprintf("%s %s", stringFromStatus(enabled), iconFromStatus(enabled)), maintainer} } + if printDocs { + temp = append(temp, docs) + } + tData = append(tData, temp) } - table.AppendBulk(tData) + table.Render() v, _, err := config.ListProfiles() From dfa371652bbaa5bb5db119c020ad58b6c94154e7 Mon Sep 17 00:00:00 2001 From: Nils Fahldieck Date: Tue, 31 May 2022 19:33:27 +0200 Subject: [PATCH 054/545] Update docs usage output --- cmd/minikube/cmd/config/addons_list.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/minikube/cmd/config/addons_list.go b/cmd/minikube/cmd/config/addons_list.go index 95fa31c2f3..d03dde1778 100644 --- a/cmd/minikube/cmd/config/addons_list.go +++ b/cmd/minikube/cmd/config/addons_list.go @@ -70,7 +70,7 @@ var addonsListCmd = &cobra.Command{ func init() { addonsListCmd.Flags().StringVarP(&addonListOutput, "output", "o", "list", "minikube addons list --output OUTPUT. json, list") - addonsListCmd.Flags().BoolVarP(&addonPrintDocs, "docs", "d", false, "If true, print web links to addons' documentation.") + addonsListCmd.Flags().BoolVarP(&addonPrintDocs, "docs", "d", false, "If true, print web links to addons' documentation if using --output=list (default).") AddonsCmd.AddCommand(addonsListCmd) } From c44d2e2b1c943218fa489120d8944b8370d0b8b1 Mon Sep 17 00:00:00 2001 From: Nils Fahldieck Date: Tue, 31 May 2022 19:39:53 +0200 Subject: [PATCH 055/545] generate-docs --- site/content/en/docs/commands/addons.md | 1 + translations/de.json | 1 + translations/es.json | 1 + translations/fr.json | 1 + translations/ja.json | 1 + translations/ko.json | 1 + translations/pl.json | 1 + translations/ru.json | 1 + translations/strings.txt | 1 + translations/zh-CN.json | 1 + 10 files changed, 10 insertions(+) diff --git a/site/content/en/docs/commands/addons.md b/site/content/en/docs/commands/addons.md index d7e2377f8c..1b4ebaac52 100644 --- a/site/content/en/docs/commands/addons.md +++ b/site/content/en/docs/commands/addons.md @@ -252,6 +252,7 @@ minikube addons list [flags] ### Options ``` + -d, --docs If true, print web links to addons' documentation if using --output=list (default). -o, --output string minikube addons list --output OUTPUT. json, list (default "list") ``` diff --git a/translations/de.json b/translations/de.json index 86b706c7e3..ba591e10a6 100644 --- a/translations/de.json +++ b/translations/de.json @@ -345,6 +345,7 @@ "If true, cache docker images for the current bootstrapper and load them into the machine. Always false with --vm-driver=none.": "Wenn true, speichern Sie Docker-Images für den aktuellen Bootstrapper zwischen und laden Sie sie auf den Computer. Immer falsch mit --vm-driver = none.", "If true, only download and cache files for later use - don't install or start anything.": "Wenn true, laden Sie nur Dateien für die spätere Verwendung herunter und speichern Sie sie – installieren oder starten Sie nichts.", "If true, pods might get deleted and restarted on addon enable": "Falls gesetzt, könnten Pods gelöscht und neugestartet werden, wenn ein Addon aktiviert wird", + "If true, print web links to addons' documentation if using --output=list (default).": "Falls gesetzt, gibt Links zu den Dokumentationen der Addons aus. Funktioniert nur, wenn --output=list (default).", "If true, returns list of profiles faster by skipping validating the status of the cluster.": "Falls gesetzt, gibt die Liste der Profile schneller aus, indem das Validieren des Status des Clusters ausgelassen wird.", "If true, the added node will be marked for work. Defaults to true.": "Falls gesetzt, wird der hinzugefügte Node als Arbeitsnode markiert. Default: true", "If true, the node added will also be a control plane in addition to a worker.": "Falls gesetzt, wird der Knoten auch als Control Plane hinzugefügt, zusätzlich zu als Worker.", diff --git a/translations/es.json b/translations/es.json index 0573311575..0040fab95c 100644 --- a/translations/es.json +++ b/translations/es.json @@ -354,6 +354,7 @@ "If true, cache docker images for the current bootstrapper and load them into the machine. Always false with --vm-driver=none.": "Si el valor es \"true\", las imágenes de Docker del programa previo actual se almacenan en caché y se cargan en la máquina. Siempre es \"false\" si se especifica --vm-driver=none.", "If true, only download and cache files for later use - don't install or start anything.": "Si el valor es \"true\", los archivos solo se descargan y almacenan en caché (no se instala ni inicia nada).", "If true, pods might get deleted and restarted on addon enable": "", + "If true, print web links to addons' documentation if using --output=list (default).": "", "If true, returns list of profiles faster by skipping validating the status of the cluster.": "", "If true, the added node will be marked for work. Defaults to true.": "", "If true, the node added will also be a control plane in addition to a worker.": "", diff --git a/translations/fr.json b/translations/fr.json index 06bcd73a00..30e1aa91ff 100644 --- a/translations/fr.json +++ b/translations/fr.json @@ -337,6 +337,7 @@ "If true, cache docker images for the current bootstrapper and load them into the machine. Always false with --driver=none.": "Si vrai, met en cache les images Docker pour le programme d'amorçage actuel et les charge dans la machine. Toujours faux avec --driver=none.", "If true, only download and cache files for later use - don't install or start anything.": "Si la valeur est \"true\", téléchargez les fichiers et mettez-les en cache uniquement pour une utilisation future. Ne lancez pas d'installation et ne commencez aucun processus.", "If true, pods might get deleted and restarted on addon enable": "Si vrai, les pods peuvent être supprimés et redémarrés lors addon enable", + "If true, print web links to addons' documentation if using --output=list (default).": "", "If true, returns list of profiles faster by skipping validating the status of the cluster.": "Si vrai, renvoie la liste des profils plus rapidement en ignorant la validation de l'état du cluster.", "If true, the added node will be marked for work. Defaults to true.": "Si vrai, le nœud ajouté sera marqué pour le travail. La valeur par défaut est true.", "If true, the node added will also be a control plane in addition to a worker.": "Si vrai, le nœud ajouté sera également un plan de contrôle en plus d'un travailleur.", diff --git a/translations/ja.json b/translations/ja.json index dbd5d0d624..9c4f9c56a6 100644 --- a/translations/ja.json +++ b/translations/ja.json @@ -345,6 +345,7 @@ "If true, cache docker images for the current bootstrapper and load them into the machine. Always false with --vm-driver=none.": "true の場合、現在のブートストラッパーの Docker イメージをキャッシュに保存して、マシンに読み込みます。--vm-driver=none の場合は常に false です。", "If true, only download and cache files for later use - don't install or start anything.": "true の場合、後の使用のためのファイルのダウンロードとキャッシュ保存のみ行われます。インストールも起動も行いません", "If true, pods might get deleted and restarted on addon enable": "true の場合、有効なアドオンの Pod は削除され、再起動されます", + "If true, print web links to addons' documentation if using --output=list (default).": "", "If true, returns list of profiles faster by skipping validating the status of the cluster.": "true の場合、クラスター状態の検証を省略することにより高速にプロファイル一覧を返します。", "If true, the added node will be marked for work. Defaults to true.": "true の場合、追加されたノードはワーカー用としてマークされます。デフォルトは true です。", "If true, the node added will also be a control plane in addition to a worker.": "true の場合、追加されたノードはワーカーに加えてコントロールプレーンにもなります。", diff --git a/translations/ko.json b/translations/ko.json index 4d4536ec9b..a32d205c1e 100644 --- a/translations/ko.json +++ b/translations/ko.json @@ -371,6 +371,7 @@ "If true, cache docker images for the current bootstrapper and load them into the machine. Always false with --driver=none.": "", "If true, only download and cache files for later use - don't install or start anything.": "", "If true, pods might get deleted and restarted on addon enable": "", + "If true, print web links to addons' documentation if using --output=list (default).": "", "If true, returns list of profiles faster by skipping validating the status of the cluster.": "", "If true, the added node will be marked for work. Defaults to true.": "", "If true, the node added will also be a control plane in addition to a worker.": "", diff --git a/translations/pl.json b/translations/pl.json index 17f838b48f..3433a15426 100644 --- a/translations/pl.json +++ b/translations/pl.json @@ -357,6 +357,7 @@ "If true, cache docker images for the current bootstrapper and load them into the machine. Always false with --driver=none.": "", "If true, only download and cache files for later use - don't install or start anything.": "", "If true, pods might get deleted and restarted on addon enable": "", + "If true, print web links to addons' documentation if using --output=list (default).": "", "If true, returns list of profiles faster by skipping validating the status of the cluster.": "", "If true, the added node will be marked for work. Defaults to true.": "", "If true, the node added will also be a control plane in addition to a worker.": "", diff --git a/translations/ru.json b/translations/ru.json index 8c8bdef386..d8bbe4aeaf 100644 --- a/translations/ru.json +++ b/translations/ru.json @@ -324,6 +324,7 @@ "If true, cache docker images for the current bootstrapper and load them into the machine. Always false with --driver=none.": "", "If true, only download and cache files for later use - don't install or start anything.": "", "If true, pods might get deleted and restarted on addon enable": "", + "If true, print web links to addons' documentation if using --output=list (default).": "", "If true, returns list of profiles faster by skipping validating the status of the cluster.": "", "If true, the added node will be marked for work. Defaults to true.": "", "If true, the node added will also be a control plane in addition to a worker.": "", diff --git a/translations/strings.txt b/translations/strings.txt index dbf487fa6e..843de236cf 100644 --- a/translations/strings.txt +++ b/translations/strings.txt @@ -324,6 +324,7 @@ "If true, cache docker images for the current bootstrapper and load them into the machine. Always false with --driver=none.": "", "If true, only download and cache files for later use - don't install or start anything.": "", "If true, pods might get deleted and restarted on addon enable": "", + "If true, print web links to addons' documentation if using --output=list (default).": "", "If true, returns list of profiles faster by skipping validating the status of the cluster.": "", "If true, the added node will be marked for work. Defaults to true.": "", "If true, the node added will also be a control plane in addition to a worker.": "", diff --git a/translations/zh-CN.json b/translations/zh-CN.json index b4fa549275..3241051e8d 100644 --- a/translations/zh-CN.json +++ b/translations/zh-CN.json @@ -429,6 +429,7 @@ "If true, cache docker images for the current bootstrapper and load them into the machine. Always false with --vm-driver=none.": "如果为 true，请缓存当前引导程序的 docker 镜像并将其加载到机器中。在 --vm-driver=none 情况下始终为 false。", "If true, only download and cache files for later use - don't install or start anything.": "如果为 true，仅会下载和缓存文件以备后用 - 不会安装或启动任何项。", "If true, pods might get deleted and restarted on addon enable": "", + "If true, print web links to addons' documentation if using --output=list (default).": "", "If true, returns list of profiles faster by skipping validating the status of the cluster.": "", "If true, the added node will be marked for work. Defaults to true.": "", "If true, the node added will also be a control plane in addition to a worker.": "", From f6d639182d6378ad93be57d2ccbf3a66a0261257 Mon Sep 17 00:00:00 2001 From: Pablo Caderno Date: Mon, 6 Jun 2022 16:59:41 +1000 Subject: [PATCH 056/545] fix: minikube delete exclude networks from other profiles Fixes: 12635 --- pkg/drivers/kic/oci/network_create.go | 8 ++++---- pkg/minikube/delete/delete.go | 2 +- test/integration/kic_custom_network_test.go | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkg/drivers/kic/oci/network_create.go b/pkg/drivers/kic/oci/network_create.go index fd8137fbe8..894be2ee92 100644 --- a/pkg/drivers/kic/oci/network_create.go +++ b/pkg/drivers/kic/oci/network_create.go @@ -133,7 +133,7 @@ func tryCreateDockerNetwork(ociBin string, subnet *network.Parameters, mtu int, args = append(args, fmt.Sprintf("com.docker.network.driver.mtu=%d", mtu)) } } - args = append(args, fmt.Sprintf("--label=%s=%s", CreatedByLabelKey, "true"), name) + args = append(args, fmt.Sprintf("--label=%s=%s", CreatedByLabelKey, "true"), fmt.Sprintf("--label=%s=%s", ProfileLabelKey, name), name) rr, err := runCmd(exec.Command(ociBin, args...)) if err != nil { @@ -320,10 +320,10 @@ func networkNamesByLabel(ociBin string, label string) ([]string, error) { return lines, nil } -// DeleteKICNetworks deletes all networks created by kic -func DeleteKICNetworks(ociBin string) []error { +// DeleteAllKICKNetworksByLabel deletes all networks that have a specific label +func DeleteKICNetworksByLabel(ociBin string, label string) []error { var errs []error - ns, err := networkNamesByLabel(ociBin, CreatedByLabelKey) + ns, err := networkNamesByLabel(ociBin, label) if err != nil { return []error{errors.Wrap(err, "list all volume")} } diff --git a/pkg/minikube/delete/delete.go b/pkg/minikube/delete/delete.go index cd6000496c..95dc688f8e 100644 --- a/pkg/minikube/delete/delete.go +++ b/pkg/minikube/delete/delete.go @@ -64,7 +64,7 @@ func PossibleLeftOvers(ctx context.Context, cname string, driverName string) { klog.Warningf("error deleting volumes (might be okay).\nTo see the list of volumes run: 'docker volume ls'\n:%v", errs) } - errs = oci.DeleteKICNetworks(bin) + errs = oci.DeleteKICNetworksByLabel(bin, delLabel) if errs != nil { klog.Warningf("error deleting leftover networks (might be okay).\nTo see the list of networks: 'docker network ls'\n:%v", errs) } diff --git a/test/integration/kic_custom_network_test.go b/test/integration/kic_custom_network_test.go index 6bbf3fb1d7..85d2822e09 100644 --- a/test/integration/kic_custom_network_test.go +++ b/test/integration/kic_custom_network_test.go @@ -78,7 +78,7 @@ func TestKicExistingNetwork(t *testing.T) { t.Fatalf("error creating network: %v", err) } defer func() { - if err := oci.DeleteKICNetworks(oci.Docker); err != nil { + if err := oci.DeleteKICNetworksByLabel(oci.Docker, networkName); err != nil { t.Logf("error deleting kic network, may need to delete manually: %v", err) } }() From edde358756834bc4211a499c46b823f99f500575 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Jun 2022 18:32:02 +0000 Subject: [PATCH 057/545] Bump peter-evans/create-pull-request from 4.0.3 to 4.0.4 Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from 4.0.3 to 4.0.4. - [Release notes](https://github.com/peter-evans/create-pull-request/releases) - [Commits](https://github.com/peter-evans/create-pull-request/compare/f094b77505fb89581e68a1163fbd2fffece39da1...923ad837f191474af6b1721408744feb989a4c27) --- 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-gopogh-version.yml | 2 +- .github/workflows/update-gotestsum-version.yml | 2 +- .github/workflows/update-k8s-versions.yml | 2 +- .github/workflows/update-kubadm-constants.yml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 777fc772e2..b7f983a7ff 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@f094b77505fb89581e68a1163fbd2fffece39da1 + uses: peter-evans/create-pull-request@923ad837f191474af6b1721408744feb989a4c27 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 6b41d2ffc6..5b30dc2782 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@f094b77505fb89581e68a1163fbd2fffece39da1 + uses: peter-evans/create-pull-request@923ad837f191474af6b1721408744feb989a4c27 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 b1d75d9089..c5c9db24ac 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@f094b77505fb89581e68a1163fbd2fffece39da1 + uses: peter-evans/create-pull-request@923ad837f191474af6b1721408744feb989a4c27 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 95fab538ab..4ea73ce9b4 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@f094b77505fb89581e68a1163fbd2fffece39da1 + uses: peter-evans/create-pull-request@923ad837f191474af6b1721408744feb989a4c27 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 fda67e6f4a..70b60b34ea 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@f094b77505fb89581e68a1163fbd2fffece39da1 + uses: peter-evans/create-pull-request@923ad837f191474af6b1721408744feb989a4c27 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: bump golint versions diff --git a/.github/workflows/update-gopogh-version.yml b/.github/workflows/update-gopogh-version.yml index d54b4d7fe4..6246e92075 100644 --- a/.github/workflows/update-gopogh-version.yml +++ b/.github/workflows/update-gopogh-version.yml @@ -26,7 +26,7 @@ jobs: echo "::set-output name=changes::$(git status --porcelain)" - name: Create PR if: ${{ steps.bumpGopogh.outputs.changes != '' }} - uses: peter-evans/create-pull-request@f094b77505fb89581e68a1163fbd2fffece39da1 + uses: peter-evans/create-pull-request@923ad837f191474af6b1721408744feb989a4c27 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: bump gopogh versions diff --git a/.github/workflows/update-gotestsum-version.yml b/.github/workflows/update-gotestsum-version.yml index de847d7e44..e0051808be 100644 --- a/.github/workflows/update-gotestsum-version.yml +++ b/.github/workflows/update-gotestsum-version.yml @@ -26,7 +26,7 @@ jobs: echo "::set-output name=changes::$(git status --porcelain)" - name: Create PR if: ${{ steps.bumpGotestsum.outputs.changes != '' }} - uses: peter-evans/create-pull-request@f094b77505fb89581e68a1163fbd2fffece39da1 + uses: peter-evans/create-pull-request@923ad837f191474af6b1721408744feb989a4c27 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: bump gotestsum versions diff --git a/.github/workflows/update-k8s-versions.yml b/.github/workflows/update-k8s-versions.yml index 9057285953..ce117d2739 100644 --- a/.github/workflows/update-k8s-versions.yml +++ b/.github/workflows/update-k8s-versions.yml @@ -30,7 +30,7 @@ jobs: echo "::set-output name=changes::$c" - name: Create PR if: ${{ steps.bumpk8s.outputs.changes != '' }} - uses: peter-evans/create-pull-request@f094b77505fb89581e68a1163fbd2fffece39da1 + uses: peter-evans/create-pull-request@923ad837f191474af6b1721408744feb989a4c27 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 f5c1a9f689..7ebada292c 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@f094b77505fb89581e68a1163fbd2fffece39da1 + uses: peter-evans/create-pull-request@923ad837f191474af6b1721408744feb989a4c27 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: update image constants for kubeadm images From 9cc18c0aa68a5d5bc958ddbc2beba7a6b6db1ff2 Mon Sep 17 00:00:00 2001 From: Sharif Elgamal Date: Mon, 6 Jun 2022 12:43:59 -0700 Subject: [PATCH 058/545] allow users to supply custom QEMU firmware path --- cmd/minikube/cmd/start_flags.go | 6 ++++++ pkg/minikube/config/types.go | 1 + pkg/minikube/registry/drvs/qemu2/qemu2.go | 12 ++++++++---- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/cmd/minikube/cmd/start_flags.go b/cmd/minikube/cmd/start_flags.go index e83a1f59ec..2c0abb64ef 100644 --- a/cmd/minikube/cmd/start_flags.go +++ b/cmd/minikube/cmd/start_flags.go @@ -136,6 +136,7 @@ const ( binaryMirror = "binary-mirror" disableOptimizations = "disable-optimizations" disableMetrics = "disable-metrics" + qemuFirmwarePath = "qemu-firmware-path" ) var ( @@ -253,6 +254,9 @@ func initDriverFlags() { startCmd.Flags().String(listenAddress, "", "IP Address to use to expose ports (docker and podman driver only)") startCmd.Flags().StringSlice(ports, []string{}, "List of ports that should be exposed (docker and podman driver only)") startCmd.Flags().String(subnet, "", "Subnet to be used on kic cluster. If left empty, minikube will choose subnet address, beginning from 192.168.49.0. (docker and podman driver only)") + + // qemu + startCmd.Flags().String(qemuFirmwarePath, "", "Path to the qemu firmware file. Defaults: For linux, the default firmware location. For macOS, the brew installation location. For Windows, C:\\Program Files\\qemu\\share") } // initNetworkingFlags inits the commandline flags for connectivity related flags for start @@ -523,6 +527,7 @@ func generateNewConfigFromFlags(cmd *cobra.Command, k8sVersion string, rtime str BinaryMirror: viper.GetString(binaryMirror), DisableOptimizations: viper.GetBool(disableOptimizations), DisableMetrics: viper.GetBool(disableMetrics), + CustomQemuFirmwarePath: viper.GetString(qemuFirmwarePath), KubernetesConfig: config.KubernetesConfig{ KubernetesVersion: k8sVersion, ClusterName: ClusterFlagValue(), @@ -741,6 +746,7 @@ func updateExistingConfigFromFlags(cmd *cobra.Command, existing *config.ClusterC updateStringFromFlag(cmd, &cc.MountUID, mountUID) updateStringFromFlag(cmd, &cc.BinaryMirror, binaryMirror) updateBoolFromFlag(cmd, &cc.DisableOptimizations, disableOptimizations) + updateStringFromFlag(cmd, &cc.CustomQemuFirmwarePath, qemuFirmwarePath) if cmd.Flags().Changed(kubernetesVersion) { cc.KubernetesConfig.KubernetesVersion = getKubernetesVersion(existing) diff --git a/pkg/minikube/config/types.go b/pkg/minikube/config/types.go index c27454d2bd..0faaabec37 100644 --- a/pkg/minikube/config/types.go +++ b/pkg/minikube/config/types.go @@ -101,6 +101,7 @@ type ClusterConfig struct { BinaryMirror string // Mirror location for kube binaries (kubectl, kubelet, & kubeadm) DisableOptimizations bool DisableMetrics bool + CustomQemuFirmwarePath string } // KubernetesConfig contains the parameters used to configure the VM Kubernetes. diff --git a/pkg/minikube/registry/drvs/qemu2/qemu2.go b/pkg/minikube/registry/drvs/qemu2/qemu2.go index 5cd70e58f1..7871bb3d41 100644 --- a/pkg/minikube/registry/drvs/qemu2/qemu2.go +++ b/pkg/minikube/registry/drvs/qemu2/qemu2.go @@ -26,6 +26,7 @@ import ( "runtime" "github.com/docker/machine/libmachine/drivers" + "github.com/spf13/viper" "k8s.io/minikube/pkg/drivers/qemu" "k8s.io/minikube/pkg/minikube/config" @@ -64,7 +65,10 @@ func qemuSystemProgram() (string, error) { } } -func qemuFirmwarePath() (string, error) { +func qemuFirmwarePath(customPath string) (string, error) { + if customPath != "" { + return customPath, nil + } arch := runtime.GOARCH // For macOS, find the correct brew installation path for qemu firmware if runtime.GOOS == "darwin" { @@ -126,7 +130,7 @@ func configure(cc config.ClusterConfig, n config.Node) (interface{}, error) { default: return nil, fmt.Errorf("unknown arch: %s", runtime.GOARCH) } - qemuFirmware, err := qemuFirmwarePath() + qemuFirmware, err := qemuFirmwarePath(cc.CustomQemuFirmwarePath) if err != nil { return nil, err } @@ -166,12 +170,12 @@ func status() registry.State { return registry.State{Error: err, Fix: "Install qemu-system", Doc: docURL} } - qemuFirmware, err := qemuFirmwarePath() + qemuFirmware, err := qemuFirmwarePath(viper.GetString("qemu-firmware-path")) if err != nil { return registry.State{Error: err, Doc: docURL} } - if _, err := os.Stat(qemuFirmware); err != nil && runtime.GOARCH == "arm64" { + if _, err := os.Stat(qemuFirmware); err != nil { return registry.State{Error: err, Fix: "Install uefi firmware", Doc: docURL} } From 7b890545b40f28f9408ed0e99b2af09f6713d29b Mon Sep 17 00:00:00 2001 From: Sharif Elgamal Date: Mon, 6 Jun 2022 12:54:56 -0700 Subject: [PATCH 059/545] Update cmd/minikube/cmd/start_flags.go Co-authored-by: Steven Powell <44844360+spowelljr@users.noreply.github.com> --- cmd/minikube/cmd/start_flags.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/minikube/cmd/start_flags.go b/cmd/minikube/cmd/start_flags.go index 2c0abb64ef..261b1af978 100644 --- a/cmd/minikube/cmd/start_flags.go +++ b/cmd/minikube/cmd/start_flags.go @@ -256,7 +256,7 @@ func initDriverFlags() { startCmd.Flags().String(subnet, "", "Subnet to be used on kic cluster. If left empty, minikube will choose subnet address, beginning from 192.168.49.0. (docker and podman driver only)") // qemu - startCmd.Flags().String(qemuFirmwarePath, "", "Path to the qemu firmware file. Defaults: For linux, the default firmware location. For macOS, the brew installation location. For Windows, C:\\Program Files\\qemu\\share") + startCmd.Flags().String(qemuFirmwarePath, "", "Path to the qemu firmware file. Defaults: For Linux, the default firmware location. For macOS, the brew installation location. For Windows, C:\\Program Files\\qemu\\share") } // initNetworkingFlags inits the commandline flags for connectivity related flags for start From 2f1ea61365ec77e1728496b67df229ae97ae86f4 Mon Sep 17 00:00:00 2001 From: Sharif Elgamal Date: Mon, 6 Jun 2022 13:50:27 -0700 Subject: [PATCH 060/545] define qemu as a qemu2 driver alias --- pkg/minikube/driver/driver.go | 2 + pkg/minikube/registry/drvs/qemu/doc.go | 17 ----- pkg/minikube/registry/drvs/qemu/qemu.go | 75 ----------------------- pkg/minikube/registry/drvs/qemu2/qemu2.go | 5 +- 4 files changed, 5 insertions(+), 94 deletions(-) delete mode 100644 pkg/minikube/registry/drvs/qemu/doc.go delete mode 100644 pkg/minikube/registry/drvs/qemu/qemu.go diff --git a/pkg/minikube/driver/driver.go b/pkg/minikube/driver/driver.go index cae2cdd08e..ebaa064c69 100644 --- a/pkg/minikube/driver/driver.go +++ b/pkg/minikube/driver/driver.go @@ -69,6 +69,8 @@ const ( AliasSSH = "generic" // AliasNative is driver name alias for None driver AliasNative = "native" + // AliasQEMU is the driver name alias for qemu2 + AliasQEMU = "qemu" ) var ( diff --git a/pkg/minikube/registry/drvs/qemu/doc.go b/pkg/minikube/registry/drvs/qemu/doc.go deleted file mode 100644 index ea4425ce8d..0000000000 --- a/pkg/minikube/registry/drvs/qemu/doc.go +++ /dev/null @@ -1,17 +0,0 @@ -/* -Copyright 2018 The Kubernetes Authors All rights reserved. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package qemu diff --git a/pkg/minikube/registry/drvs/qemu/qemu.go b/pkg/minikube/registry/drvs/qemu/qemu.go deleted file mode 100644 index 24f15693eb..0000000000 --- a/pkg/minikube/registry/drvs/qemu/qemu.go +++ /dev/null @@ -1,75 +0,0 @@ -/* -Copyright 2018 The Kubernetes Authors All rights reserved. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package qemu - -import ( - "fmt" - "os/exec" - "path/filepath" - - "github.com/docker/machine/libmachine/drivers" - drvqemu "github.com/machine-drivers/docker-machine-driver-qemu" - - "k8s.io/minikube/pkg/minikube/config" - "k8s.io/minikube/pkg/minikube/download" - "k8s.io/minikube/pkg/minikube/driver" - "k8s.io/minikube/pkg/minikube/localpath" - "k8s.io/minikube/pkg/minikube/registry" -) - -const ( - docURL = "https://minikube.sigs.k8s.io/docs/reference/drivers/qemu/" -) - -func init() { - if err := registry.Register(registry.DriverDef{ - Name: driver.QEMU, - Config: configure, - Status: status, - Default: true, - Priority: registry.Experimental, - }); err != nil { - panic(fmt.Sprintf("register failed: %v", err)) - } -} - -func configure(cc config.ClusterConfig, n config.Node) (interface{}, error) { - name := config.MachineName(cc, n) - return drvqemu.Driver{ - BaseDriver: &drivers.BaseDriver{ - MachineName: name, - StorePath: localpath.MiniPath(), - SSHUser: "docker", - }, - Boot2DockerURL: download.LocalISOResource(cc.MinikubeISO), - DiskSize: cc.DiskSize, - Memory: cc.Memory, - CPU: cc.CPUs, - EnginePort: 2376, - FirstQuery: true, - DiskPath: filepath.Join(localpath.MiniPath(), "machines", name, fmt.Sprintf("%s.img", name)), - }, nil -} - -func status() registry.State { - _, err := exec.LookPath("qemu-system-x86_64") - if err != nil { - return registry.State{Error: err, Fix: "Install qemu-system", Doc: docURL} - } - - return registry.State{Installed: true, Healthy: true, Running: true} -} diff --git a/pkg/minikube/registry/drvs/qemu2/qemu2.go b/pkg/minikube/registry/drvs/qemu2/qemu2.go index 5cd70e58f1..8a81a546a2 100644 --- a/pkg/minikube/registry/drvs/qemu2/qemu2.go +++ b/pkg/minikube/registry/drvs/qemu2/qemu2.go @@ -42,6 +42,7 @@ const ( func init() { if err := registry.Register(registry.DriverDef{ Name: driver.QEMU2, + Alias: []string{driver.AliasQEMU}, Init: func() drivers.Driver { return qemu.NewDriver("", "") }, Config: configure, Status: status, @@ -118,9 +119,9 @@ func configure(cc config.ClusterConfig, n config.Node) (interface{}, error) { qemuCPU = "cortex-a72" // highmem=off needed, see https://patchwork.kernel.org/project/qemu-devel/patch/20201126215017.41156-9-agraf@csgraf.de/#23800615 for details if runtime.GOOS == "darwin" { - qemuMachine = "virt,highmem=off" + qemuMachine += ",highmem=off" } else if _, err := os.Stat("/dev/kvm"); err == nil { - qemuMachine = "virt,gic-version=3" + qemuMachine += ",gic-version=3" qemuCPU = "host" } default: From 956515967e6af3e4e73074df1a8883adaeb8b327 Mon Sep 17 00:00:00 2001 From: Sharif Elgamal Date: Mon, 6 Jun 2022 13:51:40 -0700 Subject: [PATCH 061/545] remove import --- pkg/minikube/registry/drvs/init.go | 1 - 1 file changed, 1 deletion(-) diff --git a/pkg/minikube/registry/drvs/init.go b/pkg/minikube/registry/drvs/init.go index 6176d892ef..78bb3e6631 100644 --- a/pkg/minikube/registry/drvs/init.go +++ b/pkg/minikube/registry/drvs/init.go @@ -25,7 +25,6 @@ import ( _ "k8s.io/minikube/pkg/minikube/registry/drvs/none" _ "k8s.io/minikube/pkg/minikube/registry/drvs/parallels" _ "k8s.io/minikube/pkg/minikube/registry/drvs/podman" - _ "k8s.io/minikube/pkg/minikube/registry/drvs/qemu" _ "k8s.io/minikube/pkg/minikube/registry/drvs/qemu2" _ "k8s.io/minikube/pkg/minikube/registry/drvs/ssh" _ "k8s.io/minikube/pkg/minikube/registry/drvs/virtualbox" From 92ebc8cbb6ad6de1e548d43e054d8c068261e2ee Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 6 Jun 2022 22:38:35 +0000 Subject: [PATCH 062/545] Update auto-generated docs and translations --- site/content/en/docs/commands/start.md | 1 + translations/de.json | 1 + translations/es.json | 1 + translations/fr.json | 1 + translations/ja.json | 1 + translations/ko.json | 1 + translations/pl.json | 1 + translations/ru.json | 1 + translations/strings.txt | 1 + translations/zh-CN.json | 1 + 10 files changed, 10 insertions(+) diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index 7284459555..061da59824 100644 --- a/site/content/en/docs/commands/start.md +++ b/site/content/en/docs/commands/start.md @@ -102,6 +102,7 @@ minikube start [flags] -o, --output string Format to print stdout in. Options include: [text,json] (default "text") --ports strings List of ports that should be exposed (docker and podman driver only) --preload If set, download tarball of preloaded images if available to improve start time. Defaults to true. (default true) + --qemu-firmware-path string Path to the qemu firmware file. Defaults: For Linux, the default firmware location. For macOS, the brew installation location. For Windows, C:\Program Files\qemu\share --registry-mirror strings Registry mirrors to pass to the Docker daemon --service-cluster-ip-range string The CIDR to be used for service cluster IPs. (default "10.96.0.0/12") --ssh-ip-address string IP address (ssh driver only) diff --git a/translations/de.json b/translations/de.json index ba591e10a6..f8079cfff9 100644 --- a/translations/de.json +++ b/translations/de.json @@ -456,6 +456,7 @@ "Outputs minikube shell completion for the given shell (bash, zsh or fish)\n\n\tThis depends on the bash-completion binary. Example installation instructions:\n\tOS X:\n\t\t$ brew install bash-completion\n\t\t$ source $(brew --prefix)/etc/bash_completion\n\t\t$ minikube completion bash \u003e ~/.minikube-completion # for bash users\n\t\t$ minikube completion zsh \u003e ~/.minikube-completion # for zsh users\n\t\t$ source ~/.minikube-completion\n\t\t$ minikube completion fish \u003e ~/.config/fish/completions/minikube.fish # for fish users\n\tUbuntu:\n\t\t$ apt-get install bash-completion\n\t\t$ source /etc/bash_completion\n\t\t$ source \u003c(minikube completion bash) # for bash users\n\t\t$ source \u003c(minikube completion zsh) # for zsh users\n\t\t$ minikube completion fish \u003e ~/.config/fish/completions/minikube.fish # for fish users\n\n\tAdditionally, you may want to output the completion to a file and source in your .bashrc\n\n\tNote for zsh users: [1] zsh completions are only supported in versions of zsh \u003e= 5.2\n\tNote for fish users: [2] please refer to this docs for more details https://fishshell.com/docs/current/#tab-completion\n": "", "Overwrite image even if same image:tag name exists": "Überschreibe das Image, auch wenn ein Image mit dem gleichen Image:Tag-Namen existiert", "Path to the Dockerfile to use (optional)": "Pfad des zu verwendenden Dockerfiles (optional)", + "Path to the qemu firmware file. Defaults: For Linux, the default firmware location. For macOS, the brew installation location. For Windows, C:\\Program Files\\qemu\\share": "", "Pause": "", "Paused {{.count}} containers": "{{.count}} Container pausiert", "Paused {{.count}} containers in: {{.namespaces}}": "{{.count}} Container pausiert in: {{.namespaces}}", diff --git a/translations/es.json b/translations/es.json index 0040fab95c..49a9e40b67 100644 --- a/translations/es.json +++ b/translations/es.json @@ -464,6 +464,7 @@ "Outputs minikube shell completion for the given shell (bash, zsh or fish)\n\n\tThis depends on the bash-completion binary. Example installation instructions:\n\tOS X:\n\t\t$ brew install bash-completion\n\t\t$ source $(brew --prefix)/etc/bash_completion\n\t\t$ minikube completion bash \u003e ~/.minikube-completion # for bash users\n\t\t$ minikube completion zsh \u003e ~/.minikube-completion # for zsh users\n\t\t$ source ~/.minikube-completion\n\t\t$ minikube completion fish \u003e ~/.config/fish/completions/minikube.fish # for fish users\n\tUbuntu:\n\t\t$ apt-get install bash-completion\n\t\t$ source /etc/bash_completion\n\t\t$ source \u003c(minikube completion bash) # for bash users\n\t\t$ source \u003c(minikube completion zsh) # for zsh users\n\t\t$ minikube completion fish \u003e ~/.config/fish/completions/minikube.fish # for fish users\n\n\tAdditionally, you may want to output the completion to a file and source in your .bashrc\n\n\tNote for zsh users: [1] zsh completions are only supported in versions of zsh \u003e= 5.2\n\tNote for fish users: [2] please refer to this docs for more details https://fishshell.com/docs/current/#tab-completion\n": "", "Overwrite image even if same image:tag name exists": "", "Path to the Dockerfile to use (optional)": "", + "Path to the qemu firmware file. Defaults: For Linux, the default firmware location. For macOS, the brew installation location. For Windows, C:\\Program Files\\qemu\\share": "", "Pause": "", "Paused {{.count}} containers": "", "Paused {{.count}} containers in: {{.namespaces}}": "", diff --git a/translations/fr.json b/translations/fr.json index 30e1aa91ff..605ed5f438 100644 --- a/translations/fr.json +++ b/translations/fr.json @@ -443,6 +443,7 @@ "Outputs minikube shell completion for the given shell (bash, zsh or fish)\n\n\tThis depends on the bash-completion binary. Example installation instructions:\n\tOS X:\n\t\t$ brew install bash-completion\n\t\t$ source $(brew --prefix)/etc/bash_completion\n\t\t$ minikube completion bash \u003e ~/.minikube-completion # for bash users\n\t\t$ minikube completion zsh \u003e ~/.minikube-completion # for zsh users\n\t\t$ source ~/.minikube-completion\n\t\t$ minikube completion fish \u003e ~/.config/fish/completions/minikube.fish # for fish users\n\tUbuntu:\n\t\t$ apt-get install bash-completion\n\t\t$ source /etc/bash_completion\n\t\t$ source \u003c(minikube completion bash) # for bash users\n\t\t$ source \u003c(minikube completion zsh) # for zsh users\n\t\t$ minikube completion fish \u003e ~/.config/fish/completions/minikube.fish # for fish users\n\n\tAdditionally, you may want to output the completion to a file and source in your .bashrc\n\n\tNote for zsh users: [1] zsh completions are only supported in versions of zsh \u003e= 5.2\n\tNote for fish users: [2] please refer to this docs for more details https://fishshell.com/docs/current/#tab-completion\n": "Affiche la complétion du shell minikube pour le shell donné (bash, zsh ou fish)\n\n\tCela dépend du binaire bash-completion. Exemple d'instructions d'installation :\n\tOS X :\n\t\t$ brew install bash-completion\n\t\t$ source $(brew --prefix)/etc/bash_completion\n\t\t$ minikube completion bash \u003e ~/.minikube-completion # pour les utilisateurs bash\n\t\t$ minikube completion zsh \u003e ~/.minikube-completion # pour les utilisateurs zsh\n\t\t$ source ~/.minikube-completion\n\t\t$ minikube completion fish \u003e ~/.config/fish/completions/minikube.fish # pour les utilisateurs de fish\n\tUbuntu:\n\t\t$ apt-get install bash-completion\n\t \t$ source /etc/bash_completion\n\t\t$ source \u003c(minikube completion bash) # pour les utilisateurs bash\n\t\t$ source \u003c(minikube completion zsh) # pour les utilisateurs zsh\n\t \t$ minikube completion fish \u003e ~/.config/fish/completions/minikube.fish # pour les utilisateurs de fish\n\n\tDe plus, vous voudrez peut-être sortir la complétion dans un fichier et une source dans votre .bashrc\n n\tRemarque pour les utilisateurs de zsh : [1] les complétions zsh ne sont prises en charge que dans les versions de zsh \u003e= 5.2\n\tRemarque pour les utilisateurs de fish : [2] veuillez vous référer à cette documentation pour plus de détails https://fishshell.com/docs/current/#tab-completion\n", "Overwrite image even if same image:tag name exists": "Écraser l'image même si la même image:balise existe", "Path to the Dockerfile to use (optional)": "Chemin d'accès au Dockerfile à utiliser (facultatif)", + "Path to the qemu firmware file. Defaults: For Linux, the default firmware location. For macOS, the brew installation location. For Windows, C:\\Program Files\\qemu\\share": "", "Pause": "Pause", "Paused {{.count}} containers": "{{.count}} conteneurs suspendus", "Paused {{.count}} containers in: {{.namespaces}}": "{{.count}} conteneurs suspendus dans : {{.namespaces}}", diff --git a/translations/ja.json b/translations/ja.json index 9c4f9c56a6..9fb0045d1d 100644 --- a/translations/ja.json +++ b/translations/ja.json @@ -454,6 +454,7 @@ "Outputs minikube shell completion for the given shell (bash, zsh or fish)\n\n\tThis depends on the bash-completion binary. Example installation instructions:\n\tOS X:\n\t\t$ brew install bash-completion\n\t\t$ source $(brew --prefix)/etc/bash_completion\n\t\t$ minikube completion bash \u003e ~/.minikube-completion # for bash users\n\t\t$ minikube completion zsh \u003e ~/.minikube-completion # for zsh users\n\t\t$ source ~/.minikube-completion\n\t\t$ minikube completion fish \u003e ~/.config/fish/completions/minikube.fish # for fish users\n\tUbuntu:\n\t\t$ apt-get install bash-completion\n\t\t$ source /etc/bash_completion\n\t\t$ source \u003c(minikube completion bash) # for bash users\n\t\t$ source \u003c(minikube completion zsh) # for zsh users\n\t\t$ minikube completion fish \u003e ~/.config/fish/completions/minikube.fish # for fish users\n\n\tAdditionally, you may want to output the completion to a file and source in your .bashrc\n\n\tNote for zsh users: [1] zsh completions are only supported in versions of zsh \u003e= 5.2\n\tNote for fish users: [2] please refer to this docs for more details https://fishshell.com/docs/current/#tab-completion\n": "指定されたシェル用の minikube シェル補完コマンドを出力 (bash、zsh、fish)\n\n\tbash-completion バイナリーに依存しています。インストールコマンドの例:\n\tOS X:\n\t\t$ brew install bash-completion\n\t\t$ source $(brew --prefix)/etc/bash_completion\n\t\t$ minikube completion bash \u003e ~/.minikube-completion # bash ユーザー用\n\t\t$ minikube completion zsh \u003e ~/.minikube-completion # zsh ユーザー用\n\t\t$ source ~/.minikube-completion\n\t\t$ minikube completion fish \u003e ~/.config/fish/completions/minikube.fish # fish ユーザー用\n\tUbuntu:\n\t\t$ apt-get install bash-completion\n\t\t$ source /etc/bash_completion\n\t\t$ source \u003c(minikube completion bash) # bash ユーザー用\n\t\t$ source \u003c(minikube completion zsh) # zsh ユーザー用\n\t\t$ minikube completion fish \u003e ~/.config/fish/completions/minikube.fish # fish ユーザー用\n\n\tさらに、補完コマンドをファイルに出力して .bashrc 内で source を実行するとよいでしょう\n\n\t注意 (zsh ユーザー): [1] zsh 補完コマンドは zsh バージョン \u003e= 5.2 でのみサポートしています\n\t注意 (fish ユーザー): [2] 詳細はこちらのドキュメントを参照してください https://fishshell.com/docs/current/#tab-completion\n", "Overwrite image even if same image:tag name exists": "同じ image:tag 名が存在していてもイメージを上書きします", "Path to the Dockerfile to use (optional)": "使用する Dockerfile へのパス (任意)", + "Path to the qemu firmware file. Defaults: For Linux, the default firmware location. For macOS, the brew installation location. For Windows, C:\\Program Files\\qemu\\share": "", "Pause": "一時停止", "Paused {{.count}} containers": "{{.count}} 個のコンテナーを一時停止しました", "Paused {{.count}} containers in: {{.namespaces}}": "{{.namespaces}} に存在する {{.count}} 個のコンテナーを一時停止しました", diff --git a/translations/ko.json b/translations/ko.json index a32d205c1e..6d553b11d5 100644 --- a/translations/ko.json +++ b/translations/ko.json @@ -479,6 +479,7 @@ "Outputs minikube shell completion for the given shell (bash, zsh or fish)\n\n\tThis depends on the bash-completion binary. Example installation instructions:\n\tOS X:\n\t\t$ brew install bash-completion\n\t\t$ source $(brew --prefix)/etc/bash_completion\n\t\t$ minikube completion bash \u003e ~/.minikube-completion # for bash users\n\t\t$ minikube completion zsh \u003e ~/.minikube-completion # for zsh users\n\t\t$ source ~/.minikube-completion\n\t\t$ minikube completion fish \u003e ~/.config/fish/completions/minikube.fish # for fish users\n\tUbuntu:\n\t\t$ apt-get install bash-completion\n\t\t$ source /etc/bash_completion\n\t\t$ source \u003c(minikube completion bash) # for bash users\n\t\t$ source \u003c(minikube completion zsh) # for zsh users\n\t\t$ minikube completion fish \u003e ~/.config/fish/completions/minikube.fish # for fish users\n\n\tAdditionally, you may want to output the completion to a file and source in your .bashrc\n\n\tNote for zsh users: [1] zsh completions are only supported in versions of zsh \u003e= 5.2\n\tNote for fish users: [2] please refer to this docs for more details https://fishshell.com/docs/current/#tab-completion\n": "", "Overwrite image even if same image:tag name exists": "", "Path to the Dockerfile to use (optional)": "", + "Path to the qemu firmware file. Defaults: For Linux, the default firmware location. For macOS, the brew installation location. For Windows, C:\\Program Files\\qemu\\share": "", "Pause": "", "Paused {{.count}} containers": "", "Paused {{.count}} containers in: {{.namespaces}}": "", diff --git a/translations/pl.json b/translations/pl.json index 3433a15426..6f70148964 100644 --- a/translations/pl.json +++ b/translations/pl.json @@ -473,6 +473,7 @@ "Outputs minikube shell completion for the given shell (bash, zsh or fish)\n\n\tThis depends on the bash-completion binary. Example installation instructions:\n\tOS X:\n\t\t$ brew install bash-completion\n\t\t$ source $(brew --prefix)/etc/bash_completion\n\t\t$ minikube completion bash \u003e ~/.minikube-completion # for bash users\n\t\t$ minikube completion zsh \u003e ~/.minikube-completion # for zsh users\n\t\t$ source ~/.minikube-completion\n\t\t$ minikube completion fish \u003e ~/.config/fish/completions/minikube.fish # for fish users\n\tUbuntu:\n\t\t$ apt-get install bash-completion\n\t\t$ source /etc/bash_completion\n\t\t$ source \u003c(minikube completion bash) # for bash users\n\t\t$ source \u003c(minikube completion zsh) # for zsh users\n\t\t$ minikube completion fish \u003e ~/.config/fish/completions/minikube.fish # for fish users\n\n\tAdditionally, you may want to output the completion to a file and source in your .bashrc\n\n\tNote for zsh users: [1] zsh completions are only supported in versions of zsh \u003e= 5.2\n\tNote for fish users: [2] please refer to this docs for more details https://fishshell.com/docs/current/#tab-completion\n": "", "Overwrite image even if same image:tag name exists": "Nadpisuje obraz nawet jeśli istnieje obraz o tej samej nazwie i tagu.", "Path to the Dockerfile to use (optional)": "Ścieżka pliku Dockerfile, którego należy użyć (opcjonalne)", + "Path to the qemu firmware file. Defaults: For Linux, the default firmware location. For macOS, the brew installation location. For Windows, C:\\Program Files\\qemu\\share": "", "Pause": "Stop", "Paused {{.count}} containers": "Zatrzymane kontenery: {{.count}}", "Paused {{.count}} containers in: {{.namespaces}}": "Zatrzymane kontenery: {{.count}} w przestrzeniach nazw: {{.namespaces}}", diff --git a/translations/ru.json b/translations/ru.json index d8bbe4aeaf..bbb156f5a3 100644 --- a/translations/ru.json +++ b/translations/ru.json @@ -429,6 +429,7 @@ "Outputs minikube shell completion for the given shell (bash, zsh or fish)\n\n\tThis depends on the bash-completion binary. Example installation instructions:\n\tOS X:\n\t\t$ brew install bash-completion\n\t\t$ source $(brew --prefix)/etc/bash_completion\n\t\t$ minikube completion bash \u003e ~/.minikube-completion # for bash users\n\t\t$ minikube completion zsh \u003e ~/.minikube-completion # for zsh users\n\t\t$ source ~/.minikube-completion\n\t\t$ minikube completion fish \u003e ~/.config/fish/completions/minikube.fish # for fish users\n\tUbuntu:\n\t\t$ apt-get install bash-completion\n\t\t$ source /etc/bash_completion\n\t\t$ source \u003c(minikube completion bash) # for bash users\n\t\t$ source \u003c(minikube completion zsh) # for zsh users\n\t\t$ minikube completion fish \u003e ~/.config/fish/completions/minikube.fish # for fish users\n\n\tAdditionally, you may want to output the completion to a file and source in your .bashrc\n\n\tNote for zsh users: [1] zsh completions are only supported in versions of zsh \u003e= 5.2\n\tNote for fish users: [2] please refer to this docs for more details https://fishshell.com/docs/current/#tab-completion\n": "", "Overwrite image even if same image:tag name exists": "", "Path to the Dockerfile to use (optional)": "", + "Path to the qemu firmware file. Defaults: For Linux, the default firmware location. For macOS, the brew installation location. For Windows, C:\\Program Files\\qemu\\share": "", "Pause": "", "Paused {{.count}} containers": "", "Paused {{.count}} containers in: {{.namespaces}}": "", diff --git a/translations/strings.txt b/translations/strings.txt index 843de236cf..f1d330ecc4 100644 --- a/translations/strings.txt +++ b/translations/strings.txt @@ -429,6 +429,7 @@ "Outputs minikube shell completion for the given shell (bash, zsh or fish)\n\n\tThis depends on the bash-completion binary. Example installation instructions:\n\tOS X:\n\t\t$ brew install bash-completion\n\t\t$ source $(brew --prefix)/etc/bash_completion\n\t\t$ minikube completion bash \u003e ~/.minikube-completion # for bash users\n\t\t$ minikube completion zsh \u003e ~/.minikube-completion # for zsh users\n\t\t$ source ~/.minikube-completion\n\t\t$ minikube completion fish \u003e ~/.config/fish/completions/minikube.fish # for fish users\n\tUbuntu:\n\t\t$ apt-get install bash-completion\n\t\t$ source /etc/bash_completion\n\t\t$ source \u003c(minikube completion bash) # for bash users\n\t\t$ source \u003c(minikube completion zsh) # for zsh users\n\t\t$ minikube completion fish \u003e ~/.config/fish/completions/minikube.fish # for fish users\n\n\tAdditionally, you may want to output the completion to a file and source in your .bashrc\n\n\tNote for zsh users: [1] zsh completions are only supported in versions of zsh \u003e= 5.2\n\tNote for fish users: [2] please refer to this docs for more details https://fishshell.com/docs/current/#tab-completion\n": "", "Overwrite image even if same image:tag name exists": "", "Path to the Dockerfile to use (optional)": "", + "Path to the qemu firmware file. Defaults: For Linux, the default firmware location. For macOS, the brew installation location. For Windows, C:\\Program Files\\qemu\\share": "", "Pause": "", "Paused {{.count}} containers": "", "Paused {{.count}} containers in: {{.namespaces}}": "", diff --git a/translations/zh-CN.json b/translations/zh-CN.json index 3241051e8d..dc7e7f1c87 100644 --- a/translations/zh-CN.json +++ b/translations/zh-CN.json @@ -544,6 +544,7 @@ "Outputs minikube shell completion for the given shell (bash, zsh or fish)\n\n\tThis depends on the bash-completion binary. Example installation instructions:\n\tOS X:\n\t\t$ brew install bash-completion\n\t\t$ source $(brew --prefix)/etc/bash_completion\n\t\t$ minikube completion bash \u003e ~/.minikube-completion # for bash users\n\t\t$ minikube completion zsh \u003e ~/.minikube-completion # for zsh users\n\t\t$ source ~/.minikube-completion\n\t\t$ minikube completion fish \u003e ~/.config/fish/completions/minikube.fish # for fish users\n\tUbuntu:\n\t\t$ apt-get install bash-completion\n\t\t$ source /etc/bash_completion\n\t\t$ source \u003c(minikube completion bash) # for bash users\n\t\t$ source \u003c(minikube completion zsh) # for zsh users\n\t\t$ minikube completion fish \u003e ~/.config/fish/completions/minikube.fish # for fish users\n\n\tAdditionally, you may want to output the completion to a file and source in your .bashrc\n\n\tNote for zsh users: [1] zsh completions are only supported in versions of zsh \u003e= 5.2\n\tNote for fish users: [2] please refer to this docs for more details https://fishshell.com/docs/current/#tab-completion\n": "", "Overwrite image even if same image:tag name exists": "", "Path to the Dockerfile to use (optional)": "", + "Path to the qemu firmware file. Defaults: For Linux, the default firmware location. For macOS, the brew installation location. For Windows, C:\\Program Files\\qemu\\share": "", "Pause": "暂停", "Paused kubelet and {{.count}} containers": "已暂停 kubelet 和 {{.count}} 个容器", "Paused kubelet and {{.count}} containers in: {{.namespaces}}": "已暂停 {{.namespaces}} 中的 kubelet 和 {{.count}} 个容器", From 74de6499f73adba2b72d0f26a29d1fd98816c45a Mon Sep 17 00:00:00 2001 From: Sharif Elgamal Date: Mon, 6 Jun 2022 17:46:44 -0700 Subject: [PATCH 063/545] refresh pods before verifying --- pkg/addons/addons_gcpauth.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/addons/addons_gcpauth.go b/pkg/addons/addons_gcpauth.go index cf2f9b315d..697c104d01 100644 --- a/pkg/addons/addons_gcpauth.go +++ b/pkg/addons/addons_gcpauth.go @@ -370,16 +370,16 @@ func verifyGCPAuthAddon(cc *config.ClusterConfig, name, val string) error { return ErrSkipThisAddon } - if err := verifyAddonStatusInternal(cc, name, val, "gcp-auth"); err != nil { - return err - } - if Refresh { if err := refreshExistingPods(cc); err != nil { return err } } + if err := verifyAddonStatusInternal(cc, name, val, "gcp-auth"); err != nil { + return err + } + if enable && err == nil { out.Styled(style.Notice, "Your GCP credentials will now be mounted into every pod created in the {{.name}} cluster.", out.V{"name": cc.Name}) out.Styled(style.Notice, "If you don't want your credentials mounted into a specific pod, add a label with the `gcp-auth-skip-secret` key to your pod configuration.") From f20b7ecf73f089d9a7d7ee497b540212ca317620 Mon Sep 17 00:00:00 2001 From: Francis Laniel Date: Tue, 31 May 2022 11:03:17 +0100 Subject: [PATCH 064/545] Fix minikube.iso target when not running inside docker. Fixes: d92f42a6e459 ("fix the minikube.iso make target") Signed-off-by: Francis Laniel --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 346dfd0614..48bdd5c414 100644 --- a/Makefile +++ b/Makefile @@ -322,7 +322,7 @@ ifeq ($(IN_DOCKER),1) else docker run --rm --workdir /mnt --volume $(CURDIR):/mnt $(ISO_DOCKER_EXTRA_ARGS) \ --user $(shell id -u):$(shell id -g) --env HOME=/tmp --env IN_DOCKER=1 \ - $(ISO_BUILD_IMAGE) /bin/bash -lc '/usr/bin/make out/minikube.iso' + $(ISO_BUILD_IMAGE) /bin/bash -lc '/usr/bin/make minikube-iso-$*' endif iso_in_docker: From 4f03ea51cbee4049e9e2b7741a1ed8bd1f40650d Mon Sep 17 00:00:00 2001 From: Francis Laniel Date: Fri, 8 Apr 2022 10:44:18 +0100 Subject: [PATCH 065/545] Add tbb package. This is needed by sysdig 0.27.1. It is based on the following patch: https://lore.kernel.org/buildroot/20220407182425.194001-2-flaniel@linux.microsoft.com/T/#u Signed-off-by: Francis Laniel --- deploy/iso/minikube-iso/package/Config.in | 1 + .../0001-tbb-Enable-cross-compilation.patch | 55 +++++++++++++++++++ deploy/iso/minikube-iso/package/tbb/Config.in | 16 ++++++ deploy/iso/minikube-iso/package/tbb/tbb.hash | 2 + deploy/iso/minikube-iso/package/tbb/tbb.mk | 39 +++++++++++++ 5 files changed, 113 insertions(+) create mode 100644 deploy/iso/minikube-iso/package/tbb/0001-tbb-Enable-cross-compilation.patch create mode 100644 deploy/iso/minikube-iso/package/tbb/Config.in create mode 100644 deploy/iso/minikube-iso/package/tbb/tbb.hash create mode 100644 deploy/iso/minikube-iso/package/tbb/tbb.mk diff --git a/deploy/iso/minikube-iso/package/Config.in b/deploy/iso/minikube-iso/package/Config.in index 3cb958fae6..fb09317e73 100644 --- a/deploy/iso/minikube-iso/package/Config.in +++ b/deploy/iso/minikube-iso/package/Config.in @@ -1,4 +1,5 @@ menu "System tools" + source "$BR2_EXTERNAL_MINIKUBE_PATH/package/tbb/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/package/crun/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/package/automount/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/package/gluster/Config.in" diff --git a/deploy/iso/minikube-iso/package/tbb/0001-tbb-Enable-cross-compilation.patch b/deploy/iso/minikube-iso/package/tbb/0001-tbb-Enable-cross-compilation.patch new file mode 100644 index 0000000000..652d59c47b --- /dev/null +++ b/deploy/iso/minikube-iso/package/tbb/0001-tbb-Enable-cross-compilation.patch @@ -0,0 +1,55 @@ +From 42c3faff14917f687aab405d8f571e352ffdf3f5 Mon Sep 17 00:00:00 2001 +From: Francis Laniel +Date: Wed, 6 Apr 2022 15:58:02 +0100 +Subject: [PATCH] tbb: Enable cross-compilation. + +This patch replaces hardcoded value for CPLUS and CONLY with $(CXX) and $(CC). +So, by defining CC= it is possible to cross compile this library using a +cross-compiler. + +This patch was originally written by: +Marcin Juszkiewicz +and taken from: +https://github.com/intel/luv-yocto/blob/3b0688bc9a5e8d52b6ca461b15fb4abd3eaaf7a8/meta-oe/recipes-support/tbb/tbb/cross-compile.patch + +Signed-off-by: Francis Laniel +--- + build/linux.clang.inc | 5 +++-- + build/linux.gcc.inc | 5 +++-- + 2 files changed, 6 insertions(+), 4 deletions(-) + +diff --git a/build/linux.clang.inc b/build/linux.clang.inc +index 5a459ef5..a0777db5 100644 +--- a/build/linux.clang.inc ++++ b/build/linux.clang.inc +@@ -31,8 +31,9 @@ DYLIB_KEY = -shared + EXPORT_KEY = -Wl,--version-script, + LIBDL = -ldl + +-CPLUS = clang++ +-CONLY = clang ++CPLUS = $(CXX) ++CONLY = $(CC) ++CPLUS_FLAGS = $(CXXFLAGS) + LIB_LINK_FLAGS = $(DYLIB_KEY) -Wl,-soname=$(BUILDING_LIBRARY) + LIBS += -lpthread -lrt + LINK_FLAGS = -Wl,-rpath-link=. -rdynamic +diff --git a/build/linux.gcc.inc b/build/linux.gcc.inc +index 786c4153..30242a82 100644 +--- a/build/linux.gcc.inc ++++ b/build/linux.gcc.inc +@@ -32,8 +32,9 @@ DYLIB_KEY = -shared + EXPORT_KEY = -Wl,--version-script, + LIBDL = -ldl + +-CPLUS = g++ +-CONLY = gcc ++CPLUS = $(CXX) ++CONLY = $(CC) ++CPLUS_FLAGS = $(CXXFLAGS) + LIB_LINK_FLAGS = $(DYLIB_KEY) -Wl,-soname=$(BUILDING_LIBRARY) + LIBS += -lpthread -lrt + LINK_FLAGS = -Wl,-rpath-link=. -rdynamic +-- +2.25.1 + diff --git a/deploy/iso/minikube-iso/package/tbb/Config.in b/deploy/iso/minikube-iso/package/tbb/Config.in new file mode 100644 index 0000000000..0f40b74d31 --- /dev/null +++ b/deploy/iso/minikube-iso/package/tbb/Config.in @@ -0,0 +1,16 @@ +config BR2_PACKAGE_TBB + bool "tbb" + depends on BR2_TOOLCHAIN_USES_GLIBC + depends on !BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_INSTALL_LIBSTDCPP + help + Intel(R) Threading Building Blocks (Intel(R) TBB) lets you + easily write parallel C++ programs that take full advantage + of multicore performance, that are portable, composable and + have future-proof scalability. + + https://www.threadingbuildingblocks.org/ + +comment "tbb needs a glibc toolchain w/ dynamic library, threads, C++" + depends on !BR2_TOOLCHAIN_USES_GLIBC || BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP diff --git a/deploy/iso/minikube-iso/package/tbb/tbb.hash b/deploy/iso/minikube-iso/package/tbb/tbb.hash new file mode 100644 index 0000000000..e9fb7511b8 --- /dev/null +++ b/deploy/iso/minikube-iso/package/tbb/tbb.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 b8dbab5aea2b70cf07844f86fa413e549e099aa3205b6a04059ca92ead93a372 tbb-2018_U5.tar.gz diff --git a/deploy/iso/minikube-iso/package/tbb/tbb.mk b/deploy/iso/minikube-iso/package/tbb/tbb.mk new file mode 100644 index 0000000000..cf06579b98 --- /dev/null +++ b/deploy/iso/minikube-iso/package/tbb/tbb.mk @@ -0,0 +1,39 @@ +################################################################################ +# +# tbb +# +################################################################################ + +TBB_VERSION = 2018_U5 +TBB_SITE = $(call github,01org,tbb,$(TBB_VERSION)) +TBB_INSTALL_STAGING = YES +TBB_LICENSE = Apache-2.0 +TBB_LICENSE_FILES = LICENSE + +TBB_SO_VERSION = 2 +TBB_LIBS = libtbb libtbbmalloc libtbbmalloc_proxy +TBB_BIN_PATH = $(@D)/build/linux_* + +define TBB_BUILD_CMDS + $(MAKE) $(TARGET_CONFIGURE_OPTS) arch=$(BR2_ARCH) -C $(@D) +endef + +define TBB_INSTALL_LIBS + $(foreach lib,$(TBB_LIBS), + $(INSTALL) -D -m 0755 $(TBB_BIN_PATH)/$(lib).so.$(TBB_SO_VERSION) \ + $(1)/usr/lib/$(lib).so.$(TBB_SO_VERSION) ; + ln -sf $(lib).so.$(TBB_SO_VERSION) $(1)/usr/lib/$(lib).so + ) +endef + +define TBB_INSTALL_STAGING_CMDS + mkdir -p $(STAGING_DIR)/usr/include/ + cp -a $(@D)/include/* $(STAGING_DIR)/usr/include/ + $(call TBB_INSTALL_LIBS,$(STAGING_DIR)) +endef + +define TBB_INSTALL_TARGET_CMDS + $(call TBB_INSTALL_LIBS,$(TARGET_DIR)) +endef + +$(eval $(generic-package)) From f0ccf77945bea213b9e45f2ef1a340b05d47cf4b Mon Sep 17 00:00:00 2001 From: Francis Laniel Date: Fri, 8 Apr 2022 10:44:58 +0100 Subject: [PATCH 066/545] Add sysdig 0.27.1 package. This package is used in place of sysdig 0.23.1 which comes with buildroot. Indeed, sysdig 0.23.1 does not compile with recent kernel. It is based on the following patch: https://lore.kernel.org/buildroot/20220407182425.194001-3-flaniel@linux.microsoft.com/T/#u Signed-off-by: Francis Laniel --- Makefile | 2 + deploy/iso/minikube-iso/package/Config.in | 1 + ...ATCH_COMMAND-to-fix-lua-types-and-fu.patch | 82 +++++++++++++++++++ .../iso/minikube-iso/package/sysdig/Config.in | 38 +++++++++ .../minikube-iso/package/sysdig/sysdig.hash | 4 + .../iso/minikube-iso/package/sysdig/sysdig.mk | 52 ++++++++++++ 6 files changed, 179 insertions(+) create mode 100644 deploy/iso/minikube-iso/package/sysdig/0001-libsinsp-Apply-PATCH_COMMAND-to-fix-lua-types-and-fu.patch create mode 100644 deploy/iso/minikube-iso/package/sysdig/Config.in create mode 100644 deploy/iso/minikube-iso/package/sysdig/sysdig.hash create mode 100644 deploy/iso/minikube-iso/package/sysdig/sysdig.mk diff --git a/Makefile b/Makefile index 48bdd5c414..d83eb5a7f6 100644 --- a/Makefile +++ b/Makefile @@ -292,6 +292,8 @@ minikube-iso-%: deploy/iso/minikube-iso/board/minikube/%/rootfs-overlay/usr/bin/ if [ ! -d $(BUILD_DIR)/buildroot ]; then \ mkdir -p $(BUILD_DIR); \ git clone --depth=1 --branch=$(BUILDROOT_BRANCH) https://github.com/buildroot/buildroot $(BUILD_DIR)/buildroot; \ + perl -pi -e 's@\s+source "package/sysdig/Config\.in"\n@@;' $(BUILD_DIR)/buildroot/package/Config.in; \ + rm -r $(BUILD_DIR)/buildroot/package/sysdig; \ cp deploy/iso/minikube-iso/go.hash $(BUILD_DIR)/buildroot/package/go/go.hash; \ fi; $(MAKE) -C $(BUILD_DIR)/buildroot $(BUILDROOT_OPTIONS) O=$(BUILD_DIR)/buildroot/output-$* minikube_$*_defconfig diff --git a/deploy/iso/minikube-iso/package/Config.in b/deploy/iso/minikube-iso/package/Config.in index fb09317e73..8fbd6c82f2 100644 --- a/deploy/iso/minikube-iso/package/Config.in +++ b/deploy/iso/minikube-iso/package/Config.in @@ -1,5 +1,6 @@ menu "System tools" source "$BR2_EXTERNAL_MINIKUBE_PATH/package/tbb/Config.in" + source "$BR2_EXTERNAL_MINIKUBE_PATH/package/sysdig/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/package/crun/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/package/automount/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/package/gluster/Config.in" diff --git a/deploy/iso/minikube-iso/package/sysdig/0001-libsinsp-Apply-PATCH_COMMAND-to-fix-lua-types-and-fu.patch b/deploy/iso/minikube-iso/package/sysdig/0001-libsinsp-Apply-PATCH_COMMAND-to-fix-lua-types-and-fu.patch new file mode 100644 index 0000000000..7873210281 --- /dev/null +++ b/deploy/iso/minikube-iso/package/sysdig/0001-libsinsp-Apply-PATCH_COMMAND-to-fix-lua-types-and-fu.patch @@ -0,0 +1,82 @@ +From cc8bccc3ebb90103900a7f0f2b085ddb723b8792 Mon Sep 17 00:00:00 2001 +From: Francis Laniel +Date: Wed, 6 Apr 2022 16:54:37 +0100 +Subject: [PATCH] libsinsp: Apply PATCH_COMMAND to fix lua types and function. + +Buildroot luajit 5.1 seems to not have compatibility between luaL_reg and +luaL_Reg. +So, we apply sysdig CMakeLists.txt PATCH_COMMAND to fix this and lua function +call as well. +Note that, this PATCH_COMMAND was added in sysdig in: +a064440394c9 ("Adding power support to Travis builds (#1566)") + +This patch is also present in kubernetes/minikube in: +f036c279bc59 ("Add patch for compiling sysdig with system luajit") + +Signed-off-by: Francis Laniel +--- + userspace/libsinsp/chisel.cpp | 6 +++--- + userspace/libsinsp/lua_parser.cpp | 2 +- + userspace/libsinsp/lua_parser_api.cpp | 2 +- + 3 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/userspace/libsinsp/chisel.cpp b/userspace/libsinsp/chisel.cpp +index 0a6e3cf8..0c2e255a 100644 +--- a/userspace/libsinsp/chisel.cpp ++++ b/userspace/libsinsp/chisel.cpp +@@ -98,7 +98,7 @@ void lua_stackdump(lua_State *L) + // Lua callbacks + /////////////////////////////////////////////////////////////////////////////// + #ifdef HAS_LUA_CHISELS +-const static struct luaL_reg ll_sysdig [] = ++const static struct luaL_Reg ll_sysdig [] = + { + {"set_filter", &lua_cbacks::set_global_filter}, + {"set_snaplen", &lua_cbacks::set_snaplen}, +@@ -134,7 +134,7 @@ const static struct luaL_reg ll_sysdig [] = + {NULL,NULL} + }; + +-const static struct luaL_reg ll_chisel [] = ++const static struct luaL_Reg ll_chisel [] = + { + {"request_field", &lua_cbacks::request_field}, + {"set_filter", &lua_cbacks::set_filter}, +@@ -146,7 +146,7 @@ const static struct luaL_reg ll_chisel [] = + {NULL,NULL} + }; + +-const static struct luaL_reg ll_evt [] = ++const static struct luaL_Reg ll_evt [] = + { + {"field", &lua_cbacks::field}, + {"get_num", &lua_cbacks::get_num}, +diff --git a/userspace/libsinsp/lua_parser.cpp b/userspace/libsinsp/lua_parser.cpp +index 0e26617d..78810d96 100644 +--- a/userspace/libsinsp/lua_parser.cpp ++++ b/userspace/libsinsp/lua_parser.cpp +@@ -32,7 +32,7 @@ extern "C" { + #include "lauxlib.h" + } + +-const static struct luaL_reg ll_filter [] = ++const static struct luaL_Reg ll_filter [] = + { + {"rel_expr", &lua_parser_cbacks::rel_expr}, + {"bool_op", &lua_parser_cbacks::bool_op}, +diff --git a/userspace/libsinsp/lua_parser_api.cpp b/userspace/libsinsp/lua_parser_api.cpp +index c89e9126..c3d8008a 100644 +--- a/userspace/libsinsp/lua_parser_api.cpp ++++ b/userspace/libsinsp/lua_parser_api.cpp +@@ -266,7 +266,7 @@ int lua_parser_cbacks::rel_expr(lua_State *ls) + string err = "Got non-table as in-expression operand\n"; + throw sinsp_exception("parser API error"); + } +- int n = luaL_getn(ls, 4); /* get size of table */ ++ int n = lua_objlen (ls, 4); /* get size of table */ + for (i=1; i<=n; i++) + { + lua_rawgeti(ls, 4, i); +-- +2.25.1 + diff --git a/deploy/iso/minikube-iso/package/sysdig/Config.in b/deploy/iso/minikube-iso/package/sysdig/Config.in new file mode 100644 index 0000000000..5a7fbb50e0 --- /dev/null +++ b/deploy/iso/minikube-iso/package/sysdig/Config.in @@ -0,0 +1,38 @@ +config BR2_PACKAGE_SYSDIG + bool "sysdig" + depends on BR2_LINUX_KERNEL + depends on BR2_INSTALL_LIBSTDCPP # jsoncpp + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + depends on BR2_TOOLCHAIN_HAS_THREADS # elfutils, jq + depends on !BR2_STATIC_LIBS # elfutils + depends on BR2_USE_WCHAR # elfutils + depends on BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC # elfutils + depends on BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION_5_1 + select BR2_PACKAGE_C_ARES + select BR2_PACKAGE_ELFUTILS + select BR2_PACKAGE_GRPC + select BR2_PACKAGE_GTEST + select BR2_PACKAGE_JQ + select BR2_PACKAGE_JSONCPP + select BR2_PACKAGE_LIBB64 + select BR2_PACKAGE_LIBCURL + select BR2_PACKAGE_NCURSES + select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_PROTOBUF + select BR2_PACKAGE_TBB + select BR2_PACKAGE_ZLIB + help + Sysdig is open source, system-level exploration: + capture system state and activity from a running Linux + instance, then save, filter and analyze. + Think of it as strace + tcpdump + lsof + awesome sauce. + With a little Lua cherry on top. + + https://github.com/draios/sysdig/wiki + +comment "sysdig needs a glibc or uclibc toolchain w/ C++, threads, gcc >= 4.8, dynamic library, a Linux kernel, and luajit or lua 5.1 to be built" + depends on !BR2_LINUX_KERNEL || !BR2_INSTALL_LIBSTDCPP \ + || !BR2_TOOLCHAIN_HAS_THREADS \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || BR2_STATIC_LIBS \ + || !(BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC) \ + || !BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION_5_1 diff --git a/deploy/iso/minikube-iso/package/sysdig/sysdig.hash b/deploy/iso/minikube-iso/package/sysdig/sysdig.hash new file mode 100644 index 0000000000..4bce674f3e --- /dev/null +++ b/deploy/iso/minikube-iso/package/sysdig/sysdig.hash @@ -0,0 +1,4 @@ +# sha256 locally computed +sha256 b9d05854493d245a7a7e75f77fc654508f720aab5e5e8a3a932bd8eb54e49bda sysdig-0.27.1.tar.gz +sha256 57d5b713b875eba35546a1408bf3f20c2703904a17d956be115ee55272db4cfa sysdig-0.23.1.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/deploy/iso/minikube-iso/package/sysdig/sysdig.mk b/deploy/iso/minikube-iso/package/sysdig/sysdig.mk new file mode 100644 index 0000000000..d497c7c381 --- /dev/null +++ b/deploy/iso/minikube-iso/package/sysdig/sysdig.mk @@ -0,0 +1,52 @@ +################################################################################ +# +# sysdig +# +################################################################################ + +SYSDIG_VERSION = 0.27.1 +SYSDIG_SITE = $(call github,draios,sysdig,$(SYSDIG_VERSION)) +SYSDIG_LICENSE = GPL-2.0 +SYSDIG_LICENSE_FILES = COPYING +SYSDIG_CPE_ID_VENDOR = sysdig +SYSDIG_CONF_OPTS = -DENABLE_DKMS=OFF -DUSE_BUNDLED_DEPS=OFF +SYSDIG_SUPPORTS_IN_SOURCE_BUILD = NO + +SYSDIG_DEPENDENCIES = \ + c-ares \ + elfutils \ + gtest \ + grpc \ + jq \ + jsoncpp \ + libb64 \ + libcurl \ + luainterpreter \ + ncurses \ + openssl \ + protobuf \ + tbb \ + zlib + +# sysdig creates the module Makefile from a template, which contains a +# single place-holder, KBUILD_FLAGS, wich is only replaced with two +# things: +# - debug flags, which we don't care about here, +# - 'sysdig-feature' flags, which are never set, so always empty +# So, just replace the place-holder with the only meaningful value: nothing. +define SYSDIG_MODULE_GEN_MAKEFILE + $(INSTALL) -m 0644 $(@D)/driver/Makefile.in $(@D)/driver/Makefile + $(SED) 's/@KBUILD_FLAGS@//;' $(@D)/driver/Makefile + $(SED) 's/@PROBE_NAME@/sysdig-probe/;' $(@D)/driver/Makefile +endef +SYSDIG_POST_PATCH_HOOKS += SYSDIG_MODULE_GEN_MAKEFILE + +# Don't build the driver as part of the 'standard' procedure, we'll +# build it on our own with the kernel-module infra. +SYSDIG_CONF_OPTS += -DBUILD_DRIVER=OFF + +SYSDIG_MODULE_SUBDIRS = driver +SYSDIG_MODULE_MAKE_OPTS = KERNELDIR=$(LINUX_DIR) + +$(eval $(kernel-module)) +$(eval $(cmake-package)) From 770d41f21b42b037fbf4386b1817e3a3d3370aaf Mon Sep 17 00:00:00 2001 From: Francis Laniel Date: Wed, 13 Oct 2021 19:28:51 +0200 Subject: [PATCH 067/545] Use kernel 5.10 for minikube.iso. This commit jumps kernel version used in minikube.iso to 5.10. To do so, the following kernel configuration options were added to linux_*_defconfig: - CONFIG_TMPFS to be able to use mount -t tmpfs in init. - CONFIG_PCI to have network. - CONFIG_BRIDGE_NETFILTER to have /proc/sys/net/bridge/bridge-nf-call-iptables which is needed by kubeadm. CONFIG_* relaed to vbox were added to linux_x86_64_defconfig and as consequence vbox related packages were removed since vbox modules are available in upstream kernel. To compile falco module, CONFIG_FTRACE_* were added to linux_aarch64_defconfig. Signed-off-by: Francis Laniel --- Makefile | 2 +- .../arch/x86_64/package/Config.in | 1 - .../package/hyperv-daemons/hyperv-daemons.mk | 2 +- .../arch/x86_64/package/vbox-guest/Config.in | 5 -- .../x86_64/package/vbox-guest/vbox-guest.hash | 9 --- .../x86_64/package/vbox-guest/vbox-guest.mk | 67 ------------------- .../package/vbox-guest/vboxservice.service | 17 ----- .../minikube/aarch64/linux_aarch64_defconfig | 7 +- .../minikube/x86_64/linux_x86_64_defconfig | 6 ++ .../configs/minikube_aarch64_defconfig | 6 +- .../configs/minikube_x86_64_defconfig | 6 +- 11 files changed, 20 insertions(+), 108 deletions(-) delete mode 100644 deploy/iso/minikube-iso/arch/x86_64/package/vbox-guest/Config.in delete mode 100644 deploy/iso/minikube-iso/arch/x86_64/package/vbox-guest/vbox-guest.hash delete mode 100644 deploy/iso/minikube-iso/arch/x86_64/package/vbox-guest/vbox-guest.mk delete mode 100644 deploy/iso/minikube-iso/arch/x86_64/package/vbox-guest/vboxservice.service diff --git a/Makefile b/Makefile index d83eb5a7f6..b4ee75eaeb 100644 --- a/Makefile +++ b/Makefile @@ -73,7 +73,7 @@ MINIKUBE_BUCKET ?= minikube/releases MINIKUBE_UPLOAD_LOCATION := gs://${MINIKUBE_BUCKET} MINIKUBE_RELEASES_URL=https://github.com/kubernetes/minikube/releases/download -KERNEL_VERSION ?= 4.19.235 +KERNEL_VERSION ?= 5.10.57 # latest from https://github.com/golangci/golangci-lint/releases # update this only by running `make update-golint-version` GOLINT_VERSION ?= v1.46.2 diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/Config.in b/deploy/iso/minikube-iso/arch/x86_64/package/Config.in index 1766727bf7..25e88687a5 100644 --- a/deploy/iso/minikube-iso/arch/x86_64/package/Config.in +++ b/deploy/iso/minikube-iso/arch/x86_64/package/Config.in @@ -10,6 +10,5 @@ menu "System tools x86_64" source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/cni-plugins/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/containerd-bin/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/podman/Config.in" - source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/vbox-guest/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/hyperv-daemons/Config.in" endmenu diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/hyperv-daemons/hyperv-daemons.mk b/deploy/iso/minikube-iso/arch/x86_64/package/hyperv-daemons/hyperv-daemons.mk index 3ea36bbbb0..dcc26010ee 100644 --- a/deploy/iso/minikube-iso/arch/x86_64/package/hyperv-daemons/hyperv-daemons.mk +++ b/deploy/iso/minikube-iso/arch/x86_64/package/hyperv-daemons/hyperv-daemons.mk @@ -5,7 +5,7 @@ ################################################################################ HYPERV_DAEMONS_VERSION = $(call qstrip,$(BR2_LINUX_KERNEL_VERSION)) -HYPERV_DAEMONS_SITE = https://www.kernel.org/pub/linux/kernel/v4.x +HYPERV_DAEMONS_SITE = https://www.kernel.org/pub/linux/kernel/v5.x HYPERV_DAEMONS_SOURCE = linux-$(HYPERV_DAEMONS_VERSION).tar.xz define HYPERV_DAEMONS_BUILD_CMDS diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/vbox-guest/Config.in b/deploy/iso/minikube-iso/arch/x86_64/package/vbox-guest/Config.in deleted file mode 100644 index 2147deb04a..0000000000 --- a/deploy/iso/minikube-iso/arch/x86_64/package/vbox-guest/Config.in +++ /dev/null @@ -1,5 +0,0 @@ -config BR2_PACKAGE_VBOX_GUEST - bool "vbox-guest" - depends on BR2_x86_64 - depends on BR2_LINUX_KERNEL - diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/vbox-guest/vbox-guest.hash b/deploy/iso/minikube-iso/arch/x86_64/package/vbox-guest/vbox-guest.hash deleted file mode 100644 index 8d7c01127b..0000000000 --- a/deploy/iso/minikube-iso/arch/x86_64/package/vbox-guest/vbox-guest.hash +++ /dev/null @@ -1,9 +0,0 @@ -# From http://download.virtualbox.org/virtualbox/5.1.30/SHA256SUMS -sha256 96cab2296fb014ce0a16b7b9603b52208b9403c10c1524b44201d3c274e8a821 VirtualBox-5.1.38.tar.bz2 -sha256 0e7ee2c78ebf7cd0d3a933d51148bef04a64f64fb27ccf70d59cddf9ca1e517a VBoxGuestAdditions_5.1.38.iso -# From http://download.virtualbox.org/virtualbox/5.2.32/SHA256SUMS -sha256 ff6390e50cb03718cd3f5779627910999c12279b465e340c80d7175778a33958 VirtualBox-5.2.32.tar.bz2 -sha256 4311c7408a3410e6a33264a9062347d9eec04f58339a49f0a60488c0cabc8996 VBoxGuestAdditions_5.2.32.iso -# From http://download.virtualbox.org/virtualbox/5.2.42/SHA256SUMS -sha256 e5bee2e34f349aac115ee93974febfe3213ad5e94045fa36b9f04b5f8caa3720 VirtualBox-5.2.42.tar.bz2 -sha256 ff784417295e48e3cee80a596faf05e3b0976e1b94d3b88427939912b0c1fc45 VBoxGuestAdditions_5.2.42.iso diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/vbox-guest/vbox-guest.mk b/deploy/iso/minikube-iso/arch/x86_64/package/vbox-guest/vbox-guest.mk deleted file mode 100644 index 2b1eeca93f..0000000000 --- a/deploy/iso/minikube-iso/arch/x86_64/package/vbox-guest/vbox-guest.mk +++ /dev/null @@ -1,67 +0,0 @@ -################################################################################ -# -# VirtualBox Linux Guest Drivers -# -################################################################################ - -VBOX_GUEST_VERSION = 5.2.42 -VBOX_GUEST_SITE = http://download.virtualbox.org/virtualbox/$(VBOX_GUEST_VERSION) -VBOX_GUEST_LICENSE = GPLv2 -VBOX_GUEST_LICENSE_FILES = COPYING -VBOX_GUEST_SOURCE = VirtualBox-$(VBOX_GUEST_VERSION).tar.bz2 -VBOX_GUEST_EXTRA_DOWNLOADS = http://download.virtualbox.org/virtualbox/${VBOX_GUEST_VERSION}/VBoxGuestAdditions_${VBOX_GUEST_VERSION}.iso - -define VBOX_GUEST_EXPORT_MODULES - ( cd $(@D)/src/VBox/Additions/linux; ./export_modules.sh modules.tar.gz ) - mkdir -p $(@D)/vbox-modules - tar -C $(@D)/vbox-modules -xzf $(@D)/src/VBox/Additions/linux/modules.tar.gz -endef - -VBOX_GUEST_POST_EXTRACT_HOOKS += VBOX_GUEST_EXPORT_MODULES - -VBOX_GUEST_MODULE_SUBDIRS = vbox-modules/ -VBOX_GUEST_MODULE_MAKE_OPTS = KVERSION=$(LINUX_VERSION_PROBED) KERN_DIR=$(LINUX_DIR) - -define VBOX_GUEST_USERS - - -1 vboxsf -1 - - - - - -endef - -define VBOX_GUEST_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 644 \ - $(VBOX_GUEST_PKGDIR)/vboxservice.service \ - $(TARGET_DIR)/usr/lib/systemd/system/vboxservice.service - - ln -fs /usr/lib/systemd/system/vboxservice.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/vboxservice.service -endef - -define VBOX_GUEST_BUILD_CMDS - 7z x -aoa $(BR2_DL_DIR)/vbox-guest/VBoxGuestAdditions_${VBOX_GUEST_VERSION}.iso -ir'!VBoxLinuxAdditions.run' -o"$(@D)" - sh $(@D)/VBoxLinuxAdditions.run --noexec --target $(@D) - tar --overwrite -C $(@D) -xjf $(@D)/VBoxGuestAdditions-amd64.tar.bz2 sbin/VBoxService - tar --overwrite -C $(@D) -xjf $(@D)/VBoxGuestAdditions-amd64.tar.bz2 bin/VBoxControl - - $(TARGET_CC) -Wall -O2 -D_GNU_SOURCE -DIN_RING3 \ - -I$(@D)/vbox-modules/vboxsf/include \ - -I$(@D)/vbox-modules/vboxsf \ - -o $(@D)/vbox-modules/mount.vboxsf \ - $(@D)/src/VBox/Additions/linux/sharedfolders/vbsfmount.c \ - $(@D)/src/VBox/Additions/linux/sharedfolders/mount.vboxsf.c -endef - -define VBOX_GUEST_INSTALL_TARGET_CMDS - $(INSTALL) -Dm755 \ - $(@D)/vbox-modules/mount.vboxsf \ - $(TARGET_DIR)/sbin - - $(INSTALL) -Dm755 \ - $(@D)/sbin/VBoxService \ - $(TARGET_DIR)/sbin - - $(INSTALL) -Dm755 \ - $(@D)/bin/VBoxControl \ - $(TARGET_DIR)/bin -endef - -$(eval $(kernel-module)) -$(eval $(generic-package)) diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/vbox-guest/vboxservice.service b/deploy/iso/minikube-iso/arch/x86_64/package/vbox-guest/vboxservice.service deleted file mode 100644 index 5f05bd3d20..0000000000 --- a/deploy/iso/minikube-iso/arch/x86_64/package/vbox-guest/vboxservice.service +++ /dev/null @@ -1,17 +0,0 @@ -[Unit] -Description=VirtualBox Guest Service -ConditionVirtualization=oracle - -[Service] -ExecStartPre=-/usr/sbin/modprobe vboxguest - -# Broken and probably unused: Unknown symbol ttm_bo_del_sub_from_lru -# ExecStartPre=-/usr/sbin/modprobe vboxvideo - -ExecStartPre=-/usr/sbin/modprobe vboxsf -# Normally, VirtualBox only syncs every 20 minutes. This syncs on start, and -# forces an immediate sync if VM time is over 5 seconds off. -ExecStart=/usr/sbin/VBoxService -f --disable-automount --timesync-set-start --timesync-set-threshold 5000 - -[Install] -WantedBy=multi-user.target diff --git a/deploy/iso/minikube-iso/board/minikube/aarch64/linux_aarch64_defconfig b/deploy/iso/minikube-iso/board/minikube/aarch64/linux_aarch64_defconfig index 2d0a352999..6580b3eb09 100644 --- a/deploy/iso/minikube-iso/board/minikube/aarch64/linux_aarch64_defconfig +++ b/deploy/iso/minikube-iso/board/minikube/aarch64/linux_aarch64_defconfig @@ -1,3 +1,9 @@ +CONFIG_FTRACE_SYSCALLS=y +CONFIG_FTRACE=y +CONFIG_HAVE_SYSCALL_TRACEPOINTS=y +CONFIG_BRIDGE_NETFILTER=y +CONFIG_PCI=y +CONFIG_TMPFS=y CONFIG_SYSVIPC=y CONFIG_POSIX_MQUEUE=y CONFIG_AUDIT=y @@ -1213,5 +1219,4 @@ CONFIG_DEBUG_FS=y CONFIG_DEBUG_KERNEL=y # CONFIG_SCHED_DEBUG is not set # CONFIG_DEBUG_PREEMPT is not set -# CONFIG_FTRACE is not set CONFIG_MEMTEST=y diff --git a/deploy/iso/minikube-iso/board/minikube/x86_64/linux_x86_64_defconfig b/deploy/iso/minikube-iso/board/minikube/x86_64/linux_x86_64_defconfig index 2c5364616d..d1ffd4c0d3 100644 --- a/deploy/iso/minikube-iso/board/minikube/x86_64/linux_x86_64_defconfig +++ b/deploy/iso/minikube-iso/board/minikube/x86_64/linux_x86_64_defconfig @@ -1,3 +1,9 @@ +CONFIG_VBOXGUEST=m +CONFIG_VBOXSF_FS=m +CONFIG_DRM_VBOXVIDEO=m +CONFIG_BRIDGE_NETFILTER=y +CONFIG_PCI=y +CONFIG_TMPFS=y # CONFIG_LOCALVERSION_AUTO is not set CONFIG_KERNEL_LZ4=y CONFIG_SYSVIPC=y diff --git a/deploy/iso/minikube-iso/configs/minikube_aarch64_defconfig b/deploy/iso/minikube-iso/configs/minikube_aarch64_defconfig index 2ab5989e6a..4d2b25421f 100644 --- a/deploy/iso/minikube-iso/configs/minikube_aarch64_defconfig +++ b/deploy/iso/minikube-iso/configs/minikube_aarch64_defconfig @@ -29,13 +29,13 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_MINIKUBE_PATH)/board/minikube/aarch BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_MINIKUBE_PATH)/board/minikube/aarch64/genimage.cfg" -# Linux headers same as kernel, a 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.235" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.57" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_LINUX_KERNEL_INSTALL_TARGET=y diff --git a/deploy/iso/minikube-iso/configs/minikube_x86_64_defconfig b/deploy/iso/minikube-iso/configs/minikube_x86_64_defconfig index 2623be4091..2ad7c3ceec 100644 --- a/deploy/iso/minikube-iso/configs/minikube_x86_64_defconfig +++ b/deploy/iso/minikube-iso/configs/minikube_x86_64_defconfig @@ -31,13 +31,13 @@ BR2_TARGET_SYSLINUX=y BR2_TARGET_ROOTFS_CPIO=y BR2_TARGET_ROOTFS_CPIO_GZIP=y -# Linux headers same as kernel, a 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.235" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.57" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_LINUX_KERNEL_INSTALL_TARGET=y From 06022e80174fd5fa65d9d702546846a0e95ead99 Mon Sep 17 00:00:00 2001 From: Francis Laniel Date: Tue, 31 May 2022 11:01:52 +0100 Subject: [PATCH 068/545] For prototyping purpose: Remove CHANGELOG. CHANGELOG file is created by a jenkins related script which I do not run when building the image myself outside of CI Signed-off-by: Francis Laniel --- Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/Makefile b/Makefile index b4ee75eaeb..31f0666851 100644 --- a/Makefile +++ b/Makefile @@ -287,7 +287,6 @@ minikube-iso-arm64: minikube-iso-aarch64 minikube-iso-%: deploy/iso/minikube-iso/board/minikube/%/rootfs-overlay/usr/bin/auto-pause # build minikube iso echo $(ISO_VERSION) > deploy/iso/minikube-iso/board/minikube/$*/rootfs-overlay/etc/VERSION - cp deploy/iso/minikube-iso/CHANGELOG deploy/iso/minikube-iso/board/minikube/$*/rootfs-overlay/etc/CHANGELOG cp deploy/iso/minikube-iso/arch/$*/Config.in.tmpl deploy/iso/minikube-iso/Config.in if [ ! -d $(BUILD_DIR)/buildroot ]; then \ mkdir -p $(BUILD_DIR); \ From 9f21f1e4a62ba6cff2d455c23f9919f7dd8d4676 Mon Sep 17 00:00:00 2001 From: Francis Laniel Date: Tue, 31 May 2022 15:46:12 +0100 Subject: [PATCH 069/545] Fix linux-menuconfig Makefile target. It now uses the output-* directory corresponding to the target architecture under out/buildroot. Fixes: d1829f24ec6d ("small fixes") Signed-off-by: Francis Laniel --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 31f0666851..397ae2734c 100644 --- a/Makefile +++ b/Makefile @@ -313,9 +313,9 @@ iso-menuconfig: ## Configure buildroot configuration # Change the kernel configuration for the minikube ISO linux-menuconfig-%: ## Configure Linux kernel configuration - $(MAKE) -C $(BUILD_DIR)/buildroot/output/build/linux-$(KERNEL_VERSION)/ menuconfig - $(MAKE) -C $(BUILD_DIR)/buildroot/output/build/linux-$(KERNEL_VERSION)/ savedefconfig - cp $(BUILD_DIR)/buildroot/output/build/linux-$(KERNEL_VERSION)/defconfig deploy/iso/minikube-iso/board/minikube/$*/linux_$*_defconfig + $(MAKE) -C $(BUILD_DIR)/buildroot/output-$*/build/linux-$(KERNEL_VERSION)/ menuconfig + $(MAKE) -C $(BUILD_DIR)/buildroot/output-$*/build/linux-$(KERNEL_VERSION)/ savedefconfig + cp $(BUILD_DIR)/buildroot/output-$*/build/linux-$(KERNEL_VERSION)/defconfig deploy/iso/minikube-iso/board/minikube/$*/linux_$*_defconfig out/minikube-%.iso: $(shell find "deploy/iso/minikube-iso" -type f) ifeq ($(IN_DOCKER),1) From c0a0f4542d9178b8f00fb57fdaeceaae57e2313c Mon Sep 17 00:00:00 2001 From: Francis Laniel Date: Tue, 7 Jun 2022 10:30:33 +0100 Subject: [PATCH 070/545] For test purpose only: permits the CI running test with this ISO. Signed-off-by: Francis Laniel --- Makefile | 2 +- pkg/minikube/download/iso.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 397ae2734c..24bf8a3842 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.26.0-1653677468-13807 +ISO_VERSION ?= v1.26.0-1654280115-12707 # 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 dcbe6c9089..6a9a6e85f1 100644 --- a/pkg/minikube/download/iso.go +++ b/pkg/minikube/download/iso.go @@ -41,7 +41,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/13807" + isoBucket := "minikube-builds/iso/12707" return []string{ fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s-%s.iso", isoBucket, v, runtime.GOARCH), fmt.Sprintf("https://github.com/kubernetes/minikube/releases/download/%s/minikube-%s-%s.iso", v, v, runtime.GOARCH), From c7707168f5cc8826b8ab6cd9e020b6e9b7b5fb38 Mon Sep 17 00:00:00 2001 From: layakdev <107048101+layakdev@users.noreply.github.com> Date: Tue, 7 Jun 2022 14:51:10 +0200 Subject: [PATCH 071/545] Make closing CLI-terminal more visible --- site/content/en/docs/start/_index.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/site/content/en/docs/start/_index.md b/site/content/en/docs/start/_index.md index 7e245b8de9..93f8b54d99 100644 --- a/site/content/en/docs/start/_index.md +++ b/site/content/en/docs/start/_index.md @@ -455,7 +455,8 @@ choco install minikube [Environment]::SetEnvironmentVariable('Path', $('{0};C:\minikube' -f $oldPath), [EnvironmentVariableTarget]::Machine) ` } ``` - _If you used a CLI to perform the installation, you will need to close that CLI and open a new one before proceeding._ + + _If you used a CLI to perform the installation, you will need to close that CLI and open a new one before proceeding._ {{% /quiz_instruction %}} {{% quiz_instruction id="/Windows/x86-64/Beta/.exe download" %}} From 7df74d3e4a6b00be1208b0d416c3a03ade8cf911 Mon Sep 17 00:00:00 2001 From: Kevin Grigorenko Date: Tue, 7 Jun 2022 09:24:21 -0500 Subject: [PATCH 072/545] Issue #12658: Special case port mapping publish on macOS Signed-off-by: Kevin Grigorenko --- pkg/drivers/kic/oci/oci.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkg/drivers/kic/oci/oci.go b/pkg/drivers/kic/oci/oci.go index 9516af6b6f..132e8dfee3 100644 --- a/pkg/drivers/kic/oci/oci.go +++ b/pkg/drivers/kic/oci/oci.go @@ -472,8 +472,13 @@ func generatePortMappings(portMappings ...PortMapping) []string { for _, pm := range portMappings { // let docker pick a host port by leaving it as :: // example --publish=127.0.0.17::8443 will get a random host port for 8443 - publish := fmt.Sprintf("--publish=%s::%d", pm.ListenAddress, pm.ContainerPort) - result = append(result, publish) + if runtime.GOOS == "darwin" { + publish := fmt.Sprintf("--publish=%d", pm.ContainerPort) + result = append(result, publish) + } else { + publish := fmt.Sprintf("--publish=%s::%d", pm.ListenAddress, pm.ContainerPort) + result = append(result, publish) + } } return result } From 1665baa23e3e970ccda4d32e995c2c88761f0317 Mon Sep 17 00:00:00 2001 From: Sharif Elgamal Date: Tue, 7 Jun 2022 09:47:51 -0700 Subject: [PATCH 073/545] revert unrelated change --- pkg/minikube/registry/drvs/qemu2/qemu2.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/minikube/registry/drvs/qemu2/qemu2.go b/pkg/minikube/registry/drvs/qemu2/qemu2.go index 8a81a546a2..4a21e93528 100644 --- a/pkg/minikube/registry/drvs/qemu2/qemu2.go +++ b/pkg/minikube/registry/drvs/qemu2/qemu2.go @@ -119,9 +119,9 @@ func configure(cc config.ClusterConfig, n config.Node) (interface{}, error) { qemuCPU = "cortex-a72" // highmem=off needed, see https://patchwork.kernel.org/project/qemu-devel/patch/20201126215017.41156-9-agraf@csgraf.de/#23800615 for details if runtime.GOOS == "darwin" { - qemuMachine += ",highmem=off" + qemuMachine = "virt,highmem=off" } else if _, err := os.Stat("/dev/kvm"); err == nil { - qemuMachine += ",gic-version=3" + qemuMachine = "virt,gic-version=3" qemuCPU = "host" } default: From 8d60734670cbf518657eb9149137e147946f5798 Mon Sep 17 00:00:00 2001 From: Sharif Elgamal Date: Tue, 7 Jun 2022 12:52:39 -0700 Subject: [PATCH 074/545] small fixes --- cmd/minikube/cmd/node_start.go | 2 +- cmd/minikube/cmd/start.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/minikube/cmd/node_start.go b/cmd/minikube/cmd/node_start.go index 35ed190411..cba98c5530 100644 --- a/cmd/minikube/cmd/node_start.go +++ b/cmd/minikube/cmd/node_start.go @@ -68,7 +68,7 @@ var nodeStartCmd = &cobra.Command{ Host: h, Cfg: cc, Node: n, - ExistingAddons: nil, + ExistingAddons: cc.Addons, } _, err = node.Start(s, n.ControlPlane) diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go index afee89071a..49cb115320 100644 --- a/cmd/minikube/cmd/start.go +++ b/cmd/minikube/cmd/start.go @@ -770,8 +770,8 @@ func validateSpecifiedDriver(existing *config.ClusterConfig) { return } - out.WarningT("Deleting existing cluster {{.name}} with different driver {{.driver_name}} due to --delete-on-failure flag set by the user. ", out.V{"name": existing.Name, "driver_name": old}) if viper.GetBool(deleteOnFailure) { + out.WarningT("Deleting existing cluster {{.name}} with different driver {{.driver_name}} due to --delete-on-failure flag set by the user. ", out.V{"name": existing.Name, "driver_name": old}) // Start failed, delete the cluster profile, err := config.LoadProfile(existing.Name) if err != nil { From 5c3d3be0a6180c8cbdf97540ce48f79d0dbca4d9 Mon Sep 17 00:00:00 2001 From: Sharif Elgamal Date: Tue, 7 Jun 2022 13:06:22 -0700 Subject: [PATCH 075/545] qemu: only set highmem=off for darwin if availble RAM is under 32GB --- pkg/minikube/registry/drvs/qemu2/qemu2.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkg/minikube/registry/drvs/qemu2/qemu2.go b/pkg/minikube/registry/drvs/qemu2/qemu2.go index 7871bb3d41..edfba90fb1 100644 --- a/pkg/minikube/registry/drvs/qemu2/qemu2.go +++ b/pkg/minikube/registry/drvs/qemu2/qemu2.go @@ -122,9 +122,12 @@ func configure(cc config.ClusterConfig, n config.Node) (interface{}, error) { qemuCPU = "cortex-a72" // highmem=off needed, see https://patchwork.kernel.org/project/qemu-devel/patch/20201126215017.41156-9-agraf@csgraf.de/#23800615 for details if runtime.GOOS == "darwin" { - qemuMachine = "virt,highmem=off" + if cc.Memory < 32000 { + qemuMachine += ",highmem=off" + } + qemuCPU = "host" } else if _, err := os.Stat("/dev/kvm"); err == nil { - qemuMachine = "virt,gic-version=3" + qemuMachine += ",gic-version=3" qemuCPU = "host" } default: From e9e2b6bc3f9483673403f74854534e8df5650faf Mon Sep 17 00:00:00 2001 From: Sharif Elgamal Date: Tue, 7 Jun 2022 16:04:19 -0700 Subject: [PATCH 076/545] fix minikube build --- go.mod | 1 - go.sum | 6 ------ pkg/minikube/assets/addons.go | 2 +- 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/go.mod b/go.mod index 6331147388..8de0579e9b 100644 --- a/go.mod +++ b/go.mod @@ -44,7 +44,6 @@ require ( github.com/juju/version v0.0.0-20180108022336-b64dbd566305 // indirect github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 github.com/klauspost/cpuid v1.2.0 - github.com/machine-drivers/docker-machine-driver-qemu v0.1.1-0.20220331133007-0324171328f7 github.com/machine-drivers/docker-machine-driver-vmware v0.1.5 github.com/mattbaird/jsonpatch v0.0.0-20200820163806-098863c1fc24 github.com/mattn/go-isatty v0.0.14 diff --git a/go.sum b/go.sum index 1e582a398b..8c3f60919c 100644 --- a/go.sum +++ b/go.sum @@ -375,7 +375,6 @@ github.com/docker/distribution v2.7.1-0.20190205005809-0d3efadf0154+incompatible github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= github.com/docker/distribution v2.8.1+incompatible h1:Q50tZOPR6T/hjNsyc9g8/syEs6bk8XXApsHjKukMl68= github.com/docker/distribution v2.8.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= -github.com/docker/docker v0.0.0-20180621001606-093424bec097/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker v17.12.0-ce-rc1.0.20181225093023-5ddb1d410a8b+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker v17.12.0-ce-rc1.0.20190115220918-5ec31380a5d3+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker v20.10.7+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= @@ -782,8 +781,6 @@ github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de/go.mod h1:zAbeS9 github.com/lithammer/dedent v1.1.0/go.mod h1:jrXYCQtgg0nJiN+StA2KgR7w6CiQNv9Fd/Z9BP0jIOc= github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 h1:6E+4a0GO5zZEnZ81pIr0yLvtUWk2if982qA3F3QD6H4= github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I= -github.com/machine-drivers/docker-machine-driver-qemu v0.1.1-0.20220331133007-0324171328f7 h1:f9xnae3LZMVUXFJtqy1xuwQfwX+NQUS5LelCLM3RBxg= -github.com/machine-drivers/docker-machine-driver-qemu v0.1.1-0.20220331133007-0324171328f7/go.mod h1:yhDK3dYTcmZljNMDPXfmVRwSsHx1EoaEL32v7BANaYs= github.com/machine-drivers/docker-machine-driver-vmware v0.1.5 h1:51GqJ84u9EBATnn8rWsHNavcuRPlCLnDmvjzZVuliwY= github.com/machine-drivers/docker-machine-driver-vmware v0.1.5/go.mod h1:dTnTzUH3uzhMo0ddV1zRjGYWcVhQWwqiHPxz5l+HPd0= github.com/machine-drivers/machine v0.7.1-0.20211105063445-78a84df85426 h1:gVDPCmqwvHQ4ox/9svvnkomYJAAiV59smbPdTK4DIm4= @@ -1047,7 +1044,6 @@ github.com/shirou/gopsutil/v3 v3.22.5 h1:atX36I/IXgFiB81687vSiBI5zrMsxcIBkP9cQMJ github.com/shirou/gopsutil/v3 v3.22.5/go.mod h1:so9G9VzeHt/hsd0YwqprnjHnfARAUktauykSbr+y2gA= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= github.com/sirupsen/logrus v1.0.4-0.20170822132746-89742aefa4b2/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc= -github.com/sirupsen/logrus v1.0.4/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc= github.com/sirupsen/logrus v1.0.6/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.3.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= @@ -1213,7 +1209,6 @@ go.uber.org/zap v1.19.0/go.mod h1:xg/QME4nWcxGxrpdeYfq7UvYrLh66cuVKdrbD1XF/NI= go4.org v0.0.0-20180809161055-417644f6feb5/go.mod h1:MkTOUMDaeVYJUOUsaDXIhWPZYa1yOyC1qaOBpL57BhE= golang.org/x/build v0.0.0-20190927031335-2835ba2e683f h1:hXVePvSFG7tPGX4Pwk1d10ePFfoTCc0QmISfpKOHsS8= golang.org/x/build v0.0.0-20190927031335-2835ba2e683f/go.mod h1:fYw7AShPAhGMdXqA9gRadk/CcMsvLlClpE5oBwnS3dM= -golang.org/x/crypto v0.0.0-20170704135851-51714a8c4ac1/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20171113213409-9f005a07e0d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181009213950-7c1a557ab941/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= @@ -1391,7 +1386,6 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20180202135801-37707fdb30a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= diff --git a/pkg/minikube/assets/addons.go b/pkg/minikube/assets/addons.go index 535b112235..5858635303 100755 --- a/pkg/minikube/assets/addons.go +++ b/pkg/minikube/assets/addons.go @@ -696,7 +696,7 @@ var Addons = map[string]*Addon{ vmpath.GuestAddonsDir, "fpga-operator.yaml", "0640"), - }, false, "inaccel", "InAccel ", map[string]string{ + }, false, "inaccel", "InAccel ", "", map[string]string{ "Helm3": "alpine/helm:3.9.0@sha256:9f4bf4d24241f983910550b1fe8688571cd684046500abe58cef14308f9cb19e", }, map[string]string{ "Helm3": "docker.io", From 022e7bfc9ae1e74e700a1bbcf6e1ea082d9b33dd Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Wed, 1 Jun 2022 16:39:55 -0700 Subject: [PATCH 077/545] automate updating kubectl version --- .github/workflows/functional_verified.yml | 2 +- .github/workflows/leaderboard.yml | 1 + .github/workflows/master.yml | 10 +++++----- .github/workflows/pr.yml | 10 +++++----- .github/workflows/sync-minikube.yml | 7 ++++--- .github/workflows/time-to-k8s-public-chart.yml | 2 +- hack/update/golang_version/update_golang_version.go | 5 +++++ 7 files changed, 22 insertions(+), 15 deletions(-) diff --git a/.github/workflows/functional_verified.yml b/.github/workflows/functional_verified.yml index 9f25f05730..e21d8d94e7 100644 --- a/.github/workflows/functional_verified.yml +++ b/.github/workflows/functional_verified.yml @@ -87,7 +87,7 @@ jobs: - name: Install kubectl shell: bash run: | - curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.18.0/bin/linux/arm64/kubectl + curl -LO "https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/arm64/kubectl" sudo install kubectl /usr/local/bin/kubectl kubectl version --client=true diff --git a/.github/workflows/leaderboard.yml b/.github/workflows/leaderboard.yml index 5b30dc2782..eecd48cbf9 100644 --- a/.github/workflows/leaderboard.yml +++ b/.github/workflows/leaderboard.yml @@ -7,6 +7,7 @@ on: release: types: [published] env: + GOPROXY: https://proxy.golang.org GO_VERSION: '1.18.2' permissions: contents: read diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index dd5c5382f7..7e81b9ec64 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -102,7 +102,7 @@ jobs: - name: Install kubectl shell: bash run: | - curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.18.0/bin/linux/amd64/kubectl + curl -LO "https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl" sudo install kubectl /usr/local/bin/kubectl kubectl version --client=true - name: Docker Info @@ -202,7 +202,7 @@ jobs: - name: Install kubectl shell: bash run: | - curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.18.0/bin/linux/amd64/kubectl + curl -LO "https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl" sudo install kubectl /usr/local/bin/kubectl kubectl version --client=true - name: Docker Info @@ -303,7 +303,7 @@ jobs: - name: Install kubectl shell: bash run: | - curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.18.0/bin/linux/amd64/kubectl + curl -LO "https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl" sudo install kubectl /usr/local/bin/kubectl kubectl version --client=true @@ -406,7 +406,7 @@ jobs: - name: Install kubectl shell: bash run: | - curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.18.0/bin/darwin/amd64/kubectl + curl -LO "https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/darwin/amd64/kubectl" sudo install kubectl /usr/local/bin/kubectl kubectl version --client=true - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 @@ -505,7 +505,7 @@ jobs: - name: Install kubectl shell: bash run: | - curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.18.0/bin/linux/amd64/kubectl + curl -LO "https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl" sudo install kubectl /usr/local/bin/kubectl kubectl version --client=true # conntrack is required for kubernetes 1.18 and higher diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 53519b3f0c..bb4a07b173 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -100,7 +100,7 @@ jobs: - name: Install kubectl shell: bash run: | - curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.18.0/bin/linux/amd64/kubectl + curl -LO "https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl" sudo install kubectl /usr/local/bin/kubectl kubectl version --client=true - name: Docker Info @@ -200,7 +200,7 @@ jobs: - name: Install kubectl shell: bash run: | - curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.18.0/bin/linux/amd64/kubectl + curl -LO "https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl" sudo install kubectl /usr/local/bin/kubectl kubectl version --client=true - name: Docker Info @@ -302,7 +302,7 @@ jobs: - name: Install kubectl shell: bash run: | - curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.18.0/bin/linux/amd64/kubectl + curl -LO "https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl" sudo install kubectl /usr/local/bin/kubectl kubectl version --client=true @@ -406,7 +406,7 @@ jobs: - name: Install kubectl shell: bash run: | - curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.18.0/bin/darwin/amd64/kubectl + curl -LO "https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/darwin/amd64/kubectl" sudo install kubectl /usr/local/bin/kubectl kubectl version --client=true - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 @@ -506,7 +506,7 @@ jobs: - name: Install kubectl shell: bash run: | - curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.18.0/bin/linux/amd64/kubectl + curl -LO "https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl" sudo install kubectl /usr/local/bin/kubectl kubectl version --client=true # conntrack is required for kubernetes 1.18 and higher diff --git a/.github/workflows/sync-minikube.yml b/.github/workflows/sync-minikube.yml index 7bad491f15..c5c217bf73 100644 --- a/.github/workflows/sync-minikube.yml +++ b/.github/workflows/sync-minikube.yml @@ -1,11 +1,12 @@ name: Sync docker images of minikube to Alibaba Cloud - on: workflow_dispatch: schedule: # every day at 7am & 7pm pacific - cron: "0 2,14 * * *" - +env: + GOPROXY: https://proxy.golang.org + GO_VERSION: '1.18.2' permissions: contents: read @@ -24,7 +25,7 @@ jobs: - name: Set up Go uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 with: - go-version: 1.17 + go-version: ${{env.GO_VERSION}} - name: Build run: make diff --git a/.github/workflows/time-to-k8s-public-chart.yml b/.github/workflows/time-to-k8s-public-chart.yml index 686bd8914c..6d7677678a 100644 --- a/.github/workflows/time-to-k8s-public-chart.yml +++ b/.github/workflows/time-to-k8s-public-chart.yml @@ -42,7 +42,7 @@ jobs: - name: Install kubectl shell: bash run: | - curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.18.0/bin/darwin/amd64/kubectl + curl -LO "https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/darwin/amd64/kubectl" sudo install kubectl /usr/local/bin/kubectl kubectl version --client=true - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 diff --git a/hack/update/golang_version/update_golang_version.go b/hack/update/golang_version/update_golang_version.go index b574ce79fc..ca27d838a4 100644 --- a/hack/update/golang_version/update_golang_version.go +++ b/hack/update/golang_version/update_golang_version.go @@ -120,6 +120,11 @@ var ( `GO_VERSION: .*`: `GO_VERSION: '{{.StableVersion}}'`, }, }, + ".github/workflows/sync-minikube.yml": { + Replace: map[string]string{ + `GO_VERSION: .*`: `GO_VERSION: '{{.StableVersion}}'`, + }, + }, "go.mod": { Replace: map[string]string{ `(?m)^go .*`: `go {{.StableVersionMM}}`, From d016eac5c403ae1d733cecf81051524dc41a4295 Mon Sep 17 00:00:00 2001 From: Sharif Elgamal Date: Tue, 7 Jun 2022 16:47:06 -0700 Subject: [PATCH 078/545] set highmem=off based on qemu version instead of memory --- go.mod | 1 + go.sum | 1 + pkg/minikube/registry/drvs/qemu2/qemu2.go | 27 ++++++++++++++++++++--- 3 files changed, 26 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 8de0579e9b..6666c37706 100644 --- a/go.mod +++ b/go.mod @@ -97,6 +97,7 @@ require ( require ( github.com/Xuanwo/go-locale v1.1.0 + github.com/blang/semver v3.5.1+incompatible github.com/docker/go-connections v0.4.0 github.com/google/go-github/v43 v43.0.0 github.com/opencontainers/runc v1.0.2 diff --git a/go.sum b/go.sum index 8c3f60919c..5230672d45 100644 --- a/go.sum +++ b/go.sum @@ -191,6 +191,7 @@ github.com/bitly/go-simplejson v0.5.0/go.mod h1:cXHtHw4XUPsvGaxgjIAn8PhEWG9NfngE github.com/bits-and-blooms/bitset v1.2.0/go.mod h1:gIdJ4wp64HaoK2YrL1Q5/N7Y16edYb8uY+O0FJTyyDA= github.com/bketelsen/crypt v0.0.4/go.mod h1:aI6NrJ0pMGgvZKL1iVgXLnfIFJtfV+bKCoqOes/6LfM= github.com/blang/semver v3.1.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= +github.com/blang/semver v3.5.1+incompatible h1:cQNTCjp13qL8KC3Nbxr/y2Bqb63oX6wdnnjpJbkM4JQ= github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM= github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ= diff --git a/pkg/minikube/registry/drvs/qemu2/qemu2.go b/pkg/minikube/registry/drvs/qemu2/qemu2.go index e205db3fbe..b81d045692 100644 --- a/pkg/minikube/registry/drvs/qemu2/qemu2.go +++ b/pkg/minikube/registry/drvs/qemu2/qemu2.go @@ -24,7 +24,9 @@ import ( "path" "path/filepath" "runtime" + "strings" + "github.com/blang/semver" "github.com/docker/machine/libmachine/drivers" "github.com/spf13/viper" "k8s.io/minikube/pkg/drivers/qemu" @@ -106,6 +108,21 @@ func qemuFirmwarePath(customPath string) (string, error) { } } +func qemuVersion() (semver.Version, error) { + qemuSystem, err := qemuSystemProgram() + if err != nil { + return semver.Version{}, err + } + + cmd := exec.Command(qemuSystem, "-version") + rr, err := cmd.Output() + if err != nil { + return semver.Version{}, err + } + v := strings.Split(strings.TrimPrefix(string(rr), "QEMU emulator version "), "\n")[0] + return semver.Make(v) +} + func configure(cc config.ClusterConfig, n config.Node) (interface{}, error) { name := config.MachineName(cc, n) qemuSystem, err := qemuSystemProgram() @@ -121,12 +138,16 @@ func configure(cc config.ClusterConfig, n config.Node) (interface{}, error) { case "arm64": qemuMachine = "virt" qemuCPU = "cortex-a72" - // highmem=off needed, see https://patchwork.kernel.org/project/qemu-devel/patch/20201126215017.41156-9-agraf@csgraf.de/#23800615 for details + // highmem=off needed for qemu 6.2.0 and lower, see https://patchwork.kernel.org/project/qemu-devel/patch/20201126215017.41156-9-agraf@csgraf.de/#23800615 for details if runtime.GOOS == "darwin" { - if cc.Memory < 32000 { + qemu7 := semver.MustParse("7.0.0") + v, err := qemuVersion() + if err != nil { + return nil, err + } + if v.LT(qemu7) || cc.Memory <= 3072 { qemuMachine += ",highmem=off" } - qemuCPU = "host" } else if _, err := os.Stat("/dev/kvm"); err == nil { qemuMachine += ",gic-version=3" qemuCPU = "host" From 014ae19fb6369d9a0dbfe2468355b790300a2714 Mon Sep 17 00:00:00 2001 From: Sharif Elgamal Date: Tue, 7 Jun 2022 16:48:09 -0700 Subject: [PATCH 079/545] qemu cpu host for darwin --- pkg/minikube/registry/drvs/qemu2/qemu2.go | 1 + 1 file changed, 1 insertion(+) diff --git a/pkg/minikube/registry/drvs/qemu2/qemu2.go b/pkg/minikube/registry/drvs/qemu2/qemu2.go index b81d045692..112d8b82f7 100644 --- a/pkg/minikube/registry/drvs/qemu2/qemu2.go +++ b/pkg/minikube/registry/drvs/qemu2/qemu2.go @@ -148,6 +148,7 @@ func configure(cc config.ClusterConfig, n config.Node) (interface{}, error) { if v.LT(qemu7) || cc.Memory <= 3072 { qemuMachine += ",highmem=off" } + qemuCPU = "host" } else if _, err := os.Stat("/dev/kvm"); err == nil { qemuMachine += ",gic-version=3" qemuCPU = "host" From bee82151b55284aeea7b51d3b4e2e585e59bd19e Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Wed, 8 Jun 2022 00:23:50 +0000 Subject: [PATCH 080/545] Update auto-generated docs and translations --- site/content/en/docs/contrib/tests.en.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/content/en/docs/contrib/tests.en.md b/site/content/en/docs/contrib/tests.en.md index 0e94bd52d1..ddfd5744bc 100644 --- a/site/content/en/docs/contrib/tests.en.md +++ b/site/content/en/docs/contrib/tests.en.md @@ -43,7 +43,7 @@ tests the csi hostpath driver by creating a persistent volume, snapshotting it a tests the GCP Auth addon with either phony or real credentials and makes sure the files are mounted into pods correctly #### validateInAccelAddon -tests the InAccel addon by trying a vadd +tests the inaccel addon by trying a vadd ## TestCertOptions makes sure minikube certs respect the --apiserver-ips and --apiserver-names parameters From aa9d2fd8eee84f542a4305a0c44ccf6b22311a72 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 8 Jun 2022 00:52:23 +0000 Subject: [PATCH 081/545] Bump github.com/spf13/viper from 1.11.0 to 1.12.0 Bumps [github.com/spf13/viper](https://github.com/spf13/viper) from 1.11.0 to 1.12.0. - [Release notes](https://github.com/spf13/viper/releases) - [Commits](https://github.com/spf13/viper/compare/v1.11.0...v1.12.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 | 32 ++++++++++++++--------------- go.sum | 63 +++++++++++++++++++++++++++++++++++----------------------- 2 files changed, 54 insertions(+), 41 deletions(-) diff --git a/go.mod b/go.mod index 8de0579e9b..8bbe758c37 100644 --- a/go.mod +++ b/go.mod @@ -64,7 +64,7 @@ require ( github.com/shirou/gopsutil/v3 v3.22.5 github.com/spf13/cobra v1.4.0 github.com/spf13/pflag v1.0.5 - github.com/spf13/viper v1.11.0 + github.com/spf13/viper v1.12.0 github.com/zchee/go-vmnet v0.0.0-20161021174912-97ebf9174097 go.opencensus.io v0.23.0 go.opentelemetry.io/otel v1.7.0 @@ -75,12 +75,12 @@ require ( golang.org/x/exp v0.0.0-20210220032938-85be41e4509f golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 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-20220517195934-5e4e11fc645e + golang.org/x/sync v0.0.0-20220513210516-0976fa681c29 + golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 golang.org/x/text v0.3.7 gonum.org/v1/plot v0.11.0 - google.golang.org/api v0.79.0 + google.golang.org/api v0.81.0 gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 // indirect gopkg.in/yaml.v2 v2.4.0 k8s.io/api v0.24.1 @@ -136,7 +136,7 @@ require ( github.com/emicklei/go-restful v2.9.5+incompatible // 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 + github.com/fsnotify/fsnotify v1.5.4 // indirect github.com/go-fonts/liberation v0.2.0 // indirect github.com/go-latex/latex v0.0.0-20210823091927-c0d11ff05a81 // indirect github.com/go-logr/logr v1.2.3 // indirect @@ -155,7 +155,7 @@ require ( github.com/google/gnostic v0.5.7-v3refs // indirect github.com/google/go-querystring v1.1.0 // indirect github.com/google/gofuzz v1.1.0 // indirect - github.com/googleapis/gax-go/v2 v2.3.0 // indirect + github.com/googleapis/gax-go/v2 v2.4.0 // 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 @@ -178,7 +178,7 @@ require ( github.com/mitchellh/go-homedir v1.1.0 // indirect github.com/mitchellh/go-testing-interface v1.0.0 // indirect github.com/mitchellh/go-wordwrap v1.0.0 // indirect - github.com/mitchellh/mapstructure v1.4.3 // indirect + github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/moby/spdystream v0.2.0 // indirect github.com/moby/sys/mountinfo v0.4.1 // indirect github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 // indirect @@ -187,8 +187,8 @@ require ( github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/opencontainers/image-spec v1.0.1 // indirect github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417 // indirect - github.com/pelletier/go-toml v1.9.4 // indirect - github.com/pelletier/go-toml/v2 v2.0.0-beta.8 // indirect + github.com/pelletier/go-toml v1.9.5 // indirect + github.com/pelletier/go-toml/v2 v2.0.1 // indirect github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect github.com/prometheus/client_golang v1.12.1 // indirect github.com/prometheus/client_model v0.2.0 // indirect @@ -199,9 +199,9 @@ require ( github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/sirupsen/logrus v1.8.1 // indirect github.com/spf13/afero v1.8.2 // indirect - github.com/spf13/cast v1.4.1 // indirect + github.com/spf13/cast v1.5.0 // indirect github.com/spf13/jwalterweatherman v1.1.0 // indirect - github.com/subosito/gotenv v1.2.0 // indirect + github.com/subosito/gotenv v1.3.0 // indirect github.com/tklauser/go-sysconf v0.3.10 // indirect github.com/tklauser/numcpus v0.4.0 // indirect github.com/ulikunitz/xz v0.5.8 // indirect @@ -211,16 +211,16 @@ 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-20220425223048-2871e0cb64e4 // indirect + golang.org/x/net v0.0.0-20220520000938-2e3eb7b945c2 // indirect golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect - golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f // indirect + golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df // indirect google.golang.org/appengine v1.6.7 // indirect - google.golang.org/genproto v0.0.0-20220505152158-f39f71e6c8f3 // indirect - google.golang.org/grpc v1.46.0 // indirect + google.golang.org/genproto v0.0.0-20220519153652-3a47de7e79bd // indirect + google.golang.org/grpc v1.46.2 // indirect google.golang.org/protobuf v1.28.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/ini.v1 v1.66.4 // indirect - gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect + gopkg.in/yaml.v3 v3.0.0 // indirect k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 // indirect sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect diff --git a/go.sum b/go.sum index 8c3f60919c..a217702b03 100644 --- a/go.sum +++ b/go.sum @@ -430,10 +430,11 @@ github.com/fogleman/gg v1.3.0/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzP github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= github.com/form3tech-oss/jwt-go v3.2.3+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k= +github.com/frankban/quicktest v1.14.3 h1:FJKSZTDHjyhriyC81FLQ0LY93eSai0ZyR/ZIkd3ZUKE= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= -github.com/fsnotify/fsnotify v1.5.1 h1:mZcQUHVQUQWoPXXtuf9yuEXKudkV2sx1E06UadKWpgI= -github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU= +github.com/fsnotify/fsnotify v1.5.4 h1:jRbGcIw6P2Meqdwuo0H1p6JVLbL5DHKAKlYndzMwVZI= +github.com/fsnotify/fsnotify v1.5.4/go.mod h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmVXmkdnm1bU= github.com/fullsailor/pkcs7 v0.0.0-20190404230743-d7302db945fa/go.mod h1:KnogPXtdwXqoenmZCw6S+25EAm2MkxbG0deNDu4cbSA= github.com/fvbommel/sortorder v1.0.1/go.mod h1:uk88iVf1ovNn1iLfgUVU2F9o5eO30ui720w+kxuqRs0= github.com/garyburd/redigo v0.0.0-20150301180006-535138d7bcd7/go.mod h1:NR3MbYisc3/PwhQ00EMzDiPmrwpPxAn5GI05/YaO1SY= @@ -619,8 +620,9 @@ github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5m 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/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/gax-go/v2 v2.4.0 h1:dS9eYAjhrE2RjmzYw2XAPvcXfmcQLtFEQWn0CR82awk= +github.com/googleapis/gax-go/v2 v2.4.0/go.mod h1:XOTVJ59hdnfJLIP/dh8n5CGryZR2LxK9wbMD5+iXC6c= 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/go.mod h1:7+EbHbldMins07ALC74bsA81Ovc97DwqyJO1AENw9kA= @@ -769,8 +771,8 @@ github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= -github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= +github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/pty v1.1.3/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA= @@ -845,8 +847,8 @@ github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0Qu github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= -github.com/mitchellh/mapstructure v1.4.3 h1:OVowDSCllw/YjdLkam3/sm7wEtOy59d8ndGgCcyj8cs= -github.com/mitchellh/mapstructure v1.4.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= +github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= +github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/osext v0.0.0-20151018003038-5e2d6d41470f/go.mod h1:OkQIRizQZAeMln+1tSwduZz7+Af5oFlKirV/MSYes2A= github.com/moby/hyperkit v0.0.0-20210108224842-2f061e447e14 h1:XGy4iMfaG4r1uZKZQmEPSYSH0Nj5JJuKgPNUhWGQ08E= github.com/moby/hyperkit v0.0.0-20210108224842-2f061e447e14/go.mod h1:aBcAEoy5u01cPAYvosR85gzSrMZ0TVVnkPytOQN+9z8= @@ -946,10 +948,10 @@ github.com/pborman/uuid v1.2.1/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtP github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/pelletier/go-toml v1.8.1/go.mod h1:T2/BmBdy8dvIRq1a/8aqjN41wvWlN4lrapLU/GW4pbc= 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/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8= +github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= +github.com/pelletier/go-toml/v2 v2.0.1 h1:8e3L2cCQzLFi2CR4g7vGFuFxX7Jl1kKX8gW+iV0GUKU= +github.com/pelletier/go-toml/v2 v2.0.1/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= @@ -1022,6 +1024,7 @@ github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6So github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-charset v0.0.0-20180617210344-2471d30d28b4/go.mod h1:qgYeAmZ5ZIpBWTGllZSQnw97Dj+woV0toclVaRGI8pc= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= +github.com/rogpeppe/go-internal v1.6.1 h1:/FiVV8dS/e+YqF2JvO3yXRFbBLTIuSDkuC7aBOAvL+k= github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= github.com/russross/blackfriday v1.5.3-0.20200218234912-41c5fccfd6f6 h1:tlXG832s5pa9x9Gs3Rp2rTvEqjiDEuETUOSfBEiTcns= github.com/russross/blackfriday v1.5.3-0.20200218234912-41c5fccfd6f6/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= @@ -1068,8 +1071,8 @@ 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= -github.com/spf13/cast v1.4.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= +github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w= +github.com/spf13/cast v1.5.0/go.mod h1:SpXXQ5YoyJw6s3/6cMTQuxvgRl3PCJiyaX9p6b155UU= github.com/spf13/cobra v0.0.2-0.20171109065643-2da4a54c5cee/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= github.com/spf13/cobra v1.0.0/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE= @@ -1087,8 +1090,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.11.0 h1:7OX/1FS6n7jHD1zGrZTM7WtY13ZELRyosK4k93oPr44= -github.com/spf13/viper v1.11.0/go.mod h1:djo0X/bA5+tYVoCn+C7cAYJGcVn/qYLFTG8gdUsX7Zk= +github.com/spf13/viper v1.12.0 h1:CZ7eSOd3kZoaYDLbXnmzgQI5RlciuXBMA+18HwHRfZQ= +github.com/spf13/viper v1.12.0/go.mod h1:b6COn30jlNxbm/V2IqWiNWkJ+vZNiMNksliPCiuKtSI= 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= @@ -1104,8 +1107,9 @@ github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= +github.com/subosito/gotenv v1.3.0 h1:mjC+YW8QpAdXibNi+vNWgzmgBH4+5l5dCXv8cNysBLI= +github.com/subosito/gotenv v1.3.0/go.mod h1:YzJjq/33h7nrwdY+iHMhEOEEbW0ovIz0tB6t6PwAXzs= github.com/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= @@ -1348,8 +1352,9 @@ golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220325170049-de3da57026de/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220412020605-290c469a71a5/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= -golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4 h1:HVyaeDAYux4pnY+D/SiwmLOR36ewZ4iGQIIrtnuCjFA= golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= +golang.org/x/net v0.0.0-20220520000938-2e3eb7b945c2 h1:NWy5+hlRbC7HK+PmcXVUmW1IMyFce7to56IUvhUFm7Y= +golang.org/x/net v0.0.0-20220520000938-2e3eb7b945c2/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= @@ -1384,8 +1389,9 @@ golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20220513210516-0976fa681c29 h1:w8s32wxx3sY+OjLlv9qltkLU5yvJzxjjgiHWLjdIcw4= +golang.org/x/sync v0.0.0-20220513210516-0976fa681c29/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -1501,9 +1507,10 @@ golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220328115105-d36c6a25d886/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220517195934-5e4e11fc645e h1:w36l2Uw3dRan1K3TyXriXvY+6T56GNmlKGcqiQUJDfM= +golang.org/x/sys v0.0.0-20220502124256-b6088ccd6cba/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220517195934-5e4e11fc645e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a h1:dGzPydgVsqGcTRVwiLJ1jVbufYwmzD3LfVPLKsKg+0k= +golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/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-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY= @@ -1597,8 +1604,9 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T 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/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= +golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df h1:5Pf6pFKu98ODmgnpvkJ3kFUOQGGLIzLIkbzUHp47618= +golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= 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= @@ -1642,8 +1650,9 @@ google.golang.org/api v0.70.0/go.mod h1:Bs4ZM2HGifEvXwd50TtW70ovgJffJYw2oRCOFU/S google.golang.org/api v0.71.0/go.mod h1:4PyU6e6JogV1f9eA4voyrTY2batOLdgZ5qZ5HOCc4j8= google.golang.org/api v0.74.0/go.mod h1:ZpfMZOVRMywNyvJFeqL9HRWBgAuRfSjJFpe9QtRRyDs= google.golang.org/api v0.75.0/go.mod h1:pU9QmyHLnzlpar1Mjt4IbapUCy8J+6HD6GeELN69ljA= -google.golang.org/api v0.79.0 h1:vaOcm0WdXvhGkci9a0+CcQVZqSRjN8ksSBlWv99f8Pg= -google.golang.org/api v0.79.0/go.mod h1:xY3nI94gbvBrE0J6NHXhxOmW97HG7Khjkku6AFB3Hyg= +google.golang.org/api v0.78.0/go.mod h1:1Sg78yoMLOhlQTeF+ARBoytAcH1NNyyl390YMy6rKmw= +google.golang.org/api v0.81.0 h1:o8WF5AvfidafWbFjsRyupxyEQJNUWxLZJCK5NXrxZZ8= +google.golang.org/api v0.81.0/go.mod h1:FA6Mb/bZxj706H2j+j2d6mHEEaHBmbbWnkfvmorOCko= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -1737,8 +1746,10 @@ google.golang.org/genproto v0.0.0-20220407144326-9054f6ed7bac/go.mod h1:8w6bsBMX google.golang.org/genproto v0.0.0-20220413183235-5e96e2839df9/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= google.golang.org/genproto v0.0.0-20220414192740-2d67ff6cf2b4/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= google.golang.org/genproto v0.0.0-20220421151946-72621c1f0bd3/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= -google.golang.org/genproto v0.0.0-20220505152158-f39f71e6c8f3 h1:q1kiSVscqoDeqTF27eQ2NnLLDmqF0I373qQNXYMy0fo= +google.golang.org/genproto v0.0.0-20220429170224-98d788798c3e/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= google.golang.org/genproto v0.0.0-20220505152158-f39f71e6c8f3/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4= +google.golang.org/genproto v0.0.0-20220519153652-3a47de7e79bd h1:e0TwkXOdbnH/1x5rc5MZ/VYyiZ4v+RdVfrGMqEwT68I= +google.golang.org/genproto v0.0.0-20220519153652-3a47de7e79bd/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4= 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= @@ -1771,8 +1782,9 @@ google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9K google.golang.org/grpc v1.40.1/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= google.golang.org/grpc v1.44.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ= -google.golang.org/grpc v1.46.0 h1:oCjezcn6g6A75TGoKYBPgKmVBLexhYLM6MebdrPApP8= google.golang.org/grpc v1.46.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= +google.golang.org/grpc v1.46.2 h1:u+MLGgVf7vRdjEYZ8wDFhAVNmhkbJ5hmrA1LMWK1CAQ= +google.golang.org/grpc v1.46.2/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= @@ -1829,8 +1841,9 @@ gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.0 h1:hjy8E9ON/egN1tAYqKb61G10WtihqetD4sz2H+8nIeA= +gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo= gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk= From cd15cc83cdcd96a23bad09fa9529154ec7349df4 Mon Sep 17 00:00:00 2001 From: Sharif Elgamal Date: Wed, 8 Jun 2022 10:18:48 -0700 Subject: [PATCH 082/545] one more comment --- pkg/minikube/registry/drvs/qemu2/qemu2.go | 1 + 1 file changed, 1 insertion(+) diff --git a/pkg/minikube/registry/drvs/qemu2/qemu2.go b/pkg/minikube/registry/drvs/qemu2/qemu2.go index 112d8b82f7..9cb3928896 100644 --- a/pkg/minikube/registry/drvs/qemu2/qemu2.go +++ b/pkg/minikube/registry/drvs/qemu2/qemu2.go @@ -145,6 +145,7 @@ func configure(cc config.ClusterConfig, n config.Node) (interface{}, error) { if err != nil { return nil, err } + // Surprsingly, highmem doesn't work for low memory situations if v.LT(qemu7) || cc.Memory <= 3072 { qemuMachine += ",highmem=off" } From f2ffcd312b3315733e58cf6a2c03592a38fcf2b1 Mon Sep 17 00:00:00 2001 From: Sharif Elgamal Date: Wed, 8 Jun 2022 11:09:40 -0700 Subject: [PATCH 083/545] Update qemu2.go --- pkg/minikube/registry/drvs/qemu2/qemu2.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/minikube/registry/drvs/qemu2/qemu2.go b/pkg/minikube/registry/drvs/qemu2/qemu2.go index 9cb3928896..d2cfae3164 100644 --- a/pkg/minikube/registry/drvs/qemu2/qemu2.go +++ b/pkg/minikube/registry/drvs/qemu2/qemu2.go @@ -145,7 +145,7 @@ func configure(cc config.ClusterConfig, n config.Node) (interface{}, error) { if err != nil { return nil, err } - // Surprsingly, highmem doesn't work for low memory situations + // Surprisingly, highmem doesn't work for low memory situations if v.LT(qemu7) || cc.Memory <= 3072 { qemuMachine += ",highmem=off" } From 1de83138b39993f65b5fa376a033596a59e5ff2e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 8 Jun 2022 18:38:28 +0000 Subject: [PATCH 084/545] Bump github.com/opencontainers/runc from 1.0.2 to 1.1.2 Bumps [github.com/opencontainers/runc](https://github.com/opencontainers/runc) from 1.0.2 to 1.1.2. - [Release notes](https://github.com/opencontainers/runc/releases) - [Changelog](https://github.com/opencontainers/runc/blob/v1.1.2/CHANGELOG.md) - [Commits](https://github.com/opencontainers/runc/compare/v1.0.2...v1.1.2) --- updated-dependencies: - dependency-name: github.com/opencontainers/runc dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 8 ++++---- go.sum | 26 ++++++++++++++++---------- 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/go.mod b/go.mod index 6666c37706..3627d3f287 100644 --- a/go.mod +++ b/go.mod @@ -100,7 +100,7 @@ require ( github.com/blang/semver v3.5.1+incompatible github.com/docker/go-connections v0.4.0 github.com/google/go-github/v43 v43.0.0 - github.com/opencontainers/runc v1.0.2 + github.com/opencontainers/runc v1.1.2 github.com/santhosh-tekuri/jsonschema/v5 v5.0.0 ) @@ -129,7 +129,7 @@ require ( github.com/containerd/stargz-snapshotter/estargz v0.7.0 // indirect github.com/coreos/go-systemd/v22 v22.3.2 // indirect github.com/cpuguy83/go-md2man/v2 v2.0.1 // indirect - github.com/cyphar/filepath-securejoin v0.2.2 // indirect + github.com/cyphar/filepath-securejoin v0.2.3 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/docker/cli v20.10.7+incompatible // indirect github.com/docker/distribution v2.8.1+incompatible // indirect @@ -147,7 +147,7 @@ require ( github.com/go-openapi/jsonreference v0.19.5 // indirect github.com/go-openapi/swag v0.19.14 // indirect github.com/go-pdf/fpdf v0.6.0 // indirect - github.com/godbus/dbus/v5 v5.0.4 // indirect + github.com/godbus/dbus/v5 v5.0.6 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect @@ -181,7 +181,7 @@ require ( github.com/mitchellh/go-wordwrap v1.0.0 // indirect github.com/mitchellh/mapstructure v1.4.3 // indirect github.com/moby/spdystream v0.2.0 // indirect - github.com/moby/sys/mountinfo v0.4.1 // indirect + github.com/moby/sys/mountinfo v0.5.0 // indirect github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect diff --git a/go.sum b/go.sum index 5230672d45..0926bace1c 100644 --- a/go.sum +++ b/go.sum @@ -188,7 +188,6 @@ github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d h1:xDfNPAt8lFiC1U github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d/go.mod h1:6QX/PXZ00z/TKoufEY6K/a0k6AhaJrQKdFe6OfVXsa4= github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= github.com/bitly/go-simplejson v0.5.0/go.mod h1:cXHtHw4XUPsvGaxgjIAn8PhEWG9NfngEKAMDJEczWVA= -github.com/bits-and-blooms/bitset v1.2.0/go.mod h1:gIdJ4wp64HaoK2YrL1Q5/N7Y16edYb8uY+O0FJTyyDA= github.com/bketelsen/crypt v0.0.4/go.mod h1:aI6NrJ0pMGgvZKL1iVgXLnfIFJtfV+bKCoqOes/6LfM= github.com/blang/semver v3.1.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= github.com/blang/semver v3.5.1+incompatible h1:cQNTCjp13qL8KC3Nbxr/y2Bqb63oX6wdnnjpJbkM4JQ= @@ -217,7 +216,7 @@ github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cb github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5/go.mod h1:/iP1qXHoty45bqomnu2LM+VVyAEdWN+vtSHGlQgyxbw= github.com/checkpoint-restore/go-criu/v4 v4.1.0/go.mod h1:xUQBLp4RLc5zJtWY++yjOoMoB5lihDt7fai+75m+rGw= -github.com/checkpoint-restore/go-criu/v5 v5.0.0/go.mod h1:cfwC0EG7HMUenopBsUf9d89JlCLQIfgVcNsNN0t6T2M= +github.com/checkpoint-restore/go-criu/v5 v5.3.0/go.mod h1:E/eQpaFtUKGOOSEBZgmKAcn+zUUwWxqcaKZlF54wK8E= github.com/cheggaaa/pb v1.0.27/go.mod h1:pQciLPpbU0oxA0h+VJYYLxO+XeDQb5pZijXscXHm81s= github.com/cheggaaa/pb/v3 v3.0.8 h1:bC8oemdChbke2FHIIGy9mn4DPJ2caZYQnfbRqwmdCoA= github.com/cheggaaa/pb/v3 v3.0.8/go.mod h1:UICbiLec/XO6Hw6k+BHEtHeQFzzBH4i2/qk/ow1EJTA= @@ -228,7 +227,7 @@ github.com/cilium/ebpf v0.0.0-20200110133405-4032b1d8aae3/go.mod h1:MA5e5Lr8slmE github.com/cilium/ebpf v0.0.0-20200702112145-1c8d4c9ef775/go.mod h1:7cR51M8ViRLIdUjrmSXlK9pkrsDlLHbO8jiB8X8JnOc= github.com/cilium/ebpf v0.2.0/go.mod h1:To2CFviqOWL/M0gIMsvSMlqe7em/l1ALkX1PyjrX2Qs= github.com/cilium/ebpf v0.4.0/go.mod h1:4tRaxcgiL706VnOzHOdBlY8IEAIdxINsQBcU4xJJXRs= -github.com/cilium/ebpf v0.6.2/go.mod h1:4tRaxcgiL706VnOzHOdBlY8IEAIdxINsQBcU4xJJXRs= +github.com/cilium/ebpf v0.7.0/go.mod h1:/oI2+1shJiTGAMgl6/RgJr36Eo1jzrRcAWbcXO2usCA= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cloudevents/sdk-go/v2 v2.9.0 h1:StQ9q2JuGvclGFoT7kpTdQm+qjW0LQzg51CgUF4ncpY= github.com/cloudevents/sdk-go/v2 v2.9.0/go.mod h1:GpCBmUj7DIRiDhVvsK5d6WCbgTWs8DxAWTRtAwQmIXs= @@ -262,6 +261,7 @@ github.com/containerd/console v0.0.0-20181022165439-0650fd9eeb50/go.mod h1:Tj/on github.com/containerd/console v0.0.0-20191206165004-02ecf6a7291e/go.mod h1:8Pf4gM6VEbTNRIT26AyyU7hxdQU3MvAvxVI0sc00XBE= github.com/containerd/console v1.0.1/go.mod h1:XUsP6YE/mKtz6bxc+I8UiKKTP04qjQL4qcS3XoQ5xkw= github.com/containerd/console v1.0.2/go.mod h1:ytZPjGgY2oeTkAONYafi2kSj0aYggsf8acV1PGKCbzQ= +github.com/containerd/console v1.0.3/go.mod h1:7LqA/THxQ86k76b8c/EMSiaJ3h1eZkMkXar0TQ1gf3U= github.com/containerd/containerd v1.2.10/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= github.com/containerd/containerd v1.3.0-beta.2.0.20190828155532-0293cbd26c69/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= github.com/containerd/containerd v1.3.0/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= @@ -354,8 +354,9 @@ github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7Do github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/creack/pty v1.1.11 h1:07n33Z8lZxZ2qwegKbObQohDhXDQxiMMz1NOUGYlesw= github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= -github.com/cyphar/filepath-securejoin v0.2.2 h1:jCwT2GTP+PY5nBz3c/YL5PAIbusElVrPujOBSCj8xRg= github.com/cyphar/filepath-securejoin v0.2.2/go.mod h1:FpkQEhXnPnOthhzymB7CGsFk2G9VLXONKD9G7QGMM+4= +github.com/cyphar/filepath-securejoin v0.2.3 h1:YX6ebbZCZP7VkM3scTTokDgBL2TY741X51MTk3ycuNI= +github.com/cyphar/filepath-securejoin v0.2.3/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4= github.com/d2g/dhcp4 v0.0.0-20170904100407-a1d1b6c41b1c/go.mod h1:Ct2BUK8SB0YC1SMSibvLzxjeJLnrYEVLULFNiHY9YfQ= github.com/d2g/dhcp4client v1.0.0/go.mod h1:j0hNfjhrt2SxUOw55nL0ATM/z4Yt3t2Kd1mW34z5W5s= github.com/d2g/dhcp4server v0.0.0-20181031114812-7d4a0a7f59a5/go.mod h1:Eo87+Kg/IX2hfWJfwxMzLyuSZyxSoAug2nGa1G2QAi8= @@ -499,8 +500,9 @@ github.com/godbus/dbus v0.0.0-20151105175453-c7fdd8b5cd55/go.mod h1:/YcGZj5zSblf github.com/godbus/dbus v0.0.0-20180201030542-885f9cc04c9c/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw= github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e/go.mod h1:bBOAhwG1umN6/6ZUMtDFBMQR8jRg9O75tm9K00oMsK4= github.com/godbus/dbus/v5 v5.0.3/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= -github.com/godbus/dbus/v5 v5.0.4 h1:9349emZab16e7zQvpmsbtjc18ykshndd8y2PG3sgJbA= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= +github.com/godbus/dbus/v5 v5.0.6 h1:mkgN1ofwASrYnJ5W6U/BxG15eXXXjirgZc7CLqkcaro= +github.com/godbus/dbus/v5 v5.0.6/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/gogo/googleapis v1.2.0/go.mod h1:Njal3psf3qN6dwBtQfUmBZh2ybovJ0tlu3o/AC7HYjU= github.com/gogo/googleapis v1.4.0/go.mod h1:5YRNX2z1oM5gXdAkurHa942MDgEJyk02w4OecKY87+c= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= @@ -857,8 +859,9 @@ github.com/moby/spdystream v0.2.0/go.mod h1:f7i0iNDQJ059oMTcWxx8MA/zKFIuD/lY+0Gq github.com/moby/sys/mount v0.2.0 h1:WhCW5B355jtxndN5ovugJlMFJawbUODuW8fSnEH6SSM= github.com/moby/sys/mount v0.2.0/go.mod h1:aAivFE2LB3W4bACsUXChRHQ0qKWsetY4Y9V7sxOougM= github.com/moby/sys/mountinfo v0.4.0/go.mod h1:rEr8tzG/lsIZHBtN/JjGG+LMYx9eXgW2JI+6q0qou+A= -github.com/moby/sys/mountinfo v0.4.1 h1:1O+1cHA1aujwEwwVMa2Xm2l+gIpUHyd3+D+d7LZh1kM= github.com/moby/sys/mountinfo v0.4.1/go.mod h1:rEr8tzG/lsIZHBtN/JjGG+LMYx9eXgW2JI+6q0qou+A= +github.com/moby/sys/mountinfo v0.5.0 h1:2Ks8/r6lopsxWi9m58nlwjaeSzUX9iiL1vj5qB/9ObI= +github.com/moby/sys/mountinfo v0.5.0/go.mod h1:3bMD3Rg+zkqx8MRYPi7Pyb0Ie97QEBmdxbhnCLlSvSU= github.com/moby/sys/symlink v0.1.0/go.mod h1:GGDODQmbFOjFsXvfLVn3+ZRxkch54RkSiGqsZeMYowQ= github.com/moby/term v0.0.0-20200312100748-672ec06f55cd/go.mod h1:DdlQx2hp0Ss5/fLikoLlEeIYiATotOjgB//nb973jeo= github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 h1:dcztxKSvZ4Id8iPpHERQBbIJfabdt4wUm5qy3wOL2Zc= @@ -921,8 +924,8 @@ github.com/opencontainers/runc v0.1.1/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59P github.com/opencontainers/runc v1.0.0-rc8.0.20190926000215-3e425f80a8c9/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= github.com/opencontainers/runc v1.0.0-rc9/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= github.com/opencontainers/runc v1.0.0-rc93/go.mod h1:3NOsor4w32B2tC0Zbl8Knk4Wg84SM2ImC1fxBuqJ/H0= -github.com/opencontainers/runc v1.0.2 h1:opHZMaswlyxz1OuGpBE53Dwe4/xF7EZTY0A2L/FpCOg= -github.com/opencontainers/runc v1.0.2/go.mod h1:aTaHFFwQXuA71CiyxOdFFIorAoemI04suvGRQFzWTD0= +github.com/opencontainers/runc v1.1.2 h1:2VSZwLx5k/BfsBxMMipG/LYUnmqOD/BPkIVgQUcTlLw= +github.com/opencontainers/runc v1.1.2/go.mod h1:Tj1hFw6eFWp/o33uxGf5yF2BX5yz2Z6iptFpuvbbKqc= github.com/opencontainers/runtime-spec v0.1.2-0.20190507144316-5b71a03e2700/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= github.com/opencontainers/runtime-spec v1.0.1/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= github.com/opencontainers/runtime-spec v1.0.2-0.20190207185410-29686dbc5559/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= @@ -933,7 +936,7 @@ github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417/go.m github.com/opencontainers/runtime-tools v0.0.0-20181011054405-1d69bd0f9c39/go.mod h1:r3f7wjNzSs2extwzU3Y+6pKfobzPh+kKFJ3ofN+3nfs= github.com/opencontainers/selinux v1.6.0/go.mod h1:VVGKuOLlE7v4PJyT6h7mNWvq1rzqiriPsEqVhc+svHE= github.com/opencontainers/selinux v1.8.0/go.mod h1:RScLhm78qiWa2gbVCcGkC7tCGdgk3ogry1nUQF8Evvo= -github.com/opencontainers/selinux v1.8.2/go.mod h1:MUIHuUEvKB1wtJjQdOyYRgOnLD2xAPP8dBsCoU0KuF8= +github.com/opencontainers/selinux v1.10.0/go.mod h1:2i0OySw99QjzBBQByd1Gr9gSjvuho1lHsJxIJ3gGbJI= github.com/otiai10/copy v1.7.0 h1:hVoPiN+t+7d2nzzwMiDHPSOogsWAStewq3TwU05+clE= github.com/otiai10/copy v1.7.0/go.mod h1:rmRl6QPdJj6EiUqXQ/4Nn2lLXoNQjFCQbbNrxgc/t3U= github.com/otiai10/curr v0.0.0-20150429015615-9b4961190c95/go.mod h1:9qAhocn7zKJG+0mI8eUu6xqkFDYS2kb2saOteoSB3cE= @@ -1040,6 +1043,7 @@ github.com/sayboras/dockerclient v1.0.0 h1:awHcxOzTP07Gl1SJAhkTCTagyJwgA6f/Az/Z4 github.com/sayboras/dockerclient v1.0.0/go.mod h1:mUmEoqt0b+uQg57s006FsvL4mybi+N5wINLDBGtaPTY= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= github.com/seccomp/libseccomp-golang v0.9.1/go.mod h1:GbW5+tmTXfcxTToHLXlScSlAvWlF4P2Ca7zGrPiEpWo= +github.com/seccomp/libseccomp-golang v0.9.2-0.20210429002308-3879420cc921/go.mod h1:JA8cRccbGaA1s33RQf7Y1+q9gHmZX1yB/z9WDN1C6fg= github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= github.com/shirou/gopsutil/v3 v3.22.5 h1:atX36I/IXgFiB81687vSiBI5zrMsxcIBkP9cQMJQoJA= github.com/shirou/gopsutil/v3 v3.22.5/go.mod h1:so9G9VzeHt/hsd0YwqprnjHnfARAUktauykSbr+y2gA= @@ -1477,7 +1481,6 @@ golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210426230700-d19ff857e887/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -1487,12 +1490,15 @@ golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210906170528-6f6e22806c34/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210917161153-d61c044b1678/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211023085530-d6a326fbbf70/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211116061358-0a5406a5449c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= 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= From 6d4e2a0bde21bf7f0d3130bf654c2b75d1b0a0df Mon Sep 17 00:00:00 2001 From: Sharif Elgamal Date: Wed, 8 Jun 2022 12:29:28 -0700 Subject: [PATCH 085/545] don't special case gcp-auth for enabling addons --- pkg/addons/addons.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkg/addons/addons.go b/pkg/addons/addons.go index 2b273dd6d2..a667abe38e 100644 --- a/pkg/addons/addons.go +++ b/pkg/addons/addons.go @@ -159,9 +159,6 @@ func EnableOrDisableAddon(cc *config.ClusterConfig, name string, val string) err // check addon status before enabling/disabling it if isAddonAlreadySet(cc, addon, enable) { - if addon.Name() == "gcp-auth" { - return nil - } klog.Warningf("addon %s should already be in state %v", name, val) if !enable { return nil From 73beba4feb8770b31b3810da85d6f9ca5b040705 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 8 Jun 2022 19:58:58 +0000 Subject: [PATCH 086/545] Bump github.com/cloudevents/sdk-go/v2 from 2.9.0 to 2.10.0 Bumps [github.com/cloudevents/sdk-go/v2](https://github.com/cloudevents/sdk-go) from 2.9.0 to 2.10.0. - [Release notes](https://github.com/cloudevents/sdk-go/releases) - [Commits](https://github.com/cloudevents/sdk-go/compare/v2.9.0...v2.10.0) --- updated-dependencies: - dependency-name: github.com/cloudevents/sdk-go/v2 dependency-type: direct:production update-type: version-update:semver-minor ... 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 3627d3f287..4c1745cb11 100644 --- a/go.mod +++ b/go.mod @@ -16,7 +16,7 @@ require ( github.com/c4milo/gotoolkit v0.0.0-20190525173301-67483a18c17a // indirect 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/cloudevents/sdk-go/v2 v2.10.0 github.com/docker/docker v20.10.16+incompatible github.com/docker/go-units v0.4.0 github.com/docker/machine v0.16.2 diff --git a/go.sum b/go.sum index 0926bace1c..576323ce2d 100644 --- a/go.sum +++ b/go.sum @@ -229,8 +229,8 @@ github.com/cilium/ebpf v0.2.0/go.mod h1:To2CFviqOWL/M0gIMsvSMlqe7em/l1ALkX1PyjrX github.com/cilium/ebpf v0.4.0/go.mod h1:4tRaxcgiL706VnOzHOdBlY8IEAIdxINsQBcU4xJJXRs= github.com/cilium/ebpf v0.7.0/go.mod h1:/oI2+1shJiTGAMgl6/RgJr36Eo1jzrRcAWbcXO2usCA= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudevents/sdk-go/v2 v2.9.0 h1:StQ9q2JuGvclGFoT7kpTdQm+qjW0LQzg51CgUF4ncpY= -github.com/cloudevents/sdk-go/v2 v2.9.0/go.mod h1:GpCBmUj7DIRiDhVvsK5d6WCbgTWs8DxAWTRtAwQmIXs= +github.com/cloudevents/sdk-go/v2 v2.10.0 h1:sz0pbNBGh1iRspqLGe/2cXhDghZZpvNPHwKPucVbh+8= +github.com/cloudevents/sdk-go/v2 v2.10.0/go.mod h1:GpCBmUj7DIRiDhVvsK5d6WCbgTWs8DxAWTRtAwQmIXs= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= From 475b17d4db6809061932a90c7d461a8d39a1b8de Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Wed, 8 Jun 2022 13:24:54 -0700 Subject: [PATCH 087/545] bump cloud.google.com/go/storage to resolve build error --- go.mod | 18 +++++++++--------- go.sum | 39 ++++++++++++++++++++++++--------------- 2 files changed, 33 insertions(+), 24 deletions(-) diff --git a/go.mod b/go.mod index 8bbe758c37..3d35ed35d9 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.22.0 + cloud.google.com/go/storage v1.22.1 contrib.go.opencensus.io/exporter/stackdriver v0.13.12 github.com/Delta456/box-cli-maker/v2 v2.2.2 github.com/GoogleCloudPlatform/docker-credential-gcr v0.0.0-20210713212222-faed5e8b8ca2 @@ -74,13 +74,13 @@ require ( golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4 golang.org/x/exp v0.0.0-20210220032938-85be41e4509f golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 - golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 - golang.org/x/sync v0.0.0-20220513210516-0976fa681c29 - golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a + golang.org/x/oauth2 v0.0.0-20220608161450-d0670ef3b1eb + golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f + golang.org/x/sys v0.0.0-20220608164250-635b8c9b7f68 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 golang.org/x/text v0.3.7 gonum.org/v1/plot v0.11.0 - google.golang.org/api v0.81.0 + google.golang.org/api v0.83.0 gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 // indirect gopkg.in/yaml.v2 v2.4.0 k8s.io/api v0.24.1 @@ -104,7 +104,7 @@ require ( ) require ( - cloud.google.com/go v0.100.2 // indirect + cloud.google.com/go v0.102.0 // indirect cloud.google.com/go/compute v1.6.1 // indirect cloud.google.com/go/iam v0.3.0 // indirect cloud.google.com/go/monitoring v1.1.0 // indirect @@ -211,12 +211,12 @@ 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-20220520000938-2e3eb7b945c2 // indirect + golang.org/x/net v0.0.0-20220607020251-c690dde0001d // indirect golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df // indirect google.golang.org/appengine v1.6.7 // indirect - google.golang.org/genproto v0.0.0-20220519153652-3a47de7e79bd // indirect - google.golang.org/grpc v1.46.2 // indirect + google.golang.org/genproto v0.0.0-20220608133413-ed9918b62aac // indirect + google.golang.org/grpc v1.47.0 // indirect google.golang.org/protobuf v1.28.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/ini.v1 v1.66.4 // indirect diff --git a/go.sum b/go.sum index a217702b03..cc832dc49c 100644 --- a/go.sum +++ b/go.sum @@ -30,8 +30,9 @@ 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.2 h1:t9Iw5QH5v4XtlEQaCtUY7x6sCABps8sW0acw7e2WQ6Y= cloud.google.com/go v0.100.2/go.mod h1:4Xra9TjzAeYHrl5+oeLlzbM2k3mjVhZh4UqTZ//w99A= +cloud.google.com/go v0.102.0 h1:DAq3r8y4mDgyB/ZPJ9v/5VJNqjgJAxTn6ZYLlUywOu8= +cloud.google.com/go v0.102.0/go.mod h1:oWcCzKlqJ5zgHQt9YsaeTY9KzIvjyy0ArmiBUgpQ+nc= cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= @@ -61,8 +62,8 @@ cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohl 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/storage v1.22.1 h1:F6IlQJZrZM++apn9V5/VfS3gbTUYg98PS3EMQAzqtfg= +cloud.google.com/go/storage v1.22.1/go.mod h1:S8N1cAStu7BOeFfE8KAQzmyyLkK8p/vmRq6kuBTW58Y= 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= @@ -1353,8 +1354,8 @@ golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su golang.org/x/net v0.0.0-20220325170049-de3da57026de/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220412020605-290c469a71a5/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= -golang.org/x/net v0.0.0-20220520000938-2e3eb7b945c2 h1:NWy5+hlRbC7HK+PmcXVUmW1IMyFce7to56IUvhUFm7Y= -golang.org/x/net v0.0.0-20220520000938-2e3eb7b945c2/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= +golang.org/x/net v0.0.0-20220607020251-c690dde0001d h1:4SFsTMi4UahlKoloni7L4eYzhFRifURQLw+yv0QDCx8= +golang.org/x/net v0.0.0-20220607020251-c690dde0001d/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= 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= @@ -1376,8 +1377,10 @@ golang.org/x/oauth2 v0.0.0-20211005180243-6b3c2da341f1/go.mod h1:KelEdhl1UZF7XfJ 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/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/oauth2 v0.0.0-20220524215830-622c5d57e401/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= +golang.org/x/oauth2 v0.0.0-20220608161450-d0670ef3b1eb h1:8tDJ3aechhddbdPAxpycgXHJRMLpk/Ab+aa4OgdN5/g= +golang.org/x/oauth2 v0.0.0-20220608161450-d0670ef3b1eb/go.mod h1:jaDAt6Dkxork7LmZnYtzbRWj0W47D86a3TGe0YHBvmE= 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= @@ -1390,8 +1393,8 @@ golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20220513210516-0976fa681c29 h1:w8s32wxx3sY+OjLlv9qltkLU5yvJzxjjgiHWLjdIcw4= -golang.org/x/sync v0.0.0-20220513210516-0976fa681c29/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f h1:Ax0t5p6N38Ga0dThY21weqDEyz2oklo4IvDkpigvkD8= +golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -1508,9 +1511,11 @@ golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220328115105-d36c6a25d886/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220502124256-b6088ccd6cba/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220517195934-5e4e11fc645e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a h1:dGzPydgVsqGcTRVwiLJ1jVbufYwmzD3LfVPLKsKg+0k= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220608164250-635b8c9b7f68 h1:z8Hj/bl9cOV2grsOpEaQFUaly0JWN3i97mo3jXKJNp0= +golang.org/x/sys v0.0.0-20220608164250-635b8c9b7f68/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-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY= @@ -1651,8 +1656,9 @@ google.golang.org/api v0.71.0/go.mod h1:4PyU6e6JogV1f9eA4voyrTY2batOLdgZ5qZ5HOCc google.golang.org/api v0.74.0/go.mod h1:ZpfMZOVRMywNyvJFeqL9HRWBgAuRfSjJFpe9QtRRyDs= google.golang.org/api v0.75.0/go.mod h1:pU9QmyHLnzlpar1Mjt4IbapUCy8J+6HD6GeELN69ljA= google.golang.org/api v0.78.0/go.mod h1:1Sg78yoMLOhlQTeF+ARBoytAcH1NNyyl390YMy6rKmw= -google.golang.org/api v0.81.0 h1:o8WF5AvfidafWbFjsRyupxyEQJNUWxLZJCK5NXrxZZ8= -google.golang.org/api v0.81.0/go.mod h1:FA6Mb/bZxj706H2j+j2d6mHEEaHBmbbWnkfvmorOCko= +google.golang.org/api v0.80.0/go.mod h1:xY3nI94gbvBrE0J6NHXhxOmW97HG7Khjkku6AFB3Hyg= +google.golang.org/api v0.83.0 h1:pMvST+6v+46Gabac4zlJlalxZjCeRcepwg2EdBU+nCc= +google.golang.org/api v0.83.0/go.mod h1:CNywQoj/AfhTw26ZWAa6LwOv+6WFxHmeLPZq2uncLZk= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -1741,15 +1747,17 @@ 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/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= google.golang.org/genproto v0.0.0-20220407144326-9054f6ed7bac/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= google.golang.org/genproto v0.0.0-20220413183235-5e96e2839df9/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= google.golang.org/genproto v0.0.0-20220414192740-2d67ff6cf2b4/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= google.golang.org/genproto v0.0.0-20220421151946-72621c1f0bd3/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= google.golang.org/genproto v0.0.0-20220429170224-98d788798c3e/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= google.golang.org/genproto v0.0.0-20220505152158-f39f71e6c8f3/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4= -google.golang.org/genproto v0.0.0-20220519153652-3a47de7e79bd h1:e0TwkXOdbnH/1x5rc5MZ/VYyiZ4v+RdVfrGMqEwT68I= -google.golang.org/genproto v0.0.0-20220519153652-3a47de7e79bd/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4= +google.golang.org/genproto v0.0.0-20220518221133-4f43b3371335/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4= +google.golang.org/genproto v0.0.0-20220523171625-347a074981d8/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4= +google.golang.org/genproto v0.0.0-20220602131408-e326c6e8e9c8/go.mod h1:yKyY4AMRwFiC8yMMNaMi+RkCnjZJt9LoWuvhXjMs+To= +google.golang.org/genproto v0.0.0-20220608133413-ed9918b62aac h1:ByeiW1F67iV9o8ipGskA+HWzSkMbRJuKLlwCdPxzn7A= +google.golang.org/genproto v0.0.0-20220608133413-ed9918b62aac/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA= 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= @@ -1783,8 +1791,9 @@ google.golang.org/grpc v1.40.1/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9K google.golang.org/grpc v1.44.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ= google.golang.org/grpc v1.46.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= -google.golang.org/grpc v1.46.2 h1:u+MLGgVf7vRdjEYZ8wDFhAVNmhkbJ5hmrA1LMWK1CAQ= google.golang.org/grpc v1.46.2/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= +google.golang.org/grpc v1.47.0 h1:9n77onPX5F3qfFCqjy9dhn8PbNQsIKeVU04J9G7umt8= +google.golang.org/grpc v1.47.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= From 95a0c12fcc90164700c5bc887b5981f1cd04927d Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Wed, 8 Jun 2022 14:04:42 -0700 Subject: [PATCH 088/545] update presentations --- site/content/en/docs/presentations/_index.md | 160 +++++++------------ 1 file changed, 59 insertions(+), 101 deletions(-) diff --git a/site/content/en/docs/presentations/_index.md b/site/content/en/docs/presentations/_index.md index a4594acb4d..7ca24c149e 100644 --- a/site/content/en/docs/presentations/_index.md +++ b/site/content/en/docs/presentations/_index.md @@ -7,115 +7,73 @@ description: > Presentations about the minikube project, mostly from the Kubernetes blog and the KubeCon conference. +## Conferences + +### KubeCon EU 2022 (Valencia, Spain) + +* [Deep Dive into Minikube - YouTube](https://youtu.be/Iyq_MlSku-I) (38:37) + * Medya Ghazizadeh & Sharif Elgamal, Google + +### KubeCon NA 2021 (Los Angeles, California) + +* [A Deep Dive Into 5 years of Minikube - YouTube](https://youtu.be/GHczvbzuVvc) (47:47) + * Medya Ghazizadeh, Google + +### KubeCon EU 2021 (Online, Europe) - Virtual + +* [Minikube & Three Different Local Kubernetes Learning Environments - YouTube](https://youtu.be/nqKYgeUtk8s) (32:48) + * Anders Björklund & Predrag Rogic + +### KubeCon EU 2020 (Amsterdam, Netherlands) - Virtual + +* [Minikube - YouTube](https://youtu.be/xdoOmSSCxo8) (37:31) + * Rohit Anand, NEC Corporation & Medya Ghazizadeh, Google + +* [Improving the Performance of Your Kubernetes Cluster - YouTube](https://youtu.be/tvreJem3xIw) (36:10) + * Priya Wadhwa, Google + +### KubeCon NA 2019 (San Diego, California) + +* [Minikube - YouTube](https://youtu.be/3giynG20f3I) (47:27) + * Thomas Strömberg & Medya Ghazizadeh, Google + +### Helm Summit EU 2019 (Amsterdam, The Netherlands) + +* [Dancing with Helm, Skaffold and Minikube! - YouTube](https://youtu.be/Ww7JvxKY478) (35:26) + * Medya Ghazizadeh, Google + +### KubeCon CN 2019 (Shanghai, China) + +* [Minikube: Bringing Kubernetes to the Next Billion Users - YouTube](https://youtu.be/ahb-_NBtOL0) (33:21) + * Thomas Strömberg, Google + +### KubeCon NA 2018 (Seattle, Washington) + +* [Intro: Minikube - YouTube](https://youtu.be/2yBOVlonHQw) (38:49) + * Thomas Strömberg & Bálint Pató, Google + +* [Deep Dive: Minikube - YouTube](https://youtu.be/46-FXiSEfE4) (44:05) + * Bálint Pató & Thomas Strömberg, Google + +### KubeCon EU 2018 (Copenhagen, Denmark) + +* [Minikube Intro - YouTube](https://youtu.be/4x0CZmF_U5o) (28:30) + * Dan Lorenc, Google + ## Kubernetes Blog -### 2016 - -2016-05-30, Kubernetes 1.3, Minikube 0.1.0 - -* _This is the initial release of Minikube._ - -2016-07-11, Kubernetes 1.3, Minikube 0.5.0 - -* - ### 2019 2019-03-28, Kubernetes 1.14, Minikube 1.0.0 -* +* [Running Kubernetes locally on Linux with Minikube - now with Kubernetes 1.14 support](https://kubernetes.io/blog/2019/03/28/running-kubernetes-locally-on-linux-with-minikube-now-with-kubernetes-1.14-support/) -## KubeCon + CloudNativeCon +### 2016 -### KubeCon NA 2016 (Seattle, Washington) +2016-07-11, Kubernetes 1.3, Minikube 0.5.0 - +* [Minikube: easily run Kubernetes locally](https://kubernetes.io/blog/2016/07/minikube-easily-run-kubernetes-locally/) -### KubeCon EU 2017 (Berlin, Germany) +2016-05-30, Kubernetes 1.3, Minikube 0.1.0 - - -### KubeCon NA 2017 (Austin, Texas) - - - -### KubeCon EU 2018 (Copenhagen, Denmark) - - - -* (28:30) - * "Minikube Intro" - * Dan Lorenc, Google - -### KubeCon NA 2018 (Seattle, Washington) - - - -* (38:49) - * "Intro: Minikube" - * Thomas Strömberg & Bálint Pató, Google - -* (44:05) - * "Deep Dive: Minikube" - * Bálint Pató & Thomas Strömberg, Google - -### KubeCon EU 2019 (Barcelona, Spain) - - - -* _No results found for minikube_ - -### KubeCon CN 2019 (Shanghai, China) - - - -* (33:21) - * "Minikube: Bringing Kubernetes to the Next Billion Users" - * Thomas Strömberg, Google - -### KubeCon NA 2019 (San Diego, California) - - - -* (47:27) - * "Minikube" - * Thomas Strömberg & Medya Ghazizadeh, Google - -### KubeCon EU 2020 (Amsterdam, Netherlands) - Virtual - - - -* (37:31) - * "Minikube" - * Rohit Anand, NEC Corporation & Medya Ghazizadeh, Google - -* (36:10) - * "Improving the Performance of Your Kubernetes Cluster" - * Priya Wadhwa, Google - -### KubeCon NA 2020 (Boston, Massachusetts) - Virtual - - - -* _No results found for minikube_ - -### KubeCon EU 2021 (Online, Europe) - Virtual - -* (32:48) - * "Minikube and Three Different Local Kubernetes Learning Environments" - * Anders Björklund & Predrag Rogic - -### KubeCon NA 2021 (Los Angeles, California) - -* (47:47) - * "A Deep Dive Into 5 years of Minikube" - * Medya Ghazizadeh - - -## Other conferences - -### Helm Summit EU 2019 (Amsterdam, The Netherlands) - -* (35:26) - * "Dancing with Helm, Skaffold and Minikube!" - * Medya Ghazizadeh, Google +* _This is the initial release of Minikube._ From 472bb238edbad804e3bd64ad26c7aec0eab20e57 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 8 Jun 2022 21:23:20 +0000 Subject: [PATCH 089/545] Bump github.com/google/go-containerregistry from 0.6.0 to 0.9.0 Bumps [github.com/google/go-containerregistry](https://github.com/google/go-containerregistry) from 0.6.0 to 0.9.0. - [Release notes](https://github.com/google/go-containerregistry/releases) - [Changelog](https://github.com/google/go-containerregistry/blob/main/.goreleaser.yml) - [Commits](https://github.com/google/go-containerregistry/compare/v0.6.0...v0.9.0) --- updated-dependencies: - dependency-name: github.com/google/go-containerregistry dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 20 +-- go.sum | 394 +++++++++++++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 378 insertions(+), 36 deletions(-) diff --git a/go.mod b/go.mod index 7f1f32acd8..6b9cecc61d 100644 --- a/go.mod +++ b/go.mod @@ -23,7 +23,7 @@ require ( github.com/elazarl/goproxy v0.0.0-20210110162100-a92cc753f88e github.com/golang-collections/collections v0.0.0-20130729185459-604e922904d3 github.com/google/go-cmp v0.5.8 - github.com/google/go-containerregistry v0.6.0 + github.com/google/go-containerregistry v0.9.0 github.com/google/slowjam v1.0.0 github.com/google/uuid v1.3.0 github.com/hashicorp/go-getter v1.6.1 @@ -59,7 +59,7 @@ require ( github.com/pkg/errors v0.9.1 github.com/pkg/profile v0.0.0-20161223203901-3a8809bd8a80 github.com/pmezard/go-difflib v1.0.0 - github.com/russross/blackfriday v1.5.3-0.20200218234912-41c5fccfd6f6 // indirect + github.com/russross/blackfriday v1.6.0 // indirect github.com/samalba/dockerclient v0.0.0-20160414174713-91d7393ff859 // indirect github.com/shirou/gopsutil/v3 v3.22.5 github.com/spf13/cobra v1.4.0 @@ -114,7 +114,7 @@ require ( github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.31.0 // indirect github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd // indirect - github.com/Microsoft/go-winio v0.5.0 // indirect + github.com/Microsoft/go-winio v0.5.2 // indirect github.com/PuerkitoBio/purell v1.1.1 // indirect github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect github.com/VividCortex/ewma v1.1.1 // indirect @@ -126,14 +126,14 @@ require ( github.com/cespare/xxhash/v2 v2.1.2 // indirect github.com/containerd/cgroups v1.0.1 // indirect github.com/containerd/containerd v1.5.2 // indirect - github.com/containerd/stargz-snapshotter/estargz v0.7.0 // indirect + github.com/containerd/stargz-snapshotter/estargz v0.11.4 // indirect github.com/coreos/go-systemd/v22 v22.3.2 // indirect - github.com/cpuguy83/go-md2man/v2 v2.0.1 // indirect + github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect github.com/cyphar/filepath-securejoin v0.2.3 // indirect github.com/davecgh/go-spew v1.1.1 // indirect - github.com/docker/cli v20.10.7+incompatible // indirect + github.com/docker/cli v20.10.16+incompatible // indirect github.com/docker/distribution v2.8.1+incompatible // indirect - github.com/docker/docker-credential-helpers v0.6.3 // indirect + github.com/docker/docker-credential-helpers v0.6.4 // indirect github.com/emicklei/go-restful v2.9.5+incompatible // indirect github.com/evanphx/json-patch v4.12.0+incompatible // indirect github.com/fatih/color v1.13.0 // indirect @@ -152,7 +152,6 @@ require ( github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/protobuf v1.5.2 // indirect - github.com/golang/snappy v0.0.3 // indirect github.com/google/gnostic v0.5.7-v3refs // indirect github.com/google/go-querystring v1.1.0 // indirect github.com/google/gofuzz v1.1.0 // indirect @@ -168,7 +167,7 @@ require ( github.com/jmespath/go-jmespath v0.4.0 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect - github.com/klauspost/compress v1.13.0 // indirect + github.com/klauspost/compress v1.15.4 // indirect github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect github.com/magiconair/properties v1.8.6 // indirect github.com/mailru/easyjson v0.7.6 // indirect @@ -186,7 +185,7 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect - github.com/opencontainers/image-spec v1.0.1 // indirect + github.com/opencontainers/image-spec v1.0.3-0.20220114050600-8b9d41f48198 // indirect github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417 // indirect github.com/pelletier/go-toml v1.9.5 // indirect github.com/pelletier/go-toml/v2 v2.0.1 // indirect @@ -206,6 +205,7 @@ require ( github.com/tklauser/go-sysconf v0.3.10 // indirect github.com/tklauser/numcpus v0.4.0 // indirect github.com/ulikunitz/xz v0.5.8 // indirect + github.com/vbatts/tar-split v0.11.2 // indirect github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect go.uber.org/atomic v1.7.0 // indirect diff --git a/go.sum b/go.sum index 2cc13876da..66bedd5641 100644 --- a/go.sum +++ b/go.sum @@ -1,4 +1,6 @@ +4d63.com/gochecknoglobals v0.1.0/go.mod h1:wfdC5ZjKSPr7CybKEcgJhUOgeAQW1+7WcyK8OvUilfo= bazil.org/fuse v0.0.0-20160811212531-371fbbdaa898/go.mod h1:Xbm+BRKSBEpa4q4hTSxohYNQpsxXPbPry4JJWOB3LB8= +bitbucket.org/creachadair/shell v0.0.6/go.mod h1:8Qqi/cYk7vPnsOePHroKXDJYmb5x7ENhtiFtfZq8K+M= cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= @@ -14,6 +16,7 @@ cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6 cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc= cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk= cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs= +cloud.google.com/go v0.60.0/go.mod h1:yw2G51M9IfRboUH61Us8GqCeF1PzPblB823Mn2q2eAU= cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc= cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY= cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI= @@ -48,6 +51,7 @@ cloud.google.com/go/compute v1.6.1/go.mod h1:g85FgpzFvNULZ+S8AYq87axRKuf2Kh7deLq 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/firestore v1.6.0/go.mod h1:afJwI0vaXwAG54kI7A//lP/lSPDkQORQuMkv56TxEPU= 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= @@ -56,6 +60,8 @@ cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2k cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU= +cloud.google.com/go/pubsub v1.5.0/go.mod h1:ZEwJccE3z93Z2HWvstpri00jOg7oO4UZDtKhwDwqF0w= +cloud.google.com/go/spanner v1.7.0/go.mod h1:sd3K2gZ9Fd0vMPLXzeCrF6fq4i63Q7aTLW/lBIfBkIk= cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos= cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= @@ -67,12 +73,15 @@ cloud.google.com/go/storage v1.22.1/go.mod h1:S8N1cAStu7BOeFfE8KAQzmyyLkK8p/vmRq 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.4/go.mod h1:aXENhDJ1Y4lIg4EUaVTwzvYETVNZk10Pu26tevFKLUc= contrib.go.opencensus.io/exporter/stackdriver v0.13.12 h1:bjBKzIf7/TAkxd7L2utGaLM78bmUWlCval5K9UeElbY= contrib.go.opencensus.io/exporter/stackdriver v0.13.12/go.mod h1:mmxnWlrvrFdpiOHOhxBaVi1rkc0WOqhgfknj4Yg0SeQ= 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= git.sr.ht/~sbinet/gg v0.3.1/go.mod h1:KGYtlADtqsqANL9ueOFkWymvzUvLMQllU5Ixo+8v3pc= +github.com/Antonboom/errname v0.1.5/go.mod h1:DugbBstvPFQbv/5uLcRRzfrNqKE9tVdVCqWCLp6Cifo= +github.com/Antonboom/nilnil v0.1.0/go.mod h1:PhHLvRPSghY5Y7mX4TW+BHZQYo1A8flE5H20D3IPZBo= github.com/Azure/azure-sdk-for-go v16.2.1+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8= github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8= @@ -102,9 +111,11 @@ github.com/Azure/go-autorest/logger v0.2.1/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZ github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk= github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/BurntSushi/toml v0.4.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/Delta456/box-cli-maker/v2 v2.2.2 h1:CpSLcPgi5pY4+arzpyuWN2+nU8gHqto2Y+OO7VbELQ0= github.com/Delta456/box-cli-maker/v2 v2.2.2/go.mod h1:idItIMZeyx3bg73XwSgsLeZd+gdpD2IvGbR3FC8a9TU= +github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24/go.mod h1:4UJr5HIiMZrwgkSPdsjy2uOQExX/WEILpIrO9UPGuXs= 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.7.0 h1:8vpIORQCKkwM0r/IZ1faAddG56t7byhqSxATphc+8MI= @@ -113,6 +124,11 @@ github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapp github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.31.0/go.mod h1:j+FS9VBW3mwtHBmm9KOJEy5Tq68fCp7fE/R9bV/flIM= 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/Masterminds/goutils v1.1.0/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU= +github.com/Masterminds/semver v1.4.2/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y= +github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y= +github.com/Masterminds/sprig v2.15.0+incompatible/go.mod h1:y6hNFY5UBTIWBxnzTeuNhlNS5hqE0NB0E6fgfo2Br3o= +github.com/Masterminds/sprig v2.22.0+incompatible/go.mod h1:y6hNFY5UBTIWBxnzTeuNhlNS5hqE0NB0E6fgfo2Br3o= github.com/Microsoft/go-winio v0.4.11/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA= github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA= github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5/go.mod h1:tTuCMEN+UleMWgg9dVx4Hu52b1bJo+59jBh3ajtinzw= @@ -121,8 +137,8 @@ github.com/Microsoft/go-winio v0.4.16/go.mod h1:XB6nPKklQyQ7GC9LdcBEcBl8PF76WugX github.com/Microsoft/go-winio v0.4.17-0.20210211115548-6eac466e5fa3/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= github.com/Microsoft/go-winio v0.4.17-0.20210324224401-5516f17a5958/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= github.com/Microsoft/go-winio v0.4.17/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= -github.com/Microsoft/go-winio v0.5.0 h1:Elr9Wn+sGKPlkaBvwu4mTrxtmOp3F3yV9qhaHbXGjwU= -github.com/Microsoft/go-winio v0.5.0/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= +github.com/Microsoft/go-winio v0.5.2 h1:a9IhgEQBCUEk6QCdml9CiJGhAws+YwffDHEMp1VMrpA= +github.com/Microsoft/go-winio v0.5.2/go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v8QkMxJ6pZY= github.com/Microsoft/hcsshim v0.8.6/go.mod h1:Op3hHsoHPAvb6lceZHDtd9OkTew38wNoXnJs8iY7rUg= github.com/Microsoft/hcsshim v0.8.7-0.20190325164909-8abdbb8205e4/go.mod h1:Op3hHsoHPAvb6lceZHDtd9OkTew38wNoXnJs8iY7rUg= github.com/Microsoft/hcsshim v0.8.7/go.mod h1:OHd7sQqRFrYd3RmSgbgji+ctCwkbq2wbEYNSzOYtcBQ= @@ -136,6 +152,7 @@ github.com/Microsoft/hcsshim/test v0.0.0-20201218223536-d3e5debf77da/go.mod h1:5 github.com/Microsoft/hcsshim/test v0.0.0-20210227013316-43a75bb4edd3/go.mod h1:mw7qgWloBUl75W/gVH3cQszUg1+gUITj7D6NY7ywVnY= github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= +github.com/OpenPeeDeeP/depguard v1.0.1/go.mod h1:xsIw86fROiiwelg+jB2uM9PiKihMMmUx/1V+TNhjQvM= github.com/Parallels/docker-machine-parallels/v2 v2.0.1 h1:3Rj+4tcm/UqMU5g2bLJmpxD0ssn1BB5am4Cd6yUDbVI= github.com/Parallels/docker-machine-parallels/v2 v2.0.1/go.mod h1:NKwI5KryEmEHMZVj80t9JQcfXWZp4/ZYNBuw4C5sQ9E= github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= @@ -145,6 +162,7 @@ github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdko github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 h1:d+Bc7a5rLufV/sSk/8dngufqelfh6jnri85riMAaF/M= github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d/go.mod h1:HI8ITrYtUY+O+ZhtlqUnD8+KwNPOyugEhfP9fdUIaEQ= +github.com/StackExchange/wmi v1.2.1/go.mod h1:rcmrprowKIVzvc+NUiLncP2uuArMWLCbu9SBzvHz7e8= github.com/VividCortex/ewma v1.1.1 h1:MnEK4VOv6n0RSY4vtRe3h11qjxL3+t0B8yOL8iMXdcM= github.com/VividCortex/ewma v1.1.1/go.mod h1:2Tkkvm3sRDVXaiyucHiACn4cqf7DpdyLvmxzcbUokwA= github.com/VividCortex/godaemon v1.0.0 h1:aHYrScWvgaSOdAoYCdObWXLm+e1rldP9Pwb1ZvuZkQw= @@ -161,19 +179,30 @@ github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRF github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= github.com/alexflint/go-filemutex v0.0.0-20171022225611-72bdc8eae2ae/go.mod h1:CgnQgUtFrFz9mxFNtED3jI5tLDjKlOM+oUF/sTk6ps0= +github.com/alexkohler/prealloc v1.0.0/go.mod h1:VetnK3dIgFBBKmg0YnD9F9x6Icjd+9cvfHR56wJVlKE= github.com/alonyb/spinner v1.12.7 h1:FflTMA9I2xRd8OQ5swyZY6Q1DFeaicA/bWo6/oM82a8= github.com/alonyb/spinner v1.12.7/go.mod h1:mQak9GHqbspjC/5iUx3qMlIho8xBS/ppAL/hX5SmPJU= +github.com/andybalholm/brotli v1.0.2/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu3qAvBg8x/Y= +github.com/andybalholm/brotli v1.0.3/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c= +github.com/antihax/optional v0.0.0-20180407024304-ca021399b1a6/go.mod h1:V8iCPQYkqmusNa815XgQio277wI47sdRh1dUOLdyC6Q= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= +github.com/aokoli/goutils v1.0.1/go.mod h1:SijmP0QR8LtwsmDs8Yii5Z/S4trXFGFC2oO5g9DP+DQ= github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= +github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= +github.com/ashanbrown/forbidigo v1.2.0/go.mod h1:vVW7PEdqEFqapJe95xHkTfB1+XvZXBFg8t0sG2FIxmI= +github.com/ashanbrown/makezero v0.0.0-20210520155254-b6261585ddde/go.mod h1:oG9Dnez7/ESBqc4EdrdNlryeo7d0KcW1ftXHm7nU/UU= github.com/aws/aws-sdk-go v1.15.11/go.mod h1:mFuSZ37Z9YOHbQEwBWztmVzqXrEkub65tZoCYDt7FT0= github.com/aws/aws-sdk-go v1.15.78/go.mod h1:E3/ieXAlvM0XWO57iftYVDLLvQ824smPP3ATZkfNZeM= +github.com/aws/aws-sdk-go v1.23.20/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= +github.com/aws/aws-sdk-go v1.25.37/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= +github.com/aws/aws-sdk-go v1.36.30/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= github.com/aws/aws-sdk-go v1.37.0/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= github.com/aws/aws-sdk-go v1.38.49 h1:E31vxjCe6a5I+mJLmUGaZobiWmg9KdWaud9IfceYeYQ= github.com/aws/aws-sdk-go v1.38.49/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= @@ -190,20 +219,25 @@ github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d/go.mod h1:6QX/PXZ github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= github.com/bitly/go-simplejson v0.5.0/go.mod h1:cXHtHw4XUPsvGaxgjIAn8PhEWG9NfngEKAMDJEczWVA= github.com/bketelsen/crypt v0.0.4/go.mod h1:aI6NrJ0pMGgvZKL1iVgXLnfIFJtfV+bKCoqOes/6LfM= +github.com/bkielbasa/cyclop v1.2.0/go.mod h1:qOI0yy6A7dYC4Zgsa72Ppm9kONl0RoIlPbzot9mhmeI= github.com/blang/semver v3.1.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= github.com/blang/semver v3.5.1+incompatible h1:cQNTCjp13qL8KC3Nbxr/y2Bqb63oX6wdnnjpJbkM4JQ= github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM= github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ= +github.com/blizzy78/varnamelen v0.3.0/go.mod h1:hbwRdBvoBqxk34XyQ6HA0UH3G0/1TKuv5AC4eaBT0Ec= github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4= +github.com/bombsimon/wsl/v3 v3.3.0/go.mod h1:st10JtZYLE4D5sC7b8xV4zTKZwAQjCH/Hy2Pm1FNZIc= github.com/boombuler/barcode v1.0.0/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8= github.com/boombuler/barcode v1.0.1/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8= github.com/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625/go.mod h1:HYsPBTaaSFSlLx/70C2HPIMNZpVV8+vt/A+FMnYP11g= +github.com/breml/bidichk v0.1.1/go.mod h1:zbfeitpevDUGI7V91Uzzuwrn4Vls8MoBMrwtt78jmso= github.com/bshuster-repo/logrus-logstash-hook v0.4.1/go.mod h1:zsTqEiSzDgAa/8GZR7E1qaXrhYNDKBYy5/dWPTIflbk= github.com/buger/jsonparser v0.0.0-20180808090653-f4dd9f5a6b44/go.mod h1:bbYlZJ7hK1yFx9hf58LP0zeX7UjIGs20ufpu3evjr+s= github.com/bugsnag/bugsnag-go v0.0.0-20141110184014-b1d153021fcd/go.mod h1:2oa8nejYd4cQ/b0hMIopN0lCRxU0bueqREvZLWFrtK8= github.com/bugsnag/osext v0.0.0-20130617224835-0dd3f918b21b/go.mod h1:obH5gd0BsqsP2LwDJ9aOkm/6J86V6lyAXCoQWGw3K50= github.com/bugsnag/panicwrap v0.0.0-20151223152923-e2c28503fcd0/go.mod h1:D/8v3kj0zr8ZAKg1AQ6crr+5VwKN5eIywRkfhyM/+dE= +github.com/butuzov/ireturn v0.1.1/go.mod h1:Wh6Zl3IMtTpaIKbmwzqi6olnM9ptYQxxVacMsOEFPoc= 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.3 h1:cFAlzYUlVYDysBEH2T5hyJZMh3+5+WCBvSnK6Q8UtC4= @@ -216,6 +250,8 @@ github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XL github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE= github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5/go.mod h1:/iP1qXHoty45bqomnu2LM+VVyAEdWN+vtSHGlQgyxbw= +github.com/charithe/durationcheck v0.0.9/go.mod h1:SSbRIBVfMjCi/kEB6K65XEA83D6prSM8ap1UCpNKtgg= +github.com/chavacava/garif v0.0.0-20210405164556-e8a0a408d6af/go.mod h1:Qjyv4H3//PWVzTeCezG2b9IRn6myJxJSr4TD/xo6ojU= github.com/checkpoint-restore/go-criu/v4 v4.1.0/go.mod h1:xUQBLp4RLc5zJtWY++yjOoMoB5lihDt7fai+75m+rGw= github.com/checkpoint-restore/go-criu/v5 v5.3.0/go.mod h1:E/eQpaFtUKGOOSEBZgmKAcn+zUUwWxqcaKZlF54wK8E= github.com/cheggaaa/pb v1.0.27/go.mod h1:pQciLPpbU0oxA0h+VJYYLxO+XeDQb5pZijXscXHm81s= @@ -306,8 +342,8 @@ github.com/containerd/imgcrypt v1.1.1/go.mod h1:xpLnwiQmEUJPvQoAapeb2SNCxz7Xr6PJ github.com/containerd/nri v0.0.0-20201007170849-eb1350a75164/go.mod h1:+2wGSDGFYfE5+So4M5syatU0N0f0LbWpuqyMi4/BE8c= github.com/containerd/nri v0.0.0-20210316161719-dbaa18c31c14/go.mod h1:lmxnXF6oMkbqs39FiCt1s0R2HSMhcLel9vNL3m4AaeY= github.com/containerd/nri v0.1.0/go.mod h1:lmxnXF6oMkbqs39FiCt1s0R2HSMhcLel9vNL3m4AaeY= -github.com/containerd/stargz-snapshotter/estargz v0.7.0 h1:1d/rydzTywc76lnjJb6qbPCiTiCwts49AzKps/Ecblw= -github.com/containerd/stargz-snapshotter/estargz v0.7.0/go.mod h1:83VWDqHnurTKliEB0YvWMiCfLDwv4Cjj1X9Vk98GJZw= +github.com/containerd/stargz-snapshotter/estargz v0.11.4 h1:LjrYUZpyOhiSaU7hHrdR82/RBoxfGWSaC0VeSSMXqnk= +github.com/containerd/stargz-snapshotter/estargz v0.11.4/go.mod h1:7vRJIcImfY8bpifnMjt+HTJoQxASq7T28MYbP15/Nf0= github.com/containerd/ttrpc v0.0.0-20190828154514-0e0f228740de/go.mod h1:PvCDdDGpgqzQIzDW1TphrGLssLDZp2GuS+X5DkEJB8o= github.com/containerd/ttrpc v0.0.0-20190828172938-92c8520ef9f8/go.mod h1:PvCDdDGpgqzQIzDW1TphrGLssLDZp2GuS+X5DkEJB8o= github.com/containerd/ttrpc v0.0.0-20191028202541-4f1b8fe65a5c/go.mod h1:LPm1u0xBw8r8NOKoOdNMeVHSawSsltak+Ihv+etqsE8= @@ -332,6 +368,7 @@ github.com/containers/ocicrypt v1.1.0/go.mod h1:b8AOe0YR67uU8OqfVNcznfFpAzu3rdgU github.com/containers/ocicrypt v1.1.1/go.mod h1:Dm55fwWm1YZAjYRaJ94z2mfZikIyIN4B0oB3dj3jFxY= github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= +github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= github.com/coreos/go-iptables v0.4.5/go.mod h1:/mVI274lEDI2ns62jHCDnCyBF9Iwsmekav8Dbxlm1MU= github.com/coreos/go-iptables v0.5.0/go.mod h1:/mVI274lEDI2ns62jHCDnCyBF9Iwsmekav8Dbxlm1MU= github.com/coreos/go-oidc v2.1.0+incompatible/go.mod h1:CgnwVTmzoESiwO9qyAFEMiHoZ1nMCKZlZ9V6mm3/LKc= @@ -341,16 +378,19 @@ github.com/coreos/go-systemd v0.0.0-20161114122254-48702e0da86b/go.mod h1:F5haX7 github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= +github.com/coreos/go-systemd v0.0.0-20190620071333-e64a0ec8b42a/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/go-systemd/v22 v22.0.0/go.mod h1:xO0FLkIi5MaZafQlIrOotqXZ90ih+1atmu1JpKERPPk= github.com/coreos/go-systemd/v22 v22.1.0/go.mod h1:xO0FLkIi5MaZafQlIrOotqXZ90ih+1atmu1JpKERPPk= github.com/coreos/go-systemd/v22 v22.3.2 h1:D9/bQk5vlXQFZ6Kwuu6zaiXJ9oTPe68++AzAJc1DzSI= github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= +github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= -github.com/cpuguy83/go-md2man/v2 v2.0.1 h1:r/myEWzV9lfsM1tFLgDyu0atFtJ1fXn261LKYj/3DxU= github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= +github.com/cpuguy83/go-md2man/v2 v2.0.2 h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHHBfMQ6w= +github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/creack/pty v1.1.11 h1:07n33Z8lZxZ2qwegKbObQohDhXDQxiMMz1NOUGYlesw= @@ -362,17 +402,21 @@ github.com/d2g/dhcp4 v0.0.0-20170904100407-a1d1b6c41b1c/go.mod h1:Ct2BUK8SB0YC1S github.com/d2g/dhcp4client v1.0.0/go.mod h1:j0hNfjhrt2SxUOw55nL0ATM/z4Yt3t2Kd1mW34z5W5s= github.com/d2g/dhcp4server v0.0.0-20181031114812-7d4a0a7f59a5/go.mod h1:Eo87+Kg/IX2hfWJfwxMzLyuSZyxSoAug2nGa1G2QAi8= github.com/d2g/hardwareaddr v0.0.0-20190221164911-e7d9fbe030e4/go.mod h1:bMl4RjIciD2oAxI7DmWRx6gbeqrkoLqv3MV0vzNad+I= +github.com/daixiang0/gci v0.2.9/go.mod h1:+4dZ7TISfSmqfAGv59ePaHfNzgGtIkHAhhdKggP1JAc= +github.com/danieljoos/wincred v1.1.0/go.mod h1:XYlo+eRTsVA9aHGp7NGjFkPla4m+DCL7hqDjlFjiygg= +github.com/davecgh/go-spew v0.0.0-20161028175848-04cdfd42973b/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/daviddengcn/go-colortext v0.0.0-20160507010035-511bcaf42ccd/go.mod h1:dv4zxwHi5C/8AeI+4gX4dCWOIvNi7I6JCSX0HvlKPgE= +github.com/denis-tingajkin/go-header v0.4.2/go.mod h1:eLRHAVXzE5atsKAnNRDB90WHCFFnBUn4RN0nRcs1LJA= github.com/denverdino/aliyungo v0.0.0-20190125010748-a747050bb1ba/go.mod h1:dV8lFg6daOBZbT6/BDGIz6Y3WFGn8juu6G+CQ6LHtl0= github.com/dgrijalva/jwt-go v0.0.0-20170104182250-a601269ab70c/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= github.com/dnaeon/go-vcr v1.0.1/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyGc8n1E= -github.com/docker/cli v20.10.7+incompatible h1:pv/3NqibQKphWZiAskMzdz8w0PRbtTaEB+f6NwdU7Is= -github.com/docker/cli v20.10.7+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= +github.com/docker/cli v20.10.16+incompatible h1:aLQ8XowgKpR3/IysPj8qZQJBVQ+Qws61icFuZl6iKYs= +github.com/docker/cli v20.10.16+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/distribution v0.0.0-20190905152932-14b96e55d84c/go.mod h1:0+TTO4EOBfRPhZXAeF1Vu+W3hHZ8eLp8PgKVZlcvtFY= github.com/docker/distribution v2.7.1-0.20190205005809-0d3efadf0154+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= @@ -380,11 +424,10 @@ github.com/docker/distribution v2.8.1+incompatible h1:Q50tZOPR6T/hjNsyc9g8/syEs6 github.com/docker/distribution v2.8.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= github.com/docker/docker v17.12.0-ce-rc1.0.20181225093023-5ddb1d410a8b+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker v17.12.0-ce-rc1.0.20190115220918-5ec31380a5d3+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= -github.com/docker/docker v20.10.7+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker v20.10.16+incompatible h1:2Db6ZR/+FUR3hqPMwnogOPHFn405crbpxvWzKovETOQ= github.com/docker/docker v20.10.16+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= -github.com/docker/docker-credential-helpers v0.6.3 h1:zI2p9+1NQYdnG6sMU26EX4aVGlqbInSQxQXLvzJ4RPQ= -github.com/docker/docker-credential-helpers v0.6.3/go.mod h1:WRaJzqw3CTB9bk10avuGsjVBZsD05qeibJ1/TYlvc0Y= +github.com/docker/docker-credential-helpers v0.6.4 h1:axCks+yV+2MR3/kZhAmy07yC56WZ2Pwu/fKWtKuZB0o= +github.com/docker/docker-credential-helpers v0.6.4/go.mod h1:ofX3UI0Gz1TteYBjtgs07O36Pyasyp66D2uKT7H8W1c= github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ= github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= github.com/docker/go-events v0.0.0-20170721190031-9461782956ad/go.mod h1:Uw6UezgYA44ePAFQYUehOuCzmy5zmg/+nl2ZfMWGkpA= @@ -415,7 +458,10 @@ github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.m github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ= github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0= github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE= +github.com/envoyproxy/protoc-gen-validate v0.0.14/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +github.com/esimonov/ifshort v1.0.3/go.mod h1:yZqNJUrNn20K8Q9n2CrjTKYyVEmX209Hgu+M1LBpeZE= +github.com/ettle/strcase v0.1.1/go.mod h1:hzDLsPC7/lwKyBOywSHEP89nt2pDgdy+No1NBA9o9VY= github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/evanphx/json-patch v4.11.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/evanphx/json-patch v4.12.0+incompatible h1:4onqiflcdA9EOZ4RxV643DvftH5pOlLGNtQ5lPWQu84= @@ -423,9 +469,11 @@ github.com/evanphx/json-patch v4.12.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQL github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d/go.mod h1:ZZMPRZwes7CROmyNKgQzC3XPs6L/G2EJLHddWejkmf4= github.com/fatih/camelcase v1.0.0/go.mod h1:yN2Sb0lFhZJUdVvtELVWefmrXpuZESvPmqwoZc+/fpc= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= +github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= github.com/fatih/color v1.10.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM= github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w= github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= +github.com/fatih/structtag v1.2.0/go.mod h1:mBJUNpUnHmRKrKlQQlmCrh5PuhftFbNv8Ys4/aAZl94= github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/felixge/httpsnoop v1.0.2 h1:+nS9g82KMXccJ/wp0zyRW9ZBHFETmMGtkk+2CTTrW4o= github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= @@ -436,15 +484,19 @@ github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM github.com/frankban/quicktest v1.14.3 h1:FJKSZTDHjyhriyC81FLQ0LY93eSai0ZyR/ZIkd3ZUKE= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= +github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU= github.com/fsnotify/fsnotify v1.5.4 h1:jRbGcIw6P2Meqdwuo0H1p6JVLbL5DHKAKlYndzMwVZI= github.com/fsnotify/fsnotify v1.5.4/go.mod h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmVXmkdnm1bU= github.com/fullsailor/pkcs7 v0.0.0-20190404230743-d7302db945fa/go.mod h1:KnogPXtdwXqoenmZCw6S+25EAm2MkxbG0deNDu4cbSA= +github.com/fullstorydev/grpcurl v1.6.0/go.mod h1:ZQ+ayqbKMJNhzLmbpCiurTVlaK2M/3nqZCxaQ2Ze/sM= github.com/fvbommel/sortorder v1.0.1/go.mod h1:uk88iVf1ovNn1iLfgUVU2F9o5eO30ui720w+kxuqRs0= +github.com/fzipp/gocyclo v0.3.1/go.mod h1:DJHO6AUmbdqj2ET4Z9iArSuwWgYDRryYt2wASxc7x3E= github.com/garyburd/redigo v0.0.0-20150301180006-535138d7bcd7/go.mod h1:NR3MbYisc3/PwhQ00EMzDiPmrwpPxAn5GI05/YaO1SY= github.com/getkin/kin-openapi v0.76.0/go.mod h1:660oXbgy5JFMKreazJaQTw7o+X00qeSyhcnluiMv+Xg= github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/gliderlabs/ssh v0.1.1/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0= +github.com/go-critic/go-critic v0.6.1/go.mod h1:SdNCfU0yF3UBjtaZGw6586/WocupMOJuiqgom5DsQxM= github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q= github.com/go-fonts/dejavu v0.1.0 h1:JSajPXURYqpr+Cu8U9bt8K+XcACIHWqWrvWCKyeFmVQ= github.com/go-fonts/dejavu v0.1.0/go.mod h1:4Wt4I4OU2Nq9asgDCteaAaWZOV24E+0/Pwo0gppep4g= @@ -475,6 +527,7 @@ github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbV 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= +github.com/go-ole/go-ole v1.2.5/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY= github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod h1:+35s3my2LFTysnkMfxsJBAMHj/DoqoB9knIWoYG/Vk0= @@ -497,7 +550,24 @@ github.com/go-openapi/swag v0.19.14/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/ github.com/go-pdf/fpdf v0.5.0/go.mod h1:HzcnA+A23uwogo0tp9yU+l3V+KXhiESpt1PMayhOh5M= github.com/go-pdf/fpdf v0.6.0 h1:MlgtGIfsdMEEQJr2le6b/HNr1ZlQwxyWr77r2aj2U/8= github.com/go-pdf/fpdf v0.6.0/go.mod h1:HzcnA+A23uwogo0tp9yU+l3V+KXhiESpt1PMayhOh5M= +github.com/go-redis/redis v6.15.8+incompatible/go.mod h1:NAIEuMOZ/fxfXJIrKDQDz8wamY7mA7PouImQ2Jvg6kA= +github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= +github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= +github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= +github.com/go-toolsmith/astcast v1.0.0/go.mod h1:mt2OdQTeAQcY4DQgPSArJjHCcOwlX+Wl/kwN+LbLGQ4= +github.com/go-toolsmith/astcopy v1.0.0/go.mod h1:vrgyG+5Bxrnz4MZWPF+pI4R8h3qKRjjyvV/DSez4WVQ= +github.com/go-toolsmith/astequal v1.0.0/go.mod h1:H+xSiq0+LtiDC11+h1G32h7Of5O3CYFJ99GVbS5lDKY= +github.com/go-toolsmith/astequal v1.0.1/go.mod h1:4oGA3EZXTVItV/ipGiOx7NWkY5veFfcsOJVS2YxltLw= +github.com/go-toolsmith/astfmt v1.0.0/go.mod h1:cnWmsOAuq4jJY6Ct5YWlVLmcmLMn1JUPuQIHCY7CJDw= +github.com/go-toolsmith/astinfo v0.0.0-20180906194353-9809ff7efb21/go.mod h1:dDStQCHtmZpYOmjRP/8gHHnCCch3Zz3oEgCdZVdtweU= +github.com/go-toolsmith/astp v1.0.0/go.mod h1:RSyrtpVlfTFGDYRbrjyWP1pYu//tSFcvdYrA8meBmLI= +github.com/go-toolsmith/pkgload v1.0.0/go.mod h1:5eFArkbO80v7Z0kdngIxsRXRMTaX4Ilcwuh3clNrQJc= +github.com/go-toolsmith/strparse v1.0.0/go.mod h1:YI2nUKP9YGZnL/L1/DLFBfixrcjslWct4wyljWhSRy8= +github.com/go-toolsmith/typep v1.0.0/go.mod h1:JSQCQMUPdRlMZFswiq3TGpNp1GMktqkR2Ns5AIQkATU= +github.com/go-toolsmith/typep v1.0.2/go.mod h1:JSQCQMUPdRlMZFswiq3TGpNp1GMktqkR2Ns5AIQkATU= +github.com/go-xmlfmt/xmlfmt v0.0.0-20191208150333-d5b6f63a941b/go.mod h1:aUCEOzzezBEjDBbFBoSiya/gduyIiWYRP6CnSFIV8AM= +github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8= github.com/godbus/dbus v0.0.0-20151105175453-c7fdd8b5cd55/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw= github.com/godbus/dbus v0.0.0-20180201030542-885f9cc04c9c/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw= github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e/go.mod h1:bBOAhwG1umN6/6ZUMtDFBMQR8jRg9O75tm9K00oMsK4= @@ -505,6 +575,7 @@ github.com/godbus/dbus/v5 v5.0.3/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5x github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/godbus/dbus/v5 v5.0.6 h1:mkgN1ofwASrYnJ5W6U/BxG15eXXXjirgZc7CLqkcaro= github.com/godbus/dbus/v5 v5.0.6/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= +github.com/gofrs/flock v0.8.1/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU= github.com/gogo/googleapis v1.2.0/go.mod h1:Njal3psf3qN6dwBtQfUmBZh2ybovJ0tlu3o/AC7HYjU= github.com/gogo/googleapis v1.4.0/go.mod h1:5YRNX2z1oM5gXdAkurHa942MDgEJyk02w4OecKY87+c= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= @@ -536,6 +607,7 @@ github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71 github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8= github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc= github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= +github.com/golang/protobuf v1.1.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= @@ -554,12 +626,23 @@ github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaS github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM= github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/golang/snappy v0.0.3 h1:fHPg5GQYlCeLIPB9BZqMVR5nR9A+IM5zcgeTdjMYmLA= github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2/go.mod h1:k9Qvh+8juN+UKMCS/3jFtGICgW8O96FVaZsaxdzDkR4= +github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a/go.mod h1:ryS0uhF+x9jgbj/N71xsEqODy9BN81/GonCZiOzirOk= +github.com/golangci/go-misc v0.0.0-20180628070357-927a3d87b613/go.mod h1:SyvUF2NxV+sN8upjjeVYr5W7tyxaT1JVtvhKhOn2ii8= +github.com/golangci/gofmt v0.0.0-20190930125516-244bba706f1a/go.mod h1:9qCChq59u/eW8im404Q2WWTrnBUQKjpNYKMbU4M7EFU= +github.com/golangci/golangci-lint v1.43.0/go.mod h1:VIFlUqidx5ggxDfQagdvd9E67UjMXtTHBkBQ7sHoC5Q= +github.com/golangci/lint-1 v0.0.0-20191013205115-297bf364a8e0/go.mod h1:66R6K6P6VWk9I95jvqGxkqJxVWGFy9XlDwLwVz1RCFg= +github.com/golangci/maligned v0.0.0-20180506175553-b1d89398deca/go.mod h1:tvlJhZqDe4LMs4ZHD0oMUlt9G2LWuDGoisJTBzLMV9o= +github.com/golangci/misspell v0.3.5/go.mod h1:dEbvlSfYbMQDtrpRMQU675gSDLDNa8sCPPChZ7PhiVA= +github.com/golangci/revgrep v0.0.0-20210930125155-c22e5001d4f2/go.mod h1:LK+zW4MpyytAWQRz0M4xnzEk50lSvqDQKfx304apFkY= +github.com/golangci/unconvert v0.0.0-20180507085042-28b1c447d1f4/go.mod h1:Izgrg8RkN3rCIMLGE9CyYmU9pY2Jer6DgANEnZ/L/cQ= github.com/golangplus/testing v0.0.0-20180327235837-af21d9c3145e/go.mod h1:0AA//k/eakGydO4jKRoRL2j92ZKSzTgj9tclaCrvXHk= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA= +github.com/google/certificate-transparency-go v1.0.21/go.mod h1:QeJfpSbVSfYc7RgB3gJFj9cbuQMMchQxrWXz8Ruopmg= +github.com/google/certificate-transparency-go v1.1.1/go.mod h1:FDKqPvSXawb2ecErVRrD+nfy23RCzyl7eqVCEmlT1Zs= github.com/google/gnostic v0.5.7-v3refs h1:FhTMOKj2VhjpouxvWJAV1TL304uMlb9zcDqkl6cEI54= github.com/google/gnostic v0.5.7-v3refs/go.mod h1:73MKFl6jIHelAJNaBGFzt3SPtZULs9dYrGFt8OiIsHQ= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= @@ -577,8 +660,8 @@ github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE= github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -github.com/google/go-containerregistry v0.6.0 h1:niQ+8XD//kKgArIFwDVBXsWVWbde16LPdHMyNwSC8h4= -github.com/google/go-containerregistry v0.6.0/go.mod h1:euCCtNbZ6tKqi1E72vwDj2xZcN5ttKpZLfa/wSo5iLw= +github.com/google/go-containerregistry v0.9.0 h1:5Ths7RjxyFV0huKChQTgY6fLzvHhZMpLTFNja8U0/0w= +github.com/google/go-containerregistry v0.9.0/go.mod h1:9eq4BnSufyT1kHNffX+vSXVonaJ7yaIOulrKZejMxnQ= github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ= github.com/google/go-github/v43 v43.0.0 h1:y+GL7LIsAIF2NZlJ46ZoC/D1W1ivZasT0lnWHMYPZ+U= github.com/google/go-github/v43 v43.0.0/go.mod h1:ZkTvvmCXBvsfPpTHXnH/d2hP9Y0cTbvN9kr5xqyXOIc= @@ -600,6 +683,7 @@ github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hf github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20200507031123-427632fa3b1c/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= 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= @@ -613,6 +697,8 @@ github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm4 github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ= github.com/google/slowjam v1.0.0 h1:dA9flW4oGTJcSy8FpEvdq8JKwPFVgqYwMmjhqlb2L+s= github.com/google/slowjam v1.0.0/go.mod h1:mNktULbvWfYVMKKmpt94Rp3jMtmhQZLS0iR+W84S0mM= +github.com/google/trillian v1.3.11/go.mod h1:0tPraVHrSDkA3BO6vKX67zgLXs6SsOAbHEivX+9mPgw= +github.com/google/uuid v0.0.0-20161128191214-064e2069ce9c/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= @@ -638,23 +724,43 @@ 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= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= +github.com/gordonklaus/ineffassign v0.0.0-20200309095847-7953dde2c7bf/go.mod h1:cuNKsD1zp2v6XfE/orVX2QE1LC+i254ceGcVeDT3pTU= +github.com/gordonklaus/ineffassign v0.0.0-20210225214923-2e10b2664254/go.mod h1:M9mZEtGIsR1oDaZagNPNG9iq9n2HrhZ17dsXk73V3Lw= +github.com/gorhill/cronexpr v0.0.0-20180427100037-88b0669f7d75/go.mod h1:g2644b03hfBX9Ov0ZBDgXXens4rxSxmqFBbhvKv2yVA= github.com/gorilla/handlers v0.0.0-20150720190736-60c7bfde3e33/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ= github.com/gorilla/mux v1.7.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= -github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI= github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= +github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/gostaticanalysis/analysisutil v0.0.0-20190318220348-4088753ea4d3/go.mod h1:eEOZF4jCKGi+aprrirO9e7WKB3beBRtWgqGunKl6pKE= +github.com/gostaticanalysis/analysisutil v0.0.3/go.mod h1:eEOZF4jCKGi+aprrirO9e7WKB3beBRtWgqGunKl6pKE= +github.com/gostaticanalysis/analysisutil v0.1.0/go.mod h1:dMhHRU9KTiDcuLGdy87/2gTR8WruwYZrKdRq9m1O6uw= +github.com/gostaticanalysis/analysisutil v0.4.1/go.mod h1:18U/DLpRgIUd459wGxVHE0fRgmo1UgHDcbw7F5idXu0= +github.com/gostaticanalysis/analysisutil v0.7.1/go.mod h1:v21E3hY37WKMGSnbsw2S/ojApNWb6C1//mXO48CXbVc= +github.com/gostaticanalysis/comment v1.3.0/go.mod h1:xMicKDx7XRXYdVwY9f9wQpDJVnqWxw9wCauCMKp+IBI= +github.com/gostaticanalysis/comment v1.4.1/go.mod h1:ih6ZxzTHLdadaiSnF5WY3dxUoXfXAlTaRzuaNDlSado= +github.com/gostaticanalysis/comment v1.4.2/go.mod h1:KLUTGDv6HOCotCH8h2erHKmpci2ZoR8VPu34YA2uzdM= +github.com/gostaticanalysis/forcetypeassert v0.0.0-20200621232751-01d4955beaa5/go.mod h1:qZEedyP/sY1lTGV1uJ3VhWZ2mqag3IkWsDHVbplHXak= +github.com/gostaticanalysis/nilerr v0.1.1/go.mod h1:wZYb6YI5YAxxq0i1+VJbY0s2YONW0HU0GPE3+5PWN4A= +github.com/gostaticanalysis/testutil v0.3.1-0.20210208050101-bfb5c8eec0e4/go.mod h1:D+FIZ+7OahH3ePw/izIEeH5I06eKs1IKI4Xr64/Am3M= +github.com/gostaticanalysis/testutil v0.4.0/go.mod h1:bLIoPefWXrRi/ssLFWX1dx7Repi5x3CuviD3dgAZaBU= github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= +github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= +github.com/grpc-ecosystem/go-grpc-middleware v1.2.2/go.mod h1:EaizFBKfUKtMIF5iaDEhniwNedqGo9FuLFzppDr3uwI= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= +github.com/grpc-ecosystem/grpc-gateway v1.12.1/go.mod h1:8XEsbTttt/W+VvjtQhLACqCisSPWTxCZ7sBRjU6iH9c= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q= +github.com/hashicorp/consul/api v1.10.1/go.mod h1:XjsvQN+RJGWI2TWy1/kqaE16HrR2J/FWgkYjdZQsX9M= github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= +github.com/hashicorp/consul/sdk v0.8.0/go.mod h1:GBvyrGALthsZObzUGsfgHZQDXjg4lOjagTIwIR1vPms= github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= @@ -663,14 +769,18 @@ github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/S github.com/hashicorp/go-getter v1.6.1 h1:NASsgP4q6tL94WH6nJxKWj8As2H/2kop/bB1d8JMyRY= github.com/hashicorp/go-getter v1.6.1/go.mod h1:IZCrswsZPeWv9IkVnLElzRU/gz/QPi6pZHn4tv6vbwA= github.com/hashicorp/go-hclog v0.9.2/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ= +github.com/hashicorp/go-hclog v0.12.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= 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= github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= +github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA= +github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= 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-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8= github.com/hashicorp/go-safetemp v1.0.0 h1:2HR189eFNrjHQyENnQMMpCiBAsRxzbTMIgBhEyExpmo= github.com/hashicorp/go-safetemp v1.0.0/go.mod h1:oaerMy3BhqiTbVye6QuFhFtIceqFoDHxNAB65b+Rj1I= github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= @@ -683,12 +793,16 @@ github.com/hashicorp/go-version v1.2.1/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09 github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= +github.com/hashicorp/mdns v1.0.1/go.mod h1:4gW7WsVCke5TE7EPeYliwHlRUyBtfCwuFwuMg2DmyNY= github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= +github.com/hashicorp/memberlist v0.2.2/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE= github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= +github.com/hashicorp/serf v0.9.5/go.mod h1:UWDWwZeL5cuWDJdl0C6wrvrUwEqtQ4ZKBKKENpqIUyk= github.com/hectane/go-acl v0.0.0-20190604041725-da78bae5fc95 h1:S4qyfL2sEm5Budr4KVMyEniCy+PbS55651I/a+Kn/NQ= github.com/hectane/go-acl v0.0.0-20190604041725-da78bae5fc95/go.mod h1:QiyDdbZLaJ/mZP4Zwc9g2QsfaEA4o7XvvgZegSci5/E= github.com/hooklift/assert v0.0.0-20170704181755-9d1defd6d214 h1:WgfvpuKg42WVLkxNwzfFraXkTXPK36bMqXvMFN67clI= @@ -696,8 +810,11 @@ github.com/hooklift/assert v0.0.0-20170704181755-9d1defd6d214/go.mod h1:kj6hFWqf github.com/hooklift/iso9660 v0.0.0-20170318115843-1cf07e5970d8 h1:ARl0RuGZTqBOMXQIfXen0twVSJ8kMojd7ThJf4EBcrc= github.com/hooklift/iso9660 v0.0.0-20170318115843-1cf07e5970d8/go.mod h1:sOC47ru8lB0DlU0EZ7BJ0KCP5rDqOvx0c/5K5ADm8H0= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= +github.com/huandu/xstrings v1.0.0/go.mod h1:4qWG/gcEcfX4z/mBDHJ++3ReCw9ibxbsNJbcucJdbSo= +github.com/huandu/xstrings v1.2.0/go.mod h1:DvyZB1rfVYsBIigL8HwpZgxHwXozlTgGqn63UyNX5k4= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= +github.com/imdario/mergo v0.3.4/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= github.com/imdario/mergo v0.3.8/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= github.com/imdario/mergo v0.3.10/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= @@ -709,18 +826,26 @@ github.com/intel-go/cpuid v0.0.0-20181003105527-1a4a6f06a1c6 h1:XboatR7lasl05yel github.com/intel-go/cpuid v0.0.0-20181003105527-1a4a6f06a1c6/go.mod h1:RmeVYf9XrPRbRc3XIx0gLYA8qOFvNoPOfaEZduRlEp4= github.com/j-keck/arping v0.0.0-20160618110441-2cf9dc699c56/go.mod h1:ymszkNOg6tORTn+6F6j+Jc8TOr5osrynvN6ivFWZ2GA= github.com/jellevandenhooff/dkim v0.0.0-20150330215556-f50fe3d243e1/go.mod h1:E0B/fFc00Y+Rasa88328GlI/XbtyysCtTHZS8h7IrBU= +github.com/jgautheron/goconst v1.5.1/go.mod h1:aAosetZ5zaeC/2EfMeRswtxUFBpe2Hr7HzkgX4fanO4= +github.com/jhump/protoreflect v1.6.1/go.mod h1:RZQ/lnuN+zqeRVpQigTwO6o0AJUkxbnSnpuG7toUTG4= +github.com/jingyugao/rowserrcheck v1.1.1/go.mod h1:4yvlZSDb3IyDTUZJUmpZfm2Hwok+Dtp+nu2qOq+er9c= +github.com/jirfag/go-printf-func-name v0.0.0-20200119135958-7558a9eaa5af/go.mod h1:HEWGJkRDzjJY2sqdDwxccsGicWEf9BQOZsq2tV+xzM0= github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= github.com/jmespath/go-jmespath v0.0.0-20160803190731-bd40a432e4c7/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= +github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= +github.com/jmoiron/sqlx v1.2.0/go.mod h1:1FEQNm3xlJgrMD+FBdI9+xvCksHtbpVBBw5dYhBSsks= github.com/johanneswuerbach/nfsexports v0.0.0-20200318065542-c48c3734757f h1:tL0xH80QVHQOde6Qqdohv6PewABH8l8N9pywZtuojJ0= github.com/johanneswuerbach/nfsexports v0.0.0-20200318065542-c48c3734757f/go.mod h1:+c1/kUpg2zlkoWqTOvzDs36Wpbm3Gd1nlmtXAEB0WGU= github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= +github.com/jonboulle/clockwork v0.2.0/go.mod h1:Pkfl5aHPm1nk2H9h0bjmnJD/BcgbGXUBGnn1kMkgxc8= github.com/jonboulle/clockwork v0.2.2/go.mod h1:Pkfl5aHPm1nk2H9h0bjmnJD/BcgbGXUBGnn1kMkgxc8= github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= +github.com/josharian/txtarfs v0.0.0-20210218200122-0702f000015a/go.mod h1:izVPOvVRsHiKkeGCT6tYBNWyDVuzj9wAaBb5R9qamfw= github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= @@ -743,6 +868,7 @@ github.com/juju/loggo v0.0.0-20190526231331-6e530bcce5d8 h1:UUHMLvzt/31azWTN/ifG github.com/juju/loggo v0.0.0-20190526231331-6e530bcce5d8/go.mod h1:vgyd7OREkbtVEN/8IXZe5Ooef3LQePvuBm9UWj6ZL8U= github.com/juju/mutex v0.0.0-20180619145857-d21b13acf4bf h1:2d3cilQly1OpAfZcn4QRuwDOdVoHsM4cDTkcKbmO760= github.com/juju/mutex v0.0.0-20180619145857-d21b13acf4bf/go.mod h1:Y3oOzHH8CQ0Ppt0oCKJ2JFO81/EsWenH5AEqigLH+yY= +github.com/juju/ratelimit v1.0.1/go.mod h1:qapgC/Gy+xNh9UxzV13HGGl/6UXNN+ct+vwSgWNm/qk= github.com/juju/retry v0.0.0-20180821225755-9058e192b216 h1:/eQL7EJQKFHByJe3DeE8Z36yqManj9UY5zppDoQi4FU= github.com/juju/retry v0.0.0-20180821225755-9058e192b216/go.mod h1:OohPQGsr4pnxwD5YljhQ+TZnuVRYpa5irjugL1Yuif4= github.com/juju/testing v0.0.0-20190723135506-ce30eb24acd2 h1:Pp8RxiF4rSoXP9SED26WCfNB28/dwTDpPXS8XMJR8rc= @@ -753,19 +879,24 @@ github.com/juju/version v0.0.0-20180108022336-b64dbd566305 h1:lQxPJ1URr2fjsKnJRt github.com/juju/version v0.0.0-20180108022336-b64dbd566305/go.mod h1:kE8gK5X0CImdr7qpSKl3xB2PmpySSmfj7zVbkZFs81U= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= +github.com/julz/importas v0.0.0-20210419104244-841f0c0fe66d/go.mod h1:oSFU2R4XK/P7kNBrnL/FEQlDGN1/6WoxXEjSSXO0DV0= github.com/jung-kurt/gofpdf v1.0.0/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes= +github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88/go.mod h1:3w7q1U84EfirKl04SVQ/s7nPm1ZPhiXd34z40TNz36k= github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs= github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8= github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= +github.com/kisielk/errcheck v1.6.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/klauspost/compress v1.11.2/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= github.com/klauspost/compress v1.11.3/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= github.com/klauspost/compress v1.11.13/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= -github.com/klauspost/compress v1.12.3/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg= -github.com/klauspost/compress v1.13.0 h1:2T7tUoQrQT+fQWdaY5rjWztFGAFwbGD04iPJg90ZiOs= -github.com/klauspost/compress v1.13.0/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg= +github.com/klauspost/compress v1.13.4/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg= +github.com/klauspost/compress v1.13.5/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= +github.com/klauspost/compress v1.15.1/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= +github.com/klauspost/compress v1.15.4 h1:1kn4/7MepF/CHmYub99/nNX8az0IJjfSOU/jbnTVfqQ= +github.com/klauspost/compress v1.15.4/go.mod h1:PhcZ0MbTNciWF3rruxRgKxI5NkcHHrHUDtV4Yw2GlzU= github.com/klauspost/cpuid v1.2.0 h1:NMpwD2G9JSFOE1/TJjGSo5zG7Yb2bTe7eq1jH+irmeE= github.com/klauspost/cpuid v1.2.0/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= @@ -783,8 +914,20 @@ github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/kulti/thelper v0.4.0/go.mod h1:vMu2Cizjy/grP+jmsvOFDx1kYP6+PD1lqg4Yu5exl2U= +github.com/kunwardeep/paralleltest v1.0.3/go.mod h1:vLydzomDFpk7yu5UX02RmP0H8QfRPOV/oFhWN85Mjb4= +github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= +github.com/kyoh86/exportloopref v0.1.8/go.mod h1:1tUcJeiioIs7VWe5gcOObrux3lb66+sBqGZrRkMwPgg= +github.com/ldez/gomoddirectives v0.2.2/go.mod h1:cpgBogWITnCfRq2qGoDkKMEVSaarhdBr6g8G04uz6d0= +github.com/ldez/tagliatelle v0.2.0/go.mod h1:8s6WJQwEYHbKZDsp/LjArytKOG8qaMrKQQ3mFukHs88= +github.com/letsencrypt/pkcs11key/v4 v4.0.0/go.mod h1:EFUvBDay26dErnNb70Nd0/VW3tJiIbETBPTl9ATXQag= +github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= +github.com/lib/pq v1.8.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= +github.com/lib/pq v1.9.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= +github.com/lib/pq v1.10.3/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de/go.mod h1:zAbeS9B/r2mtpb6U+EI2rYA5OAXxsYw6wTamcNW+zcE= github.com/lithammer/dedent v1.1.0/go.mod h1:jrXYCQtgg0nJiN+StA2KgR7w6CiQNv9Fd/Z9BP0jIOc= +github.com/logrusorgru/aurora v0.0.0-20181002194514-a7b3b318ed4e/go.mod h1:7rIyQOR62GCctdiQpZ/zOJlFyk6y+94wXzv6RNZgaR4= github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 h1:6E+4a0GO5zZEnZ81pIr0yLvtUWk2if982qA3F3QD6H4= github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I= github.com/machine-drivers/docker-machine-driver-vmware v0.1.5 h1:51GqJ84u9EBATnn8rWsHNavcuRPlCLnDmvjzZVuliwY= @@ -801,42 +944,60 @@ github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs= github.com/mailru/easyjson v0.7.6 h1:8yTIVnZgCoiM1TgqoeTl+LfU5Jg6/xL3QhGQnimLYnA= github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= +github.com/maratori/testpackage v1.0.1/go.mod h1:ddKdw+XG0Phzhx8BFDTKgpWP4i7MpApTE5fXSKAqwDU= github.com/marstr/guid v1.1.0/go.mod h1:74gB1z2wpxxInTG6yaqA7KrtM0NZ+RbrcqDvYHefzho= github.com/maruel/panicparse v1.5.0/go.mod h1:aOutY/MUjdj80R0AEVI9qE2zHqig+67t2ffUDDiLzAM= +github.com/matoous/godox v0.0.0-20210227103229-6504466cf951/go.mod h1:1BELzlh859Sh1c6+90blK8lbYy0kwQf1bYlBhBysy1s= +github.com/matryer/is v1.4.0/go.mod h1:8I/i5uYgLzgsgEloJE1U6xx5HkBQpAZvepWuujKwMRU= github.com/mattbaird/jsonpatch v0.0.0-20200820163806-098863c1fc24 h1:uYuGXJBAi1umT+ZS4oQJUgKtfXCAYTR+n9zw1ViT0vA= github.com/mattbaird/jsonpatch v0.0.0-20200820163806-098863c1fc24/go.mod h1:M1qoD/MqPgTZIk0EWKB38wE28ACRfVcn+cU08jyArI0= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= +github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= +github.com/mattn/go-colorable v0.1.11/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= github.com/mattn/go-colorable v0.1.12 h1:jF+Du6AlPIjs2BiUiQlKOX0rt3SujHxPnksPKZbaA40= github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= +github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84= +github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE= github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y= github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= +github.com/mattn/go-runewidth v0.0.6/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= github.com/mattn/go-runewidth v0.0.7/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= github.com/mattn/go-runewidth v0.0.12/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk= github.com/mattn/go-runewidth v0.0.13 h1:lTGmDsbAYt5DmK6OnoV7EuIF1wEIFAcxld6ypU4OSgU= github.com/mattn/go-runewidth v0.0.13/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= github.com/mattn/go-shellwords v1.0.3/go.mod h1:3xCvwCdWdlDJUrvuMn7Wuy9eWs4pE8vqg+NOMyg4B2o= +github.com/mattn/go-sqlite3 v1.9.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= +github.com/mattn/goveralls v0.0.2/go.mod h1:8d1ZMHsd7fW6IRPKQh46F2WRpyib5/X4FOpevwGNQEw= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 h1:I0XW9+e1XWDxdcEniV4rQAIOPUGDq67JSCiRCgGCZLI= github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= +github.com/mbilski/exhaustivestruct v1.2.0/go.mod h1:OeTBVxQWoEmB2J2JCHmXWPJ0aksxSUOUy+nvtVEfzXc= +github.com/mgechev/dots v0.0.0-20210922191527-e955255bf517/go.mod h1:KQ7+USdGKfpPjXk4Ga+5XxQM4Lm4e3gAogrreFAYpOg= +github.com/mgechev/revive v1.1.2/go.mod h1:bnXsMr+ZTH09V5rssEI+jHAZ4z+ZdyhgO/zsy3EhK+0= github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE= github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= +github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso= github.com/miekg/dns v1.1.29/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM= +github.com/miekg/dns v1.1.35/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM= github.com/miekg/dns v1.1.41 h1:WMszZWJG0XmzbK9FEmzH2TVcqYzFesusSIB41b8KHxY= github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI= +github.com/miekg/pkcs11 v1.0.2/go.mod h1:XsNlhZGX73bx86s2hdc/FuaLm2CPZJemRLMA+WTFxgs= github.com/miekg/pkcs11 v1.0.3/go.mod h1:XsNlhZGX73bx86s2hdc/FuaLm2CPZJemRLMA+WTFxgs= github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible/go.mod h1:8AuVvqP/mXw1px98n46wfvcGfQ4ci2FwoAjKYxuo3Z4= github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= +github.com/mitchellh/cli v1.1.0/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXxx3xhI= +github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw= github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= @@ -851,9 +1012,12 @@ github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0Qu github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= +github.com/mitchellh/mapstructure v1.4.2/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/osext v0.0.0-20151018003038-5e2d6d41470f/go.mod h1:OkQIRizQZAeMln+1tSwduZz7+Af5oFlKirV/MSYes2A= +github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= +github.com/mitchellh/reflectwalk v1.0.1/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= github.com/moby/hyperkit v0.0.0-20210108224842-2f061e447e14 h1:XGy4iMfaG4r1uZKZQmEPSYSH0Nj5JJuKgPNUhWGQ08E= github.com/moby/hyperkit v0.0.0-20210108224842-2f061e447e14/go.mod h1:aBcAEoy5u01cPAYvosR85gzSrMZ0TVVnkPytOQN+9z8= github.com/moby/locker v1.0.1/go.mod h1:S7SDdo5zpBK84bzzVlKr2V0hz+7x9hWbYC/kq7oQppc= @@ -876,22 +1040,35 @@ github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lN github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= +github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8= github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00/go.mod h1:Pm3mSP3c5uWn86xMLZ5Sa7JB9GsEZySvHYXCTK4E9q4= +github.com/moricho/tparallel v0.2.1/go.mod h1:fXEIZxG2vdfl0ZF8b42f5a78EhjjD5mX8qUplsoSU4k= github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A= -github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= +github.com/mozilla/scribe v0.0.0-20180711195314-fb71baf557c1/go.mod h1:FIczTrinKo8VaLxe6PWTPEXRXDIHz2QAwiaBaP5/4a8= +github.com/mozilla/tls-observatory v0.0.0-20210609171429-7bc42856d2e5/go.mod h1:FUqVoUPHSEdDR0MnFM3Dh8AU0pZHLXUD127SAJGER/s= github.com/mrunalp/fileutils v0.5.0/go.mod h1:M1WthSahJixYnrXQl/DFQuteStB1weuxD2QJNHXfbSQ= github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= +github.com/mwitkow/go-proto-validators v0.0.0-20180403085117-0950a7990007/go.mod h1:m2XC9Qq0AlmmVksL6FktJCdTYyLk7V3fKyp0sl1yWQo= +github.com/mwitkow/go-proto-validators v0.2.0/go.mod h1:ZfA1hW+UH/2ZHOWvQ3HnQaU0DtnpXu850MZiy+YUgcc= github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= +github.com/nakabonne/nestif v0.3.1/go.mod h1:9EtoZochLn5iUprVDmDjqGKPofoUEBL8U4Ngq6aY7OE= +github.com/nbutton23/zxcvbn-go v0.0.0-20210217022336-fa2cb2858354/go.mod h1:KSVJerMDfblTH7p5MZaTt+8zaT2iEk3AkVb9PQdZuE8= github.com/ncw/swift v1.0.47/go.mod h1:23YIA4yWVnGwv2dQlN4bB7egfYX6YLn0Yo/S6zZO/ZM= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= -github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78= +github.com/nishanths/exhaustive v0.2.3/go.mod h1:bhIX678Nx8inLM9PbpvK1yv6oGtoP8BfaIeMzgBNKvc= +github.com/nishanths/predeclared v0.0.0-20190419143655-18a43bb90ffc/go.mod h1:62PewwiQTlm/7Rj+cxVYqZvDIUc+JjZq6GHAC1fsObQ= +github.com/nishanths/predeclared v0.2.1/go.mod h1:HvkGJcA3naj4lOwnFXFDkFxVtSqQMB9sbB1usJ+xjQE= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= +github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= +github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= +github.com/olekukonko/tablewriter v0.0.1/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= +github.com/olekukonko/tablewriter v0.0.2/go.mod h1:rSAaSIOAGT9odnlyGlUfAJaoc5w2fSBUmeGDbRWPxyQ= github.com/olekukonko/tablewriter v0.0.4/go.mod h1:zq6QwlOf5SlnkVbMSr5EoBv3636FWnp+qbPhuoO21uA= github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec= github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY= @@ -903,16 +1080,18 @@ github.com/onsi/ginkgo v1.10.3/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+ github.com/onsi/ginkgo v1.11.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.12.0/go.mod h1:oUhWkIvk5aDxtKvDDuw8gItl8pKl42LzjC9KZE0HfGg= github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= -github.com/onsi/ginkgo v1.14.0 h1:2mOpI4JVVPBN+WQRa0WKH2eXR+Ey+uK4n7Zj0aYpIQA= github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= +github.com/onsi/ginkgo v1.16.4 h1:29JGrr5oVBm5ulCWet69zQkzWipVXIol6ygQUe/EzNc= +github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0= github.com/onsi/gomega v0.0.0-20151007035656-2152b45fa28a/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= -github.com/onsi/gomega v1.10.3 h1:gph6h/qe9GSUw1NhH1gp+qb+h8rXD8Cy60Z32Qw3ELA= github.com/onsi/gomega v1.10.3/go.mod h1:V9xEwhxec5O8UDM77eCW8vLymOMltsqPVYWrpDsH8xc= +github.com/onsi/gomega v1.16.0 h1:6gjqkI8iiRHMvdccRJM8rVKjCWk6ZIm6FTm3ddIe4/c= +github.com/onsi/gomega v1.16.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= github.com/opencontainers/go-digest v0.0.0-20170106003457-a6d0ee40d420/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= github.com/opencontainers/go-digest v0.0.0-20180430190053-c9281466c8b2/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= @@ -920,8 +1099,9 @@ github.com/opencontainers/go-digest v1.0.0-rc1.0.20180430190053-c9281466c8b2/go. github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= github.com/opencontainers/image-spec v1.0.0/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= -github.com/opencontainers/image-spec v1.0.1 h1:JMemWkRwHx4Zj+fVxWoMCFm/8sYGGrUVojFA6h/TRcI= github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= +github.com/opencontainers/image-spec v1.0.3-0.20220114050600-8b9d41f48198 h1:+czc/J8SlhPKLOtVLMQc+xDCFBT73ZStMsRhSsUhsSg= +github.com/opencontainers/image-spec v1.0.3-0.20220114050600-8b9d41f48198/go.mod h1:j4h1pJW6ZcJTgMZWP3+7RlG3zTaP02aDZ/Qw0sppK7Q= github.com/opencontainers/runc v0.0.0-20190115041553-12f6a991201f/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= github.com/opencontainers/runc v0.1.1/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= github.com/opencontainers/runc v1.0.0-rc8.0.20190926000215-3e425f80a8c9/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= @@ -940,24 +1120,30 @@ github.com/opencontainers/runtime-tools v0.0.0-20181011054405-1d69bd0f9c39/go.mo github.com/opencontainers/selinux v1.6.0/go.mod h1:VVGKuOLlE7v4PJyT6h7mNWvq1rzqiriPsEqVhc+svHE= github.com/opencontainers/selinux v1.8.0/go.mod h1:RScLhm78qiWa2gbVCcGkC7tCGdgk3ogry1nUQF8Evvo= github.com/opencontainers/selinux v1.10.0/go.mod h1:2i0OySw99QjzBBQByd1Gr9gSjvuho1lHsJxIJ3gGbJI= +github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= +github.com/otiai10/copy v1.2.0/go.mod h1:rrF5dJ5F0t/EWSYODDu4j9/vEeYHMkc8jt0zJChqQWw= github.com/otiai10/copy v1.7.0 h1:hVoPiN+t+7d2nzzwMiDHPSOogsWAStewq3TwU05+clE= github.com/otiai10/copy v1.7.0/go.mod h1:rmRl6QPdJj6EiUqXQ/4Nn2lLXoNQjFCQbbNrxgc/t3U= github.com/otiai10/curr v0.0.0-20150429015615-9b4961190c95/go.mod h1:9qAhocn7zKJG+0mI8eUu6xqkFDYS2kb2saOteoSB3cE= github.com/otiai10/curr v1.0.0/go.mod h1:LskTG5wDwr8Rs+nNQ+1LlxRjAtTZZjtJW4rMXl6j4vs= github.com/otiai10/mint v1.3.0/go.mod h1:F5AjcsTsWUqX+Na9fpHb52P8pcRX2CI6A3ctIT91xUo= +github.com/otiai10/mint v1.3.1/go.mod h1:/yxELlJQ0ufhjUwhshSj+wFjZ78CnZ48/1wtmBH1OTc= github.com/otiai10/mint v1.3.3 h1:7JgpsBaN0uMkyju4tbYHu0mnM55hNKVYLsXmwr15NQI= github.com/otiai10/mint v1.3.3/go.mod h1:/yxELlJQ0ufhjUwhshSj+wFjZ78CnZ48/1wtmBH1OTc= github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= +github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= github.com/pborman/uuid v1.2.1 h1:+ZZIw58t/ozdjRaXh/3awHfmWRbzYxJoAdNJxe/3pvw= github.com/pborman/uuid v1.2.1/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/pelletier/go-toml v1.8.1/go.mod h1:T2/BmBdy8dvIRq1a/8aqjN41wvWlN4lrapLU/GW4pbc= github.com/pelletier/go-toml v1.9.3/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= +github.com/pelletier/go-toml v1.9.4/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8= github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= github.com/pelletier/go-toml/v2 v2.0.1 h1:8e3L2cCQzLFi2CR4g7vGFuFxX7Jl1kKX8gW+iV0GUKU= github.com/pelletier/go-toml/v2 v2.0.1/go.mod h1:r9LEWfGN8R5k0VXJ+0BkIe7MYkRdwZOjgMj2KwnJFUo= github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= +github.com/phayes/checkstyle v0.0.0-20170904204023-bfd46e6a821d/go.mod h1:3OzsM7FXDQlpCiw2j81fOmAwQLnZnLGXVKUzeKQXIAw= 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= github.com/phpdave11/gofpdf v1.4.2/go.mod h1:zpO6xFn9yxo3YLyMvW8HcKWVdbNqgIfOOp2dXMnm1mY= @@ -974,9 +1160,12 @@ github.com/pkg/profile v0.0.0-20161223203901-3a8809bd8a80 h1:DQFOykp5w+HOykOMzd2 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 v0.0.0-20151028094244-d8ed2627bdf0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= 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/polyfloyd/go-errorlint v0.0.0-20210722154253-910bb7978349/go.mod h1:wi9BfjxjF/bwiZ701TzmfKu6UKC357IOAtNr0Td0Lvw= github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= +github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s= github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c h1:ncq/mPwQF4JjgDlrVEn3C11VoGHZN7m8qihwgMEtzYw= github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE= github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA= @@ -1022,6 +1211,16 @@ github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1 github.com/prometheus/prometheus v2.5.0+incompatible h1:7QPitgO2kOFG8ecuRn9O/4L9+10He72rVRJvMXrE9Hg= github.com/prometheus/prometheus v2.5.0+incompatible/go.mod h1:oAIUtOny2rjMX0OWN5vPR5/q/twIROJvdqnQKDdil/s= github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= +github.com/pseudomuto/protoc-gen-doc v1.3.2/go.mod h1:y5+P6n3iGrbKG+9O04V5ld71in3v/bX88wUwgt+U8EA= +github.com/pseudomuto/protokit v0.2.0/go.mod h1:2PdH30hxVHsup8KpBTOXTBeMVhJZVio3Q8ViKSAXT0Q= +github.com/quasilyte/go-consistent v0.0.0-20190521200055-c6f3937de18c/go.mod h1:5STLWrekHfjyYwxBRVRXNOSewLJ3PWfDJd1VyTS21fI= +github.com/quasilyte/go-ruleguard v0.3.1-0.20210203134552-1b5a410e1cc8/go.mod h1:KsAh3x0e7Fkpgs+Q9pNLS5XpFSvYCEVl5gP9Pp1xp30= +github.com/quasilyte/go-ruleguard v0.3.13/go.mod h1:Ul8wwdqR6kBVOCt2dipDBkE+T6vAV/iixkrKuRTN1oQ= +github.com/quasilyte/go-ruleguard/dsl v0.3.0/go.mod h1:KeCP03KrjuSO0H1kTuZQCWlQPulDV6YMIXmpQss17rU= +github.com/quasilyte/go-ruleguard/dsl v0.3.10/go.mod h1:KeCP03KrjuSO0H1kTuZQCWlQPulDV6YMIXmpQss17rU= +github.com/quasilyte/go-ruleguard/rules v0.0.0-20201231183845-9e62ed36efe1/go.mod h1:7JTjp89EGyU1d6XfBiXihJNG37wB2VRkd125Q1u7Plc= +github.com/quasilyte/go-ruleguard/rules v0.0.0-20210428214800-545e0d2e0bf7/go.mod h1:4cgAphtvu7Ftv7vOT2ZOYhC6CvBxZixcasr8qIOTA50= +github.com/quasilyte/regex/syntax v0.0.0-20200407221936-30656e2c4a95/go.mod h1:rlzQ04UMyJXu/aOvhd8qT+hvDrFpiwqp8MRXDY9szc0= github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY= github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= @@ -1029,17 +1228,23 @@ github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6So github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-charset v0.0.0-20180617210344-2471d30d28b4/go.mod h1:qgYeAmZ5ZIpBWTGllZSQnw97Dj+woV0toclVaRGI8pc= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= -github.com/rogpeppe/go-internal v1.6.1 h1:/FiVV8dS/e+YqF2JvO3yXRFbBLTIuSDkuC7aBOAvL+k= +github.com/rogpeppe/go-internal v1.6.2 h1:aIihoIOHCiLZHxyoNQ+ABL4NKhFTgKLBdMLyEAh98m0= +github.com/rogpeppe/go-internal v1.6.2/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= +github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU= github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= -github.com/russross/blackfriday v1.5.3-0.20200218234912-41c5fccfd6f6 h1:tlXG832s5pa9x9Gs3Rp2rTvEqjiDEuETUOSfBEiTcns= -github.com/russross/blackfriday v1.5.3-0.20200218234912-41c5fccfd6f6/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= +github.com/russross/blackfriday v1.6.0 h1:KqfZb0pUVN2lYqZUYRddxF4OR8ZMURnJIG5Y3VRLtww= +github.com/russross/blackfriday v1.6.0/go.mod h1:ti0ldHuxg49ri4ksnFxlkCfN+hvslNlmVHqNRXXJNAY= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/ruudk/golang-pdf417 v0.0.0-20181029194003-1af4ab5afa58/go.mod h1:6lfFZQK844Gfx8o5WFuvpxWRwnSoipWe/p622j1v06w= github.com/ruudk/golang-pdf417 v0.0.0-20201230142125-a7e3863a1245/go.mod h1:pQAZKsJ8yyVxGRWYNEm9oFB8ieLgKFnamEyDmSA0BRk= +github.com/ryancurrah/gomodguard v1.2.3/go.mod h1:rYbA/4Tg5c54mV1sv4sQTP5WOPBcoLtnBZ7/TEhXAbg= +github.com/ryanrolds/sqlclosecheck v0.3.0/go.mod h1:1gREqxyTGR3lVtpngyFo3hZAgk0KCtEdgEkHwDbigdA= github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= github.com/safchain/ethtool v0.0.0-20190326074333-42ed695e3de8/go.mod h1:Z0q5wiBQGYcxhMZ6gUqHn6pYNLypFAvaL3UvgZLR0U4= +github.com/sagikazarmark/crypt v0.1.0/go.mod h1:B/mN0msZuINBtQ1zZLEQcegFJJf9vnYIR88KRMEuODE= +github.com/sanposhiho/wastedassign/v2 v2.0.6/go.mod h1:KyZ0MWTwxxBmfwn33zh3k1dmsbF2ud9pAAGfoLfjhtI= github.com/santhosh-tekuri/jsonschema/v5 v5.0.0 h1:TToq11gyfNlrMFZiYujSekIsPd9AmsA2Bj/iv+s4JHE= github.com/santhosh-tekuri/jsonschema/v5 v5.0.0/go.mod h1:FKdcjfQW6rpZSnxxUvEA5H/cDPdvJ/SZJQLWWXWGrZ0= github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= @@ -1048,9 +1253,14 @@ github.com/sayboras/dockerclient v1.0.0/go.mod h1:mUmEoqt0b+uQg57s006FsvL4mybi+N github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= github.com/seccomp/libseccomp-golang v0.9.1/go.mod h1:GbW5+tmTXfcxTToHLXlScSlAvWlF4P2Ca7zGrPiEpWo= github.com/seccomp/libseccomp-golang v0.9.2-0.20210429002308-3879420cc921/go.mod h1:JA8cRccbGaA1s33RQf7Y1+q9gHmZX1yB/z9WDN1C6fg= +github.com/securego/gosec/v2 v2.9.1/go.mod h1:oDcDLcatOJxkCGaCaq8lua1jTnYf6Sou4wdiJ1n4iHc= github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= +github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c/go.mod h1:/PevMnwAxekIXwN8qQyfc5gl2NlkB3CQlkizAbOkeBs= +github.com/shirou/gopsutil/v3 v3.21.10/go.mod h1:t75NhzCZ/dYyPQjyQmrAYP6c8+LCdFANeBMdLPCNnew= github.com/shirou/gopsutil/v3 v3.22.5 h1:atX36I/IXgFiB81687vSiBI5zrMsxcIBkP9cQMJQoJA= github.com/shirou/gopsutil/v3 v3.22.5/go.mod h1:so9G9VzeHt/hsd0YwqprnjHnfARAUktauykSbr+y2gA= +github.com/shurcooL/go v0.0.0-20180423040247-9e1955d9fb6e/go.mod h1:TDJrrUr11Vxrven61rcy3hJMUqaf/CLWYhHNPmT14Lk= +github.com/shurcooL/go-goon v0.0.0-20170922171312-37c2f522c041/go.mod h1:N5mDOmsrJOB+vfqUK+7DmDyjhSLIIBnXo9lvZJj3MWQ= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= github.com/sirupsen/logrus v1.0.4-0.20170822132746-89742aefa4b2/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc= github.com/sirupsen/logrus v1.0.6/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc= @@ -1062,6 +1272,7 @@ github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrf github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE= github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= +github.com/sivchari/tenv v1.4.7/go.mod h1:5nF+bITvkebQVanjU6IuMbvIot/7ReNsUV7I5NbprB0= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= @@ -1069,6 +1280,8 @@ github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9 github.com/smartystreets/goconvey v1.6.7 h1:I6tZjLXD2Q1kjvNbIzB1wvQBsXmKXiVrhpRE8ZjP5jY= github.com/smartystreets/goconvey v1.6.7/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= +github.com/sonatard/noctx v0.0.1/go.mod h1:9D2D/EoULe8Yy2joDHJj7bv3sZoq9AaSb8B4lqBjiZI= +github.com/sourcegraph/go-diff v0.6.1/go.mod h1:iBszgVvyxdc8SFZ7gm69go2KDdt3ag071iBaWPF6cjs= 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= @@ -1077,10 +1290,12 @@ 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/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w= github.com/spf13/cast v1.5.0/go.mod h1:SpXXQ5YoyJw6s3/6cMTQuxvgRl3PCJiyaX9p6b155UU= github.com/spf13/cobra v0.0.2-0.20171109065643-2da4a54c5cee/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= +github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= github.com/spf13/cobra v1.0.0/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE= github.com/spf13/cobra v1.2.1/go.mod h1:ExllRjgxM/piMAM+3tAZvg8fsklGAf3tPfi+i8t68Nk= github.com/spf13/cobra v1.4.0 h1:y+wJpx64xcgO1V+RcnwW0LEHxTKRi2ZDPSBjWnrg88Q= @@ -1094,17 +1309,22 @@ github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnIn github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= 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.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= 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.9.0/go.mod h1:+i6ajR7OX2XaiBkrcZJFK21htRk7eDeLg7+O6bhUPP4= github.com/spf13/viper v1.12.0 h1:CZ7eSOd3kZoaYDLbXnmzgQI5RlciuXBMA+18HwHRfZQ= github.com/spf13/viper v1.12.0/go.mod h1:b6COn30jlNxbm/V2IqWiNWkJ+vZNiMNksliPCiuKtSI= +github.com/ssgreg/nlreturn/v2 v2.2.1/go.mod h1:E/iiPB78hV7Szg2YfRgyIrk1AD6JVMTRkkxBiELzh2I= 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= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= +github.com/stretchr/testify v0.0.0-20170130113145-4d4bfba8f1d1/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v0.0.0-20180303142811-b89eecf5ca5d/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +github.com/stretchr/testify v1.1.4/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= @@ -1116,27 +1336,49 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= github.com/subosito/gotenv v1.3.0 h1:mjC+YW8QpAdXibNi+vNWgzmgBH4+5l5dCXv8cNysBLI= github.com/subosito/gotenv v1.3.0/go.mod h1:YzJjq/33h7nrwdY+iHMhEOEEbW0ovIz0tB6t6PwAXzs= +github.com/sylvia7788/contextcheck v1.0.4/go.mod h1:vuPKJMQ7MQ91ZTqfdyreNKwZjyUg6KO+IebVyQDedZQ= github.com/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07/go.mod h1:kDXzergiv9cbyO7IOYJZWg1U88JhDg3PB6klq9Hg2pA= github.com/tchap/go-patricia v2.2.6+incompatible/go.mod h1:bmLyhP68RS6kStMGxByiQ23RP/odRBOTVjwp2cDyi6I= +github.com/tdakkota/asciicheck v0.0.0-20200416200610-e657995f937b/go.mod h1:yHp0ai0Z9gUljN3o0xMhYJnH/IcvkdTBOX2fmJ93JEM= +github.com/tenntenn/modver v1.0.1/go.mod h1:bePIyQPb7UeioSRkw3Q0XeMhYZSMx9B8ePqg6SAMGH0= +github.com/tenntenn/text/transform v0.0.0-20200319021203-7eef512accb3/go.mod h1:ON8b8w4BN/kE1EOhwT0o+d62W65a6aPw1nouo9LMgyY= +github.com/tetafro/godot v1.4.11/go.mod h1:LR3CJpxDVGlYOWn3ZZg1PgNZdTUvzsZWu8xaEohUpn8= +github.com/timakin/bodyclose v0.0.0-20200424151742-cb6215831a94/go.mod h1:Qimiffbc6q9tBWlVV6x0P9sat/ao1xEkREYPPj9hphk= +github.com/tklauser/go-sysconf v0.3.9/go.mod h1:11DU/5sG7UexIrp/O6g35hrWzu0JxlwQ3LSFUzyeuhs= github.com/tklauser/go-sysconf v0.3.10 h1:IJ1AZGZRWbY8T5Vfk04D9WOA5WSejdflXxP03OUqALw= github.com/tklauser/go-sysconf v0.3.10/go.mod h1:C8XykCvCb+Gn0oNCWPIlcb0RuglQTYaQ2hGm7jmxEFk= +github.com/tklauser/numcpus v0.3.0/go.mod h1:yFGUr7TUHQRAhyqBcEg0Ge34zDBAsIvJJcyE6boqnA8= github.com/tklauser/numcpus v0.4.0 h1:E53Dm1HjH1/R2/aoCtXtPgzmElmn51aOkhCFSuZq//o= github.com/tklauser/numcpus v0.4.0/go.mod h1:1+UI3pD8NW14VMwdgJNJ1ESk2UnwhAnz5hMwiKKqXCQ= github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= +github.com/tmc/grpc-websocket-proxy v0.0.0-20200427203606-3cfed13b9966/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= +github.com/tomarrell/wrapcheck/v2 v2.4.0/go.mod h1:68bQ/eJg55BROaRTbMjC7vuhL2OgfoG8bLp9ZyoBfyY= +github.com/tomasen/realip v0.0.0-20180522021738-f0c99a92ddce/go.mod h1:o8v6yHRoik09Xen7gje4m9ERNah1d1PPsVq1VEx9vE4= +github.com/tommy-muehle/go-mnd/v2 v2.4.0/go.mod h1:WsUAkMJMYww6l/ufffCD3m+P7LEvr8TnZn9lwVDlgzw= github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= +github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= github.com/ulikunitz/xz v0.5.8 h1:ERv8V6GKqVi23rgu5cj9pVfVzJbOqAY2Ntl88O6c2nQ= github.com/ulikunitz/xz v0.5.8/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= +github.com/ultraware/funlen v0.0.3/go.mod h1:Dp4UiAus7Wdb9KUZsYWZEWiRzGuM2kXM1lPbfaF6xhA= +github.com/ultraware/whitespace v0.0.4/go.mod h1:aVMh/gQve5Maj9hQ/hg+F75lr/X5A89uZnzAmWSineA= github.com/urfave/cli v0.0.0-20171014202726-7bc6a0acffa5/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= github.com/urfave/cli v1.22.2/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= github.com/urfave/cli v1.22.4/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= +github.com/uudashr/gocognit v1.0.5/go.mod h1:wgYz0mitoKOTysqxTDMOUXg+Jb5SvtihkfmugIZYpEA= github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= +github.com/valyala/fasthttp v1.30.0/go.mod h1:2rsYD01CKFrjjsvFxx75KlEUNpWNBY9JWD3K/7o2Cus= +github.com/valyala/quicktemplate v1.7.0/go.mod h1:sqKJnoaOF88V07vkO+9FL8fb9uZg/VPSJnLYn+LmLk8= +github.com/valyala/tcplisten v1.0.0/go.mod h1:T0xQ8SeCZGxckz9qRXTfG43PvQ/mcWh7FwZEA7Ioqkc= +github.com/vbatts/tar-split v0.11.2 h1:Via6XqJr0hceW4wff3QRzD5gAk/tatMw/4ZA7cTlIME= +github.com/vbatts/tar-split v0.11.2/go.mod h1:vV3ZuO2yWSVsz+pfFzDG/upWH1JhjOiEaWq6kXyQ3VI= +github.com/viki-org/dnscache v0.0.0-20130720023526-c70c1f23c5d8/go.mod h1:dniwbG03GafCjFohMDmz6Zc6oCuiqgH6tGNyXTkHzXE= github.com/vishvananda/netlink v0.0.0-20181108222139-023a6dafdcdf/go.mod h1:+SR5DhBJrl6ZM7CoCKvpw5BKroDKQ+PJqOg65H/2ktk= github.com/vishvananda/netlink v1.1.0/go.mod h1:cTgwzPIzzgDAYoQrMm0EdrjRUBkTqKYppBueQtXaqoE= github.com/vishvananda/netlink v1.1.1-0.20201029203352-d40f9887b852/go.mod h1:twkDnbuQxJYemMlGd4JFIcuhgX83tXhKS2B/PRMpOho= @@ -1148,16 +1390,22 @@ github.com/willf/bitset v1.1.11/go.mod h1:83CECat5yLh5zVOf4P1ErAgKA5UDvKtgyUABdr github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ= github.com/xeipuuv/gojsonschema v0.0.0-20180618132009-1d523034197f/go.mod h1:5yf86TLmAcydyeJq5YvxkGPE2fm/u4myDekKRoLuqhs= +github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca/go.mod h1:ce1O1j6UtZfjr22oyGxGLbauSBp2YVXpARAosm7dHBg= github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 h1:QldyIu/L63oPpyvQmHgvgickp1Yw510KJOqX7H24mg8= github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778/go.mod h1:2MuV+tbUrU1zIOPMxZ5EncGwgmMJsa+9ucAQZXxsObs= github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= +github.com/yeya24/promlinter v0.1.0/go.mod h1:rs5vtZzeBHqqMwXqFScncpCF6u06lezhZepno9AB1Oc= +github.com/yudai/gojsondiff v1.0.0/go.mod h1:AY32+k2cwILAkW1fbgxQ5mUmMiZFgLIV+FBNExI05xg= +github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82/go.mod h1:lgjkn3NuSvDfVJdfcVVdX+jpBxNmX4rDAzaS45IcYoM= +github.com/yudai/pp v2.0.1+incompatible/go.mod h1:PuxR/8QJ7cyCkFp/aUDS+JY727OFEZkTdatxwunjIkc= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= +github.com/yuin/goldmark v1.4.0/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yusufpapurcu/wmi v1.2.2 h1:KBNDSne4vP5mbSWnJbO+51IMOXJB67QiYCSBrubbPRg= github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= @@ -1168,11 +1416,14 @@ github.com/zchee/go-vmnet v0.0.0-20161021174912-97ebf9174097 h1:Ucx5I1l1+TWXvqFm github.com/zchee/go-vmnet v0.0.0-20161021174912-97ebf9174097/go.mod h1:lFZSWRIpCfE/pt91hHBBpV6+x87YlCjsp+aIR2qCPPU= go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= +go.etcd.io/bbolt v1.3.4/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= +go.etcd.io/etcd v0.0.0-20200513171258-e048e166ab9c/go.mod h1:xCI7ZzBfRuGgBXyXO6yfWfDmlWd35khcWpUa4L0xI/k= go.etcd.io/etcd v0.5.0-alpha.5.0.20200910180754-dd1b699fc489/go.mod h1:yVHk9ub3CSBatqGNg7GRmsnfLWtoW60w4eDYfh7vHDg= go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v2 v2.305.0/go.mod h1:h9puh54ZTgAKtEbut2oe9P4L/oqKCVB6xsXlzd7alYQ= +go.mozilla.org/mozlog v0.0.0-20170222151521-4bb13139d403/go.mod h1:jHoPAGnDrCy6kaI2tAze5Prf0Nr0w/oNkROt2lw3n3o= go.mozilla.org/pkcs7 v0.0.0-20200128120323-432b2356ecb1/go.mod h1:SNgMg+EgDFwmvSmLRTNKC5fegJjB7v23qTQ0XLGUNHk= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= @@ -1205,14 +1456,19 @@ go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqe 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= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= +go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/goleak v1.1.10 h1:z+mqJhf6ss6BSfSM671tgKyZBFPTTJM+HLxnhPC3wu0= go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= +go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4= +go.uber.org/multierr v1.4.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4= go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= +go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= +go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= go.uber.org/zap v1.19.0 h1:mZQZefskPPCMIBCSEH0v2/iUqqLrYtaeqwD6FUGUnFE= go.uber.org/zap v1.19.0/go.mod h1:xg/QME4nWcxGxrpdeYfq7UvYrLh66cuVKdrbD1XF/NI= @@ -1220,9 +1476,11 @@ go4.org v0.0.0-20180809161055-417644f6feb5/go.mod h1:MkTOUMDaeVYJUOUsaDXIhWPZYa1 golang.org/x/build v0.0.0-20190927031335-2835ba2e683f h1:hXVePvSFG7tPGX4Pwk1d10ePFfoTCc0QmISfpKOHsS8= golang.org/x/build v0.0.0-20190927031335-2835ba2e683f/go.mod h1:fYw7AShPAhGMdXqA9gRadk/CcMsvLlClpE5oBwnS3dM= golang.org/x/crypto v0.0.0-20171113213409-9f005a07e0d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20180501155221-613d6eafa307/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181009213950-7c1a557ab941/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190103213133-ff983b9c42bc/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190424203555-c05e17bb3b2d/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= @@ -1231,15 +1489,19 @@ golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= 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-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= +golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8= +golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/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-20220214200702-86341886e292/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= @@ -1256,6 +1518,7 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0 golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= +golang.org/x/exp v0.0.0-20200331195152-e8c3332aa8e5/go.mod h1:4M0jN8W1tt0AVLNr8HDosyJCDCDuyL9N9+3m7wDWgKw= golang.org/x/exp v0.0.0-20210220032938-85be41e4509f h1:GrkO5AtFUU9U/1f5ctbIBXtBGeSJbWwIYfIsTcFMaX4= golang.org/x/exp v0.0.0-20210220032938-85be41e4509f/go.mod h1:I6l2HNBLBZEcrOoCpyKLdY2lHoRZ8lI4x60KMCQDft4= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= @@ -1296,6 +1559,7 @@ golang.org/x/mod v0.3.1-0.20200828183125-ce943fd02449/go.mod h1:s0Qsj1ACt9ePp/hM golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.5.0/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 h1:kQgndtyPBW/JIYERgdxfwMYh3AVStj88WQTlNDi2a+o= golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -1323,6 +1587,7 @@ golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20191002035440-2ec189313ef0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= @@ -1331,6 +1596,7 @@ golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200421231249-e086a090c8fd/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= @@ -1349,9 +1615,12 @@ golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= +golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk= golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20210510120150-4163338589ed/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210520170846-37e1c6afe023/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= @@ -1391,6 +1660,7 @@ golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190412183630-56d357773e84/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -1407,6 +1677,7 @@ golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -1429,10 +1700,12 @@ golang.org/x/sys v0.0.0-20190812073006-9eafafc0a87e/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191002063906-3421d5a6bb1c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191022100944-742c48ecaeb7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191115151921-52ab43148777/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -1453,6 +1726,7 @@ golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200420163511-1957bb5e6d1f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -1477,6 +1751,7 @@ golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20201202213521-69691e467435/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= 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= @@ -1498,12 +1773,16 @@ golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210816074244-15123e1e1f71/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210906170528-6f6e22806c34/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210915083310-ed5796bab164/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210917161153-d61c044b1678/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211013075003-97ac67df715c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211023085530-d6a326fbbf70/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -1541,19 +1820,26 @@ golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxb golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 h1:vVKdlvoWBphwdxWKrFZEuM0kGgGLxUOYcY4U/2Vjg44= golang.org/x/time v0.0.0-20220210224613-90d013bbcef8/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190110163146-51295c7ec13a/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= +golang.org/x/tools v0.0.0-20190307163923-6a08e3108db3/go.mod h1:25r3+/G6/xytQM8iWZKq3Hn0kr0rgFKPUNVEL/dr3z4= golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190311215038-5c2858a9cfe5/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190321232350-e250d351ecad/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190322203728-c1a832b0ad89/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= @@ -1564,8 +1850,14 @@ golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgw golang.org/x/tools v0.0.0-20190624222133-a101b041ded4/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20190910044552-dd2b5c81c578/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20190916130336-e45ffcd953cc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191010075000-0337d82405ff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= @@ -1578,6 +1870,7 @@ golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapK golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200117012304-6edc0a871e69/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200117220505-0cba7a3a9ee9/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= @@ -1587,31 +1880,60 @@ golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapK golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= +golang.org/x/tools v0.0.0-20200324003944-a576cf524670/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= +golang.org/x/tools v0.0.0-20200329025819-fd4102a86c65/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= +golang.org/x/tools v0.0.0-20200414032229-332987a829c3/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200422022333-3d57cf2e726e/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200426102838-f3a5411a4c3b/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200505023115-26f46d2f7ef8/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= 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-20200622203043-20e05c1c8ffa/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200624225443-88f3c62a19ff/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200625211823-6506e20df31f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200626171337-aa94e735be7f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200630154851-b2d8b0336632/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200706234117-b22de6825cf7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= +golang.org/x/tools v0.0.0-20200724022722-7017fd6b1305/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= 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-20200812195022-5ae4c3c160a0/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= +golang.org/x/tools v0.0.0-20200820010801-b793a1359eac/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= +golang.org/x/tools v0.0.0-20200831203904-5a2aa26beb65/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE= golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE= +golang.org/x/tools v0.0.0-20201001104356-43ebab892c4c/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU= +golang.org/x/tools v0.0.0-20201002184944-ecd9fd270d5d/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU= +golang.org/x/tools v0.0.0-20201023174141-c8cfbd0f21e6/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20201028025901-8cd080b735b3/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20201114224030-61ea331ec02b/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20201118003311-bd56c0adb394/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20201230224404-63754364767c/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20210101214203-2dba1e4ea05c/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20210104081019-d8d6ddbec6ee/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-0.20210205202024-ef80cdb6ec6d/go.mod h1:9bzcO0MWcOuT0tm1iBGzDVPshzfwoVvREIui8C+MHqU= +golang.org/x/tools v0.1.1-0.20210302220138-2ac05c832e1a/go.mod h1:9bzcO0MWcOuT0tm1iBGzDVPshzfwoVvREIui8C+MHqU= golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.1.10-0.20220218145154-897bd77cd717 h1:hI3jKY4Hpf63ns040onEbB3dAkR/H/P83hw1TG8dD3Y= +golang.org/x/tools v0.1.6/go.mod h1:LGqMHiF4EqQNHR1JncWGqT5BVaXmza+X+BDGol+dOxo= +golang.org/x/tools v0.1.7/go.mod h1:LGqMHiF4EqQNHR1JncWGqT5BVaXmza+X+BDGol+dOxo= golang.org/x/tools v0.1.10-0.20220218145154-897bd77cd717/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E= +golang.org/x/tools v0.1.10 h1:QjFRCZxdOhBJ/UNgnBZLbNV13DlbnK0quyivTnXJM20= 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= @@ -1627,6 +1949,7 @@ google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEt google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= +google.golang.org/api v0.10.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= @@ -1670,12 +1993,15 @@ google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9Ywl google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= +google.golang.org/appengine v1.6.2/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/cloud v0.0.0-20151119220103-975617b05ea8/go.mod h1:0H1ncTHf11KCFhTc/+EFRbzSCOZx+VUbRMk55Yv5MYk= +google.golang.org/genproto v0.0.0-20170818010345-ee236bd376b0/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/genproto v0.0.0-20181107211654-5fc9ac540362/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= @@ -1684,6 +2010,7 @@ google.golang.org/genproto v0.0.0-20190522204451-c2c4e71fbf69/go.mod h1:z3L6/3dT google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= +google.golang.org/genproto v0.0.0-20190927181202-20e1ac93f88c/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= @@ -1698,12 +2025,15 @@ google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfG google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200423170343-7949de9c1215/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= 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-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= +google.golang.org/genproto v0.0.0-20200626011028-ee7919e894b5/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20200707001353-8e8330bf89df/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= 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= google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= @@ -1766,6 +2096,7 @@ google.golang.org/genproto v0.0.0-20220602131408-e326c6e8e9c8/go.mod h1:yKyY4AMR google.golang.org/genproto v0.0.0-20220608133413-ed9918b62aac h1:ByeiW1F67iV9o8ipGskA+HWzSkMbRJuKLlwCdPxzn7A= google.golang.org/genproto v0.0.0-20220608133413-ed9918b62aac/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA= google.golang.org/grpc v0.0.0-20160317175043-d3ddb4469d5a/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= +google.golang.org/grpc v1.8.0/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= google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= @@ -1778,6 +2109,7 @@ google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8 google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60= +google.golang.org/grpc v1.29.0/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= @@ -1828,12 +2160,15 @@ gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntN gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= gopkg.in/cheggaaa/pb.v1 v1.0.27/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= +gopkg.in/cheggaaa/pb.v1 v1.0.28/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= +gopkg.in/gcfg.v1 v1.2.3/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o= gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod h1:Xk6kEKp8OKb+X14hQBKWaSkCsqBpgog8nAV2xsGOxlo= 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.63.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= @@ -1845,12 +2180,14 @@ gopkg.in/square/go-jose.v2 v2.3.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76 gopkg.in/square/go-jose.v2 v2.5.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= +gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.6/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= @@ -1874,6 +2211,7 @@ honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.1.3/go.mod h1:NgwopIslSNH47DimFoV78dnkksY2EFtX0ajyb3K/las= +honnef.co/go/tools v0.2.1/go.mod h1:lPVVZ2BS5TfnjLyizF7o7hv7j9/L+8cZY2hLyjP9cGY= k8s.io/api v0.19.1/go.mod h1:+u/k4/K/7vp4vsfdT7dyl8Oxk1F26Md4g5F26Tu85PU= k8s.io/api v0.20.1/go.mod h1:KqwcCVogGxQY3nBlRpwt+wpAMF/KjaCc7RpywacvqUo= k8s.io/api v0.20.4/go.mod h1:++lNL1AJMkDymriNniQsWRkMDzRaX2Y/POTUi8yvqYQ= @@ -1942,6 +2280,10 @@ k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 h1:HNSDgDCrr/6Ly3WEGKZftiE7IY19V k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= libvirt.org/go/libvirt v1.8003.0 h1:2puEq21MkIiOK6EboeRp7dLW1CdPsSJAYPWufH0CESg= libvirt.org/go/libvirt v1.8003.0/go.mod h1:1WiFE8EjZfq+FCVog+rvr1yatKbKZ9FaFMZgEqxEJqQ= +mvdan.cc/gofumpt v0.1.1/go.mod h1:yXG1r1WqZVKWbVRtBWKWX9+CxGYfA51nSomhM0woR48= +mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed/go.mod h1:Xkxe497xwlCKkIaQYRfC7CSLworTXY9RMqwhhCm+8Nc= +mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b/go.mod h1:2odslEg/xrtNQqCYg2/jCoyKnw3vv5biOc3JnIcYfL4= +mvdan.cc/unparam v0.0.0-20210104141923-aac4ce9116a7/go.mod h1:hBpJkZE8H/sb+VRFvw2+rBpHNsTBcvSpk61hr8mzXZE= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/pdf v0.1.1 h1:k1MczvYDUvJBe93bYd7wrZLLUEcLZAuF824/I4e5Xr4= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= From 7c4389c68b0c13aebd2ca3b5173154774d04584c Mon Sep 17 00:00:00 2001 From: Jack Zhang Date: Mon, 14 Mar 2022 18:42:46 +0800 Subject: [PATCH 090/545] update image prefix --- cmd/minikube/cmd/start_flags.go | 2 +- pkg/addons/addons.go | 2 +- pkg/minikube/bootstrapper/images/images.go | 13 ++++- .../bootstrapper/images/images_test.go | 50 +++++++++++++++++++ pkg/minikube/bootstrapper/images/repo.go | 10 ---- pkg/minikube/bootstrapper/images/repo_test.go | 24 --------- pkg/minikube/constants/constants.go | 5 +- pkg/minikube/image/image.go | 26 +--------- pkg/minikube/node/cache.go | 2 +- 9 files changed, 71 insertions(+), 63 deletions(-) diff --git a/cmd/minikube/cmd/start_flags.go b/cmd/minikube/cmd/start_flags.go index 261b1af978..19e256f2a3 100644 --- a/cmd/minikube/cmd/start_flags.go +++ b/cmd/minikube/cmd/start_flags.go @@ -430,7 +430,7 @@ func getRepository(cmd *cobra.Command, k8sVersion string) string { repository = autoSelectedRepository } - if repository == "registry.cn-hangzhou.aliyuncs.com/google_containers" { + if repository == constants.AliyunMirror { download.SetAliyunMirror() } diff --git a/pkg/addons/addons.go b/pkg/addons/addons.go index 2b273dd6d2..24d0e3ac1a 100644 --- a/pkg/addons/addons.go +++ b/pkg/addons/addons.go @@ -192,7 +192,7 @@ func EnableOrDisableAddon(cc *config.ClusterConfig, name string, val string) err exit.Error(reason.HostSaveProfile, "Failed to persist images", err) } - if cc.KubernetesConfig.ImageRepository == "registry.cn-hangzhou.aliyuncs.com/google_containers" { + if cc.KubernetesConfig.ImageRepository == constants.AliyunMirror { images, customRegistries = assets.FixAddonImagesAndRegistries(addon, images, customRegistries) } diff --git a/pkg/minikube/bootstrapper/images/images.go b/pkg/minikube/bootstrapper/images/images.go index 60d2e68d6b..3e270918e9 100644 --- a/pkg/minikube/bootstrapper/images/images.go +++ b/pkg/minikube/bootstrapper/images/images.go @@ -130,6 +130,10 @@ func coreDNS(v semver.Version, mirror string) string { cv = findLatestTagFromRepository(fmt.Sprintf(tagURLTemplate, kubernetesRepo(mirror), imageName), cv) } + if mirror == constants.AliyunMirror { + imageName = "coredns" + } + return fmt.Sprintf("%s:%s", path.Join(kubernetesRepo(mirror), imageName), cv) } @@ -161,7 +165,14 @@ func auxiliary(mirror string) []string { // storageProvisioner returns the minikube storage provisioner image func storageProvisioner(mirror string) string { - return path.Join(minikubeRepo(mirror), "storage-provisioner:"+version.GetStorageProvisionerVersion()) + cv := version.GetStorageProvisionerVersion() + in := "k8s-minikube/storage-provisioner:" + cv + if mirror == "" { + mirror = "gcr.io" + } else if mirror == constants.AliyunMirror { + in = "storage-provisioner:" + cv + } + return path.Join(mirror, in) } // KindNet returns the image used for kindnet diff --git a/pkg/minikube/bootstrapper/images/images_test.go b/pkg/minikube/bootstrapper/images/images_test.go index 65fac2e26e..67078d294a 100644 --- a/pkg/minikube/bootstrapper/images/images_test.go +++ b/pkg/minikube/bootstrapper/images/images_test.go @@ -127,6 +127,46 @@ func TestGetLatestTag(t *testing.T) { } } +func TestEssentialsAliyunMirror(t *testing.T) { + var testCases = []struct { + version string + images []string + }{ + + {"v1.21.0", strings.Split(strings.Trim(` +registry.cn-hangzhou.aliyuncs.com/google_containers/kube-apiserver:v1.21.0 +registry.cn-hangzhou.aliyuncs.com/google_containers/kube-controller-manager:v1.21.0 +registry.cn-hangzhou.aliyuncs.com/google_containers/kube-scheduler:v1.21.0 +registry.cn-hangzhou.aliyuncs.com/google_containers/kube-proxy:v1.21.0 +registry.cn-hangzhou.aliyuncs.com/google_containers/pause:3.4.1 +registry.cn-hangzhou.aliyuncs.com/google_containers/etcd:3.4.13-0 +registry.cn-hangzhou.aliyuncs.com/google_containers/coredns:v1.8.0 +`, "\n"), "\n")}, + {"v1.22.0", strings.Split(strings.Trim(` +registry.cn-hangzhou.aliyuncs.com/google_containers/kube-apiserver:v1.22.0 +registry.cn-hangzhou.aliyuncs.com/google_containers/kube-controller-manager:v1.22.0 +registry.cn-hangzhou.aliyuncs.com/google_containers/kube-scheduler:v1.22.0 +registry.cn-hangzhou.aliyuncs.com/google_containers/kube-proxy:v1.22.0 +registry.cn-hangzhou.aliyuncs.com/google_containers/pause:3.5 +registry.cn-hangzhou.aliyuncs.com/google_containers/etcd:3.5.0-0 +registry.cn-hangzhou.aliyuncs.com/google_containers/coredns:v1.8.4 +`, "\n"), "\n")}, + } + for _, tc := range testCases { + t.Run(tc.version, func(t *testing.T) { + v, err := semver.Make(strings.TrimPrefix(tc.version, "v")) + if err != nil { + t.Fatal(err) + } + want := tc.images + got := essentials("registry.cn-hangzhou.aliyuncs.com/google_containers", v) + if diff := cmp.Diff(want, got); diff != "" { + t.Errorf("images mismatch (-want +got):\n%s", diff) + } + }) + } +} + func TestAuxiliary(t *testing.T) { want := []string{ "gcr.io/k8s-minikube/storage-provisioner:" + version.GetStorageProvisionerVersion(), @@ -147,6 +187,16 @@ func TestAuxiliaryMirror(t *testing.T) { } } +func TestAuxiliaryAliyunMirror(t *testing.T) { + want := []string{ + "registry.cn-hangzhou.aliyuncs.com/google_containers/storage-provisioner:" + version.GetStorageProvisionerVersion(), + } + got := auxiliary("registry.cn-hangzhou.aliyuncs.com/google_containers") + if diff := cmp.Diff(want, got); diff != "" { + t.Errorf("images mismatch (-want +got):\n%s", diff) + } +} + func TestCNI(t *testing.T) { // images used by k8s.io/minikube/pkg/minikube/cni var testCases = []struct { diff --git a/pkg/minikube/bootstrapper/images/repo.go b/pkg/minikube/bootstrapper/images/repo.go index d06f0db9a8..dbd25d4548 100644 --- a/pkg/minikube/bootstrapper/images/repo.go +++ b/pkg/minikube/bootstrapper/images/repo.go @@ -16,8 +16,6 @@ limitations under the License. package images -import "path" - // DefaultKubernetesRepo is the default Kubernetes repository const DefaultKubernetesRepo = "k8s.gcr.io" @@ -28,11 +26,3 @@ func kubernetesRepo(mirror string) string { } return DefaultKubernetesRepo } - -// minikubeRepo returns the official minikube repository, or an alternate -func minikubeRepo(mirror string) string { - if mirror == "" { - mirror = "gcr.io" - } - return path.Join(mirror, "k8s-minikube") -} diff --git a/pkg/minikube/bootstrapper/images/repo_test.go b/pkg/minikube/bootstrapper/images/repo_test.go index e4e2b11aa8..5621003dda 100644 --- a/pkg/minikube/bootstrapper/images/repo_test.go +++ b/pkg/minikube/bootstrapper/images/repo_test.go @@ -44,27 +44,3 @@ func Test_kubernetesRepo(t *testing.T) { } } - -func Test_minikubeRepo(t *testing.T) { - tests := []struct { - mirror string - want string - }{ - { - "", - "gcr.io/k8s-minikube", - }, - { - "mirror.k8s.io", - "mirror.k8s.io/k8s-minikube", - }, - } - - for _, tc := range tests { - got := minikubeRepo(tc.mirror) - if !cmp.Equal(got, tc.want) { - t.Errorf("mirror miss match, want: %s, got: %s", tc.want, got) - } - } - -} diff --git a/pkg/minikube/constants/constants.go b/pkg/minikube/constants/constants.go index fcdb38c436..242db0ddab 100644 --- a/pkg/minikube/constants/constants.go +++ b/pkg/minikube/constants/constants.go @@ -145,6 +145,9 @@ const ( MountTypeFlag = "type" // MountUIDFlag is the flag used to set the mount UID MountUIDFlag = "uid" + + // Mirror CN + AliyunMirror = "registry.cn-hangzhou.aliyuncs.com/google_containers" ) var ( @@ -177,7 +180,7 @@ var ( // ImageRepositories contains all known image repositories ImageRepositories = map[string][]string{ "global": {""}, - "cn": {"registry.cn-hangzhou.aliyuncs.com/google_containers"}, + "cn": {AliyunMirror}, } // KubernetesReleaseBinaries are Kubernetes release binaries required for // kubeadm (kubelet, kubeadm) and the addon manager (kubectl) diff --git a/pkg/minikube/image/image.go b/pkg/minikube/image/image.go index c671b57e87..b66b240acb 100644 --- a/pkg/minikube/image/image.go +++ b/pkg/minikube/image/image.go @@ -154,15 +154,12 @@ func retrieveImage(ref name.Reference, imgName string) (v1.Image, string, error) } } if useRemote { - ref, canonicalName, err := fixRemoteImageName(ref, imgName) - if err != nil { - return nil, "", err - } + cname := canonicalName(ref) img, err = retrieveRemote(ref, defaultPlatform) if err == nil { img, err = fixPlatform(ref, img, defaultPlatform) if err == nil { - return img, canonicalName, nil + return img, cname, nil } } } @@ -321,22 +318,3 @@ func normalizeTagName(image string) string { } return base + ":" + tag } - -func fixRemoteImageName(ref name.Reference, imgName string) (name.Reference, string, error) { - const aliyunMirror = "registry.cn-hangzhou.aliyuncs.com/google_containers/" - if strings.HasPrefix(imgName, aliyunMirror) { - // for aliyun registry must strip namespace from image name, e.g. - // registry.cn-hangzhou.aliyuncs.com/google_containers/coredns/coredns:v1.8.0 will not work - // registry.cn-hangzhou.aliyuncs.com/google_containers/coredns:1.8.0 does work - image := strings.TrimPrefix(imgName, aliyunMirror) - image = strings.TrimPrefix(image, "k8s-minikube/") - image = strings.TrimPrefix(image, "kubernetesui/") - image = strings.TrimPrefix(image, "coredns/") - remoteRef, err := name.ParseReference(aliyunMirror+image, name.WeakValidation) - if err != nil { - return nil, "", err - } - return remoteRef, canonicalName(ref), nil - } - return ref, canonicalName(ref), nil -} diff --git a/pkg/minikube/node/cache.go b/pkg/minikube/node/cache.go index fbd53889bf..7acaee0474 100644 --- a/pkg/minikube/node/cache.go +++ b/pkg/minikube/node/cache.go @@ -261,7 +261,7 @@ func imagesInConfigFile() ([]string, error) { func updateKicImageRepo(imgName string, repo string) string { image := strings.TrimPrefix(imgName, "gcr.io/") - if repo == "registry.cn-hangzhou.aliyuncs.com/google_containers" { + if repo == constants.AliyunMirror { // for aliyun registry must strip namespace from image name, e.g. // registry.cn-hangzhou.aliyuncs.com/google_containers/k8s-minikube/kicbase:v0.0.25 will not work // registry.cn-hangzhou.aliyuncs.com/google_containers/kicbase:v0.0.25 does work From 6b458a8e0d65250650a32aef54166d9bb0c3a666 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Thu, 9 Jun 2022 16:13:21 +0000 Subject: [PATCH 091/545] Update auto-generated docs and translations --- site/content/en/docs/commands/start.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index 061da59824..f619a82f1b 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/13807/minikube-v1.26.0-1653677468-13807-amd64.iso,https://github.com/kubernetes/minikube/releases/download/v1.26.0-1653677468-13807/minikube-v1.26.0-1653677468-13807-amd64.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.26.0-1653677468-13807-amd64.iso,https://storage.googleapis.com/minikube-builds/iso/13807/minikube-v1.26.0-1653677468-13807.iso,https://github.com/kubernetes/minikube/releases/download/v1.26.0-1653677468-13807/minikube-v1.26.0-1653677468-13807.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.26.0-1653677468-13807.iso]) + --iso-url strings Locations to fetch the minikube ISO from. (default [https://storage.googleapis.com/minikube-builds/iso/12707/minikube-v1.26.0-1654280115-12707-amd64.iso,https://github.com/kubernetes/minikube/releases/download/v1.26.0-1654280115-12707/minikube-v1.26.0-1654280115-12707-amd64.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.26.0-1654280115-12707-amd64.iso,https://storage.googleapis.com/minikube-builds/iso/12707/minikube-v1.26.0-1654280115-12707.iso,https://github.com/kubernetes/minikube/releases/download/v1.26.0-1654280115-12707/minikube-v1.26.0-1654280115-12707.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.26.0-1654280115-12707.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.6, 'latest' for v1.23.6). Defaults to 'stable'. --kvm-gpu Enable experimental NVIDIA GPU support in minikube From 962f2b693574da9c71a33ac0168f236633e0b5fb Mon Sep 17 00:00:00 2001 From: Sharif Elgamal Date: Thu, 9 Jun 2022 10:02:33 -0700 Subject: [PATCH 092/545] fix syntax --- deploy/iso/minikube-iso/package/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/deploy/iso/minikube-iso/package/Config.in b/deploy/iso/minikube-iso/package/Config.in index 57cc164c63..dd0663e2c4 100644 --- a/deploy/iso/minikube-iso/package/Config.in +++ b/deploy/iso/minikube-iso/package/Config.in @@ -1,5 +1,4 @@ menu "System tools" -<<<<<<< HEAD source "$BR2_EXTERNAL_MINIKUBE_PATH/package/conmon/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/package/crio-bin/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/package/tbb/Config.in" From d5db9f635cb0b0dceab553721d07389403d4ef40 Mon Sep 17 00:00:00 2001 From: Sharif Elgamal Date: Thu, 9 Jun 2022 10:11:22 -0700 Subject: [PATCH 093/545] dummy commit for testing --- .github/workflows/docs.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index b7f983a7ff..0d56edbb23 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -12,6 +12,7 @@ permissions: jobs: generate-docs: + if: github.repository == 'kubernetes/minikube' runs-on: ubuntu-20.04 steps: - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5 From a64f828b89612c5585d72233f2ad57852a91c2c6 Mon Sep 17 00:00:00 2001 From: Sharif Elgamal Date: Thu, 9 Jun 2022 12:53:59 -0700 Subject: [PATCH 094/545] remove vbox-guest config entry --- deploy/iso/minikube-iso/arch/x86_64/package/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/Config.in b/deploy/iso/minikube-iso/arch/x86_64/package/Config.in index ac1b922baf..870c338128 100644 --- a/deploy/iso/minikube-iso/arch/x86_64/package/Config.in +++ b/deploy/iso/minikube-iso/arch/x86_64/package/Config.in @@ -5,6 +5,5 @@ menu "System tools x86_64" source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/docker-bin/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/cni-plugins/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/containerd-bin/Config.in" - source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/vbox-guest/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/hyperv-daemons/Config.in" endmenu From 5d5cdc793fde64c49c8b49ecfb019576b98df426 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Thu, 9 Jun 2022 23:16:05 +0000 Subject: [PATCH 095/545] Updating ISO to v1.26.0-1654804800-14265 --- 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 24bf8a3842..92f9dfde4f 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.26.0-1654280115-12707 +ISO_VERSION ?= v1.26.0-1654804800-14265 # 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 6a9a6e85f1..3b597e7f5c 100644 --- a/pkg/minikube/download/iso.go +++ b/pkg/minikube/download/iso.go @@ -41,7 +41,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/12707" + isoBucket := "minikube-builds/iso/14265" return []string{ fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s-%s.iso", isoBucket, v, runtime.GOARCH), fmt.Sprintf("https://github.com/kubernetes/minikube/releases/download/%s/minikube-%s-%s.iso", v, v, runtime.GOARCH), diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index beb459bc3e..922238fb86 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/14265/minikube-v1.26.0-1654217465-14265-amd64.iso,https://github.com/kubernetes/minikube/releases/download/v1.26.0-1654217465-14265/minikube-v1.26.0-1654217465-14265-amd64.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.26.0-1654217465-14265-amd64.iso,https://storage.googleapis.com/minikube-builds/iso/14265/minikube-v1.26.0-1654217465-14265.iso,https://github.com/kubernetes/minikube/releases/download/v1.26.0-1654217465-14265/minikube-v1.26.0-1654217465-14265.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.26.0-1654217465-14265.iso]) + --iso-url strings Locations to fetch the minikube ISO from. (default [https://storage.googleapis.com/minikube-builds/iso/14265/minikube-v1.26.0-1654804800-14265-amd64.iso,https://github.com/kubernetes/minikube/releases/download/v1.26.0-1654804800-14265/minikube-v1.26.0-1654804800-14265-amd64.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.26.0-1654804800-14265-amd64.iso,https://storage.googleapis.com/minikube-builds/iso/14265/minikube-v1.26.0-1654804800-14265.iso,https://github.com/kubernetes/minikube/releases/download/v1.26.0-1654804800-14265/minikube-v1.26.0-1654804800-14265.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.26.0-1654804800-14265.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.6, 'latest' for v1.23.6). Defaults to 'stable'. --kvm-gpu Enable experimental NVIDIA GPU support in minikube From d59034e27c9e5fc9985bc0d3625edfb6d1ae57a7 Mon Sep 17 00:00:00 2001 From: Francis Laniel Date: Fri, 10 Jun 2022 11:52:50 +0100 Subject: [PATCH 096/545] Change iso-menuconfig to iso-menuconfig-%. iso-menuconfig would do nothing related to buildroot configurations with the changes added with arm64. Signed-off-by: Francis Laniel --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 24bf8a3842..1b25fa2e1f 100644 --- a/Makefile +++ b/Makefile @@ -307,9 +307,9 @@ minikube-iso-%: deploy/iso/minikube-iso/board/minikube/%/rootfs-overlay/usr/bin/ # Change buildroot configuration for the minikube ISO .PHONY: iso-menuconfig -iso-menuconfig: ## Configure buildroot configuration - $(MAKE) -C $(BUILD_DIR)/buildroot $(BUILDROOT_OPTIONS) menuconfig - $(MAKE) -C $(BUILD_DIR)/buildroot $(BUILDROOT_OPTIONS) savedefconfig +iso-menuconfig-%: ## Configure buildroot configuration + $(MAKE) -C $(BUILD_DIR)/buildroot $(BUILDROOT_OPTIONS) O=$(BUILD_DIR)/buildroot/output-$* menuconfig + $(MAKE) -C $(BUILD_DIR)/buildroot $(BUILDROOT_OPTIONS) O=$(BUILD_DIR)/buildroot/output-$* savedefconfig # Change the kernel configuration for the minikube ISO linux-menuconfig-%: ## Configure Linux kernel configuration From 5a9a4b13449f8e292fb4212b3794edd9a56c4b53 Mon Sep 17 00:00:00 2001 From: Francis Laniel Date: Wed, 1 Jun 2022 11:15:40 +0100 Subject: [PATCH 097/545] Add pahole package. This package is needed to build the kernel when using CONFIG_DEBUG_INFO_BTF. Signed-off-by: Francis Laniel --- deploy/iso/minikube-iso/package/Config.in | 1 + .../package/pahole/Config.in.host | 7 ++++++ .../minikube-iso/package/pahole/pahole.hash | 2 ++ .../iso/minikube-iso/package/pahole/pahole.mk | 22 +++++++++++++++++++ 4 files changed, 32 insertions(+) create mode 100644 deploy/iso/minikube-iso/package/pahole/Config.in.host create mode 100644 deploy/iso/minikube-iso/package/pahole/pahole.hash create mode 100644 deploy/iso/minikube-iso/package/pahole/pahole.mk diff --git a/deploy/iso/minikube-iso/package/Config.in b/deploy/iso/minikube-iso/package/Config.in index 8fbd6c82f2..ee2036e559 100644 --- a/deploy/iso/minikube-iso/package/Config.in +++ b/deploy/iso/minikube-iso/package/Config.in @@ -1,6 +1,7 @@ menu "System tools" source "$BR2_EXTERNAL_MINIKUBE_PATH/package/tbb/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/package/sysdig/Config.in" + source "$BR2_EXTERNAL_MINIKUBE_PATH/package/pahole/Config.in.host" source "$BR2_EXTERNAL_MINIKUBE_PATH/package/crun/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/package/automount/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/package/gluster/Config.in" diff --git a/deploy/iso/minikube-iso/package/pahole/Config.in.host b/deploy/iso/minikube-iso/package/pahole/Config.in.host new file mode 100644 index 0000000000..a3ec9995ef --- /dev/null +++ b/deploy/iso/minikube-iso/package/pahole/Config.in.host @@ -0,0 +1,7 @@ +config BR2_PACKAGE_HOST_PAHOLE + bool "host pahole" + default y + help + Pahole and other DWARF utils. + + https://git.kernel.org/pub/scm/devel/pahole/pahole.git diff --git a/deploy/iso/minikube-iso/package/pahole/pahole.hash b/deploy/iso/minikube-iso/package/pahole/pahole.hash new file mode 100644 index 0000000000..0c6f0faeac --- /dev/null +++ b/deploy/iso/minikube-iso/package/pahole/pahole.hash @@ -0,0 +1,2 @@ +# Locally computed +sha256 cde85af68b368f50a913be387f94f6b43612a04af6c92387b4dcabb712a668fe pahole-v1.23-br1.tar.gz diff --git a/deploy/iso/minikube-iso/package/pahole/pahole.mk b/deploy/iso/minikube-iso/package/pahole/pahole.mk new file mode 100644 index 0000000000..2fb3985637 --- /dev/null +++ b/deploy/iso/minikube-iso/package/pahole/pahole.mk @@ -0,0 +1,22 @@ +######################################################################## +# +# pahole +# +######################################################################## + +PAHOLE_VERSION = v1.23 +PAHOLE_SITE = git://git.kernel.org/pub/scm/devel/pahole/pahole.git +PAHOLE_SITE_METHOD = git +# This guy saved me: +# https://stackoverflow.com/a/50526817 +# Indeed, pahole contains git submodule and relies on them to be built. +# The problem is that buildroot default behavior is to remove .git from archive. +# Thus, it is not possible to use git submodule... +PAHOLE_GIT_SUBMODULES = YES +# We want to have static pahole binary to avoid problem while using it during +# Linux kernel build. +HOST_PAHOLE_CONF_OPTS = -DBUILD_SHARED_LIBS=OFF -D__LIB=lib +PAHOLE_LICENSE = GPL-2.0 +PAHOLE_LICENSE_FILES = COPYING + +$(eval $(host-cmake-package)) From ca1f05e2d2c10240eb1d6506d845e3adc2953481 Mon Sep 17 00:00:00 2001 From: Francis Laniel Date: Fri, 15 Oct 2021 20:53:47 +0200 Subject: [PATCH 098/545] Backport buildroot patch to add BR2_LINUX_KERNEL_NEEDS_HOST_PAHOLE. This config option permits indicating the Linux kernel needs pahole to be compiled. Thus, host-pahole will be built before the kernel. This is mandatory when using CONFIG_DEBUG_INFO_BTF. Signed-off-by: Francis Laniel --- Makefile | 3 + ...d-BR2_LINUX_KERNEL_NEEDS_HOST_PAHOLE.patch | 72 +++++++++++++++++++ 2 files changed, 75 insertions(+) create mode 100644 deploy/iso/minikube-iso/0001-linux-add-BR2_LINUX_KERNEL_NEEDS_HOST_PAHOLE.patch diff --git a/Makefile b/Makefile index 1b25fa2e1f..4084ef353f 100644 --- a/Makefile +++ b/Makefile @@ -294,6 +294,9 @@ minikube-iso-%: deploy/iso/minikube-iso/board/minikube/%/rootfs-overlay/usr/bin/ perl -pi -e 's@\s+source "package/sysdig/Config\.in"\n@@;' $(BUILD_DIR)/buildroot/package/Config.in; \ rm -r $(BUILD_DIR)/buildroot/package/sysdig; \ cp deploy/iso/minikube-iso/go.hash $(BUILD_DIR)/buildroot/package/go/go.hash; \ + git --git-dir=$(BUILD_DIR)/buildroot/.git config user.email "dev@random.com"; \ + git --git-dir=$(BUILD_DIR)/buildroot/.git config user.name "Random developer"; \ + git --git-dir=$(BUILD_DIR)/buildroot/.git --work-tree=$(BUILD_DIR)/buildroot am ../../deploy/iso/minikube-iso/0001-linux-add-BR2_LINUX_KERNEL_NEEDS_HOST_PAHOLE.patch; \ fi; $(MAKE) -C $(BUILD_DIR)/buildroot $(BUILDROOT_OPTIONS) O=$(BUILD_DIR)/buildroot/output-$* minikube_$*_defconfig $(MAKE) -C $(BUILD_DIR)/buildroot $(BUILDROOT_OPTIONS) O=$(BUILD_DIR)/buildroot/output-$* host-python diff --git a/deploy/iso/minikube-iso/0001-linux-add-BR2_LINUX_KERNEL_NEEDS_HOST_PAHOLE.patch b/deploy/iso/minikube-iso/0001-linux-add-BR2_LINUX_KERNEL_NEEDS_HOST_PAHOLE.patch new file mode 100644 index 0000000000..6d04450511 --- /dev/null +++ b/deploy/iso/minikube-iso/0001-linux-add-BR2_LINUX_KERNEL_NEEDS_HOST_PAHOLE.patch @@ -0,0 +1,72 @@ +From 2da2f359dba50aafef1202edda34374d99b77a14 Mon Sep 17 00:00:00 2001 +From: Francis Laniel +Date: Wed, 22 Dec 2021 18:49:05 +0100 +Subject: [PATCH] linux: add BR2_LINUX_KERNEL_NEEDS_HOST_PAHOLE + +CONFIG_DEBUG_BTF_INFO relies on pahole, so kernel DWARF are converted to BTF. +If CONFIG_DEBUG_BTF_INFO is set and BR2_LINUX_KERNEL_NEEDS_HOST_PAHOLE not, +an error message is shown and .config is not written. + +Signed-off-by: Francis Laniel +Signed-off-by: Thomas Petazzoni +--- + linux/Config.in | 12 ++++++++++++ + linux/linux.mk | 12 ++++++++++++ + 2 files changed, 24 insertions(+) + +diff --git a/linux/Config.in b/linux/Config.in +index 891e2cdcb6..582f37ba7c 100644 +--- a/linux/Config.in ++++ b/linux/Config.in +@@ -470,6 +470,18 @@ config BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF + CONFIG_UNWINDER_ORC=y, please install libelf-dev, + libelf-devel or elfutils-libelf-devel". + ++config BR2_LINUX_KERNEL_NEEDS_HOST_PAHOLE ++ bool "Needs host pahole" ++ help ++ Some Linux kernel configuration options (such as ++ CONFIG_DEBUG_INFO_BTF) require building a host program ++ called pahole. Enabling this option will ensure host-pahole ++ gets built before the Linux kernel. ++ ++ Enable this option if you get a Linux kernel build failure ++ such as "BTF: .tmp_vmlinux.btf: pahole (pahole) is not ++ available". ++ + # Linux extensions + source "linux/Config.ext.in" + +diff --git a/linux/linux.mk b/linux/linux.mk +index 61fdc0c76c..dd2eebd446 100644 +--- a/linux/linux.mk ++++ b/linux/linux.mk +@@ -114,6 +114,17 @@ ifeq ($(BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF),y) + LINUX_DEPENDENCIES += host-elfutils host-pkgconf + endif + ++ifeq ($(BR2_LINUX_KERNEL_NEEDS_HOST_PAHOLE),y) ++LINUX_DEPENDENCIES += host-pahole ++else ++define LINUX_FIXUP_CONFIG_PAHOLE_CHECK ++ if grep -q "^CONFIG_DEBUG_INFO_BTF=y" $(KCONFIG_DOT_CONFIG); then \ ++ echo "To use CONFIG_DEBUG_INFO_BTF, enable host-pahole (BR2_LINUX_KERNEL_NEEDS_HOST_PAHOLE)" 1>&2; \ ++ exit 1; \ ++ fi ++endef ++endif ++ + # If host-uboot-tools is selected by the user, assume it is needed to + # create a custom image + ifeq ($(BR2_PACKAGE_HOST_UBOOT_TOOLS),y) +@@ -324,6 +335,7 @@ define LINUX_KCONFIG_FIXUP_CMDS + $(call KCONFIG_DISABLE_OPT,$(opt)) + ) + $(LINUX_FIXUP_CONFIG_ENDIANNESS) ++ $(LINUX_FIXUP_CONFIG_PAHOLE_CHECK) + $(if $(BR2_arm)$(BR2_armeb), + $(call KCONFIG_ENABLE_OPT,CONFIG_AEABI)) + $(if $(BR2_powerpc)$(BR2_powerpc64)$(BR2_powerpc64le), +-- +2.25.1 + From 6a0eea229877b0a2f192984af07fe5142a6b3b6f Mon Sep 17 00:00:00 2001 From: Francis Laniel Date: Wed, 1 Jun 2022 11:26:06 +0100 Subject: [PATCH 099/545] Add eBPF related kernel options. Signed-off-by: Francis Laniel --- .../board/minikube/aarch64/linux_aarch64_defconfig | 6 ++++++ .../board/minikube/x86_64/linux_x86_64_defconfig | 6 ++++++ deploy/iso/minikube-iso/configs/minikube_aarch64_defconfig | 1 + deploy/iso/minikube-iso/configs/minikube_x86_64_defconfig | 1 + 4 files changed, 14 insertions(+) diff --git a/deploy/iso/minikube-iso/board/minikube/aarch64/linux_aarch64_defconfig b/deploy/iso/minikube-iso/board/minikube/aarch64/linux_aarch64_defconfig index 6580b3eb09..4f4586e94b 100644 --- a/deploy/iso/minikube-iso/board/minikube/aarch64/linux_aarch64_defconfig +++ b/deploy/iso/minikube-iso/board/minikube/aarch64/linux_aarch64_defconfig @@ -1,3 +1,9 @@ +CONFIG_FANOTIFY=y +CONFIG_KPROBE_EVENTS=y +CONFIG_DEBUG_INFO=y +CONFIG_DEBUG_INFO_BTF=y +CONFIG_IKHEADERS=y +CONFIG_BPF_LSM=y CONFIG_FTRACE_SYSCALLS=y CONFIG_FTRACE=y CONFIG_HAVE_SYSCALL_TRACEPOINTS=y diff --git a/deploy/iso/minikube-iso/board/minikube/x86_64/linux_x86_64_defconfig b/deploy/iso/minikube-iso/board/minikube/x86_64/linux_x86_64_defconfig index d1ffd4c0d3..01c27835db 100644 --- a/deploy/iso/minikube-iso/board/minikube/x86_64/linux_x86_64_defconfig +++ b/deploy/iso/minikube-iso/board/minikube/x86_64/linux_x86_64_defconfig @@ -1,3 +1,9 @@ +CONFIG_FANOTIFY=y +CONFIG_KPROBE_EVENTS=y +CONFIG_DEBUG_INFO=y +CONFIG_DEBUG_INFO_BTF=y +CONFIG_IKHEADERS=y +CONFIG_BPF_LSM=y CONFIG_VBOXGUEST=m CONFIG_VBOXSF_FS=m CONFIG_DRM_VBOXVIDEO=m diff --git a/deploy/iso/minikube-iso/configs/minikube_aarch64_defconfig b/deploy/iso/minikube-iso/configs/minikube_aarch64_defconfig index 4d2b25421f..9c7af275bf 100644 --- a/deploy/iso/minikube-iso/configs/minikube_aarch64_defconfig +++ b/deploy/iso/minikube-iso/configs/minikube_aarch64_defconfig @@ -67,6 +67,7 @@ BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_MINIKUBE_PATH)/board/minikube/aarch64/linux_aarch64_defconfig" BR2_LINUX_KERNEL_LZ4=y BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y +BR2_LINUX_KERNEL_NEEDS_HOST_PAHOLE=y BR2_PACKAGE_GZIP=y BR2_PACKAGE_XZ=y BR2_PACKAGE_STRACE=y diff --git a/deploy/iso/minikube-iso/configs/minikube_x86_64_defconfig b/deploy/iso/minikube-iso/configs/minikube_x86_64_defconfig index 2ad7c3ceec..1498442182 100644 --- a/deploy/iso/minikube-iso/configs/minikube_x86_64_defconfig +++ b/deploy/iso/minikube-iso/configs/minikube_x86_64_defconfig @@ -69,6 +69,7 @@ BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_MINIKUBE_PATH)/board/minikube/x86_64/linux_x86_64_defconfig" BR2_LINUX_KERNEL_LZ4=y BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y +BR2_LINUX_KERNEL_NEEDS_HOST_PAHOLE=y BR2_PACKAGE_GZIP=y BR2_PACKAGE_XZ=y BR2_PACKAGE_STRACE=y From c8e3f3239b55090f4b3ea86a5199d344dc045f84 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Fri, 10 Jun 2022 10:46:17 -0700 Subject: [PATCH 100/545] update nginx image --- pkg/minikube/assets/addons.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/minikube/assets/addons.go b/pkg/minikube/assets/addons.go index 5858635303..5b3dec96bc 100755 --- a/pkg/minikube/assets/addons.go +++ b/pkg/minikube/assets/addons.go @@ -240,8 +240,8 @@ var Addons = map[string]*Addon{ "ingress-deploy.yaml", "0640"), }, false, "ingress", "", "https://kubernetes.io/docs/tasks/access-application-cluster/ingress-minikube/", map[string]string{ - // https://github.com/kubernetes/ingress-nginx/blob/6d9a39eda7b180f27b34726d7a7a96d73808ce75/deploy/static/provider/kind/deploy.yaml#L417 - "IngressController": "ingress-nginx/controller:v1.2.0@sha256:d8196e3bc1e72547c5dec66d6556c0ff92a23f6d0919b206be170bc90d5f9185", + // https://github.com/kubernetes/ingress-nginx/blob/c32f9a43279425920c41ba2e54dfcb1a54c0daf7/deploy/static/provider/kind/deploy.yaml#L834 + "IngressController": "ingress-nginx/controller:v1.2.1@sha256:5516d103a9c2ecc4f026efbd4b40662ce22dc1f824fb129ed121460aaa5c47f8", // https://github.com/kubernetes/ingress-nginx/blob/fc38b9f2aa2d68ee00c417cf97e727b77a00c175/deploy/static/provider/kind/deploy.yaml#L621 "KubeWebhookCertgenCreate": "k8s.gcr.io/ingress-nginx/kube-webhook-certgen:v1.1.1@sha256:64d8c73dca984af206adf9d6d7e46aa550362b1d7a01f3a0a91b20cc67868660", // https://github.com/kubernetes/ingress-nginx/blob/fc38b9f2aa2d68ee00c417cf97e727b77a00c175/deploy/static/provider/kind/deploy.yaml#L673 From d36ed5aa7899a6d5786c8c0393892f43f8c64f31 Mon Sep 17 00:00:00 2001 From: Sharif Elgamal Date: Fri, 10 Jun 2022 12:06:57 -0700 Subject: [PATCH 101/545] remove inaccel addons test --- pkg/minikube/detect/detect.go | 22 ------------------ test/integration/addons_test.go | 40 --------------------------------- 2 files changed, 62 deletions(-) diff --git a/pkg/minikube/detect/detect.go b/pkg/minikube/detect/detect.go index 23ebc31613..c5910efc59 100644 --- a/pkg/minikube/detect/detect.go +++ b/pkg/minikube/detect/detect.go @@ -17,7 +17,6 @@ limitations under the License. package detect import ( - "io" "net/http" "os" "os/exec" @@ -68,27 +67,6 @@ func IsOnGCE() bool { return resp.Header.Get("Metadata-Flavor") == "Google" } -// IsOnAmazonEC2 determines whether minikube is currently running on Amazon EC2 -// and, if yes, on which instance type. -func IsOnAmazonEC2() (bool, string) { - resp, err := http.Get("http://instance-data.ec2.internal/latest/meta-data/instance-type") - if err != nil { - return false, "" - } - defer resp.Body.Close() - - if resp.StatusCode != http.StatusOK { - return true, "" - } - - instanceType, err := io.ReadAll(resp.Body) - if err != nil { - return true, "" - } - - return true, string(instanceType) -} - // IsCloudShell determines whether minikube is running inside CloudShell func IsCloudShell() bool { e := os.Getenv("CLOUD_SHELL") diff --git a/test/integration/addons_test.go b/test/integration/addons_test.go index b7d18b7f64..7b85db6b33 100644 --- a/test/integration/addons_test.go +++ b/test/integration/addons_test.go @@ -68,8 +68,6 @@ func TestAddons(t *testing.T) { args := append([]string{"start", "-p", profile, "--wait=true", "--memory=4000", "--alsologtostderr", "--addons=registry", "--addons=metrics-server", "--addons=volumesnapshots", "--addons=csi-hostpath-driver", "--addons=gcp-auth"}, StartArgs()...) if !NoneDriver() { // none driver does not support ingress args = append(args, "--addons=ingress", "--addons=ingress-dns") - } else if isOnAmazonEC2, instanceType := detect.IsOnAmazonEC2(); isOnAmazonEC2 && strings.HasPrefix(instanceType, "f1.") { - args = append(args, "--addons=inaccel") // inaccel supports only none driver } if !arm64Platform() { args = append(args, "--addons=helm-tiller") @@ -97,7 +95,6 @@ func TestAddons(t *testing.T) { {"HelmTiller", validateHelmTillerAddon}, {"Olm", validateOlmAddon}, {"CSI", validateCSIDriverAndSnapshots}, - {"InAccel", validateInAccelAddon}, } for _, tc := range tests { tc := tc @@ -711,40 +708,3 @@ func validateGCPAuthAddon(ctx context.Context, t *testing.T, profile string) { } } } - -// validateInAccelAddon tests the inaccel addon by trying a vadd -func validateInAccelAddon(ctx context.Context, t *testing.T, profile string) { - defer PostMortemLogs(t, profile) - - if !NoneDriver() { - t.Skipf("skipping: inaccel not supported") - } - - if isOnAmazonEC2, instanceType := detect.IsOnAmazonEC2(); !(isOnAmazonEC2 && strings.HasPrefix(instanceType, "f1.")) { - t.Skipf("skipping: not running on an Amazon EC2 f1 instance") - } - - // create sample pod - rr, err := Run(t, exec.CommandContext(ctx, "kubectl", "--context", profile, "create", "--filename", filepath.Join(*testdataDir, "inaccel.yaml"))) - if err != nil { - t.Fatalf("creating pod with %s failed: %v", rr.Command(), err) - } - - if _, err = Run(t, exec.CommandContext(ctx, "kubectl", "--context", profile, "wait", "--for", "condition=ready", "--timeout", "-1s", "pod/inaccel-vadd")); err != nil { - t.Fatalf("failed waiting for inaccel-vadd pod: %v", err) - } - - rr, err = Run(t, exec.CommandContext(ctx, "kubectl", "--context", profile, "logs", "--follow", "pod/inaccel-vadd")) - if err != nil { - t.Fatalf("%q failed: %v", rr.Command(), err) - } - if !strings.Contains(rr.Stdout.String(), "Test PASSED") { - t.Fatalf("expected inaccel-vadd logs to include: %q but got: %s", "Test PASSED", rr.Output()) - } - - // delete pod - rr, err = Run(t, exec.CommandContext(ctx, "kubectl", "--context", profile, "delete", "pod/inaccel-vadd")) - if err != nil { - t.Fatalf("deleting pod with %s failed: %v", rr.Command(), err) - } -} From 28e509dd764bfb672a7302ca5b514b24d3c0f151 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 10 Jun 2022 20:41:07 +0000 Subject: [PATCH 102/545] 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.7.0 to 1.8.1. - [Release notes](https://github.com/GoogleCloudPlatform/opentelemetry-operations-go/releases) - [Commits](https://github.com/GoogleCloudPlatform/opentelemetry-operations-go/compare/exporter/trace/v1.7.0...exporter/trace/v1.8.1) --- 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 | 6 +++--- go.sum | 11 ++++++----- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/go.mod b/go.mod index 6b9cecc61d..0f99ab90ee 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ require ( contrib.go.opencensus.io/exporter/stackdriver v0.13.12 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.7.0 + github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.8.1 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 @@ -112,7 +112,7 @@ require ( 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/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.31.0 // indirect + github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.32.1 // indirect github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd // indirect github.com/Microsoft/go-winio v0.5.2 // indirect github.com/PuerkitoBio/purell v1.1.1 // indirect @@ -209,7 +209,7 @@ require ( github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect go.uber.org/atomic v1.7.0 // indirect - go.uber.org/multierr v1.6.0 // indirect + go.uber.org/multierr v1.8.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-20220607020251-c690dde0001d // indirect diff --git a/go.sum b/go.sum index 66bedd5641..88b8ded755 100644 --- a/go.sum +++ b/go.sum @@ -118,10 +118,10 @@ github.com/Delta456/box-cli-maker/v2 v2.2.2/go.mod h1:idItIMZeyx3bg73XwSgsLeZd+g github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24/go.mod h1:4UJr5HIiMZrwgkSPdsjy2uOQExX/WEILpIrO9UPGuXs= 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.7.0 h1:8vpIORQCKkwM0r/IZ1faAddG56t7byhqSxATphc+8MI= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.7.0/go.mod h1:HuFNmMWVYJDj2IxyIlUOW2vguRBM8ct9mOuAtWRU2EQ= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.31.0 h1:tfaeStvrph8eJEmo1iji3A4DXen3s6ZMM17nQmvo0WA= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.31.0/go.mod h1:j+FS9VBW3mwtHBmm9KOJEy5Tq68fCp7fE/R9bV/flIM= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.8.1 h1:Tn/3pMqRSsI09jFVdGEuMqLIBNOmRHVqKp9DSQg4HPM= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.8.1/go.mod h1:KddM1vG3MS+CRfmoFBqeUIICfd9nS8pLHKtwJ/kt0QQ= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.32.1 h1:SixyMKTOWhEWISdA7PB7vOxkvOP8BIgW5uzbyIf0kXM= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.32.1/go.mod h1:j+FS9VBW3mwtHBmm9KOJEy5Tq68fCp7fE/R9bV/flIM= 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/Masterminds/goutils v1.1.0/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU= @@ -1464,8 +1464,9 @@ go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4= go.uber.org/multierr v1.4.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4= -go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= +go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= +go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM= From 141640219071f65e0515575cd6de03d91576b3e3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 10 Jun 2022 20:41:17 +0000 Subject: [PATCH 103/545] Bump k8s.io/kubectl from 0.24.0 to 0.24.1 Bumps [k8s.io/kubectl](https://github.com/kubernetes/kubectl) from 0.24.0 to 0.24.1. - [Release notes](https://github.com/kubernetes/kubectl/releases) - [Commits](https://github.com/kubernetes/kubectl/compare/v0.24.0...v0.24.1) --- updated-dependencies: - dependency-name: k8s.io/kubectl dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 16 ++++++---------- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/go.mod b/go.mod index 6b9cecc61d..60ae379ece 100644 --- a/go.mod +++ b/go.mod @@ -89,7 +89,7 @@ require ( k8s.io/cluster-bootstrap v0.0.0 k8s.io/component-base v0.24.1 k8s.io/klog/v2 v2.60.1 - k8s.io/kubectl v0.24.0 + k8s.io/kubectl v0.24.1 k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 libvirt.org/go/libvirt v1.8003.0 sigs.k8s.io/sig-storage-lib-external-provisioner/v6 v6.3.0 diff --git a/go.sum b/go.sum index 66bedd5641..c11902eabb 100644 --- a/go.sum +++ b/go.sum @@ -2217,7 +2217,6 @@ k8s.io/api v0.20.1/go.mod h1:KqwcCVogGxQY3nBlRpwt+wpAMF/KjaCc7RpywacvqUo= k8s.io/api v0.20.4/go.mod h1:++lNL1AJMkDymriNniQsWRkMDzRaX2Y/POTUi8yvqYQ= k8s.io/api v0.20.6/go.mod h1:X9e8Qag6JV/bL5G6bU8sdVRltWKmdHsFUGS3eVndqE8= k8s.io/api v0.22.4/go.mod h1:Rgs+9gIGYC5laXQSZZ9JqT5NevNgoGiOdVWi1BAB3qk= -k8s.io/api v0.24.0/go.mod h1:5Jl90IUrJHUJYEMANRURMiVvJ0g7Ax7r3R1bqO8zx8I= k8s.io/api v0.24.1 h1:BjCMRDcyEYz03joa3K1+rbshwh1Ay6oB53+iUx2H8UY= k8s.io/api v0.24.1/go.mod h1:JhoOvNiLXKTPQ60zh2g0ewpA+bnEYf5q44Flhquh4vQ= k8s.io/apimachinery v0.19.1/go.mod h1:DnPGDnARWFvYa3pMHgSxtbZb7gpzzAZ1pTfaUNDVlmA= @@ -2225,30 +2224,27 @@ k8s.io/apimachinery v0.20.1/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRp k8s.io/apimachinery v0.20.4/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU= k8s.io/apimachinery v0.20.6/go.mod h1:ejZXtW1Ra6V1O5H8xPBGz+T3+4gfkTCeExAHKU57MAc= k8s.io/apimachinery v0.22.4/go.mod h1:yU6oA6Gnax9RrxGzVvPFFJ+mpnW6PBSqp0sx0I0HHW0= -k8s.io/apimachinery v0.24.0/go.mod h1:82Bi4sCzVBdpYjyI4jY6aHX+YCUchUIrZrXKedjd2UM= k8s.io/apimachinery v0.24.1 h1:ShD4aDxTQKN5zNf8K1RQ2u98ELLdIW7jEnlO9uAMX/I= k8s.io/apimachinery v0.24.1/go.mod h1:82Bi4sCzVBdpYjyI4jY6aHX+YCUchUIrZrXKedjd2UM= k8s.io/apiserver v0.20.1/go.mod h1:ro5QHeQkgMS7ZGpvf4tSMx6bBOgPfE+f52KwvXfScaU= k8s.io/apiserver v0.20.4/go.mod h1:Mc80thBKOyy7tbvFtB4kJv1kbdD0eIH8k8vianJcbFM= k8s.io/apiserver v0.20.6/go.mod h1:QIJXNt6i6JB+0YQRNcS0hdRHJlMhflFmsBDeSgT1r8Q= -k8s.io/cli-runtime v0.24.0/go.mod h1:9XxoZDsEkRFUThnwqNviqzljtT/LdHtNWvcNFrAXl0A= +k8s.io/cli-runtime v0.24.1/go.mod h1:14aVvCTqkA7dNXY51N/6hRY3GUjchyWDOwW84qmR3bs= k8s.io/client-go v0.19.1/go.mod h1:AZOIVSI9UUtQPeJD3zJFp15CEhSjRgAuQP5PWRJrCIQ= k8s.io/client-go v0.20.1/go.mod h1:/zcHdt1TeWSd5HoUe6elJmHSQ6uLLgp4bIJHVEuy+/Y= k8s.io/client-go v0.20.4/go.mod h1:LiMv25ND1gLUdBeYxBIwKpkSC5IsozMMmOOeSJboP+k= k8s.io/client-go v0.20.6/go.mod h1:nNQMnOvEUEsOzRRFIIkdmYOjAZrC8bgq0ExboWSU1I0= -k8s.io/client-go v0.24.0/go.mod h1:VFPQET+cAFpYxh6Bq6f4xyMY80G6jKKktU6G0m00VDw= k8s.io/client-go v0.24.1 h1:w1hNdI9PFrzu3OlovVeTnf4oHDt+FJLd9Ndluvnb42E= k8s.io/client-go v0.24.1/go.mod h1:f1kIDqcEYmwXS/vTbbhopMUbhKp2JhOeVTfxgaCIlF8= k8s.io/cluster-bootstrap v0.22.4 h1:2ZhV/1K4GiCrnmDHHbBnN3bERWn+Nxrtxmxp6uYYThI= k8s.io/cluster-bootstrap v0.22.4/go.mod h1:fTQZ6u9G6fg2LHhB8nEgZLnXIhCDSRYuLUUS5pgW8RY= -k8s.io/code-generator v0.24.0/go.mod h1:dpVhs00hTuTdTY6jvVxvTFCk6gSMrtfRydbhZwHI15w= +k8s.io/code-generator v0.24.1/go.mod h1:dpVhs00hTuTdTY6jvVxvTFCk6gSMrtfRydbhZwHI15w= k8s.io/component-base v0.20.1/go.mod h1:guxkoJnNoh8LNrbtiQOlyp2Y2XFCZQmrcg2n/DeYNLk= k8s.io/component-base v0.20.4/go.mod h1:t4p9EdiagbVCJKrQ1RsA5/V4rFQNDfRlevJajlGwgjI= k8s.io/component-base v0.20.6/go.mod h1:6f1MPBAeI+mvuts3sIdtpjljHWBQ2cIy38oBIWMYnrM= -k8s.io/component-base v0.24.0/go.mod h1:Dgazgon0i7KYUsS8krG8muGiMVtUZxG037l1MKyXgrA= k8s.io/component-base v0.24.1 h1:APv6W/YmfOWZfo+XJ1mZwep/f7g7Tpwvdbo9CQLDuts= k8s.io/component-base v0.24.1/go.mod h1:DW5vQGYVCog8WYpNob3PMmmsY8A3L9QZNg4j/dV3s38= -k8s.io/component-helpers v0.24.0/go.mod h1:Q2SlLm4h6g6lPTC9GMMfzdywfLSvJT2f1hOnnjaWD8c= +k8s.io/component-helpers v0.24.1/go.mod h1:q5Z1pWV/QfX9ThuNeywxasiwkLw9KsR4Q9TAOdb/Y3s= k8s.io/cri-api v0.17.3/go.mod h1:X1sbHmuXhwaHs9xxYffLqJogVsnI+f6cPRcgPel7ywM= k8s.io/cri-api v0.20.1/go.mod h1:2JRbKt+BFLTjtrILYVqQK5jqhI+XNdF6UiGMgczeBCI= k8s.io/cri-api v0.20.4/go.mod h1:2JRbKt+BFLTjtrILYVqQK5jqhI+XNdF6UiGMgczeBCI= @@ -2269,10 +2265,10 @@ k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e/go.mod h1:vHXdDvt9+2spS2R k8s.io/kube-openapi v0.0.0-20211109043538-20434351676c/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw= k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 h1:Gii5eqf+GmIEwGNKQYQClCayuJCe2/4fZUvF7VG99sU= k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42/go.mod h1:Z/45zLw8lUo4wdiUkI+v/ImEGAvu3WatcZl3lPMR4Rk= -k8s.io/kubectl v0.24.0 h1:nA+WtMLVdXUs4wLogGd1mPTAesnLdBpCVgCmz3I7dXo= -k8s.io/kubectl v0.24.0/go.mod h1:pdXkmCyHiRTqjYfyUJiXtbVNURhv0/Q1TyRhy2d5ic0= +k8s.io/kubectl v0.24.1 h1:gxcjHrnwntV1c+G/BHWVv4Mtk8CQJ0WTraElLBG+ddk= +k8s.io/kubectl v0.24.1/go.mod h1:NzFqQ50B004fHYWOfhHTrAm4TY6oGF5FAAL13LEaeUI= k8s.io/kubernetes v1.13.0/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk= -k8s.io/metrics v0.24.0/go.mod h1:jrLlFGdKl3X+szubOXPG0Lf2aVxuV3QJcbsgVRAM6fI= +k8s.io/metrics v0.24.1/go.mod h1:vMs5xpcOyY9D+/XVwlaw8oUHYCo6JTGBCZfyXOOkAhE= k8s.io/utils v0.0.0-20200729134348-d5654de09c73/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20210802155522-efc7438f0176/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= From e388ecaa6c8e6bec10f79afc698d3c6cbb295f9c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 10 Jun 2022 20:41:30 +0000 Subject: [PATCH 104/545] Bump github.com/docker/docker Bumps [github.com/docker/docker](https://github.com/docker/docker) from 20.10.16+incompatible to 20.10.17+incompatible. - [Release notes](https://github.com/docker/docker/releases) - [Changelog](https://github.com/moby/moby/blob/master/CHANGELOG.md) - [Commits](https://github.com/docker/docker/compare/v20.10.16...v20.10.17) --- updated-dependencies: - dependency-name: github.com/docker/docker 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 6b9cecc61d..989684b2e3 100644 --- a/go.mod +++ b/go.mod @@ -17,7 +17,7 @@ require ( github.com/cenkalti/backoff/v4 v4.1.3 github.com/cheggaaa/pb/v3 v3.0.8 github.com/cloudevents/sdk-go/v2 v2.10.0 - github.com/docker/docker v20.10.16+incompatible + github.com/docker/docker v20.10.17+incompatible github.com/docker/go-units v0.4.0 github.com/docker/machine v0.16.2 github.com/elazarl/goproxy v0.0.0-20210110162100-a92cc753f88e diff --git a/go.sum b/go.sum index 66bedd5641..a5db4dc957 100644 --- a/go.sum +++ b/go.sum @@ -424,8 +424,8 @@ github.com/docker/distribution v2.8.1+incompatible h1:Q50tZOPR6T/hjNsyc9g8/syEs6 github.com/docker/distribution v2.8.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= github.com/docker/docker v17.12.0-ce-rc1.0.20181225093023-5ddb1d410a8b+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker v17.12.0-ce-rc1.0.20190115220918-5ec31380a5d3+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= -github.com/docker/docker v20.10.16+incompatible h1:2Db6ZR/+FUR3hqPMwnogOPHFn405crbpxvWzKovETOQ= -github.com/docker/docker v20.10.16+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v20.10.17+incompatible h1:JYCuMrWaVNophQTOrMMoSwudOVEfcegoZZrleKc1xwE= +github.com/docker/docker v20.10.17+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker-credential-helpers v0.6.4 h1:axCks+yV+2MR3/kZhAmy07yC56WZ2Pwu/fKWtKuZB0o= github.com/docker/docker-credential-helpers v0.6.4/go.mod h1:ofX3UI0Gz1TteYBjtgs07O36Pyasyp66D2uKT7H8W1c= github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ= From a1193736dc720c5f89326e9d7ff42469707c37ee Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Fri, 10 Jun 2022 20:41:49 +0000 Subject: [PATCH 105/545] Update auto-generated docs and translations --- site/content/en/docs/contrib/tests.en.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/site/content/en/docs/contrib/tests.en.md b/site/content/en/docs/contrib/tests.en.md index ddfd5744bc..ab19ee6f6a 100644 --- a/site/content/en/docs/contrib/tests.en.md +++ b/site/content/en/docs/contrib/tests.en.md @@ -42,9 +42,6 @@ tests the csi hostpath driver by creating a persistent volume, snapshotting it a #### validateGCPAuthAddon tests the GCP Auth addon with either phony or real credentials and makes sure the files are mounted into pods correctly -#### validateInAccelAddon -tests the inaccel addon by trying a vadd - ## TestCertOptions makes sure minikube certs respect the --apiserver-ips and --apiserver-names parameters From bc03821826d96ea651b1e193b325ba0dce6d9fba Mon Sep 17 00:00:00 2001 From: Kian-Meng Ang Date: Sat, 29 Jan 2022 08:41:41 +0800 Subject: [PATCH 106/545] Fix typos --- CHANGELOG.md | 30 +++++++++---------- cmd/minikube/cmd/cp.go | 4 +-- cmd/minikube/cmd/start.go | 2 +- cmd/minikube/cmd/status.go | 2 +- cmd/minikube/main.go | 2 +- .../ambassador-operator-crds.yaml.tmpl | 2 +- deploy/addons/olm/crds.yaml.tmpl | 4 +-- ...t.storage.k8s.io_volumesnapshots.yaml.tmpl | 4 +-- .../package/crio-bin-aarch64/crio.conf | 2 +- .../crio-bin-aarch64/crio.conf.default | 2 +- .../public-chart/generate-chart.go | 2 +- hack/jenkins/common.ps1 | 2 +- .../test-flake-chart/compute_flake_rate.go | 2 +- hack/preload-images/generate.go | 2 +- hack/release_notes.sh | 2 +- hack/update/github.go | 4 +-- pkg/drivers/kic/kic.go | 2 +- pkg/drivers/kic/oci/errors.go | 2 +- pkg/drivers/kic/oci/network.go | 2 +- pkg/drivers/kic/oci/network_create.go | 2 +- pkg/drivers/kic/oci/oci.go | 6 ++-- .../bootstrapper/bsutil/kverify/kverify.go | 2 +- pkg/minikube/bootstrapper/kubeadm/kubeadm.go | 4 +-- pkg/minikube/cni/calico.yaml | 2 +- pkg/minikube/command/ssh_runner.go | 2 +- pkg/minikube/config/profile.go | 2 +- pkg/minikube/config/profile_test.go | 2 +- pkg/minikube/constants/constants.go | 2 +- pkg/minikube/cruntime/cri.go | 2 +- pkg/minikube/download/preload.go | 2 +- pkg/minikube/driver/driver.go | 2 +- pkg/minikube/kubeconfig/extension.go | 2 +- pkg/minikube/machine/cache_images.go | 2 +- pkg/minikube/machine/client.go | 2 +- pkg/minikube/machine/delete.go | 2 +- pkg/minikube/machine/fix.go | 2 +- pkg/minikube/machine/stop.go | 2 +- pkg/minikube/node/start.go | 2 +- pkg/minikube/registry/drvs/kvm2/kvm2.go | 4 +-- pkg/minikube/registry/drvs/podman/podman.go | 2 +- pkg/minikube/shell/shell_test.go | 2 +- pkg/trace/trace.go | 2 +- pkg/util/utils_test.go | 2 +- site/README.md | 2 +- .../imageBuild/benchmarkingprocess.md | 8 ++--- .../en/docs/contrib/external-packages.en.md | 2 +- .../content/en/docs/contrib/json_output.en.md | 2 +- site/content/en/docs/contrib/tests.en.md | 2 +- .../en/docs/handbook/troubleshooting.md | 2 +- site/content/en/docs/tutorials/telemetry.md | 2 +- .../en/docs/tutorials/token-auth-file.md | 2 +- site/content/en/docs/tutorials/user_flag.md | 2 +- test/integration/cert_options_test.go | 2 +- test/integration/functional_test.go | 2 +- test/integration/guest_env_test.go | 2 +- test/integration/gvisor_addon_test.go | 2 +- test/integration/multinode_test.go | 4 +-- test/integration/version_upgrade_test.go | 4 +-- 58 files changed, 85 insertions(+), 85 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a400053194..c85acc2bb3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -218,7 +218,7 @@ Check out our [contributions leaderboard](https://minikube.sigs.k8s.io/docs/cont * Resolved regression breaking `minikube start` with hyperkit driver [#13418](https://github.com/kubernetes/minikube/pull/13418) -For a more detailed changelog, including changes occuring in pre-release versions, see [CHANGELOG.md](https://github.com/kubernetes/minikube/blob/master/CHANGELOG.md). +For a more detailed changelog, including changes occurring in pre-release versions, see [CHANGELOG.md](https://github.com/kubernetes/minikube/blob/master/CHANGELOG.md). Thank you to our contributors for this release! @@ -265,7 +265,7 @@ Version Upgrades: Deprecation: * mount: Remove `--mode` flag [#13162](https://github.com/kubernetes/minikube/pull/13162) -For a more detailed changelog, including changes occuring in pre-release versions, see [CHANGELOG.md](https://github.com/kubernetes/minikube/blob/master/CHANGELOG.md). +For a more detailed changelog, including changes occurring in pre-release versions, see [CHANGELOG.md](https://github.com/kubernetes/minikube/blob/master/CHANGELOG.md). Thank you to our contributors for this release! @@ -342,7 +342,7 @@ Bug fixes: * fix zsh completion [#12841](https://github.com/kubernetes/minikube/pull/12841) * Fix starting on Windows with VMware driver on non `C:` drive [#12819](https://github.com/kubernetes/minikube/pull/12819) -For a more detailed changelog, including changes occuring in pre-release versions, see [CHANGELOG.md](https://github.com/kubernetes/minikube/blob/master/CHANGELOG.md). +For a more detailed changelog, including changes occurring in pre-release versions, see [CHANGELOG.md](https://github.com/kubernetes/minikube/blob/master/CHANGELOG.md). Thank you to our contributors for this release! @@ -404,7 +404,7 @@ Version Upgrades: * minikube-ingress-dns: Update image to 0.0.2 [#12730](https://github.com/kubernetes/minikube/pull/12730) * helm-tiller: Update image to v2.17.0 [#12641](https://github.com/kubernetes/minikube/pull/12641) -For a more detailed changelog, including changes occuring in pre-release versions, see [CHANGELOG.md](https://github.com/kubernetes/minikube/blob/master/CHANGELOG.md). +For a more detailed changelog, including changes occurring in pre-release versions, see [CHANGELOG.md](https://github.com/kubernetes/minikube/blob/master/CHANGELOG.md). Thank you to our contributors for this release! @@ -463,7 +463,7 @@ Fix crio regression: * Roll back default crio cgroup to systemd [#12533](https://github.com/kubernetes/minikube/pull/12533) * Fix template typo [#12532](https://github.com/kubernetes/minikube/pull/12532) -For a more detailed changelog, including changes occuring in pre-release versions, see [CHANGELOG.md](https://github.com/kubernetes/minikube/blob/master/CHANGELOG.md). +For a more detailed changelog, including changes occurring in pre-release versions, see [CHANGELOG.md](https://github.com/kubernetes/minikube/blob/master/CHANGELOG.md). Thank you to our contributors for this release! @@ -509,7 +509,7 @@ Version Upgrades: * Bump cri-o from v1.20.0 to 1.22.0 [#12425](https://github.com/kubernetes/minikube/pull/12425) * Bump dashboard from v2.1.0 to v2.3.1 and metrics-scraper from v1.0.4 to v1.0.7 [#12475](https://github.com/kubernetes/minikube/pull/12475) -For a more detailed changelog, including changes occuring in pre-release versions, see [CHANGELOG.md](https://github.com/kubernetes/minikube/blob/master/CHANGELOG.md). +For a more detailed changelog, including changes occurring in pre-release versions, see [CHANGELOG.md](https://github.com/kubernetes/minikube/blob/master/CHANGELOG.md). Thank you to our contributors for this release! @@ -657,7 +657,7 @@ Bugs: Version Upgrades: * bump default kubernetes version to v1.21.2 & newest kubernetes version to v1.22.0-beta.0 [#11901](https://github.com/kubernetes/minikube/pull/11901) -For a more detailed changelog, including changes occuring in pre-release versions, see [CHANGELOG.md](https://github.com/kubernetes/minikube/blob/master/CHANGELOG.md). +For a more detailed changelog, including changes occurring in pre-release versions, see [CHANGELOG.md](https://github.com/kubernetes/minikube/blob/master/CHANGELOG.md). Thank you to our contributors for this release! @@ -702,7 +702,7 @@ Bugs: * Fix embed-certs global config [#11576](https://github.com/kubernetes/minikube/pull/11576) * Fix a download link to use arm64 instead of amd64 [#11653](https://github.com/kubernetes/minikube/pull/11653) * fix downloading duplicate base image [#11690](https://github.com/kubernetes/minikube/pull/11690) -* fix multi-node loosing track of nodes after second restart [#11731](https://github.com/kubernetes/minikube/pull/11731) +* fix multi-node losing track of nodes after second restart [#11731](https://github.com/kubernetes/minikube/pull/11731) * gcp-auth: do not override existing environment variables in pods [#11665](https://github.com/kubernetes/minikube/pull/11665) Minor improvements: @@ -710,7 +710,7 @@ Minor improvements: * Allow running amd64 binary on M1 [#11674](https://github.com/kubernetes/minikube/pull/11674) * improve containerd experience on cgroup v2 [#11632](https://github.com/kubernetes/minikube/pull/11632) * Improve French locale [#11728](https://github.com/kubernetes/minikube/pull/11728) -* Fix UI error for stoppping systemd service [#11667](https://github.com/kubernetes/minikube/pull/11667) +* Fix UI error for stopping systemd service [#11667](https://github.com/kubernetes/minikube/pull/11667) * international languages: allow using LC_ALL env to set local language for windows [#11721](https://github.com/kubernetes/minikube/pull/11721) * Change registery_mirror to registery-mirror [#11678](https://github.com/kubernetes/minikube/pull/11678) @@ -719,7 +719,7 @@ Version Upgrades: * ISO: Upgrade podman to 3.1.2 [#11704](https://github.com/kubernetes/minikube/pull/11704) * Upgrade Buildroot to 2021.02 LTS with Linux 4.19 [#11688](https://github.com/kubernetes/minikube/pull/11688) -For a more detailed changelog, including changes occuring in pre-release versions, see [CHANGELOG.md](https://github.com/kubernetes/minikube/blob/master/CHANGELOG.md). +For a more detailed changelog, including changes occurring in pre-release versions, see [CHANGELOG.md](https://github.com/kubernetes/minikube/blob/master/CHANGELOG.md). Thank you to our contributors for this release! @@ -756,7 +756,7 @@ Thank you to our triage members for this release! * add more polish translations [#11587](https://github.com/kubernetes/minikube/pull/11587) * Modify MetricsServer to use v1 api version (instead of v1beta1). [#11584](https://github.com/kubernetes/minikube/pull/11584) -For a more detailed changelog, including changes occuring in pre-release versions, see [CHANGELOG.md](https://github.com/kubernetes/minikube/blob/master/CHANGELOG.md). +For a more detailed changelog, including changes occurring in pre-release versions, see [CHANGELOG.md](https://github.com/kubernetes/minikube/blob/master/CHANGELOG.md). Thank you to our contributors for this release! @@ -805,7 +805,7 @@ Version Upgrades: * containerd: upgrade `io.containerd.runtime.v1.linux` to `io.containerd.runc.v2` (suppot cgroup v2) [#11325](https://github.com/kubernetes/minikube/pull/11325) * metallb-addon: Update metallb from 0.8.2 to 0.9.6 [#11410](https://github.com/kubernetes/minikube/pull/11410) -For a more detailed changelog, including changes occuring in pre-release versions, see [CHANGELOG.md](https://github.com/kubernetes/minikube/blob/master/CHANGELOG.md). +For a more detailed changelog, including changes occurring in pre-release versions, see [CHANGELOG.md](https://github.com/kubernetes/minikube/blob/master/CHANGELOG.md). Thank you to our contributors for this release! @@ -869,7 +869,7 @@ Version Upgrades: * Update olm addon to v0.17.0 [#10947](https://github.com/kubernetes/minikube/pull/10947) * Update newest supported Kubernetes version to v1.22.0-alpha.1 [#11287](https://github.com/kubernetes/minikube/pull/11287) -For a more detailed changelog, including changes occuring in pre-release versions, see [CHANGELOG.md](https://github.com/kubernetes/minikube/blob/master/CHANGELOG.md). +For a more detailed changelog, including changes occurring in pre-release versions, see [CHANGELOG.md](https://github.com/kubernetes/minikube/blob/master/CHANGELOG.md). Thank you to our contributors for this release! @@ -1237,7 +1237,7 @@ Minor Improvements: Bug Fixes: -* Snap package manger: fix cert copy issue [#10042](https://github.com/kubernetes/minikube/pull/10042) +* Snap package manager: fix cert copy issue [#10042](https://github.com/kubernetes/minikube/pull/10042) * Ignore non-socks5 ALL_PROXY env var when checking docker status [#10109](https://github.com/kubernetes/minikube/pull/10109) * Docker-env: avoid race condition in bootstrap certs for parallel runs [#10118](https://github.com/kubernetes/minikube/pull/10118) * Fix 'profile list' for multi-node clusters [#9955](https://github.com/kubernetes/minikube/pull/9955) @@ -2106,7 +2106,7 @@ Improvements: * Behavior change: start with no arguments uses existing cluster config [#7449](https://github.com/kubernetes/minikube/pull/7449) * conformance: add --wait=all, reduce quirks [#7716](https://github.com/kubernetes/minikube/pull/7716) * Upgrade minimum supported k8s version to v1.12 [#7723](https://github.com/kubernetes/minikube/pull/7723) -* Add default CNI network for running wth podman [#7754](https://github.com/kubernetes/minikube/pull/7754) +* Add default CNI network for running with podman [#7754](https://github.com/kubernetes/minikube/pull/7754) * Behavior change: fallback to alternate drivers on failure [#7389](https://github.com/kubernetes/minikube/pull/7389) * Add registry addon feature for docker on mac/windows [#7603](https://github.com/kubernetes/minikube/pull/7603) * Check node pressure & new option "node_ready" for --wait flag [#7752](https://github.com/kubernetes/minikube/pull/7752) diff --git a/cmd/minikube/cmd/cp.go b/cmd/minikube/cmd/cp.go index d4269d8c9c..012b0f5976 100644 --- a/cmd/minikube/cmd/cp.go +++ b/cmd/minikube/cmd/cp.go @@ -66,7 +66,7 @@ Example Command : "minikube cp a.txt /home/docker/b.txt" + if dst.node != "" { runner = remoteCommandRunner(&co, dst.node) } else if src.node == "" { - // if node name not explicitly specfied in both of source and target, + // if node name not explicitly specified in both of source and target, // consider target is controlpanel node for backward compatibility. runner = co.CP.Runner } else { @@ -158,7 +158,7 @@ func validateArgs(src, dst *remotePath) { exit.Message(reason.Usage, "Target {{.path}} can not be empty", out.V{"path": dst.path}) } - // if node name not explicitly specfied in both of source and target, + // if node name not explicitly specified in both of source and target, // consider target node is controlpanel for backward compatibility. if src.node == "" && dst.node == "" && !strings.HasPrefix(dst.path, "/") { exit.Message(reason.Usage, `Target must be an absolute Path. Relative Path is not allowed (example: "minikube:/home/docker/copied.txt")`) diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go index afee89071a..d34f522975 100644 --- a/cmd/minikube/cmd/start.go +++ b/cmd/minikube/cmd/start.go @@ -1574,7 +1574,7 @@ func validateKubernetesVersion(old *config.ClusterConfig) { zeroVersion := semver.MustParse(strings.TrimPrefix(constants.NoKubernetesVersion, version.VersionPrefix)) if nvs.Equals(zeroVersion) { - klog.Infof("No Kuberentes version set for minikube, setting Kubernetes version to %s", constants.NoKubernetesVersion) + klog.Infof("No Kubernetes version set for minikube, setting Kubernetes version to %s", constants.NoKubernetesVersion) return } if nvs.Major > newestVersion.Major { diff --git a/cmd/minikube/cmd/status.go b/cmd/minikube/cmd/status.go index 67d6ac7242..9e9e1c322c 100644 --- a/cmd/minikube/cmd/status.go +++ b/cmd/minikube/cmd/status.go @@ -293,7 +293,7 @@ func writeStatusesAtInterval(duration time.Duration, api libmachine.API, cc *con } } -// exitCode calcluates the appropriate exit code given a set of status messages +// exitCode calculates the appropriate exit code given a set of status messages func exitCode(statuses []*Status) int { c := 0 for _, st := range statuses { diff --git a/cmd/minikube/main.go b/cmd/minikube/main.go index b7a56d375a..09dbe85f93 100644 --- a/cmd/minikube/main.go +++ b/cmd/minikube/main.go @@ -180,7 +180,7 @@ func logFileName(dir string, logIdx int64) string { // setFlags sets the flags func setFlags(parse bool) { - // parse flags beyond subcommand - get aroung go flag 'limitations': + // parse flags beyond subcommand - get around go flag 'limitations': // "Flag parsing stops just before the first non-flag argument" (ref: https://pkg.go.dev/flag#hdr-Command_line_flag_syntax) pflag.CommandLine.ParseErrorsWhitelist.UnknownFlags = true pflag.CommandLine.AddGoFlagSet(flag.CommandLine) diff --git a/deploy/addons/ambassador/ambassador-operator-crds.yaml.tmpl b/deploy/addons/ambassador/ambassador-operator-crds.yaml.tmpl index b8d52b3b89..b6a0d8a0f4 100644 --- a/deploy/addons/ambassador/ambassador-operator-crds.yaml.tmpl +++ b/deploy/addons/ambassador/ambassador-operator-crds.yaml.tmpl @@ -91,7 +91,7 @@ spec: instead of [AES](https://www.getambassador.io/docs/latest/topics/install/). Default is false which means it installs AES by default. TODO: 1. AES/AOSS is not installed and the user installs using `installOSS: - true`, then we straightaway install AOSS. 2. AOSS is installed via + true`, then we straight away install AOSS. 2. AOSS is installed via operator and the user sets `installOSS: false`, then we perform the migration as detailed here - https://www.getambassador.io/docs/latest/topics/install/upgrade-to-edge-stack/ 3. AES is installed and the user sets `installOSS: true`, then we diff --git a/deploy/addons/olm/crds.yaml.tmpl b/deploy/addons/olm/crds.yaml.tmpl index 44811eb989..6c4a68171d 100644 --- a/deploy/addons/olm/crds.yaml.tmpl +++ b/deploy/addons/olm/crds.yaml.tmpl @@ -3674,7 +3674,7 @@ spec: description: TopologyKey is the key of node labels. Nodes that have a label with this key and identical values are considered to be in the same topology. We consider each as a "bucket", and try to put balanced number of pods into each bucket. It's a required field. type: string whenUnsatisfiable: - description: 'WhenUnsatisfiable indicates how to deal with a pod if it doesn''t satisfy the spread constraint. - DoNotSchedule (default) tells the scheduler not to schedule it. - ScheduleAnyway tells the scheduler to schedule the pod in any location, but giving higher precedence to topologies that would help reduce the skew. A constraint is considered "Unsatisfiable" for an incoming pod if and only if every possible node assigment for that pod would violate "MaxSkew" on some topology. For example, in a 3-zone cluster, MaxSkew is set to 1, and pods with the same labelSelector spread as 3/1/1: | zone1 | zone2 | zone3 | | P P P | P | P | If WhenUnsatisfiable is set to DoNotSchedule, incoming pod can only be scheduled to zone2(zone3) to become 3/2/1(3/1/2) as ActualSkew(2-1) on zone2(zone3) satisfies MaxSkew(1). In other words, the cluster can still be imbalanced, but scheduler won''t make it *more* imbalanced. It''s a required field.' + description: 'WhenUnsatisfiable indicates how to deal with a pod if it doesn''t satisfy the spread constraint. - DoNotSchedule (default) tells the scheduler not to schedule it. - ScheduleAnyway tells the scheduler to schedule the pod in any location, but giving higher precedence to topologies that would help reduce the skew. A constraint is considered "Unsatisfiable" for an incoming pod if and only if every possible node assignment for that pod would violate "MaxSkew" on some topology. For example, in a 3-zone cluster, MaxSkew is set to 1, and pods with the same labelSelector spread as 3/1/1: | zone1 | zone2 | zone3 | | P P P | P | P | If WhenUnsatisfiable is set to DoNotSchedule, incoming pod can only be scheduled to zone2(zone3) to become 3/2/1(3/1/2) as ActualSkew(2-1) on zone2(zone3) satisfies MaxSkew(1). In other words, the cluster can still be imbalanced, but scheduler won''t make it *more* imbalanced. It''s a required field.' type: string x-kubernetes-list-map-keys: - topologyKey @@ -4678,7 +4678,7 @@ spec: nativeAPIs: type: array items: - description: GroupVersionKind unambiguously identifies a kind. It doesn't anonymously include GroupVersion to avoid automatic coersion. It doesn't use a GroupVersion to avoid custom marshalling + description: GroupVersionKind unambiguously identifies a kind. It doesn't anonymously include GroupVersion to avoid automatic coercion. It doesn't use a GroupVersion to avoid custom marshalling type: object required: - group diff --git a/deploy/addons/volumesnapshots/snapshot.storage.k8s.io_volumesnapshots.yaml.tmpl b/deploy/addons/volumesnapshots/snapshot.storage.k8s.io_volumesnapshots.yaml.tmpl index 9153c660e2..9111ecc009 100644 --- a/deploy/addons/volumesnapshots/snapshot.storage.k8s.io_volumesnapshots.yaml.tmpl +++ b/deploy/addons/volumesnapshots/snapshot.storage.k8s.io_volumesnapshots.yaml.tmpl @@ -107,7 +107,7 @@ spec: format: date-time type: string error: - description: error is the last observed error during snapshot creation, if any. This field could be helpful to upper level controllers(i.e., application controller) to decide whether they should continue on waiting for the snapshot to be created based on the type of error reported. The snapshot controller will keep retrying when an error occurrs during the snapshot creation. Upon success, this error field will be cleared. + description: error is the last observed error during snapshot creation, if any. This field could be helpful to upper level controllers(i.e., application controller) to decide whether they should continue on waiting for the snapshot to be created based on the type of error reported. The snapshot controller will keep retrying when an error occurs during the snapshot creation. Upon success, this error field will be cleared. properties: message: description: 'message is a string detailing the encountered error during snapshot creation if specified. NOTE: message may be logged, and it should not contain sensitive information.' @@ -206,7 +206,7 @@ spec: format: date-time type: string error: - description: error is the last observed error during snapshot creation, if any. This field could be helpful to upper level controllers(i.e., application controller) to decide whether they should continue on waiting for the snapshot to be created based on the type of error reported. The snapshot controller will keep retrying when an error occurrs during the snapshot creation. Upon success, this error field will be cleared. + description: error is the last observed error during snapshot creation, if any. This field could be helpful to upper level controllers(i.e., application controller) to decide whether they should continue on waiting for the snapshot to be created based on the type of error reported. The snapshot controller will keep retrying when an error occurs during the snapshot creation. Upon success, this error field will be cleared. properties: message: description: 'message is a string detailing the encountered error during snapshot creation if specified. NOTE: message may be logged, and it should not contain sensitive information.' diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/crio-bin-aarch64/crio.conf b/deploy/iso/minikube-iso/arch/aarch64/package/crio-bin-aarch64/crio.conf index fafaed67bc..110152f9c3 100644 --- a/deploy/iso/minikube-iso/arch/aarch64/package/crio-bin-aarch64/crio.conf +++ b/deploy/iso/minikube-iso/arch/aarch64/package/crio-bin-aarch64/crio.conf @@ -203,7 +203,7 @@ pids_limit = 1024 # limit is never exceeded. log_size_max = -1 -# Whether container output should be logged to journald in addition to the kuberentes log file +# Whether container output should be logged to journald in addition to the kubernetes log file log_to_journald = false # Path to directory in which container exit files are written to by conmon. diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/crio-bin-aarch64/crio.conf.default b/deploy/iso/minikube-iso/arch/aarch64/package/crio-bin-aarch64/crio.conf.default index 25debfab9f..1a8ddfc3a5 100644 --- a/deploy/iso/minikube-iso/arch/aarch64/package/crio-bin-aarch64/crio.conf.default +++ b/deploy/iso/minikube-iso/arch/aarch64/package/crio-bin-aarch64/crio.conf.default @@ -203,7 +203,7 @@ pids_limit = 1024 # limit is never exceeded. log_size_max = -1 -# Whether container output should be logged to journald in addition to the kuberentes log file +# Whether container output should be logged to journald in addition to the kubernetes log file log_to_journald = false # Path to directory in which container exit files are written to by conmon. diff --git a/hack/benchmark/time-to-k8s/public-chart/generate-chart.go b/hack/benchmark/time-to-k8s/public-chart/generate-chart.go index bbaec8a7e9..897783595d 100644 --- a/hack/benchmark/time-to-k8s/public-chart/generate-chart.go +++ b/hack/benchmark/time-to-k8s/public-chart/generate-chart.go @@ -250,7 +250,7 @@ func createWeeklyChart(benchmarks []benchmark, chartOutputPath string) { if i == len(benchmarks) { break } - // try running this benchmark again, this is needed incase there's a week without any benchmarks + // try running this benchmark again, this is needed in case there's a week without any benchmarks i-- continue } diff --git a/hack/jenkins/common.ps1 b/hack/jenkins/common.ps1 index dc8418a6ae..668886f40d 100644 --- a/hack/jenkins/common.ps1 +++ b/hack/jenkins/common.ps1 @@ -118,7 +118,7 @@ echo $description #Upload logs to gcs If($env:EXTERNAL -eq "yes"){ # If we're not already in GCP, we won't have credentials to upload to GCS - # Instad, move logs to a predictable spot Jenkins can find and upload itself + # Instead, move logs to a predictable spot Jenkins can find and upload itself mkdir -p test_reports cp testout.txt test_reports/out.txt cp testout.json test_reports/out.json diff --git a/hack/jenkins/test-flake-chart/compute_flake_rate.go b/hack/jenkins/test-flake-chart/compute_flake_rate.go index 1ab72a2ecb..03142cef2b 100644 --- a/hack/jenkins/test-flake-chart/compute_flake_rate.go +++ b/hack/jenkins/test-flake-chart/compute_flake_rate.go @@ -105,7 +105,7 @@ func readData(file io.Reader) []testEntry { } } if len(fields) != 9 { - fmt.Printf("Found line with wrong number of columns. Expectd 9, but got %d - skipping\n", len(fields)) + fmt.Printf("Found line with wrong number of columns. Expected 9, but got %d - skipping\n", len(fields)) continue } previousLine = fields diff --git a/hack/preload-images/generate.go b/hack/preload-images/generate.go index b5947b35e4..0744d3fa1f 100644 --- a/hack/preload-images/generate.go +++ b/hack/preload-images/generate.go @@ -87,7 +87,7 @@ func generateTarball(kubernetesVersion, containerRuntime, tarballFilename string Type: containerRuntime, Runner: runner, ImageRepository: "", - KubernetesVersion: sv, // this is just to satisfy cruntime and shouldnt matter what version. + KubernetesVersion: sv, // this is just to satisfy cruntime and shouldn't matter what version. } cr, err := cruntime.New(co) if err != nil { diff --git a/hack/release_notes.sh b/hack/release_notes.sh index 9e85e8499f..ade4ed16f5 100755 --- a/hack/release_notes.sh +++ b/hack/release_notes.sh @@ -41,7 +41,7 @@ recent_date=$(git log -1 --format=%as $recent) "${DIR}/release-notes" kubernetes minikube --since $recent echo "" -echo "For a more detailed changelog, including changes occuring in pre-release versions, see [CHANGELOG.md](https://github.com/kubernetes/minikube/blob/master/CHANGELOG.md)." +echo "For a more detailed changelog, including changes occurring in pre-release versions, see [CHANGELOG.md](https://github.com/kubernetes/minikube/blob/master/CHANGELOG.md)." echo "" echo "Thank you to our contributors for this release!" diff --git a/hack/update/github.go b/hack/update/github.go index d2ed8221f1..b49bca56ac 100644 --- a/hack/update/github.go +++ b/hack/update/github.go @@ -131,7 +131,7 @@ func ghCreatePR(ctx context.Context, owner, repo, base, branch, title string, is klog.Fatalf("Unable to parse schema: %v\n%s", err, pretty) } modifiable := true - pr, _, err := ghc.PullRequests.Create(ctx, owner, repo, &github.NewPullRequest{ + pr, _, err := ghc.pull requests.Create(ctx, owner, repo, &github.NewPullRequest{ Title: github.String(title), Head: github.String(*fork.Owner.Login + ":" + prBranch), Base: github.String(base), @@ -144,7 +144,7 @@ func ghCreatePR(ctx context.Context, owner, repo, base, branch, title string, is return pr, nil } -// ghFindPR returns URL of the PR if found in the given GitHub ower/repo base and any error occurred. +// ghFindPR returns URL of the PR if found in the given GitHub owner/repo base and any error occurred. func ghFindPR(ctx context.Context, title, owner, repo, base, token string) (url string, err error) { ghc := ghClient(ctx, token) diff --git a/pkg/drivers/kic/kic.go b/pkg/drivers/kic/kic.go index 8c71743277..7ea6739868 100644 --- a/pkg/drivers/kic/kic.go +++ b/pkg/drivers/kic/kic.go @@ -343,7 +343,7 @@ func (d *Driver) Kill() error { klog.Warningf("couldn't shutdown the container, will continue with kill anyways: %v", err) } - cr := command.NewExecRunner(false) // using exec runner for interacting with dameon. + cr := command.NewExecRunner(false) // using exec runner for interacting with daemon. if _, err := cr.RunCmd(oci.PrefixCmd(exec.Command(d.NodeConfig.OCIBinary, "kill", d.MachineName))); err != nil { return errors.Wrapf(err, "killing %q", d.MachineName) } diff --git a/pkg/drivers/kic/oci/errors.go b/pkg/drivers/kic/oci/errors.go index 832500b53e..a1967ca1b2 100644 --- a/pkg/drivers/kic/oci/errors.go +++ b/pkg/drivers/kic/oci/errors.go @@ -63,7 +63,7 @@ var ErrNetworkSubnetTaken = errors.New("subnet is taken") // ErrNetworkNotFound is when given network was not found var ErrNetworkNotFound = errors.New("kic network not found") -// ErrNetworkGatewayTaken is when given network gatway is taken +// ErrNetworkGatewayTaken is when given network gateway is taken var ErrNetworkGatewayTaken = errors.New("network gateway is taken") // ErrNetworkInUse is when trying to delete a network which is attached to another container diff --git a/pkg/drivers/kic/oci/network.go b/pkg/drivers/kic/oci/network.go index da73ff26ad..8486fa6989 100644 --- a/pkg/drivers/kic/oci/network.go +++ b/pkg/drivers/kic/oci/network.go @@ -66,7 +66,7 @@ func RoutableHostIPFromInside(ociBin string, clusterName string, containerName s info, err := containerNetworkInspect(ociBin, clusterName) if err != nil { if errors.Is(err, ErrNetworkNotFound) { - klog.Infof("The container %s is not attached to a network, this could be because the cluster was created by minikube /dev/null ``` -For instance after running `minikube start`, the above comamnd will show: +For instance after running `minikube start`, the above command will show: `-rw-r--r-- 1 user grp 718 Aug 18 12:40 /var/folders/n1/qxvd9kc/T//minikube_start_dc950831e1a232e0318a6d6ca82aaf4f4a8a048b_0.log` diff --git a/site/content/en/docs/tutorials/telemetry.md b/site/content/en/docs/tutorials/telemetry.md index b3dc9ab3a3..29de8455f5 100644 --- a/site/content/en/docs/tutorials/telemetry.md +++ b/site/content/en/docs/tutorials/telemetry.md @@ -7,7 +7,7 @@ date: 2020-11-24 ## Overview -minikube provides telemetry suppport via [OpenTelemetry tracing](https://opentelemetry.io/about/) to collect trace data for `minikube start`. +minikube provides telemetry support via [OpenTelemetry tracing](https://opentelemetry.io/about/) to collect trace data for `minikube start`. Currently, minikube supports the following exporters for tracing data: diff --git a/site/content/en/docs/tutorials/token-auth-file.md b/site/content/en/docs/tutorials/token-auth-file.md index e1d105093e..4b3cf7485e 100644 --- a/site/content/en/docs/tutorials/token-auth-file.md +++ b/site/content/en/docs/tutorials/token-auth-file.md @@ -9,7 +9,7 @@ description: > ## Overview -A [static token file](https://kubernetes.io/docs/reference/access-authn-authz/authentication/#static-token-file) can be used to ensure only authenticated users access the API server. As minikube nodes are run in VMs/containers, this adds a complication to ensuring this token file is accessable to the node. This tutorial explains how to configure a static token file. +A [static token file](https://kubernetes.io/docs/reference/access-authn-authz/authentication/#static-token-file) can be used to ensure only authenticated users access the API server. As minikube nodes are run in VMs/containers, this adds a complication to ensuring this token file is accessible to the node. This tutorial explains how to configure a static token file. ## Tutorial diff --git a/site/content/en/docs/tutorials/user_flag.md b/site/content/en/docs/tutorials/user_flag.md index 55e8ee4752..c0bf2846e5 100644 --- a/site/content/en/docs/tutorials/user_flag.md +++ b/site/content/en/docs/tutorials/user_flag.md @@ -46,7 +46,7 @@ Here you can see that passing `--user=mary` overwrote the OS user with `mary` as ## How do I use minikube in a script? -If you are using minikube in a script or plugin it is recommeneded to add `--user=your_script_name` to all operations. +If you are using minikube in a script or plugin it is recommended to add `--user=your_script_name` to all operations. Example: ``` diff --git a/test/integration/cert_options_test.go b/test/integration/cert_options_test.go index 8dd842dad4..101b5c01d3 100644 --- a/test/integration/cert_options_test.go +++ b/test/integration/cert_options_test.go @@ -103,7 +103,7 @@ func TestCertOptions(t *testing.T) { } if !strings.Contains(rr.Stdout.String(), "8555") { - t.Errorf("Internal minikube kubeconfig (admin.conf) does not containe the right api port. %s", rr.Output()) + t.Errorf("Internal minikube kubeconfig (admin.conf) does not contains the right api port. %s", rr.Output()) } } diff --git a/test/integration/functional_test.go b/test/integration/functional_test.go index a3109b1b70..cbe2d7614c 100644 --- a/test/integration/functional_test.go +++ b/test/integration/functional_test.go @@ -94,7 +94,7 @@ func TestFunctional(t *testing.T) { {"CopySyncFile", setupFileSync}, // Set file for the file sync test case {"StartWithProxy", validateStartWithProxy}, // Set everything else up for success {"AuditLog", validateAuditAfterStart}, // check audit feature works - {"SoftStart", validateSoftStart}, // do a soft start. ensure config didnt change. + {"SoftStart", validateSoftStart}, // do a soft start. ensure config didn't change. {"KubeContext", validateKubeContext}, // Racy: must come immediately after "minikube start" {"KubectlGetPods", validateKubectlGetPods}, // Make sure apiserver is up {"CacheCmd", validateCacheCmd}, // Caches images needed for subsequent tests because of proxy diff --git a/test/integration/guest_env_test.go b/test/integration/guest_env_test.go index 6791ce4895..34f4c13d6b 100644 --- a/test/integration/guest_env_test.go +++ b/test/integration/guest_env_test.go @@ -27,7 +27,7 @@ import ( "k8s.io/minikube/pkg/minikube/vmpath" ) -// TestGuestEnvironment verifies files and packges installed inside minikube ISO/Base image +// TestGuestEnvironment verifies files and packages installed inside minikube ISO/Base image func TestGuestEnvironment(t *testing.T) { MaybeParallel(t) diff --git a/test/integration/gvisor_addon_test.go b/test/integration/gvisor_addon_test.go index c07f7f9729..28893de9ed 100644 --- a/test/integration/gvisor_addon_test.go +++ b/test/integration/gvisor_addon_test.go @@ -90,7 +90,7 @@ func TestGvisorAddon(t *testing.T) { // Ensure that workloads survive a restart rr, err = Run(t, exec.CommandContext(ctx, Target(), "stop", "-p", profile)) if err != nil { - t.Fatalf("faild stopping minikube. args %q : %v", rr.Command(), err) + t.Fatalf("failed stopping minikube. args %q : %v", rr.Command(), err) } rr, err = Run(t, exec.CommandContext(ctx, Target(), startArgs...)) diff --git a/test/integration/multinode_test.go b/test/integration/multinode_test.go index 6079278dd4..d4dbd7e1dc 100644 --- a/test/integration/multinode_test.go +++ b/test/integration/multinode_test.go @@ -444,7 +444,7 @@ func validateNameConflict(ctx context.Context, t *testing.T, profile string) { } curNodeNum := strings.Count(rr.Stdout.String(), profile) - // Start new profile. It's expected failture + // Start new profile. It's expected failure profileName := fmt.Sprintf("%s-m0%d", profile, curNodeNum) startArgs := append([]string{"start", "-p", profileName}, StartArgs()...) rr, err = Run(t, exec.CommandContext(ctx, Target(), startArgs...)) @@ -460,7 +460,7 @@ func validateNameConflict(ctx context.Context, t *testing.T, profile string) { t.Errorf("failed to start profile. args %q : %v", rr.Command(), err) } - // Add a node to the current cluster. It's expected failture + // Add a node to the current cluster. It's expected failure addArgs := []string{"node", "add", "-p", profile} rr, err = Run(t, exec.CommandContext(ctx, Target(), addArgs...)) if err == nil { diff --git a/test/integration/version_upgrade_test.go b/test/integration/version_upgrade_test.go index 7e3b7d4aa7..8187f58411 100644 --- a/test/integration/version_upgrade_test.go +++ b/test/integration/version_upgrade_test.go @@ -108,7 +108,7 @@ func TestRunningBinaryUpgrade(t *testing.T) { c := exec.CommandContext(ctx, tf.Name(), args...) var legacyEnv []string // replace the global KUBECONFIG with a fresh kubeconfig - // because for minikube<1.17.0 it can not read the new kubeconfigs that have extra "Extenions" block + // because for minikube<1.17.0 it can not read the new kubeconfigs that have extra "Extensions" block // see: https://github.com/kubernetes/minikube/issues/10210 for _, e := range os.Environ() { if !strings.Contains(e, "KUBECONFIG") { // get all global envs except the Kubeconfig which is used by new versions of minikubes @@ -171,7 +171,7 @@ func TestStoppedBinaryUpgrade(t *testing.T) { c := exec.CommandContext(ctx, tf.Name(), args...) var legacyEnv []string // replace the global KUBECONFIG with a fresh kubeconfig - // because for minikube<1.17.0 it can not read the new kubeconfigs that have extra "Extenions" block + // because for minikube<1.17.0 it can not read the new kubeconfigs that have extra "Extensions" block // see: https://github.com/kubernetes/minikube/issues/10210 for _, e := range os.Environ() { if !strings.Contains(e, "KUBECONFIG") { // get all global envs except the Kubeconfig which is used by new versions of minikubes From cfa620c26ebf1e7ba8b82dbb53535e717d405127 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Fri, 10 Jun 2022 15:36:18 -0700 Subject: [PATCH 107/545] run make generate-docs --- hack/update/github.go | 2 +- translations/de.json | 1 - translations/es.json | 2 +- translations/fr.json | 1 + translations/ja.json | 1 + translations/ko.json | 2 +- translations/pl.json | 1 + translations/ru.json | 2 +- translations/strings.txt | 2 +- translations/zh-CN.json | 2 +- 10 files changed, 9 insertions(+), 7 deletions(-) diff --git a/hack/update/github.go b/hack/update/github.go index b49bca56ac..0456485444 100644 --- a/hack/update/github.go +++ b/hack/update/github.go @@ -131,7 +131,7 @@ func ghCreatePR(ctx context.Context, owner, repo, base, branch, title string, is klog.Fatalf("Unable to parse schema: %v\n%s", err, pretty) } modifiable := true - pr, _, err := ghc.pull requests.Create(ctx, owner, repo, &github.NewPullRequest{ + pr, _, err := ghc.PullRequests.Create(ctx, owner, repo, &github.NewPullRequest{ Title: github.String(title), Head: github.String(*fork.Owner.Login + ":" + prBranch), Base: github.String(base), diff --git a/translations/de.json b/translations/de.json index f8079cfff9..704f9e5506 100644 --- a/translations/de.json +++ b/translations/de.json @@ -467,7 +467,6 @@ "Please enter a value:": "Bitte geben Sie einen Wert ein:", "Please free up disk or prune images.": "Bitte geben Sie Plattenplatz frei oder löschen Sie unbenutzte Images (prune)", "Please increase Desktop's disk size.": "Bitte erhöhen Sie die Plattengröße von Desktop", - "Please increse Desktop's disk size.": "", "Please install the minikube hyperkit VM driver, or select an alternative --driver": "Bitte installieren Sie den minikube hyperkit VM Treiber oder geben Sie einen alternativen Treiber mit --driver an", "Please install the minikube kvm2 VM driver, or select an alternative --driver": "Bitte installieren Sie den minikube kvm2 VM Treiber oder geben Sie einen alternativen Treiber mit --driver an", "Please make sure the service you are looking for is deployed or is in the correct namespace.": "Bitte stellen Sie sicher, dass der gesuchte Service deployed ist oder im korrekten Namespace ist.", diff --git a/translations/es.json b/translations/es.json index 49a9e40b67..1d857ae00a 100644 --- a/translations/es.json +++ b/translations/es.json @@ -474,7 +474,7 @@ "Please either authenticate to the registry or use --base-image flag to use a different registry.": "", "Please enter a value:": "", "Please free up disk or prune images.": "", - "Please increse Desktop's disk size.": "", + "Please increase Desktop's disk size.": "", "Please install the minikube hyperkit VM driver, or select an alternative --driver": "", "Please install the minikube kvm2 VM driver, or select an alternative --driver": "", "Please make sure the service you are looking for is deployed or is in the correct namespace.": "", diff --git a/translations/fr.json b/translations/fr.json index 605ed5f438..11ab7332f3 100644 --- a/translations/fr.json +++ b/translations/fr.json @@ -454,6 +454,7 @@ "Please either authenticate to the registry or use --base-image flag to use a different registry.": "Veuillez vous authentifier auprès du registre ou utiliser l'indicateur --base-image pour utiliser un registre différent.", "Please enter a value:": "Entrer un nombre, SVP:", "Please free up disk or prune images.": "Veuillez libérer le disque ou élaguer les images.", + "Please increase Desktop's disk size.": "", "Please increse Desktop's disk size.": "Veuillez augmenter la taille du disque du bureau.", "Please install the minikube hyperkit VM driver, or select an alternative --driver": "Veuillez installer le pilote minikube hyperkit VM, ou sélectionnez un --driver alternatif", "Please install the minikube kvm2 VM driver, or select an alternative --driver": "Veuillez installer le pilote minikube kvm2 VM, ou sélectionnez un --driver alternatif", diff --git a/translations/ja.json b/translations/ja.json index 9fb0045d1d..8b63e0745a 100644 --- a/translations/ja.json +++ b/translations/ja.json @@ -464,6 +464,7 @@ "Please either authenticate to the registry or use --base-image flag to use a different registry.": "レジストリーに認証するか、--base-image フラグで別のレジストリーを指定するかどちらを行ってください。", "Please enter a value:": "値を入力してください:", "Please free up disk or prune images.": "ディスクを解放するか、イメージを削除してください。", + "Please increase Desktop's disk size.": "", "Please increse Desktop's disk size.": "Desktop のディスクサイズを増やしてください。", "Please install the minikube hyperkit VM driver, or select an alternative --driver": "minikube hyperkit VM ドライバーをインストールするか、--driver で別のドライバーを選択してください", "Please install the minikube kvm2 VM driver, or select an alternative --driver": "minikube kvm2 VM ドライバーをインストールするか、--driver で別のドライバーを選択してください", diff --git a/translations/ko.json b/translations/ko.json index 6d553b11d5..e694d3e36d 100644 --- a/translations/ko.json +++ b/translations/ko.json @@ -489,7 +489,7 @@ "Please either authenticate to the registry or use --base-image flag to use a different registry.": "", "Please enter a value:": "값을 입력하세요", "Please free up disk or prune images.": "", - "Please increse Desktop's disk size.": "", + "Please increase Desktop's disk size.": "", "Please install the minikube hyperkit VM driver, or select an alternative --driver": "", "Please install the minikube kvm2 VM driver, or select an alternative --driver": "", "Please make sure the service you are looking for is deployed or is in the correct namespace.": "", diff --git a/translations/pl.json b/translations/pl.json index 6f70148964..f38c679044 100644 --- a/translations/pl.json +++ b/translations/pl.json @@ -484,6 +484,7 @@ "Please either authenticate to the registry or use --base-image flag to use a different registry.": "Uwierzytelnij się w rejestrze lub użyć flagi --base-image w celu użycia innego rejestru.", "Please enter a value:": "Wprowadź wartość", "Please free up disk or prune images.": "Zwolnij miejsce na dysku lub usuń niepotrzebne obrazy", + "Please increase Desktop's disk size.": "", "Please increse Desktop's disk size.": "Zwiększ miejsce na dysku dla programu Docker Desktop", "Please install the minikube hyperkit VM driver, or select an alternative --driver": "Zainstaluj sterownik hyperkit lub wybierz inny sterownik używając flagi --driver", "Please install the minikube kvm2 VM driver, or select an alternative --driver": "Zainstaluj sterownik kvm2 lub wybierz inny sterownik używając flagi --driver", diff --git a/translations/ru.json b/translations/ru.json index bbb156f5a3..248fd40769 100644 --- a/translations/ru.json +++ b/translations/ru.json @@ -439,7 +439,7 @@ "Please either authenticate to the registry or use --base-image flag to use a different registry.": "", "Please enter a value:": "", "Please free up disk or prune images.": "", - "Please increse Desktop's disk size.": "", + "Please increase Desktop's disk size.": "", "Please install the minikube hyperkit VM driver, or select an alternative --driver": "", "Please install the minikube kvm2 VM driver, or select an alternative --driver": "", "Please make sure the service you are looking for is deployed or is in the correct namespace.": "", diff --git a/translations/strings.txt b/translations/strings.txt index f1d330ecc4..235cf74840 100644 --- a/translations/strings.txt +++ b/translations/strings.txt @@ -439,7 +439,7 @@ "Please either authenticate to the registry or use --base-image flag to use a different registry.": "", "Please enter a value:": "", "Please free up disk or prune images.": "", - "Please increse Desktop's disk size.": "", + "Please increase Desktop's disk size.": "", "Please install the minikube hyperkit VM driver, or select an alternative --driver": "", "Please install the minikube kvm2 VM driver, or select an alternative --driver": "", "Please make sure the service you are looking for is deployed or is in the correct namespace.": "", diff --git a/translations/zh-CN.json b/translations/zh-CN.json index dc7e7f1c87..6d994db135 100644 --- a/translations/zh-CN.json +++ b/translations/zh-CN.json @@ -557,7 +557,7 @@ "Please either authenticate to the registry or use --base-image flag to use a different registry.": "", "Please enter a value:": "请输入一个值：", "Please free up disk or prune images.": "", - "Please increse Desktop's disk size.": "", + "Please increase Desktop's disk size.": "", "Please install the minikube hyperkit VM driver, or select an alternative --driver": "", "Please install the minikube kvm2 VM driver, or select an alternative --driver": "", "Please make sure the service you are looking for is deployed or is in the correct namespace.": "", From ee65efc891b147e9bbb292bd0ab8f54349d2ba00 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Fri, 10 Jun 2022 16:02:40 -0700 Subject: [PATCH 108/545] Fix typo in the documentation of virtualbox CIDR --- site/content/en/docs/drivers/virtualbox.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/content/en/docs/drivers/virtualbox.md b/site/content/en/docs/drivers/virtualbox.md index 0e84f58c60..8247c76c34 100644 --- a/site/content/en/docs/drivers/virtualbox.md +++ b/site/content/en/docs/drivers/virtualbox.md @@ -16,7 +16,7 @@ VirtualBox is minikube's original driver. It may not provide the fastest start-u minikube start supports some VirtualBox specific flags: * **`--host-only-cidr`**: The CIDR to be used for the minikube VM (default "192.168.59.1/24") - * On Linux, Mac OS X and Oracle Solaris with VirtualBox >= 6.1.28, [only IP addresses in the 192.68.56.0/21 range are allowed for host-only networking by default](https://www.virtualbox.org/manual/ch06.html#network_hostonly). Passing a disallowed value to `--host-only-cidr` will result in a VirtualBox access denied error: `VBoxManage: error: Code E_ACCESSDENIED (0x80070005) - Access denied (extended info not available)`. + * On Linux, Mac OS X and Oracle Solaris with VirtualBox >= 6.1.28, [only IP addresses in the 192.168.56.0/21 range are allowed for host-only networking by default](https://www.virtualbox.org/manual/ch06.html#network_hostonly). Passing a disallowed value to `--host-only-cidr` will result in a VirtualBox access denied error: `VBoxManage: error: Code E_ACCESSDENIED (0x80070005) - Access denied (extended info not available)`. * **`--no-vtx-check`**: Disable checking for the availability of hardware virtualization ## Issues From 887084a2cce65af4dd7e00a7c6d5ef9bbaef10d2 Mon Sep 17 00:00:00 2001 From: Leonardo Grasso Date: Mon, 13 Jun 2022 10:08:07 +0200 Subject: [PATCH 109/545] Upgrade Falco to 0.32.0 Signed-off-by: Leonardo Grasso --- .../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 e39ff22cb3..8f19663e33 100644 --- a/deploy/iso/minikube-iso/package/falco-module/falco-module.hash +++ b/deploy/iso/minikube-iso/package/falco-module/falco-module.hash @@ -9,6 +9,7 @@ sha256 1fa9c05e461817aa2542efa3b5e28e51a6caf02935dfc9d47271af79d5414947 0.28.0.t sha256 9d90a86752a700dad2d1ea888b2cd33cdc808621faa2b6300bb0463d404744fb 0.30.0.tar.gz sha256 0c7d88bfa2ec8e17e6e27158fabfb1d05982ede3138138b44a0f3ac6ffba5545 0.31.0.tar.gz sha256 207b875c5b24717ecc9a5c288ff8df703d5d2a9ad00533f798d530e758f8ae42 0.31.1.tar.gz +sha256 d31f6aa19e4312e04fa7d13e6b1d7b3945582a7f3f1a3d27ae7b90a13df2e790 0.32.0.tar.gz # sysdig sha256 6e477ac5fe9d3110b870bd4495f01541373a008c375a1934a2d1c46798b6bad6 146a431edf95829ac11bfd9c85ba3ef08789bffe.tar.gz @@ -16,6 +17,8 @@ sha256 1c69363e4c36cdaeed413c2ef557af53bfc4bf1109fbcb6d6e18dc40fe6ddec8 be1ea2d9 sha256 766e8952a36a4198fd976b9d848523e6abe4336612188e4fc911e217d8e8a00d 96bd9bc560f67742738eb7255aeb4d03046b8045.tar.gz sha256 6c3f5f2d699c9540e281f50cbc5cb6b580f0fc689798bc65d4a77f57f932a71c 85c88952b018fdbce2464222c3303229f5bfcfad.tar.gz sha256 9de717b3a4b611ea6df56afee05171860167112f74bb7717b394bcc88ac843cd 5c0b863ddade7a45568c0ac97d037422c9efb750.tar.gz + # falcosecurity/libs sha256 2cf44f06a282e8cee7aa1f775a08ea94c06e275faaf0636b21eb06af28cf4b3f 319368f1ad778691164d33d59945e00c5752cd27.tar.gz sha256 0f6dcdc3b94243c91294698ee343806539af81c5b33c60c6acf83fc1aa455e85 b7eb0dd65226a8dc254d228c8d950d07bf3521d2.tar.gz +sha256 b9034baeff4518b044574956f5768fac080c269bacad4a1e17a7f6fdb872ce66 39ae7d40496793cf3d3e7890c9bbdc202263836b.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 5e7a4460f0..01f7324ed5 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.1 +FALCO_MODULE_VERSION = 0.32.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/falcosecurity-libs.cmake -FALCO_MODULE_FALCOSECURITY_LIBS_VERSION = b7eb0dd65226a8dc254d228c8d950d07bf3521d2 +FALCO_MODULE_FALCOSECURITY_LIBS_VERSION = 39ae7d40496793cf3d3e7890c9bbdc202263836b FALCO_MODULE_EXTRA_DOWNLOADS = https://github.com/falcosecurity/libs/archive/$(FALCO_MODULE_FALCOSECURITY_LIBS_VERSION).tar.gz define FALCO_MODULE_FALCOSECURITY_LIBS_SRC From 61c26a23cd20eba1edd09a775da0bb0b9002fa2d Mon Sep 17 00:00:00 2001 From: Leonardo Grasso Date: Mon, 13 Jun 2022 10:09:29 +0200 Subject: [PATCH 110/545] Falco does not depend anymore on ncurses See https://github.com/falcosecurity/falco/pull/1552/commits/2ba0132450cb69f54b81b296f98fa29c31e165ef Signed-off-by: Leonardo Grasso --- deploy/iso/minikube-iso/package/falco-module/falco-module.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 01f7324ed5..6328d2d060 100644 --- a/deploy/iso/minikube-iso/package/falco-module/falco-module.mk +++ b/deploy/iso/minikube-iso/package/falco-module/falco-module.mk @@ -7,7 +7,7 @@ FALCO_MODULE_VERSION = 0.32.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_DEPENDENCIES += libyaml FALCO_MODULE_LICENSE = Apache-2.0 FALCO_MODULE_LICENSE_FILES = COPYING From 65a31719efd369ec5bba4b9ae459bb187467f135 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 13 Jun 2022 09:02:11 +0000 Subject: [PATCH 111/545] 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/sync-minikube.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-gopogh-version.yml | 2 +- .github/workflows/update-gotestsum-version.yml | 2 +- .github/workflows/update-k8s-versions.yml | 2 +- .github/workflows/update-kubadm-constants.yml | 2 +- Makefile | 2 +- hack/jenkins/common.ps1 | 2 +- hack/jenkins/installers/check_install_golang.sh | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7a31c07d1c..9b56461286 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.2' + GO_VERSION: '1.18.3' permissions: contents: read diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 0d56edbb23..85d3d6a898 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.2' + GO_VERSION: '1.18.3' permissions: contents: read diff --git a/.github/workflows/functional_verified.yml b/.github/workflows/functional_verified.yml index e21d8d94e7..b815a531c7 100644 --- a/.github/workflows/functional_verified.yml +++ b/.github/workflows/functional_verified.yml @@ -22,7 +22,7 @@ on: - deleted env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.18.2' + GO_VERSION: '1.18.3' permissions: contents: read diff --git a/.github/workflows/leaderboard.yml b/.github/workflows/leaderboard.yml index eecd48cbf9..2c7652583b 100644 --- a/.github/workflows/leaderboard.yml +++ b/.github/workflows/leaderboard.yml @@ -8,7 +8,7 @@ on: types: [published] env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.18.2' + GO_VERSION: '1.18.3' permissions: contents: read diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 7e81b9ec64..97ebe97cbe 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.2' + GO_VERSION: '1.18.3' permissions: contents: read diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index bb4a07b173..4c38b5aeb7 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.2' + GO_VERSION: '1.18.3' permissions: contents: read diff --git a/.github/workflows/sync-minikube.yml b/.github/workflows/sync-minikube.yml index c5c217bf73..2487c5231d 100644 --- a/.github/workflows/sync-minikube.yml +++ b/.github/workflows/sync-minikube.yml @@ -6,7 +6,7 @@ on: - cron: "0 2,14 * * *" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.18.2' + GO_VERSION: '1.18.3' permissions: contents: read diff --git a/.github/workflows/time-to-k8s-public-chart.yml b/.github/workflows/time-to-k8s-public-chart.yml index 6d7677678a..6947cf76db 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.2' + GO_VERSION: '1.18.3' permissions: contents: read diff --git a/.github/workflows/time-to-k8s.yml b/.github/workflows/time-to-k8s.yml index c5c9db24ac..e50ebea6ab 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.2' + GO_VERSION: '1.18.3' permissions: contents: read diff --git a/.github/workflows/translations.yml b/.github/workflows/translations.yml index 8b8d8b5535..4fd24629f7 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.2' + GO_VERSION: '1.18.3' permissions: contents: read diff --git a/.github/workflows/update-golang-version.yml b/.github/workflows/update-golang-version.yml index 4ea73ce9b4..14108420e0 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.2' + GO_VERSION: '1.18.3' permissions: contents: read diff --git a/.github/workflows/update-golint-version.yml b/.github/workflows/update-golint-version.yml index 70b60b34ea..54a43fe690 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.2' + GO_VERSION: '1.18.3' permissions: contents: read diff --git a/.github/workflows/update-gopogh-version.yml b/.github/workflows/update-gopogh-version.yml index 6246e92075..154412e028 100644 --- a/.github/workflows/update-gopogh-version.yml +++ b/.github/workflows/update-gopogh-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 9 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.18.2' + GO_VERSION: '1.18.3' permissions: contents: read diff --git a/.github/workflows/update-gotestsum-version.yml b/.github/workflows/update-gotestsum-version.yml index e0051808be..f2bfd7dd0d 100644 --- a/.github/workflows/update-gotestsum-version.yml +++ b/.github/workflows/update-gotestsum-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.18.2' + GO_VERSION: '1.18.3' permissions: contents: read diff --git a/.github/workflows/update-k8s-versions.yml b/.github/workflows/update-k8s-versions.yml index ce117d2739..26d7162285 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.2' + GO_VERSION: '1.18.3' permissions: contents: read diff --git a/.github/workflows/update-kubadm-constants.yml b/.github/workflows/update-kubadm-constants.yml index 7ebada292c..f2b4bd8c77 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.2' + GO_VERSION: '1.18.3' permissions: contents: read diff --git a/Makefile b/Makefile index 24bf8a3842..f540fefbe0 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.2 +GO_VERSION ?= 1.18.3 # update this only by running `make update-golang-version` GO_K8S_VERSION_PREFIX ?= v1.25.0 diff --git a/hack/jenkins/common.ps1 b/hack/jenkins/common.ps1 index 668886f40d..d45042338d 100644 --- a/hack/jenkins/common.ps1 +++ b/hack/jenkins/common.ps1 @@ -30,7 +30,7 @@ function Write-GithubStatus { $env:SHORT_COMMIT=$env:COMMIT.substring(0, 7) $gcs_bucket="minikube-builds/logs/$env:MINIKUBE_LOCATION/$env:ROOT_JOB_ID" $env:MINIKUBE_SUPPRESS_DOCKER_PERFORMANCE="true" -$GoVersion = "1.18.2" +$GoVersion = "1.18.3" # Docker's kubectl breaks things, and comes earlier in the path than the regular kubectl. So download the expected kubectl and replace Docker's version. $KubeVersion = (Invoke-WebRequest -Uri 'https://storage.googleapis.com/kubernetes-release/release/stable.txt' -UseBasicParsing).Content diff --git a/hack/jenkins/installers/check_install_golang.sh b/hack/jenkins/installers/check_install_golang.sh index a07bb7ab4d..fc18399a49 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.2 +VERSION_TO_INSTALL=1.18.3 INSTALL_PATH=${1} function current_arch() { From aa1d3054128275a13075a4b4bbe17ec4422a89f6 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Thu, 9 Jun 2022 16:30:24 -0700 Subject: [PATCH 112/545] add script to update cri-docker --- Makefile | 3 +- .../cri_dockerd/update_cri_dockerd_version.go | 83 ++++++++ hack/update/github.go | 188 +----------------- .../golang_version/update_golang_version.go | 34 +--- .../golint_version/update_golint_version.go | 26 +-- .../gopogh_version/update_gopogh_version.go | 21 +- .../update_gotestsum_version.go | 21 +- .../kicbase_version/update_kicbase_version.go | 19 +- .../update_kubeadm_constants.go | 6 +- .../update_kubernetes_version.go | 27 +-- .../preload_version/update_preload_version.go | 24 +-- hack/update/update.go | 67 +------ 12 files changed, 128 insertions(+), 391 deletions(-) create mode 100644 hack/update/cri_dockerd/update_cri_dockerd_version.go diff --git a/Makefile b/Makefile index 24bf8a3842..f498307a3b 100644 --- a/Makefile +++ b/Makefile @@ -706,7 +706,8 @@ KICBASE_IMAGE_REGISTRIES ?= $(KICBASE_IMAGE_GCR) $(KICBASE_IMAGE_HUB) CRI_DOCKERD_VERSION ?= $(shell egrep "CRI_DOCKERD_VERSION=" deploy/kicbase/Dockerfile | cut -d \" -f2) .PHONY: update-cri-dockerd update-cri-dockerd: - hack/update/cri_dockerd/update_cri_dockerd.sh $(CRI_DOCKERD_VERSION) $(KICBASE_ARCH) + (cd hack/update/cri_dockerd && \ + go run update_cri_dockerd_version.go $(CRI_DOCKERD_VERSION) $(KICBASE_ARCH)) .PHONY: local-kicbase local-kicbase: ## Builds the kicbase image and tags it local/kicbase:latest and local/kicbase:$(KIC_VERSION)-$(COMMIT_SHORT) diff --git a/hack/update/cri_dockerd/update_cri_dockerd_version.go b/hack/update/cri_dockerd/update_cri_dockerd_version.go new file mode 100644 index 0000000000..a8ea5fc9c4 --- /dev/null +++ b/hack/update/cri_dockerd/update_cri_dockerd_version.go @@ -0,0 +1,83 @@ +/* +Copyright 2022 The Kubernetes Authors All rights reserved. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package main + +import ( + "fmt" + "log" + "os" + "os/exec" + + "k8s.io/minikube/hack/update" +) + +var ( + schema = map[string]update.Item{ + ".github/workflows/master.yml": { + Replace: map[string]string{ + `CRI_DOCKER_VERSION=".*"`: `CRI_DOCKER_VERSION="{{.FullCommit}}"`, + }, + }, + ".github/workflows/pr.yml": { + Replace: map[string]string{ + `CRI_DOCKER_VERSION=".*"`: `CRI_DOCKER_VERSION="{{.FullCommit}}"`, + }, + }, + "hack/jenkins/linux_integration_tests_none.sh": { + Replace: map[string]string{ + `CRI_DOCKER_VERSION=".*"`: `CRI_DOCKER_VERSION="{{.FullCommit}}"`, + }, + }, + "deploy/iso/minikube-iso/arch/aarch64/package/cri-dockerd-aarch64/cri-dockerd.mk": { + Replace: map[string]string{ + `CRI_DOCKERD_AARCH64_VERSION = .*`: `CRI_DOCKERD_AARCH64_VERSION = {{.FullCommit}}`, + `CRI_DOCKERD_AARCH64_REV = .*`: `CRI_DOCKERD_AARCH64_REV = {{.ShortCommit}}`, + }, + }, + "deploy/iso/minikube-iso/arch/x86_64/package/cri-dockerd/cri-dockerd.mk": { + Replace: map[string]string{ + `CRI_DOCKERD_VERSION = .*`: `CRI_DOCKERD_VERSION = {{.FullCommit}}`, + `CRI_DOCKERD_REV = .*`: `CRI_DOCKERD_REV = {{.ShortCommit}}`, + }, + }, + } +) + +// Data holds stable gotestsum version in semver format. +type Data struct { + FullCommit string + ShortCommit string +} + +func main() { + if len(os.Args) < 3 { + log.Fatalf("Usage: update_cri_dockerd_version.go ") + } + + commit := os.Args[1] + archs := os.Args[2] + + data := Data{FullCommit: commit, ShortCommit: commit[:7]} + + update.Apply(schema, data) + + if out, err := exec.Command("./update_cri_dockerd.sh", commit, archs).CombinedOutput(); err != nil { + log.Fatalf("failed to build and upload cri-docker binaries: %s", string(out)) + } + + fmt.Println("Don't forget you still need to update the hash files!") +} diff --git a/hack/update/github.go b/hack/update/github.go index 0456485444..8486497a39 100644 --- a/hack/update/github.go +++ b/hack/update/github.go @@ -18,16 +18,11 @@ package update import ( "context" - "fmt" - "os" "strings" - "time" "golang.org/x/mod/semver" - "golang.org/x/oauth2" "github.com/google/go-github/v43/github" - "k8s.io/klog/v2" ) const ( @@ -39,179 +34,10 @@ const ( ghSearchLimit = 300 ) -var ( - // GitHub repo data - ghToken = os.Getenv("GITHUB_TOKEN") - ghOwner = "kubernetes" - ghRepo = "minikube" - ghBase = "master" // could be "main" in the near future? -) - -// ghCreatePR returns PR created in the GitHub owner/repo, applying the changes to the base head commit fork, as defined by the schema and data. -// Returns any error occurred. -// PR branch will be named by the branch, sufixed by '_' and first 7 characters of the fork commit SHA. -// PR itself will be named by the title and will reference the issue. -func ghCreatePR(ctx context.Context, owner, repo, base, branch, title string, issue int, token string, schema map[string]Item, data interface{}) (*github.PullRequest, error) { - ghc := ghClient(ctx, token) - - // get base branch - baseBranch, _, err := ghc.Repositories.GetBranch(ctx, owner, repo, base, true) - if err != nil { - return nil, fmt.Errorf("unable to get base branch: %w", err) - } - - // get base commit - baseCommit, _, err := ghc.Repositories.GetCommit(ctx, owner, repo, *baseBranch.Commit.SHA, &github.ListOptions{PerPage: ghListPerPage}) - if err != nil { - return nil, fmt.Errorf("unable to get base commit: %w", err) - } - - // get base tree - baseTree, _, err := ghc.Git.GetTree(ctx, owner, repo, baseCommit.GetSHA(), true) - if err != nil { - return nil, fmt.Errorf("unable to get base tree: %w", err) - } - - // update files - changes, err := ghUpdate(ctx, owner, repo, token, schema, data) - if err != nil { - return nil, fmt.Errorf("unable to update files: %w", err) - } - if changes == nil { - return nil, nil - } - - // create fork - fork, resp, err := ghc.Repositories.CreateFork(ctx, owner, repo, nil) - // "This method might return an *AcceptedError and a status code of 202. - // This is because this is the status that GitHub returns to signify that it is now computing creating the fork in a background task. - // In this event, the Repository value will be returned, which includes the details about the pending fork. - // A follow up request, after a delay of a second or so, should result in a successful request." - // (ref: https://pkg.go.dev/github.com/google/go-github/v32@v32.1.0/github#RepositoriesService.CreateFork) - if resp.StatusCode == 202 { // *AcceptedError - time.Sleep(time.Second * 5) - } else if err != nil { - return nil, fmt.Errorf("unable to create fork: %w", err) - } - - // create fork tree from base and changed files - forkTree, _, err := ghc.Git.CreateTree(ctx, *fork.Owner.Login, *fork.Name, *baseTree.SHA, changes) - if err != nil { - return nil, fmt.Errorf("unable to create fork tree: %w", err) - } - - // create fork commit - forkCommit, _, err := ghc.Git.CreateCommit(ctx, *fork.Owner.Login, *fork.Name, &github.Commit{ - Message: github.String(title), - Tree: &github.Tree{SHA: forkTree.SHA}, - Parents: []*github.Commit{{SHA: baseCommit.SHA}}, - }) - if err != nil { - return nil, fmt.Errorf("unable to create fork commit: %w", err) - } - klog.Infof("PR commit '%s' successfully created: %s", forkCommit.GetSHA(), forkCommit.GetHTMLURL()) - - // create PR branch - prBranch := branch + forkCommit.GetSHA()[:7] - prRef, _, err := ghc.Git.CreateRef(ctx, *fork.Owner.Login, *fork.Name, &github.Reference{ - Ref: github.String("refs/heads/" + prBranch), - Object: &github.GitObject{ - Type: github.String("commit"), - SHA: forkCommit.SHA, - }, - }) - if err != nil { - return nil, fmt.Errorf("unable to create PR branch: %w", err) - } - klog.Infof("PR branch '%s' successfully created: %s", prBranch, prRef.GetURL()) - - // create PR - _, pretty, err := GetPlan(schema, data) - if err != nil { - klog.Fatalf("Unable to parse schema: %v\n%s", err, pretty) - } - modifiable := true - pr, _, err := ghc.PullRequests.Create(ctx, owner, repo, &github.NewPullRequest{ - Title: github.String(title), - Head: github.String(*fork.Owner.Login + ":" + prBranch), - Base: github.String(base), - Body: github.String(fmt.Sprintf("fixes: #%d\n\nAutomatically created PR to update repo according to the Plan:\n\n```\n%s\n```", issue, pretty)), - MaintainerCanModify: &modifiable, - }) - if err != nil { - return nil, fmt.Errorf("unable to create PR: %w", err) - } - return pr, nil -} - -// ghFindPR returns URL of the PR if found in the given GitHub owner/repo base and any error occurred. -func ghFindPR(ctx context.Context, title, owner, repo, base, token string) (url string, err error) { - ghc := ghClient(ctx, token) - - // walk through the paginated list of up to ghSearchLimit newest pull requests - opts := &github.PullRequestListOptions{State: "all", Base: base, ListOptions: github.ListOptions{PerPage: ghListPerPage}} - for (opts.Page+1)*ghListPerPage <= ghSearchLimit { - prs, resp, err := ghc.PullRequests.List(ctx, owner, repo, opts) - if err != nil { - return "", err - } - for _, pr := range prs { - if pr.GetTitle() == title { - return pr.GetHTMLURL(), nil - } - } - if resp.NextPage == 0 { - break - } - opts.Page = resp.NextPage - } - return "", nil -} - -// ghUpdate updates remote GitHub owner/repo tree according to the given token, schema and data. -// Returns resulting changes, and any error occurred. -func ghUpdate(ctx context.Context, owner, repo string, token string, schema map[string]Item, data interface{}) (changes []*github.TreeEntry, err error) { - ghc := ghClient(ctx, token) - - // load each schema item content and update it creating new GitHub TreeEntries - for path, item := range schema { - // if the item's content is already set, give it precedence over any current file content - var content string - if item.Content == nil { - file, _, _, err := ghc.Repositories.GetContents(ctx, owner, repo, path, &github.RepositoryContentGetOptions{Ref: ghBase}) - if err != nil { - return nil, fmt.Errorf("unable to get file content: %w", err) - } - content, err = file.GetContent() - if err != nil { - return nil, fmt.Errorf("unable to read file content: %w", err) - } - item.Content = []byte(content) - } - if err := item.apply(data); err != nil { - return nil, fmt.Errorf("unable to update file: %w", err) - } - if content != string(item.Content) { - // add github.TreeEntry that will replace original path content with the updated one or add new if one doesn't exist already - // ref: https://developer.github.com/v3/git/trees/#tree-object - rcPath := path // make sure to copy path variable as its reference (not value!) is passed to changes - rcMode := "100644" - rcType := "blob" - changes = append(changes, &github.TreeEntry{ - Path: &rcPath, - Mode: &rcMode, - Type: &rcType, - Content: github.String(string(item.Content)), - }) - } - } - return changes, nil -} - // GHReleases returns greatest current stable release and greatest latest rc or beta pre-release from GitHub owner/repo repository, and any error occurred. // If latest pre-release version is lower than the current stable release, then it will return current stable release for both. func GHReleases(ctx context.Context, owner, repo string) (stable, latest, edge string, err error) { - ghc := ghClient(ctx, ghToken) + ghc := github.NewClient(nil) // walk through the paginated list of up to ghSearchLimit newest releases opts := &github.ListOptions{PerPage: ghListPerPage} @@ -253,15 +79,3 @@ func GHReleases(ctx context.Context, owner, repo string) (stable, latest, edge s } return stable, latest, edge, nil } - -// ghClient returns GitHub Client with a given context and optional token for authenticated requests. -func ghClient(ctx context.Context, token string) *github.Client { - if token == "" { - return github.NewClient(nil) - } - ts := oauth2.StaticTokenSource( - &oauth2.Token{AccessToken: token}, - ) - tc := oauth2.NewClient(ctx, ts) - return github.NewClient(tc) -} diff --git a/hack/update/golang_version/update_golang_version.go b/hack/update/golang_version/update_golang_version.go index ca27d838a4..c315cc40ec 100644 --- a/hack/update/golang_version/update_golang_version.go +++ b/hack/update/golang_version/update_golang_version.go @@ -14,35 +14,18 @@ See the License for the specific language governing permissions and limitations under the License. */ -/* -Script expects the following env variables: - - UPDATE_TARGET=: optional - if unset/absent, default option is "fs"; valid options are: - - "fs" - update only local filesystem repo files [default] - - "gh" - update only remote GitHub repo files and create PR (if one does not exist already) - - "all" - update local and remote repo files and create PR (if one does not exist already) - - GITHUB_TOKEN=: GitHub [personal] access token - - note: GITHUB_TOKEN is required if UPDATE_TARGET is "gh" or "all" -*/ - package main import ( - "context" "io" "net/http" "strings" - "time" "k8s.io/klog/v2" "k8s.io/minikube/hack/update" ) -const ( - // default context timeout - cxTimeout = 300 * time.Second -) - var ( schema = map[string]update.Item{ ".github/workflows/build.yml": { @@ -148,26 +131,17 @@ var ( }, }, } - - // PR data - prBranchPrefix = "update-golang-version_" // will be appended with first 7 characters of the PR commit SHA - prTitle = `update_golang_version: {stable: "{{.StableVersion}}"}` - prIssue = 9264 ) // Data holds stable Golang version - in full and in . format type Data struct { - StableVersion string `json:"stableVersion"` - StableVersionMM string `json:"stableVersionMM"` // go.mod wants go version in . format - K8SVersion string `json:"k8sVersion"` // as of v1.23.0 Kubernetes uses k8s version in golang image name because: https://github.com/kubernetes/kubernetes/pull/103692#issuecomment-908659826 + StableVersion string + StableVersionMM string // go.mod wants go version in . format + K8SVersion string // as of v1.23.0 Kubernetes uses k8s version in golang image name because: https://github.com/kubernetes/kubernetes/pull/103692#issuecomment-908659826 } func main() { - // set a context with defined timeout - ctx, cancel := context.WithTimeout(context.Background(), cxTimeout) - defer cancel() - // get Golang stable version stable, stableMM, k8sVersion, err := goVersions() if err != nil || stable == "" || stableMM == "" { @@ -181,7 +155,7 @@ func main() { data := Data{StableVersion: stable, StableVersionMM: stableMM, K8SVersion: k8sVersion} klog.Infof("Golang stable version: %s", data.StableVersion) - update.Apply(ctx, schema, data, prBranchPrefix, prTitle, prIssue) + update.Apply(schema, data) } // goVersion returns Golang stable version. diff --git a/hack/update/golint_version/update_golint_version.go b/hack/update/golint_version/update_golint_version.go index 3b09135e8b..5c8d38a043 100644 --- a/hack/update/golint_version/update_golint_version.go +++ b/hack/update/golint_version/update_golint_version.go @@ -14,16 +14,6 @@ See the License for the specific language governing permissions and limitations under the License. */ -/* -Script expects the following env variables: - - UPDATE_TARGET=: optional - if unset/absent, default option is "fs"; valid options are: - - "fs" - update only local filesystem repo files [default] - - "gh" - update only remote GitHub repo files and create PR (if one does not exist already) - - "all" - update local and remote repo files and create PR (if one does not exist already) - - GITHUB_TOKEN=: GitHub [personal] access token - - note: GITHUB_TOKEN is required if UPDATE_TARGET is "gh" or "all" -*/ - package main import ( @@ -38,7 +28,7 @@ import ( const ( // default context timeout - cxTimeout = 300 * time.Second + cxTimeout = 5 * time.Minute ) var ( @@ -49,15 +39,11 @@ var ( }, }, } - - // PR data - prBranchPrefix = "update-golint-version_" // will be appended with first 7 characters of the PR commit SHA - prTitle = `update go lint version: {stable: "{{.StableVersion}}"}` ) // Data holds stable gopogh version in semver format. type Data struct { - StableVersion string `json:"stableVersion"` + StableVersion string } func main() { @@ -65,15 +51,15 @@ func main() { ctx, cancel := context.WithTimeout(context.Background(), cxTimeout) defer cancel() - // get Golang stable version + // get Golint stable version stable, err := golintVersion(ctx, "golangci", "golangci-lint") if err != nil { - klog.Fatalf("Unable to get Golang stable version: %v", err) + klog.Fatalf("Unable to get Golint stable version: %v", err) } data := Data{StableVersion: stable} - klog.Infof("Golang stable version: %s", data.StableVersion) + klog.Infof("Golint stable version: %s", data.StableVersion) - update.Apply(ctx, schema, data, prBranchPrefix, prTitle, 12247) + update.Apply(schema, data) } // diff --git a/hack/update/gopogh_version/update_gopogh_version.go b/hack/update/gopogh_version/update_gopogh_version.go index c99c987919..56cc5dcacb 100644 --- a/hack/update/gopogh_version/update_gopogh_version.go +++ b/hack/update/gopogh_version/update_gopogh_version.go @@ -14,16 +14,6 @@ See the License for the specific language governing permissions and limitations under the License. */ -/* -Script expects the following env variables: - - UPDATE_TARGET=: optional - if unset/absent, default option is "fs"; valid options are: - - "fs" - update only local filesystem repo files [default] - - "gh" - update only remote GitHub repo files and create PR (if one does not exist already) - - "all" - update local and remote repo files and create PR (if one does not exist already) - - GITHUB_TOKEN=: GitHub [personal] access token - - note: GITHUB_TOKEN is required if UPDATE_TARGET is "gh" or "all" -*/ - package main import ( @@ -38,7 +28,7 @@ import ( const ( // default context timeout - cxTimeout = 300 * time.Second + cxTimeout = 5 * time.Minute ) var ( @@ -69,16 +59,11 @@ var ( }, }, } - - // PR data - prBranchPrefix = "update-gopogh-version_" // will be appended with first 7 characters of the PR commit SHA - prTitle = `update_gopogh_version: {stable: "{{.StableVersion}}"}` - prIssue = 9850 ) // Data holds stable gopogh version in semver format. type Data struct { - StableVersion string `json:"stableVersion"` + StableVersion string } func main() { @@ -94,7 +79,7 @@ func main() { data := Data{StableVersion: stable} klog.Infof("gopogh stable version: %s", data.StableVersion) - update.Apply(ctx, schema, data, prBranchPrefix, prTitle, prIssue) + update.Apply(schema, data) } // gopoghVersion returns gopogh stable version in semver format. diff --git a/hack/update/gotestsum_version/update_gotestsum_version.go b/hack/update/gotestsum_version/update_gotestsum_version.go index 8e00573a4a..3d5db2df52 100644 --- a/hack/update/gotestsum_version/update_gotestsum_version.go +++ b/hack/update/gotestsum_version/update_gotestsum_version.go @@ -14,16 +14,6 @@ See the License for the specific language governing permissions and limitations under the License. */ -/* -Script expects the following env variables: - - UPDATE_TARGET=: optional - if unset/absent, default option is "fs"; valid options are: - - "fs" - update only local filesystem repo files [default] - - "gh" - update only remote GitHub repo files and create PR (if one does not exist already) - - "all" - update local and remote repo files and create PR (if one does not exist already) - - GITHUB_TOKEN=: GitHub [personal] access token - - note: GITHUB_TOKEN is required if UPDATE_TARGET is "gh" or "all" -*/ - package main import ( @@ -39,7 +29,7 @@ import ( const ( // default context timeout - cxTimeout = 300 * time.Second + cxTimeout = 5 * time.Minute ) var ( @@ -55,16 +45,11 @@ var ( }, }, } - - // PR data - prBranchPrefix = "update-gotestsum-version_" // will be appended with first 7 characters of the PR commit SHA - prTitle = `update_gotestsum_version: {stable: "{{.StableVersion}}"}` - prIssue = 14224 ) // Data holds stable gotestsum version in semver format. type Data struct { - StableVersion string `json:"stableVersion"` + StableVersion string } func main() { @@ -80,7 +65,7 @@ func main() { data := Data{StableVersion: strings.TrimPrefix(stable, "v")} klog.Infof("gotestsum stable version: %s", data.StableVersion) - update.Apply(ctx, schema, data, prBranchPrefix, prTitle, prIssue) + update.Apply(schema, data) } // gotestsumVersion returns gotestsum stable version in semver format. diff --git a/hack/update/kicbase_version/update_kicbase_version.go b/hack/update/kicbase_version/update_kicbase_version.go index 6649de54b2..9d0b2a3ba2 100644 --- a/hack/update/kicbase_version/update_kicbase_version.go +++ b/hack/update/kicbase_version/update_kicbase_version.go @@ -22,12 +22,6 @@ Script promotes current KIC base image as stable, ie: - tags current KIC base image with the release version, and - pushes it to all relevant container registries -Script expects the following env variables: - - UPDATE_TARGET=: optional - if unset/absent, default option is "fs"; valid options are: - - "fs" - update only local filesystem repo files [default] - - "gh" - update only remote GitHub repo files and create PR (if one does not exist already) - - "all" - update local and remote repo files and create PR (if one does not exist already) - Script also requires following credentials as env variables (injected by Jenkins credential provider): @GCR (ref: https://cloud.google.com/container-registry/docs/advanced-authentication): - GCR_USERNAME=: GCR username, eg: @@ -61,7 +55,7 @@ import ( const ( // default context timeout - cxTimeout = 600 * time.Second + cxTimeout = 10 * time.Minute ) var ( @@ -75,17 +69,12 @@ var ( }, }, } - - // PR data - prBranchPrefix = "update-kicbase-version_" // will be appended with first 7 characters of the PR commit SHA - prTitle = `update-kicbase-version: {stable: "{{.StableVersion}}"}` - prIssue = 9420 ) // Data holds current and stable KIC base image versions type Data struct { - CurrentVersion string `json:"CurrentVersion"` - StableVersion string `json:"StableVersion"` + CurrentVersion string + StableVersion string } func main() { @@ -116,7 +105,7 @@ func main() { klog.Fatalf("Unable to update any registry") } - update.Apply(ctx, schema, data, prBranchPrefix, prTitle, prIssue) + update.Apply(schema, data) } // KICVersions returns current and stable KIC base image versions and any error occurred. diff --git a/hack/update/kubeadm_constants/update_kubeadm_constants.go b/hack/update/kubeadm_constants/update_kubeadm_constants.go index 22b58fc50f..1827098ddd 100644 --- a/hack/update/kubeadm_constants/update_kubeadm_constants.go +++ b/hack/update/kubeadm_constants/update_kubeadm_constants.go @@ -38,7 +38,7 @@ import ( const ( // default context timeout - cxTimeout = 300 * time.Second + cxTimeout = 5 * time.Minute kubeadmReleaseURL = "https://storage.googleapis.com/kubernetes-release/release/%s/bin/linux/amd64/kubeadm" kubeadmBinaryName = "kubeadm-linux-amd64-%s" minikubeConstantsFilePath = "pkg/minikube/constants/constants_kubeadm_images.go" @@ -53,7 +53,7 @@ const ( // Data contains kubeadm Images map type Data struct { - ImageMap string `json:"ImageMap"` + ImageMap string } func main() { @@ -102,7 +102,7 @@ func main() { schema[minikubeConstantsFilePath].Replace[versionIdentifier] = "{{.ImageMap}}" } - update.Apply(ctx, schema, data, "", "", -1) + update.Apply(schema, data) } } diff --git a/hack/update/kubernetes_version/update_kubernetes_version.go b/hack/update/kubernetes_version/update_kubernetes_version.go index 7c67524603..8f9da69b8e 100644 --- a/hack/update/kubernetes_version/update_kubernetes_version.go +++ b/hack/update/kubernetes_version/update_kubernetes_version.go @@ -14,16 +14,6 @@ See the License for the specific language governing permissions and limitations under the License. */ -/* -Script expects the following env variables: - - UPDATE_TARGET=: optional - if unset/absent, default option is "fs"; valid options are: - - "fs" - update only local filesystem repo files [default] - - "gh" - update only remote GitHub repo files and create PR (if one does not exist already) - - "all" - update local and remote repo files and create PR (if one does not exist already) - - GITHUB_TOKEN=: GitHub [personal] access token - - note: GITHUB_TOKEN is required if UPDATE_TARGET is "gh" or "all" -*/ - package main import ( @@ -39,7 +29,7 @@ import ( const ( // default context timeout - cxTimeout = 300 * time.Second + cxTimeout = 5 * time.Minute ) var ( @@ -111,20 +101,15 @@ var ( }, }, } - - // PR data - prBranchPrefix = "update-kubernetes-version_" // will be appended with first 7 characters of the PR commit SHA - prTitle = `update_kubernetes_version: {stable: "{{.StableVersion}}", latest: "{{.LatestVersion}}"}` - prIssue = 4392 ) // Data holds greatest current stable release and greatest latest rc or beta pre-release Kubernetes versions type Data struct { - StableVersion string `json:"StableVersion"` - LatestVersion string `json:"LatestVersion"` - LatestVersionMM string `json:"LatestVersionMM"` // LatestVersion in . format + StableVersion string + LatestVersion string + LatestVersionMM string // LatestVersion in . format // for testdata: if StableVersion greater than 'LatestVersionMM.0' exists, LatestVersionP0 is 'LatestVersionMM.0', otherwise LatestVersionP0 is LatestVersion. - LatestVersionP0 string `json:"LatestVersionP0"` + LatestVersionP0 string } func main() { @@ -142,7 +127,7 @@ func main() { // Print PR title for GitHub action. fmt.Printf("Bump Kubernetes version default: %s and latest: %s\n", data.StableVersion, data.LatestVersion) - update.Apply(ctx, schema, data, prBranchPrefix, prTitle, prIssue) + update.Apply(schema, data) } // k8sVersion returns Kubernetes versions. diff --git a/hack/update/preload_version/update_preload_version.go b/hack/update/preload_version/update_preload_version.go index 2867a74a91..659c302c3a 100644 --- a/hack/update/preload_version/update_preload_version.go +++ b/hack/update/preload_version/update_preload_version.go @@ -14,26 +14,14 @@ See the License for the specific language governing permissions and limitations under the License. */ -/* -Script expects the following env variables: - - UPDATE_TARGET=: optional - if unset/absent, default option is "fs"; valid options are: - - "fs" - update only local filesystem repo files [default] - - "gh" - update only remote GitHub repo files and create PR (if one does not exist already) - - "all" - update local and remote repo files and create PR (if one does not exist already) - - GITHUB_TOKEN=: GitHub [personal] access token - - note: GITHUB_TOKEN is required if UPDATE_TARGET is "gh" or "all" -*/ - package main import ( - "context" "fmt" "os" "path/filepath" "regexp" "strconv" - "time" "k8s.io/klog/v2" "k8s.io/minikube/hack/update" @@ -52,22 +40,14 @@ var ( }, }, } - - // prBranchPrefix is the PR branch prefix; will be appended with the first 7 characters of the PR commit SHA. - prBranchPrefix = "update-preload-version_" - prTitle = `update preload version: {update: "{{.UpdateVersion}}"}` ) // Data holds updated preload version. type Data struct { - UpdateVersion string `json:"updateVersion"` + UpdateVersion string } func main() { - const cxTimeout = 300 * time.Second - ctx, cancel := context.WithTimeout(context.Background(), cxTimeout) - defer cancel() - // Get current preload version. vCurrent, err := getPreloadVersion() if err != nil { @@ -84,7 +64,7 @@ func main() { data := Data{UpdateVersion: fmt.Sprint(updatedVersion)} klog.Infof("updated preload version: %s", data.UpdateVersion) - update.Apply(ctx, schema, data, prBranchPrefix, prTitle, -1) + update.Apply(schema, data) } // getPreloadVersion returns current preload version and any error. diff --git a/hack/update/update.go b/hack/update/update.go index 10c088ed95..ff903d8d74 100644 --- a/hack/update/update.go +++ b/hack/update/update.go @@ -14,16 +14,6 @@ See the License for the specific language governing permissions and limitations under the License. */ -/* -Script expects the following env variables: - - UPDATE_TARGET=: optional - if unset/absent, default option is "fs"; valid options are: - - "fs" - update only local filesystem repo files [default] - - "gh" - update only remote GitHub repo files and create PR (if one does not exist already) - - "all" - update local and remote repo files and create PR (if one does not exist already) - - GITHUB_TOKEN=: GitHub [personal] access token - - note: GITHUB_TOKEN is required if UPDATE_TARGET is "gh" or "all" -*/ - package update import ( @@ -67,14 +57,6 @@ func init() { flag.String("kubernetes-version", "latest", "kubernetes-version") flag.Parse() defer klog.Flush() - - if target == "" { - target = "fs" - } else if target != "fs" && target != "gh" && target != "all" { - klog.Fatalf("Invalid UPDATE_TARGET option: '%s'; Valid options are: unset/absent (defaults to 'fs'), 'fs', 'gh', or 'all'", target) - } else if (target == "gh" || target == "all") && ghToken == "" { - klog.Fatalf("GITHUB_TOKEN is required if UPDATE_TARGET is 'gh' or 'all'") - } } // Item defines Content where all occurrences of each Replace map key, @@ -82,8 +64,8 @@ func init() { // would be swapped with its respective actual map value (having placeholders replaced with data), creating a concrete update plan. // Replace map keys can use RegExp and map values can use Golang Text Template. type Item struct { - Content []byte `json:"-"` - Replace map[string]string `json:"replace"` + Content []byte + Replace map[string]string } // apply updates Item Content by replacing all occurrences of Replace map's keys with their actual map values (with placeholders replaced with data). @@ -105,48 +87,21 @@ func (i *Item) apply(data interface{}) error { return nil } -// Apply applies concrete update plan (schema + data) to GitHub or local filesystem repo -func Apply(ctx context.Context, schema map[string]Item, data interface{}, prBranchPrefix, prTitle string, prIssue int) { +// Apply applies concrete update plan (schema + data) to local filesystem repo +func Apply(schema map[string]Item, data interface{}) { schema, pretty, err := GetPlan(schema, data) if err != nil { klog.Fatalf("Unable to parse schema: %v\n%s", err, pretty) } klog.Infof("The Plan:\n%s", pretty) - if target == "fs" || target == "all" { - changed, err := fsUpdate(FSRoot, schema, data) - if err != nil { - klog.Errorf("Unable to update local repo: %v", err) - } else if !changed { - klog.Infof("Local repo update skipped: nothing changed") - } else { - klog.Infof("Local repo successfully updated") - } - } - - if target == "gh" || target == "all" { - // update prTitle replacing template placeholders with actual data values - if prTitle, err = ParseTmpl(prTitle, data, "prTitle"); err != nil { - klog.Fatalf("Unable to parse PR Title: %v", err) - } - - // check if PR already exists - prURL, err := ghFindPR(ctx, prTitle, ghOwner, ghRepo, ghBase, ghToken) - if err != nil { - klog.Errorf("Unable to check if PR already exists: %v", err) - } else if prURL != "" { - klog.Infof("PR create skipped: already exists (%s)", prURL) - } else { - // create PR - pr, err := ghCreatePR(ctx, ghOwner, ghRepo, ghBase, prBranchPrefix, prTitle, prIssue, ghToken, schema, data) - if err != nil { - klog.Fatalf("Unable to create PR: %v", err) - } else if pr == nil { - klog.Infof("PR create skipped: nothing changed") - } else { - klog.Infof("PR successfully created: %s", *pr.HTMLURL) - } - } + changed, err := fsUpdate(FSRoot, schema, data) + if err != nil { + klog.Errorf("Unable to update local repo: %v", err) + } else if !changed { + klog.Infof("Local repo update skipped: nothing changed") + } else { + klog.Infof("Local repo successfully updated") } } From 17d06a3022a4d3135e63da4ccd539550d4c9ac8f Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Thu, 9 Jun 2022 16:49:50 -0700 Subject: [PATCH 113/545] linting --- hack/update/update.go | 5 ----- 1 file changed, 5 deletions(-) diff --git a/hack/update/update.go b/hack/update/update.go index ff903d8d74..655214bad3 100644 --- a/hack/update/update.go +++ b/hack/update/update.go @@ -23,7 +23,6 @@ import ( "flag" "fmt" "io" - "os" "os/exec" "regexp" "text/template" @@ -39,10 +38,6 @@ const ( FSRoot = "../../../" ) -var ( - target = os.Getenv("UPDATE_TARGET") -) - // init klog and check general requirements func init() { klog.InitFlags(nil) From 53b3408d273188db3a5ade709d041c81f9cbf93d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 Jun 2022 18:01:42 +0000 Subject: [PATCH 114/545] Bump github.com/opencontainers/runc from 1.1.2 to 1.1.3 Bumps [github.com/opencontainers/runc](https://github.com/opencontainers/runc) from 1.1.2 to 1.1.3. - [Release notes](https://github.com/opencontainers/runc/releases) - [Changelog](https://github.com/opencontainers/runc/blob/v1.1.3/CHANGELOG.md) - [Commits](https://github.com/opencontainers/runc/compare/v1.1.2...v1.1.3) --- updated-dependencies: - dependency-name: github.com/opencontainers/runc dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 8 ++++---- go.sum | 17 +++++++++-------- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/go.mod b/go.mod index 6b9cecc61d..4faeb81c95 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ require ( contrib.go.opencensus.io/exporter/stackdriver v0.13.12 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.7.0 + github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.8.1 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 @@ -100,7 +100,7 @@ require ( github.com/blang/semver v3.5.1+incompatible github.com/docker/go-connections v0.4.0 github.com/google/go-github/v43 v43.0.0 - github.com/opencontainers/runc v1.1.2 + github.com/opencontainers/runc v1.1.3 github.com/santhosh-tekuri/jsonschema/v5 v5.0.0 ) @@ -112,7 +112,7 @@ require ( 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/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.31.0 // indirect + github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.32.1 // indirect github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd // indirect github.com/Microsoft/go-winio v0.5.2 // indirect github.com/PuerkitoBio/purell v1.1.1 // indirect @@ -209,7 +209,7 @@ require ( github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect go.uber.org/atomic v1.7.0 // indirect - go.uber.org/multierr v1.6.0 // indirect + go.uber.org/multierr v1.8.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-20220607020251-c690dde0001d // indirect diff --git a/go.sum b/go.sum index 66bedd5641..040c2ed0b4 100644 --- a/go.sum +++ b/go.sum @@ -118,10 +118,10 @@ github.com/Delta456/box-cli-maker/v2 v2.2.2/go.mod h1:idItIMZeyx3bg73XwSgsLeZd+g github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24/go.mod h1:4UJr5HIiMZrwgkSPdsjy2uOQExX/WEILpIrO9UPGuXs= 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.7.0 h1:8vpIORQCKkwM0r/IZ1faAddG56t7byhqSxATphc+8MI= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.7.0/go.mod h1:HuFNmMWVYJDj2IxyIlUOW2vguRBM8ct9mOuAtWRU2EQ= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.31.0 h1:tfaeStvrph8eJEmo1iji3A4DXen3s6ZMM17nQmvo0WA= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.31.0/go.mod h1:j+FS9VBW3mwtHBmm9KOJEy5Tq68fCp7fE/R9bV/flIM= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.8.1 h1:Tn/3pMqRSsI09jFVdGEuMqLIBNOmRHVqKp9DSQg4HPM= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.8.1/go.mod h1:KddM1vG3MS+CRfmoFBqeUIICfd9nS8pLHKtwJ/kt0QQ= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.32.1 h1:SixyMKTOWhEWISdA7PB7vOxkvOP8BIgW5uzbyIf0kXM= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.32.1/go.mod h1:j+FS9VBW3mwtHBmm9KOJEy5Tq68fCp7fE/R9bV/flIM= 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/Masterminds/goutils v1.1.0/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU= @@ -1107,8 +1107,8 @@ github.com/opencontainers/runc v0.1.1/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59P github.com/opencontainers/runc v1.0.0-rc8.0.20190926000215-3e425f80a8c9/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= github.com/opencontainers/runc v1.0.0-rc9/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= github.com/opencontainers/runc v1.0.0-rc93/go.mod h1:3NOsor4w32B2tC0Zbl8Knk4Wg84SM2ImC1fxBuqJ/H0= -github.com/opencontainers/runc v1.1.2 h1:2VSZwLx5k/BfsBxMMipG/LYUnmqOD/BPkIVgQUcTlLw= -github.com/opencontainers/runc v1.1.2/go.mod h1:Tj1hFw6eFWp/o33uxGf5yF2BX5yz2Z6iptFpuvbbKqc= +github.com/opencontainers/runc v1.1.3 h1:vIXrkId+0/J2Ymu2m7VjGvbSlAId9XNRPhn2p4b+d8w= +github.com/opencontainers/runc v1.1.3/go.mod h1:1J5XiS+vdZ3wCyZybsuxXZWGrgSr8fFJHLXuG2PsnNg= github.com/opencontainers/runtime-spec v0.1.2-0.20190507144316-5b71a03e2700/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= github.com/opencontainers/runtime-spec v1.0.1/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= github.com/opencontainers/runtime-spec v1.0.2-0.20190207185410-29686dbc5559/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= @@ -1252,7 +1252,7 @@ github.com/sayboras/dockerclient v1.0.0 h1:awHcxOzTP07Gl1SJAhkTCTagyJwgA6f/Az/Z4 github.com/sayboras/dockerclient v1.0.0/go.mod h1:mUmEoqt0b+uQg57s006FsvL4mybi+N5wINLDBGtaPTY= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= github.com/seccomp/libseccomp-golang v0.9.1/go.mod h1:GbW5+tmTXfcxTToHLXlScSlAvWlF4P2Ca7zGrPiEpWo= -github.com/seccomp/libseccomp-golang v0.9.2-0.20210429002308-3879420cc921/go.mod h1:JA8cRccbGaA1s33RQf7Y1+q9gHmZX1yB/z9WDN1C6fg= +github.com/seccomp/libseccomp-golang v0.9.2-0.20220502022130-f33da4d89646/go.mod h1:JA8cRccbGaA1s33RQf7Y1+q9gHmZX1yB/z9WDN1C6fg= github.com/securego/gosec/v2 v2.9.1/go.mod h1:oDcDLcatOJxkCGaCaq8lua1jTnYf6Sou4wdiJ1n4iHc= github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c/go.mod h1:/PevMnwAxekIXwN8qQyfc5gl2NlkB3CQlkizAbOkeBs= @@ -1464,8 +1464,9 @@ go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4= go.uber.org/multierr v1.4.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4= -go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= +go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= +go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM= From 7c2a4502df771549f5176884eaba455e7d171d2e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 Jun 2022 18:28:01 +0000 Subject: [PATCH 115/545] Bump github.com/cloudevents/sdk-go/v2 from 2.10.0 to 2.10.1 Bumps [github.com/cloudevents/sdk-go/v2](https://github.com/cloudevents/sdk-go) from 2.10.0 to 2.10.1. - [Release notes](https://github.com/cloudevents/sdk-go/releases) - [Commits](https://github.com/cloudevents/sdk-go/compare/v2.10.0...v2.10.1) --- updated-dependencies: - dependency-name: github.com/cloudevents/sdk-go/v2 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 35ad31081c..6454486147 100644 --- a/go.mod +++ b/go.mod @@ -16,7 +16,7 @@ require ( github.com/c4milo/gotoolkit v0.0.0-20190525173301-67483a18c17a // indirect github.com/cenkalti/backoff/v4 v4.1.3 github.com/cheggaaa/pb/v3 v3.0.8 - github.com/cloudevents/sdk-go/v2 v2.10.0 + github.com/cloudevents/sdk-go/v2 v2.10.1 github.com/docker/docker v20.10.17+incompatible github.com/docker/go-units v0.4.0 github.com/docker/machine v0.16.2 diff --git a/go.sum b/go.sum index 1883bc2124..5e3c042551 100644 --- a/go.sum +++ b/go.sum @@ -266,8 +266,8 @@ github.com/cilium/ebpf v0.2.0/go.mod h1:To2CFviqOWL/M0gIMsvSMlqe7em/l1ALkX1PyjrX github.com/cilium/ebpf v0.4.0/go.mod h1:4tRaxcgiL706VnOzHOdBlY8IEAIdxINsQBcU4xJJXRs= github.com/cilium/ebpf v0.7.0/go.mod h1:/oI2+1shJiTGAMgl6/RgJr36Eo1jzrRcAWbcXO2usCA= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudevents/sdk-go/v2 v2.10.0 h1:sz0pbNBGh1iRspqLGe/2cXhDghZZpvNPHwKPucVbh+8= -github.com/cloudevents/sdk-go/v2 v2.10.0/go.mod h1:GpCBmUj7DIRiDhVvsK5d6WCbgTWs8DxAWTRtAwQmIXs= +github.com/cloudevents/sdk-go/v2 v2.10.1 h1:qNFovJ18fWOd8Q9ydWJPk1oiFudXyv1GxJIP7MwPjuM= +github.com/cloudevents/sdk-go/v2 v2.10.1/go.mod h1:GpCBmUj7DIRiDhVvsK5d6WCbgTWs8DxAWTRtAwQmIXs= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= From 33cb8cb876e7d4cc16fb63f33066968eda248146 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 13 Jun 2022 18:32:13 +0000 Subject: [PATCH 116/545] Updating ISO to v1.26.0-1655134933-14265 --- Makefile | 2 +- site/content/en/docs/commands/start.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 92f9dfde4f..6fd77bbb6d 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.26.0-1654804800-14265 +ISO_VERSION ?= v1.26.0-1655134933-14265 # 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/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index 922238fb86..809a15960d 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/14265/minikube-v1.26.0-1654804800-14265-amd64.iso,https://github.com/kubernetes/minikube/releases/download/v1.26.0-1654804800-14265/minikube-v1.26.0-1654804800-14265-amd64.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.26.0-1654804800-14265-amd64.iso,https://storage.googleapis.com/minikube-builds/iso/14265/minikube-v1.26.0-1654804800-14265.iso,https://github.com/kubernetes/minikube/releases/download/v1.26.0-1654804800-14265/minikube-v1.26.0-1654804800-14265.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.26.0-1654804800-14265.iso]) + --iso-url strings Locations to fetch the minikube ISO from. (default [https://storage.googleapis.com/minikube-builds/iso/14265/minikube-v1.26.0-1655134933-14265-amd64.iso,https://github.com/kubernetes/minikube/releases/download/v1.26.0-1655134933-14265/minikube-v1.26.0-1655134933-14265-amd64.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.26.0-1655134933-14265-amd64.iso,https://storage.googleapis.com/minikube-builds/iso/14265/minikube-v1.26.0-1655134933-14265.iso,https://github.com/kubernetes/minikube/releases/download/v1.26.0-1655134933-14265/minikube-v1.26.0-1655134933-14265.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.26.0-1655134933-14265.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.6, 'latest' for v1.23.6). Defaults to 'stable'. --kvm-gpu Enable experimental NVIDIA GPU support in minikube From 70e155ef281d9f9cc054c5dd7652d3bacebd0389 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 Jun 2022 19:04:56 +0000 Subject: [PATCH 117/545] Bump github.com/hashicorp/go-getter from 1.6.1 to 1.6.2 Bumps [github.com/hashicorp/go-getter](https://github.com/hashicorp/go-getter) from 1.6.1 to 1.6.2. - [Release notes](https://github.com/hashicorp/go-getter/releases) - [Changelog](https://github.com/hashicorp/go-getter/blob/main/.goreleaser.yml) - [Commits](https://github.com/hashicorp/go-getter/compare/v1.6.1...v1.6.2) --- updated-dependencies: - dependency-name: github.com/hashicorp/go-getter 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 6454486147..138c757dab 100644 --- a/go.mod +++ b/go.mod @@ -26,7 +26,7 @@ require ( github.com/google/go-containerregistry v0.9.0 github.com/google/slowjam v1.0.0 github.com/google/uuid v1.3.0 - github.com/hashicorp/go-getter v1.6.1 + github.com/hashicorp/go-getter v1.6.2 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 diff --git a/go.sum b/go.sum index 5e3c042551..e6df57fdef 100644 --- a/go.sum +++ b/go.sum @@ -766,8 +766,8 @@ github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brv github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ= github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48= -github.com/hashicorp/go-getter v1.6.1 h1:NASsgP4q6tL94WH6nJxKWj8As2H/2kop/bB1d8JMyRY= -github.com/hashicorp/go-getter v1.6.1/go.mod h1:IZCrswsZPeWv9IkVnLElzRU/gz/QPi6pZHn4tv6vbwA= +github.com/hashicorp/go-getter v1.6.2 h1:7jX7xcB+uVCliddZgeKyNxv0xoT7qL5KDtH7rU4IqIk= +github.com/hashicorp/go-getter v1.6.2/go.mod h1:IZCrswsZPeWv9IkVnLElzRU/gz/QPi6pZHn4tv6vbwA= github.com/hashicorp/go-hclog v0.9.2/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ= github.com/hashicorp/go-hclog v0.12.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= github.com/hashicorp/go-hclog v1.2.0 h1:La19f8d7WIlm4ogzNHB0JGqs5AUDAZ2UfCY4sJXcJdM= From aa905ed4613b2b563aa4f2ae4f5eb1148ec06b77 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 13 Jun 2022 20:51:28 +0000 Subject: [PATCH 118/545] Updating ISO to v1.26.0-1655143205-14329 --- 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 24bf8a3842..c8e956b4c3 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.26.0-1654280115-12707 +ISO_VERSION ?= v1.26.0-1655143205-14329 # 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 6a9a6e85f1..8ac2ce6a36 100644 --- a/pkg/minikube/download/iso.go +++ b/pkg/minikube/download/iso.go @@ -41,7 +41,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/12707" + isoBucket := "minikube-builds/iso/14329" return []string{ fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s-%s.iso", isoBucket, v, runtime.GOARCH), fmt.Sprintf("https://github.com/kubernetes/minikube/releases/download/%s/minikube-%s-%s.iso", v, v, runtime.GOARCH), diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index f619a82f1b..5ff647e0e1 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/12707/minikube-v1.26.0-1654280115-12707-amd64.iso,https://github.com/kubernetes/minikube/releases/download/v1.26.0-1654280115-12707/minikube-v1.26.0-1654280115-12707-amd64.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.26.0-1654280115-12707-amd64.iso,https://storage.googleapis.com/minikube-builds/iso/12707/minikube-v1.26.0-1654280115-12707.iso,https://github.com/kubernetes/minikube/releases/download/v1.26.0-1654280115-12707/minikube-v1.26.0-1654280115-12707.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.26.0-1654280115-12707.iso]) + --iso-url strings Locations to fetch the minikube ISO from. (default [https://storage.googleapis.com/minikube-builds/iso/14329/minikube-v1.26.0-1655143205-14329-amd64.iso,https://github.com/kubernetes/minikube/releases/download/v1.26.0-1655143205-14329/minikube-v1.26.0-1655143205-14329-amd64.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.26.0-1655143205-14329-amd64.iso,https://storage.googleapis.com/minikube-builds/iso/14329/minikube-v1.26.0-1655143205-14329.iso,https://github.com/kubernetes/minikube/releases/download/v1.26.0-1655143205-14329/minikube-v1.26.0-1655143205-14329.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.26.0-1655143205-14329.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.6, 'latest' for v1.23.6). Defaults to 'stable'. --kvm-gpu Enable experimental NVIDIA GPU support in minikube From abd20cad7da0adc45c685b577147a4a1c5250518 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 Jun 2022 22:06:15 +0000 Subject: [PATCH 119/545] Bump libvirt.org/go/libvirt from 1.8003.0 to 1.8004.0 Bumps [libvirt.org/go/libvirt](https://gitlab.com/libvirt/libvirt-go-module) from 1.8003.0 to 1.8004.0. - [Release notes](https://gitlab.com/libvirt/libvirt-go-module/tags) - [Commits](https://gitlab.com/libvirt/libvirt-go-module/compare/v1.8003.0...v1.8004.0) --- updated-dependencies: - dependency-name: libvirt.org/go/libvirt dependency-type: direct:production update-type: version-update:semver-minor ... 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 aa38cd552b..d810f2608b 100644 --- a/go.mod +++ b/go.mod @@ -91,7 +91,7 @@ require ( k8s.io/klog/v2 v2.60.1 k8s.io/kubectl v0.24.1 k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 - libvirt.org/go/libvirt v1.8003.0 + libvirt.org/go/libvirt v1.8004.0 sigs.k8s.io/sig-storage-lib-external-provisioner/v6 v6.3.0 ) diff --git a/go.sum b/go.sum index 6c69209361..ab9144fb06 100644 --- a/go.sum +++ b/go.sum @@ -2275,8 +2275,8 @@ k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/ k8s.io/utils v0.0.0-20210802155522-efc7438f0176/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 h1:HNSDgDCrr/6Ly3WEGKZftiE7IY19Vz2GdbOCyI4qqhc= k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= -libvirt.org/go/libvirt v1.8003.0 h1:2puEq21MkIiOK6EboeRp7dLW1CdPsSJAYPWufH0CESg= -libvirt.org/go/libvirt v1.8003.0/go.mod h1:1WiFE8EjZfq+FCVog+rvr1yatKbKZ9FaFMZgEqxEJqQ= +libvirt.org/go/libvirt v1.8004.0 h1:SKa5hQNKQfc1VjU4LqLMorqPCxC1lplnz8LwLiMrPyM= +libvirt.org/go/libvirt v1.8004.0/go.mod h1:1WiFE8EjZfq+FCVog+rvr1yatKbKZ9FaFMZgEqxEJqQ= mvdan.cc/gofumpt v0.1.1/go.mod h1:yXG1r1WqZVKWbVRtBWKWX9+CxGYfA51nSomhM0woR48= mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed/go.mod h1:Xkxe497xwlCKkIaQYRfC7CSLworTXY9RMqwhhCm+8Nc= mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b/go.mod h1:2odslEg/xrtNQqCYg2/jCoyKnw3vv5biOc3JnIcYfL4= From 2fec3232d5b79250b383e69742ed6db1a8a908a2 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Mon, 13 Jun 2022 15:39:26 -0700 Subject: [PATCH 120/545] filter out latest unique MM versions --- .../update_kubeadm_constants.go | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/hack/update/kubeadm_constants/update_kubeadm_constants.go b/hack/update/kubeadm_constants/update_kubeadm_constants.go index 22b58fc50f..aae2ac6322 100644 --- a/hack/update/kubeadm_constants/update_kubeadm_constants.go +++ b/hack/update/kubeadm_constants/update_kubeadm_constants.go @@ -70,7 +70,8 @@ func main() { if err != nil { klog.Fatal(err) } - imageVersions = append(imageVersions, stableImageVersion, latestImageVersion, edgeImageVersion) + uniqueMM := filterLatestUniqueMM([]string{stableImageVersion, latestImageVersion, edgeImageVersion}) + imageVersions = append(imageVersions, uniqueMM...) } else if semver.IsValid(inputVersion) { imageVersions = append(imageVersions, inputVersion) } else { @@ -106,6 +107,23 @@ func main() { } } +func filterLatestUniqueMM(versions []string) []string { + if len(versions) < 2 { + return versions + } + semver.Sort(versions) + uniqueMMVersions := []string{} + last := versions[0] + for _, ver := range versions { + if semver.MajorMinor(last) != semver.MajorMinor(ver) { + uniqueMMVersions = append(uniqueMMVersions, last) + } + last = ver + } + uniqueMMVersions = append(uniqueMMVersions, last) + return uniqueMMVersions +} + func getKubeadmImagesMapString(version string) (string, error) { url := fmt.Sprintf(kubeadmReleaseURL, version) fileName := fmt.Sprintf(kubeadmBinaryName, version) From 4b7d1b271824bb98128cea0d29f7f009ca86aac2 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Mon, 13 Jun 2022 16:24:08 -0700 Subject: [PATCH 121/545] remove unused Makefile command --- Makefile | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/Makefile b/Makefile index f498307a3b..3812818ab5 100644 --- a/Makefile +++ b/Makefile @@ -1009,17 +1009,6 @@ update-preload-version: (cd hack/update/preload_version && \ go run update_preload_version.go) -.PHONY: update-kubernetes-version-pr -update-kubernetes-version-pr: -ifndef GITHUB_TOKEN - @echo "⚠️ please set GITHUB_TOKEN environment variable with your GitHub token" - @echo "you can use https://github.com/settings/tokens/new?scopes=repo,write:packages to create new one" -else - (cd hack/update/kubernetes_version && \ - export UPDATE_TARGET="all" && \ - go run update_kubernetes_version.go) -endif - .PHONY: update-kubeadm-constants update-kubeadm-constants: (cd hack/update/kubeadm_constants && \ From 55a8f98f0db60861fc382d1be0b6560ec5588d03 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 13 Jun 2022 23:24:55 +0000 Subject: [PATCH 122/545] Update auto-generated docs and translations --- translations/de.json | 2 +- translations/es.json | 2 +- translations/fr.json | 1 + translations/ja.json | 2 +- translations/ko.json | 2 +- translations/pl.json | 2 +- translations/ru.json | 2 +- translations/strings.txt | 2 +- translations/zh-CN.json | 2 +- 9 files changed, 9 insertions(+), 8 deletions(-) diff --git a/translations/de.json b/translations/de.json index 704f9e5506..c95e4e1c81 100644 --- a/translations/de.json +++ b/translations/de.json @@ -893,7 +893,7 @@ "addon '{{.name}}' is currently not enabled.\nTo enable this addon run:\nminikube addons enable {{.name}}": "Addon '{{.name}}' ist derzeit nicht aktiviert.\nUm es zu aktivieren, führe Folgendes aus:\nminikube addons enable {{.name}}", "addon '{{.name}}' is not a valid addon packaged with minikube.\nTo see the list of available addons run:\nminikube addons list": "Addon '{{.name}}' ist kein valides Addon welches mit Minikube paketiert ist.\nUm eine Liste der verfügbaren Addons anzuzeigen, führe Folgendes aus:\nminikube addons list", "addons modifies minikube addons files using subcommands like \"minikube addons enable dashboard\"": "addons modifiziert Minikube Addon Dateien mittels Unter-Befehlen wie \"minikube addons enable dashboard\"", - "arm64 VM drivers do not currently support containerd or crio container runtimes. See https://github.com/kubernetes/minikube/issues/14146 for details.": "", + "arm64 VM drivers do not currently support the crio container runtime. See https://github.com/kubernetes/minikube/issues/14146 for details.": "", "auto-pause addon is an alpha feature and still in early development. Please file issues to help us make it better.": "auto-pause für ein Addon ist ein Alpha-Feature und ist immer noch in Entwicklung. Bitte melde Issues um uns zu helfen das Feature zu verbessern.", "bash completion failed": "bash completion fehlgeschlagen", "bash completion.": "", diff --git a/translations/es.json b/translations/es.json index 1d857ae00a..6a1eb947fb 100644 --- a/translations/es.json +++ b/translations/es.json @@ -894,7 +894,7 @@ "addon '{{.name}}' is currently not enabled.\nTo enable this addon run:\nminikube addons enable {{.name}}": "", "addon '{{.name}}' is not a valid addon packaged with minikube.\nTo see the list of available addons run:\nminikube addons list": "", "addons modifies minikube addons files using subcommands like \"minikube addons enable dashboard\"": "", - "arm64 VM drivers do not currently support containerd or crio container runtimes. See https://github.com/kubernetes/minikube/issues/14146 for details.": "", + "arm64 VM drivers do not currently support the crio container runtime. See https://github.com/kubernetes/minikube/issues/14146 for details.": "", "auto-pause addon is an alpha feature and still in early development. Please file issues to help us make it better.": "", "bash completion failed": "", "bash completion.": "", diff --git a/translations/fr.json b/translations/fr.json index 11ab7332f3..f5b62af785 100644 --- a/translations/fr.json +++ b/translations/fr.json @@ -863,6 +863,7 @@ "addon '{{.name}}' is not a valid addon packaged with minikube.\nTo see the list of available addons run:\nminikube addons list": "Le module '{{.name}}' n'est pas un module valide fourni avec minikube.\nPour voir la liste des modules disponibles, exécutez :\nminikube addons list", "addons modifies minikube addons files using subcommands like \"minikube addons enable dashboard\"": "addons modifie les fichiers de modules minikube à l'aide de sous-commandes telles que \"minikube addons enable dashboard\"", "arm64 VM drivers do not currently support containerd or crio container runtimes. See https://github.com/kubernetes/minikube/issues/14146 for details.": "Les pilotes de machine virtuelle arm64 ne prennent actuellement pas en charge les runtimes de conteneur containerd ou crio. Voir https://github.com/kubernetes/minikube/issues/14146 pour plus de détails.", + "arm64 VM drivers do not currently support the crio container runtime. See https://github.com/kubernetes/minikube/issues/14146 for details.": "", "auto-pause addon is an alpha feature and still in early development. Please file issues to help us make it better.": "Le module auto-pause est une fonctionnalité alpha et encore en développement précoce. Veuillez signaler les problèmes pour nous aider à l'améliorer.", "bash completion failed": "échec de la complétion bash", "bash completion.": "complétion bash", diff --git a/translations/ja.json b/translations/ja.json index 8b63e0745a..7c538116e0 100644 --- a/translations/ja.json +++ b/translations/ja.json @@ -905,7 +905,7 @@ "addon '{{.name}}' is currently not enabled.\nTo enable this addon run:\nminikube addons enable {{.name}}": "'{{.name}}' アドオンは現在無効になっています。\n有効にするためには、以下のコマンドを実行してください。 \nminikube addons enable {{.name}}", "addon '{{.name}}' is not a valid addon packaged with minikube.\nTo see the list of available addons run:\nminikube addons list": "'{{.name}}' は minikube にパッケージングされた有効なアドオンではありません。\n利用可能なアドオンの一覧を表示するためには、以下のコマンドを実行してください。 \nminikube addons list", "addons modifies minikube addons files using subcommands like \"minikube addons enable dashboard\"": "addons コマンドは「minikube addons enable dashboard」のようなサブコマンドを使用することで、minikube アドオンファイルを修正します", - "arm64 VM drivers do not currently support containerd or crio container runtimes. See https://github.com/kubernetes/minikube/issues/14146 for details.": "", + "arm64 VM drivers do not currently support the crio container runtime. See https://github.com/kubernetes/minikube/issues/14146 for details.": "", "auto-pause addon is an alpha feature and still in early development. Please file issues to help us make it better.": "auto-pause アドオンはアルファ機能で、まだ開発の初期段階です。auto-pause アドオン改善の手助けのために、問題は報告してください。", "bash completion failed": "bash のコマンド補完に失敗しました", "bash completion.": "bash のコマンド補完です。", diff --git a/translations/ko.json b/translations/ko.json index e694d3e36d..d3dbed1917 100644 --- a/translations/ko.json +++ b/translations/ko.json @@ -897,7 +897,7 @@ "addon '{{.name}}' is currently not enabled.\nTo enable this addon run:\nminikube addons enable {{.name}}": "", "addon '{{.name}}' is not a valid addon packaged with minikube.\nTo see the list of available addons run:\nminikube addons list": "", "addons modifies minikube addons files using subcommands like \"minikube addons enable dashboard\"": "", - "arm64 VM drivers do not currently support containerd or crio container runtimes. See https://github.com/kubernetes/minikube/issues/14146 for details.": "", + "arm64 VM drivers do not currently support the crio container runtime. See https://github.com/kubernetes/minikube/issues/14146 for details.": "", "auto-pause addon is an alpha feature and still in early development. Please file issues to help us make it better.": "", "bash completion failed": "bash 자동 완성이 실패하였습니다", "bash completion.": "", diff --git a/translations/pl.json b/translations/pl.json index f38c679044..25e99394f7 100644 --- a/translations/pl.json +++ b/translations/pl.json @@ -907,7 +907,7 @@ "addon '{{.name}}' is currently not enabled.\nTo enable this addon run:\nminikube addons enable {{.name}}": "", "addon '{{.name}}' is not a valid addon packaged with minikube.\nTo see the list of available addons run:\nminikube addons list": "", "addons modifies minikube addons files using subcommands like \"minikube addons enable dashboard\"": "", - "arm64 VM drivers do not currently support containerd or crio container runtimes. See https://github.com/kubernetes/minikube/issues/14146 for details.": "", + "arm64 VM drivers do not currently support the crio container runtime. See https://github.com/kubernetes/minikube/issues/14146 for details.": "", "auto-pause addon is an alpha feature and still in early development. Please file issues to help us make it better.": "", "bash completion failed": "", "bash completion.": "", diff --git a/translations/ru.json b/translations/ru.json index 248fd40769..4cd6cb232d 100644 --- a/translations/ru.json +++ b/translations/ru.json @@ -828,7 +828,7 @@ "addon '{{.name}}' is currently not enabled.\nTo enable this addon run:\nminikube addons enable {{.name}}": "", "addon '{{.name}}' is not a valid addon packaged with minikube.\nTo see the list of available addons run:\nminikube addons list": "", "addons modifies minikube addons files using subcommands like \"minikube addons enable dashboard\"": "", - "arm64 VM drivers do not currently support containerd or crio container runtimes. See https://github.com/kubernetes/minikube/issues/14146 for details.": "", + "arm64 VM drivers do not currently support the crio container runtime. See https://github.com/kubernetes/minikube/issues/14146 for details.": "", "auto-pause addon is an alpha feature and still in early development. Please file issues to help us make it better.": "", "bash completion failed": "", "bash completion.": "", diff --git a/translations/strings.txt b/translations/strings.txt index 235cf74840..6dcf250bdd 100644 --- a/translations/strings.txt +++ b/translations/strings.txt @@ -828,7 +828,7 @@ "addon '{{.name}}' is currently not enabled.\nTo enable this addon run:\nminikube addons enable {{.name}}": "", "addon '{{.name}}' is not a valid addon packaged with minikube.\nTo see the list of available addons run:\nminikube addons list": "", "addons modifies minikube addons files using subcommands like \"minikube addons enable dashboard\"": "", - "arm64 VM drivers do not currently support containerd or crio container runtimes. See https://github.com/kubernetes/minikube/issues/14146 for details.": "", + "arm64 VM drivers do not currently support the crio container runtime. See https://github.com/kubernetes/minikube/issues/14146 for details.": "", "auto-pause addon is an alpha feature and still in early development. Please file issues to help us make it better.": "", "bash completion failed": "", "bash completion.": "", diff --git a/translations/zh-CN.json b/translations/zh-CN.json index 6d994db135..a2e0c872fe 100644 --- a/translations/zh-CN.json +++ b/translations/zh-CN.json @@ -1013,7 +1013,7 @@ "addon '{{.name}}' is not a valid addon packaged with minikube.\nTo see the list of available addons run:\nminikube addons list": "", "addon enable failed": "启用插件失败", "addons modifies minikube addons files using subcommands like \"minikube addons enable dashboard\"": "插件使用诸如 \"minikube addons enable dashboard\" 的子命令修改 minikube 的插件文件", - "arm64 VM drivers do not currently support containerd or crio container runtimes. See https://github.com/kubernetes/minikube/issues/14146 for details.": "", + "arm64 VM drivers do not currently support the crio container runtime. See https://github.com/kubernetes/minikube/issues/14146 for details.": "", "auto-pause addon is an alpha feature and still in early development. Please file issues to help us make it better.": "", "bash completion failed": "", "bash completion.": "", From 255954ab8dd621a688db14b6f290c15e47f23f19 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Mon, 13 Jun 2022 16:38:11 -0700 Subject: [PATCH 123/545] add back bracket accidently removed during rebase --- site/content/en/docs/commands/start.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index 77a5283426..809a15960d 100644 --- a/site/content/en/docs/commands/start.md +++ b/site/content/en/docs/commands/start.md @@ -68,7 +68,7 @@ minikube start [flags] --image-repository string Alternative image repository to pull docker images from. This can be used when you have limited access to gcr.io. Set it to "auto" to let minikube decide one for you. For Chinese mainland users, you may use local gcr.io mirrors such as registry.cn-hangzhou.aliyuncs.com/google_containers --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 + --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/14265/minikube-v1.26.0-1655134933-14265-amd64.iso,https://github.com/kubernetes/minikube/releases/download/v1.26.0-1655134933-14265/minikube-v1.26.0-1655134933-14265-amd64.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.26.0-1655134933-14265-amd64.iso,https://storage.googleapis.com/minikube-builds/iso/14265/minikube-v1.26.0-1655134933-14265.iso,https://github.com/kubernetes/minikube/releases/download/v1.26.0-1655134933-14265/minikube-v1.26.0-1655134933-14265.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.26.0-1655134933-14265.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.6, 'latest' for v1.23.6). Defaults to 'stable'. From 7d749255783b07419985366b8b8b03554ef493e1 Mon Sep 17 00:00:00 2001 From: Sharif Elgamal Date: Mon, 13 Jun 2022 17:08:30 -0700 Subject: [PATCH 124/545] build auto-pause outside kicbase dockerfile --- Makefile | 3 ++- deploy/kicbase/Dockerfile | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index f540fefbe0..75bef36f42 100644 --- a/Makefile +++ b/Makefile @@ -739,7 +739,8 @@ endif ifndef CIBUILD $(call user_confirm, 'Are you sure you want to push $(KICBASE_IMAGE_REGISTRIES) ?') endif - env $(X_BUILD_ENV) docker buildx build -f ./deploy/kicbase/Dockerfile --builder $(X_DOCKER_BUILDER) --platform $(KICBASE_ARCH) $(addprefix -t ,$(KICBASE_IMAGE_REGISTRIES)) --push --build-arg COMMIT_SHA=${VERSION}-$(COMMIT) . + ./deploy/kicbase/build_auto_pause.sh $(KICBASE_ARCH) + env $(X_BUILD_ENV) docker buildx build -f ./deploy/kicbase/Dockerfile --builder $(X_DOCKER_BUILDER) --platform $(KICBASE_ARCH) $(addprefix -t ,$(KICBASE_IMAGE_REGISTRIES)) --push --build-arg COMMIT_SHA=${VERSION}-$(COMMIT) --build-arg PREBUILT_AUTO_PAUSE=true . out/preload-tool: go build -ldflags="$(MINIKUBE_LDFLAGS)" -o $@ ./hack/preload-images/*.go diff --git a/deploy/kicbase/Dockerfile b/deploy/kicbase/Dockerfile index a683b77046..743fb5eea1 100644 --- a/deploy/kicbase/Dockerfile +++ b/deploy/kicbase/Dockerfile @@ -31,7 +31,8 @@ COPY third_party/ ./third_party COPY go.mod go.sum ./ ARG TARGETARCH ENV GOARCH=${TARGETARCH} -RUN cd ./cmd/auto-pause/ && go build +ARG PREBUILT_AUTO_PAUSE +RUN if [ "$PREBUILT_AUTO_PAUSE" != "true" ]; then cd ./cmd/auto-pause/ && go build -o auto-pause-${TARGETARCH}; fi # start from ubuntu 20.04, this image is reasonably small as a starting point # for a kubernetes node image, it doesn't contain much we don't need @@ -51,7 +52,7 @@ COPY deploy/kicbase/02-crio.conf /etc/crio/crio.conf.d/02-crio.conf COPY deploy/kicbase/containerd.toml /etc/containerd/config.toml COPY deploy/kicbase/clean-install /usr/local/bin/clean-install COPY deploy/kicbase/entrypoint /usr/local/bin/entrypoint -COPY --from=auto-pause /src/cmd/auto-pause/auto-pause /bin/auto-pause +COPY --from=auto-pause /src/cmd/auto-pause/auto-pause-${TARGETARCH} /bin/auto-pause # Install dependencies, first from apt, then from release tarballs. From 821d88a18083d69a911ada0dc4f7b9289d08f59f Mon Sep 17 00:00:00 2001 From: Sharif Elgamal Date: Mon, 13 Jun 2022 17:10:08 -0700 Subject: [PATCH 125/545] add new file --- deploy/kicbase/build_auto_pause.sh | 34 ++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 deploy/kicbase/build_auto_pause.sh diff --git a/deploy/kicbase/build_auto_pause.sh b/deploy/kicbase/build_auto_pause.sh new file mode 100644 index 0000000000..c7d1daf884 --- /dev/null +++ b/deploy/kicbase/build_auto_pause.sh @@ -0,0 +1,34 @@ +#!/bin/bash + +# Copyright 2022 The Kubernetes Authors All rights reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +set -eux -o pipefail + +if [ "$#" -ne 1 ]; then + echo "Usage: build_auto_pause.sh " >&2 + exit 1 +fi + +archlist=$1 +IFS=, read -a archarray <<< "$archlist" + +pushd cmd/auto-pause + +for (( i=0; i < ${#archarray[*]}; i++ )) +do + arch=${archarray[i]#"linux/"} + env GOOS=linux GOARCH=$arch CGO_ENABLED=0 go build -o auto-pause-$arch +done +popd From 9938965715336085cbc20266b1731d84e1ca3e1e Mon Sep 17 00:00:00 2001 From: Sharif Elgamal Date: Mon, 13 Jun 2022 17:17:22 -0700 Subject: [PATCH 126/545] make script executable --- deploy/kicbase/build_auto_pause.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 deploy/kicbase/build_auto_pause.sh diff --git a/deploy/kicbase/build_auto_pause.sh b/deploy/kicbase/build_auto_pause.sh old mode 100644 new mode 100755 From 34ec997bdbadbb5e169512396f3bc73e7e76a142 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Tue, 14 Jun 2022 01:05:35 +0000 Subject: [PATCH 127/545] Updating kicbase image to v0.0.31-1655167405-14337 --- pkg/drivers/kic/types.go | 4 ++-- site/content/en/docs/commands/start.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/drivers/kic/types.go b/pkg/drivers/kic/types.go index bc1a3257bb..638c6ac6ee 100644 --- a/pkg/drivers/kic/types.go +++ b/pkg/drivers/kic/types.go @@ -24,9 +24,9 @@ import ( const ( // Version is the current version of kic - Version = "v0.0.31-1654032859-14252" + Version = "v0.0.31-1655167405-14337" // SHA of the kic base image - baseImageSHA = "6460c031afce844e0e3c071f4bf5274136c9036e4954d4d6fe2b32ad73fc3496" + baseImageSHA = "007ee1d2e27a61d87fd05c11b41a5956577f975ef7440d0283f28fa9c5dc4f26" // The name of the GCR kicbase repository gcrRepo = "gcr.io/k8s-minikube/kicbase-builds" // The name of the Dockerhub kicbase repository diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index f619a82f1b..0fc7e5eb94 100644 --- a/site/content/en/docs/commands/start.md +++ b/site/content/en/docs/commands/start.md @@ -26,7 +26,7 @@ minikube start [flags] --apiserver-names strings A set of apiserver names which are used in the generated certificate for kubernetes. This can be used if you want to make the apiserver available from outside the machine --apiserver-port int The apiserver listening port (default 8443) --auto-update-drivers If set, automatically updates drivers to the latest version. Defaults to true. (default true) - --base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase-builds:v0.0.31-1654032859-14252@sha256:6460c031afce844e0e3c071f4bf5274136c9036e4954d4d6fe2b32ad73fc3496") + --base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase-builds:v0.0.31-1655167405-14337@sha256:007ee1d2e27a61d87fd05c11b41a5956577f975ef7440d0283f28fa9c5dc4f26") --binary-mirror string Location to fetch kubectl, kubelet, & kubeadm binaries from. --cache-images If true, cache docker images for the current bootstrapper and load them into the machine. Always false with --driver=none. (default true) --cert-expiration duration Duration until minikube certificate expiration, defaults to three years (26280h). (default 26280h0m0s) From b69df23b03e83b4e6385c8cfdc59d371e29c5e2a Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Tue, 14 Jun 2022 02:17:53 +0000 Subject: [PATCH 128/545] Updating ISO to v1.26.0-1655163725-14329 --- 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 1b0d92f9ee..0439bc3d6a 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.26.0-1655134933-14265 +ISO_VERSION ?= v1.26.0-1655163725-14329 # 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 3b597e7f5c..8ac2ce6a36 100644 --- a/pkg/minikube/download/iso.go +++ b/pkg/minikube/download/iso.go @@ -41,7 +41,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/14265" + isoBucket := "minikube-builds/iso/14329" return []string{ fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s-%s.iso", isoBucket, v, runtime.GOARCH), fmt.Sprintf("https://github.com/kubernetes/minikube/releases/download/%s/minikube-%s-%s.iso", v, v, runtime.GOARCH), diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index 809a15960d..a778cf210e 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/14265/minikube-v1.26.0-1655134933-14265-amd64.iso,https://github.com/kubernetes/minikube/releases/download/v1.26.0-1655134933-14265/minikube-v1.26.0-1655134933-14265-amd64.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.26.0-1655134933-14265-amd64.iso,https://storage.googleapis.com/minikube-builds/iso/14265/minikube-v1.26.0-1655134933-14265.iso,https://github.com/kubernetes/minikube/releases/download/v1.26.0-1655134933-14265/minikube-v1.26.0-1655134933-14265.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.26.0-1655134933-14265.iso]) + --iso-url strings Locations to fetch the minikube ISO from. (default [https://storage.googleapis.com/minikube-builds/iso/14329/minikube-v1.26.0-1655163725-14329-amd64.iso,https://github.com/kubernetes/minikube/releases/download/v1.26.0-1655163725-14329/minikube-v1.26.0-1655163725-14329-amd64.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.26.0-1655163725-14329-amd64.iso,https://storage.googleapis.com/minikube-builds/iso/14329/minikube-v1.26.0-1655163725-14329.iso,https://github.com/kubernetes/minikube/releases/download/v1.26.0-1655163725-14329/minikube-v1.26.0-1655163725-14329.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.26.0-1655163725-14329.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.6, 'latest' for v1.23.6). Defaults to 'stable'. --kvm-gpu Enable experimental NVIDIA GPU support in minikube From 0849e44413c997be7fae9b545eb5d0e8b22ee4e0 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Wed, 15 Jun 2022 10:33:15 -0700 Subject: [PATCH 129/545] fix first run taking longer --- hack/jenkins/prbot.sh | 2 ++ pkg/minikube/perf/start.go | 9 +++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/hack/jenkins/prbot.sh b/hack/jenkins/prbot.sh index 92230c8de7..142c6f818d 100755 --- a/hack/jenkins/prbot.sh +++ b/hack/jenkins/prbot.sh @@ -52,3 +52,5 @@ if [ $? -gt 0 ]; then fi output=$(cat mkcmp.log) gh pr comment ${MINIKUBE_LOCATION} --body "${output}" + +docker system prune -a --volumes -f diff --git a/pkg/minikube/perf/start.go b/pkg/minikube/perf/start.go index 508fa80d07..876cfb7890 100644 --- a/pkg/minikube/perf/start.go +++ b/pkg/minikube/perf/start.go @@ -100,11 +100,16 @@ func average(nums []float64) float64 { func downloadArtifacts(ctx context.Context, binaries []*Binary, driver string, runtime string) error { for _, b := range binaries { - c := exec.CommandContext(ctx, b.path, "start", fmt.Sprintf("--driver=%s", driver), "--download-only", fmt.Sprintf("--container-runtime=%s", runtime)) + c := exec.CommandContext(ctx, b.path, "start", fmt.Sprintf("--driver=%s", driver), fmt.Sprintf("--container-runtime=%s", runtime)) c.Stderr = os.Stderr log.Printf("Running: %v...", c.Args) if err := c.Run(); err != nil { - return errors.Wrap(err, "downloading artifacts") + return errors.Wrap(err, "artifact download start") + } + c = exec.CommandContext(ctx, b.path, "delete") + log.Printf("Running: %v...", c.Args) + if err := c.Run(); err != nil { + return errors.Wrap(err, "artifact download delete") } } return nil From 3b9ac640b7bf9aa9136d0a1ffd14121a87c05677 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Wed, 15 Jun 2022 13:08:15 -0700 Subject: [PATCH 130/545] fix cron cleanup script --- hack/jenkins/cron/cleanup_and_reboot_Linux.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hack/jenkins/cron/cleanup_and_reboot_Linux.sh b/hack/jenkins/cron/cleanup_and_reboot_Linux.sh index 87c719f99c..b9ac62290c 100755 --- a/hack/jenkins/cron/cleanup_and_reboot_Linux.sh +++ b/hack/jenkins/cron/cleanup_and_reboot_Linux.sh @@ -117,7 +117,8 @@ function cleanup() { } # Give 15m for Linux-specific cleanup -timeout 15m cleanup +export -f cleanup +timeout 15m bash -c cleanup # disable localkube, kubelet systemctl list-unit-files --state=enabled \ From a8b69283f74718490007dc48dee1b8453ed81c98 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Wed, 15 Jun 2022 13:20:52 -0700 Subject: [PATCH 131/545] ensure cleaning all of docker up --- .github/workflows/functional_verified.yml | 2 +- hack/gh_actions/cleanup.sh | 2 +- hack/jenkins/common.ps1 | 2 +- hack/jenkins/common.sh | 2 +- hack/jenkins/cron/cleanup_and_reboot_Linux.sh | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/functional_verified.yml b/.github/workflows/functional_verified.yml index b815a531c7..f22f34aa7d 100644 --- a/.github/workflows/functional_verified.yml +++ b/.github/workflows/functional_verified.yml @@ -130,7 +130,7 @@ jobs: run: | minikube_binaries/minikube-linux-arm64 delete --all --purge || true docker kill $(docker ps -aq) || true - docker system prune --volumes --force || true + docker system prune -a --volumes -f || true - name: Run Integration Test continue-on-error: false diff --git a/hack/gh_actions/cleanup.sh b/hack/gh_actions/cleanup.sh index eb12251e47..85afc9b9eb 100644 --- a/hack/gh_actions/cleanup.sh +++ b/hack/gh_actions/cleanup.sh @@ -42,7 +42,7 @@ check_running_job echo "cleanup docker..." docker kill $(docker ps -aq) >/dev/null 2>&1 || true -docker system prune --volumes --force || true +docker system prune -a --volumes -f || true echo "rebooting..." sudo reboot diff --git a/hack/jenkins/common.ps1 b/hack/jenkins/common.ps1 index d45042338d..9443394feb 100644 --- a/hack/jenkins/common.ps1 +++ b/hack/jenkins/common.ps1 @@ -50,7 +50,7 @@ If ($lastexitcode -gt 0) { $json = "{`"state`": `"failure`", `"description`": `"Jenkins: docker failed to start`", `"target_url`": `"https://storage.googleapis.com/$gcs_bucket/Hyper-V_Windows.txt`", `"context`": `"$env:JOB_NAME`"}" Write-GithubStatus -JsonBody $json - docker system prune --all --force + docker system prune -a --volumes -f Exit $lastexitcode } diff --git a/hack/jenkins/common.sh b/hack/jenkins/common.sh index 8b6fa75a98..22a492274b 100755 --- a/hack/jenkins/common.sh +++ b/hack/jenkins/common.sh @@ -108,7 +108,7 @@ else fi # let's just clean all docker artifacts up -docker system prune --force --volumes || true +docker system prune -a --volumes -f || true docker system df || true echo ">> Starting at $(date)" diff --git a/hack/jenkins/cron/cleanup_and_reboot_Linux.sh b/hack/jenkins/cron/cleanup_and_reboot_Linux.sh index b9ac62290c..34c148882a 100755 --- a/hack/jenkins/cron/cleanup_and_reboot_Linux.sh +++ b/hack/jenkins/cron/cleanup_and_reboot_Linux.sh @@ -55,7 +55,7 @@ function cleanup() { # clean docker left overs echo -e "\ncleanup docker..." docker kill $(docker ps -aq) >/dev/null 2>&1 || true - docker system prune --volumes --force || true + docker system prune -a --volumes -f || true # clean KVM left overs echo -e "\ncleanup kvm..." From 26afc8f85cffb258572fe41dc386d4e84a65a1cf Mon Sep 17 00:00:00 2001 From: Santhosh Nagaraj S Date: Mon, 6 Jun 2022 12:47:55 +0530 Subject: [PATCH 132/545] Addon: add headlamp Signed-off-by: Santhosh Nagaraj S --- cmd/minikube/cmd/config/addons_list_test.go | 2 +- cmd/minikube/cmd/config/enable.go | 23 +++++++++ deploy/addons/assets.go | 4 ++ .../headlamp/headlamp-clusterrolebinding.yaml | 18 +++++++ .../headlamp/headlamp-deployment.yaml.tmpl | 42 +++++++++++++++ .../addons/headlamp/headlamp-namespace.yaml | 6 +++ deploy/addons/headlamp/headlamp-service.yaml | 21 ++++++++ .../headlamp/headlamp-serviceaccount.yaml | 10 ++++ pkg/addons/config.go | 5 ++ pkg/minikube/assets/addons.go | 13 +++++ .../en/docs/handbook/addons/headlamp.md | 51 +++++++++++++++++++ test/integration/addons_test.go | 14 +++++ 12 files changed, 208 insertions(+), 1 deletion(-) create mode 100644 deploy/addons/headlamp/headlamp-clusterrolebinding.yaml create mode 100644 deploy/addons/headlamp/headlamp-deployment.yaml.tmpl create mode 100644 deploy/addons/headlamp/headlamp-namespace.yaml create mode 100644 deploy/addons/headlamp/headlamp-service.yaml create mode 100644 deploy/addons/headlamp/headlamp-serviceaccount.yaml create mode 100644 site/content/en/docs/handbook/addons/headlamp.md diff --git a/cmd/minikube/cmd/config/addons_list_test.go b/cmd/minikube/cmd/config/addons_list_test.go index ae4a53ca25..1398508c2d 100644 --- a/cmd/minikube/cmd/config/addons_list_test.go +++ b/cmd/minikube/cmd/config/addons_list_test.go @@ -77,7 +77,7 @@ func TestAddonsList(t *testing.T) { Ambassador *interface{} `json:"ambassador"` } - b := make([]byte, 557) + b := make([]byte, 571) r, w, err := os.Pipe() if err != nil { t.Fatalf("failed to create pipe: %v", err) diff --git a/cmd/minikube/cmd/config/enable.go b/cmd/minikube/cmd/config/enable.go index 28da1eb43f..36c38c1ed8 100644 --- a/cmd/minikube/cmd/config/enable.go +++ b/cmd/minikube/cmd/config/enable.go @@ -67,6 +67,29 @@ var addonsEnableCmd = &cobra.Command{ minikube{{.profileArg}} addons enable metrics-server +`, out.V{"profileArg": tipProfileArg}) + + } + if addon == "headlamp" { + out.Styled(style.Tip, `To access Headlamp, use the following command: +minikube service headlamp -n headlamp + +`) + out.Styled(style.Tip, `To authenticate in Headlamp, fetch the Authentication Token using the following command: + +export SECRET=$(kubectl get secrets --namespace headlamp -o custom-columns=":metadata.name" | grep "headlamp-token") +kubectl get secret $SECRET --namespace headlamp --template=\{\{.data.token\}\} | base64 --decode + +`) + + tipProfileArg := "" + if ClusterFlagValue() != constants.DefaultClusterName { + tipProfileArg = fmt.Sprintf(" -p %s", ClusterFlagValue()) + } + out.Styled(style.Tip, `Headlamp can display more detailed information when metrics-server is installed. To install it, run: + +minikube{{.profileArg}} addons enable metrics-server + `, out.V{"profileArg": tipProfileArg}) } diff --git a/deploy/addons/assets.go b/deploy/addons/assets.go index 84b6b644d5..209f0560d4 100644 --- a/deploy/addons/assets.go +++ b/deploy/addons/assets.go @@ -147,4 +147,8 @@ var ( // InAccelAssets assets for inaccel addon //go:embed inaccel/fpga-operator.yaml.tmpl InAccelAssets embed.FS + + // HeadlampAssets assets for headlamp addon + //go:embed headlamp/*.yaml headlamp/*.tmpl + HeadlampAssets embed.FS ) diff --git a/deploy/addons/headlamp/headlamp-clusterrolebinding.yaml b/deploy/addons/headlamp/headlamp-clusterrolebinding.yaml new file mode 100644 index 0000000000..1f516989ed --- /dev/null +++ b/deploy/addons/headlamp/headlamp-clusterrolebinding.yaml @@ -0,0 +1,18 @@ +--- +# ClusterRoleBinding +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + name: headlamp-admin + namespace: headlamp + labels: + app.kubernetes.io/name: headlamp + app.kubernetes.io/instance: headlamp +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: cluster-admin +subjects: +- kind: ServiceAccount + name: headlamp + namespace: headlamp diff --git a/deploy/addons/headlamp/headlamp-deployment.yaml.tmpl b/deploy/addons/headlamp/headlamp-deployment.yaml.tmpl new file mode 100644 index 0000000000..63da3b3433 --- /dev/null +++ b/deploy/addons/headlamp/headlamp-deployment.yaml.tmpl @@ -0,0 +1,42 @@ +--- +# Deployment +apiVersion: apps/v1 +kind: Deployment +metadata: + name: headlamp + namespace: headlamp + labels: + app.kubernetes.io/name: headlamp + app.kubernetes.io/instance: headlamp +spec: + replicas: 1 + selector: + matchLabels: + app.kubernetes.io/name: headlamp + app.kubernetes.io/instance: headlamp + template: + metadata: + labels: + app.kubernetes.io/name: headlamp + app.kubernetes.io/instance: headlamp + spec: + serviceAccountName: headlamp + containers: + - name: headlamp + image: {{.CustomRegistries.Headlamp | default .ImageRepository | default .Registries.Headlamp }}{{.Images.Headlamp}} + imagePullPolicy: IfNotPresent + args: + - "-in-cluster" + - "-plugins-dir=/headlamp/plugins" + ports: + - name: http + containerPort: 4466 + protocol: TCP + livenessProbe: + httpGet: + path: / + port: http + readinessProbe: + httpGet: + path: / + port: http diff --git a/deploy/addons/headlamp/headlamp-namespace.yaml b/deploy/addons/headlamp/headlamp-namespace.yaml new file mode 100644 index 0000000000..85d4ae0a2e --- /dev/null +++ b/deploy/addons/headlamp/headlamp-namespace.yaml @@ -0,0 +1,6 @@ +--- +# Namespace +apiVersion: v1 +kind: Namespace +metadata: + name: headlamp diff --git a/deploy/addons/headlamp/headlamp-service.yaml b/deploy/addons/headlamp/headlamp-service.yaml new file mode 100644 index 0000000000..1eca749b82 --- /dev/null +++ b/deploy/addons/headlamp/headlamp-service.yaml @@ -0,0 +1,21 @@ +--- +# Service +apiVersion: v1 +kind: Service +metadata: + name: headlamp + namespace: headlamp + labels: + app.kubernetes.io/name: headlamp + app.kubernetes.io/instance: headlamp + kubernetes.io/minikube-addons-endpoint: headlamp +spec: + type: NodePort + ports: + - port: 80 + targetPort: http + protocol: TCP + name: http + selector: + app.kubernetes.io/name: headlamp + app.kubernetes.io/instance: headlamp diff --git a/deploy/addons/headlamp/headlamp-serviceaccount.yaml b/deploy/addons/headlamp/headlamp-serviceaccount.yaml new file mode 100644 index 0000000000..2dfba7fc61 --- /dev/null +++ b/deploy/addons/headlamp/headlamp-serviceaccount.yaml @@ -0,0 +1,10 @@ +--- +# ServiceAccount +apiVersion: v1 +kind: ServiceAccount +metadata: + name: headlamp + namespace: headlamp + labels: + app.kubernetes.io/name: headlamp + app.kubernetes.io/instance: headlamp diff --git a/pkg/addons/config.go b/pkg/addons/config.go index 81db657897..6aba241a00 100644 --- a/pkg/addons/config.go +++ b/pkg/addons/config.go @@ -202,4 +202,9 @@ var Addons = []*Addon{ set: SetBool, callbacks: []setFn{EnableOrDisableAddon}, }, + { + name: "headlamp", + set: SetBool, + callbacks: []setFn{EnableOrDisableAddon}, + }, } diff --git a/pkg/minikube/assets/addons.go b/pkg/minikube/assets/addons.go index 5b3dec96bc..c7ed128430 100755 --- a/pkg/minikube/assets/addons.go +++ b/pkg/minikube/assets/addons.go @@ -701,6 +701,19 @@ var Addons = map[string]*Addon{ }, map[string]string{ "Helm3": "docker.io", }), + "headlamp": NewAddon([]*BinAsset{ + MustBinAsset(addons.HeadlampAssets, "headlamp/headlamp-namespace.yaml", vmpath.GuestAddonsDir, "headlamp-namespace.yaml", "6040"), + MustBinAsset(addons.HeadlampAssets, "headlamp/headlamp-service.yaml", vmpath.GuestAddonsDir, "headlamp-service.yaml", "6040"), + MustBinAsset(addons.HeadlampAssets, "headlamp/headlamp-deployment.yaml.tmpl", vmpath.GuestAddonsDir, "headlamp-deployment.yaml", "6040"), + MustBinAsset(addons.HeadlampAssets, "headlamp/headlamp-serviceaccount.yaml", vmpath.GuestAddonsDir, "headlamp-serviceaccount.yaml", "6040"), + MustBinAsset(addons.HeadlampAssets, "headlamp/headlamp-clusterrolebinding.yaml", vmpath.GuestAddonsDir, "headlamp-clusterrolebinding.yaml", "6040"), + }, false, "headlamp", "kinvolk.io", "https://minikube.sigs.k8s.io/docs/handbook/addons/headlamp/", + map[string]string{ + "Headlamp": "kinvolk/headlamp:v0.9.0@sha256:465aaee6518f3fdd032965eccd6a8f49e924d144b1c86115bad613872672ec02", + }, + map[string]string{ + "Headlamp": "ghcr.io", + }), } // parseMapString creates a map based on `str` which is encoded as =,=,... diff --git a/site/content/en/docs/handbook/addons/headlamp.md b/site/content/en/docs/handbook/addons/headlamp.md new file mode 100644 index 0000000000..f72e3aa2ad --- /dev/null +++ b/site/content/en/docs/handbook/addons/headlamp.md @@ -0,0 +1,51 @@ +--- +title: "Using Headlamp Addon" +linkTitle: "Headlamp" +weight: 1 +date: 2022-06-08 +--- + +## Headlamp Addon + +[Headlamp](https://kinvolk.github.io/headlamp) is an easy-to-use and extensible Kubernetes web UI. + +### Enable Headlamp on minikube + +To enable this addon, simply run: +```shell script +minikube addons enable headlamp +``` + +Once the addon is enabled, you can access the Headlamp's web UI using the following command. +```shell script +minikube service headlamp -n headlamp +``` + +To authenticate in Headlamp, fetch the Authentication Token using the following command: + +```shell script +export SECRET=$(kubectl get secrets --namespace headlamp -o custom-columns=":metadata.name" | grep "headlamp-token") +kubectl get secret $SECRET --namespace headlamp --template=\{\{.data.token\}\} | base64 --decode +``` + +Headlamp can display more detailed information when metrics-server is installed. To install it, run: + +```shell script +minikube addons enable metrics-server +``` + +### Testing installation + +```shell script +kubectl get pods -n headlamp +``` + +If everything went well, there should be no errors about Headlamp's installation in your minikube cluster. + +### Disable headlamp + +To disable this addon, simply run: + +```shell script +minikube addons disable headlamp +``` \ No newline at end of file diff --git a/test/integration/addons_test.go b/test/integration/addons_test.go index 7b85db6b33..9071afee10 100644 --- a/test/integration/addons_test.go +++ b/test/integration/addons_test.go @@ -95,6 +95,7 @@ func TestAddons(t *testing.T) { {"HelmTiller", validateHelmTillerAddon}, {"Olm", validateOlmAddon}, {"CSI", validateCSIDriverAndSnapshots}, + {"Headlamp", validateHeadlampAddon}, } for _, tc := range tests { tc := tc @@ -708,3 +709,16 @@ func validateGCPAuthAddon(ctx context.Context, t *testing.T, profile string) { } } } + +func validateHeadlampAddon(ctx context.Context, t *testing.T, profile string) { + defer PostMortemLogs(t, profile) + + rr, err := Run(t, exec.CommandContext(ctx, Target(), "addons", "enable", "headlamp", "-p", profile, "--alsologtostderr", "-v=1")) + if err != nil { + t.Fatalf("failed to enable headlamp addon: args: %q: %v", rr.Command(), err) + } + + if _, err := PodWait(ctx, t, profile, "headlamp", "app.kubernetes.io/name=headlamp", Minutes(8)); err != nil { + t.Fatalf("failed waiting for headlamp pod: %v", err) + } +} From cc1fba4411ac3b58c5bfe61e5dbbe864d88cadec Mon Sep 17 00:00:00 2001 From: lakshkeswani Date: Sat, 11 Jun 2022 09:29:43 +0000 Subject: [PATCH 133/545] Don't allow --control-plane=true for node add --- cmd/minikube/cmd/node_add.go | 9 +++++++-- site/content/en/docs/commands/node.md | 2 +- 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 ++- 11 files changed, 26 insertions(+), 9 deletions(-) diff --git a/cmd/minikube/cmd/node_add.go b/cmd/minikube/cmd/node_add.go index 5f281ab04f..1e54aec7fb 100644 --- a/cmd/minikube/cmd/node_add.go +++ b/cmd/minikube/cmd/node_add.go @@ -50,8 +50,13 @@ var nodeAddCmd = &cobra.Command{ name := node.Name(len(cc.Nodes) + 1) - out.Step(style.Happy, "Adding node {{.name}} to cluster {{.cluster}}", out.V{"name": name, "cluster": cc.Name}) + // for now control-plane feature is not supported + if cp { + out.Step(style.Unsupported, "Adding a control-plane node is not yet supported, setting control-plane flag to false") + cp = false + } + out.Step(style.Happy, "Adding node {{.name}} to cluster {{.cluster}}", out.V{"name": name, "cluster": cc.Name}) // TODO: Deal with parameters better. Ideally we should be able to acceot any node-specific minikube start params here. n := config.Node{ Name: name, @@ -89,7 +94,7 @@ var nodeAddCmd = &cobra.Command{ func init() { // TODO(https://github.com/kubernetes/minikube/issues/7366): We should figure out which minikube start flags to actually import - nodeAddCmd.Flags().BoolVar(&cp, "control-plane", false, "If true, the node added will also be a control plane in addition to a worker.") + nodeAddCmd.Flags().BoolVar(&cp, "control-plane", false, "This flag is currently unsupported.") nodeAddCmd.Flags().BoolVar(&worker, "worker", true, "If true, the added node will be marked for work. Defaults to true.") nodeAddCmd.Flags().Bool(deleteOnFailure, false, "If set, delete the current cluster if start fails and try again. Defaults to false.") diff --git a/site/content/en/docs/commands/node.md b/site/content/en/docs/commands/node.md index 3214262e0d..3268727416 100644 --- a/site/content/en/docs/commands/node.md +++ b/site/content/en/docs/commands/node.md @@ -55,7 +55,7 @@ minikube node add [flags] ### Options ``` - --control-plane If true, the node added will also be a control plane in addition to a worker. + --control-plane This flag is currently unsupported. --delete-on-failure If set, delete the current cluster if start fails and try again. Defaults to false. --worker If true, the added node will be marked for work. Defaults to true. (default true) ``` diff --git a/translations/de.json b/translations/de.json index f8079cfff9..7beb28f015 100644 --- a/translations/de.json +++ b/translations/de.json @@ -48,6 +48,7 @@ "Add machine IP to NO_PROXY environment variable": "Die IP der Maschine zur NO_PROXY Umgebungsvariable hinzufügen", "Add, delete, or push a local image into minikube": "Lokales Image zu Minikube hinzufügen, löschen oder pushen", "Add, remove, or list additional nodes": "Hinzufügen, Löschen oder auflisten von zusätzlichen Nodes", + "Adding a control-plane node is not yet supported, setting control-plane flag to false": "", "Adding node {{.name}} to cluster {{.cluster}}": "Node {{.name}} zu Cluster {{.cluster}} hinzufügen", "Additional help topics": "Weitere Hilfe-Themen", "Adds a node to the given cluster config, and starts it.": "Fügt einen Node zur angegebenen Cluster-Konfiguration hinzu und startet es.", @@ -734,6 +735,7 @@ "This can also be done automatically by setting the env var CHANGE_MINIKUBE_NONE_USER=true": "Dies kann auch automatisch erfolgen, indem Sie die env var CHANGE_MINIKUBE_NONE_USER = true setzen", "This control plane is not running! (state={{.state}})": "Diese Kontroll-Ebene läuft nicht! (state={{.state}})", "This driver does not yet work on your architecture. Maybe try --driver=none": "Dieser Treiber funktioniert noch nicht mit dieser Architektur. Versuche --driver=none zu verwenden", + "This flag is currently unsupported.": "", "This is a known issue with BTRFS storage driver, there is a workaround, please checkout the issue on GitHub": "Dies ist ein bekanntes Problem mit dem BTRFS Treiber. Es exisitiert ein Workaround. Bitte schaue das GitHub Issue an", "This is unusual - you may want to investigate using \"{{.command}}\"": "Das ist ungewöhnlich - Du könntest versuchen \"{{.command}}\" zu verwenden", "This will keep the existing kubectl context and will create a minikube context.": "Dadurch wird der vorhandene Kubectl-Kontext beibehalten und ein minikube-Kontext erstellt.", diff --git a/translations/es.json b/translations/es.json index 49a9e40b67..e21e5bb1d3 100644 --- a/translations/es.json +++ b/translations/es.json @@ -49,6 +49,7 @@ "Add machine IP to NO_PROXY environment variable": "Agregar una IP de máquina a la variable de entorno NO_PROXY", "Add, delete, or push a local image into minikube": "Agrega, elimina, o empuja una imagen local dentro de minikube, haciendo (add, delete, push) respectivamente.", "Add, remove, or list additional nodes": "Usa (add, remove, list) para agregar, eliminar o listar nodos adicionales.", + "Adding a control-plane node is not yet supported, setting control-plane flag to false": "", "Adding node {{.name}} to cluster {{.cluster}}": "Agregando el nodo {{.name}} al cluster {{.cluster}}.", "Additional help topics": "Temas de ayuda adicionales", "Additional mount options, such as cache=fscache": "Opciones de montaje adicionales, por ejemplo cache=fscache", @@ -357,7 +358,6 @@ "If true, print web links to addons' documentation if using --output=list (default).": "", "If true, returns list of profiles faster by skipping validating the status of the cluster.": "", "If true, the added node will be marked for work. Defaults to true.": "", - "If true, the node added will also be a control plane in addition to a worker.": "", "If true, will perform potentially dangerous operations. Use with discretion.": "", "If you are running minikube within a VM, consider using --driver=none:": "", "If you are still interested to make {{.driver_name}} driver work. The following suggestions might help you get passed this issue:": "", @@ -737,6 +737,7 @@ "This can also be done automatically by setting the env var CHANGE_MINIKUBE_NONE_USER=true": "El proceso se puede automatizar si se define la variable de entorno CHANGE_MINIKUBE_NONE_USER=true", "This control plane is not running! (state={{.state}})": "", "This driver does not yet work on your architecture. Maybe try --driver=none": "", + "This flag is currently unsupported.": "", "This is a known issue with BTRFS storage driver, there is a workaround, please checkout the issue on GitHub": "", "This is unusual - you may want to investigate using \"{{.command}}\"": "", "This will keep the existing kubectl context and will create a minikube context.": "Se conservará el contexto de kubectl actual y se creará uno de minikube.", diff --git a/translations/fr.json b/translations/fr.json index 605ed5f438..4cb4dc53cc 100644 --- a/translations/fr.json +++ b/translations/fr.json @@ -49,6 +49,7 @@ "Add machine IP to NO_PROXY environment variable": "Ajouter l'IP de la machine à la variable d'environnement NO_PROXY", "Add, delete, or push a local image into minikube": "Ajouter, supprimer ou pousser une image locale dans minikube", "Add, remove, or list additional nodes": "Ajouter, supprimer ou lister des nœuds supplémentaires", + "Adding a control-plane node is not yet supported, setting control-plane flag to false": "", "Adding node {{.name}} to cluster {{.cluster}}": "Ajout du nœud {{.name}} au cluster {{.cluster}}", "Additional help topics": "Rubriques d'aide supplémentaires", "Additional mount options, such as cache=fscache": "Options de montage supplémentaires, telles que cache=fscache", @@ -708,6 +709,7 @@ "This can also be done automatically by setting the env var CHANGE_MINIKUBE_NONE_USER=true": "Cette opération peut également être réalisée en définissant la variable d'environment \"CHANGE_MINIKUBE_NONE_USER=true\".", "This control plane is not running! (state={{.state}})": "Ce plan de contrôle ne fonctionne pas ! (état={{.state}})", "This driver does not yet work on your architecture. Maybe try --driver=none": "Ce pilote ne fonctionne pas encore sur votre architecture. Essayez peut-être --driver=none", + "This flag is currently unsupported.": "", "This is a known issue with BTRFS storage driver, there is a workaround, please checkout the issue on GitHub": "Il s'agit d'un problème connu avec le pilote de stockage BTRFS, il existe une solution de contournement, veuillez vérifier le problème sur GitHub", "This is unusual - you may want to investigate using \"{{.command}}\"": "C'est inhabituel - vous voudrez peut-être investiguer en utilisant \"{{.command}}\"", "This will keep the existing kubectl context and will create a minikube context.": "Cela permet de conserver le contexte kubectl existent et de créer un contexte minikube.", diff --git a/translations/ja.json b/translations/ja.json index 9fb0045d1d..bcdf4df7f0 100644 --- a/translations/ja.json +++ b/translations/ja.json @@ -50,6 +50,7 @@ "Add machine IP to NO_PROXY environment variable": "マシンの IP アドレスを NO_PROXY 環境変数に追加します", "Add, delete, or push a local image into minikube": "ローカルイメージを minikube に追加、削除、またはプッシュします", "Add, remove, or list additional nodes": "追加のノードを追加、削除またはリストアップします", + "Adding a control-plane node is not yet supported, setting control-plane flag to false": "", "Adding node {{.name}} to cluster {{.cluster}}": "{{.name}} ノードを {{.cluster}} クラスターに追加します", "Additional help topics": "追加のトピック", "Additional mount options, such as cache=fscache": "cache=fscache などの追加のマウントオプション", @@ -734,6 +735,7 @@ "This can also be done automatically by setting the env var CHANGE_MINIKUBE_NONE_USER=true": "これは環境変数 CHANGE_MINIKUBE_NONE_USER=true を設定して自動的に行うこともできます", "This control plane is not running! (state={{.state}})": "このコントロールプレーンは動作していません！(state={{.state}})", "This driver does not yet work on your architecture. Maybe try --driver=none": "このドライバーはあなたのアーキテクチャではまだ機能しません。もしかしたら、--driver=none を試してみてください", + "This flag is currently unsupported.": "", "This is a known issue with BTRFS storage driver, there is a workaround, please checkout the issue on GitHub": "これは BTRFS ストレージドライバーの既知の問題です (回避策があります)。GitHub の issue を確認してください", "This is unusual - you may want to investigate using \"{{.command}}\"": "これは異常です - 「{{.command}}」を使って調査できます", "This will keep the existing kubectl context and will create a minikube context.": "これにより既存の kubectl コンテキストが保持され、minikube コンテキストが作成されます。", diff --git a/translations/ko.json b/translations/ko.json index 6d553b11d5..1d67e51371 100644 --- a/translations/ko.json +++ b/translations/ko.json @@ -52,6 +52,7 @@ "Add or delete an image from the local cache.": "로컬 캐시에 이미지를 추가하거나 삭제합니다", "Add, delete, or push a local image into minikube": "minikube에 로컬 이미지를 추가하거나 삭제, 푸시합니다", "Add, remove, or list additional nodes": "노드를 추가하거나 삭제, 나열합니다", + "Adding a control-plane node is not yet supported, setting control-plane flag to false": "", "Adding node {{.name}} to cluster {{.cluster}}": "노드 {{.name}} 를 클러스터 {{.cluster}} 에 추가합니다", "Additional help topics": "", "Additional mount options, such as cache=fscache": "cache=fscache 와 같은 추가적인 마운트 옵션", @@ -374,7 +375,6 @@ "If true, print web links to addons' documentation if using --output=list (default).": "", "If true, returns list of profiles faster by skipping validating the status of the cluster.": "", "If true, the added node will be marked for work. Defaults to true.": "", - "If true, the node added will also be a control plane in addition to a worker.": "", "If true, will perform potentially dangerous operations. Use with discretion.": "", "If you are running minikube within a VM, consider using --driver=none:": "", "If you are still interested to make {{.driver_name}} driver work. The following suggestions might help you get passed this issue:": "", @@ -740,6 +740,7 @@ "This can also be done automatically by setting the env var CHANGE_MINIKUBE_NONE_USER=true": "", "This control plane is not running! (state={{.state}})": "", "This driver does not yet work on your architecture. Maybe try --driver=none": "", + "This flag is currently unsupported.": "", "This is a known issue with BTRFS storage driver, there is a workaround, please checkout the issue on GitHub": "", "This is unusual - you may want to investigate using \"{{.command}}\"": "", "This will keep the existing kubectl context and will create a minikube context.": "", diff --git a/translations/pl.json b/translations/pl.json index 6f70148964..132e785741 100644 --- a/translations/pl.json +++ b/translations/pl.json @@ -50,6 +50,7 @@ "Add machine IP to NO_PROXY environment variable": "Dodaj IP serwera do zmiennej środowiskowej NO_PROXY", "Add, delete, or push a local image into minikube": "Dodaj, usuń lub wypchnij lokalny obraz do minikube", "Add, remove, or list additional nodes": "Dodaj, usuń lub wylistuj pozostałe węzły", + "Adding a control-plane node is not yet supported, setting control-plane flag to false": "", "Adding node {{.name}} to cluster {{.cluster}}": "Dodawanie węzła {{.name}} do klastra {{.cluster}}", "Additional help topics": "Dodatkowe tematy pomocy", "Additional mount options, such as cache=fscache": "Dodatkowe opcje montowania, jak na przykład cache=fscache", @@ -360,7 +361,6 @@ "If true, print web links to addons' documentation if using --output=list (default).": "", "If true, returns list of profiles faster by skipping validating the status of the cluster.": "", "If true, the added node will be marked for work. Defaults to true.": "", - "If true, the node added will also be a control plane in addition to a worker.": "", "If true, will perform potentially dangerous operations. Use with discretion.": "", "If using the none driver, ensure that systemctl is installed": "Jeśli użyto sterownika 'none', upewnij się że systemctl jest zainstalowany", "If you are running minikube within a VM, consider using --driver=none:": "", @@ -750,6 +750,7 @@ "This can also be done automatically by setting the env var CHANGE_MINIKUBE_NONE_USER=true": "", "This control plane is not running! (state={{.state}})": "", "This driver does not yet work on your architecture. Maybe try --driver=none": "", + "This flag is currently unsupported.": "", "This is a known issue with BTRFS storage driver, there is a workaround, please checkout the issue on GitHub": "", "This is unusual - you may want to investigate using \"{{.command}}\"": "", "This will keep the existing kubectl context and will create a minikube context.": "", diff --git a/translations/ru.json b/translations/ru.json index bbb156f5a3..dca55b5c52 100644 --- a/translations/ru.json +++ b/translations/ru.json @@ -44,6 +44,7 @@ "Add image to cache for all running minikube clusters": "", "Add machine IP to NO_PROXY environment variable": "", "Add, remove, or list additional nodes": "", + "Adding a control-plane node is not yet supported, setting control-plane flag to false": "", "Adding node {{.name}} to cluster {{.cluster}}": "", "Additional help topics": "", "Adds a node to the given cluster config, and starts it.": "", @@ -327,7 +328,6 @@ "If true, print web links to addons' documentation if using --output=list (default).": "", "If true, returns list of profiles faster by skipping validating the status of the cluster.": "", "If true, the added node will be marked for work. Defaults to true.": "", - "If true, the node added will also be a control plane in addition to a worker.": "", "If true, will perform potentially dangerous operations. Use with discretion.": "", "If you are running minikube within a VM, consider using --driver=none:": "", "If you are still interested to make {{.driver_name}} driver work. The following suggestions might help you get passed this issue:": "", @@ -682,6 +682,7 @@ "This can also be done automatically by setting the env var CHANGE_MINIKUBE_NONE_USER=true": "", "This control plane is not running! (state={{.state}})": "", "This driver does not yet work on your architecture. Maybe try --driver=none": "", + "This flag is currently unsupported.": "", "This is a known issue with BTRFS storage driver, there is a workaround, please checkout the issue on GitHub": "", "This is unusual - you may want to investigate using \"{{.command}}\"": "", "This will keep the existing kubectl context and will create a minikube context.": "", diff --git a/translations/strings.txt b/translations/strings.txt index f1d330ecc4..eb5a88c8d0 100644 --- a/translations/strings.txt +++ b/translations/strings.txt @@ -44,6 +44,7 @@ "Add image to cache for all running minikube clusters": "", "Add machine IP to NO_PROXY environment variable": "", "Add, remove, or list additional nodes": "", + "Adding a control-plane node is not yet supported, setting control-plane flag to false": "", "Adding node {{.name}} to cluster {{.cluster}}": "", "Additional help topics": "", "Adds a node to the given cluster config, and starts it.": "", @@ -327,7 +328,6 @@ "If true, print web links to addons' documentation if using --output=list (default).": "", "If true, returns list of profiles faster by skipping validating the status of the cluster.": "", "If true, the added node will be marked for work. Defaults to true.": "", - "If true, the node added will also be a control plane in addition to a worker.": "", "If true, will perform potentially dangerous operations. Use with discretion.": "", "If you are running minikube within a VM, consider using --driver=none:": "", "If you are still interested to make {{.driver_name}} driver work. The following suggestions might help you get passed this issue:": "", @@ -682,6 +682,7 @@ "This can also be done automatically by setting the env var CHANGE_MINIKUBE_NONE_USER=true": "", "This control plane is not running! (state={{.state}})": "", "This driver does not yet work on your architecture. Maybe try --driver=none": "", + "This flag is currently unsupported.": "", "This is a known issue with BTRFS storage driver, there is a workaround, please checkout the issue on GitHub": "", "This is unusual - you may want to investigate using \"{{.command}}\"": "", "This will keep the existing kubectl context and will create a minikube context.": "", diff --git a/translations/zh-CN.json b/translations/zh-CN.json index dc7e7f1c87..4b194fe183 100644 --- a/translations/zh-CN.json +++ b/translations/zh-CN.json @@ -57,6 +57,7 @@ "Add machine IP to NO_PROXY environment variable": "将机器IP添加到环境变量 NO_PROXY 中", "Add or delete an image from the local cache.": "在本地缓存中添加或删除 image。", "Add, remove, or list additional nodes": "", + "Adding a control-plane node is not yet supported, setting control-plane flag to false": "", "Adding node {{.name}} to cluster {{.cluster}}": "添加节点 {{.name}} 至集群 {{.cluster}}", "Additional help topics": "其他帮助", "Additional mount options, such as cache=fscache": "其他挂载选项，例如：cache=fscache", @@ -432,7 +433,6 @@ "If true, print web links to addons' documentation if using --output=list (default).": "", "If true, returns list of profiles faster by skipping validating the status of the cluster.": "", "If true, the added node will be marked for work. Defaults to true.": "", - "If true, the node added will also be a control plane in addition to a worker.": "", "If true, will perform potentially dangerous operations. Use with discretion.": "", "If you are running minikube within a VM, consider using --driver=none:": "", "If you are still interested to make {{.driver_name}} driver work. The following suggestions might help you get passed this issue:": "", @@ -839,6 +839,7 @@ "This can also be done automatically by setting the env var CHANGE_MINIKUBE_NONE_USER=true": "此操作还可通过设置环境变量 CHANGE_MINIKUBE_NONE_USER=true 自动完成", "This control plane is not running! (state={{.state}})": "", "This driver does not yet work on your architecture. Maybe try --driver=none": "", + "This flag is currently unsupported.": "", "This is a known issue with BTRFS storage driver, there is a workaround, please checkout the issue on GitHub": "", "This is unusual - you may want to investigate using \"{{.command}}\"": "", "This will keep the existing kubectl context and will create a minikube context.": "这将保留现有 kubectl 上下文并创建 minikube 上下文。", From 4630eec72d4a73085945551d50505de7898e6895 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Thu, 16 Jun 2022 10:36:48 -0700 Subject: [PATCH 134/545] stop removing /tmp --- hack/jenkins/cron/cleanup_and_reboot_Linux.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/hack/jenkins/cron/cleanup_and_reboot_Linux.sh b/hack/jenkins/cron/cleanup_and_reboot_Linux.sh index 34c148882a..401924350d 100755 --- a/hack/jenkins/cron/cleanup_and_reboot_Linux.sh +++ b/hack/jenkins/cron/cleanup_and_reboot_Linux.sh @@ -111,9 +111,6 @@ function cleanup() { done echo -e "\nafter the cleanup:" overview - - # clean up /tmp - find /tmp -name . -o -prune -exec rm -rf -- {} + >/dev/null 2>&1 || true } # Give 15m for Linux-specific cleanup From fffffaa47b98397c51460ca6b3bd3e0cc86e24f5 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Thu, 19 May 2022 12:13:27 -0700 Subject: [PATCH 135/545] bump k8s to v1.24.0 --- .../testdata/v1.24/containerd-api-port.yaml | 72 +++++++++++++++++ .../v1.24/containerd-pod-network-cidr.yaml | 72 +++++++++++++++++ .../bsutil/testdata/v1.24/containerd.yaml | 72 +++++++++++++++++ .../testdata/v1.24/crio-options-gates.yaml | 79 +++++++++++++++++++ .../bsutil/testdata/v1.24/crio.yaml | 72 +++++++++++++++++ .../bsutil/testdata/v1.24/default.yaml | 72 +++++++++++++++++ .../bsutil/testdata/v1.24/dns.yaml | 72 +++++++++++++++++ .../testdata/v1.24/image-repository.yaml | 73 +++++++++++++++++ .../bsutil/testdata/v1.24/options.yaml | 76 ++++++++++++++++++ pkg/minikube/constants/constants.go | 5 +- site/content/en/docs/commands/start.md | 2 +- 11 files changed, 664 insertions(+), 3 deletions(-) create mode 100644 pkg/minikube/bootstrapper/bsutil/testdata/v1.24/containerd-api-port.yaml create mode 100644 pkg/minikube/bootstrapper/bsutil/testdata/v1.24/containerd-pod-network-cidr.yaml create mode 100644 pkg/minikube/bootstrapper/bsutil/testdata/v1.24/containerd.yaml create mode 100644 pkg/minikube/bootstrapper/bsutil/testdata/v1.24/crio-options-gates.yaml create mode 100644 pkg/minikube/bootstrapper/bsutil/testdata/v1.24/crio.yaml create mode 100644 pkg/minikube/bootstrapper/bsutil/testdata/v1.24/default.yaml create mode 100644 pkg/minikube/bootstrapper/bsutil/testdata/v1.24/dns.yaml create mode 100644 pkg/minikube/bootstrapper/bsutil/testdata/v1.24/image-repository.yaml create mode 100644 pkg/minikube/bootstrapper/bsutil/testdata/v1.24/options.yaml diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/containerd-api-port.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/containerd-api-port.yaml new file mode 100644 index 0000000000..c0d6a2e107 --- /dev/null +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/containerd-api-port.yaml @@ -0,0 +1,72 @@ +apiVersion: kubeadm.k8s.io/v1beta3 +kind: InitConfiguration +localAPIEndpoint: + advertiseAddress: 1.1.1.1 + bindPort: 12345 +bootstrapTokens: + - groups: + - system:bootstrappers:kubeadm:default-node-token + ttl: 24h0m0s + usages: + - signing + - authentication +nodeRegistration: + criSocket: /run/containerd/containerd.sock + name: "mk" + kubeletExtraArgs: + node-ip: 1.1.1.1 + taints: [] +--- +apiVersion: kubeadm.k8s.io/v1beta3 +kind: ClusterConfiguration +apiServer: + certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] + extraArgs: + enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" +controllerManager: + extraArgs: + allocate-node-cidrs: "true" + leader-elect: "false" +scheduler: + extraArgs: + leader-elect: "false" +certificatesDir: /var/lib/minikube/certs +clusterName: mk +controlPlaneEndpoint: control-plane.minikube.internal:12345 +etcd: + local: + dataDir: /var/lib/minikube/etcd + extraArgs: + proxy-refresh-interval: "70000" +kubernetesVersion: v1.24.0 +networking: + dnsDomain: cluster.local + podSubnet: "10.244.0.0/16" + serviceSubnet: 10.96.0.0/12 +--- +apiVersion: kubelet.config.k8s.io/v1beta1 +kind: KubeletConfiguration +authentication: + x509: + clientCAFile: /var/lib/minikube/certs/ca.crt +cgroupDriver: systemd +clusterDomain: "cluster.local" +# disable disk resource management by default +imageGCHighThresholdPercent: 100 +evictionHard: + nodefs.available: "0%" + nodefs.inodesFree: "0%" + imagefs.available: "0%" +failSwapOn: false +staticPodPath: /etc/kubernetes/manifests +--- +apiVersion: kubeproxy.config.k8s.io/v1alpha1 +kind: KubeProxyConfiguration +clusterCIDR: "10.244.0.0/16" +metricsBindAddress: 0.0.0.0:10249 +conntrack: + maxPerCore: 0 +# Skip setting "net.netfilter.nf_conntrack_tcp_timeout_established" + tcpEstablishedTimeout: 0s +# Skip setting "net.netfilter.nf_conntrack_tcp_timeout_close" + tcpCloseWaitTimeout: 0s diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/containerd-pod-network-cidr.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/containerd-pod-network-cidr.yaml new file mode 100644 index 0000000000..ad0f6e2d5f --- /dev/null +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/containerd-pod-network-cidr.yaml @@ -0,0 +1,72 @@ +apiVersion: kubeadm.k8s.io/v1beta3 +kind: InitConfiguration +localAPIEndpoint: + advertiseAddress: 1.1.1.1 + bindPort: 8443 +bootstrapTokens: + - groups: + - system:bootstrappers:kubeadm:default-node-token + ttl: 24h0m0s + usages: + - signing + - authentication +nodeRegistration: + criSocket: /run/containerd/containerd.sock + name: "mk" + kubeletExtraArgs: + node-ip: 1.1.1.1 + taints: [] +--- +apiVersion: kubeadm.k8s.io/v1beta3 +kind: ClusterConfiguration +apiServer: + certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] + extraArgs: + enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" +controllerManager: + extraArgs: + allocate-node-cidrs: "true" + leader-elect: "false" +scheduler: + extraArgs: + leader-elect: "false" +certificatesDir: /var/lib/minikube/certs +clusterName: mk +controlPlaneEndpoint: control-plane.minikube.internal:8443 +etcd: + local: + dataDir: /var/lib/minikube/etcd + extraArgs: + proxy-refresh-interval: "70000" +kubernetesVersion: v1.24.0 +networking: + dnsDomain: cluster.local + podSubnet: "192.168.32.0/20" + serviceSubnet: 10.96.0.0/12 +--- +apiVersion: kubelet.config.k8s.io/v1beta1 +kind: KubeletConfiguration +authentication: + x509: + clientCAFile: /var/lib/minikube/certs/ca.crt +cgroupDriver: systemd +clusterDomain: "cluster.local" +# disable disk resource management by default +imageGCHighThresholdPercent: 100 +evictionHard: + nodefs.available: "0%" + nodefs.inodesFree: "0%" + imagefs.available: "0%" +failSwapOn: false +staticPodPath: /etc/kubernetes/manifests +--- +apiVersion: kubeproxy.config.k8s.io/v1alpha1 +kind: KubeProxyConfiguration +clusterCIDR: "192.168.32.0/20" +metricsBindAddress: 0.0.0.0:10249 +conntrack: + maxPerCore: 0 +# Skip setting "net.netfilter.nf_conntrack_tcp_timeout_established" + tcpEstablishedTimeout: 0s +# Skip setting "net.netfilter.nf_conntrack_tcp_timeout_close" + tcpCloseWaitTimeout: 0s diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/containerd.yaml new file mode 100644 index 0000000000..b57437de99 --- /dev/null +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/containerd.yaml @@ -0,0 +1,72 @@ +apiVersion: kubeadm.k8s.io/v1beta3 +kind: InitConfiguration +localAPIEndpoint: + advertiseAddress: 1.1.1.1 + bindPort: 8443 +bootstrapTokens: + - groups: + - system:bootstrappers:kubeadm:default-node-token + ttl: 24h0m0s + usages: + - signing + - authentication +nodeRegistration: + criSocket: /run/containerd/containerd.sock + name: "mk" + kubeletExtraArgs: + node-ip: 1.1.1.1 + taints: [] +--- +apiVersion: kubeadm.k8s.io/v1beta3 +kind: ClusterConfiguration +apiServer: + certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] + extraArgs: + enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" +controllerManager: + extraArgs: + allocate-node-cidrs: "true" + leader-elect: "false" +scheduler: + extraArgs: + leader-elect: "false" +certificatesDir: /var/lib/minikube/certs +clusterName: mk +controlPlaneEndpoint: control-plane.minikube.internal:8443 +etcd: + local: + dataDir: /var/lib/minikube/etcd + extraArgs: + proxy-refresh-interval: "70000" +kubernetesVersion: v1.24.0 +networking: + dnsDomain: cluster.local + podSubnet: "10.244.0.0/16" + serviceSubnet: 10.96.0.0/12 +--- +apiVersion: kubelet.config.k8s.io/v1beta1 +kind: KubeletConfiguration +authentication: + x509: + clientCAFile: /var/lib/minikube/certs/ca.crt +cgroupDriver: systemd +clusterDomain: "cluster.local" +# disable disk resource management by default +imageGCHighThresholdPercent: 100 +evictionHard: + nodefs.available: "0%" + nodefs.inodesFree: "0%" + imagefs.available: "0%" +failSwapOn: false +staticPodPath: /etc/kubernetes/manifests +--- +apiVersion: kubeproxy.config.k8s.io/v1alpha1 +kind: KubeProxyConfiguration +clusterCIDR: "10.244.0.0/16" +metricsBindAddress: 0.0.0.0:10249 +conntrack: + maxPerCore: 0 +# Skip setting "net.netfilter.nf_conntrack_tcp_timeout_established" + tcpEstablishedTimeout: 0s +# Skip setting "net.netfilter.nf_conntrack_tcp_timeout_close" + tcpCloseWaitTimeout: 0s diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/crio-options-gates.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/crio-options-gates.yaml new file mode 100644 index 0000000000..c071093bf1 --- /dev/null +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/crio-options-gates.yaml @@ -0,0 +1,79 @@ +apiVersion: kubeadm.k8s.io/v1beta3 +kind: InitConfiguration +localAPIEndpoint: + advertiseAddress: 1.1.1.1 + bindPort: 8443 +bootstrapTokens: + - groups: + - system:bootstrappers:kubeadm:default-node-token + ttl: 24h0m0s + usages: + - signing + - authentication +nodeRegistration: + criSocket: /var/run/crio/crio.sock + name: "mk" + kubeletExtraArgs: + node-ip: 1.1.1.1 + taints: [] +--- +apiVersion: kubeadm.k8s.io/v1beta3 +kind: ClusterConfiguration +apiServer: + certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] + extraArgs: + enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" + fail-no-swap: "true" + feature-gates: "a=b" +controllerManager: + extraArgs: + allocate-node-cidrs: "true" + feature-gates: "a=b" + kube-api-burst: "32" + leader-elect: "false" +scheduler: + extraArgs: + feature-gates: "a=b" + leader-elect: "false" + scheduler-name: "mini-scheduler" +certificatesDir: /var/lib/minikube/certs +clusterName: mk +controlPlaneEndpoint: control-plane.minikube.internal:8443 +etcd: + local: + dataDir: /var/lib/minikube/etcd + extraArgs: + proxy-refresh-interval: "70000" +kubernetesVersion: v1.24.0 +networking: + dnsDomain: cluster.local + podSubnet: "10.244.0.0/16" + serviceSubnet: 10.96.0.0/12 +--- +apiVersion: kubelet.config.k8s.io/v1beta1 +kind: KubeletConfiguration +authentication: + x509: + clientCAFile: /var/lib/minikube/certs/ca.crt +cgroupDriver: systemd +clusterDomain: "cluster.local" +# disable disk resource management by default +imageGCHighThresholdPercent: 100 +evictionHard: + nodefs.available: "0%" + nodefs.inodesFree: "0%" + imagefs.available: "0%" +failSwapOn: false +staticPodPath: /etc/kubernetes/manifests +--- +apiVersion: kubeproxy.config.k8s.io/v1alpha1 +kind: KubeProxyConfiguration +clusterCIDR: "10.244.0.0/16" +metricsBindAddress: 0.0.0.0:10249 +conntrack: + maxPerCore: 0 +# Skip setting "net.netfilter.nf_conntrack_tcp_timeout_established" + tcpEstablishedTimeout: 0s +# Skip setting "net.netfilter.nf_conntrack_tcp_timeout_close" + tcpCloseWaitTimeout: 0s +mode: "iptables" diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/crio.yaml new file mode 100644 index 0000000000..e610321bef --- /dev/null +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/crio.yaml @@ -0,0 +1,72 @@ +apiVersion: kubeadm.k8s.io/v1beta3 +kind: InitConfiguration +localAPIEndpoint: + advertiseAddress: 1.1.1.1 + bindPort: 8443 +bootstrapTokens: + - groups: + - system:bootstrappers:kubeadm:default-node-token + ttl: 24h0m0s + usages: + - signing + - authentication +nodeRegistration: + criSocket: /var/run/crio/crio.sock + name: "mk" + kubeletExtraArgs: + node-ip: 1.1.1.1 + taints: [] +--- +apiVersion: kubeadm.k8s.io/v1beta3 +kind: ClusterConfiguration +apiServer: + certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] + extraArgs: + enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" +controllerManager: + extraArgs: + allocate-node-cidrs: "true" + leader-elect: "false" +scheduler: + extraArgs: + leader-elect: "false" +certificatesDir: /var/lib/minikube/certs +clusterName: mk +controlPlaneEndpoint: control-plane.minikube.internal:8443 +etcd: + local: + dataDir: /var/lib/minikube/etcd + extraArgs: + proxy-refresh-interval: "70000" +kubernetesVersion: v1.24.0 +networking: + dnsDomain: cluster.local + podSubnet: "10.244.0.0/16" + serviceSubnet: 10.96.0.0/12 +--- +apiVersion: kubelet.config.k8s.io/v1beta1 +kind: KubeletConfiguration +authentication: + x509: + clientCAFile: /var/lib/minikube/certs/ca.crt +cgroupDriver: systemd +clusterDomain: "cluster.local" +# disable disk resource management by default +imageGCHighThresholdPercent: 100 +evictionHard: + nodefs.available: "0%" + nodefs.inodesFree: "0%" + imagefs.available: "0%" +failSwapOn: false +staticPodPath: /etc/kubernetes/manifests +--- +apiVersion: kubeproxy.config.k8s.io/v1alpha1 +kind: KubeProxyConfiguration +clusterCIDR: "10.244.0.0/16" +metricsBindAddress: 0.0.0.0:10249 +conntrack: + maxPerCore: 0 +# Skip setting "net.netfilter.nf_conntrack_tcp_timeout_established" + tcpEstablishedTimeout: 0s +# Skip setting "net.netfilter.nf_conntrack_tcp_timeout_close" + tcpCloseWaitTimeout: 0s diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/default.yaml new file mode 100644 index 0000000000..a7d163f7ae --- /dev/null +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/default.yaml @@ -0,0 +1,72 @@ +apiVersion: kubeadm.k8s.io/v1beta3 +kind: InitConfiguration +localAPIEndpoint: + advertiseAddress: 1.1.1.1 + bindPort: 8443 +bootstrapTokens: + - groups: + - system:bootstrappers:kubeadm:default-node-token + ttl: 24h0m0s + usages: + - signing + - authentication +nodeRegistration: + criSocket: /var/run/dockershim.sock + name: "mk" + kubeletExtraArgs: + node-ip: 1.1.1.1 + taints: [] +--- +apiVersion: kubeadm.k8s.io/v1beta3 +kind: ClusterConfiguration +apiServer: + certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] + extraArgs: + enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" +controllerManager: + extraArgs: + allocate-node-cidrs: "true" + leader-elect: "false" +scheduler: + extraArgs: + leader-elect: "false" +certificatesDir: /var/lib/minikube/certs +clusterName: mk +controlPlaneEndpoint: control-plane.minikube.internal:8443 +etcd: + local: + dataDir: /var/lib/minikube/etcd + extraArgs: + proxy-refresh-interval: "70000" +kubernetesVersion: v1.24.0 +networking: + dnsDomain: cluster.local + podSubnet: "10.244.0.0/16" + serviceSubnet: 10.96.0.0/12 +--- +apiVersion: kubelet.config.k8s.io/v1beta1 +kind: KubeletConfiguration +authentication: + x509: + clientCAFile: /var/lib/minikube/certs/ca.crt +cgroupDriver: systemd +clusterDomain: "cluster.local" +# disable disk resource management by default +imageGCHighThresholdPercent: 100 +evictionHard: + nodefs.available: "0%" + nodefs.inodesFree: "0%" + imagefs.available: "0%" +failSwapOn: false +staticPodPath: /etc/kubernetes/manifests +--- +apiVersion: kubeproxy.config.k8s.io/v1alpha1 +kind: KubeProxyConfiguration +clusterCIDR: "10.244.0.0/16" +metricsBindAddress: 0.0.0.0:10249 +conntrack: + maxPerCore: 0 +# Skip setting "net.netfilter.nf_conntrack_tcp_timeout_established" + tcpEstablishedTimeout: 0s +# Skip setting "net.netfilter.nf_conntrack_tcp_timeout_close" + tcpCloseWaitTimeout: 0s diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/dns.yaml new file mode 100644 index 0000000000..f304a30dd2 --- /dev/null +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/dns.yaml @@ -0,0 +1,72 @@ +apiVersion: kubeadm.k8s.io/v1beta3 +kind: InitConfiguration +localAPIEndpoint: + advertiseAddress: 1.1.1.1 + bindPort: 8443 +bootstrapTokens: + - groups: + - system:bootstrappers:kubeadm:default-node-token + ttl: 24h0m0s + usages: + - signing + - authentication +nodeRegistration: + criSocket: /var/run/dockershim.sock + name: "mk" + kubeletExtraArgs: + node-ip: 1.1.1.1 + taints: [] +--- +apiVersion: kubeadm.k8s.io/v1beta3 +kind: ClusterConfiguration +apiServer: + certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] + extraArgs: + enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" +controllerManager: + extraArgs: + allocate-node-cidrs: "true" + leader-elect: "false" +scheduler: + extraArgs: + leader-elect: "false" +certificatesDir: /var/lib/minikube/certs +clusterName: mk +controlPlaneEndpoint: control-plane.minikube.internal:8443 +etcd: + local: + dataDir: /var/lib/minikube/etcd + extraArgs: + proxy-refresh-interval: "70000" +kubernetesVersion: v1.24.0 +networking: + dnsDomain: minikube.local + podSubnet: "10.244.0.0/16" + serviceSubnet: 10.96.0.0/12 +--- +apiVersion: kubelet.config.k8s.io/v1beta1 +kind: KubeletConfiguration +authentication: + x509: + clientCAFile: /var/lib/minikube/certs/ca.crt +cgroupDriver: systemd +clusterDomain: "minikube.local" +# disable disk resource management by default +imageGCHighThresholdPercent: 100 +evictionHard: + nodefs.available: "0%" + nodefs.inodesFree: "0%" + imagefs.available: "0%" +failSwapOn: false +staticPodPath: /etc/kubernetes/manifests +--- +apiVersion: kubeproxy.config.k8s.io/v1alpha1 +kind: KubeProxyConfiguration +clusterCIDR: "10.244.0.0/16" +metricsBindAddress: 0.0.0.0:10249 +conntrack: + maxPerCore: 0 +# Skip setting "net.netfilter.nf_conntrack_tcp_timeout_established" + tcpEstablishedTimeout: 0s +# Skip setting "net.netfilter.nf_conntrack_tcp_timeout_close" + tcpCloseWaitTimeout: 0s diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/image-repository.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/image-repository.yaml new file mode 100644 index 0000000000..232c8785ab --- /dev/null +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/image-repository.yaml @@ -0,0 +1,73 @@ +apiVersion: kubeadm.k8s.io/v1beta3 +kind: InitConfiguration +localAPIEndpoint: + advertiseAddress: 1.1.1.1 + bindPort: 8443 +bootstrapTokens: + - groups: + - system:bootstrappers:kubeadm:default-node-token + ttl: 24h0m0s + usages: + - signing + - authentication +nodeRegistration: + criSocket: /var/run/dockershim.sock + name: "mk" + kubeletExtraArgs: + node-ip: 1.1.1.1 + taints: [] +--- +apiVersion: kubeadm.k8s.io/v1beta3 +kind: ClusterConfiguration +imageRepository: test/repo +apiServer: + certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] + extraArgs: + enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" +controllerManager: + extraArgs: + allocate-node-cidrs: "true" + leader-elect: "false" +scheduler: + extraArgs: + leader-elect: "false" +certificatesDir: /var/lib/minikube/certs +clusterName: mk +controlPlaneEndpoint: control-plane.minikube.internal:8443 +etcd: + local: + dataDir: /var/lib/minikube/etcd + extraArgs: + proxy-refresh-interval: "70000" +kubernetesVersion: v1.24.0 +networking: + dnsDomain: cluster.local + podSubnet: "10.244.0.0/16" + serviceSubnet: 10.96.0.0/12 +--- +apiVersion: kubelet.config.k8s.io/v1beta1 +kind: KubeletConfiguration +authentication: + x509: + clientCAFile: /var/lib/minikube/certs/ca.crt +cgroupDriver: systemd +clusterDomain: "cluster.local" +# disable disk resource management by default +imageGCHighThresholdPercent: 100 +evictionHard: + nodefs.available: "0%" + nodefs.inodesFree: "0%" + imagefs.available: "0%" +failSwapOn: false +staticPodPath: /etc/kubernetes/manifests +--- +apiVersion: kubeproxy.config.k8s.io/v1alpha1 +kind: KubeProxyConfiguration +clusterCIDR: "10.244.0.0/16" +metricsBindAddress: 0.0.0.0:10249 +conntrack: + maxPerCore: 0 +# Skip setting "net.netfilter.nf_conntrack_tcp_timeout_established" + tcpEstablishedTimeout: 0s +# Skip setting "net.netfilter.nf_conntrack_tcp_timeout_close" + tcpCloseWaitTimeout: 0s diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/options.yaml new file mode 100644 index 0000000000..71046482a4 --- /dev/null +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/options.yaml @@ -0,0 +1,76 @@ +apiVersion: kubeadm.k8s.io/v1beta3 +kind: InitConfiguration +localAPIEndpoint: + advertiseAddress: 1.1.1.1 + bindPort: 8443 +bootstrapTokens: + - groups: + - system:bootstrappers:kubeadm:default-node-token + ttl: 24h0m0s + usages: + - signing + - authentication +nodeRegistration: + criSocket: /var/run/dockershim.sock + name: "mk" + kubeletExtraArgs: + node-ip: 1.1.1.1 + taints: [] +--- +apiVersion: kubeadm.k8s.io/v1beta3 +kind: ClusterConfiguration +apiServer: + certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] + extraArgs: + enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" + fail-no-swap: "true" +controllerManager: + extraArgs: + allocate-node-cidrs: "true" + kube-api-burst: "32" + leader-elect: "false" +scheduler: + extraArgs: + leader-elect: "false" + scheduler-name: "mini-scheduler" +certificatesDir: /var/lib/minikube/certs +clusterName: mk +controlPlaneEndpoint: control-plane.minikube.internal:8443 +etcd: + local: + dataDir: /var/lib/minikube/etcd + extraArgs: + proxy-refresh-interval: "70000" +kubernetesVersion: v1.24.0 +networking: + dnsDomain: cluster.local + podSubnet: "10.244.0.0/16" + serviceSubnet: 10.96.0.0/12 +--- +apiVersion: kubelet.config.k8s.io/v1beta1 +kind: KubeletConfiguration +authentication: + x509: + clientCAFile: /var/lib/minikube/certs/ca.crt +cgroupDriver: systemd +clusterDomain: "cluster.local" +# disable disk resource management by default +imageGCHighThresholdPercent: 100 +evictionHard: + nodefs.available: "0%" + nodefs.inodesFree: "0%" + imagefs.available: "0%" +failSwapOn: false +staticPodPath: /etc/kubernetes/manifests +--- +apiVersion: kubeproxy.config.k8s.io/v1alpha1 +kind: KubeProxyConfiguration +clusterCIDR: "10.244.0.0/16" +metricsBindAddress: 0.0.0.0:10249 +conntrack: + maxPerCore: 0 +# Skip setting "net.netfilter.nf_conntrack_tcp_timeout_established" + tcpEstablishedTimeout: 0s +# Skip setting "net.netfilter.nf_conntrack_tcp_timeout_close" + tcpCloseWaitTimeout: 0s +mode: "iptables" diff --git a/pkg/minikube/constants/constants.go b/pkg/minikube/constants/constants.go index c52072be3b..3bd21a6be9 100644 --- a/pkg/minikube/constants/constants.go +++ b/pkg/minikube/constants/constants.go @@ -32,10 +32,11 @@ var ( const ( // DefaultKubernetesVersion is the default Kubernetes version - DefaultKubernetesVersion = "v1.23.6" + // dont update till #10545 is solved + DefaultKubernetesVersion = "v1.24.0" // NewestKubernetesVersion is the newest Kubernetes version to test against // NOTE: You may need to update coreDNS & etcd versions in pkg/minikube/bootstrapper/images/images.go - NewestKubernetesVersion = "v1.23.6" + NewestKubernetesVersion = "v1.24.1-rc.0" // OldestKubernetesVersion is the oldest Kubernetes version to test against OldestKubernetesVersion = "v1.16.0" // NoKubernetesVersion is the version used when users does NOT want to install kubernetes diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index 284ba52062..e44eb1d0e2 100644 --- a/site/content/en/docs/commands/start.md +++ b/site/content/en/docs/commands/start.md @@ -71,7 +71,7 @@ minikube start [flags] --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/14329/minikube-v1.26.0-1655163725-14329-amd64.iso,https://github.com/kubernetes/minikube/releases/download/v1.26.0-1655163725-14329/minikube-v1.26.0-1655163725-14329-amd64.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.26.0-1655163725-14329-amd64.iso,https://storage.googleapis.com/minikube-builds/iso/14329/minikube-v1.26.0-1655163725-14329.iso,https://github.com/kubernetes/minikube/releases/download/v1.26.0-1655163725-14329/minikube-v1.26.0-1655163725-14329.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.26.0-1655163725-14329.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.6, 'latest' for v1.23.6). Defaults to 'stable'. + --kubernetes-version string The Kubernetes version that the minikube VM will use (ex: v1.2.3, 'stable' for v1.24.0, 'latest' for v1.24.1-rc.0). Defaults to 'stable'. --kvm-gpu Enable experimental NVIDIA GPU support in minikube --kvm-hidden Hide the hypervisor signature from the guest in minikube (kvm2 driver only) --kvm-network string The KVM default network name. (kvm2 driver only) (default "default") From 4362818c0c3b0d24a2d1b56ddd49798bea69b4d8 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Thu, 19 May 2022 13:35:12 -0700 Subject: [PATCH 136/545] fix skipping starting cri service with force systemd --- pkg/minikube/cruntime/docker.go | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/pkg/minikube/cruntime/docker.go b/pkg/minikube/cruntime/docker.go index 116305643f..ca82f87a71 100644 --- a/pkg/minikube/cruntime/docker.go +++ b/pkg/minikube/cruntime/docker.go @@ -121,7 +121,6 @@ func (r *Docker) Enable(disOthers, forceSystemd, inUserNamespace bool) error { if inUserNamespace { return errors.New("inUserNamespace must not be true for docker") } - containerdWasActive := r.Init.Active("containerd") if disOthers { if err := disableOthers(r, r.Runner); err != nil { @@ -145,15 +144,9 @@ func (r *Docker) Enable(disOthers, forceSystemd, inUserNamespace bool) error { if err := r.forceSystemd(); err != nil { return err } - return r.Init.Restart("docker") } - if containerdWasActive && !dockerBoundToContainerd(r.Runner) { - // Make sure to use the internal containerd - return r.Init.Restart("docker") - } - - if err := r.Init.Start("docker"); err != nil { + if err := r.Init.Restart("docker"); err != nil { return err } From b33ae0d59aa552f5188c31bcb66aedc8957200c6 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Thu, 19 May 2022 13:36:54 -0700 Subject: [PATCH 137/545] update kindnetd image --- pkg/minikube/bootstrapper/images/images.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/minikube/bootstrapper/images/images.go b/pkg/minikube/bootstrapper/images/images.go index 3e270918e9..4492fc6b42 100644 --- a/pkg/minikube/bootstrapper/images/images.go +++ b/pkg/minikube/bootstrapper/images/images.go @@ -182,7 +182,7 @@ func KindNet(repo string) string { if repo == "" { repo = "kindest" } - return path.Join(repo, "kindnetd:v20210326-1e038dc5") + return path.Join(repo, "kindnetd:v20220510-4929dd75") } // all calico images are from https://docs.projectcalico.org/manifests/calico.yaml From 32f940d470076c3700b3ef513ebffcefad7ee81c Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Thu, 19 May 2022 14:37:45 -0700 Subject: [PATCH 138/545] auto install cri-dockerd for none tests and docs --- hack/jenkins/linux_integration_tests_none.sh | 18 ++++++++++++++++-- .../en/docs/drivers/includes/none_usage.inc | 1 + .../en/docs/drivers/includes/ssh_usage.inc | 1 + 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/hack/jenkins/linux_integration_tests_none.sh b/hack/jenkins/linux_integration_tests_none.sh index 5f6c950705..353bc289c9 100755 --- a/hack/jenkins/linux_integration_tests_none.sh +++ b/hack/jenkins/linux_integration_tests_none.sh @@ -51,20 +51,34 @@ sudo systemctl is-active --quiet kubelet \ && echo "stopping kubelet" \ && sudo systemctl stop -f kubelet - # conntrack is required for kubernetes 1.18 and higher for none driver +# conntrack is required for Kubernetes 1.18 and higher for none driver if ! conntrack --version &>/dev/null; then echo "WARNING: contrack is not installed. will try to install." sudo apt-get update -qq sudo apt-get -qq -y install conntrack fi - # socat is required for kubectl port forward which is used in some tests such as validateHelmTillerAddon +# socat is required for kubectl port forward which is used in some tests such as validateHelmTillerAddon if ! which socat &>/dev/null; then echo "WARNING: socat is not installed. will try to install." sudo apt-get update -qq sudo apt-get -qq -y install socat fi +# cri-dockerd is required for Kubernetes 1.24 and higher for none driver +if ! cri-dockerd &>/dev/null; then + echo "WARNING: cri-dockerd is not installed. will try to install." + git clone -n https://github.com/Mirantis/cri-dockerd + cd cri-dockerd + git checkout a4d1895a2659ea9974bd7528a706592ab8b74181 + cd src + env CGO_ENABLED=0 go build -ldflags '-X github.com/Mirantis/cri-dockerd/version.GitCommit=a4d1895' -o cri-dockerd + cd ../.. + sudo cp cri-dockerd/src/cri-dockerd /usr/bin/cri-dockerd + sudo cp cri-dockerd/packaging/systemd/cri-docker.service /usr/lib/systemd/system/cri-docker.service + sudo cp cri-dockerd/packaging/systemd/cri-docker.socket /usr/lib/systemd/system/cri-docker.socket +fi + # We need this for reasons now sudo sysctl fs.protected_regular=0 diff --git a/site/content/en/docs/drivers/includes/none_usage.inc b/site/content/en/docs/drivers/includes/none_usage.inc index e1664e6199..9718246772 100644 --- a/site/content/en/docs/drivers/includes/none_usage.inc +++ b/site/content/en/docs/drivers/includes/none_usage.inc @@ -4,6 +4,7 @@ A Linux VM with the following: * systemd or OpenRC * a container runtime, such as Docker or CRIO +* [cri-dockerd](https://github.com/Mirantis/cri-dockerd#build-and-install) (if using Kubernetes +v1.24 & `docker` container-runtime) This VM must also meet the [kubeadm requirements](https://kubernetes.io/docs/setup/production-environment/tools/kubeadm/install-kubeadm/), such as: diff --git a/site/content/en/docs/drivers/includes/ssh_usage.inc b/site/content/en/docs/drivers/includes/ssh_usage.inc index 608383fe81..0c2c81ea0a 100644 --- a/site/content/en/docs/drivers/includes/ssh_usage.inc +++ b/site/content/en/docs/drivers/includes/ssh_usage.inc @@ -4,6 +4,7 @@ A Linux VM with the following: * systemd or OpenRC * a container runtime, such as Docker or CRIO +* [cri-dockerd](https://github.com/Mirantis/cri-dockerd#build-and-install) (if using Kubernetes +v1.24 & `docker` container-runtime) This VM must also meet the [kubeadm requirements](https://kubernetes.io/docs/setup/production-environment/tools/kubeadm/install-kubeadm/), such as: From fe623ab0c4f5b3f1f448e0958e424da06b51ca10 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Thu, 19 May 2022 15:09:04 -0700 Subject: [PATCH 139/545] install cri-dockerd in github actions --- .github/workflows/master.yml | 18 ++++++++++++++---- .github/workflows/pr.yml | 18 ++++++++++++++---- 2 files changed, 28 insertions(+), 8 deletions(-) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 97ebe97cbe..ed5a38e2ec 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -508,21 +508,31 @@ jobs: curl -LO "https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl" sudo install kubectl /usr/local/bin/kubectl kubectl version --client=true + - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 + with: + go-version: ${{env.GO_VERSION}} + stable: true # conntrack is required for kubernetes 1.18 and higher # socat is required for kubectl port forward which is used in some tests such as validateHelmTillerAddon + # cri-dockerd is required for Kubernetes 1.24 and higher for none driver - name: Install tools for none shell: bash run: | sudo apt-get update -qq sudo apt-get -qq -y install conntrack sudo apt-get -qq -y install socat + git clone -n https://github.com/Mirantis/cri-dockerd + cd cri-dockerd + git checkout a4d1895a2659ea9974bd7528a706592ab8b74181 + cd src + env CGO_ENABLED=0 go build -ldflags '-X github.com/Mirantis/cri-dockerd/version.GitCommit=a4d1895' -o cri-dockerd + cd ../.. + sudo cp cri-dockerd/src/cri-dockerd /usr/bin/cri-dockerd + sudo cp cri-dockerd/packaging/systemd/cri-docker.service /usr/lib/systemd/system/cri-docker.service + sudo cp cri-dockerd/packaging/systemd/cri-docker.socket /usr/lib/systemd/system/cri-docker.socket VERSION="v1.17.0" curl -L https://github.com/kubernetes-sigs/cri-tools/releases/download/$VERSION/crictl-${VERSION}-linux-amd64.tar.gz --output crictl-${VERSION}-linux-amd64.tar.gz sudo tar zxvf crictl-$VERSION-linux-amd64.tar.gz -C /usr/local/bin - - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 - with: - go-version: ${{env.GO_VERSION}} - stable: true - name: Install gopogh shell: bash diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 4c38b5aeb7..448a715567 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -509,21 +509,31 @@ jobs: curl -LO "https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl" sudo install kubectl /usr/local/bin/kubectl kubectl version --client=true + - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 + with: + go-version: ${{env.GO_VERSION}} + stable: true # conntrack is required for kubernetes 1.18 and higher # socat is required for kubectl port forward which is used in some tests such as validateHelmTillerAddon + # cri-dockerd is required for Kubernetes 1.24 and higher for none driver - name: Install tools for none shell: bash run: | sudo apt-get update -qq sudo apt-get -qq -y install conntrack sudo apt-get -qq -y install socat + git clone -n https://github.com/Mirantis/cri-dockerd + cd cri-dockerd + git checkout a4d1895a2659ea9974bd7528a706592ab8b74181 + cd src + env CGO_ENABLED=0 go build -ldflags '-X github.com/Mirantis/cri-dockerd/version.GitCommit=a4d1895' -o cri-dockerd + cd ../.. + sudo cp cri-dockerd/src/cri-dockerd /usr/bin/cri-dockerd + sudo cp cri-dockerd/packaging/systemd/cri-docker.service /usr/lib/systemd/system/cri-docker.service + sudo cp cri-dockerd/packaging/systemd/cri-docker.socket /usr/lib/systemd/system/cri-docker.socket VERSION="v1.17.0" curl -L https://github.com/kubernetes-sigs/cri-tools/releases/download/$VERSION/crictl-${VERSION}-linux-amd64.tar.gz --output crictl-${VERSION}-linux-amd64.tar.gz sudo tar zxvf crictl-$VERSION-linux-amd64.tar.gz -C /usr/local/bin - - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 - with: - go-version: ${{env.GO_VERSION}} - stable: true - name: Install gopogh shell: bash From 35987a8cd49f4f53abdbdac8115e5d8b63dd36d1 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Thu, 19 May 2022 16:57:02 -0700 Subject: [PATCH 140/545] install crictl on none tests --- hack/jenkins/linux_integration_tests_none.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/hack/jenkins/linux_integration_tests_none.sh b/hack/jenkins/linux_integration_tests_none.sh index 353bc289c9..90df2157e8 100755 --- a/hack/jenkins/linux_integration_tests_none.sh +++ b/hack/jenkins/linux_integration_tests_none.sh @@ -79,6 +79,14 @@ if ! cri-dockerd &>/dev/null; then sudo cp cri-dockerd/packaging/systemd/cri-docker.socket /usr/lib/systemd/system/cri-docker.socket fi +# crictl is required for Kubernetes 1.24 and higher for none driver +if ! crictl &>/dev/null; then + echo "WARNING: crictl is not installed. will try to install." + VERSION="v1.17.0" + curl -L https://github.com/kubernetes-sigs/cri-tools/releases/download/$VERSION/crictl-${VERSION}-linux-amd64.tar.gz --output crictl-${VERSION}-linux-amd64.tar.gz + sudo tar zxvf crictl-$VERSION-linux-amd64.tar.gz -C /usr/local/bin +fi + # We need this for reasons now sudo sysctl fs.protected_regular=0 From 4f24f5bdff1d85bd49c0cc3b2df1a5d51c75d62f Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Fri, 20 May 2022 16:13:39 -0700 Subject: [PATCH 141/545] increase metric-resolution --- .../metrics-server/metrics-server-deployment.yaml.tmpl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/deploy/addons/metrics-server/metrics-server-deployment.yaml.tmpl b/deploy/addons/metrics-server/metrics-server-deployment.yaml.tmpl index e8ed7029e4..9a47a24540 100644 --- a/deploy/addons/metrics-server/metrics-server-deployment.yaml.tmpl +++ b/deploy/addons/metrics-server/metrics-server-deployment.yaml.tmpl @@ -35,7 +35,7 @@ spec: - --secure-port=4443 - --kubelet-preferred-address-types=InternalIP,ExternalIP,Hostname - --kubelet-use-node-status-port - - --metric-resolution=15s + - --metric-resolution=20s - --kubelet-insecure-tls resources: requests: @@ -47,14 +47,14 @@ spec: protocol: TCP readinessProbe: httpGet: - path: /readyz?exclude=livez + path: /readyz port: https scheme: HTTPS periodSeconds: 10 failureThreshold: 3 livenessProbe: httpGet: - path: /livez?exclude=readyz + path: /livez port: https scheme: HTTPS periodSeconds: 10 From a7a250431352f0cb9b329f4f105eb86d3da99906 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Fri, 27 May 2022 14:03:21 -0700 Subject: [PATCH 142/545] up metrics-resolution to 60s --- .../addons/metrics-server/metrics-server-deployment.yaml.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/addons/metrics-server/metrics-server-deployment.yaml.tmpl b/deploy/addons/metrics-server/metrics-server-deployment.yaml.tmpl index 9a47a24540..5d81acd9e1 100644 --- a/deploy/addons/metrics-server/metrics-server-deployment.yaml.tmpl +++ b/deploy/addons/metrics-server/metrics-server-deployment.yaml.tmpl @@ -35,7 +35,7 @@ spec: - --secure-port=4443 - --kubelet-preferred-address-types=InternalIP,ExternalIP,Hostname - --kubelet-use-node-status-port - - --metric-resolution=20s + - --metric-resolution=60s - --kubelet-insecure-tls resources: requests: From e2bc30691922edb5d92a08a68ea8920cb960c931 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Wed, 1 Jun 2022 16:13:43 -0700 Subject: [PATCH 143/545] fix copy on Windows --- pkg/minikube/cruntime/docker.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkg/minikube/cruntime/docker.go b/pkg/minikube/cruntime/docker.go index ca82f87a71..cd83dd1f94 100644 --- a/pkg/minikube/cruntime/docker.go +++ b/pkg/minikube/cruntime/docker.go @@ -23,7 +23,6 @@ import ( "os" "os/exec" "path" - "path/filepath" "strings" "text/template" "time" @@ -700,7 +699,7 @@ ExecStart=/usr/bin/cri-dockerd --container-runtime-endpoint fd:// --network-plug return errors.Wrap(err, "failed to execute template") } criDockerService := b.Bytes() - c := exec.Command("sudo", "mkdir", "-p", filepath.Dir(CRIDockerServiceConfFile)) + c := exec.Command("sudo", "mkdir", "-p", path.Dir(CRIDockerServiceConfFile)) if _, err := cr.RunCmd(c); err != nil { return errors.Wrapf(err, "failed to create directory") } From 8067862cdf513b0fd9d4fce80321db881d96afc3 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Wed, 1 Jun 2022 16:56:06 -0700 Subject: [PATCH 144/545] fix docker service state test --- pkg/minikube/cruntime/cruntime_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/minikube/cruntime/cruntime_test.go b/pkg/minikube/cruntime/cruntime_test.go index 80bf49cf0a..c5d12c024a 100644 --- a/pkg/minikube/cruntime/cruntime_test.go +++ b/pkg/minikube/cruntime/cruntime_test.go @@ -664,7 +664,7 @@ func TestEnable(t *testing.T) { }{ {"docker", defaultServices, map[string]serviceState{ - "docker": SvcRunning, + "docker": SvcRestarted, "containerd": SvcExited, "crio": SvcExited, "crio-shutdown": SvcExited, From 84955bbac595549a1d79bca4beb13176797d04cb Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Wed, 8 Jun 2022 10:56:47 -0700 Subject: [PATCH 145/545] bump k8s versions --- pkg/minikube/constants/constants.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkg/minikube/constants/constants.go b/pkg/minikube/constants/constants.go index 3bd21a6be9..e751a66f42 100644 --- a/pkg/minikube/constants/constants.go +++ b/pkg/minikube/constants/constants.go @@ -32,11 +32,10 @@ var ( const ( // DefaultKubernetesVersion is the default Kubernetes version - // dont update till #10545 is solved - DefaultKubernetesVersion = "v1.24.0" + DefaultKubernetesVersion = "v1.24.1" // NewestKubernetesVersion is the newest Kubernetes version to test against // NOTE: You may need to update coreDNS & etcd versions in pkg/minikube/bootstrapper/images/images.go - NewestKubernetesVersion = "v1.24.1-rc.0" + NewestKubernetesVersion = "v1.24.2-rc.0" // OldestKubernetesVersion is the oldest Kubernetes version to test against OldestKubernetesVersion = "v1.16.0" // NoKubernetesVersion is the version used when users does NOT want to install kubernetes From 353f9fb0eb916cbfa11548ef4477f553d887602b Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Wed, 8 Jun 2022 11:01:54 -0700 Subject: [PATCH 146/545] remove old flag --- test/integration/start_stop_delete_test.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/test/integration/start_stop_delete_test.go b/test/integration/start_stop_delete_test.go index 46f0a761f6..3f249f06d8 100644 --- a/test/integration/start_stop_delete_test.go +++ b/test/integration/start_stop_delete_test.go @@ -61,8 +61,6 @@ func TestStartStop(t *testing.T) { "--feature-gates", "ServerSideApply=true", "--network-plugin=cni", - // TODO: Remove network-plugin config when newest is 1.24 - "--extra-config=kubelet.network-plugin=cni", "--extra-config=kubeadm.pod-network-cidr=192.168.111.111/16", }}, {"default-k8s-different-port", constants.DefaultKubernetesVersion, []string{ From 900a30f67df1e4694245134f00308b191f8e47e3 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Wed, 8 Jun 2022 11:04:19 -0700 Subject: [PATCH 147/545] update docs --- site/content/en/docs/commands/start.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index e44eb1d0e2..9dbe0bb8a9 100644 --- a/site/content/en/docs/commands/start.md +++ b/site/content/en/docs/commands/start.md @@ -71,7 +71,7 @@ minikube start [flags] --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/14329/minikube-v1.26.0-1655163725-14329-amd64.iso,https://github.com/kubernetes/minikube/releases/download/v1.26.0-1655163725-14329/minikube-v1.26.0-1655163725-14329-amd64.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.26.0-1655163725-14329-amd64.iso,https://storage.googleapis.com/minikube-builds/iso/14329/minikube-v1.26.0-1655163725-14329.iso,https://github.com/kubernetes/minikube/releases/download/v1.26.0-1655163725-14329/minikube-v1.26.0-1655163725-14329.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.26.0-1655163725-14329.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.24.0, 'latest' for v1.24.1-rc.0). Defaults to 'stable'. + --kubernetes-version string The Kubernetes version that the minikube VM will use (ex: v1.2.3, 'stable' for v1.24.1, 'latest' for v1.24.2-rc.0). Defaults to 'stable'. --kvm-gpu Enable experimental NVIDIA GPU support in minikube --kvm-hidden Hide the hypervisor signature from the guest in minikube (kvm2 driver only) --kvm-network string The KVM default network name. (kvm2 driver only) (default "default") From d4a783c6d5b56e2175b2827543f62e45736cab7c Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Wed, 8 Jun 2022 12:44:14 -0700 Subject: [PATCH 148/545] update cri-docker version --- deploy/kicbase/Dockerfile | 2 +- hack/update/cri_dockerd/update_cri_dockerd.sh | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/deploy/kicbase/Dockerfile b/deploy/kicbase/Dockerfile index 743fb5eea1..6c42a9250f 100644 --- a/deploy/kicbase/Dockerfile +++ b/deploy/kicbase/Dockerfile @@ -42,7 +42,7 @@ ARG BUILDKIT_VERSION="v0.10.3" ARG FUSE_OVERLAYFS_VERSION="v1.7.1" ARG CONTAINERD_FUSE_OVERLAYFS_VERSION="1.0.3" ARG CRIO_VERSION="1.22" -ARG CRI_DOCKERD_VERSION="a4d1895a2659ea9974bd7528a706592ab8b74181" +ARG CRI_DOCKERD_VERSION="d627d3e64a0ebf4cd4c9f80c131c34fc615258b5" ARG TARGETARCH # copy in static files (configs, scripts) diff --git a/hack/update/cri_dockerd/update_cri_dockerd.sh b/hack/update/cri_dockerd/update_cri_dockerd.sh index f6ea8e841d..bf42db6de6 100755 --- a/hack/update/cri_dockerd/update_cri_dockerd.sh +++ b/hack/update/cri_dockerd/update_cri_dockerd.sh @@ -31,7 +31,6 @@ pushd $tmpdir git clone -n https://github.com/Mirantis/cri-dockerd cd cri-dockerd git checkout $version -cd src for (( i=0; i < ${#archarray[*]}; i++ )) do @@ -41,7 +40,6 @@ do done -cd .. gsutil cp ./packaging/systemd/cri-docker.service gs://kicbase-artifacts/cri-dockerd/$version/cri-docker.service gsutil cp ./packaging/systemd/cri-docker.socket gs://kicbase-artifacts/cri-dockerd/$version/cri-docker.socket From 1a5d2b67817f25480d0040a7a88839029ee3c90b Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Wed, 8 Jun 2022 14:45:47 -0700 Subject: [PATCH 149/545] set hairpin for cri-docker --- pkg/minikube/cruntime/docker.go | 1 + 1 file changed, 1 insertion(+) diff --git a/pkg/minikube/cruntime/docker.go b/pkg/minikube/cruntime/docker.go index cd83dd1f94..de4763069a 100644 --- a/pkg/minikube/cruntime/docker.go +++ b/pkg/minikube/cruntime/docker.go @@ -679,6 +679,7 @@ func dockerConfigureNetworkPlugin(r Manager, cr CommandRunner, networkPlugin str args += " --cni-bin-dir=" + CNIBinDir args += " --cni-cache-dir=" + CNICacheDir args += " --cni-conf-dir=" + cni.ConfDir + args += " --hairpin-mode=promiscuous-bridge" } opts := struct { From e33a694cda191a3ef7449707c52202bb53b2c141 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Wed, 8 Jun 2022 15:03:27 -0700 Subject: [PATCH 150/545] update CI cri-docker versions --- .github/workflows/master.yml | 8 ++++---- .github/workflows/pr.yml | 8 ++++---- hack/jenkins/linux_integration_tests_none.sh | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index ed5a38e2ec..b3b3bb1569 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -521,12 +521,12 @@ jobs: sudo apt-get update -qq sudo apt-get -qq -y install conntrack sudo apt-get -qq -y install socat + CRI_DOCKER_VERSION="d627d3e64a0ebf4cd4c9f80c131c34fc615258b5" git clone -n https://github.com/Mirantis/cri-dockerd cd cri-dockerd - git checkout a4d1895a2659ea9974bd7528a706592ab8b74181 - cd src - env CGO_ENABLED=0 go build -ldflags '-X github.com/Mirantis/cri-dockerd/version.GitCommit=a4d1895' -o cri-dockerd - cd ../.. + git checkout "$CRI_DOCKER_VERSION" + env CGO_ENABLED=0 go build -ldflags '-X github.com/Mirantis/cri-dockerd/version.GitCommit=${CRI_DOCKER_VERSION:0:7}' -o cri-dockerd + cd .. sudo cp cri-dockerd/src/cri-dockerd /usr/bin/cri-dockerd sudo cp cri-dockerd/packaging/systemd/cri-docker.service /usr/lib/systemd/system/cri-docker.service sudo cp cri-dockerd/packaging/systemd/cri-docker.socket /usr/lib/systemd/system/cri-docker.socket diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 448a715567..909239dd50 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -522,12 +522,12 @@ jobs: sudo apt-get update -qq sudo apt-get -qq -y install conntrack sudo apt-get -qq -y install socat + CRI_DOCKER_VERSION="d627d3e64a0ebf4cd4c9f80c131c34fc615258b5" git clone -n https://github.com/Mirantis/cri-dockerd cd cri-dockerd - git checkout a4d1895a2659ea9974bd7528a706592ab8b74181 - cd src - env CGO_ENABLED=0 go build -ldflags '-X github.com/Mirantis/cri-dockerd/version.GitCommit=a4d1895' -o cri-dockerd - cd ../.. + git checkout "$CRI_DOCKER_VERSION" + env CGO_ENABLED=0 go build -ldflags '-X github.com/Mirantis/cri-dockerd/version.GitCommit=${CRI_DOCKER_VERSION:0:7}' -o cri-dockerd + cd .. sudo cp cri-dockerd/src/cri-dockerd /usr/bin/cri-dockerd sudo cp cri-dockerd/packaging/systemd/cri-docker.service /usr/lib/systemd/system/cri-docker.service sudo cp cri-dockerd/packaging/systemd/cri-docker.socket /usr/lib/systemd/system/cri-docker.socket diff --git a/hack/jenkins/linux_integration_tests_none.sh b/hack/jenkins/linux_integration_tests_none.sh index 90df2157e8..d8c5205910 100755 --- a/hack/jenkins/linux_integration_tests_none.sh +++ b/hack/jenkins/linux_integration_tests_none.sh @@ -68,12 +68,12 @@ fi # cri-dockerd is required for Kubernetes 1.24 and higher for none driver if ! cri-dockerd &>/dev/null; then echo "WARNING: cri-dockerd is not installed. will try to install." + CRI_DOCKER_VERSION="d627d3e64a0ebf4cd4c9f80c131c34fc615258b5" git clone -n https://github.com/Mirantis/cri-dockerd cd cri-dockerd - git checkout a4d1895a2659ea9974bd7528a706592ab8b74181 - cd src - env CGO_ENABLED=0 go build -ldflags '-X github.com/Mirantis/cri-dockerd/version.GitCommit=a4d1895' -o cri-dockerd - cd ../.. + git checkout "$CRI_DOCKER_VERSION" + env CGO_ENABLED=0 go build -ldflags '-X github.com/Mirantis/cri-dockerd/version.GitCommit=${CRI_DOCKER_VERSION:0:7}' -o cri-dockerd + cd .. sudo cp cri-dockerd/src/cri-dockerd /usr/bin/cri-dockerd sudo cp cri-dockerd/packaging/systemd/cri-docker.service /usr/lib/systemd/system/cri-docker.service sudo cp cri-dockerd/packaging/systemd/cri-docker.socket /usr/lib/systemd/system/cri-docker.socket From f16cce541de9963885c0240ee59abab973d29629 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Thu, 9 Jun 2022 10:59:48 -0700 Subject: [PATCH 151/545] update cri-docker in ISO --- .../aarch64/package/cri-dockerd-aarch64/cri-dockerd.hash | 1 + .../aarch64/package/cri-dockerd-aarch64/cri-dockerd.mk | 8 ++++---- .../arch/x86_64/package/cri-dockerd/cri-dockerd.hash | 1 + .../arch/x86_64/package/cri-dockerd/cri-dockerd.mk | 8 ++++---- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/cri-dockerd-aarch64/cri-dockerd.hash b/deploy/iso/minikube-iso/arch/aarch64/package/cri-dockerd-aarch64/cri-dockerd.hash index 1693e1b9d4..6432679054 100644 --- a/deploy/iso/minikube-iso/arch/aarch64/package/cri-dockerd-aarch64/cri-dockerd.hash +++ b/deploy/iso/minikube-iso/arch/aarch64/package/cri-dockerd-aarch64/cri-dockerd.hash @@ -1,3 +1,4 @@ sha256 4acd7605a0cb95a6ad50314d1f2497b92ee0f07382062d0c18a5434c1a3b9513 542e27dee12db61d6e96d2a83a20359474a5efa2.tar.gz sha256 b2a082a8846ac74b8482ee6353d480cea0dec017bbec2b59b16e3f91efa2f5ca eb0c48ef49856f7d098ec005ddebcae197e08e49.tar.gz sha256 ceb99430633f75f354c0e9fea1f3cf0e5138ac5ee3c2691a1a70811fd2feeeef a4d1895a2659ea9974bd7528a706592ab8b74181.tar.gz +sha256 e75e79e84760c7a2a9f90c3c45bdb6f1c8a08c9adddc9b816162b287b400988c d627d3e64a0ebf4cd4c9f80c131c34fc615258b5.tar.gz diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/cri-dockerd-aarch64/cri-dockerd.mk b/deploy/iso/minikube-iso/arch/aarch64/package/cri-dockerd-aarch64/cri-dockerd.mk index f4af4616b3..cdd85833bf 100644 --- a/deploy/iso/minikube-iso/arch/aarch64/package/cri-dockerd-aarch64/cri-dockerd.mk +++ b/deploy/iso/minikube-iso/arch/aarch64/package/cri-dockerd-aarch64/cri-dockerd.mk @@ -4,10 +4,10 @@ # ################################################################################ -# As of 2022-02-03 -CRI_DOCKERD_AARCH64_VER = 0.2.0 -CRI_DOCKERD_AARCH64_REV = a4d1895 -CRI_DOCKERD_AARCH64_VERSION = a4d1895a2659ea9974bd7528a706592ab8b74181 +# As of 2022-06-09 +CRI_DOCKERD_AARCH64_VER = 0.2.2 +CRI_DOCKERD_AARCH64_REV = d627d3e +CRI_DOCKERD_AARCH64_VERSION = d627d3e64a0ebf4cd4c9f80c131c34fc615258b5 CRI_DOCKERD_AARCH64_SITE = https://github.com/Mirantis/cri-dockerd/archive CRI_DOCKERD_AARCH64_SOURCE = $(CRI_DOCKERD_AARCH64_VERSION).tar.gz diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/cri-dockerd/cri-dockerd.hash b/deploy/iso/minikube-iso/arch/x86_64/package/cri-dockerd/cri-dockerd.hash index 1693e1b9d4..6432679054 100644 --- a/deploy/iso/minikube-iso/arch/x86_64/package/cri-dockerd/cri-dockerd.hash +++ b/deploy/iso/minikube-iso/arch/x86_64/package/cri-dockerd/cri-dockerd.hash @@ -1,3 +1,4 @@ sha256 4acd7605a0cb95a6ad50314d1f2497b92ee0f07382062d0c18a5434c1a3b9513 542e27dee12db61d6e96d2a83a20359474a5efa2.tar.gz sha256 b2a082a8846ac74b8482ee6353d480cea0dec017bbec2b59b16e3f91efa2f5ca eb0c48ef49856f7d098ec005ddebcae197e08e49.tar.gz sha256 ceb99430633f75f354c0e9fea1f3cf0e5138ac5ee3c2691a1a70811fd2feeeef a4d1895a2659ea9974bd7528a706592ab8b74181.tar.gz +sha256 e75e79e84760c7a2a9f90c3c45bdb6f1c8a08c9adddc9b816162b287b400988c d627d3e64a0ebf4cd4c9f80c131c34fc615258b5.tar.gz diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/cri-dockerd/cri-dockerd.mk b/deploy/iso/minikube-iso/arch/x86_64/package/cri-dockerd/cri-dockerd.mk index 501fc49fbe..5116a13b98 100644 --- a/deploy/iso/minikube-iso/arch/x86_64/package/cri-dockerd/cri-dockerd.mk +++ b/deploy/iso/minikube-iso/arch/x86_64/package/cri-dockerd/cri-dockerd.mk @@ -4,10 +4,10 @@ # ################################################################################ -# As of 2022-02-03 -CRI_DOCKERD_VER = 0.2.0 -CRI_DOCKERD_REV = a4d1895 -CRI_DOCKERD_VERSION = a4d1895a2659ea9974bd7528a706592ab8b74181 +# As of 2022-06-09 +CRI_DOCKERD_VER = 0.2.2 +CRI_DOCKERD_REV = d627d3e +CRI_DOCKERD_VERSION = d627d3e64a0ebf4cd4c9f80c131c34fc615258b5 CRI_DOCKERD_SITE = https://github.com/Mirantis/cri-dockerd/archive CRI_DOCKERD_SOURCE = $(CRI_DOCKERD_VERSION).tar.gz From 1b7f6d5435c4904f5bf1581bf77596bc07e17134 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Tue, 14 Jun 2022 11:27:07 -0700 Subject: [PATCH 152/545] downgrade newest to 1.24.1 --- pkg/minikube/constants/constants.go | 2 +- site/content/en/docs/commands/start.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/minikube/constants/constants.go b/pkg/minikube/constants/constants.go index e751a66f42..82ada2797c 100644 --- a/pkg/minikube/constants/constants.go +++ b/pkg/minikube/constants/constants.go @@ -35,7 +35,7 @@ const ( DefaultKubernetesVersion = "v1.24.1" // NewestKubernetesVersion is the newest Kubernetes version to test against // NOTE: You may need to update coreDNS & etcd versions in pkg/minikube/bootstrapper/images/images.go - NewestKubernetesVersion = "v1.24.2-rc.0" + NewestKubernetesVersion = "v1.24.1" // OldestKubernetesVersion is the oldest Kubernetes version to test against OldestKubernetesVersion = "v1.16.0" // NoKubernetesVersion is the version used when users does NOT want to install kubernetes diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index 9dbe0bb8a9..fae3c30b04 100644 --- a/site/content/en/docs/commands/start.md +++ b/site/content/en/docs/commands/start.md @@ -71,7 +71,7 @@ minikube start [flags] --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/14329/minikube-v1.26.0-1655163725-14329-amd64.iso,https://github.com/kubernetes/minikube/releases/download/v1.26.0-1655163725-14329/minikube-v1.26.0-1655163725-14329-amd64.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.26.0-1655163725-14329-amd64.iso,https://storage.googleapis.com/minikube-builds/iso/14329/minikube-v1.26.0-1655163725-14329.iso,https://github.com/kubernetes/minikube/releases/download/v1.26.0-1655163725-14329/minikube-v1.26.0-1655163725-14329.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.26.0-1655163725-14329.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.24.1, 'latest' for v1.24.2-rc.0). Defaults to 'stable'. + --kubernetes-version string The Kubernetes version that the minikube VM will use (ex: v1.2.3, 'stable' for v1.24.1, 'latest' for v1.24.1). Defaults to 'stable'. --kvm-gpu Enable experimental NVIDIA GPU support in minikube --kvm-hidden Hide the hypervisor signature from the guest in minikube (kvm2 driver only) --kvm-network string The KVM default network name. (kvm2 driver only) (default "default") From 20e6499b6cc8ac2c56657860bd993b936fe0cb45 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Tue, 14 Jun 2022 14:18:14 -0700 Subject: [PATCH 153/545] restore kicbase image --- pkg/drivers/kic/types.go | 4 ++-- site/content/en/docs/commands/start.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/drivers/kic/types.go b/pkg/drivers/kic/types.go index 638c6ac6ee..050e4ae4a6 100644 --- a/pkg/drivers/kic/types.go +++ b/pkg/drivers/kic/types.go @@ -24,9 +24,9 @@ import ( const ( // Version is the current version of kic - Version = "v0.0.31-1655167405-14337" + Version = "v0.0.31-1655231662-14197" // SHA of the kic base image - baseImageSHA = "007ee1d2e27a61d87fd05c11b41a5956577f975ef7440d0283f28fa9c5dc4f26" + baseImageSHA = "4e4069397beafbcb2f49b772ad0d2ed30c7212202cbfbc0a17dad0f8d6f8fd9e" // The name of the GCR kicbase repository gcrRepo = "gcr.io/k8s-minikube/kicbase-builds" // The name of the Dockerhub kicbase repository diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index fae3c30b04..f083cda319 100644 --- a/site/content/en/docs/commands/start.md +++ b/site/content/en/docs/commands/start.md @@ -26,7 +26,7 @@ minikube start [flags] --apiserver-names strings A set of apiserver names which are used in the generated certificate for kubernetes. This can be used if you want to make the apiserver available from outside the machine --apiserver-port int The apiserver listening port (default 8443) --auto-update-drivers If set, automatically updates drivers to the latest version. Defaults to true. (default true) - --base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase-builds:v0.0.31-1655167405-14337@sha256:007ee1d2e27a61d87fd05c11b41a5956577f975ef7440d0283f28fa9c5dc4f26") + --base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase-builds:v0.0.31-1655231662-14197@sha256:4e4069397beafbcb2f49b772ad0d2ed30c7212202cbfbc0a17dad0f8d6f8fd9e") --binary-mirror string Location to fetch kubectl, kubelet, & kubeadm binaries from. --cache-images If true, cache docker images for the current bootstrapper and load them into the machine. Always false with --driver=none. (default true) --cert-expiration duration Duration until minikube certificate expiration, defaults to three years (26280h). (default 26280h0m0s) From c88c6e70bc508a243b99cddd4adce8dd66c4000e Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Wed, 15 Jun 2022 01:06:32 +0000 Subject: [PATCH 154/545] Updating ISO to v1.26.0-1655241299-14197 --- 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 8896c1a836..3572721fd3 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.26.0-1655163725-14329 +ISO_VERSION ?= v1.26.0-1655241299-14197 # 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 8ac2ce6a36..1f13d85db3 100644 --- a/pkg/minikube/download/iso.go +++ b/pkg/minikube/download/iso.go @@ -41,7 +41,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/14329" + isoBucket := "minikube-builds/iso/14197" return []string{ fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s-%s.iso", isoBucket, v, runtime.GOARCH), fmt.Sprintf("https://github.com/kubernetes/minikube/releases/download/%s/minikube-%s-%s.iso", v, v, runtime.GOARCH), diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index f083cda319..f07c169291 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/14329/minikube-v1.26.0-1655163725-14329-amd64.iso,https://github.com/kubernetes/minikube/releases/download/v1.26.0-1655163725-14329/minikube-v1.26.0-1655163725-14329-amd64.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.26.0-1655163725-14329-amd64.iso,https://storage.googleapis.com/minikube-builds/iso/14329/minikube-v1.26.0-1655163725-14329.iso,https://github.com/kubernetes/minikube/releases/download/v1.26.0-1655163725-14329/minikube-v1.26.0-1655163725-14329.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.26.0-1655163725-14329.iso]) + --iso-url strings Locations to fetch the minikube ISO from. (default [https://storage.googleapis.com/minikube-builds/iso/14197/minikube-v1.26.0-1655241299-14197-amd64.iso,https://github.com/kubernetes/minikube/releases/download/v1.26.0-1655241299-14197/minikube-v1.26.0-1655241299-14197-amd64.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.26.0-1655241299-14197-amd64.iso,https://storage.googleapis.com/minikube-builds/iso/14197/minikube-v1.26.0-1655241299-14197.iso,https://github.com/kubernetes/minikube/releases/download/v1.26.0-1655241299-14197/minikube-v1.26.0-1655241299-14197.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.26.0-1655241299-14197.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.24.1, 'latest' for v1.24.1). Defaults to 'stable'. --kvm-gpu Enable experimental NVIDIA GPU support in minikube From 42fb10861c903351025ecba3f49ac90bd8a2d896 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Wed, 15 Jun 2022 13:48:41 -0700 Subject: [PATCH 155/545] update cri-docker commit --- .github/workflows/master.yml | 2 +- .github/workflows/pr.yml | 2 +- .../arch/aarch64/package/cri-dockerd-aarch64/cri-dockerd.hash | 2 +- .../arch/aarch64/package/cri-dockerd-aarch64/cri-dockerd.mk | 4 ++-- .../arch/x86_64/package/cri-dockerd/cri-dockerd.hash | 2 +- .../arch/x86_64/package/cri-dockerd/cri-dockerd.mk | 4 ++-- deploy/kicbase/Dockerfile | 2 +- hack/jenkins/linux_integration_tests_none.sh | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index b3b3bb1569..53e7c2e29e 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -521,7 +521,7 @@ jobs: sudo apt-get update -qq sudo apt-get -qq -y install conntrack sudo apt-get -qq -y install socat - CRI_DOCKER_VERSION="d627d3e64a0ebf4cd4c9f80c131c34fc615258b5" + CRI_DOCKER_VERSION="0737013d3c48992724283d151e8a2a767a1839e9" git clone -n https://github.com/Mirantis/cri-dockerd cd cri-dockerd git checkout "$CRI_DOCKER_VERSION" diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 909239dd50..dcc7b45951 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -522,7 +522,7 @@ jobs: sudo apt-get update -qq sudo apt-get -qq -y install conntrack sudo apt-get -qq -y install socat - CRI_DOCKER_VERSION="d627d3e64a0ebf4cd4c9f80c131c34fc615258b5" + CRI_DOCKER_VERSION="0737013d3c48992724283d151e8a2a767a1839e9" git clone -n https://github.com/Mirantis/cri-dockerd cd cri-dockerd git checkout "$CRI_DOCKER_VERSION" diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/cri-dockerd-aarch64/cri-dockerd.hash b/deploy/iso/minikube-iso/arch/aarch64/package/cri-dockerd-aarch64/cri-dockerd.hash index 6432679054..1b98c60d4f 100644 --- a/deploy/iso/minikube-iso/arch/aarch64/package/cri-dockerd-aarch64/cri-dockerd.hash +++ b/deploy/iso/minikube-iso/arch/aarch64/package/cri-dockerd-aarch64/cri-dockerd.hash @@ -1,4 +1,4 @@ sha256 4acd7605a0cb95a6ad50314d1f2497b92ee0f07382062d0c18a5434c1a3b9513 542e27dee12db61d6e96d2a83a20359474a5efa2.tar.gz sha256 b2a082a8846ac74b8482ee6353d480cea0dec017bbec2b59b16e3f91efa2f5ca eb0c48ef49856f7d098ec005ddebcae197e08e49.tar.gz sha256 ceb99430633f75f354c0e9fea1f3cf0e5138ac5ee3c2691a1a70811fd2feeeef a4d1895a2659ea9974bd7528a706592ab8b74181.tar.gz -sha256 e75e79e84760c7a2a9f90c3c45bdb6f1c8a08c9adddc9b816162b287b400988c d627d3e64a0ebf4cd4c9f80c131c34fc615258b5.tar.gz +sha256 2bdef1ae691fc2e179fa808a39c643986bb12867737bfed0fa4b5cb379dd4e6e 0737013d3c48992724283d151e8a2a767a1839e9.tar.gz diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/cri-dockerd-aarch64/cri-dockerd.mk b/deploy/iso/minikube-iso/arch/aarch64/package/cri-dockerd-aarch64/cri-dockerd.mk index cdd85833bf..4f7ee9ef50 100644 --- a/deploy/iso/minikube-iso/arch/aarch64/package/cri-dockerd-aarch64/cri-dockerd.mk +++ b/deploy/iso/minikube-iso/arch/aarch64/package/cri-dockerd-aarch64/cri-dockerd.mk @@ -6,8 +6,8 @@ # As of 2022-06-09 CRI_DOCKERD_AARCH64_VER = 0.2.2 -CRI_DOCKERD_AARCH64_REV = d627d3e -CRI_DOCKERD_AARCH64_VERSION = d627d3e64a0ebf4cd4c9f80c131c34fc615258b5 +CRI_DOCKERD_AARCH64_REV = 0737013 +CRI_DOCKERD_AARCH64_VERSION = 0737013d3c48992724283d151e8a2a767a1839e9 CRI_DOCKERD_AARCH64_SITE = https://github.com/Mirantis/cri-dockerd/archive CRI_DOCKERD_AARCH64_SOURCE = $(CRI_DOCKERD_AARCH64_VERSION).tar.gz diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/cri-dockerd/cri-dockerd.hash b/deploy/iso/minikube-iso/arch/x86_64/package/cri-dockerd/cri-dockerd.hash index 6432679054..1b98c60d4f 100644 --- a/deploy/iso/minikube-iso/arch/x86_64/package/cri-dockerd/cri-dockerd.hash +++ b/deploy/iso/minikube-iso/arch/x86_64/package/cri-dockerd/cri-dockerd.hash @@ -1,4 +1,4 @@ sha256 4acd7605a0cb95a6ad50314d1f2497b92ee0f07382062d0c18a5434c1a3b9513 542e27dee12db61d6e96d2a83a20359474a5efa2.tar.gz sha256 b2a082a8846ac74b8482ee6353d480cea0dec017bbec2b59b16e3f91efa2f5ca eb0c48ef49856f7d098ec005ddebcae197e08e49.tar.gz sha256 ceb99430633f75f354c0e9fea1f3cf0e5138ac5ee3c2691a1a70811fd2feeeef a4d1895a2659ea9974bd7528a706592ab8b74181.tar.gz -sha256 e75e79e84760c7a2a9f90c3c45bdb6f1c8a08c9adddc9b816162b287b400988c d627d3e64a0ebf4cd4c9f80c131c34fc615258b5.tar.gz +sha256 2bdef1ae691fc2e179fa808a39c643986bb12867737bfed0fa4b5cb379dd4e6e 0737013d3c48992724283d151e8a2a767a1839e9.tar.gz diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/cri-dockerd/cri-dockerd.mk b/deploy/iso/minikube-iso/arch/x86_64/package/cri-dockerd/cri-dockerd.mk index 5116a13b98..5502a2b9b8 100644 --- a/deploy/iso/minikube-iso/arch/x86_64/package/cri-dockerd/cri-dockerd.mk +++ b/deploy/iso/minikube-iso/arch/x86_64/package/cri-dockerd/cri-dockerd.mk @@ -6,8 +6,8 @@ # As of 2022-06-09 CRI_DOCKERD_VER = 0.2.2 -CRI_DOCKERD_REV = d627d3e -CRI_DOCKERD_VERSION = d627d3e64a0ebf4cd4c9f80c131c34fc615258b5 +CRI_DOCKERD_REV = 0737013 +CRI_DOCKERD_VERSION = 0737013d3c48992724283d151e8a2a767a1839e9 CRI_DOCKERD_SITE = https://github.com/Mirantis/cri-dockerd/archive CRI_DOCKERD_SOURCE = $(CRI_DOCKERD_VERSION).tar.gz diff --git a/deploy/kicbase/Dockerfile b/deploy/kicbase/Dockerfile index 6c42a9250f..2297b5ae80 100644 --- a/deploy/kicbase/Dockerfile +++ b/deploy/kicbase/Dockerfile @@ -42,7 +42,7 @@ ARG BUILDKIT_VERSION="v0.10.3" ARG FUSE_OVERLAYFS_VERSION="v1.7.1" ARG CONTAINERD_FUSE_OVERLAYFS_VERSION="1.0.3" ARG CRIO_VERSION="1.22" -ARG CRI_DOCKERD_VERSION="d627d3e64a0ebf4cd4c9f80c131c34fc615258b5" +ARG CRI_DOCKERD_VERSION="0737013d3c48992724283d151e8a2a767a1839e9" ARG TARGETARCH # copy in static files (configs, scripts) diff --git a/hack/jenkins/linux_integration_tests_none.sh b/hack/jenkins/linux_integration_tests_none.sh index d8c5205910..220441542d 100755 --- a/hack/jenkins/linux_integration_tests_none.sh +++ b/hack/jenkins/linux_integration_tests_none.sh @@ -68,7 +68,7 @@ fi # cri-dockerd is required for Kubernetes 1.24 and higher for none driver if ! cri-dockerd &>/dev/null; then echo "WARNING: cri-dockerd is not installed. will try to install." - CRI_DOCKER_VERSION="d627d3e64a0ebf4cd4c9f80c131c34fc615258b5" + CRI_DOCKER_VERSION="0737013d3c48992724283d151e8a2a767a1839e9" git clone -n https://github.com/Mirantis/cri-dockerd cd cri-dockerd git checkout "$CRI_DOCKER_VERSION" From 3cce504908f572bc00cabb8bfff717fa786edaa4 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Wed, 15 Jun 2022 21:10:23 +0000 Subject: [PATCH 156/545] Updating kicbase image to v0.0.31-1655326339-14197 --- pkg/drivers/kic/types.go | 4 ++-- site/content/en/docs/commands/start.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/drivers/kic/types.go b/pkg/drivers/kic/types.go index 050e4ae4a6..2da8030b88 100644 --- a/pkg/drivers/kic/types.go +++ b/pkg/drivers/kic/types.go @@ -24,9 +24,9 @@ import ( const ( // Version is the current version of kic - Version = "v0.0.31-1655231662-14197" + Version = "v0.0.31-1655326339-14197" // SHA of the kic base image - baseImageSHA = "4e4069397beafbcb2f49b772ad0d2ed30c7212202cbfbc0a17dad0f8d6f8fd9e" + baseImageSHA = "9190bd2393eae887316c97a74370b7d5dad8f0b2ef91ac2662bc36f7ef8e0b95" // The name of the GCR kicbase repository gcrRepo = "gcr.io/k8s-minikube/kicbase-builds" // The name of the Dockerhub kicbase repository diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index f07c169291..08174238b0 100644 --- a/site/content/en/docs/commands/start.md +++ b/site/content/en/docs/commands/start.md @@ -26,7 +26,7 @@ minikube start [flags] --apiserver-names strings A set of apiserver names which are used in the generated certificate for kubernetes. This can be used if you want to make the apiserver available from outside the machine --apiserver-port int The apiserver listening port (default 8443) --auto-update-drivers If set, automatically updates drivers to the latest version. Defaults to true. (default true) - --base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase-builds:v0.0.31-1655231662-14197@sha256:4e4069397beafbcb2f49b772ad0d2ed30c7212202cbfbc0a17dad0f8d6f8fd9e") + --base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase-builds:v0.0.31-1655326339-14197@sha256:9190bd2393eae887316c97a74370b7d5dad8f0b2ef91ac2662bc36f7ef8e0b95") --binary-mirror string Location to fetch kubectl, kubelet, & kubeadm binaries from. --cache-images If true, cache docker images for the current bootstrapper and load them into the machine. Always false with --driver=none. (default true) --cert-expiration duration Duration until minikube certificate expiration, defaults to three years (26280h). (default 26280h0m0s) From 5869f12abbc8417bbaee0f7123e1b0962462fc0b Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Wed, 15 Jun 2022 15:17:18 -0700 Subject: [PATCH 157/545] fix cri-docker copy path --- .github/workflows/master.yml | 2 +- .github/workflows/pr.yml | 2 +- hack/jenkins/linux_integration_tests_none.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 53e7c2e29e..6b3a27f2f0 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -527,7 +527,7 @@ jobs: git checkout "$CRI_DOCKER_VERSION" env CGO_ENABLED=0 go build -ldflags '-X github.com/Mirantis/cri-dockerd/version.GitCommit=${CRI_DOCKER_VERSION:0:7}' -o cri-dockerd cd .. - sudo cp cri-dockerd/src/cri-dockerd /usr/bin/cri-dockerd + sudo cp cri-dockerd/cri-dockerd /usr/bin/cri-dockerd sudo cp cri-dockerd/packaging/systemd/cri-docker.service /usr/lib/systemd/system/cri-docker.service sudo cp cri-dockerd/packaging/systemd/cri-docker.socket /usr/lib/systemd/system/cri-docker.socket VERSION="v1.17.0" diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index dcc7b45951..bd7990149e 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -528,7 +528,7 @@ jobs: git checkout "$CRI_DOCKER_VERSION" env CGO_ENABLED=0 go build -ldflags '-X github.com/Mirantis/cri-dockerd/version.GitCommit=${CRI_DOCKER_VERSION:0:7}' -o cri-dockerd cd .. - sudo cp cri-dockerd/src/cri-dockerd /usr/bin/cri-dockerd + sudo cp cri-dockerd/cri-dockerd /usr/bin/cri-dockerd sudo cp cri-dockerd/packaging/systemd/cri-docker.service /usr/lib/systemd/system/cri-docker.service sudo cp cri-dockerd/packaging/systemd/cri-docker.socket /usr/lib/systemd/system/cri-docker.socket VERSION="v1.17.0" diff --git a/hack/jenkins/linux_integration_tests_none.sh b/hack/jenkins/linux_integration_tests_none.sh index 220441542d..4874847411 100755 --- a/hack/jenkins/linux_integration_tests_none.sh +++ b/hack/jenkins/linux_integration_tests_none.sh @@ -74,7 +74,7 @@ if ! cri-dockerd &>/dev/null; then git checkout "$CRI_DOCKER_VERSION" env CGO_ENABLED=0 go build -ldflags '-X github.com/Mirantis/cri-dockerd/version.GitCommit=${CRI_DOCKER_VERSION:0:7}' -o cri-dockerd cd .. - sudo cp cri-dockerd/src/cri-dockerd /usr/bin/cri-dockerd + sudo cp cri-dockerd/cri-dockerd /usr/bin/cri-dockerd sudo cp cri-dockerd/packaging/systemd/cri-docker.service /usr/lib/systemd/system/cri-docker.service sudo cp cri-dockerd/packaging/systemd/cri-docker.socket /usr/lib/systemd/system/cri-docker.socket fi From 6d7c51fb88d6a480296fae789ffcbaf24aa87784 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Wed, 15 Jun 2022 17:14:03 -0700 Subject: [PATCH 158/545] restart cri-docker after config updated --- pkg/minikube/cruntime/cruntime.go | 6 +++++- pkg/minikube/cruntime/docker.go | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkg/minikube/cruntime/cruntime.go b/pkg/minikube/cruntime/cruntime.go index cb09449689..4b4017a71e 100644 --- a/pkg/minikube/cruntime/cruntime.go +++ b/pkg/minikube/cruntime/cruntime.go @@ -345,5 +345,9 @@ func ConfigureNetworkPlugin(r Manager, cr CommandRunner, networkPlugin string) e } return nil } - return dockerConfigureNetworkPlugin(r, cr, networkPlugin) + dm, ok := r.(*Docker) + if !ok { + return fmt.Errorf("name and type mismatch") + } + return dockerConfigureNetworkPlugin(*dm, cr, networkPlugin) } diff --git a/pkg/minikube/cruntime/docker.go b/pkg/minikube/cruntime/docker.go index de4763069a..93d370e730 100644 --- a/pkg/minikube/cruntime/docker.go +++ b/pkg/minikube/cruntime/docker.go @@ -668,7 +668,7 @@ const ( CNICacheDir = "/var/lib/cni/cache" ) -func dockerConfigureNetworkPlugin(r Manager, cr CommandRunner, networkPlugin string) error { +func dockerConfigureNetworkPlugin(r Docker, cr CommandRunner, networkPlugin string) error { if networkPlugin == "" { // no-op plugin return nil @@ -708,5 +708,5 @@ ExecStart=/usr/bin/cri-dockerd --container-runtime-endpoint fd:// --network-plug if err := cr.Copy(svc); err != nil { return errors.Wrap(err, "failed to copy template") } - return nil + return r.Init.Restart("cri-docker") } From 80596422462b905c4ed06a7369c93c74a96b5ef5 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Thu, 16 Jun 2022 12:23:14 -0700 Subject: [PATCH 159/545] fix cri-docker hash --- .../arch/aarch64/package/cri-dockerd-aarch64/cri-dockerd.hash | 2 +- .../arch/x86_64/package/cri-dockerd/cri-dockerd.hash | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/cri-dockerd-aarch64/cri-dockerd.hash b/deploy/iso/minikube-iso/arch/aarch64/package/cri-dockerd-aarch64/cri-dockerd.hash index 1b98c60d4f..cac3a05745 100644 --- a/deploy/iso/minikube-iso/arch/aarch64/package/cri-dockerd-aarch64/cri-dockerd.hash +++ b/deploy/iso/minikube-iso/arch/aarch64/package/cri-dockerd-aarch64/cri-dockerd.hash @@ -1,4 +1,4 @@ sha256 4acd7605a0cb95a6ad50314d1f2497b92ee0f07382062d0c18a5434c1a3b9513 542e27dee12db61d6e96d2a83a20359474a5efa2.tar.gz sha256 b2a082a8846ac74b8482ee6353d480cea0dec017bbec2b59b16e3f91efa2f5ca eb0c48ef49856f7d098ec005ddebcae197e08e49.tar.gz sha256 ceb99430633f75f354c0e9fea1f3cf0e5138ac5ee3c2691a1a70811fd2feeeef a4d1895a2659ea9974bd7528a706592ab8b74181.tar.gz -sha256 2bdef1ae691fc2e179fa808a39c643986bb12867737bfed0fa4b5cb379dd4e6e 0737013d3c48992724283d151e8a2a767a1839e9.tar.gz +sha256 cb90ff5fd4de69cc9cf2a63408d42b605f1d4e70b92012729c0a3bd9a4cfa197 0737013d3c48992724283d151e8a2a767a1839e9.tar.gz diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/cri-dockerd/cri-dockerd.hash b/deploy/iso/minikube-iso/arch/x86_64/package/cri-dockerd/cri-dockerd.hash index 1b98c60d4f..cac3a05745 100644 --- a/deploy/iso/minikube-iso/arch/x86_64/package/cri-dockerd/cri-dockerd.hash +++ b/deploy/iso/minikube-iso/arch/x86_64/package/cri-dockerd/cri-dockerd.hash @@ -1,4 +1,4 @@ sha256 4acd7605a0cb95a6ad50314d1f2497b92ee0f07382062d0c18a5434c1a3b9513 542e27dee12db61d6e96d2a83a20359474a5efa2.tar.gz sha256 b2a082a8846ac74b8482ee6353d480cea0dec017bbec2b59b16e3f91efa2f5ca eb0c48ef49856f7d098ec005ddebcae197e08e49.tar.gz sha256 ceb99430633f75f354c0e9fea1f3cf0e5138ac5ee3c2691a1a70811fd2feeeef a4d1895a2659ea9974bd7528a706592ab8b74181.tar.gz -sha256 2bdef1ae691fc2e179fa808a39c643986bb12867737bfed0fa4b5cb379dd4e6e 0737013d3c48992724283d151e8a2a767a1839e9.tar.gz +sha256 cb90ff5fd4de69cc9cf2a63408d42b605f1d4e70b92012729c0a3bd9a4cfa197 0737013d3c48992724283d151e8a2a767a1839e9.tar.gz From 9fe8946e6610fcd6f7c7bb24c750409024e2d9b6 Mon Sep 17 00:00:00 2001 From: Nikhil Sharma Date: Wed, 11 May 2022 22:38:01 +0530 Subject: [PATCH 160/545] Made changes so that we get logs when a command starts no matter that it is finished or not --- cmd/minikube/cmd/root.go | 13 +++-- pkg/minikube/audit/audit.go | 78 +++++++++++++++++++++++++++--- pkg/minikube/audit/audit_test.go | 49 +++++++++++++++++-- pkg/minikube/audit/logFile_test.go | 3 +- pkg/minikube/audit/row.go | 9 ++-- pkg/minikube/audit/row_test.go | 15 +++--- 6 files changed, 145 insertions(+), 22 deletions(-) diff --git a/cmd/minikube/cmd/root.go b/cmd/minikube/cmd/root.go index 870518cddc..6b7b13d082 100644 --- a/cmd/minikube/cmd/root.go +++ b/cmd/minikube/cmd/root.go @@ -23,7 +23,6 @@ import ( "path/filepath" "runtime" "strings" - "time" "github.com/spf13/cobra" "github.com/spf13/pflag" @@ -84,8 +83,16 @@ var RootCmd = &cobra.Command{ // Execute adds all child commands to the root command sets flags appropriately. // This is called by main.main(). It only needs to happen once to the rootCmd. func Execute() { - defer audit.Log(time.Now()) - + auditID, err := audit.LogCommandStart() + if err != nil { + klog.Errorf("failed to log command start to audit: %v", err) + } + defer func() { + err := audit.LogCommandEnd(auditID) + if err != nil { + klog.Errorf("failed to log command end to audit: %v", err) + } + }() // Check whether this is a windows binary (.exe) running inisde WSL. if runtime.GOOS == "windows" && detect.IsMicrosoftWSL() { var found = false diff --git a/pkg/minikube/audit/audit.go b/pkg/minikube/audit/audit.go index eb4b0ead71..8a41b47ef4 100644 --- a/pkg/minikube/audit/audit.go +++ b/pkg/minikube/audit/audit.go @@ -17,18 +17,25 @@ limitations under the License. package audit import ( + "bufio" + "encoding/json" + "fmt" "os" "os/user" "strings" + "sync" "time" + "github.com/google/uuid" "github.com/spf13/pflag" "github.com/spf13/viper" - "k8s.io/klog/v2" "k8s.io/minikube/pkg/minikube/config" + "k8s.io/minikube/pkg/minikube/constants" "k8s.io/minikube/pkg/version" ) +var mutex sync.Mutex + // userName pulls the user flag, if empty gets the os username. func userName() string { u := viper.GetString(config.UserFlag) @@ -52,14 +59,73 @@ func args() string { } // Log details about the executed command. -func Log(startTime time.Time) { - if !shouldLog() { - return +func LogCommandStart() (string, error) { + mutex.Lock() + defer mutex.Unlock() + if len(os.Args) < 2 || !shouldLog() { + return "", nil } - r := newRow(pflag.Arg(0), args(), userName(), version.GetVersion(), startTime, time.Now()) + id := uuid.New().String() + r := newRow(pflag.Arg(0), args(), userName(), version.GetVersion(), time.Now(), id) if err := appendToLog(r); err != nil { - klog.Warning(err) + return "", err } + return r.id, nil +} + +func LogCommandEnd(id string) error { + mutex.Lock() + defer mutex.Unlock() + if id == "" { + return nil + } + if currentLogFile == nil { + if err := setLogFile(); err != nil { + return fmt.Errorf("failed to set the log file: %v", err) + } + } + _, err := currentLogFile.Seek(0, 0) + if err != nil { + return fmt.Errorf("failed to offset for the next Read or Write on currentLogFile: %v", err) + } + var logs []string + s := bufio.NewScanner(currentLogFile) + for s.Scan() { + logs = append(logs, s.Text()) + } + if err = s.Err(); err != nil { + return fmt.Errorf("failed to read from audit file: %v", err) + } + rowSlice, err := logsToRows(logs) + if err != nil { + return fmt.Errorf("failed to convert logs to rows: %v", err) + } + auditContents := "" + var entriesNeedsToUpdate int + for _, v := range rowSlice { + if v.id == id { + v.endTime = time.Now().Format(constants.TimeFormat) + v.Data = v.toMap() + entriesNeedsToUpdate++ + } + auditLog, err := json.Marshal(v) + if err != nil { + return err + } + auditContents += string(auditLog) + "\n" + } + if entriesNeedsToUpdate == 0 { + return fmt.Errorf("failed to find a log row with id equals to %v", id) + } + _, err = currentLogFile.Seek(0, 0) + if err != nil { + return fmt.Errorf("failed to offset for the next Read or Write on currentLogFile: %v", err) + } + _, err = currentLogFile.Write([]byte(auditContents)) + if err != nil { + return err + } + return nil } // shouldLog returns if the command should be logged. diff --git a/pkg/minikube/audit/audit_test.go b/pkg/minikube/audit/audit_test.go index e91f7d972a..a79b255603 100644 --- a/pkg/minikube/audit/audit_test.go +++ b/pkg/minikube/audit/audit_test.go @@ -20,7 +20,6 @@ import ( "os" "os/user" "testing" - "time" "github.com/spf13/pflag" "github.com/spf13/viper" @@ -177,7 +176,27 @@ func TestAudit(t *testing.T) { }) // Check if logging with limited args causes a panic - t.Run("Log", func(t *testing.T) { + t.Run("LogCommandStart", func(t *testing.T) { + oldArgs := os.Args + defer func() { os.Args = oldArgs }() + os.Args = []string{"minikube", "start"} + + oldCommandLine := pflag.CommandLine + defer func() { + pflag.CommandLine = oldCommandLine + pflag.Parse() + }() + mockArgs(t, os.Args) + auditID, err := LogCommandStart() + if auditID == "" { + t.Fatal("audit ID should not be empty") + } + if err != nil { + t.Fatal(err) + } + }) + + t.Run("LogCommandEnd", func(t *testing.T) { oldArgs := os.Args defer func() { os.Args = oldArgs }() os.Args = []string{"minikube"} @@ -188,8 +207,32 @@ func TestAudit(t *testing.T) { pflag.Parse() }() mockArgs(t, os.Args) + auditID, err := LogCommandStart() + if err != nil { + t.Fatal("start failed") + } + err = LogCommandEnd(auditID) - Log(time.Now()) + if err != nil { + t.Fatal(err) + } + }) + + t.Run("LogCommandEnd", func(t *testing.T) { + oldArgs := os.Args + defer func() { os.Args = oldArgs }() + os.Args = []string{"minikube"} + + oldCommandLine := pflag.CommandLine + defer func() { + pflag.CommandLine = oldCommandLine + pflag.Parse() + }() + mockArgs(t, os.Args) + err := LogCommandEnd("non-existing-id") + if err == nil { + t.Fatal("function LogCommandEnd should return an error when a non-existing id is passed in it as an argument") + } }) } diff --git a/pkg/minikube/audit/logFile_test.go b/pkg/minikube/audit/logFile_test.go index 617a43b8e0..1757df00d0 100644 --- a/pkg/minikube/audit/logFile_test.go +++ b/pkg/minikube/audit/logFile_test.go @@ -23,6 +23,7 @@ import ( "testing" "time" + "github.com/google/uuid" "k8s.io/minikube/pkg/minikube/localpath" ) @@ -48,7 +49,7 @@ func TestLogFile(t *testing.T) { defer func() { currentLogFile = &oldLogFile }() currentLogFile = f - r := newRow("start", "-v", "user1", "v0.17.1", time.Now(), time.Now()) + r := newRow("start", "-v", "user1", "v0.17.1", time.Now(), uuid.New().String()) if err := appendToLog(r); err != nil { t.Fatalf("Error appendingToLog: %v", err) } diff --git a/pkg/minikube/audit/row.go b/pkg/minikube/audit/row.go index fb5991a008..94edc406aa 100644 --- a/pkg/minikube/audit/row.go +++ b/pkg/minikube/audit/row.go @@ -37,6 +37,7 @@ type row struct { startTime string user string version string + id string Data map[string]string `json:"data"` } @@ -55,6 +56,7 @@ func (e *row) assignFields() { e.startTime = e.Data["startTime"] e.user = e.Data["user"] e.version = e.Data["version"] + e.id = e.Data["id"] } // toMap combines fields into a string map, @@ -68,11 +70,12 @@ func (e *row) toMap() map[string]string { "startTime": e.startTime, "user": e.user, "version": e.version, + "id": e.id, } } // newRow creates a new audit row. -func newRow(command string, args string, user string, version string, startTime time.Time, endTime time.Time, profile ...string) *row { +func newRow(command string, args string, user string, version string, startTime time.Time, id string, profile ...string) *row { p := viper.GetString(config.ProfileName) if len(profile) > 0 { p = profile[0] @@ -80,18 +83,18 @@ func newRow(command string, args string, user string, version string, startTime return &row{ args: args, command: command, - endTime: endTime.Format(constants.TimeFormat), profile: p, startTime: startTime.Format(constants.TimeFormat), user: user, version: version, + id: id, } } // toFields converts a row to an array of fields, // to be used when converting to a table. func (e *row) toFields() []string { - return []string{e.command, e.args, e.profile, e.user, e.version, e.startTime, e.endTime} + return []string{e.command, e.args, e.profile, e.user, e.version, e.startTime, e.endTime, e.id} } // logsToRows converts audit logs into arrays of rows. diff --git a/pkg/minikube/audit/row_test.go b/pkg/minikube/audit/row_test.go index 88b54174df..8e53e52d45 100644 --- a/pkg/minikube/audit/row_test.go +++ b/pkg/minikube/audit/row_test.go @@ -23,6 +23,7 @@ import ( "testing" "time" + "github.com/google/uuid" "k8s.io/minikube/pkg/minikube/constants" ) @@ -36,8 +37,10 @@ func TestRow(t *testing.T) { stFormatted := st.Format(constants.TimeFormat) et := time.Now() etFormatted := et.Format(constants.TimeFormat) + id := uuid.New().String() - r := newRow(c, a, u, v, st, et, p) + r := newRow(c, a, u, v, st, id, p) + r.endTime = etFormatted t.Run("NewRow", func(t *testing.T) { tests := []struct { @@ -51,7 +54,7 @@ func TestRow(t *testing.T) { {"user", r.user, u}, {"version", r.version, v}, {"startTime", r.startTime, stFormatted}, - {"endTime", r.endTime, etFormatted}, + {"id", r.id, id}, } for _, tt := range tests { @@ -83,7 +86,7 @@ func TestRow(t *testing.T) { {"user", u}, {"version", v}, {"startTime", stFormatted}, - {"endTime", etFormatted}, + {"id", id}, } for _, tt := range tests { @@ -97,7 +100,7 @@ func TestRow(t *testing.T) { t.Run("toFields", func(t *testing.T) { got := r.toFields() gotString := strings.Join(got, ",") - want := []string{c, a, p, u, v, stFormatted, etFormatted} + want := []string{c, a, p, u, v, stFormatted, etFormatted, id} wantString := strings.Join(want, ",") if gotString != wantString { @@ -106,7 +109,7 @@ func TestRow(t *testing.T) { }) t.Run("assignFields", func(t *testing.T) { - l := fmt.Sprintf(`{"data":{"args":"%s","command":"%s","endTime":"%s","profile":"%s","startTime":"%s","user":"%s","version":"v0.17.1"},"datacontenttype":"application/json","id":"bc6ec9d4-0d08-4b57-ac3b-db8d67774768","source":"https://minikube.sigs.k8s.io/","specversion":"1.0","type":"io.k8s.sigs.minikube.audit"}`, a, c, etFormatted, p, stFormatted, u) + l := fmt.Sprintf(`{"data":{"args":"%s","command":"%s","id":"%s","profile":"%s","startTime":"%s","user":"%s","version":"v0.17.1"},"datacontenttype":"application/json","id":"bc6ec9d4-0d08-4b57-ac3b-db8d67774768","source":"https://minikube.sigs.k8s.io/","specversion":"1.0","type":"io.k8s.sigs.minikube.audit"}`, a, c, id, p, stFormatted, u) r := &row{} if err := json.Unmarshal([]byte(l), r); err != nil { @@ -126,7 +129,7 @@ func TestRow(t *testing.T) { {"user", r.user, u}, {"version", r.version, v}, {"startTime", r.startTime, stFormatted}, - {"endTime", r.endTime, etFormatted}, + {"id", r.id, id}, } for _, tt := range tests { From d125e3fd8e6f4f4f17e3e199af502db3ff677def Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Tue, 14 Jun 2022 15:04:13 -0700 Subject: [PATCH 161/545] fix bugs --- pkg/minikube/audit/audit.go | 14 ++++++-------- pkg/minikube/audit/logFile.go | 8 ++++++++ pkg/minikube/audit/report.go | 3 +++ pkg/minikube/audit/row.go | 25 +++++++++++++++---------- 4 files changed, 32 insertions(+), 18 deletions(-) diff --git a/pkg/minikube/audit/audit.go b/pkg/minikube/audit/audit.go index 8a41b47ef4..adc59e2680 100644 --- a/pkg/minikube/audit/audit.go +++ b/pkg/minikube/audit/audit.go @@ -84,16 +84,15 @@ func LogCommandEnd(id string) error { return fmt.Errorf("failed to set the log file: %v", err) } } - _, err := currentLogFile.Seek(0, 0) - if err != nil { - return fmt.Errorf("failed to offset for the next Read or Write on currentLogFile: %v", err) + if err := seekToBeginning(); err != nil { + return err } var logs []string s := bufio.NewScanner(currentLogFile) for s.Scan() { logs = append(logs, s.Text()) } - if err = s.Err(); err != nil { + if err := s.Err(); err != nil { return fmt.Errorf("failed to read from audit file: %v", err) } rowSlice, err := logsToRows(logs) @@ -117,9 +116,8 @@ func LogCommandEnd(id string) error { if entriesNeedsToUpdate == 0 { return fmt.Errorf("failed to find a log row with id equals to %v", id) } - _, err = currentLogFile.Seek(0, 0) - if err != nil { - return fmt.Errorf("failed to offset for the next Read or Write on currentLogFile: %v", err) + if err := currentLogFile.Truncate(0); err != nil { + return err } _, err = currentLogFile.Write([]byte(auditContents)) if err != nil { @@ -140,7 +138,7 @@ func shouldLog() bool { } // commands that should not be logged. - no := []string{"status", "version"} + no := []string{"status", "version", "logs", "generate-docs"} a := pflag.Arg(0) for _, c := range no { if a == c { diff --git a/pkg/minikube/audit/logFile.go b/pkg/minikube/audit/logFile.go index 1762070f1e..7d7bffc976 100644 --- a/pkg/minikube/audit/logFile.go +++ b/pkg/minikube/audit/logFile.go @@ -55,3 +55,11 @@ func appendToLog(row *row) error { } return nil } + +func seekToBeginning() error { + _, err := currentLogFile.Seek(0, 0) + if err != nil { + return fmt.Errorf("failed to seek to beginning of audit file: %v", err) + } + return nil +} diff --git a/pkg/minikube/audit/report.go b/pkg/minikube/audit/report.go index 6816757126..9c25f10925 100644 --- a/pkg/minikube/audit/report.go +++ b/pkg/minikube/audit/report.go @@ -37,6 +37,9 @@ func Report(lastNLines int) (*RawReport, error) { return nil, fmt.Errorf("failed to set the log file: %v", err) } } + if err := seekToBeginning(); err != nil { + return nil, err + } var logs []string s := bufio.NewScanner(currentLogFile) for s.Scan() { diff --git a/pkg/minikube/audit/row.go b/pkg/minikube/audit/row.go index 94edc406aa..29c5d0b49e 100644 --- a/pkg/minikube/audit/row.go +++ b/pkg/minikube/audit/row.go @@ -30,15 +30,20 @@ import ( // row is the log of a single command. type row struct { - args string - command string - endTime string - profile string - startTime string - user string - version string - id string - Data map[string]string `json:"data"` + SpecVersion string `json:"specversion"` + ID string `json:"id"` + Source string `json:"source"` + TypeField string `json:"type"` + DataContentType string `json:"datacontenttype"` + Data map[string]string `json:"data"` + args string + command string + endTime string + id string + profile string + startTime string + user string + version string } // Type returns the cloud events compatible type of this struct. @@ -94,7 +99,7 @@ func newRow(command string, args string, user string, version string, startTime // toFields converts a row to an array of fields, // to be used when converting to a table. func (e *row) toFields() []string { - return []string{e.command, e.args, e.profile, e.user, e.version, e.startTime, e.endTime, e.id} + return []string{e.command, e.args, e.profile, e.user, e.version, e.startTime, e.endTime} } // logsToRows converts audit logs into arrays of rows. From 6694cf5088ab77ed91de233bd74132f146c2fe85 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Tue, 14 Jun 2022 15:37:03 -0700 Subject: [PATCH 162/545] fix truncating on Windows --- pkg/minikube/audit/audit.go | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkg/minikube/audit/audit.go b/pkg/minikube/audit/audit.go index adc59e2680..db232ba5b3 100644 --- a/pkg/minikube/audit/audit.go +++ b/pkg/minikube/audit/audit.go @@ -31,6 +31,7 @@ import ( "github.com/spf13/viper" "k8s.io/minikube/pkg/minikube/config" "k8s.io/minikube/pkg/minikube/constants" + "k8s.io/minikube/pkg/minikube/localpath" "k8s.io/minikube/pkg/version" ) @@ -116,7 +117,14 @@ func LogCommandEnd(id string) error { if entriesNeedsToUpdate == 0 { return fmt.Errorf("failed to find a log row with id equals to %v", id) } - if err := currentLogFile.Truncate(0); err != nil { + // have to close the audit file, truncate it, then reopen it as Windows can't truncate an open file + if err := currentLogFile.Close(); err != nil { + return fmt.Errorf("failed to close audit file: %v", err) + } + if err := os.Truncate(localpath.AuditLog(), 0); err != nil { + return fmt.Errorf("failed to truncate audit file: %v", err) + } + if err := setLogFile(); err != nil { return err } _, err = currentLogFile.Write([]byte(auditContents)) From 5b75fd5cb12b8eab97beab8ebdc7824f1c129d2e Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Tue, 14 Jun 2022 15:40:18 -0700 Subject: [PATCH 163/545] fix test --- pkg/minikube/audit/row_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/minikube/audit/row_test.go b/pkg/minikube/audit/row_test.go index 8e53e52d45..a951234858 100644 --- a/pkg/minikube/audit/row_test.go +++ b/pkg/minikube/audit/row_test.go @@ -100,7 +100,7 @@ func TestRow(t *testing.T) { t.Run("toFields", func(t *testing.T) { got := r.toFields() gotString := strings.Join(got, ",") - want := []string{c, a, p, u, v, stFormatted, etFormatted, id} + want := []string{c, a, p, u, v, stFormatted, etFormatted} wantString := strings.Join(want, ",") if gotString != wantString { From dbc0ced19ecdb9bfc10a10a93cbad0a8bd95f147 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Tue, 14 Jun 2022 16:31:09 -0700 Subject: [PATCH 164/545] fixed duplicate test name --- pkg/minikube/audit/audit_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/minikube/audit/audit_test.go b/pkg/minikube/audit/audit_test.go index a79b255603..262ceac821 100644 --- a/pkg/minikube/audit/audit_test.go +++ b/pkg/minikube/audit/audit_test.go @@ -218,7 +218,7 @@ func TestAudit(t *testing.T) { } }) - t.Run("LogCommandEnd", func(t *testing.T) { + t.Run("LogCommandEndNonExistingID", func(t *testing.T) { oldArgs := os.Args defer func() { os.Args = oldArgs }() os.Args = []string{"minikube"} From 63259b55569f7510f392372a9d53828d5e28049a Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Wed, 15 Jun 2022 14:40:53 -0700 Subject: [PATCH 165/545] only keep audit log file open for as long as needed --- pkg/minikube/audit/audit.go | 33 +++++++++--------------------- pkg/minikube/audit/logFile.go | 32 ++++++++++++++--------------- pkg/minikube/audit/logFile_test.go | 9 +++++--- pkg/minikube/audit/report.go | 10 ++++----- 4 files changed, 35 insertions(+), 49 deletions(-) diff --git a/pkg/minikube/audit/audit.go b/pkg/minikube/audit/audit.go index db232ba5b3..dc3c46057a 100644 --- a/pkg/minikube/audit/audit.go +++ b/pkg/minikube/audit/audit.go @@ -23,7 +23,6 @@ import ( "os" "os/user" "strings" - "sync" "time" "github.com/google/uuid" @@ -35,8 +34,6 @@ import ( "k8s.io/minikube/pkg/version" ) -var mutex sync.Mutex - // userName pulls the user flag, if empty gets the os username. func userName() string { u := viper.GetString(config.UserFlag) @@ -61,8 +58,6 @@ func args() string { // Log details about the executed command. func LogCommandStart() (string, error) { - mutex.Lock() - defer mutex.Unlock() if len(os.Args) < 2 || !shouldLog() { return "", nil } @@ -75,17 +70,10 @@ func LogCommandStart() (string, error) { } func LogCommandEnd(id string) error { - mutex.Lock() - defer mutex.Unlock() if id == "" { return nil } - if currentLogFile == nil { - if err := setLogFile(); err != nil { - return fmt.Errorf("failed to set the log file: %v", err) - } - } - if err := seekToBeginning(); err != nil { + if err := openAuditLog(); err != nil { return err } var logs []string @@ -96,6 +84,9 @@ func LogCommandEnd(id string) error { if err := s.Err(); err != nil { return fmt.Errorf("failed to read from audit file: %v", err) } + if err := closeAuditLog(); err != nil { + return err + } rowSlice, err := logsToRows(logs) if err != nil { return fmt.Errorf("failed to convert logs to rows: %v", err) @@ -117,21 +108,17 @@ func LogCommandEnd(id string) error { if entriesNeedsToUpdate == 0 { return fmt.Errorf("failed to find a log row with id equals to %v", id) } - // have to close the audit file, truncate it, then reopen it as Windows can't truncate an open file - if err := currentLogFile.Close(); err != nil { - return fmt.Errorf("failed to close audit file: %v", err) - } + // have to truncate the audit log while closed as Windows can't truncate an open file if err := os.Truncate(localpath.AuditLog(), 0); err != nil { - return fmt.Errorf("failed to truncate audit file: %v", err) + return fmt.Errorf("failed to truncate audit log: %v", err) } - if err := setLogFile(); err != nil { + if err := openAuditLog(); err != nil { return err } - _, err = currentLogFile.Write([]byte(auditContents)) - if err != nil { - return err + if _, err = currentLogFile.Write([]byte(auditContents)); err != nil { + return fmt.Errorf("failed to write to audit log: %v", err) } - return nil + return closeAuditLog() } // shouldLog returns if the command should be logged. diff --git a/pkg/minikube/audit/logFile.go b/pkg/minikube/audit/logFile.go index 7d7bffc976..9d9bbf9456 100644 --- a/pkg/minikube/audit/logFile.go +++ b/pkg/minikube/audit/logFile.go @@ -27,39 +27,37 @@ import ( // currentLogFile the file that's used to store audit logs var currentLogFile *os.File -// setLogFile sets the logPath and creates the log file if it doesn't exist. -func setLogFile() error { +// openAuditLog opens the audit log file or creates it if it doesn't exist. +func openAuditLog() error { lp := localpath.AuditLog() f, err := os.OpenFile(lp, os.O_APPEND|os.O_CREATE|os.O_RDWR, 0644) if err != nil { - return fmt.Errorf("unable to open %s: %v", lp, err) + return fmt.Errorf("failed to open the audit log: %v", err) } currentLogFile = f return nil } +// closeAuditLog closes the audit log file +func closeAuditLog() error { + if err := currentLogFile.Close(); err != nil { + return fmt.Errorf("failed to close the audit log: %v", err) + } + return nil +} + // appendToLog appends the row to the log file. func appendToLog(row *row) error { - if currentLogFile == nil { - if err := setLogFile(); err != nil { - return err - } - } ce := register.CloudEvent(row, row.toMap()) bs, err := ce.MarshalJSON() if err != nil { return fmt.Errorf("error marshalling event: %v", err) } + if err := openAuditLog(); err != nil { + return err + } if _, err := currentLogFile.WriteString(string(bs) + "\n"); err != nil { return fmt.Errorf("unable to write to audit log: %v", err) } - return nil -} - -func seekToBeginning() error { - _, err := currentLogFile.Seek(0, 0) - if err != nil { - return fmt.Errorf("failed to seek to beginning of audit file: %v", err) - } - return nil + return closeAuditLog() } diff --git a/pkg/minikube/audit/logFile_test.go b/pkg/minikube/audit/logFile_test.go index 1757df00d0..8c697a40c8 100644 --- a/pkg/minikube/audit/logFile_test.go +++ b/pkg/minikube/audit/logFile_test.go @@ -28,13 +28,16 @@ import ( ) func TestLogFile(t *testing.T) { - t.Run("SetLogFile", func(t *testing.T) { + t.Run("OpenAndCloseAuditLog", func(t *testing.T) { // make sure logs directory exists if err := os.MkdirAll(filepath.Dir(localpath.AuditLog()), 0755); err != nil { t.Fatalf("Error creating logs directory: %v", err) } - if err := setLogFile(); err != nil { - t.Error(err) + if err := openAuditLog(); err != nil { + t.Fatal(err) + } + if err := closeAuditLog(); err != nil { + t.Fatal(err) } }) diff --git a/pkg/minikube/audit/report.go b/pkg/minikube/audit/report.go index 9c25f10925..8b5bc69628 100644 --- a/pkg/minikube/audit/report.go +++ b/pkg/minikube/audit/report.go @@ -32,12 +32,7 @@ func Report(lastNLines int) (*RawReport, error) { if lastNLines <= 0 { return nil, fmt.Errorf("last n lines must be 1 or greater") } - if currentLogFile == nil { - if err := setLogFile(); err != nil { - return nil, fmt.Errorf("failed to set the log file: %v", err) - } - } - if err := seekToBeginning(); err != nil { + if err := openAuditLog(); err != nil { return nil, err } var logs []string @@ -52,6 +47,9 @@ func Report(lastNLines int) (*RawReport, error) { if err := s.Err(); err != nil { return nil, fmt.Errorf("failed to read from audit file: %v", err) } + if err := closeAuditLog(); err != nil { + return nil, err + } rows, err := logsToRows(logs) if err != nil { return nil, fmt.Errorf("failed to convert logs to rows: %v", err) From 75f99c924bfcb4cf2d49789871d62ce54da9dbda Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Wed, 15 Jun 2022 14:55:25 -0700 Subject: [PATCH 166/545] defer closing the audit file --- pkg/minikube/audit/audit.go | 7 +++---- pkg/minikube/audit/logFile.go | 9 +++++---- pkg/minikube/audit/logFile_test.go | 6 ++---- pkg/minikube/audit/report.go | 4 +--- 4 files changed, 11 insertions(+), 15 deletions(-) diff --git a/pkg/minikube/audit/audit.go b/pkg/minikube/audit/audit.go index dc3c46057a..e119429dad 100644 --- a/pkg/minikube/audit/audit.go +++ b/pkg/minikube/audit/audit.go @@ -76,6 +76,7 @@ func LogCommandEnd(id string) error { if err := openAuditLog(); err != nil { return err } + defer closeAuditLog() var logs []string s := bufio.NewScanner(currentLogFile) for s.Scan() { @@ -84,9 +85,7 @@ func LogCommandEnd(id string) error { if err := s.Err(); err != nil { return fmt.Errorf("failed to read from audit file: %v", err) } - if err := closeAuditLog(); err != nil { - return err - } + closeAuditLog() rowSlice, err := logsToRows(logs) if err != nil { return fmt.Errorf("failed to convert logs to rows: %v", err) @@ -118,7 +117,7 @@ func LogCommandEnd(id string) error { if _, err = currentLogFile.Write([]byte(auditContents)); err != nil { return fmt.Errorf("failed to write to audit log: %v", err) } - return closeAuditLog() + return nil } // shouldLog returns if the command should be logged. diff --git a/pkg/minikube/audit/logFile.go b/pkg/minikube/audit/logFile.go index 9d9bbf9456..437114aa8d 100644 --- a/pkg/minikube/audit/logFile.go +++ b/pkg/minikube/audit/logFile.go @@ -20,6 +20,7 @@ import ( "fmt" "os" + "k8s.io/klog/v2" "k8s.io/minikube/pkg/minikube/localpath" "k8s.io/minikube/pkg/minikube/out/register" ) @@ -39,11 +40,10 @@ func openAuditLog() error { } // closeAuditLog closes the audit log file -func closeAuditLog() error { +func closeAuditLog() { if err := currentLogFile.Close(); err != nil { - return fmt.Errorf("failed to close the audit log: %v", err) + klog.Errorf("failed to close the audit log: %v", err) } - return nil } // appendToLog appends the row to the log file. @@ -56,8 +56,9 @@ func appendToLog(row *row) error { if err := openAuditLog(); err != nil { return err } + defer closeAuditLog() if _, err := currentLogFile.WriteString(string(bs) + "\n"); err != nil { return fmt.Errorf("unable to write to audit log: %v", err) } - return closeAuditLog() + return nil } diff --git a/pkg/minikube/audit/logFile_test.go b/pkg/minikube/audit/logFile_test.go index 8c697a40c8..9167911084 100644 --- a/pkg/minikube/audit/logFile_test.go +++ b/pkg/minikube/audit/logFile_test.go @@ -28,7 +28,7 @@ import ( ) func TestLogFile(t *testing.T) { - t.Run("OpenAndCloseAuditLog", func(t *testing.T) { + t.Run("OpenAuditLog", func(t *testing.T) { // make sure logs directory exists if err := os.MkdirAll(filepath.Dir(localpath.AuditLog()), 0755); err != nil { t.Fatalf("Error creating logs directory: %v", err) @@ -36,12 +36,10 @@ func TestLogFile(t *testing.T) { if err := openAuditLog(); err != nil { t.Fatal(err) } - if err := closeAuditLog(); err != nil { - t.Fatal(err) - } }) t.Run("AppendToLog", func(t *testing.T) { + defer closeAuditLog() f, err := os.CreateTemp("", "audit.json") if err != nil { t.Fatalf("Error creating temporary file: %v", err) diff --git a/pkg/minikube/audit/report.go b/pkg/minikube/audit/report.go index 8b5bc69628..1c255086cb 100644 --- a/pkg/minikube/audit/report.go +++ b/pkg/minikube/audit/report.go @@ -35,6 +35,7 @@ func Report(lastNLines int) (*RawReport, error) { if err := openAuditLog(); err != nil { return nil, err } + defer closeAuditLog() var logs []string s := bufio.NewScanner(currentLogFile) for s.Scan() { @@ -47,9 +48,6 @@ func Report(lastNLines int) (*RawReport, error) { if err := s.Err(); err != nil { return nil, fmt.Errorf("failed to read from audit file: %v", err) } - if err := closeAuditLog(); err != nil { - return nil, err - } rows, err := logsToRows(logs) if err != nil { return nil, fmt.Errorf("failed to convert logs to rows: %v", err) From 9dae03e5f2864a186d7b86e89e6c675c087d5415 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Fri, 17 Jun 2022 00:25:32 +0000 Subject: [PATCH 167/545] Updating ISO to v1.26.0-1655407986-14197 --- Makefile | 2 +- site/content/en/docs/commands/start.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 3572721fd3..ce02b00b28 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.26.0-1655241299-14197 +ISO_VERSION ?= v1.26.0-1655407986-14197 # 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/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index 08174238b0..06ab5adfda 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/14197/minikube-v1.26.0-1655241299-14197-amd64.iso,https://github.com/kubernetes/minikube/releases/download/v1.26.0-1655241299-14197/minikube-v1.26.0-1655241299-14197-amd64.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.26.0-1655241299-14197-amd64.iso,https://storage.googleapis.com/minikube-builds/iso/14197/minikube-v1.26.0-1655241299-14197.iso,https://github.com/kubernetes/minikube/releases/download/v1.26.0-1655241299-14197/minikube-v1.26.0-1655241299-14197.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.26.0-1655241299-14197.iso]) + --iso-url strings Locations to fetch the minikube ISO from. (default [https://storage.googleapis.com/minikube-builds/iso/14197/minikube-v1.26.0-1655407986-14197-amd64.iso,https://github.com/kubernetes/minikube/releases/download/v1.26.0-1655407986-14197/minikube-v1.26.0-1655407986-14197-amd64.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.26.0-1655407986-14197-amd64.iso,https://storage.googleapis.com/minikube-builds/iso/14197/minikube-v1.26.0-1655407986-14197.iso,https://github.com/kubernetes/minikube/releases/download/v1.26.0-1655407986-14197/minikube-v1.26.0-1655407986-14197.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.26.0-1655407986-14197.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.24.1, 'latest' for v1.24.1). Defaults to 'stable'. --kvm-gpu Enable experimental NVIDIA GPU support in minikube From cfaf1e2346e7ade72a6b9ddfb5cb725eb62c8d92 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Fri, 17 Jun 2022 15:24:54 -0700 Subject: [PATCH 168/545] increase timeout --- pkg/minikube/bootstrapper/kubeadm/kubeadm.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go index d981ac8e89..8d2f4e9a1a 100644 --- a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go +++ b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go @@ -595,7 +595,7 @@ func (k *Bootstrapper) needsReconfigure(conf string, hostname string, port int, } // cruntime.Enable() may restart kube-apiserver but does not wait for it to return back - apiStatusTimeout := 3000 * time.Millisecond + apiStatusTimeout := 10 * time.Second st, err := kverify.WaitForAPIServerStatus(k.c, apiStatusTimeout, hostname, port) if err != nil { klog.Infof("needs reconfigure: apiserver error: %v", err) From 8c4f6e8f873fc6ee5d40d36a65a0dc0a2662888d Mon Sep 17 00:00:00 2001 From: Gimb0 <18228506+Gimb0@users.noreply.github.com> Date: Sat, 18 Jun 2022 08:28:52 +1000 Subject: [PATCH 169/545] Move CR compatibility check and add error logging --- pkg/minikube/node/config.go | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkg/minikube/node/config.go b/pkg/minikube/node/config.go index 36b4ebdba1..b2f51740f1 100644 --- a/pkg/minikube/node/config.go +++ b/pkg/minikube/node/config.go @@ -52,7 +52,17 @@ func showVersionInfo(k8sVersion string, cr cruntime.Manager) { } func showNoK8sVersionInfo(cr cruntime.Manager) { - version, _ := cr.Version() + err := cruntime.CheckCompatibility(cr) + if err != nil { + klog.Warningf("%s check compatibility failed: %v", cr.Name(), err) + + } + + version, err := cr.Version() + if err != nil { + klog.Warningf("%s get version failed: %v", cr.Name(), err) + } + out.Step(cr.Style(), "Preparing {{.runtime}} {{.runtimeVersion}} ...", out.V{"runtime": cr.Name(), "runtimeVersion": version}) } From 1c2d4f45150fe81ea472c8189b9bb3a2f2de5d82 Mon Sep 17 00:00:00 2001 From: Gimb0 <18228506+Gimb0@users.noreply.github.com> Date: Sat, 18 Jun 2022 08:39:13 +1000 Subject: [PATCH 170/545] Move CR Check Compatibility to showNoK8sVersionInfo --- pkg/minikube/node/start.go | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkg/minikube/node/start.go b/pkg/minikube/node/start.go index 00e6179121..be2f671ecc 100644 --- a/pkg/minikube/node/start.go +++ b/pkg/minikube/node/start.go @@ -99,10 +99,6 @@ func Start(starter Starter, apiServer bool) (*kubeconfig.Settings, error) { nv := semver.Version{Major: 0, Minor: 0, Patch: 0} cr := configureRuntimes(starter.Runner, *starter.Cfg, nv) - if err = cruntime.CheckCompatibility(cr); err != nil { - return nil, err - } - showNoK8sVersionInfo(cr) configureMounts(&wg, *starter.Cfg) From 7439783a69481b6393dbab8c2204067696d8cc8b Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 20 Jun 2022 06:05:38 +0000 Subject: [PATCH 171/545] update image constants for kubeadm images --- pkg/minikube/constants/constants_kubeadm_images.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/minikube/constants/constants_kubeadm_images.go b/pkg/minikube/constants/constants_kubeadm_images.go index 5c11be816d..be36232481 100644 --- a/pkg/minikube/constants/constants_kubeadm_images.go +++ b/pkg/minikube/constants/constants_kubeadm_images.go @@ -19,8 +19,8 @@ package constants var ( KubeadmImages = map[string]map[string]string{ "v1.25": { - "coredns/coredns": "v1.8.6", - "etcd": "3.5.3-0", + "coredns/coredns": "v1.9.3", + "etcd": "3.5.4-0", "pause": "3.7", }, "v1.24": { From 01c48b8b408ab3bfccfa27618a89de96a8b0e8f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=BE=99=E5=B3=B0?= Date: Mon, 20 Jun 2022 15:36:08 +0800 Subject: [PATCH 172/545] occurring not occuring --- CHANGELOG.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c85acc2bb3..51ef9ce530 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,7 +9,7 @@ QEMU driver enhancements: Features: * Add configure option to registry-aliases addon [#13912](https://github.com/kubernetes/minikube/pull/13912) -For a more detailed changelog, including changes occuring in pre-release versions, see [CHANGELOG.md](https://github.com/kubernetes/minikube/blob/master/CHANGELOG.md). +For a more detailed changelog, including changes occurring in pre-release versions, see [CHANGELOG.md](https://github.com/kubernetes/minikube/blob/master/CHANGELOG.md). Thank you to our contributors for this release! @@ -75,7 +75,7 @@ Version Upgrades: * ISO: Upgrade Podman from 2.2.1 to 3.4.2 [#13126](https://github.com/kubernetes/minikube/pull/13126) * ISO: Add packaging for crun [#11679](https://github.com/kubernetes/minikube/pull/11679) -For a more detailed changelog, including changes occuring in pre-release versions, see [CHANGELOG.md](https://github.com/kubernetes/minikube/blob/master/CHANGELOG.md). +For a more detailed changelog, including changes occurring in pre-release versions, see [CHANGELOG.md](https://github.com/kubernetes/minikube/blob/master/CHANGELOG.md). Thank you to our contributors for this release! @@ -161,7 +161,7 @@ Version Upgrades: * ISO: Add packaging for cri-dockerd [#13191](https://github.com/kubernetes/minikube/pull/13191) -For a more detailed changelog, including changes occuring in pre-release versions, see [CHANGELOG.md](https://github.com/kubernetes/minikube/blob/master/CHANGELOG.md). +For a more detailed changelog, including changes occurring in pre-release versions, see [CHANGELOG.md](https://github.com/kubernetes/minikube/blob/master/CHANGELOG.md). Thank you to our contributors for this release! From dde17c0786bb402bbe1d48b29aa48f6d1db21e19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=BE=99=E5=B3=B0?= Date: Mon, 20 Jun 2022 15:43:32 +0800 Subject: [PATCH 173/545] not need modify --- cmd/minikube/cmd/config/config.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cmd/minikube/cmd/config/config.go b/cmd/minikube/cmd/config/config.go index b344c17044..cef701b87e 100644 --- a/cmd/minikube/cmd/config/config.go +++ b/cmd/minikube/cmd/config/config.go @@ -20,7 +20,6 @@ import ( "strings" "github.com/spf13/cobra" - "k8s.io/klog/v2" "k8s.io/minikube/pkg/minikube/config" "k8s.io/minikube/pkg/minikube/driver" "k8s.io/minikube/pkg/minikube/localpath" @@ -184,7 +183,7 @@ Configurable fields: ` + "\n\n" + configurableFields(), } func configurableFields() string { - var fields []string + fields := []string{} for _, s := range settings { fields = append(fields, " * "+s.name) } From 816966290eb0156214c04d631aee61aef977d819 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=BE=99=E5=B3=B0?= Date: Mon, 20 Jun 2022 15:46:55 +0800 Subject: [PATCH 174/545] import klog --- cmd/minikube/cmd/config/config.go | 1 + 1 file changed, 1 insertion(+) diff --git a/cmd/minikube/cmd/config/config.go b/cmd/minikube/cmd/config/config.go index cef701b87e..4af7698da3 100644 --- a/cmd/minikube/cmd/config/config.go +++ b/cmd/minikube/cmd/config/config.go @@ -20,6 +20,7 @@ import ( "strings" "github.com/spf13/cobra" + "k8s.io/klog/v2" "k8s.io/minikube/pkg/minikube/config" "k8s.io/minikube/pkg/minikube/driver" "k8s.io/minikube/pkg/minikube/localpath" From a05641e2fd44c149fb8e5cfd4b7b25cca797df8c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Jun 2022 18:07:12 +0000 Subject: [PATCH 175/545] Bump k8s.io/apimachinery from 0.24.1 to 0.24.2 Bumps [k8s.io/apimachinery](https://github.com/kubernetes/apimachinery) from 0.24.1 to 0.24.2. - [Release notes](https://github.com/kubernetes/apimachinery/releases) - [Commits](https://github.com/kubernetes/apimachinery/compare/v0.24.1...v0.24.2) --- updated-dependencies: - dependency-name: k8s.io/apimachinery dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index d810f2608b..31e8ea6cad 100644 --- a/go.mod +++ b/go.mod @@ -84,7 +84,7 @@ require ( gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 // indirect gopkg.in/yaml.v2 v2.4.0 k8s.io/api v0.24.1 - k8s.io/apimachinery v0.24.1 + k8s.io/apimachinery v0.24.2 k8s.io/client-go v0.24.1 k8s.io/cluster-bootstrap v0.0.0 k8s.io/component-base v0.24.1 diff --git a/go.sum b/go.sum index ab9144fb06..d8759352a5 100644 --- a/go.sum +++ b/go.sum @@ -2225,8 +2225,9 @@ k8s.io/apimachinery v0.20.1/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRp k8s.io/apimachinery v0.20.4/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU= k8s.io/apimachinery v0.20.6/go.mod h1:ejZXtW1Ra6V1O5H8xPBGz+T3+4gfkTCeExAHKU57MAc= k8s.io/apimachinery v0.22.4/go.mod h1:yU6oA6Gnax9RrxGzVvPFFJ+mpnW6PBSqp0sx0I0HHW0= -k8s.io/apimachinery v0.24.1 h1:ShD4aDxTQKN5zNf8K1RQ2u98ELLdIW7jEnlO9uAMX/I= k8s.io/apimachinery v0.24.1/go.mod h1:82Bi4sCzVBdpYjyI4jY6aHX+YCUchUIrZrXKedjd2UM= +k8s.io/apimachinery v0.24.2 h1:5QlH9SL2C8KMcrNJPor+LbXVTaZRReml7svPEh4OKDM= +k8s.io/apimachinery v0.24.2/go.mod h1:82Bi4sCzVBdpYjyI4jY6aHX+YCUchUIrZrXKedjd2UM= k8s.io/apiserver v0.20.1/go.mod h1:ro5QHeQkgMS7ZGpvf4tSMx6bBOgPfE+f52KwvXfScaU= k8s.io/apiserver v0.20.4/go.mod h1:Mc80thBKOyy7tbvFtB4kJv1kbdD0eIH8k8vianJcbFM= k8s.io/apiserver v0.20.6/go.mod h1:QIJXNt6i6JB+0YQRNcS0hdRHJlMhflFmsBDeSgT1r8Q= From 1d0714f85bc1f0150842c534d5460af637e9d06a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Jun 2022 18:07:32 +0000 Subject: [PATCH 176/545] 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.8.1 to 1.8.2. - [Release notes](https://github.com/GoogleCloudPlatform/opentelemetry-operations-go/releases) - [Commits](https://github.com/GoogleCloudPlatform/opentelemetry-operations-go/compare/exporter/trace/v1.8.1...exporter/trace/v1.8.2) --- updated-dependencies: - dependency-name: github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index d810f2608b..f54736a4f6 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ require ( contrib.go.opencensus.io/exporter/stackdriver v0.13.12 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.8.1 + github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.8.2 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 @@ -112,7 +112,7 @@ require ( 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/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.32.1 // indirect + github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.32.2 // indirect github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd // indirect github.com/Microsoft/go-winio v0.5.2 // indirect github.com/PuerkitoBio/purell v1.1.1 // indirect diff --git a/go.sum b/go.sum index ab9144fb06..53663aa45c 100644 --- a/go.sum +++ b/go.sum @@ -118,10 +118,10 @@ github.com/Delta456/box-cli-maker/v2 v2.2.2/go.mod h1:idItIMZeyx3bg73XwSgsLeZd+g github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24/go.mod h1:4UJr5HIiMZrwgkSPdsjy2uOQExX/WEILpIrO9UPGuXs= 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.8.1 h1:Tn/3pMqRSsI09jFVdGEuMqLIBNOmRHVqKp9DSQg4HPM= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.8.1/go.mod h1:KddM1vG3MS+CRfmoFBqeUIICfd9nS8pLHKtwJ/kt0QQ= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.32.1 h1:SixyMKTOWhEWISdA7PB7vOxkvOP8BIgW5uzbyIf0kXM= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.32.1/go.mod h1:j+FS9VBW3mwtHBmm9KOJEy5Tq68fCp7fE/R9bV/flIM= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.8.2 h1:Dg+BIoU7Xz5QAj9VgDyhl5sz8Uz1IE1O6NAdJ1/Lmyk= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.8.2/go.mod h1:vCKAVz9WbhvBYuqNignSpjoyMtBT/CFELC3z98onw4o= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.32.2 h1:lw6BPuBgZKGwl4jm8xrU7AGnK8ohy7UT9hPM1+S16ts= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.32.2/go.mod h1:j+FS9VBW3mwtHBmm9KOJEy5Tq68fCp7fE/R9bV/flIM= 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/Masterminds/goutils v1.1.0/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU= From 59c70fad9462a0d12777f08e51b96f6b0a4a629e Mon Sep 17 00:00:00 2001 From: layakdev <107048101+layakdev@users.noreply.github.com> Date: Tue, 21 Jun 2022 16:53:01 +0200 Subject: [PATCH 177/545] Update _index.md --- site/content/en/docs/start/_index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/content/en/docs/start/_index.md b/site/content/en/docs/start/_index.md index 93f8b54d99..5c9ebb1d32 100644 --- a/site/content/en/docs/start/_index.md +++ b/site/content/en/docs/start/_index.md @@ -456,7 +456,7 @@ choco install minikube } ``` - _If you used a CLI to perform the installation, you will need to close that CLI and open a new one before proceeding._ + *If you used a terminal (like powershell) for the installation, please close the terminal and reopen it before running minikube.* {{% /quiz_instruction %}} {{% quiz_instruction id="/Windows/x86-64/Beta/.exe download" %}} From 6c75050d12ff2ab1e448d01be7b01c3375e1484f Mon Sep 17 00:00:00 2001 From: layakdev <107048101+layakdev@users.noreply.github.com> Date: Tue, 21 Jun 2022 17:01:07 +0200 Subject: [PATCH 178/545] Update _index.md --- site/content/en/docs/start/_index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/content/en/docs/start/_index.md b/site/content/en/docs/start/_index.md index 5c9ebb1d32..504d799b6b 100644 --- a/site/content/en/docs/start/_index.md +++ b/site/content/en/docs/start/_index.md @@ -456,7 +456,7 @@ choco install minikube } ``` - *If you used a terminal (like powershell) for the installation, please close the terminal and reopen it before running minikube.* + If you used a terminal (like powershell) for the installation, please close the terminal and reopen it before running minikube. {{% /quiz_instruction %}} {{% quiz_instruction id="/Windows/x86-64/Beta/.exe download" %}} From 90dac9cfddbabc4149e15e4123c5d8c14f0e1f03 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Tue, 21 Jun 2022 10:25:11 -0700 Subject: [PATCH 179/545] revert timeout --- pkg/minikube/bootstrapper/kubeadm/kubeadm.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go index 8d2f4e9a1a..d981ac8e89 100644 --- a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go +++ b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go @@ -595,7 +595,7 @@ func (k *Bootstrapper) needsReconfigure(conf string, hostname string, port int, } // cruntime.Enable() may restart kube-apiserver but does not wait for it to return back - apiStatusTimeout := 10 * time.Second + apiStatusTimeout := 3000 * time.Millisecond st, err := kverify.WaitForAPIServerStatus(k.c, apiStatusTimeout, hostname, port) if err != nil { klog.Infof("needs reconfigure: apiserver error: %v", err) From a26b75af68e35dd11cb14282f0ae974a34ce1361 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Tue, 21 Jun 2022 17:40:39 +0000 Subject: [PATCH 180/545] Update auto-generated docs and translations --- site/content/en/docs/contrib/tests.en.md | 2 ++ translations/de.json | 3 +++ translations/es.json | 3 +++ translations/fr.json | 3 +++ translations/ja.json | 3 +++ translations/ko.json | 3 +++ translations/pl.json | 3 +++ translations/ru.json | 3 +++ translations/strings.txt | 3 +++ translations/zh-CN.json | 3 +++ 10 files changed, 29 insertions(+) diff --git a/site/content/en/docs/contrib/tests.en.md b/site/content/en/docs/contrib/tests.en.md index cff97fd455..4e807d0bb5 100644 --- a/site/content/en/docs/contrib/tests.en.md +++ b/site/content/en/docs/contrib/tests.en.md @@ -42,6 +42,8 @@ tests the csi hostpath driver by creating a persistent volume, snapshotting it a #### validateGCPAuthAddon tests the GCP Auth addon with either phony or real credentials and makes sure the files are mounted into pods correctly +#### validateHeadlampAddon + ## TestCertOptions makes sure minikube certs respect the --apiserver-ips and --apiserver-names parameters diff --git a/translations/de.json b/translations/de.json index c95e4e1c81..e1b3c68fbc 100644 --- a/translations/de.json +++ b/translations/de.json @@ -323,6 +323,7 @@ "Go template format string for the config view output. The format for Go templates can be found here: https://golang.org/pkg/text/template/\nFor the list of accessible variables for the template, see the struct values here: https://godoc.org/k8s.io/minikube/cmd/minikube/cmd/config#ConfigViewTemplate": "Go Template Format String für die Ausgabe der Konfigurations-Ansicht Ausgabe. Das Format von Go Templates ist hier beschrieben: https://golang.org/pkg/text/template/\nFür eine Liste der im Template verfügbaren Variablen, kann man die struct Werte hier einsehen: https://godoc.org/k8s.io/minikube/cmd/minikube/cmd/config#ConfigViewTemplate", "Go template format string for the status output. The format for Go templates can be found here: https://golang.org/pkg/text/template/\nFor the list accessible variables for the template, see the struct values here: https://godoc.org/k8s.io/minikube/cmd/minikube/cmd#Status": "Go Template Format String für die Status Ausgabe. Das Format von Go Templates ist hier beschrieben: https://golang.org/pkg/text/template/\nFür eine Liste der im Template verfügbaren Variablen, kann man die struct Werte hier einsehen: https://godoc.org/k8s.io/minikube/cmd/minikube/cmd#Status", "Group ID: {{.groupID}}": "Gruppen ID: {{.groupID}}", + "Headlamp can display more detailed information when metrics-server is installed. To install it, run:\n\nminikube{{.profileArg}} addons enable metrics-server\t\n\n": "", "Hide the hypervisor signature from the guest in minikube (kvm2 driver only)": "Hypervisor-Signatur vor dem Gast in minikube verbergen (nur kvm2-Treiber)", "Hyperkit is broken. Upgrade to the latest hyperkit version and/or Docker for Desktop. Alternatively, you may choose an alternate --driver": "Hyperkit ist kaputt. Aktualisieren Sie auf die neueste Version von Hyperkit und/oder Docker Desktop. Alternativ können Sie einen anderen Treiber auswählen mit --driver", "Hyperkit networking is broken. Try disabling Internet Sharing: System Preference \u003e Sharing \u003e Internet Sharing. \nAlternatively, you can try upgrading to the latest hyperkit version, or using an alternate driver.": "Das Hyperkit Netzwerk ist kaputt. Versuchen Sie das Internet Sharing zu deaktivieren: System Preference \u003e Sharing \u003e Internet Sharing. Alternativ können Sie versuchen auf die aktuellste Hyperkit Version zu aktualisieren oder einen anderen Treiber zu verwenden.", @@ -741,6 +742,8 @@ "This {{.type}} is having trouble accessing https://{{.repository}}": "Dieser {{.type}} hat Probleme beim Zugriff auf https://{{.repository}}", "Tip: To remove this root owned cluster, run: sudo {{.cmd}}": "Tip: Um diesen zu root gehörenden Cluster zu entfernen, führe {{.cmd}} aus", "Tip: To remove this root owned cluster, run: sudo {{.cmd}} delete": "Tipp: Um diesen Root-Cluster zu entfernen, führen Sie Folgendes aus: sudo {{.cmd}} delete", + "To access Headlamp, use the following command:\nminikube service headlamp -n headlamp\n\n": "", + "To authenticate in Headlamp, fetch the Authentication Token using the following command:\n\nexport SECRET=$(kubectl get secrets --namespace headlamp -o custom-columns=\":metadata.name\" | grep \"headlamp-token\")\nkubectl get secret $SECRET --namespace headlamp --template=\\{\\{.data.token\\}\\} | base64 --decode\n\t\t\t\n": "", "To connect to this cluster, use: --context={{.name}}": "Um zu diesem Cluster zu verbinden, verwende --context={{.name}}", "To connect to this cluster, use: kubectl --context={{.name}}": "Verwenden Sie zum Herstellen einer Verbindung zu diesem Cluster: kubectl --context = {{.name}}", "To connect to this cluster, use: kubectl --context={{.name}}__1": "Verwenden Sie zum Herstellen einer Verbindung zu diesem Cluster: kubectl --context = {{.name}}", diff --git a/translations/es.json b/translations/es.json index 6a1eb947fb..14b9d5d860 100644 --- a/translations/es.json +++ b/translations/es.json @@ -332,6 +332,7 @@ "Go template format string for the config view output. The format for Go templates can be found here: https://golang.org/pkg/text/template/\nFor the list of accessible variables for the template, see the struct values here: https://godoc.org/k8s.io/minikube/cmd/minikube/cmd/config#ConfigViewTemplate": "", "Go template format string for the status output. The format for Go templates can be found here: https://golang.org/pkg/text/template/\nFor the list accessible variables for the template, see the struct values here: https://godoc.org/k8s.io/minikube/cmd/minikube/cmd#Status": "", "Group ID: {{.groupID}}": "", + "Headlamp can display more detailed information when metrics-server is installed. To install it, run:\n\nminikube{{.profileArg}} addons enable metrics-server\t\n\n": "", "Hide the hypervisor signature from the guest in minikube (kvm2 driver only)": "Permite ocultar la firma del hipervisor al invitado en minikube (solo con el controlador de kvm2)", "Hyperkit is broken. Upgrade to the latest hyperkit version and/or Docker for Desktop. Alternatively, you may choose an alternate --driver": "", "Hyperkit networking is broken. Try disabling Internet Sharing: System Preference \u003e Sharing \u003e Internet Sharing. \nAlternatively, you can try upgrading to the latest hyperkit version, or using an alternate driver.": "", @@ -745,6 +746,8 @@ "This {{.type}} is having trouble accessing https://{{.repository}}": "", "Tip: To remove this root owned cluster, run: sudo {{.cmd}}": "", "Tip: To remove this root owned cluster, run: sudo {{.cmd}} delete": "Para eliminar este clúster de raíz, ejecuta: sudo {{.cmd}} delete", + "To access Headlamp, use the following command:\nminikube service headlamp -n headlamp\n\n": "", + "To authenticate in Headlamp, fetch the Authentication Token using the following command:\n\nexport SECRET=$(kubectl get secrets --namespace headlamp -o custom-columns=\":metadata.name\" | grep \"headlamp-token\")\nkubectl get secret $SECRET --namespace headlamp --template=\\{\\{.data.token\\}\\} | base64 --decode\n\t\t\t\n": "", "To connect to this cluster, use: --context={{.name}}": "", "To connect to this cluster, use: kubectl --context={{.name}}": "Para conectarte a este clúster, usa: kubectl --context={{.name}}", "To connect to this cluster, use: kubectl --context={{.name}}__1": "Para conectarte a este clúster, usa: kubectl --context={{.name}}", diff --git a/translations/fr.json b/translations/fr.json index f5b62af785..f323e7a76c 100644 --- a/translations/fr.json +++ b/translations/fr.json @@ -314,6 +314,7 @@ "Go template format string for the config view output. The format for Go templates can be found here: https://golang.org/pkg/text/template/\nFor the list of accessible variables for the template, see the struct values here: https://godoc.org/k8s.io/minikube/cmd/minikube/cmd/config#ConfigViewTemplate": "Go chaîne de format de modèle pour la sortie de la vue de configuration. Le format des modèles Go peut être trouvé ici : https://golang.org/pkg/text/template/\nPour la liste des variables accessibles pour le modèle, voir les valeurs de structure ici : https://godoc.org/k8s .io/minikube/cmd/minikube/cmd/config#ConfigViewTemplate", "Go template format string for the status output. The format for Go templates can be found here: https://golang.org/pkg/text/template/\nFor the list accessible variables for the template, see the struct values here: https://godoc.org/k8s.io/minikube/cmd/minikube/cmd#Status": "Go chaîne de format de modèle pour la sortie d'état. Le format des modèles Go peut être trouvé ici : https://golang.org/pkg/text/template/\nPour la liste des variables accessibles pour le modèle, consultez les valeurs de structure ici : https://godoc.org/k8s. io/minikube/cmd/minikube/cmd#Status", "Group ID: {{.groupID}}": "Identifiant du groupe: {{.groupID}}", + "Headlamp can display more detailed information when metrics-server is installed. To install it, run:\n\nminikube{{.profileArg}} addons enable metrics-server\t\n\n": "", "Hide the hypervisor signature from the guest in minikube (kvm2 driver only)": "Masque la signature de l'hyperviseur de l'invité dans minikube (pilote kvm2 uniquement).", "Hyperkit is broken. Upgrade to the latest hyperkit version and/or Docker for Desktop. Alternatively, you may choose an alternate --driver": "Hyperkit ne fonctionne pas. Mettez à niveau vers la dernière version d'hyperkit et/ou Docker for Desktop. Alternativement, vous pouvez choisir un autre --driver", "Hyperkit networking is broken. Try disabling Internet Sharing: System Preference \u003e Sharing \u003e Internet Sharing. \nAlternatively, you can try upgrading to the latest hyperkit version, or using an alternate driver.": "Le réseau Hyperkit est cassé. Essayez de désactiver le partage Internet : Préférence système \u003e Partage \u003e Partage Internet. \nVous pouvez également essayer de mettre à niveau vers la dernière version d'hyperkit ou d'utiliser un autre pilote.", @@ -715,6 +716,8 @@ "This will start the mount daemon and automatically mount files into minikube.": "Cela démarrera le démon de montage et montera automatiquement les fichiers dans minikube.", "This {{.type}} is having trouble accessing https://{{.repository}}": "Ce {{.type}} rencontre des difficultés pour accéder à https://{{.repository}}", "Tip: To remove this root owned cluster, run: sudo {{.cmd}}": "Astuce : Pour supprimer ce cluster appartenant à la racine, exécutez : sudo {{.cmd}}", + "To access Headlamp, use the following command:\nminikube service headlamp -n headlamp\n\n": "", + "To authenticate in Headlamp, fetch the Authentication Token using the following command:\n\nexport SECRET=$(kubectl get secrets --namespace headlamp -o custom-columns=\":metadata.name\" | grep \"headlamp-token\")\nkubectl get secret $SECRET --namespace headlamp --template=\\{\\{.data.token\\}\\} | base64 --decode\n\t\t\t\n": "", "To connect to this cluster, use: --context={{.name}}": "Pour vous connecter à ce cluster, utilisez : --context={{.name}}", "To connect to this cluster, use: kubectl --context={{.profile_name}}": "Pour vous connecter à ce cluster, utilisez : kubectl --context={{.profile_name}}", "To disable beta notices, run: 'minikube config set WantBetaUpdateNotification false'": "Pour désactiver les notifications bêta, exécutez : 'minikube config set WantBetaUpdateNotification false'", diff --git a/translations/ja.json b/translations/ja.json index 7c538116e0..282195554a 100644 --- a/translations/ja.json +++ b/translations/ja.json @@ -322,6 +322,7 @@ "Go template format string for the config view output. The format for Go templates can be found here: https://golang.org/pkg/text/template/\nFor the list of accessible variables for the template, see the struct values here: https://godoc.org/k8s.io/minikube/cmd/minikube/cmd/config#ConfigViewTemplate": "設定ビュー出力用の Go テンプレートフォーマット文字列。Go テンプレートのフォーマットはこちら: https://golang.org/pkg/text/template/\nテンプレートでアクセス可能な変数の一覧は、こちらの構造化変数を参照してください: https://godoc.org/k8s.io/minikube/cmd/minikube/cmd/config#ConfigViewTemplate", "Go template format string for the status output. The format for Go templates can be found here: https://golang.org/pkg/text/template/\nFor the list accessible variables for the template, see the struct values here: https://godoc.org/k8s.io/minikube/cmd/minikube/cmd#Status": "状態出力用の Go テンプレートフォーマット文字列。Go テンプレートのフォーマットはこちら: https://golang.org/pkg/text/template/\nテンプレートでアクセス可能な変数の一覧は、こちらの構造化変数を参照してください: https://godoc.org/k8s.io/minikube/cmd/minikube/cmd#Status", "Group ID: {{.groupID}}": "グループ ID: {{.groupID}}", + "Headlamp can display more detailed information when metrics-server is installed. To install it, run:\n\nminikube{{.profileArg}} addons enable metrics-server\t\n\n": "", "Hide the hypervisor signature from the guest in minikube (kvm2 driver only)": "minikube 中のゲストに対してハイパーバイザー署名を非表示にします (kvm2 ドライバーのみ)", "Hyperkit is broken. Upgrade to the latest hyperkit version and/or Docker for Desktop. Alternatively, you may choose an alternate --driver": "Hyperkit は故障しています。最新バージョンの Hyperkit と Docker for Desktop にアップグレードしてください。あるいは、別の --driver を選択することもできます。", "Hyperkit networking is broken. Try disabling Internet Sharing: System Preference \u003e Sharing \u003e Internet Sharing. \nAlternatively, you can try upgrading to the latest hyperkit version, or using an alternate driver.": "Hyperkit ネットワーキングは故障しています。インターネット共有の無効化を試してください: システム環境設定 \u003e 共有 \u003e インターネット共有。\nあるいは、最新の Hyperkit バージョンへのアップグレードか、別のドライバー使用を試すこともできます。", @@ -743,6 +744,8 @@ "This {{.type}} is having trouble accessing https://{{.repository}}": "この {{.type}} は https://{{.repository}} アクセスにおける問題があります", "Tip: To remove this root owned cluster, run: sudo {{.cmd}}": "ヒント: この root 所有クラスターの削除コマンド: sudo {{.cmd}}", "Tip: To remove this root owned cluster, run: sudo {{.cmd}} delete": "ヒント: この root 所有クラスターの削除コマンド: sudo {{.cmd}} delete", + "To access Headlamp, use the following command:\nminikube service headlamp -n headlamp\n\n": "", + "To authenticate in Headlamp, fetch the Authentication Token using the following command:\n\nexport SECRET=$(kubectl get secrets --namespace headlamp -o custom-columns=\":metadata.name\" | grep \"headlamp-token\")\nkubectl get secret $SECRET --namespace headlamp --template=\\{\\{.data.token\\}\\} | base64 --decode\n\t\t\t\n": "", "To connect to this cluster, use: --context={{.name}}": "このクラスターに接続するためには、--context={{.name}} を使用します", "To connect to this cluster, use: kubectl --context={{.name}}": "このクラスターに接続するためには、kubectl --context={{.name}} を使用します", "To connect to this cluster, use: kubectl --context={{.name}}__1": "このクラスターに接続するためには、kubectl --context={{.name}} を使用します", diff --git a/translations/ko.json b/translations/ko.json index d3dbed1917..cd82eb91b1 100644 --- a/translations/ko.json +++ b/translations/ko.json @@ -350,6 +350,7 @@ "Go template format string for the status output. The format for Go templates can be found here: https://golang.org/pkg/text/template/\nFor the list accessible variables for the template, see the struct values here: https://godoc.org/k8s.io/minikube/cmd/minikube/cmd#Status": "", "Group ID: {{.groupID}}": "", "Have you set up libvirt correctly?": "libvirt 설정을 알맞게 하셨습니까?", + "Headlamp can display more detailed information when metrics-server is installed. To install it, run:\n\nminikube{{.profileArg}} addons enable metrics-server\t\n\n": "", "Hide the hypervisor signature from the guest in minikube (kvm2 driver only)": "", "Hyperkit is broken. Upgrade to the latest hyperkit version and/or Docker for Desktop. Alternatively, you may choose an alternate --driver": "", "Hyperkit networking is broken. Try disabling Internet Sharing: System Preference \u003e Sharing \u003e Internet Sharing. \nAlternatively, you can try upgrading to the latest hyperkit version, or using an alternate driver.": "", @@ -746,6 +747,8 @@ "This will start the mount daemon and automatically mount files into minikube.": "", "This {{.type}} is having trouble accessing https://{{.repository}}": "", "Tip: To remove this root owned cluster, run: sudo {{.cmd}}": "", + "To access Headlamp, use the following command:\nminikube service headlamp -n headlamp\n\n": "", + "To authenticate in Headlamp, fetch the Authentication Token using the following command:\n\nexport SECRET=$(kubectl get secrets --namespace headlamp -o custom-columns=\":metadata.name\" | grep \"headlamp-token\")\nkubectl get secret $SECRET --namespace headlamp --template=\\{\\{.data.token\\}\\} | base64 --decode\n\t\t\t\n": "", "To connect to this cluster, use: --context={{.name}}": "", "To connect to this cluster, use: kubectl --context={{.profile_name}}": "", "To disable beta notices, run: 'minikube config set WantBetaUpdateNotification false'": "", diff --git a/translations/pl.json b/translations/pl.json index 25e99394f7..d51cdc0302 100644 --- a/translations/pl.json +++ b/translations/pl.json @@ -336,6 +336,7 @@ "Go template format string for the status output. The format for Go templates can be found here: https://golang.org/pkg/text/template/\nFor the list accessible variables for the template, see the struct values here: https://godoc.org/k8s.io/minikube/cmd/minikube/cmd#Status": "", "Group ID: {{.groupID}}": "", "Have you set up libvirt correctly?": "Czy napewno skonfigurowano libvirt w sposób prawidłowy?", + "Headlamp can display more detailed information when metrics-server is installed. To install it, run:\n\nminikube{{.profileArg}} addons enable metrics-server\t\n\n": "", "Hide the hypervisor signature from the guest in minikube (kvm2 driver only)": "", "Hyperkit is broken. Upgrade to the latest hyperkit version and/or Docker for Desktop. Alternatively, you may choose an alternate --driver": "", "Hyperkit networking is broken. Try disabling Internet Sharing: System Preference \u003e Sharing \u003e Internet Sharing. \nAlternatively, you can try upgrading to the latest hyperkit version, or using an alternate driver.": "", @@ -757,6 +758,8 @@ "This will start the mount daemon and automatically mount files into minikube.": "", "This {{.type}} is having trouble accessing https://{{.repository}}": "", "Tip: To remove this root owned cluster, run: sudo {{.cmd}}": "", + "To access Headlamp, use the following command:\nminikube service headlamp -n headlamp\n\n": "", + "To authenticate in Headlamp, fetch the Authentication Token using the following command:\n\nexport SECRET=$(kubectl get secrets --namespace headlamp -o custom-columns=\":metadata.name\" | grep \"headlamp-token\")\nkubectl get secret $SECRET --namespace headlamp --template=\\{\\{.data.token\\}\\} | base64 --decode\n\t\t\t\n": "", "To connect to this cluster, use: --context={{.name}}": "", "To connect to this cluster, use: kubectl --context={{.name}}": "Aby połączyć się z klastrem użyj: kubectl --context={{.name}}", "To connect to this cluster, use: kubectl --context={{.profile_name}}": "Aby połaczyć się z klastrem użyj: kubectl --context={{.profile_name}}", diff --git a/translations/ru.json b/translations/ru.json index 4cd6cb232d..6404047e54 100644 --- a/translations/ru.json +++ b/translations/ru.json @@ -303,6 +303,7 @@ "Go template format string for the config view output. The format for Go templates can be found here: https://golang.org/pkg/text/template/\nFor the list of accessible variables for the template, see the struct values here: https://godoc.org/k8s.io/minikube/cmd/minikube/cmd/config#ConfigViewTemplate": "", "Go template format string for the status output. The format for Go templates can be found here: https://golang.org/pkg/text/template/\nFor the list accessible variables for the template, see the struct values here: https://godoc.org/k8s.io/minikube/cmd/minikube/cmd#Status": "", "Group ID: {{.groupID}}": "", + "Headlamp can display more detailed information when metrics-server is installed. To install it, run:\n\nminikube{{.profileArg}} addons enable metrics-server\t\n\n": "", "Hide the hypervisor signature from the guest in minikube (kvm2 driver only)": "", "Hyperkit is broken. Upgrade to the latest hyperkit version and/or Docker for Desktop. Alternatively, you may choose an alternate --driver": "", "Hyperkit networking is broken. Try disabling Internet Sharing: System Preference \u003e Sharing \u003e Internet Sharing. \nAlternatively, you can try upgrading to the latest hyperkit version, or using an alternate driver.": "", @@ -688,6 +689,8 @@ "This will start the mount daemon and automatically mount files into minikube.": "", "This {{.type}} is having trouble accessing https://{{.repository}}": "", "Tip: To remove this root owned cluster, run: sudo {{.cmd}}": "", + "To access Headlamp, use the following command:\nminikube service headlamp -n headlamp\n\n": "", + "To authenticate in Headlamp, fetch the Authentication Token using the following command:\n\nexport SECRET=$(kubectl get secrets --namespace headlamp -o custom-columns=\":metadata.name\" | grep \"headlamp-token\")\nkubectl get secret $SECRET --namespace headlamp --template=\\{\\{.data.token\\}\\} | base64 --decode\n\t\t\t\n": "", "To connect to this cluster, use: --context={{.name}}": "", "To connect to this cluster, use: kubectl --context={{.profile_name}}": "", "To disable beta notices, run: 'minikube config set WantBetaUpdateNotification false'": "", diff --git a/translations/strings.txt b/translations/strings.txt index 6dcf250bdd..69bc1bf4fb 100644 --- a/translations/strings.txt +++ b/translations/strings.txt @@ -303,6 +303,7 @@ "Go template format string for the config view output. The format for Go templates can be found here: https://golang.org/pkg/text/template/\nFor the list of accessible variables for the template, see the struct values here: https://godoc.org/k8s.io/minikube/cmd/minikube/cmd/config#ConfigViewTemplate": "", "Go template format string for the status output. The format for Go templates can be found here: https://golang.org/pkg/text/template/\nFor the list accessible variables for the template, see the struct values here: https://godoc.org/k8s.io/minikube/cmd/minikube/cmd#Status": "", "Group ID: {{.groupID}}": "", + "Headlamp can display more detailed information when metrics-server is installed. To install it, run:\n\nminikube{{.profileArg}} addons enable metrics-server\t\n\n": "", "Hide the hypervisor signature from the guest in minikube (kvm2 driver only)": "", "Hyperkit is broken. Upgrade to the latest hyperkit version and/or Docker for Desktop. Alternatively, you may choose an alternate --driver": "", "Hyperkit networking is broken. Try disabling Internet Sharing: System Preference \u003e Sharing \u003e Internet Sharing. \nAlternatively, you can try upgrading to the latest hyperkit version, or using an alternate driver.": "", @@ -688,6 +689,8 @@ "This will start the mount daemon and automatically mount files into minikube.": "", "This {{.type}} is having trouble accessing https://{{.repository}}": "", "Tip: To remove this root owned cluster, run: sudo {{.cmd}}": "", + "To access Headlamp, use the following command:\nminikube service headlamp -n headlamp\n\n": "", + "To authenticate in Headlamp, fetch the Authentication Token using the following command:\n\nexport SECRET=$(kubectl get secrets --namespace headlamp -o custom-columns=\":metadata.name\" | grep \"headlamp-token\")\nkubectl get secret $SECRET --namespace headlamp --template=\\{\\{.data.token\\}\\} | base64 --decode\n\t\t\t\n": "", "To connect to this cluster, use: --context={{.name}}": "", "To connect to this cluster, use: kubectl --context={{.profile_name}}": "", "To disable beta notices, run: 'minikube config set WantBetaUpdateNotification false'": "", diff --git a/translations/zh-CN.json b/translations/zh-CN.json index a2e0c872fe..b45f18d53c 100644 --- a/translations/zh-CN.json +++ b/translations/zh-CN.json @@ -405,6 +405,7 @@ "Go template format string for the config view output. The format for Go templates can be found here: https://golang.org/pkg/text/template/\nFor the list of accessible variables for the template, see the struct values here: https://godoc.org/k8s.io/minikube/cmd/minikube/cmd/config#ConfigViewTemplate": "", "Go template format string for the status output. The format for Go templates can be found here: https://golang.org/pkg/text/template/\nFor the list accessible variables for the template, see the struct values here: https://godoc.org/k8s.io/minikube/cmd/minikube/cmd#Status": "", "Group ID: {{.groupID}}": "", + "Headlamp can display more detailed information when metrics-server is installed. To install it, run:\n\nminikube{{.profileArg}} addons enable metrics-server\t\n\n": "", "Hide the hypervisor signature from the guest in minikube (kvm2 driver only)": "向 minikube 中的访客隐藏管理程序签名（仅限 kvm2 驱动程序）", "Hyperkit is broken. Upgrade to the latest hyperkit version and/or Docker for Desktop. Alternatively, you may choose an alternate --driver": "", "Hyperkit is broken. Upgrade to the latest hyperkit version and/or Docker for Desktop. Alternatively, you may choose an alternate --vm-driver": "Hyperkit 已损坏。升级到最新的 hyperkit 版本以及/或者 Docker 桌面版。或者，你可以通过 --vm-driver 切换其他选项", @@ -847,6 +848,8 @@ "This {{.type}} is having trouble accessing https://{{.repository}}": "", "Tip: To remove this root owned cluster, run: sudo {{.cmd}}": "", "Tip: To remove this root owned cluster, run: sudo {{.cmd}} delete": "提示：要移除这个由根用户拥有的集群，请运行 sudo {{.cmd}} delete", + "To access Headlamp, use the following command:\nminikube service headlamp -n headlamp\n\n": "", + "To authenticate in Headlamp, fetch the Authentication Token using the following command:\n\nexport SECRET=$(kubectl get secrets --namespace headlamp -o custom-columns=\":metadata.name\" | grep \"headlamp-token\")\nkubectl get secret $SECRET --namespace headlamp --template=\\{\\{.data.token\\}\\} | base64 --decode\n\t\t\t\n": "", "To connect to this cluster, use: --context={{.name}}": "", "To connect to this cluster, use: kubectl --context={{.name}}": "如需连接到此集群，请使用 kubectl --context={{.name}}", "To connect to this cluster, use: kubectl --context={{.name}}__1": "如需连接到此集群，请使用 kubectl --context={{.name}}", From cd0b8adb5d15a6354532596dce6ae42ee8e56d00 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 21 Jun 2022 17:46:15 +0000 Subject: [PATCH 181/545] Bump k8s.io/kubectl from 0.24.1 to 0.24.2 Bumps [k8s.io/kubectl](https://github.com/kubernetes/kubectl) from 0.24.1 to 0.24.2. - [Release notes](https://github.com/kubernetes/kubectl/releases) - [Commits](https://github.com/kubernetes/kubectl/compare/v0.24.1...v0.24.2) --- updated-dependencies: - dependency-name: k8s.io/kubectl dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 8 ++++---- go.sum | 25 ++++++++++++------------- 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/go.mod b/go.mod index 31e8ea6cad..94bfa25d10 100644 --- a/go.mod +++ b/go.mod @@ -83,13 +83,13 @@ require ( google.golang.org/api v0.83.0 gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 // indirect gopkg.in/yaml.v2 v2.4.0 - k8s.io/api v0.24.1 + k8s.io/api v0.24.2 k8s.io/apimachinery v0.24.2 - k8s.io/client-go v0.24.1 + k8s.io/client-go v0.24.2 k8s.io/cluster-bootstrap v0.0.0 - k8s.io/component-base v0.24.1 + k8s.io/component-base v0.24.2 k8s.io/klog/v2 v2.60.1 - k8s.io/kubectl v0.24.1 + k8s.io/kubectl v0.24.2 k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 libvirt.org/go/libvirt v1.8004.0 sigs.k8s.io/sig-storage-lib-external-provisioner/v6 v6.3.0 diff --git a/go.sum b/go.sum index d8759352a5..9ec1396a98 100644 --- a/go.sum +++ b/go.sum @@ -2218,35 +2218,34 @@ k8s.io/api v0.20.1/go.mod h1:KqwcCVogGxQY3nBlRpwt+wpAMF/KjaCc7RpywacvqUo= k8s.io/api v0.20.4/go.mod h1:++lNL1AJMkDymriNniQsWRkMDzRaX2Y/POTUi8yvqYQ= k8s.io/api v0.20.6/go.mod h1:X9e8Qag6JV/bL5G6bU8sdVRltWKmdHsFUGS3eVndqE8= k8s.io/api v0.22.4/go.mod h1:Rgs+9gIGYC5laXQSZZ9JqT5NevNgoGiOdVWi1BAB3qk= -k8s.io/api v0.24.1 h1:BjCMRDcyEYz03joa3K1+rbshwh1Ay6oB53+iUx2H8UY= -k8s.io/api v0.24.1/go.mod h1:JhoOvNiLXKTPQ60zh2g0ewpA+bnEYf5q44Flhquh4vQ= +k8s.io/api v0.24.2 h1:g518dPU/L7VRLxWfcadQn2OnsiGWVOadTLpdnqgY2OI= +k8s.io/api v0.24.2/go.mod h1:AHqbSkTm6YrQ0ObxjO3Pmp/ubFF/KuM7jU+3khoBsOg= k8s.io/apimachinery v0.19.1/go.mod h1:DnPGDnARWFvYa3pMHgSxtbZb7gpzzAZ1pTfaUNDVlmA= k8s.io/apimachinery v0.20.1/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU= k8s.io/apimachinery v0.20.4/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU= k8s.io/apimachinery v0.20.6/go.mod h1:ejZXtW1Ra6V1O5H8xPBGz+T3+4gfkTCeExAHKU57MAc= k8s.io/apimachinery v0.22.4/go.mod h1:yU6oA6Gnax9RrxGzVvPFFJ+mpnW6PBSqp0sx0I0HHW0= -k8s.io/apimachinery v0.24.1/go.mod h1:82Bi4sCzVBdpYjyI4jY6aHX+YCUchUIrZrXKedjd2UM= k8s.io/apimachinery v0.24.2 h1:5QlH9SL2C8KMcrNJPor+LbXVTaZRReml7svPEh4OKDM= k8s.io/apimachinery v0.24.2/go.mod h1:82Bi4sCzVBdpYjyI4jY6aHX+YCUchUIrZrXKedjd2UM= k8s.io/apiserver v0.20.1/go.mod h1:ro5QHeQkgMS7ZGpvf4tSMx6bBOgPfE+f52KwvXfScaU= k8s.io/apiserver v0.20.4/go.mod h1:Mc80thBKOyy7tbvFtB4kJv1kbdD0eIH8k8vianJcbFM= k8s.io/apiserver v0.20.6/go.mod h1:QIJXNt6i6JB+0YQRNcS0hdRHJlMhflFmsBDeSgT1r8Q= -k8s.io/cli-runtime v0.24.1/go.mod h1:14aVvCTqkA7dNXY51N/6hRY3GUjchyWDOwW84qmR3bs= +k8s.io/cli-runtime v0.24.2/go.mod h1:1LIhKL2RblkhfG4v5lZEt7FtgFG5mVb8wqv5lE9m5qY= k8s.io/client-go v0.19.1/go.mod h1:AZOIVSI9UUtQPeJD3zJFp15CEhSjRgAuQP5PWRJrCIQ= k8s.io/client-go v0.20.1/go.mod h1:/zcHdt1TeWSd5HoUe6elJmHSQ6uLLgp4bIJHVEuy+/Y= k8s.io/client-go v0.20.4/go.mod h1:LiMv25ND1gLUdBeYxBIwKpkSC5IsozMMmOOeSJboP+k= k8s.io/client-go v0.20.6/go.mod h1:nNQMnOvEUEsOzRRFIIkdmYOjAZrC8bgq0ExboWSU1I0= -k8s.io/client-go v0.24.1 h1:w1hNdI9PFrzu3OlovVeTnf4oHDt+FJLd9Ndluvnb42E= -k8s.io/client-go v0.24.1/go.mod h1:f1kIDqcEYmwXS/vTbbhopMUbhKp2JhOeVTfxgaCIlF8= +k8s.io/client-go v0.24.2 h1:CoXFSf8if+bLEbinDqN9ePIDGzcLtqhfd6jpfnwGOFA= +k8s.io/client-go v0.24.2/go.mod h1:zg4Xaoo+umDsfCWr4fCnmLEtQXyCNXCvJuSsglNcV30= k8s.io/cluster-bootstrap v0.22.4 h1:2ZhV/1K4GiCrnmDHHbBnN3bERWn+Nxrtxmxp6uYYThI= k8s.io/cluster-bootstrap v0.22.4/go.mod h1:fTQZ6u9G6fg2LHhB8nEgZLnXIhCDSRYuLUUS5pgW8RY= -k8s.io/code-generator v0.24.1/go.mod h1:dpVhs00hTuTdTY6jvVxvTFCk6gSMrtfRydbhZwHI15w= +k8s.io/code-generator v0.24.2/go.mod h1:dpVhs00hTuTdTY6jvVxvTFCk6gSMrtfRydbhZwHI15w= k8s.io/component-base v0.20.1/go.mod h1:guxkoJnNoh8LNrbtiQOlyp2Y2XFCZQmrcg2n/DeYNLk= k8s.io/component-base v0.20.4/go.mod h1:t4p9EdiagbVCJKrQ1RsA5/V4rFQNDfRlevJajlGwgjI= k8s.io/component-base v0.20.6/go.mod h1:6f1MPBAeI+mvuts3sIdtpjljHWBQ2cIy38oBIWMYnrM= -k8s.io/component-base v0.24.1 h1:APv6W/YmfOWZfo+XJ1mZwep/f7g7Tpwvdbo9CQLDuts= -k8s.io/component-base v0.24.1/go.mod h1:DW5vQGYVCog8WYpNob3PMmmsY8A3L9QZNg4j/dV3s38= -k8s.io/component-helpers v0.24.1/go.mod h1:q5Z1pWV/QfX9ThuNeywxasiwkLw9KsR4Q9TAOdb/Y3s= +k8s.io/component-base v0.24.2 h1:kwpQdoSfbcH+8MPN4tALtajLDfSfYxBDYlXobNWI6OU= +k8s.io/component-base v0.24.2/go.mod h1:ucHwW76dajvQ9B7+zecZAP3BVqvrHoOxm8olHEg0nmM= +k8s.io/component-helpers v0.24.2/go.mod h1:TRQPBQKfmqkmV6c0HAmUs8cXVNYYYLsXy4zu8eODi9g= k8s.io/cri-api v0.17.3/go.mod h1:X1sbHmuXhwaHs9xxYffLqJogVsnI+f6cPRcgPel7ywM= k8s.io/cri-api v0.20.1/go.mod h1:2JRbKt+BFLTjtrILYVqQK5jqhI+XNdF6UiGMgczeBCI= k8s.io/cri-api v0.20.4/go.mod h1:2JRbKt+BFLTjtrILYVqQK5jqhI+XNdF6UiGMgczeBCI= @@ -2267,10 +2266,10 @@ k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e/go.mod h1:vHXdDvt9+2spS2R k8s.io/kube-openapi v0.0.0-20211109043538-20434351676c/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw= k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 h1:Gii5eqf+GmIEwGNKQYQClCayuJCe2/4fZUvF7VG99sU= k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42/go.mod h1:Z/45zLw8lUo4wdiUkI+v/ImEGAvu3WatcZl3lPMR4Rk= -k8s.io/kubectl v0.24.1 h1:gxcjHrnwntV1c+G/BHWVv4Mtk8CQJ0WTraElLBG+ddk= -k8s.io/kubectl v0.24.1/go.mod h1:NzFqQ50B004fHYWOfhHTrAm4TY6oGF5FAAL13LEaeUI= +k8s.io/kubectl v0.24.2 h1:+RfQVhth8akUmIc2Ge8krMl/pt66V7210ka3RE/p0J4= +k8s.io/kubectl v0.24.2/go.mod h1:+HIFJc0bA6Tzu5O/YcuUt45APAxnNL8LeMuXwoiGsPg= k8s.io/kubernetes v1.13.0/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk= -k8s.io/metrics v0.24.1/go.mod h1:vMs5xpcOyY9D+/XVwlaw8oUHYCo6JTGBCZfyXOOkAhE= +k8s.io/metrics v0.24.2/go.mod h1:5NWURxZ6Lz5gj8TFU83+vdWIVASx7W8lwPpHYCqopMo= k8s.io/utils v0.0.0-20200729134348-d5654de09c73/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20210802155522-efc7438f0176/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= From aba4bfaa50267e990ee067c5163b768e63e32737 Mon Sep 17 00:00:00 2001 From: Sharif Elgamal Date: Tue, 21 Jun 2022 12:00:11 -0700 Subject: [PATCH 182/545] update gcp-auth-webhook to v0.0.9 --- pkg/minikube/assets/addons.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/minikube/assets/addons.go b/pkg/minikube/assets/addons.go index c7ed128430..6b227b02d3 100755 --- a/pkg/minikube/assets/addons.go +++ b/pkg/minikube/assets/addons.go @@ -552,7 +552,7 @@ var Addons = map[string]*Addon{ "0640"), }, false, "gcp-auth", "Google", "https://minikube.sigs.k8s.io/docs/handbook/addons/gcp-auth/", map[string]string{ "KubeWebhookCertgen": "k8s.gcr.io/ingress-nginx/kube-webhook-certgen:v1.0@sha256:f3b6b39a6062328c095337b4cadcefd1612348fdd5190b1dcbcb9b9e90bd8068", - "GCPAuthWebhook": "k8s-minikube/gcp-auth-webhook:v0.0.8@sha256:26c7b2454f1c946d7c80839251d939606620f37c2f275be2796c1ffd96c438f6", + "GCPAuthWebhook": "k8s-minikube/gcp-auth-webhook:v0.0.9@sha256:25e1c616444d5b2b404c43ce878f320a265fd663b4fcd4c2ad5c12de316612da", }, map[string]string{ "GCPAuthWebhook": "gcr.io", }), From 7467c86613227ebbd0f77d2d48be679945736a0d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 21 Jun 2022 19:16:01 +0000 Subject: [PATCH 183/545] Bump github.com/spf13/cobra from 1.4.0 to 1.5.0 Bumps [github.com/spf13/cobra](https://github.com/spf13/cobra) from 1.4.0 to 1.5.0. - [Release notes](https://github.com/spf13/cobra/releases) - [Commits](https://github.com/spf13/cobra/compare/v1.4.0...v1.5.0) --- updated-dependencies: - dependency-name: github.com/spf13/cobra dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 14 +++++++------- go.sum | 36 ++++++++++++++++++------------------ 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/go.mod b/go.mod index 31e8ea6cad..3bc4e81959 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ require ( contrib.go.opencensus.io/exporter/stackdriver v0.13.12 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.8.1 + github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.8.2 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 @@ -62,7 +62,7 @@ require ( github.com/russross/blackfriday v1.6.0 // indirect github.com/samalba/dockerclient v0.0.0-20160414174713-91d7393ff859 // indirect github.com/shirou/gopsutil/v3 v3.22.5 - github.com/spf13/cobra v1.4.0 + github.com/spf13/cobra v1.5.0 github.com/spf13/pflag v1.0.5 github.com/spf13/viper v1.12.0 github.com/zchee/go-vmnet v0.0.0-20161021174912-97ebf9174097 @@ -83,13 +83,13 @@ require ( google.golang.org/api v0.83.0 gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 // indirect gopkg.in/yaml.v2 v2.4.0 - k8s.io/api v0.24.1 + k8s.io/api v0.24.2 k8s.io/apimachinery v0.24.2 - k8s.io/client-go v0.24.1 + k8s.io/client-go v0.24.2 k8s.io/cluster-bootstrap v0.0.0 - k8s.io/component-base v0.24.1 + k8s.io/component-base v0.24.2 k8s.io/klog/v2 v2.60.1 - k8s.io/kubectl v0.24.1 + k8s.io/kubectl v0.24.2 k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 libvirt.org/go/libvirt v1.8004.0 sigs.k8s.io/sig-storage-lib-external-provisioner/v6 v6.3.0 @@ -112,7 +112,7 @@ require ( 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/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.32.1 // indirect + github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.32.2 // indirect github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd // indirect github.com/Microsoft/go-winio v0.5.2 // indirect github.com/PuerkitoBio/purell v1.1.1 // indirect diff --git a/go.sum b/go.sum index d8759352a5..b164199c62 100644 --- a/go.sum +++ b/go.sum @@ -118,10 +118,10 @@ github.com/Delta456/box-cli-maker/v2 v2.2.2/go.mod h1:idItIMZeyx3bg73XwSgsLeZd+g github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24/go.mod h1:4UJr5HIiMZrwgkSPdsjy2uOQExX/WEILpIrO9UPGuXs= 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.8.1 h1:Tn/3pMqRSsI09jFVdGEuMqLIBNOmRHVqKp9DSQg4HPM= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.8.1/go.mod h1:KddM1vG3MS+CRfmoFBqeUIICfd9nS8pLHKtwJ/kt0QQ= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.32.1 h1:SixyMKTOWhEWISdA7PB7vOxkvOP8BIgW5uzbyIf0kXM= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.32.1/go.mod h1:j+FS9VBW3mwtHBmm9KOJEy5Tq68fCp7fE/R9bV/flIM= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.8.2 h1:Dg+BIoU7Xz5QAj9VgDyhl5sz8Uz1IE1O6NAdJ1/Lmyk= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.8.2/go.mod h1:vCKAVz9WbhvBYuqNignSpjoyMtBT/CFELC3z98onw4o= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.32.2 h1:lw6BPuBgZKGwl4jm8xrU7AGnK8ohy7UT9hPM1+S16ts= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.32.2/go.mod h1:j+FS9VBW3mwtHBmm9KOJEy5Tq68fCp7fE/R9bV/flIM= 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/Masterminds/goutils v1.1.0/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU= @@ -1298,8 +1298,9 @@ github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3 github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= github.com/spf13/cobra v1.0.0/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE= github.com/spf13/cobra v1.2.1/go.mod h1:ExllRjgxM/piMAM+3tAZvg8fsklGAf3tPfi+i8t68Nk= -github.com/spf13/cobra v1.4.0 h1:y+wJpx64xcgO1V+RcnwW0LEHxTKRi2ZDPSBjWnrg88Q= github.com/spf13/cobra v1.4.0/go.mod h1:Wo4iy3BUC+X2Fybo0PDqwJIv3dNRiZLHQymsfxlB84g= +github.com/spf13/cobra v1.5.0 h1:X+jTBEBqF0bHN+9cSMgmfuvv2VHJ9ezmFNf9Y/XstYU= +github.com/spf13/cobra v1.5.0/go.mod h1:dWXEIy2H428czQCjInthrTRUg7yKbok+2Qi/yBIJoUM= github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk= github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= @@ -2218,35 +2219,34 @@ k8s.io/api v0.20.1/go.mod h1:KqwcCVogGxQY3nBlRpwt+wpAMF/KjaCc7RpywacvqUo= k8s.io/api v0.20.4/go.mod h1:++lNL1AJMkDymriNniQsWRkMDzRaX2Y/POTUi8yvqYQ= k8s.io/api v0.20.6/go.mod h1:X9e8Qag6JV/bL5G6bU8sdVRltWKmdHsFUGS3eVndqE8= k8s.io/api v0.22.4/go.mod h1:Rgs+9gIGYC5laXQSZZ9JqT5NevNgoGiOdVWi1BAB3qk= -k8s.io/api v0.24.1 h1:BjCMRDcyEYz03joa3K1+rbshwh1Ay6oB53+iUx2H8UY= -k8s.io/api v0.24.1/go.mod h1:JhoOvNiLXKTPQ60zh2g0ewpA+bnEYf5q44Flhquh4vQ= +k8s.io/api v0.24.2 h1:g518dPU/L7VRLxWfcadQn2OnsiGWVOadTLpdnqgY2OI= +k8s.io/api v0.24.2/go.mod h1:AHqbSkTm6YrQ0ObxjO3Pmp/ubFF/KuM7jU+3khoBsOg= k8s.io/apimachinery v0.19.1/go.mod h1:DnPGDnARWFvYa3pMHgSxtbZb7gpzzAZ1pTfaUNDVlmA= k8s.io/apimachinery v0.20.1/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU= k8s.io/apimachinery v0.20.4/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU= k8s.io/apimachinery v0.20.6/go.mod h1:ejZXtW1Ra6V1O5H8xPBGz+T3+4gfkTCeExAHKU57MAc= k8s.io/apimachinery v0.22.4/go.mod h1:yU6oA6Gnax9RrxGzVvPFFJ+mpnW6PBSqp0sx0I0HHW0= -k8s.io/apimachinery v0.24.1/go.mod h1:82Bi4sCzVBdpYjyI4jY6aHX+YCUchUIrZrXKedjd2UM= k8s.io/apimachinery v0.24.2 h1:5QlH9SL2C8KMcrNJPor+LbXVTaZRReml7svPEh4OKDM= k8s.io/apimachinery v0.24.2/go.mod h1:82Bi4sCzVBdpYjyI4jY6aHX+YCUchUIrZrXKedjd2UM= k8s.io/apiserver v0.20.1/go.mod h1:ro5QHeQkgMS7ZGpvf4tSMx6bBOgPfE+f52KwvXfScaU= k8s.io/apiserver v0.20.4/go.mod h1:Mc80thBKOyy7tbvFtB4kJv1kbdD0eIH8k8vianJcbFM= k8s.io/apiserver v0.20.6/go.mod h1:QIJXNt6i6JB+0YQRNcS0hdRHJlMhflFmsBDeSgT1r8Q= -k8s.io/cli-runtime v0.24.1/go.mod h1:14aVvCTqkA7dNXY51N/6hRY3GUjchyWDOwW84qmR3bs= +k8s.io/cli-runtime v0.24.2/go.mod h1:1LIhKL2RblkhfG4v5lZEt7FtgFG5mVb8wqv5lE9m5qY= k8s.io/client-go v0.19.1/go.mod h1:AZOIVSI9UUtQPeJD3zJFp15CEhSjRgAuQP5PWRJrCIQ= k8s.io/client-go v0.20.1/go.mod h1:/zcHdt1TeWSd5HoUe6elJmHSQ6uLLgp4bIJHVEuy+/Y= k8s.io/client-go v0.20.4/go.mod h1:LiMv25ND1gLUdBeYxBIwKpkSC5IsozMMmOOeSJboP+k= k8s.io/client-go v0.20.6/go.mod h1:nNQMnOvEUEsOzRRFIIkdmYOjAZrC8bgq0ExboWSU1I0= -k8s.io/client-go v0.24.1 h1:w1hNdI9PFrzu3OlovVeTnf4oHDt+FJLd9Ndluvnb42E= -k8s.io/client-go v0.24.1/go.mod h1:f1kIDqcEYmwXS/vTbbhopMUbhKp2JhOeVTfxgaCIlF8= +k8s.io/client-go v0.24.2 h1:CoXFSf8if+bLEbinDqN9ePIDGzcLtqhfd6jpfnwGOFA= +k8s.io/client-go v0.24.2/go.mod h1:zg4Xaoo+umDsfCWr4fCnmLEtQXyCNXCvJuSsglNcV30= k8s.io/cluster-bootstrap v0.22.4 h1:2ZhV/1K4GiCrnmDHHbBnN3bERWn+Nxrtxmxp6uYYThI= k8s.io/cluster-bootstrap v0.22.4/go.mod h1:fTQZ6u9G6fg2LHhB8nEgZLnXIhCDSRYuLUUS5pgW8RY= -k8s.io/code-generator v0.24.1/go.mod h1:dpVhs00hTuTdTY6jvVxvTFCk6gSMrtfRydbhZwHI15w= +k8s.io/code-generator v0.24.2/go.mod h1:dpVhs00hTuTdTY6jvVxvTFCk6gSMrtfRydbhZwHI15w= k8s.io/component-base v0.20.1/go.mod h1:guxkoJnNoh8LNrbtiQOlyp2Y2XFCZQmrcg2n/DeYNLk= k8s.io/component-base v0.20.4/go.mod h1:t4p9EdiagbVCJKrQ1RsA5/V4rFQNDfRlevJajlGwgjI= k8s.io/component-base v0.20.6/go.mod h1:6f1MPBAeI+mvuts3sIdtpjljHWBQ2cIy38oBIWMYnrM= -k8s.io/component-base v0.24.1 h1:APv6W/YmfOWZfo+XJ1mZwep/f7g7Tpwvdbo9CQLDuts= -k8s.io/component-base v0.24.1/go.mod h1:DW5vQGYVCog8WYpNob3PMmmsY8A3L9QZNg4j/dV3s38= -k8s.io/component-helpers v0.24.1/go.mod h1:q5Z1pWV/QfX9ThuNeywxasiwkLw9KsR4Q9TAOdb/Y3s= +k8s.io/component-base v0.24.2 h1:kwpQdoSfbcH+8MPN4tALtajLDfSfYxBDYlXobNWI6OU= +k8s.io/component-base v0.24.2/go.mod h1:ucHwW76dajvQ9B7+zecZAP3BVqvrHoOxm8olHEg0nmM= +k8s.io/component-helpers v0.24.2/go.mod h1:TRQPBQKfmqkmV6c0HAmUs8cXVNYYYLsXy4zu8eODi9g= k8s.io/cri-api v0.17.3/go.mod h1:X1sbHmuXhwaHs9xxYffLqJogVsnI+f6cPRcgPel7ywM= k8s.io/cri-api v0.20.1/go.mod h1:2JRbKt+BFLTjtrILYVqQK5jqhI+XNdF6UiGMgczeBCI= k8s.io/cri-api v0.20.4/go.mod h1:2JRbKt+BFLTjtrILYVqQK5jqhI+XNdF6UiGMgczeBCI= @@ -2267,10 +2267,10 @@ k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e/go.mod h1:vHXdDvt9+2spS2R k8s.io/kube-openapi v0.0.0-20211109043538-20434351676c/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw= k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 h1:Gii5eqf+GmIEwGNKQYQClCayuJCe2/4fZUvF7VG99sU= k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42/go.mod h1:Z/45zLw8lUo4wdiUkI+v/ImEGAvu3WatcZl3lPMR4Rk= -k8s.io/kubectl v0.24.1 h1:gxcjHrnwntV1c+G/BHWVv4Mtk8CQJ0WTraElLBG+ddk= -k8s.io/kubectl v0.24.1/go.mod h1:NzFqQ50B004fHYWOfhHTrAm4TY6oGF5FAAL13LEaeUI= +k8s.io/kubectl v0.24.2 h1:+RfQVhth8akUmIc2Ge8krMl/pt66V7210ka3RE/p0J4= +k8s.io/kubectl v0.24.2/go.mod h1:+HIFJc0bA6Tzu5O/YcuUt45APAxnNL8LeMuXwoiGsPg= k8s.io/kubernetes v1.13.0/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk= -k8s.io/metrics v0.24.1/go.mod h1:vMs5xpcOyY9D+/XVwlaw8oUHYCo6JTGBCZfyXOOkAhE= +k8s.io/metrics v0.24.2/go.mod h1:5NWURxZ6Lz5gj8TFU83+vdWIVASx7W8lwPpHYCqopMo= k8s.io/utils v0.0.0-20200729134348-d5654de09c73/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20210802155522-efc7438f0176/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= From 45df2bca9d2012edc25a4a1b5aea3d1515903c55 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 21 Jun 2022 19:16:47 +0000 Subject: [PATCH 184/545] Bump google.golang.org/api from 0.83.0 to 0.84.0 Bumps [google.golang.org/api](https://github.com/googleapis/google-api-go-client) from 0.83.0 to 0.84.0. - [Release notes](https://github.com/googleapis/google-api-go-client/releases) - [Changelog](https://github.com/googleapis/google-api-go-client/blob/main/CHANGES.md) - [Commits](https://github.com/googleapis/google-api-go-client/compare/v0.83.0...v0.84.0) --- updated-dependencies: - dependency-name: google.golang.org/api dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 7 ++++--- go.sum | 15 ++++++++------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/go.mod b/go.mod index f47571217d..40a1907c89 100644 --- a/go.mod +++ b/go.mod @@ -76,11 +76,11 @@ require ( golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 golang.org/x/oauth2 v0.0.0-20220608161450-d0670ef3b1eb golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f - golang.org/x/sys v0.0.0-20220608164250-635b8c9b7f68 + golang.org/x/sys v0.0.0-20220610221304-9f5ed59c137d golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 golang.org/x/text v0.3.7 gonum.org/v1/plot v0.11.0 - google.golang.org/api v0.83.0 + google.golang.org/api v0.84.0 gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 // indirect gopkg.in/yaml.v2 v2.4.0 k8s.io/api v0.24.2 @@ -155,6 +155,7 @@ require ( github.com/google/gnostic v0.5.7-v3refs // indirect github.com/google/go-querystring v1.1.0 // indirect github.com/google/gofuzz v1.1.0 // indirect + github.com/googleapis/enterprise-certificate-proxy v0.0.0-20220520183353-fd19c99a87aa // indirect github.com/googleapis/gax-go/v2 v2.4.0 // indirect github.com/googleapis/go-type-adapters v1.0.0 // indirect github.com/gookit/color v1.4.2 // indirect @@ -214,7 +215,7 @@ require ( golang.org/x/image v0.0.0-20220302094943-723b81ca9867 // indirect golang.org/x/net v0.0.0-20220607020251-c690dde0001d // indirect golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect - golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df // indirect + golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f // indirect google.golang.org/appengine v1.6.7 // indirect google.golang.org/genproto v0.0.0-20220608133413-ed9918b62aac // indirect google.golang.org/grpc v1.47.0 // indirect diff --git a/go.sum b/go.sum index e9073704c0..a32e1b6cbf 100644 --- a/go.sum +++ b/go.sum @@ -705,6 +705,8 @@ github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+ github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/googleapis/enterprise-certificate-proxy v0.0.0-20220520183353-fd19c99a87aa h1:7MYGT2XEMam7Mtzv1yDUYXANedWvwk3HKkR3MyGowy8= +github.com/googleapis/enterprise-certificate-proxy v0.0.0-20220520183353-fd19c99a87aa/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= 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= @@ -1653,7 +1655,6 @@ golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= golang.org/x/oauth2 v0.0.0-20220309155454-6242fa91716a/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= -golang.org/x/oauth2 v0.0.0-20220524215830-622c5d57e401/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= golang.org/x/oauth2 v0.0.0-20220608161450-d0670ef3b1eb h1:8tDJ3aechhddbdPAxpycgXHJRMLpk/Ab+aa4OgdN5/g= golang.org/x/oauth2 v0.0.0-20220608161450-d0670ef3b1eb/go.mod h1:jaDAt6Dkxork7LmZnYtzbRWj0W47D86a3TGe0YHBvmE= golang.org/x/perf v0.0.0-20180704124530-6e6d33e29852/go.mod h1:JLpeXjPJfIyPr5TlbXLkXWLhP8nz10XfvxElABhCtcw= @@ -1801,8 +1802,8 @@ golang.org/x/sys v0.0.0-20220502124256-b6088ccd6cba/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220517195934-5e4e11fc645e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220608164250-635b8c9b7f68 h1:z8Hj/bl9cOV2grsOpEaQFUaly0JWN3i97mo3jXKJNp0= -golang.org/x/sys v0.0.0-20220608164250-635b8c9b7f68/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220610221304-9f5ed59c137d h1:Zu/JngovGLVi6t2J3nmAf3AoTDwuzw85YZ3b9o4yU7s= +golang.org/x/sys v0.0.0-20220610221304-9f5ed59c137d/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-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY= @@ -1940,8 +1941,9 @@ golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df h1:5Pf6pFKu98ODmgnpvkJ3kFUOQGGLIzLIkbzUHp47618= golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= +golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f h1:uF6paiQQebLeSXkrTqHqz0MXhXXS1KgF41eUdBNvxK0= +golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= 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= @@ -1988,8 +1990,8 @@ google.golang.org/api v0.74.0/go.mod h1:ZpfMZOVRMywNyvJFeqL9HRWBgAuRfSjJFpe9QtRR google.golang.org/api v0.75.0/go.mod h1:pU9QmyHLnzlpar1Mjt4IbapUCy8J+6HD6GeELN69ljA= google.golang.org/api v0.78.0/go.mod h1:1Sg78yoMLOhlQTeF+ARBoytAcH1NNyyl390YMy6rKmw= google.golang.org/api v0.80.0/go.mod h1:xY3nI94gbvBrE0J6NHXhxOmW97HG7Khjkku6AFB3Hyg= -google.golang.org/api v0.83.0 h1:pMvST+6v+46Gabac4zlJlalxZjCeRcepwg2EdBU+nCc= -google.golang.org/api v0.83.0/go.mod h1:CNywQoj/AfhTw26ZWAa6LwOv+6WFxHmeLPZq2uncLZk= +google.golang.org/api v0.84.0 h1:NMB9J4cCxs9xEm+1Z9QiO3eFvn7EnQj3Eo3hN6ugVlg= +google.golang.org/api v0.84.0/go.mod h1:NTsGnUFJMYROtiquksZHBWtHfeMC7iYthki7Eq3pa8o= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -2093,7 +2095,6 @@ google.golang.org/genproto v0.0.0-20220429170224-98d788798c3e/go.mod h1:8w6bsBMX google.golang.org/genproto v0.0.0-20220505152158-f39f71e6c8f3/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4= google.golang.org/genproto v0.0.0-20220518221133-4f43b3371335/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4= google.golang.org/genproto v0.0.0-20220523171625-347a074981d8/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4= -google.golang.org/genproto v0.0.0-20220602131408-e326c6e8e9c8/go.mod h1:yKyY4AMRwFiC8yMMNaMi+RkCnjZJt9LoWuvhXjMs+To= google.golang.org/genproto v0.0.0-20220608133413-ed9918b62aac h1:ByeiW1F67iV9o8ipGskA+HWzSkMbRJuKLlwCdPxzn7A= google.golang.org/genproto v0.0.0-20220608133413-ed9918b62aac/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA= google.golang.org/grpc v0.0.0-20160317175043-d3ddb4469d5a/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= From 2ee63b4b1e4dc15ee4938fc4d623f2e42bd9514b Mon Sep 17 00:00:00 2001 From: Sharif Elgamal Date: Tue, 21 Jun 2022 13:39:50 -0700 Subject: [PATCH 185/545] add a test for image pull secrets for gcp-auth --- test/integration/addons_test.go | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/test/integration/addons_test.go b/test/integration/addons_test.go index 9071afee10..6b3510ab39 100644 --- a/test/integration/addons_test.go +++ b/test/integration/addons_test.go @@ -29,6 +29,7 @@ import ( "os/exec" "path/filepath" "reflect" + "regexp" "strings" "testing" "time" @@ -606,6 +607,13 @@ func validateGCPAuthAddon(ctx context.Context, t *testing.T, profile string) { t.Fatalf("%s failed: %v", rr.Command(), err) } + serviceAccountName := "gcp-auth-test" + // create a dummy service account so we know the pull secret got added + rr, err = Run(t, exec.CommandContext(ctx, "kubectl", "--context", profile, "create", "sa", serviceAccountName)) + if err != nil { + t.Fatalf("%s failed: %v", rr.Command(), err) + } + // 8 minutes, because 4 is not enough for images to pull in all cases. names, err := PodWait(ctx, t, profile, "default", "integration-test=busybox", Minutes(8)) if err != nil { @@ -624,6 +632,22 @@ func validateGCPAuthAddon(ctx context.Context, t *testing.T, profile string) { t.Errorf("'printenv GOOGLE_APPLICATION_CREDENTIALS' returned %s, expected %s", got, expected) } + // Now check the service account and make sure the "gcp-auth" image pull secret is present + rr, err = Run(t, exec.CommandContext(ctx, "kubectl", "--context", profile, "describe", "sa", serviceAccountName)) + if err != nil { + t.Fatalf("%s failed: %v", rr.Command(), err) + } + + expectedPullSecret := "gcp-auth" + re, err := regexp.Compile(`.*Image pull secrets:.*`) + if err != nil { + t.Errorf("Image pull secret not found in service account output: %v", err) + } + secrets := re.FindString(rr.Stdout.String()) + if !strings.Contains(secrets, expectedPullSecret) { + t.Errorf("Unexpected image pull secrets. expected %s, got %s", expectedPullSecret, secrets) + } + if !detect.IsOnGCE() || detect.IsCloudShell() { // Make sure the file contents are correct rr, err = Run(t, exec.CommandContext(ctx, "kubectl", "--context", profile, "exec", names[0], "--", "/bin/sh", "-c", "cat /google-app-creds.json")) From 4bc3d98bb641a14c09ba1e9ed0e72515b8ceec71 Mon Sep 17 00:00:00 2001 From: Sharif Elgamal Date: Tue, 21 Jun 2022 13:53:02 -0700 Subject: [PATCH 186/545] use MustCompile for lint --- test/integration/addons_test.go | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/test/integration/addons_test.go b/test/integration/addons_test.go index 6b3510ab39..ca123a98ae 100644 --- a/test/integration/addons_test.go +++ b/test/integration/addons_test.go @@ -639,10 +639,7 @@ func validateGCPAuthAddon(ctx context.Context, t *testing.T, profile string) { } expectedPullSecret := "gcp-auth" - re, err := regexp.Compile(`.*Image pull secrets:.*`) - if err != nil { - t.Errorf("Image pull secret not found in service account output: %v", err) - } + re := regexp.MustCompile(`.*Image pull secrets:.*`) secrets := re.FindString(rr.Stdout.String()) if !strings.Contains(secrets, expectedPullSecret) { t.Errorf("Unexpected image pull secrets. expected %s, got %s", expectedPullSecret, secrets) From 77c805bcdd6170f51a51d40c92ded18f88d01bae Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 21 Jun 2022 22:23:09 +0000 Subject: [PATCH 187/545] Bump google.golang.org/api from 0.83.0 to 0.85.0 Bumps [google.golang.org/api](https://github.com/googleapis/google-api-go-client) from 0.83.0 to 0.85.0. - [Release notes](https://github.com/googleapis/google-api-go-client/releases) - [Changelog](https://github.com/googleapis/google-api-go-client/blob/main/CHANGES.md) - [Commits](https://github.com/googleapis/google-api-go-client/compare/v0.83.0...v0.85.0) --- updated-dependencies: - dependency-name: google.golang.org/api dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 12 ++++++------ go.sum | 19 +++++++++++++------ 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/go.mod b/go.mod index dd4148a20e..e65bb500f2 100644 --- a/go.mod +++ b/go.mod @@ -76,11 +76,11 @@ require ( golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 golang.org/x/oauth2 v0.0.0-20220608161450-d0670ef3b1eb golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f - golang.org/x/sys v0.0.0-20220610221304-9f5ed59c137d + golang.org/x/sys v0.0.0-20220615213510-4f61da869c0c golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 golang.org/x/text v0.3.7 gonum.org/v1/plot v0.11.0 - google.golang.org/api v0.84.0 + google.golang.org/api v0.85.0 gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 // indirect gopkg.in/yaml.v2 v2.4.0 k8s.io/api v0.24.2 @@ -106,7 +106,7 @@ require ( require ( cloud.google.com/go v0.102.0 // indirect - cloud.google.com/go/compute v1.6.1 // indirect + cloud.google.com/go/compute v1.7.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.2.0 // indirect @@ -155,7 +155,7 @@ require ( github.com/google/gnostic v0.5.7-v3refs // indirect github.com/google/go-querystring v1.1.0 // indirect github.com/google/gofuzz v1.1.0 // indirect - github.com/googleapis/enterprise-certificate-proxy v0.0.0-20220520183353-fd19c99a87aa // indirect + github.com/googleapis/enterprise-certificate-proxy v0.1.0 // indirect github.com/googleapis/gax-go/v2 v2.4.0 // indirect github.com/googleapis/go-type-adapters v1.0.0 // indirect github.com/gookit/color v1.4.2 // indirect @@ -213,11 +213,11 @@ require ( go.uber.org/multierr v1.8.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-20220607020251-c690dde0001d // indirect + golang.org/x/net v0.0.0-20220617184016-355a448f1bc9 // indirect golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f // indirect google.golang.org/appengine v1.6.7 // indirect - google.golang.org/genproto v0.0.0-20220608133413-ed9918b62aac // indirect + google.golang.org/genproto v0.0.0-20220617124728-180714bec0ad // indirect google.golang.org/grpc v1.47.0 // indirect google.golang.org/protobuf v1.28.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect diff --git a/go.sum b/go.sum index b3dd0a1812..9e3b85fb03 100644 --- a/go.sum +++ b/go.sum @@ -46,8 +46,9 @@ cloud.google.com/go/compute v0.1.0/go.mod h1:GAesmwr110a34z04OlxYkATPBEfVhkymfTB cloud.google.com/go/compute v1.3.0/go.mod h1:cCZiE1NHEtai4wiufUhW8I8S1JKkAnhnQJWM7YD99wM= cloud.google.com/go/compute v1.5.0/go.mod h1:9SMHyhJlzhlkJqrPAc839t2BZFTSk6Jdj6mkzQJeu0M= cloud.google.com/go/compute v1.6.0/go.mod h1:T29tfhtVbq1wvAPo0E3+7vhgmkOYeXjhFvz/FMzPu0s= -cloud.google.com/go/compute v1.6.1 h1:2sMmt8prCn7DPaG4Pmh0N3Inmc8cT8ae5k1M6VJ9Wqc= cloud.google.com/go/compute v1.6.1/go.mod h1:g85FgpzFvNULZ+S8AYq87axRKuf2Kh7deLqV/jJ3thU= +cloud.google.com/go/compute v1.7.0 h1:v/k9Eueb8aAJ0vZuxKMrgm6kPhCLZU9HxFU+AFDs9Uk= +cloud.google.com/go/compute v1.7.0/go.mod h1:435lt8av5oL9P3fv1OEzSbSUe+ybHXGMPQHHZWZxy9U= 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= @@ -705,8 +706,9 @@ github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+ github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/googleapis/enterprise-certificate-proxy v0.0.0-20220520183353-fd19c99a87aa h1:7MYGT2XEMam7Mtzv1yDUYXANedWvwk3HKkR3MyGowy8= github.com/googleapis/enterprise-certificate-proxy v0.0.0-20220520183353-fd19c99a87aa/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8= +github.com/googleapis/enterprise-certificate-proxy v0.1.0 h1:zO8WHNx/MYiAKJ3d5spxZXZE6KHmIQGQcAzwUzV7qQw= +github.com/googleapis/enterprise-certificate-proxy v0.1.0/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= 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= @@ -1632,8 +1634,9 @@ golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su golang.org/x/net v0.0.0-20220325170049-de3da57026de/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220412020605-290c469a71a5/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= -golang.org/x/net v0.0.0-20220607020251-c690dde0001d h1:4SFsTMi4UahlKoloni7L4eYzhFRifURQLw+yv0QDCx8= golang.org/x/net v0.0.0-20220607020251-c690dde0001d/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/net v0.0.0-20220617184016-355a448f1bc9 h1:Yqz/iviulwKwAREEeUd3nbBFn0XuyJqkoft2IlrvOhc= +golang.org/x/net v0.0.0-20220617184016-355a448f1bc9/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= 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= @@ -1803,8 +1806,9 @@ golang.org/x/sys v0.0.0-20220502124256-b6088ccd6cba/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220517195934-5e4e11fc645e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220610221304-9f5ed59c137d h1:Zu/JngovGLVi6t2J3nmAf3AoTDwuzw85YZ3b9o4yU7s= golang.org/x/sys v0.0.0-20220610221304-9f5ed59c137d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220615213510-4f61da869c0c h1:aFV+BgZ4svzjfabn8ERpuB4JI4N6/rdy1iusx77G3oU= +golang.org/x/sys v0.0.0-20220615213510-4f61da869c0c/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-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY= @@ -1991,8 +1995,9 @@ google.golang.org/api v0.74.0/go.mod h1:ZpfMZOVRMywNyvJFeqL9HRWBgAuRfSjJFpe9QtRR google.golang.org/api v0.75.0/go.mod h1:pU9QmyHLnzlpar1Mjt4IbapUCy8J+6HD6GeELN69ljA= google.golang.org/api v0.78.0/go.mod h1:1Sg78yoMLOhlQTeF+ARBoytAcH1NNyyl390YMy6rKmw= google.golang.org/api v0.80.0/go.mod h1:xY3nI94gbvBrE0J6NHXhxOmW97HG7Khjkku6AFB3Hyg= -google.golang.org/api v0.84.0 h1:NMB9J4cCxs9xEm+1Z9QiO3eFvn7EnQj3Eo3hN6ugVlg= google.golang.org/api v0.84.0/go.mod h1:NTsGnUFJMYROtiquksZHBWtHfeMC7iYthki7Eq3pa8o= +google.golang.org/api v0.85.0 h1:8rJoHuRxx+vCmZtAO/3k1dRLvYNVyTJtZ5oaFZvhgvc= +google.golang.org/api v0.85.0/go.mod h1:AqZf8Ep9uZ2pyTvgL+x0D3Zt0eoT9b5E8fmzfu6FO2g= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -2096,8 +2101,10 @@ google.golang.org/genproto v0.0.0-20220429170224-98d788798c3e/go.mod h1:8w6bsBMX google.golang.org/genproto v0.0.0-20220505152158-f39f71e6c8f3/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4= google.golang.org/genproto v0.0.0-20220518221133-4f43b3371335/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4= google.golang.org/genproto v0.0.0-20220523171625-347a074981d8/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4= -google.golang.org/genproto v0.0.0-20220608133413-ed9918b62aac h1:ByeiW1F67iV9o8ipGskA+HWzSkMbRJuKLlwCdPxzn7A= google.golang.org/genproto v0.0.0-20220608133413-ed9918b62aac/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA= +google.golang.org/genproto v0.0.0-20220616135557-88e70c0c3a90/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA= +google.golang.org/genproto v0.0.0-20220617124728-180714bec0ad h1:kqrS+lhvaMHCxul6sKQvKJ8nAAhlVItmZV822hYFH/U= +google.golang.org/genproto v0.0.0-20220617124728-180714bec0ad/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA= google.golang.org/grpc v0.0.0-20160317175043-d3ddb4469d5a/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.8.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= From 98377c37b0c1e73a8fc6af7739ed83e22e40669e Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Tue, 21 Jun 2022 15:44:26 -0700 Subject: [PATCH 188/545] automate updating yearly leaderboard --- .github/workflows/build.yml | 3 - .github/workflows/docs.yml | 1 - .github/workflows/functional_verified.yml | 2 - .github/workflows/leaderboard.yml | 1 - .github/workflows/master.yml | 8 -- .github/workflows/pr.yml | 8 -- .../workflows/time-to-k8s-public-chart.yml | 2 - .github/workflows/time-to-k8s.yml | 1 - .github/workflows/translations.yml | 1 - .github/workflows/update-golang-version.yml | 1 - .github/workflows/update-golint-version.yml | 1 - .github/workflows/update-gopogh-version.yml | 1 - .../workflows/update-gotestsum-version.yml | 1 - .github/workflows/update-kubadm-constants.yml | 1 - .github/workflows/yearly-leaderboard.yml | 47 ++++++++++++ Makefile | 4 + .../golang_version/update_golang_version.go | 5 ++ hack/update_contributions.sh | 6 +- hack/yearly-leaderboard.sh | 74 +++++++++++++++++++ 19 files changed, 133 insertions(+), 35 deletions(-) create mode 100644 .github/workflows/yearly-leaderboard.yml create mode 100755 hack/yearly-leaderboard.sh diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9b56461286..d300bfafe8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,7 +24,6 @@ jobs: - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 with: go-version: ${{env.GO_VERSION}} - stable: true - name: Download Dependencies run: go mod download - name: Build Binaries @@ -51,7 +50,6 @@ jobs: - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 with: go-version: ${{env.GO_VERSION}} - stable: true - name: Install libvirt run: | sudo apt-get update @@ -70,7 +68,6 @@ jobs: - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 with: go-version: ${{env.GO_VERSION}} - stable: true - name: Install libvirt run: | sudo apt-get update diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 85d3d6a898..96bd80c0f4 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -19,7 +19,6 @@ jobs: - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 with: go-version: ${{env.GO_VERSION}} - stable: true - name: Generate Docs id: gendocs run: | diff --git a/.github/workflows/functional_verified.yml b/.github/workflows/functional_verified.yml index f22f34aa7d..71f364b502 100644 --- a/.github/workflows/functional_verified.yml +++ b/.github/workflows/functional_verified.yml @@ -38,7 +38,6 @@ jobs: - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 with: go-version: ${{env.GO_VERSION}} - stable: true - name: Download Dependencies run: go mod download - name: Build Binaries @@ -118,7 +117,6 @@ jobs: - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 with: go-version: ${{env.GO_VERSION}} - stable: true - name: Download Binaries uses: actions/download-artifact@fdafc3f9f2e2a522dc1d230e6a03de57a1e71c95 diff --git a/.github/workflows/leaderboard.yml b/.github/workflows/leaderboard.yml index 2c7652583b..53eedcd185 100644 --- a/.github/workflows/leaderboard.yml +++ b/.github/workflows/leaderboard.yml @@ -20,7 +20,6 @@ jobs: - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 with: go-version: ${{env.GO_VERSION}} - stable: true - name: Update Leaderboard id: leaderboard run: | diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 97ebe97cbe..f892eaaf1d 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -28,7 +28,6 @@ jobs: - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 with: go-version: ${{env.GO_VERSION}} - stable: true - name: Download Dependencies run: go mod download - name: Build Binaries @@ -55,7 +54,6 @@ jobs: - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 with: go-version: ${{env.GO_VERSION}} - stable: true - name: Install libvirt run: | sudo apt-get update @@ -74,7 +72,6 @@ jobs: - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 with: go-version: ${{env.GO_VERSION}} - stable: true - name: Install libvirt run: | sudo apt-get update @@ -122,7 +119,6 @@ jobs: - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 with: go-version: ${{env.GO_VERSION}} - stable: true - name: Install gopogh shell: bash @@ -222,7 +218,6 @@ jobs: - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 with: go-version: ${{env.GO_VERSION}} - stable: true - name: Install gopogh shell: bash @@ -326,7 +321,6 @@ jobs: - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 with: go-version: ${{env.GO_VERSION}} - stable: true - name: Install gopogh shell: bash run: | @@ -412,7 +406,6 @@ jobs: - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 with: go-version: ${{env.GO_VERSION}} - stable: true - name: Install gopogh shell: bash @@ -522,7 +515,6 @@ jobs: - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 with: go-version: ${{env.GO_VERSION}} - stable: true - name: Install gopogh shell: bash diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 4c38b5aeb7..5cebd39069 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -26,7 +26,6 @@ jobs: - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 with: go-version: ${{env.GO_VERSION}} - stable: true - name: Download Dependencies run: go mod download - name: Build Binaries @@ -53,7 +52,6 @@ jobs: - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 with: go-version: ${{env.GO_VERSION}} - stable: true - name: Install libvirt run: | sudo apt-get update @@ -72,7 +70,6 @@ jobs: - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 with: go-version: ${{env.GO_VERSION}} - stable: true - name: Install libvirt run: | sudo apt-get update @@ -120,7 +117,6 @@ jobs: - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 with: go-version: ${{env.GO_VERSION}} - stable: true - name: Install gopogh shell: bash run: | @@ -220,7 +216,6 @@ jobs: - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 with: go-version: ${{env.GO_VERSION}} - stable: true - name: Install gopogh shell: bash @@ -325,7 +320,6 @@ jobs: - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 with: go-version: ${{env.GO_VERSION}} - stable: true - name: Install gopogh shell: bash run: | @@ -412,7 +406,6 @@ jobs: - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 with: go-version: ${{env.GO_VERSION}} - stable: true - name: Install gopogh shell: bash @@ -523,7 +516,6 @@ jobs: - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 with: go-version: ${{env.GO_VERSION}} - stable: true - name: Install gopogh shell: bash diff --git a/.github/workflows/time-to-k8s-public-chart.yml b/.github/workflows/time-to-k8s-public-chart.yml index 6947cf76db..d6861b7bba 100644 --- a/.github/workflows/time-to-k8s-public-chart.yml +++ b/.github/workflows/time-to-k8s-public-chart.yml @@ -23,7 +23,6 @@ jobs: - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 with: go-version: ${{env.GO_VERSION}} - stable: true - name: Benchmark time-to-k8s for Docker driver with Docker runtime run: | ./hack/benchmark/time-to-k8s/public-chart/public-chart.sh docker docker @@ -48,7 +47,6 @@ jobs: - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 with: go-version: ${{env.GO_VERSION}} - stable: true - name: Disable firewall run: | sudo /usr/libexec/ApplicationFirewall/socketfilterfw --setglobalstate off diff --git a/.github/workflows/time-to-k8s.yml b/.github/workflows/time-to-k8s.yml index e50ebea6ab..331bb6ee79 100644 --- a/.github/workflows/time-to-k8s.yml +++ b/.github/workflows/time-to-k8s.yml @@ -19,7 +19,6 @@ jobs: - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 with: go-version: ${{env.GO_VERSION}} - stable: true - name: time-to-k8s Benchmark id: timeToK8sBenchmark run: | diff --git a/.github/workflows/translations.yml b/.github/workflows/translations.yml index 4fd24629f7..1566bc8641 100644 --- a/.github/workflows/translations.yml +++ b/.github/workflows/translations.yml @@ -18,7 +18,6 @@ jobs: - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 with: go-version: ${{env.GO_VERSION}} - stable: true - name: Install libvirt run: | sudo apt-get update diff --git a/.github/workflows/update-golang-version.yml b/.github/workflows/update-golang-version.yml index 14108420e0..0ad5234b23 100644 --- a/.github/workflows/update-golang-version.yml +++ b/.github/workflows/update-golang-version.yml @@ -18,7 +18,6 @@ jobs: - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 with: go-version: ${{env.GO_VERSION}} - stable: true - name: Bump Golang Versions id: bumpGolang run: | diff --git a/.github/workflows/update-golint-version.yml b/.github/workflows/update-golint-version.yml index 54a43fe690..fddc0a1844 100644 --- a/.github/workflows/update-golint-version.yml +++ b/.github/workflows/update-golint-version.yml @@ -18,7 +18,6 @@ jobs: - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 with: go-version: ${{env.GO_VERSION}} - stable: true - name: Bump Golint Versions id: bumpGolint run: | diff --git a/.github/workflows/update-gopogh-version.yml b/.github/workflows/update-gopogh-version.yml index 154412e028..16ff8995f4 100644 --- a/.github/workflows/update-gopogh-version.yml +++ b/.github/workflows/update-gopogh-version.yml @@ -18,7 +18,6 @@ jobs: - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 with: go-version: ${{env.GO_VERSION}} - stable: true - name: Bump gopogh Versions id: bumpGopogh run: | diff --git a/.github/workflows/update-gotestsum-version.yml b/.github/workflows/update-gotestsum-version.yml index f2bfd7dd0d..e46292170f 100644 --- a/.github/workflows/update-gotestsum-version.yml +++ b/.github/workflows/update-gotestsum-version.yml @@ -18,7 +18,6 @@ jobs: - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 with: go-version: ${{env.GO_VERSION}} - stable: true - name: Bump Gotestsum Versions id: bumpGotestsum run: | diff --git a/.github/workflows/update-kubadm-constants.yml b/.github/workflows/update-kubadm-constants.yml index f2b4bd8c77..40227e1111 100644 --- a/.github/workflows/update-kubadm-constants.yml +++ b/.github/workflows/update-kubadm-constants.yml @@ -18,7 +18,6 @@ jobs: - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 with: go-version: ${{env.GO_VERSION}} - stable: true - name: Bump Kubeadm Constants for Kubernetes Images id: bumpKubAdmConsts run: | diff --git a/.github/workflows/yearly-leaderboard.yml b/.github/workflows/yearly-leaderboard.yml new file mode 100644 index 0000000000..3402d493da --- /dev/null +++ b/.github/workflows/yearly-leaderboard.yml @@ -0,0 +1,47 @@ +name: "update-yearly-leaderboard" +on: + workflow_dispatch: + schedule: + # The 2nd of every month + - cron: "0 0 2 * *" +env: + GOPROXY: https://proxy.golang.org + GO_VERSION: '1.18.3' +permissions: + contents: read + +jobs: + update-yearly-leaderboard: + if: github.repository == 'kubernetes/minikube' + runs-on: ubuntu-20.04 + env: + AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} + AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + AWS_DEFAULT_REGION: 'us-west-1' + steps: + - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5 + - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 + with: + go-version: ${{env.GO_VERSION}} + - name: Update Yearly Leaderboard + id: yearly-leaderboard + run: | + make update-yearly-leaderboard + env: + GITHUB_TOKEN: ${{ secrets.MINIKUBE_BOT_PAT }} + - name: Create PR + if: ${{ steps.leaderboard.outputs.changes != '' }} + uses: peter-evans/create-pull-request@923ad837f191474af6b1721408744feb989a4c27 + with: + token: ${{ secrets.MINIKUBE_BOT_PAT }} + commit-message: Update yearly leaderboard + committer: minikube-bot + author: minikube-bot + branch: yearly-leaderboard + push-to-fork: minikube-bot/minikube + base: master + delete-branch: true + title: 'Update Yearly Leaderboard' + body: | + Committing changes resulting from `make update-yearly-leaderboard`. + This PR is auto-generated by the [update-yearly-leaderboard](https://github.com/kubernetes/minikube/blob/master/.github/workflows/yearly-leaderboard.yml) CI workflow. diff --git a/Makefile b/Makefile index 8896c1a836..3398ac6910 100644 --- a/Makefile +++ b/Makefile @@ -813,6 +813,10 @@ release-notes: update-leaderboard: hack/update_contributions.sh +.PHONY: update-yearly-leaderboard +update-yearly-leaderboard: + hack/yearly-leaderboard.sh + out/docker-machine-driver-kvm2: out/docker-machine-driver-kvm2-$(GOARCH) $(if $(quiet),@echo " CP $@") $(Q)cp $< $@ diff --git a/hack/update/golang_version/update_golang_version.go b/hack/update/golang_version/update_golang_version.go index c315cc40ec..f29de3aa21 100644 --- a/hack/update/golang_version/update_golang_version.go +++ b/hack/update/golang_version/update_golang_version.go @@ -58,6 +58,11 @@ var ( `GO_VERSION: .*`: `GO_VERSION: '{{.StableVersion}}'`, }, }, + ".github/workflows/yearly-leaderboard.yml": { + Replace: map[string]string{ + `GO_VERSION: .*`: `GO_VERSION: '{{.StableVersion}}'`, + }, + }, ".github/workflows/translations.yml": { Replace: map[string]string{ `GO_VERSION: .*`: `GO_VERSION: '{{.StableVersion}}'`, diff --git a/hack/update_contributions.sh b/hack/update_contributions.sh index 9d0118643f..08060e4b4f 100755 --- a/hack/update_contributions.sh +++ b/hack/update_contributions.sh @@ -70,7 +70,7 @@ while read -r tag_index tag_name tag_start tag_end; do echo "Generating leaderboard for" "$tag_name" "(from $tag_start to $tag_end)" # Print header for page. printf -- "---\ntitle: \"$tag_name - $tag_end\"\nlinkTitle: \"$tag_name - $tag_end\"\nweight: $tag_index\n---\n" > "$destination/$tag_name.html" - # Add pullsheet content (deleting the lines consisting of the command used to generate it). - $DIR/pullsheet leaderboard --token-path "$TMP_TOKEN" --repos kubernetes/minikube --since "$tag_start" --until "$tag_end" --logtostderr=false --stderrthreshold=2 \ - | sed -r -e "/Command\-line/,/pullsheet/d" >> "$destination/$tag_name.html" + # Add pullsheet content + $DIR/pullsheet leaderboard --token-path "$TMP_TOKEN" --repos kubernetes/minikube --since "$tag_start" --until "$tag_end" --hide-command --logtostderr=false --stderrthreshold=2 \ + >> "$destination/$tag_name.html" done <<< "$tags_with_range" diff --git a/hack/yearly-leaderboard.sh b/hack/yearly-leaderboard.sh new file mode 100755 index 0000000000..35943de750 --- /dev/null +++ b/hack/yearly-leaderboard.sh @@ -0,0 +1,74 @@ +#!/bin/bash + +# Copyright 2022 The Kubernetes Authors All rights reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +set -eu -o pipefail + +DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) +DESTINATION="$DIR/../site/content/en/docs/contrib/leaderboard" +TMP_TOKEN=$(mktemp) +BUCKET="s3://minikube-leaderboard" +YEAR=$(date +"%Y" --date "last month") +MONTH=$(date +"%m" --date "last month") +DAYS_IN_MONTH=$(cal $(date +"%m %Y" --date "last month") | awk 'NF {DAYS = $NF}; END {print DAYS}') + +install_pullsheet() { + echo >&2 'Installing pullsheet' + go install github.com/google/pullsheet@latest +} + +verify_gh_auth() { + gh auth status -t 2>&1 | sed -n -r 's/^.*Token: ([a-zA-Z0-9_]*)/\1/p' > "$TMP_TOKEN" + if [ ! -s "$TMP_TOKEN" ]; then + echo "Failed to acquire token from 'gh auth'. Ensure 'gh' is authenticated." 1>&2 + exit 1 + fi +} + +# Ensure the token is deleted when the script exits, so the token is not leaked. +cleanup_token() { + rm -f "$TMP_TOKEN" +} + +copy() { + aws s3 cp "$1" "$2" +} + +generate_leaderboard() { + echo "Generating leaderboard for" "$YEAR" + # Print header for page + printf -- "---\ntitle: \"$YEAR\"\nlinkTitle: \"$YEAR\"\nweight: -9999$YEAR\n---\n" > "$DESTINATION/$YEAR.html" + # Add pullsheet content + pullsheet leaderboard --token-path "$TMP_TOKEN" --repos kubernetes/minikube --since-display "$YEAR-01-01" --since "$YEAR-$MONTH-01" --until "$YEAR-$MONTH-$DAYS_IN_MONTH" --json-files "./$YEAR.json" --json-output "./$YEAR.json" --hide-command --logtostderr=false --stderrthreshold=2 >> "$DESTINATION/$YEAR.html" +} + +cleanup() { + rm "$YEAR.json" +} + +install_pullsheet + +verify_gh_auth + +trap cleanup_token EXIT + +copy "$BUCKET/$YEAR.json" "$YEAR.json" || printf -- "{}" > "$YEAR.json" + +generate_leaderboard + +copy "$YEAR.json" "$BUCKET/$YEAR.json" +copy "$YEAR.json" "$BUCKET/$YEAR-$MONTH.json" + +cleanup From 975a521e895293ba3d9de6ba27d3b74e30e0d98c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 22 Jun 2022 17:15:25 +0000 Subject: [PATCH 189/545] Bump k8s.io/klog/v2 from 2.60.1 to 2.70.0 Bumps [k8s.io/klog/v2](https://github.com/kubernetes/klog) from 2.60.1 to 2.70.0. - [Release notes](https://github.com/kubernetes/klog/releases) - [Changelog](https://github.com/kubernetes/klog/blob/main/RELEASE.md) - [Commits](https://github.com/kubernetes/klog/compare/v2.60.1...v2.70.0) --- updated-dependencies: - dependency-name: k8s.io/klog/v2 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 15 ++++++++------- go.sum | 31 ++++++++++++++++++++----------- 2 files changed, 28 insertions(+), 18 deletions(-) diff --git a/go.mod b/go.mod index 3bc4e81959..5842f2081a 100644 --- a/go.mod +++ b/go.mod @@ -76,11 +76,11 @@ require ( golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 golang.org/x/oauth2 v0.0.0-20220608161450-d0670ef3b1eb golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f - golang.org/x/sys v0.0.0-20220608164250-635b8c9b7f68 + golang.org/x/sys v0.0.0-20220615213510-4f61da869c0c golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 golang.org/x/text v0.3.7 gonum.org/v1/plot v0.11.0 - google.golang.org/api v0.83.0 + google.golang.org/api v0.85.0 gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 // indirect gopkg.in/yaml.v2 v2.4.0 k8s.io/api v0.24.2 @@ -88,7 +88,7 @@ require ( k8s.io/client-go v0.24.2 k8s.io/cluster-bootstrap v0.0.0 k8s.io/component-base v0.24.2 - k8s.io/klog/v2 v2.60.1 + k8s.io/klog/v2 v2.70.0 k8s.io/kubectl v0.24.2 k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 libvirt.org/go/libvirt v1.8004.0 @@ -106,7 +106,7 @@ require ( require ( cloud.google.com/go v0.102.0 // indirect - cloud.google.com/go/compute v1.6.1 // indirect + cloud.google.com/go/compute v1.7.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.2.0 // indirect @@ -155,6 +155,7 @@ require ( github.com/google/gnostic v0.5.7-v3refs // indirect github.com/google/go-querystring v1.1.0 // indirect github.com/google/gofuzz v1.1.0 // indirect + github.com/googleapis/enterprise-certificate-proxy v0.1.0 // indirect github.com/googleapis/gax-go/v2 v2.4.0 // indirect github.com/googleapis/go-type-adapters v1.0.0 // indirect github.com/gookit/color v1.4.2 // indirect @@ -212,11 +213,11 @@ require ( go.uber.org/multierr v1.8.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-20220607020251-c690dde0001d // indirect + golang.org/x/net v0.0.0-20220617184016-355a448f1bc9 // indirect golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect - golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df // indirect + golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f // indirect google.golang.org/appengine v1.6.7 // indirect - google.golang.org/genproto v0.0.0-20220608133413-ed9918b62aac // indirect + google.golang.org/genproto v0.0.0-20220617124728-180714bec0ad // indirect google.golang.org/grpc v1.47.0 // indirect google.golang.org/protobuf v1.28.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect diff --git a/go.sum b/go.sum index b164199c62..6e46b115c2 100644 --- a/go.sum +++ b/go.sum @@ -46,8 +46,9 @@ cloud.google.com/go/compute v0.1.0/go.mod h1:GAesmwr110a34z04OlxYkATPBEfVhkymfTB cloud.google.com/go/compute v1.3.0/go.mod h1:cCZiE1NHEtai4wiufUhW8I8S1JKkAnhnQJWM7YD99wM= cloud.google.com/go/compute v1.5.0/go.mod h1:9SMHyhJlzhlkJqrPAc839t2BZFTSk6Jdj6mkzQJeu0M= cloud.google.com/go/compute v1.6.0/go.mod h1:T29tfhtVbq1wvAPo0E3+7vhgmkOYeXjhFvz/FMzPu0s= -cloud.google.com/go/compute v1.6.1 h1:2sMmt8prCn7DPaG4Pmh0N3Inmc8cT8ae5k1M6VJ9Wqc= cloud.google.com/go/compute v1.6.1/go.mod h1:g85FgpzFvNULZ+S8AYq87axRKuf2Kh7deLqV/jJ3thU= +cloud.google.com/go/compute v1.7.0 h1:v/k9Eueb8aAJ0vZuxKMrgm6kPhCLZU9HxFU+AFDs9Uk= +cloud.google.com/go/compute v1.7.0/go.mod h1:435lt8av5oL9P3fv1OEzSbSUe+ybHXGMPQHHZWZxy9U= 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= @@ -705,6 +706,9 @@ github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+ github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/googleapis/enterprise-certificate-proxy v0.0.0-20220520183353-fd19c99a87aa/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8= +github.com/googleapis/enterprise-certificate-proxy v0.1.0 h1:zO8WHNx/MYiAKJ3d5spxZXZE6KHmIQGQcAzwUzV7qQw= +github.com/googleapis/enterprise-certificate-proxy v0.1.0/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= 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= @@ -1630,8 +1634,9 @@ golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su golang.org/x/net v0.0.0-20220325170049-de3da57026de/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220412020605-290c469a71a5/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= -golang.org/x/net v0.0.0-20220607020251-c690dde0001d h1:4SFsTMi4UahlKoloni7L4eYzhFRifURQLw+yv0QDCx8= golang.org/x/net v0.0.0-20220607020251-c690dde0001d/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/net v0.0.0-20220617184016-355a448f1bc9 h1:Yqz/iviulwKwAREEeUd3nbBFn0XuyJqkoft2IlrvOhc= +golang.org/x/net v0.0.0-20220617184016-355a448f1bc9/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= 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= @@ -1654,7 +1659,6 @@ golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= golang.org/x/oauth2 v0.0.0-20220309155454-6242fa91716a/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= -golang.org/x/oauth2 v0.0.0-20220524215830-622c5d57e401/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= golang.org/x/oauth2 v0.0.0-20220608161450-d0670ef3b1eb h1:8tDJ3aechhddbdPAxpycgXHJRMLpk/Ab+aa4OgdN5/g= golang.org/x/oauth2 v0.0.0-20220608161450-d0670ef3b1eb/go.mod h1:jaDAt6Dkxork7LmZnYtzbRWj0W47D86a3TGe0YHBvmE= golang.org/x/perf v0.0.0-20180704124530-6e6d33e29852/go.mod h1:JLpeXjPJfIyPr5TlbXLkXWLhP8nz10XfvxElABhCtcw= @@ -1802,8 +1806,9 @@ golang.org/x/sys v0.0.0-20220502124256-b6088ccd6cba/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220517195934-5e4e11fc645e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220608164250-635b8c9b7f68 h1:z8Hj/bl9cOV2grsOpEaQFUaly0JWN3i97mo3jXKJNp0= -golang.org/x/sys v0.0.0-20220608164250-635b8c9b7f68/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220610221304-9f5ed59c137d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220615213510-4f61da869c0c h1:aFV+BgZ4svzjfabn8ERpuB4JI4N6/rdy1iusx77G3oU= +golang.org/x/sys v0.0.0-20220615213510-4f61da869c0c/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-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY= @@ -1941,8 +1946,9 @@ golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df h1:5Pf6pFKu98ODmgnpvkJ3kFUOQGGLIzLIkbzUHp47618= golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= +golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f h1:uF6paiQQebLeSXkrTqHqz0MXhXXS1KgF41eUdBNvxK0= +golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= 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= @@ -1989,8 +1995,9 @@ google.golang.org/api v0.74.0/go.mod h1:ZpfMZOVRMywNyvJFeqL9HRWBgAuRfSjJFpe9QtRR google.golang.org/api v0.75.0/go.mod h1:pU9QmyHLnzlpar1Mjt4IbapUCy8J+6HD6GeELN69ljA= google.golang.org/api v0.78.0/go.mod h1:1Sg78yoMLOhlQTeF+ARBoytAcH1NNyyl390YMy6rKmw= google.golang.org/api v0.80.0/go.mod h1:xY3nI94gbvBrE0J6NHXhxOmW97HG7Khjkku6AFB3Hyg= -google.golang.org/api v0.83.0 h1:pMvST+6v+46Gabac4zlJlalxZjCeRcepwg2EdBU+nCc= -google.golang.org/api v0.83.0/go.mod h1:CNywQoj/AfhTw26ZWAa6LwOv+6WFxHmeLPZq2uncLZk= +google.golang.org/api v0.84.0/go.mod h1:NTsGnUFJMYROtiquksZHBWtHfeMC7iYthki7Eq3pa8o= +google.golang.org/api v0.85.0 h1:8rJoHuRxx+vCmZtAO/3k1dRLvYNVyTJtZ5oaFZvhgvc= +google.golang.org/api v0.85.0/go.mod h1:AqZf8Ep9uZ2pyTvgL+x0D3Zt0eoT9b5E8fmzfu6FO2g= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -2094,9 +2101,10 @@ google.golang.org/genproto v0.0.0-20220429170224-98d788798c3e/go.mod h1:8w6bsBMX google.golang.org/genproto v0.0.0-20220505152158-f39f71e6c8f3/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4= google.golang.org/genproto v0.0.0-20220518221133-4f43b3371335/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4= google.golang.org/genproto v0.0.0-20220523171625-347a074981d8/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4= -google.golang.org/genproto v0.0.0-20220602131408-e326c6e8e9c8/go.mod h1:yKyY4AMRwFiC8yMMNaMi+RkCnjZJt9LoWuvhXjMs+To= -google.golang.org/genproto v0.0.0-20220608133413-ed9918b62aac h1:ByeiW1F67iV9o8ipGskA+HWzSkMbRJuKLlwCdPxzn7A= google.golang.org/genproto v0.0.0-20220608133413-ed9918b62aac/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA= +google.golang.org/genproto v0.0.0-20220616135557-88e70c0c3a90/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA= +google.golang.org/genproto v0.0.0-20220617124728-180714bec0ad h1:kqrS+lhvaMHCxul6sKQvKJ8nAAhlVItmZV822hYFH/U= +google.golang.org/genproto v0.0.0-20220617124728-180714bec0ad/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA= google.golang.org/grpc v0.0.0-20160317175043-d3ddb4469d5a/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.8.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= @@ -2259,8 +2267,9 @@ k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= k8s.io/klog/v2 v2.3.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= k8s.io/klog/v2 v2.4.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= k8s.io/klog/v2 v2.9.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec= -k8s.io/klog/v2 v2.60.1 h1:VW25q3bZx9uE3vvdL6M8ezOX79vA2Aq1nEWLqNQclHc= k8s.io/klog/v2 v2.60.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= +k8s.io/klog/v2 v2.70.0 h1:GMmmjoFOrNepPN0ZeGCzvD2Gh5IKRwdFx8W5PBxVTQU= +k8s.io/klog/v2 v2.70.0/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6/go.mod h1:UuqjUnNftUyPE5H64/qeyjQoUZhGpeFDVdxjTeEVN2o= k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd/go.mod h1:WOJ3KddDSol4tAGcJo0Tvi+dK12EcqSLqcWsryKMpfM= k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw= From ee391b56b95daa1e1f9edddcad224889492a7f1a Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Wed, 22 Jun 2022 17:41:35 +0000 Subject: [PATCH 190/545] Update ISO to v1.26.0 --- 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 53628967d4..10e4e80866 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.26.0-1655407986-14197 +ISO_VERSION ?= v1.26.0 # 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 1f13d85db3..404359a48a 100644 --- a/pkg/minikube/download/iso.go +++ b/pkg/minikube/download/iso.go @@ -41,7 +41,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/14197" + isoBucket := "minikube/iso" return []string{ fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s-%s.iso", isoBucket, v, runtime.GOARCH), fmt.Sprintf("https://github.com/kubernetes/minikube/releases/download/%s/minikube-%s-%s.iso", v, v, runtime.GOARCH), diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index 06ab5adfda..d6a20ab2b4 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/14197/minikube-v1.26.0-1655407986-14197-amd64.iso,https://github.com/kubernetes/minikube/releases/download/v1.26.0-1655407986-14197/minikube-v1.26.0-1655407986-14197-amd64.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.26.0-1655407986-14197-amd64.iso,https://storage.googleapis.com/minikube-builds/iso/14197/minikube-v1.26.0-1655407986-14197.iso,https://github.com/kubernetes/minikube/releases/download/v1.26.0-1655407986-14197/minikube-v1.26.0-1655407986-14197.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.26.0-1655407986-14197.iso]) + --iso-url strings Locations to fetch the minikube ISO from. (default [https://storage.googleapis.com/minikube/iso/minikube-v1.26.0-amd64.iso,https://github.com/kubernetes/minikube/releases/download/v1.26.0/minikube-v1.26.0-amd64.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.26.0-amd64.iso,https://storage.googleapis.com/minikube/iso/minikube-v1.26.0.iso,https://github.com/kubernetes/minikube/releases/download/v1.26.0/minikube-v1.26.0.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.26.0.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.24.1, 'latest' for v1.24.1). Defaults to 'stable'. --kvm-gpu Enable experimental NVIDIA GPU support in minikube From 1ae2970bf99de38eb4e724efc45c7d1e8e1b1433 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Wed, 22 Jun 2022 17:45:20 +0000 Subject: [PATCH 191/545] Update kicbase to v0.0.32 --- pkg/drivers/kic/types.go | 6 +++--- site/content/en/docs/commands/start.md | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/drivers/kic/types.go b/pkg/drivers/kic/types.go index 2da8030b88..67a6c5c55f 100644 --- a/pkg/drivers/kic/types.go +++ b/pkg/drivers/kic/types.go @@ -24,13 +24,13 @@ import ( const ( // Version is the current version of kic - Version = "v0.0.31-1655326339-14197" + Version = "v0.0.32" // SHA of the kic base image baseImageSHA = "9190bd2393eae887316c97a74370b7d5dad8f0b2ef91ac2662bc36f7ef8e0b95" // The name of the GCR kicbase repository - gcrRepo = "gcr.io/k8s-minikube/kicbase-builds" + gcrRepo = "gcr.io/k8s-minikube/kicbase" // The name of the Dockerhub kicbase repository - dockerhubRepo = "docker.io/kicbase/build" + dockerhubRepo = "docker.io/kicbase/stable" ) var ( diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index 06ab5adfda..20006339ba 100644 --- a/site/content/en/docs/commands/start.md +++ b/site/content/en/docs/commands/start.md @@ -26,7 +26,7 @@ minikube start [flags] --apiserver-names strings A set of apiserver names which are used in the generated certificate for kubernetes. This can be used if you want to make the apiserver available from outside the machine --apiserver-port int The apiserver listening port (default 8443) --auto-update-drivers If set, automatically updates drivers to the latest version. Defaults to true. (default true) - --base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase-builds:v0.0.31-1655326339-14197@sha256:9190bd2393eae887316c97a74370b7d5dad8f0b2ef91ac2662bc36f7ef8e0b95") + --base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase:v0.0.32@sha256:9190bd2393eae887316c97a74370b7d5dad8f0b2ef91ac2662bc36f7ef8e0b95") --binary-mirror string Location to fetch kubectl, kubelet, & kubeadm binaries from. --cache-images If true, cache docker images for the current bootstrapper and load them into the machine. Always false with --driver=none. (default true) --cert-expiration duration Duration until minikube certificate expiration, defaults to three years (26280h). (default 26280h0m0s) From f27b5048581dd4d355609368319c59882044ee9a Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Wed, 22 Jun 2022 10:56:18 -0700 Subject: [PATCH 192/545] fix upload_all_reports --- .github/workflows/master.yml | 4 ++-- .github/workflows/pr.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 00426be054..5ea90c9b41 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -570,9 +570,9 @@ jobs: echo 'EOF' >> $GITHUB_ENV - uses: actions/upload-artifact@3cea5372237819ed00197afe530f5a7ea3e805c8 with: - name: none_ubuntu18_04 + name: functional_baremetal_ubuntu18_04 path: minikube_binaries/report - - name: The End Result - None on Ubuntu 18:04 + - name: The End Result functional_baremetal_ubuntu18_04 shell: bash run: | echo ${GOPOGH_RESULT} diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index aa644e6081..b74554b42a 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -572,9 +572,9 @@ jobs: echo 'EOF' >> $GITHUB_ENV - uses: actions/upload-artifact@3cea5372237819ed00197afe530f5a7ea3e805c8 with: - name: none_ubuntu18_04 + name: functional_baremetal_ubuntu18_04 path: minikube_binaries/report - - name: The End Result - None on Ubuntu 18:04 + - name: The End Result functional_baremetal_ubuntu18_04 shell: bash run: | echo ${GOPOGH_RESULT} From 1ade9eeebdeb67d189e67c50fd19a8dd2e0d0d21 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Wed, 22 Jun 2022 18:04:56 +0000 Subject: [PATCH 193/545] Update auto-generated docs and translations --- site/content/en/docs/commands/addons.md | 112 +++++++------- site/content/en/docs/commands/cache.md | 84 +++++------ site/content/en/docs/commands/completion.md | 70 ++++----- site/content/en/docs/commands/config.md | 98 ++++++------ site/content/en/docs/commands/cp.md | 14 +- site/content/en/docs/commands/dashboard.md | 14 +- site/content/en/docs/commands/delete.md | 14 +- site/content/en/docs/commands/docker-env.md | 14 +- site/content/en/docs/commands/help.md | 14 +- site/content/en/docs/commands/image.md | 140 +++++++++--------- site/content/en/docs/commands/ip.md | 14 +- site/content/en/docs/commands/kubectl.md | 14 +- site/content/en/docs/commands/logs.md | 14 +- site/content/en/docs/commands/mount.md | 14 +- site/content/en/docs/commands/node.md | 98 ++++++------ site/content/en/docs/commands/options.md | 14 +- site/content/en/docs/commands/pause.md | 14 +- site/content/en/docs/commands/podman-env.md | 14 +- site/content/en/docs/commands/profile.md | 42 +++--- site/content/en/docs/commands/service.md | 42 +++--- site/content/en/docs/commands/ssh-host.md | 14 +- site/content/en/docs/commands/ssh-key.md | 14 +- site/content/en/docs/commands/ssh.md | 14 +- site/content/en/docs/commands/start.md | 14 +- site/content/en/docs/commands/status.md | 14 +- site/content/en/docs/commands/stop.md | 14 +- site/content/en/docs/commands/tunnel.md | 14 +- site/content/en/docs/commands/unpause.md | 14 +- site/content/en/docs/commands/update-check.md | 14 +- .../en/docs/commands/update-context.md | 14 +- site/content/en/docs/commands/version.md | 14 +- 31 files changed, 504 insertions(+), 504 deletions(-) diff --git a/site/content/en/docs/commands/addons.md b/site/content/en/docs/commands/addons.md index 1b4ebaac52..76abfd0948 100644 --- a/site/content/en/docs/commands/addons.md +++ b/site/content/en/docs/commands/addons.md @@ -21,20 +21,20 @@ minikube addons SUBCOMMAND [flags] ``` --add_dir_header If true, adds the file directory to the header of the log messages - --alsologtostderr log to standard error as well as files + --alsologtostderr log to standard error as well as files (no effect when -logtostderr=true) -b, --bootstrapper string The name of the cluster bootstrapper that will set up the Kubernetes cluster. (default "kubeadm") -h, --help --log_backtrace_at traceLocation when logging hits line file:N, emit a stack trace (default :0) - --log_dir string If non-empty, write log files in this directory - --log_file string If non-empty, use this log file - --log_file_max_size uint Defines the maximum size a log file can grow to. Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) + --log_dir string If non-empty, write log files in this directory (no effect when -logtostderr=true) + --log_file string If non-empty, use this log file (no effect when -logtostderr=true) + --log_file_max_size uint Defines the maximum size a log file can grow to (no effect when -logtostderr=true). Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) --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) + --one_output If true, only write logs to their native severity level (vs also writing to each lower severity level; no effect when -logtostderr=true) -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) + --skip_log_headers If true, avoid headers when opening log files (no effect when -logtostderr=true) + --stderrthreshold severity logs at or above this threshold go to stderr when writing to files and stderr (no effect when -logtostderr=true or -alsologtostderr=false) (default 2) --user string Specifies the user executing the operation. Useful for auditing operations executed by 3rd party tools. Defaults to the operating system username. -v, --v Level number for the log level verbosity --vmodule moduleSpec comma-separated list of pattern=N settings for file-filtered logging @@ -56,20 +56,20 @@ minikube addons configure ADDON_NAME [flags] ``` --add_dir_header If true, adds the file directory to the header of the log messages - --alsologtostderr log to standard error as well as files + --alsologtostderr log to standard error as well as files (no effect when -logtostderr=true) -b, --bootstrapper string The name of the cluster bootstrapper that will set up the Kubernetes cluster. (default "kubeadm") -h, --help --log_backtrace_at traceLocation when logging hits line file:N, emit a stack trace (default :0) - --log_dir string If non-empty, write log files in this directory - --log_file string If non-empty, use this log file - --log_file_max_size uint Defines the maximum size a log file can grow to. Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) + --log_dir string If non-empty, write log files in this directory (no effect when -logtostderr=true) + --log_file string If non-empty, use this log file (no effect when -logtostderr=true) + --log_file_max_size uint Defines the maximum size a log file can grow to (no effect when -logtostderr=true). Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) --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) + --one_output If true, only write logs to their native severity level (vs also writing to each lower severity level; no effect when -logtostderr=true) -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) + --skip_log_headers If true, avoid headers when opening log files (no effect when -logtostderr=true) + --stderrthreshold severity logs at or above this threshold go to stderr when writing to files and stderr (no effect when -logtostderr=true or -alsologtostderr=false) (default 2) --user string Specifies the user executing the operation. Useful for auditing operations executed by 3rd party tools. Defaults to the operating system username. -v, --v Level number for the log level verbosity --vmodule moduleSpec comma-separated list of pattern=N settings for file-filtered logging @@ -91,20 +91,20 @@ minikube addons disable ADDON_NAME [flags] ``` --add_dir_header If true, adds the file directory to the header of the log messages - --alsologtostderr log to standard error as well as files + --alsologtostderr log to standard error as well as files (no effect when -logtostderr=true) -b, --bootstrapper string The name of the cluster bootstrapper that will set up the Kubernetes cluster. (default "kubeadm") -h, --help --log_backtrace_at traceLocation when logging hits line file:N, emit a stack trace (default :0) - --log_dir string If non-empty, write log files in this directory - --log_file string If non-empty, use this log file - --log_file_max_size uint Defines the maximum size a log file can grow to. Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) + --log_dir string If non-empty, write log files in this directory (no effect when -logtostderr=true) + --log_file string If non-empty, use this log file (no effect when -logtostderr=true) + --log_file_max_size uint Defines the maximum size a log file can grow to (no effect when -logtostderr=true). Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) --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) + --one_output If true, only write logs to their native severity level (vs also writing to each lower severity level; no effect when -logtostderr=true) -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) + --skip_log_headers If true, avoid headers when opening log files (no effect when -logtostderr=true) + --stderrthreshold severity logs at or above this threshold go to stderr when writing to files and stderr (no effect when -logtostderr=true or -alsologtostderr=false) (default 2) --user string Specifies the user executing the operation. Useful for auditing operations executed by 3rd party tools. Defaults to the operating system username. -v, --v Level number for the log level verbosity --vmodule moduleSpec comma-separated list of pattern=N settings for file-filtered logging @@ -141,20 +141,20 @@ minikube addons enable dashboard ``` --add_dir_header If true, adds the file directory to the header of the log messages - --alsologtostderr log to standard error as well as files + --alsologtostderr log to standard error as well as files (no effect when -logtostderr=true) -b, --bootstrapper string The name of the cluster bootstrapper that will set up the Kubernetes cluster. (default "kubeadm") -h, --help --log_backtrace_at traceLocation when logging hits line file:N, emit a stack trace (default :0) - --log_dir string If non-empty, write log files in this directory - --log_file string If non-empty, use this log file - --log_file_max_size uint Defines the maximum size a log file can grow to. Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) + --log_dir string If non-empty, write log files in this directory (no effect when -logtostderr=true) + --log_file string If non-empty, use this log file (no effect when -logtostderr=true) + --log_file_max_size uint Defines the maximum size a log file can grow to (no effect when -logtostderr=true). Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) --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) + --one_output If true, only write logs to their native severity level (vs also writing to each lower severity level; no effect when -logtostderr=true) -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) + --skip_log_headers If true, avoid headers when opening log files (no effect when -logtostderr=true) + --stderrthreshold severity logs at or above this threshold go to stderr when writing to files and stderr (no effect when -logtostderr=true or -alsologtostderr=false) (default 2) --user string Specifies the user executing the operation. Useful for auditing operations executed by 3rd party tools. Defaults to the operating system username. -v, --v Level number for the log level verbosity --vmodule moduleSpec comma-separated list of pattern=N settings for file-filtered logging @@ -177,20 +177,20 @@ minikube addons help [command] [flags] ``` --add_dir_header If true, adds the file directory to the header of the log messages - --alsologtostderr log to standard error as well as files + --alsologtostderr log to standard error as well as files (no effect when -logtostderr=true) -b, --bootstrapper string The name of the cluster bootstrapper that will set up the Kubernetes cluster. (default "kubeadm") -h, --help --log_backtrace_at traceLocation when logging hits line file:N, emit a stack trace (default :0) - --log_dir string If non-empty, write log files in this directory - --log_file string If non-empty, use this log file - --log_file_max_size uint Defines the maximum size a log file can grow to. Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) + --log_dir string If non-empty, write log files in this directory (no effect when -logtostderr=true) + --log_file string If non-empty, use this log file (no effect when -logtostderr=true) + --log_file_max_size uint Defines the maximum size a log file can grow to (no effect when -logtostderr=true). Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) --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) + --one_output If true, only write logs to their native severity level (vs also writing to each lower severity level; no effect when -logtostderr=true) -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) + --skip_log_headers If true, avoid headers when opening log files (no effect when -logtostderr=true) + --stderrthreshold severity logs at or above this threshold go to stderr when writing to files and stderr (no effect when -logtostderr=true or -alsologtostderr=false) (default 2) --user string Specifies the user executing the operation. Useful for auditing operations executed by 3rd party tools. Defaults to the operating system username. -v, --v Level number for the log level verbosity --vmodule moduleSpec comma-separated list of pattern=N settings for file-filtered logging @@ -218,20 +218,20 @@ minikube addons images ingress ``` --add_dir_header If true, adds the file directory to the header of the log messages - --alsologtostderr log to standard error as well as files + --alsologtostderr log to standard error as well as files (no effect when -logtostderr=true) -b, --bootstrapper string The name of the cluster bootstrapper that will set up the Kubernetes cluster. (default "kubeadm") -h, --help --log_backtrace_at traceLocation when logging hits line file:N, emit a stack trace (default :0) - --log_dir string If non-empty, write log files in this directory - --log_file string If non-empty, use this log file - --log_file_max_size uint Defines the maximum size a log file can grow to. Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) + --log_dir string If non-empty, write log files in this directory (no effect when -logtostderr=true) + --log_file string If non-empty, use this log file (no effect when -logtostderr=true) + --log_file_max_size uint Defines the maximum size a log file can grow to (no effect when -logtostderr=true). Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) --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) + --one_output If true, only write logs to their native severity level (vs also writing to each lower severity level; no effect when -logtostderr=true) -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) + --skip_log_headers If true, avoid headers when opening log files (no effect when -logtostderr=true) + --stderrthreshold severity logs at or above this threshold go to stderr when writing to files and stderr (no effect when -logtostderr=true or -alsologtostderr=false) (default 2) --user string Specifies the user executing the operation. Useful for auditing operations executed by 3rd party tools. Defaults to the operating system username. -v, --v Level number for the log level verbosity --vmodule moduleSpec comma-separated list of pattern=N settings for file-filtered logging @@ -260,20 +260,20 @@ minikube addons list [flags] ``` --add_dir_header If true, adds the file directory to the header of the log messages - --alsologtostderr log to standard error as well as files + --alsologtostderr log to standard error as well as files (no effect when -logtostderr=true) -b, --bootstrapper string The name of the cluster bootstrapper that will set up the Kubernetes cluster. (default "kubeadm") -h, --help --log_backtrace_at traceLocation when logging hits line file:N, emit a stack trace (default :0) - --log_dir string If non-empty, write log files in this directory - --log_file string If non-empty, use this log file - --log_file_max_size uint Defines the maximum size a log file can grow to. Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) + --log_dir string If non-empty, write log files in this directory (no effect when -logtostderr=true) + --log_file string If non-empty, use this log file (no effect when -logtostderr=true) + --log_file_max_size uint Defines the maximum size a log file can grow to (no effect when -logtostderr=true). Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) --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) + --one_output If true, only write logs to their native severity level (vs also writing to each lower severity level; no effect when -logtostderr=true) -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) + --skip_log_headers If true, avoid headers when opening log files (no effect when -logtostderr=true) + --stderrthreshold severity logs at or above this threshold go to stderr when writing to files and stderr (no effect when -logtostderr=true or -alsologtostderr=false) (default 2) --user string Specifies the user executing the operation. Useful for auditing operations executed by 3rd party tools. Defaults to the operating system username. -v, --v Level number for the log level verbosity --vmodule moduleSpec comma-separated list of pattern=N settings for file-filtered logging @@ -305,20 +305,20 @@ minikube addons open ADDON_NAME [flags] ``` --add_dir_header If true, adds the file directory to the header of the log messages - --alsologtostderr log to standard error as well as files + --alsologtostderr log to standard error as well as files (no effect when -logtostderr=true) -b, --bootstrapper string The name of the cluster bootstrapper that will set up the Kubernetes cluster. (default "kubeadm") -h, --help --log_backtrace_at traceLocation when logging hits line file:N, emit a stack trace (default :0) - --log_dir string If non-empty, write log files in this directory - --log_file string If non-empty, use this log file - --log_file_max_size uint Defines the maximum size a log file can grow to. Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) + --log_dir string If non-empty, write log files in this directory (no effect when -logtostderr=true) + --log_file string If non-empty, use this log file (no effect when -logtostderr=true) + --log_file_max_size uint Defines the maximum size a log file can grow to (no effect when -logtostderr=true). Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) --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) + --one_output If true, only write logs to their native severity level (vs also writing to each lower severity level; no effect when -logtostderr=true) -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) + --skip_log_headers If true, avoid headers when opening log files (no effect when -logtostderr=true) + --stderrthreshold severity logs at or above this threshold go to stderr when writing to files and stderr (no effect when -logtostderr=true or -alsologtostderr=false) (default 2) --user string Specifies the user executing the operation. Useful for auditing operations executed by 3rd party tools. Defaults to the operating system username. -v, --v Level number for the log level verbosity --vmodule moduleSpec comma-separated list of pattern=N settings for file-filtered logging diff --git a/site/content/en/docs/commands/cache.md b/site/content/en/docs/commands/cache.md index 163210bcbf..f932cfe0aa 100644 --- a/site/content/en/docs/commands/cache.md +++ b/site/content/en/docs/commands/cache.md @@ -17,20 +17,20 @@ Add an image into minikube as a local cache, or delete, reload the cached images ``` --add_dir_header If true, adds the file directory to the header of the log messages - --alsologtostderr log to standard error as well as files + --alsologtostderr log to standard error as well as files (no effect when -logtostderr=true) -b, --bootstrapper string The name of the cluster bootstrapper that will set up the Kubernetes cluster. (default "kubeadm") -h, --help --log_backtrace_at traceLocation when logging hits line file:N, emit a stack trace (default :0) - --log_dir string If non-empty, write log files in this directory - --log_file string If non-empty, use this log file - --log_file_max_size uint Defines the maximum size a log file can grow to. Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) + --log_dir string If non-empty, write log files in this directory (no effect when -logtostderr=true) + --log_file string If non-empty, use this log file (no effect when -logtostderr=true) + --log_file_max_size uint Defines the maximum size a log file can grow to (no effect when -logtostderr=true). Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) --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) + --one_output If true, only write logs to their native severity level (vs also writing to each lower severity level; no effect when -logtostderr=true) -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) + --skip_log_headers If true, avoid headers when opening log files (no effect when -logtostderr=true) + --stderrthreshold severity logs at or above this threshold go to stderr when writing to files and stderr (no effect when -logtostderr=true or -alsologtostderr=false) (default 2) --user string Specifies the user executing the operation. Useful for auditing operations executed by 3rd party tools. Defaults to the operating system username. -v, --v Level number for the log level verbosity --vmodule moduleSpec comma-separated list of pattern=N settings for file-filtered logging @@ -58,20 +58,20 @@ minikube cache add [flags] ``` --add_dir_header If true, adds the file directory to the header of the log messages - --alsologtostderr log to standard error as well as files + --alsologtostderr log to standard error as well as files (no effect when -logtostderr=true) -b, --bootstrapper string The name of the cluster bootstrapper that will set up the Kubernetes cluster. (default "kubeadm") -h, --help --log_backtrace_at traceLocation when logging hits line file:N, emit a stack trace (default :0) - --log_dir string If non-empty, write log files in this directory - --log_file string If non-empty, use this log file - --log_file_max_size uint Defines the maximum size a log file can grow to. Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) + --log_dir string If non-empty, write log files in this directory (no effect when -logtostderr=true) + --log_file string If non-empty, use this log file (no effect when -logtostderr=true) + --log_file_max_size uint Defines the maximum size a log file can grow to (no effect when -logtostderr=true). Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) --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) + --one_output If true, only write logs to their native severity level (vs also writing to each lower severity level; no effect when -logtostderr=true) -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) + --skip_log_headers If true, avoid headers when opening log files (no effect when -logtostderr=true) + --stderrthreshold severity logs at or above this threshold go to stderr when writing to files and stderr (no effect when -logtostderr=true or -alsologtostderr=false) (default 2) --user string Specifies the user executing the operation. Useful for auditing operations executed by 3rd party tools. Defaults to the operating system username. -v, --v Level number for the log level verbosity --vmodule moduleSpec comma-separated list of pattern=N settings for file-filtered logging @@ -93,20 +93,20 @@ minikube cache delete [flags] ``` --add_dir_header If true, adds the file directory to the header of the log messages - --alsologtostderr log to standard error as well as files + --alsologtostderr log to standard error as well as files (no effect when -logtostderr=true) -b, --bootstrapper string The name of the cluster bootstrapper that will set up the Kubernetes cluster. (default "kubeadm") -h, --help --log_backtrace_at traceLocation when logging hits line file:N, emit a stack trace (default :0) - --log_dir string If non-empty, write log files in this directory - --log_file string If non-empty, use this log file - --log_file_max_size uint Defines the maximum size a log file can grow to. Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) + --log_dir string If non-empty, write log files in this directory (no effect when -logtostderr=true) + --log_file string If non-empty, use this log file (no effect when -logtostderr=true) + --log_file_max_size uint Defines the maximum size a log file can grow to (no effect when -logtostderr=true). Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) --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) + --one_output If true, only write logs to their native severity level (vs also writing to each lower severity level; no effect when -logtostderr=true) -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) + --skip_log_headers If true, avoid headers when opening log files (no effect when -logtostderr=true) + --stderrthreshold severity logs at or above this threshold go to stderr when writing to files and stderr (no effect when -logtostderr=true or -alsologtostderr=false) (default 2) --user string Specifies the user executing the operation. Useful for auditing operations executed by 3rd party tools. Defaults to the operating system username. -v, --v Level number for the log level verbosity --vmodule moduleSpec comma-separated list of pattern=N settings for file-filtered logging @@ -129,20 +129,20 @@ minikube cache help [command] [flags] ``` --add_dir_header If true, adds the file directory to the header of the log messages - --alsologtostderr log to standard error as well as files + --alsologtostderr log to standard error as well as files (no effect when -logtostderr=true) -b, --bootstrapper string The name of the cluster bootstrapper that will set up the Kubernetes cluster. (default "kubeadm") -h, --help --log_backtrace_at traceLocation when logging hits line file:N, emit a stack trace (default :0) - --log_dir string If non-empty, write log files in this directory - --log_file string If non-empty, use this log file - --log_file_max_size uint Defines the maximum size a log file can grow to. Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) + --log_dir string If non-empty, write log files in this directory (no effect when -logtostderr=true) + --log_file string If non-empty, use this log file (no effect when -logtostderr=true) + --log_file_max_size uint Defines the maximum size a log file can grow to (no effect when -logtostderr=true). Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) --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) + --one_output If true, only write logs to their native severity level (vs also writing to each lower severity level; no effect when -logtostderr=true) -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) + --skip_log_headers If true, avoid headers when opening log files (no effect when -logtostderr=true) + --stderrthreshold severity logs at or above this threshold go to stderr when writing to files and stderr (no effect when -logtostderr=true or -alsologtostderr=false) (default 2) --user string Specifies the user executing the operation. Useful for auditing operations executed by 3rd party tools. Defaults to the operating system username. -v, --v Level number for the log level verbosity --vmodule moduleSpec comma-separated list of pattern=N settings for file-filtered logging @@ -171,20 +171,20 @@ minikube cache list [flags] ``` --add_dir_header If true, adds the file directory to the header of the log messages - --alsologtostderr log to standard error as well as files + --alsologtostderr log to standard error as well as files (no effect when -logtostderr=true) -b, --bootstrapper string The name of the cluster bootstrapper that will set up the Kubernetes cluster. (default "kubeadm") -h, --help --log_backtrace_at traceLocation when logging hits line file:N, emit a stack trace (default :0) - --log_dir string If non-empty, write log files in this directory - --log_file string If non-empty, use this log file - --log_file_max_size uint Defines the maximum size a log file can grow to. Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) + --log_dir string If non-empty, write log files in this directory (no effect when -logtostderr=true) + --log_file string If non-empty, use this log file (no effect when -logtostderr=true) + --log_file_max_size uint Defines the maximum size a log file can grow to (no effect when -logtostderr=true). Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) --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) + --one_output If true, only write logs to their native severity level (vs also writing to each lower severity level; no effect when -logtostderr=true) -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) + --skip_log_headers If true, avoid headers when opening log files (no effect when -logtostderr=true) + --stderrthreshold severity logs at or above this threshold go to stderr when writing to files and stderr (no effect when -logtostderr=true or -alsologtostderr=false) (default 2) --user string Specifies the user executing the operation. Useful for auditing operations executed by 3rd party tools. Defaults to the operating system username. -v, --v Level number for the log level verbosity --vmodule moduleSpec comma-separated list of pattern=N settings for file-filtered logging @@ -206,20 +206,20 @@ minikube cache reload [flags] ``` --add_dir_header If true, adds the file directory to the header of the log messages - --alsologtostderr log to standard error as well as files + --alsologtostderr log to standard error as well as files (no effect when -logtostderr=true) -b, --bootstrapper string The name of the cluster bootstrapper that will set up the Kubernetes cluster. (default "kubeadm") -h, --help --log_backtrace_at traceLocation when logging hits line file:N, emit a stack trace (default :0) - --log_dir string If non-empty, write log files in this directory - --log_file string If non-empty, use this log file - --log_file_max_size uint Defines the maximum size a log file can grow to. Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) + --log_dir string If non-empty, write log files in this directory (no effect when -logtostderr=true) + --log_file string If non-empty, use this log file (no effect when -logtostderr=true) + --log_file_max_size uint Defines the maximum size a log file can grow to (no effect when -logtostderr=true). Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) --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) + --one_output If true, only write logs to their native severity level (vs also writing to each lower severity level; no effect when -logtostderr=true) -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) + --skip_log_headers If true, avoid headers when opening log files (no effect when -logtostderr=true) + --stderrthreshold severity logs at or above this threshold go to stderr when writing to files and stderr (no effect when -logtostderr=true or -alsologtostderr=false) (default 2) --user string Specifies the user executing the operation. Useful for auditing operations executed by 3rd party tools. Defaults to the operating system username. -v, --v Level number for the log level verbosity --vmodule moduleSpec comma-separated list of pattern=N settings for file-filtered logging diff --git a/site/content/en/docs/commands/completion.md b/site/content/en/docs/commands/completion.md index 9f8bfc557a..f4f2935ed7 100644 --- a/site/content/en/docs/commands/completion.md +++ b/site/content/en/docs/commands/completion.md @@ -42,20 +42,20 @@ minikube completion SHELL [flags] ``` --add_dir_header If true, adds the file directory to the header of the log messages - --alsologtostderr log to standard error as well as files + --alsologtostderr log to standard error as well as files (no effect when -logtostderr=true) -b, --bootstrapper string The name of the cluster bootstrapper that will set up the Kubernetes cluster. (default "kubeadm") -h, --help --log_backtrace_at traceLocation when logging hits line file:N, emit a stack trace (default :0) - --log_dir string If non-empty, write log files in this directory - --log_file string If non-empty, use this log file - --log_file_max_size uint Defines the maximum size a log file can grow to. Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) + --log_dir string If non-empty, write log files in this directory (no effect when -logtostderr=true) + --log_file string If non-empty, use this log file (no effect when -logtostderr=true) + --log_file_max_size uint Defines the maximum size a log file can grow to (no effect when -logtostderr=true). Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) --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) + --one_output If true, only write logs to their native severity level (vs also writing to each lower severity level; no effect when -logtostderr=true) -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) + --skip_log_headers If true, avoid headers when opening log files (no effect when -logtostderr=true) + --stderrthreshold severity logs at or above this threshold go to stderr when writing to files and stderr (no effect when -logtostderr=true or -alsologtostderr=false) (default 2) --user string Specifies the user executing the operation. Useful for auditing operations executed by 3rd party tools. Defaults to the operating system username. -v, --v Level number for the log level verbosity --vmodule moduleSpec comma-separated list of pattern=N settings for file-filtered logging @@ -77,20 +77,20 @@ minikube completion bash [flags] ``` --add_dir_header If true, adds the file directory to the header of the log messages - --alsologtostderr log to standard error as well as files + --alsologtostderr log to standard error as well as files (no effect when -logtostderr=true) -b, --bootstrapper string The name of the cluster bootstrapper that will set up the Kubernetes cluster. (default "kubeadm") -h, --help --log_backtrace_at traceLocation when logging hits line file:N, emit a stack trace (default :0) - --log_dir string If non-empty, write log files in this directory - --log_file string If non-empty, use this log file - --log_file_max_size uint Defines the maximum size a log file can grow to. Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) + --log_dir string If non-empty, write log files in this directory (no effect when -logtostderr=true) + --log_file string If non-empty, use this log file (no effect when -logtostderr=true) + --log_file_max_size uint Defines the maximum size a log file can grow to (no effect when -logtostderr=true). Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) --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) + --one_output If true, only write logs to their native severity level (vs also writing to each lower severity level; no effect when -logtostderr=true) -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) + --skip_log_headers If true, avoid headers when opening log files (no effect when -logtostderr=true) + --stderrthreshold severity logs at or above this threshold go to stderr when writing to files and stderr (no effect when -logtostderr=true or -alsologtostderr=false) (default 2) --user string Specifies the user executing the operation. Useful for auditing operations executed by 3rd party tools. Defaults to the operating system username. -v, --v Level number for the log level verbosity --vmodule moduleSpec comma-separated list of pattern=N settings for file-filtered logging @@ -112,20 +112,20 @@ minikube completion fish [flags] ``` --add_dir_header If true, adds the file directory to the header of the log messages - --alsologtostderr log to standard error as well as files + --alsologtostderr log to standard error as well as files (no effect when -logtostderr=true) -b, --bootstrapper string The name of the cluster bootstrapper that will set up the Kubernetes cluster. (default "kubeadm") -h, --help --log_backtrace_at traceLocation when logging hits line file:N, emit a stack trace (default :0) - --log_dir string If non-empty, write log files in this directory - --log_file string If non-empty, use this log file - --log_file_max_size uint Defines the maximum size a log file can grow to. Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) + --log_dir string If non-empty, write log files in this directory (no effect when -logtostderr=true) + --log_file string If non-empty, use this log file (no effect when -logtostderr=true) + --log_file_max_size uint Defines the maximum size a log file can grow to (no effect when -logtostderr=true). Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) --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) + --one_output If true, only write logs to their native severity level (vs also writing to each lower severity level; no effect when -logtostderr=true) -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) + --skip_log_headers If true, avoid headers when opening log files (no effect when -logtostderr=true) + --stderrthreshold severity logs at or above this threshold go to stderr when writing to files and stderr (no effect when -logtostderr=true or -alsologtostderr=false) (default 2) --user string Specifies the user executing the operation. Useful for auditing operations executed by 3rd party tools. Defaults to the operating system username. -v, --v Level number for the log level verbosity --vmodule moduleSpec comma-separated list of pattern=N settings for file-filtered logging @@ -148,20 +148,20 @@ minikube completion help [command] [flags] ``` --add_dir_header If true, adds the file directory to the header of the log messages - --alsologtostderr log to standard error as well as files + --alsologtostderr log to standard error as well as files (no effect when -logtostderr=true) -b, --bootstrapper string The name of the cluster bootstrapper that will set up the Kubernetes cluster. (default "kubeadm") -h, --help --log_backtrace_at traceLocation when logging hits line file:N, emit a stack trace (default :0) - --log_dir string If non-empty, write log files in this directory - --log_file string If non-empty, use this log file - --log_file_max_size uint Defines the maximum size a log file can grow to. Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) + --log_dir string If non-empty, write log files in this directory (no effect when -logtostderr=true) + --log_file string If non-empty, use this log file (no effect when -logtostderr=true) + --log_file_max_size uint Defines the maximum size a log file can grow to (no effect when -logtostderr=true). Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) --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) + --one_output If true, only write logs to their native severity level (vs also writing to each lower severity level; no effect when -logtostderr=true) -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) + --skip_log_headers If true, avoid headers when opening log files (no effect when -logtostderr=true) + --stderrthreshold severity logs at or above this threshold go to stderr when writing to files and stderr (no effect when -logtostderr=true or -alsologtostderr=false) (default 2) --user string Specifies the user executing the operation. Useful for auditing operations executed by 3rd party tools. Defaults to the operating system username. -v, --v Level number for the log level verbosity --vmodule moduleSpec comma-separated list of pattern=N settings for file-filtered logging @@ -183,20 +183,20 @@ minikube completion zsh [flags] ``` --add_dir_header If true, adds the file directory to the header of the log messages - --alsologtostderr log to standard error as well as files + --alsologtostderr log to standard error as well as files (no effect when -logtostderr=true) -b, --bootstrapper string The name of the cluster bootstrapper that will set up the Kubernetes cluster. (default "kubeadm") -h, --help --log_backtrace_at traceLocation when logging hits line file:N, emit a stack trace (default :0) - --log_dir string If non-empty, write log files in this directory - --log_file string If non-empty, use this log file - --log_file_max_size uint Defines the maximum size a log file can grow to. Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) + --log_dir string If non-empty, write log files in this directory (no effect when -logtostderr=true) + --log_file string If non-empty, use this log file (no effect when -logtostderr=true) + --log_file_max_size uint Defines the maximum size a log file can grow to (no effect when -logtostderr=true). Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) --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) + --one_output If true, only write logs to their native severity level (vs also writing to each lower severity level; no effect when -logtostderr=true) -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) + --skip_log_headers If true, avoid headers when opening log files (no effect when -logtostderr=true) + --stderrthreshold severity logs at or above this threshold go to stderr when writing to files and stderr (no effect when -logtostderr=true or -alsologtostderr=false) (default 2) --user string Specifies the user executing the operation. Useful for auditing operations executed by 3rd party tools. Defaults to the operating system username. -v, --v Level number for the log level verbosity --vmodule moduleSpec comma-separated list of pattern=N settings for file-filtered logging diff --git a/site/content/en/docs/commands/config.md b/site/content/en/docs/commands/config.md index 093722474f..91dc6e8ea3 100644 --- a/site/content/en/docs/commands/config.md +++ b/site/content/en/docs/commands/config.md @@ -49,20 +49,20 @@ minikube config SUBCOMMAND [flags] ``` --add_dir_header If true, adds the file directory to the header of the log messages - --alsologtostderr log to standard error as well as files + --alsologtostderr log to standard error as well as files (no effect when -logtostderr=true) -b, --bootstrapper string The name of the cluster bootstrapper that will set up the Kubernetes cluster. (default "kubeadm") -h, --help --log_backtrace_at traceLocation when logging hits line file:N, emit a stack trace (default :0) - --log_dir string If non-empty, write log files in this directory - --log_file string If non-empty, use this log file - --log_file_max_size uint Defines the maximum size a log file can grow to. Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) + --log_dir string If non-empty, write log files in this directory (no effect when -logtostderr=true) + --log_file string If non-empty, use this log file (no effect when -logtostderr=true) + --log_file_max_size uint Defines the maximum size a log file can grow to (no effect when -logtostderr=true). Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) --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) + --one_output If true, only write logs to their native severity level (vs also writing to each lower severity level; no effect when -logtostderr=true) -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) + --skip_log_headers If true, avoid headers when opening log files (no effect when -logtostderr=true) + --stderrthreshold severity logs at or above this threshold go to stderr when writing to files and stderr (no effect when -logtostderr=true or -alsologtostderr=false) (default 2) --user string Specifies the user executing the operation. Useful for auditing operations executed by 3rd party tools. Defaults to the operating system username. -v, --v Level number for the log level verbosity --vmodule moduleSpec comma-separated list of pattern=N settings for file-filtered logging @@ -94,20 +94,20 @@ minikube config defaults PROPERTY_NAME [flags] ``` --add_dir_header If true, adds the file directory to the header of the log messages - --alsologtostderr log to standard error as well as files + --alsologtostderr log to standard error as well as files (no effect when -logtostderr=true) -b, --bootstrapper string The name of the cluster bootstrapper that will set up the Kubernetes cluster. (default "kubeadm") -h, --help --log_backtrace_at traceLocation when logging hits line file:N, emit a stack trace (default :0) - --log_dir string If non-empty, write log files in this directory - --log_file string If non-empty, use this log file - --log_file_max_size uint Defines the maximum size a log file can grow to. Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) + --log_dir string If non-empty, write log files in this directory (no effect when -logtostderr=true) + --log_file string If non-empty, use this log file (no effect when -logtostderr=true) + --log_file_max_size uint Defines the maximum size a log file can grow to (no effect when -logtostderr=true). Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) --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) + --one_output If true, only write logs to their native severity level (vs also writing to each lower severity level; no effect when -logtostderr=true) -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) + --skip_log_headers If true, avoid headers when opening log files (no effect when -logtostderr=true) + --stderrthreshold severity logs at or above this threshold go to stderr when writing to files and stderr (no effect when -logtostderr=true or -alsologtostderr=false) (default 2) --user string Specifies the user executing the operation. Useful for auditing operations executed by 3rd party tools. Defaults to the operating system username. -v, --v Level number for the log level verbosity --vmodule moduleSpec comma-separated list of pattern=N settings for file-filtered logging @@ -129,20 +129,20 @@ minikube config get PROPERTY_NAME [flags] ``` --add_dir_header If true, adds the file directory to the header of the log messages - --alsologtostderr log to standard error as well as files + --alsologtostderr log to standard error as well as files (no effect when -logtostderr=true) -b, --bootstrapper string The name of the cluster bootstrapper that will set up the Kubernetes cluster. (default "kubeadm") -h, --help --log_backtrace_at traceLocation when logging hits line file:N, emit a stack trace (default :0) - --log_dir string If non-empty, write log files in this directory - --log_file string If non-empty, use this log file - --log_file_max_size uint Defines the maximum size a log file can grow to. Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) + --log_dir string If non-empty, write log files in this directory (no effect when -logtostderr=true) + --log_file string If non-empty, use this log file (no effect when -logtostderr=true) + --log_file_max_size uint Defines the maximum size a log file can grow to (no effect when -logtostderr=true). Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) --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) + --one_output If true, only write logs to their native severity level (vs also writing to each lower severity level; no effect when -logtostderr=true) -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) + --skip_log_headers If true, avoid headers when opening log files (no effect when -logtostderr=true) + --stderrthreshold severity logs at or above this threshold go to stderr when writing to files and stderr (no effect when -logtostderr=true or -alsologtostderr=false) (default 2) --user string Specifies the user executing the operation. Useful for auditing operations executed by 3rd party tools. Defaults to the operating system username. -v, --v Level number for the log level verbosity --vmodule moduleSpec comma-separated list of pattern=N settings for file-filtered logging @@ -165,20 +165,20 @@ minikube config help [command] [flags] ``` --add_dir_header If true, adds the file directory to the header of the log messages - --alsologtostderr log to standard error as well as files + --alsologtostderr log to standard error as well as files (no effect when -logtostderr=true) -b, --bootstrapper string The name of the cluster bootstrapper that will set up the Kubernetes cluster. (default "kubeadm") -h, --help --log_backtrace_at traceLocation when logging hits line file:N, emit a stack trace (default :0) - --log_dir string If non-empty, write log files in this directory - --log_file string If non-empty, use this log file - --log_file_max_size uint Defines the maximum size a log file can grow to. Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) + --log_dir string If non-empty, write log files in this directory (no effect when -logtostderr=true) + --log_file string If non-empty, use this log file (no effect when -logtostderr=true) + --log_file_max_size uint Defines the maximum size a log file can grow to (no effect when -logtostderr=true). Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) --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) + --one_output If true, only write logs to their native severity level (vs also writing to each lower severity level; no effect when -logtostderr=true) -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) + --skip_log_headers If true, avoid headers when opening log files (no effect when -logtostderr=true) + --stderrthreshold severity logs at or above this threshold go to stderr when writing to files and stderr (no effect when -logtostderr=true or -alsologtostderr=false) (default 2) --user string Specifies the user executing the operation. Useful for auditing operations executed by 3rd party tools. Defaults to the operating system username. -v, --v Level number for the log level verbosity --vmodule moduleSpec comma-separated list of pattern=N settings for file-filtered logging @@ -201,20 +201,20 @@ minikube config set PROPERTY_NAME PROPERTY_VALUE [flags] ``` --add_dir_header If true, adds the file directory to the header of the log messages - --alsologtostderr log to standard error as well as files + --alsologtostderr log to standard error as well as files (no effect when -logtostderr=true) -b, --bootstrapper string The name of the cluster bootstrapper that will set up the Kubernetes cluster. (default "kubeadm") -h, --help --log_backtrace_at traceLocation when logging hits line file:N, emit a stack trace (default :0) - --log_dir string If non-empty, write log files in this directory - --log_file string If non-empty, use this log file - --log_file_max_size uint Defines the maximum size a log file can grow to. Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) + --log_dir string If non-empty, write log files in this directory (no effect when -logtostderr=true) + --log_file string If non-empty, use this log file (no effect when -logtostderr=true) + --log_file_max_size uint Defines the maximum size a log file can grow to (no effect when -logtostderr=true). Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) --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) + --one_output If true, only write logs to their native severity level (vs also writing to each lower severity level; no effect when -logtostderr=true) -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) + --skip_log_headers If true, avoid headers when opening log files (no effect when -logtostderr=true) + --stderrthreshold severity logs at or above this threshold go to stderr when writing to files and stderr (no effect when -logtostderr=true or -alsologtostderr=false) (default 2) --user string Specifies the user executing the operation. Useful for auditing operations executed by 3rd party tools. Defaults to the operating system username. -v, --v Level number for the log level verbosity --vmodule moduleSpec comma-separated list of pattern=N settings for file-filtered logging @@ -236,20 +236,20 @@ minikube config unset PROPERTY_NAME [flags] ``` --add_dir_header If true, adds the file directory to the header of the log messages - --alsologtostderr log to standard error as well as files + --alsologtostderr log to standard error as well as files (no effect when -logtostderr=true) -b, --bootstrapper string The name of the cluster bootstrapper that will set up the Kubernetes cluster. (default "kubeadm") -h, --help --log_backtrace_at traceLocation when logging hits line file:N, emit a stack trace (default :0) - --log_dir string If non-empty, write log files in this directory - --log_file string If non-empty, use this log file - --log_file_max_size uint Defines the maximum size a log file can grow to. Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) + --log_dir string If non-empty, write log files in this directory (no effect when -logtostderr=true) + --log_file string If non-empty, use this log file (no effect when -logtostderr=true) + --log_file_max_size uint Defines the maximum size a log file can grow to (no effect when -logtostderr=true). Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) --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) + --one_output If true, only write logs to their native severity level (vs also writing to each lower severity level; no effect when -logtostderr=true) -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) + --skip_log_headers If true, avoid headers when opening log files (no effect when -logtostderr=true) + --stderrthreshold severity logs at or above this threshold go to stderr when writing to files and stderr (no effect when -logtostderr=true or -alsologtostderr=false) (default 2) --user string Specifies the user executing the operation. Useful for auditing operations executed by 3rd party tools. Defaults to the operating system username. -v, --v Level number for the log level verbosity --vmodule moduleSpec comma-separated list of pattern=N settings for file-filtered logging @@ -278,20 +278,20 @@ minikube config view [flags] ``` --add_dir_header If true, adds the file directory to the header of the log messages - --alsologtostderr log to standard error as well as files + --alsologtostderr log to standard error as well as files (no effect when -logtostderr=true) -b, --bootstrapper string The name of the cluster bootstrapper that will set up the Kubernetes cluster. (default "kubeadm") -h, --help --log_backtrace_at traceLocation when logging hits line file:N, emit a stack trace (default :0) - --log_dir string If non-empty, write log files in this directory - --log_file string If non-empty, use this log file - --log_file_max_size uint Defines the maximum size a log file can grow to. Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) + --log_dir string If non-empty, write log files in this directory (no effect when -logtostderr=true) + --log_file string If non-empty, use this log file (no effect when -logtostderr=true) + --log_file_max_size uint Defines the maximum size a log file can grow to (no effect when -logtostderr=true). Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) --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) + --one_output If true, only write logs to their native severity level (vs also writing to each lower severity level; no effect when -logtostderr=true) -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) + --skip_log_headers If true, avoid headers when opening log files (no effect when -logtostderr=true) + --stderrthreshold severity logs at or above this threshold go to stderr when writing to files and stderr (no effect when -logtostderr=true or -alsologtostderr=false) (default 2) --user string Specifies the user executing the operation. Useful for auditing operations executed by 3rd party tools. Defaults to the operating system username. -v, --v Level number for the log level verbosity --vmodule moduleSpec comma-separated list of pattern=N settings for file-filtered logging diff --git a/site/content/en/docs/commands/cp.md b/site/content/en/docs/commands/cp.md index 959f5cb13d..7b056c3733 100644 --- a/site/content/en/docs/commands/cp.md +++ b/site/content/en/docs/commands/cp.md @@ -26,20 +26,20 @@ minikube cp : :: ``` --add_dir_header If true, adds the file directory to the header of the log messages - --alsologtostderr log to standard error as well as files + --alsologtostderr log to standard error as well as files (no effect when -logtostderr=true) -b, --bootstrapper string The name of the cluster bootstrapper that will set up the Kubernetes cluster. (default "kubeadm") -h, --help --log_backtrace_at traceLocation when logging hits line file:N, emit a stack trace (default :0) - --log_dir string If non-empty, write log files in this directory - --log_file string If non-empty, use this log file - --log_file_max_size uint Defines the maximum size a log file can grow to. Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) + --log_dir string If non-empty, write log files in this directory (no effect when -logtostderr=true) + --log_file string If non-empty, use this log file (no effect when -logtostderr=true) + --log_file_max_size uint Defines the maximum size a log file can grow to (no effect when -logtostderr=true). Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) --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) + --one_output If true, only write logs to their native severity level (vs also writing to each lower severity level; no effect when -logtostderr=true) -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) + --skip_log_headers If true, avoid headers when opening log files (no effect when -logtostderr=true) + --stderrthreshold severity logs at or above this threshold go to stderr when writing to files and stderr (no effect when -logtostderr=true or -alsologtostderr=false) (default 2) --user string Specifies the user executing the operation. Useful for auditing operations executed by 3rd party tools. Defaults to the operating system username. -v, --v Level number for the log level verbosity --vmodule moduleSpec comma-separated list of pattern=N settings for file-filtered logging diff --git a/site/content/en/docs/commands/node.md b/site/content/en/docs/commands/node.md index 3268727416..31f0d5b4a4 100644 --- a/site/content/en/docs/commands/node.md +++ b/site/content/en/docs/commands/node.md @@ -21,20 +21,20 @@ minikube node [flags] ``` --add_dir_header If true, adds the file directory to the header of the log messages - --alsologtostderr log to standard error as well as files + --alsologtostderr log to standard error as well as files (no effect when -logtostderr=true) -b, --bootstrapper string The name of the cluster bootstrapper that will set up the Kubernetes cluster. (default "kubeadm") -h, --help --log_backtrace_at traceLocation when logging hits line file:N, emit a stack trace (default :0) - --log_dir string If non-empty, write log files in this directory - --log_file string If non-empty, use this log file - --log_file_max_size uint Defines the maximum size a log file can grow to. Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) + --log_dir string If non-empty, write log files in this directory (no effect when -logtostderr=true) + --log_file string If non-empty, use this log file (no effect when -logtostderr=true) + --log_file_max_size uint Defines the maximum size a log file can grow to (no effect when -logtostderr=true). Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) --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) + --one_output If true, only write logs to their native severity level (vs also writing to each lower severity level; no effect when -logtostderr=true) -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) + --skip_log_headers If true, avoid headers when opening log files (no effect when -logtostderr=true) + --stderrthreshold severity logs at or above this threshold go to stderr when writing to files and stderr (no effect when -logtostderr=true or -alsologtostderr=false) (default 2) --user string Specifies the user executing the operation. Useful for auditing operations executed by 3rd party tools. Defaults to the operating system username. -v, --v Level number for the log level verbosity --vmodule moduleSpec comma-separated list of pattern=N settings for file-filtered logging @@ -64,20 +64,20 @@ minikube node add [flags] ``` --add_dir_header If true, adds the file directory to the header of the log messages - --alsologtostderr log to standard error as well as files + --alsologtostderr log to standard error as well as files (no effect when -logtostderr=true) -b, --bootstrapper string The name of the cluster bootstrapper that will set up the Kubernetes cluster. (default "kubeadm") -h, --help --log_backtrace_at traceLocation when logging hits line file:N, emit a stack trace (default :0) - --log_dir string If non-empty, write log files in this directory - --log_file string If non-empty, use this log file - --log_file_max_size uint Defines the maximum size a log file can grow to. Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) + --log_dir string If non-empty, write log files in this directory (no effect when -logtostderr=true) + --log_file string If non-empty, use this log file (no effect when -logtostderr=true) + --log_file_max_size uint Defines the maximum size a log file can grow to (no effect when -logtostderr=true). Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) --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) + --one_output If true, only write logs to their native severity level (vs also writing to each lower severity level; no effect when -logtostderr=true) -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) + --skip_log_headers If true, avoid headers when opening log files (no effect when -logtostderr=true) + --stderrthreshold severity logs at or above this threshold go to stderr when writing to files and stderr (no effect when -logtostderr=true or -alsologtostderr=false) (default 2) --user string Specifies the user executing the operation. Useful for auditing operations executed by 3rd party tools. Defaults to the operating system username. -v, --v Level number for the log level verbosity --vmodule moduleSpec comma-separated list of pattern=N settings for file-filtered logging @@ -99,20 +99,20 @@ minikube node delete [flags] ``` --add_dir_header If true, adds the file directory to the header of the log messages - --alsologtostderr log to standard error as well as files + --alsologtostderr log to standard error as well as files (no effect when -logtostderr=true) -b, --bootstrapper string The name of the cluster bootstrapper that will set up the Kubernetes cluster. (default "kubeadm") -h, --help --log_backtrace_at traceLocation when logging hits line file:N, emit a stack trace (default :0) - --log_dir string If non-empty, write log files in this directory - --log_file string If non-empty, use this log file - --log_file_max_size uint Defines the maximum size a log file can grow to. Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) + --log_dir string If non-empty, write log files in this directory (no effect when -logtostderr=true) + --log_file string If non-empty, use this log file (no effect when -logtostderr=true) + --log_file_max_size uint Defines the maximum size a log file can grow to (no effect when -logtostderr=true). Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) --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) + --one_output If true, only write logs to their native severity level (vs also writing to each lower severity level; no effect when -logtostderr=true) -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) + --skip_log_headers If true, avoid headers when opening log files (no effect when -logtostderr=true) + --stderrthreshold severity logs at or above this threshold go to stderr when writing to files and stderr (no effect when -logtostderr=true or -alsologtostderr=false) (default 2) --user string Specifies the user executing the operation. Useful for auditing operations executed by 3rd party tools. Defaults to the operating system username. -v, --v Level number for the log level verbosity --vmodule moduleSpec comma-separated list of pattern=N settings for file-filtered logging @@ -135,20 +135,20 @@ minikube node help [command] [flags] ``` --add_dir_header If true, adds the file directory to the header of the log messages - --alsologtostderr log to standard error as well as files + --alsologtostderr log to standard error as well as files (no effect when -logtostderr=true) -b, --bootstrapper string The name of the cluster bootstrapper that will set up the Kubernetes cluster. (default "kubeadm") -h, --help --log_backtrace_at traceLocation when logging hits line file:N, emit a stack trace (default :0) - --log_dir string If non-empty, write log files in this directory - --log_file string If non-empty, use this log file - --log_file_max_size uint Defines the maximum size a log file can grow to. Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) + --log_dir string If non-empty, write log files in this directory (no effect when -logtostderr=true) + --log_file string If non-empty, use this log file (no effect when -logtostderr=true) + --log_file_max_size uint Defines the maximum size a log file can grow to (no effect when -logtostderr=true). Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) --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) + --one_output If true, only write logs to their native severity level (vs also writing to each lower severity level; no effect when -logtostderr=true) -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) + --skip_log_headers If true, avoid headers when opening log files (no effect when -logtostderr=true) + --stderrthreshold severity logs at or above this threshold go to stderr when writing to files and stderr (no effect when -logtostderr=true or -alsologtostderr=false) (default 2) --user string Specifies the user executing the operation. Useful for auditing operations executed by 3rd party tools. Defaults to the operating system username. -v, --v Level number for the log level verbosity --vmodule moduleSpec comma-separated list of pattern=N settings for file-filtered logging @@ -170,20 +170,20 @@ minikube node list [flags] ``` --add_dir_header If true, adds the file directory to the header of the log messages - --alsologtostderr log to standard error as well as files + --alsologtostderr log to standard error as well as files (no effect when -logtostderr=true) -b, --bootstrapper string The name of the cluster bootstrapper that will set up the Kubernetes cluster. (default "kubeadm") -h, --help --log_backtrace_at traceLocation when logging hits line file:N, emit a stack trace (default :0) - --log_dir string If non-empty, write log files in this directory - --log_file string If non-empty, use this log file - --log_file_max_size uint Defines the maximum size a log file can grow to. Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) + --log_dir string If non-empty, write log files in this directory (no effect when -logtostderr=true) + --log_file string If non-empty, use this log file (no effect when -logtostderr=true) + --log_file_max_size uint Defines the maximum size a log file can grow to (no effect when -logtostderr=true). Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) --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) + --one_output If true, only write logs to their native severity level (vs also writing to each lower severity level; no effect when -logtostderr=true) -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) + --skip_log_headers If true, avoid headers when opening log files (no effect when -logtostderr=true) + --stderrthreshold severity logs at or above this threshold go to stderr when writing to files and stderr (no effect when -logtostderr=true or -alsologtostderr=false) (default 2) --user string Specifies the user executing the operation. Useful for auditing operations executed by 3rd party tools. Defaults to the operating system username. -v, --v Level number for the log level verbosity --vmodule moduleSpec comma-separated list of pattern=N settings for file-filtered logging @@ -211,20 +211,20 @@ minikube node start [flags] ``` --add_dir_header If true, adds the file directory to the header of the log messages - --alsologtostderr log to standard error as well as files + --alsologtostderr log to standard error as well as files (no effect when -logtostderr=true) -b, --bootstrapper string The name of the cluster bootstrapper that will set up the Kubernetes cluster. (default "kubeadm") -h, --help --log_backtrace_at traceLocation when logging hits line file:N, emit a stack trace (default :0) - --log_dir string If non-empty, write log files in this directory - --log_file string If non-empty, use this log file - --log_file_max_size uint Defines the maximum size a log file can grow to. Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) + --log_dir string If non-empty, write log files in this directory (no effect when -logtostderr=true) + --log_file string If non-empty, use this log file (no effect when -logtostderr=true) + --log_file_max_size uint Defines the maximum size a log file can grow to (no effect when -logtostderr=true). Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) --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) + --one_output If true, only write logs to their native severity level (vs also writing to each lower severity level; no effect when -logtostderr=true) -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) + --skip_log_headers If true, avoid headers when opening log files (no effect when -logtostderr=true) + --stderrthreshold severity logs at or above this threshold go to stderr when writing to files and stderr (no effect when -logtostderr=true or -alsologtostderr=false) (default 2) --user string Specifies the user executing the operation. Useful for auditing operations executed by 3rd party tools. Defaults to the operating system username. -v, --v Level number for the log level verbosity --vmodule moduleSpec comma-separated list of pattern=N settings for file-filtered logging @@ -246,20 +246,20 @@ minikube node stop [flags] ``` --add_dir_header If true, adds the file directory to the header of the log messages - --alsologtostderr log to standard error as well as files + --alsologtostderr log to standard error as well as files (no effect when -logtostderr=true) -b, --bootstrapper string The name of the cluster bootstrapper that will set up the Kubernetes cluster. (default "kubeadm") -h, --help --log_backtrace_at traceLocation when logging hits line file:N, emit a stack trace (default :0) - --log_dir string If non-empty, write log files in this directory - --log_file string If non-empty, use this log file - --log_file_max_size uint Defines the maximum size a log file can grow to. Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) + --log_dir string If non-empty, write log files in this directory (no effect when -logtostderr=true) + --log_file string If non-empty, use this log file (no effect when -logtostderr=true) + --log_file_max_size uint Defines the maximum size a log file can grow to (no effect when -logtostderr=true). Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) --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) + --one_output If true, only write logs to their native severity level (vs also writing to each lower severity level; no effect when -logtostderr=true) -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) + --skip_log_headers If true, avoid headers when opening log files (no effect when -logtostderr=true) + --stderrthreshold severity logs at or above this threshold go to stderr when writing to files and stderr (no effect when -logtostderr=true or -alsologtostderr=false) (default 2) --user string Specifies the user executing the operation. Useful for auditing operations executed by 3rd party tools. Defaults to the operating system username. -v, --v Level number for the log level verbosity --vmodule moduleSpec comma-separated list of pattern=N settings for file-filtered logging diff --git a/site/content/en/docs/commands/options.md b/site/content/en/docs/commands/options.md index a640558c9a..399d16e5c6 100644 --- a/site/content/en/docs/commands/options.md +++ b/site/content/en/docs/commands/options.md @@ -21,20 +21,20 @@ minikube options [flags] ``` --add_dir_header If true, adds the file directory to the header of the log messages - --alsologtostderr log to standard error as well as files + --alsologtostderr log to standard error as well as files (no effect when -logtostderr=true) -b, --bootstrapper string The name of the cluster bootstrapper that will set up the Kubernetes cluster. (default "kubeadm") -h, --help --log_backtrace_at traceLocation when logging hits line file:N, emit a stack trace (default :0) - --log_dir string If non-empty, write log files in this directory - --log_file string If non-empty, use this log file - --log_file_max_size uint Defines the maximum size a log file can grow to. Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) + --log_dir string If non-empty, write log files in this directory (no effect when -logtostderr=true) + --log_file string If non-empty, use this log file (no effect when -logtostderr=true) + --log_file_max_size uint Defines the maximum size a log file can grow to (no effect when -logtostderr=true). Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) --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) + --one_output If true, only write logs to their native severity level (vs also writing to each lower severity level; no effect when -logtostderr=true) -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) + --skip_log_headers If true, avoid headers when opening log files (no effect when -logtostderr=true) + --stderrthreshold severity logs at or above this threshold go to stderr when writing to files and stderr (no effect when -logtostderr=true or -alsologtostderr=false) (default 2) --user string Specifies the user executing the operation. Useful for auditing operations executed by 3rd party tools. Defaults to the operating system username. -v, --v Level number for the log level verbosity --vmodule moduleSpec comma-separated list of pattern=N settings for file-filtered logging diff --git a/site/content/en/docs/commands/pause.md b/site/content/en/docs/commands/pause.md index 5c444c4548..e4a586f504 100644 --- a/site/content/en/docs/commands/pause.md +++ b/site/content/en/docs/commands/pause.md @@ -29,20 +29,20 @@ minikube pause [flags] ``` --add_dir_header If true, adds the file directory to the header of the log messages - --alsologtostderr log to standard error as well as files + --alsologtostderr log to standard error as well as files (no effect when -logtostderr=true) -b, --bootstrapper string The name of the cluster bootstrapper that will set up the Kubernetes cluster. (default "kubeadm") -h, --help --log_backtrace_at traceLocation when logging hits line file:N, emit a stack trace (default :0) - --log_dir string If non-empty, write log files in this directory - --log_file string If non-empty, use this log file - --log_file_max_size uint Defines the maximum size a log file can grow to. Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) + --log_dir string If non-empty, write log files in this directory (no effect when -logtostderr=true) + --log_file string If non-empty, use this log file (no effect when -logtostderr=true) + --log_file_max_size uint Defines the maximum size a log file can grow to (no effect when -logtostderr=true). Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) --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) + --one_output If true, only write logs to their native severity level (vs also writing to each lower severity level; no effect when -logtostderr=true) -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) + --skip_log_headers If true, avoid headers when opening log files (no effect when -logtostderr=true) + --stderrthreshold severity logs at or above this threshold go to stderr when writing to files and stderr (no effect when -logtostderr=true or -alsologtostderr=false) (default 2) --user string Specifies the user executing the operation. Useful for auditing operations executed by 3rd party tools. Defaults to the operating system username. -v, --v Level number for the log level verbosity --vmodule moduleSpec comma-separated list of pattern=N settings for file-filtered logging diff --git a/site/content/en/docs/commands/podman-env.md b/site/content/en/docs/commands/podman-env.md index e09a7cbf37..7160f6f952 100644 --- a/site/content/en/docs/commands/podman-env.md +++ b/site/content/en/docs/commands/podman-env.md @@ -28,20 +28,20 @@ minikube podman-env [flags] ``` --add_dir_header If true, adds the file directory to the header of the log messages - --alsologtostderr log to standard error as well as files + --alsologtostderr log to standard error as well as files (no effect when -logtostderr=true) -b, --bootstrapper string The name of the cluster bootstrapper that will set up the Kubernetes cluster. (default "kubeadm") -h, --help --log_backtrace_at traceLocation when logging hits line file:N, emit a stack trace (default :0) - --log_dir string If non-empty, write log files in this directory - --log_file string If non-empty, use this log file - --log_file_max_size uint Defines the maximum size a log file can grow to. Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) + --log_dir string If non-empty, write log files in this directory (no effect when -logtostderr=true) + --log_file string If non-empty, use this log file (no effect when -logtostderr=true) + --log_file_max_size uint Defines the maximum size a log file can grow to (no effect when -logtostderr=true). Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) --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) + --one_output If true, only write logs to their native severity level (vs also writing to each lower severity level; no effect when -logtostderr=true) -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) + --skip_log_headers If true, avoid headers when opening log files (no effect when -logtostderr=true) + --stderrthreshold severity logs at or above this threshold go to stderr when writing to files and stderr (no effect when -logtostderr=true or -alsologtostderr=false) (default 2) --user string Specifies the user executing the operation. Useful for auditing operations executed by 3rd party tools. Defaults to the operating system username. -v, --v Level number for the log level verbosity --vmodule moduleSpec comma-separated list of pattern=N settings for file-filtered logging diff --git a/site/content/en/docs/commands/profile.md b/site/content/en/docs/commands/profile.md index 5f222678e6..48886df5e0 100644 --- a/site/content/en/docs/commands/profile.md +++ b/site/content/en/docs/commands/profile.md @@ -21,20 +21,20 @@ minikube profile [MINIKUBE_PROFILE_NAME]. You can return to the default minikub ``` --add_dir_header If true, adds the file directory to the header of the log messages - --alsologtostderr log to standard error as well as files + --alsologtostderr log to standard error as well as files (no effect when -logtostderr=true) -b, --bootstrapper string The name of the cluster bootstrapper that will set up the Kubernetes cluster. (default "kubeadm") -h, --help --log_backtrace_at traceLocation when logging hits line file:N, emit a stack trace (default :0) - --log_dir string If non-empty, write log files in this directory - --log_file string If non-empty, use this log file - --log_file_max_size uint Defines the maximum size a log file can grow to. Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) + --log_dir string If non-empty, write log files in this directory (no effect when -logtostderr=true) + --log_file string If non-empty, use this log file (no effect when -logtostderr=true) + --log_file_max_size uint Defines the maximum size a log file can grow to (no effect when -logtostderr=true). Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) --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) + --one_output If true, only write logs to their native severity level (vs also writing to each lower severity level; no effect when -logtostderr=true) -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) + --skip_log_headers If true, avoid headers when opening log files (no effect when -logtostderr=true) + --stderrthreshold severity logs at or above this threshold go to stderr when writing to files and stderr (no effect when -logtostderr=true or -alsologtostderr=false) (default 2) --user string Specifies the user executing the operation. Useful for auditing operations executed by 3rd party tools. Defaults to the operating system username. -v, --v Level number for the log level verbosity --vmodule moduleSpec comma-separated list of pattern=N settings for file-filtered logging @@ -57,20 +57,20 @@ minikube profile help [command] [flags] ``` --add_dir_header If true, adds the file directory to the header of the log messages - --alsologtostderr log to standard error as well as files + --alsologtostderr log to standard error as well as files (no effect when -logtostderr=true) -b, --bootstrapper string The name of the cluster bootstrapper that will set up the Kubernetes cluster. (default "kubeadm") -h, --help --log_backtrace_at traceLocation when logging hits line file:N, emit a stack trace (default :0) - --log_dir string If non-empty, write log files in this directory - --log_file string If non-empty, use this log file - --log_file_max_size uint Defines the maximum size a log file can grow to. Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) + --log_dir string If non-empty, write log files in this directory (no effect when -logtostderr=true) + --log_file string If non-empty, use this log file (no effect when -logtostderr=true) + --log_file_max_size uint Defines the maximum size a log file can grow to (no effect when -logtostderr=true). Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) --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) + --one_output If true, only write logs to their native severity level (vs also writing to each lower severity level; no effect when -logtostderr=true) -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) + --skip_log_headers If true, avoid headers when opening log files (no effect when -logtostderr=true) + --stderrthreshold severity logs at or above this threshold go to stderr when writing to files and stderr (no effect when -logtostderr=true or -alsologtostderr=false) (default 2) --user string Specifies the user executing the operation. Useful for auditing operations executed by 3rd party tools. Defaults to the operating system username. -v, --v Level number for the log level verbosity --vmodule moduleSpec comma-separated list of pattern=N settings for file-filtered logging @@ -99,20 +99,20 @@ minikube profile list [flags] ``` --add_dir_header If true, adds the file directory to the header of the log messages - --alsologtostderr log to standard error as well as files + --alsologtostderr log to standard error as well as files (no effect when -logtostderr=true) -b, --bootstrapper string The name of the cluster bootstrapper that will set up the Kubernetes cluster. (default "kubeadm") -h, --help --log_backtrace_at traceLocation when logging hits line file:N, emit a stack trace (default :0) - --log_dir string If non-empty, write log files in this directory - --log_file string If non-empty, use this log file - --log_file_max_size uint Defines the maximum size a log file can grow to. Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) + --log_dir string If non-empty, write log files in this directory (no effect when -logtostderr=true) + --log_file string If non-empty, use this log file (no effect when -logtostderr=true) + --log_file_max_size uint Defines the maximum size a log file can grow to (no effect when -logtostderr=true). Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) --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) + --one_output If true, only write logs to their native severity level (vs also writing to each lower severity level; no effect when -logtostderr=true) -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) + --skip_log_headers If true, avoid headers when opening log files (no effect when -logtostderr=true) + --stderrthreshold severity logs at or above this threshold go to stderr when writing to files and stderr (no effect when -logtostderr=true or -alsologtostderr=false) (default 2) --user string Specifies the user executing the operation. Useful for auditing operations executed by 3rd party tools. Defaults to the operating system username. -v, --v Level number for the log level verbosity --vmodule moduleSpec comma-separated list of pattern=N settings for file-filtered logging diff --git a/site/content/en/docs/commands/service.md b/site/content/en/docs/commands/service.md index 7de3f08f83..672821a139 100644 --- a/site/content/en/docs/commands/service.md +++ b/site/content/en/docs/commands/service.md @@ -33,20 +33,20 @@ minikube service [flags] SERVICE ``` --add_dir_header If true, adds the file directory to the header of the log messages - --alsologtostderr log to standard error as well as files + --alsologtostderr log to standard error as well as files (no effect when -logtostderr=true) -b, --bootstrapper string The name of the cluster bootstrapper that will set up the Kubernetes cluster. (default "kubeadm") -h, --help --log_backtrace_at traceLocation when logging hits line file:N, emit a stack trace (default :0) - --log_dir string If non-empty, write log files in this directory - --log_file string If non-empty, use this log file - --log_file_max_size uint Defines the maximum size a log file can grow to. Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) + --log_dir string If non-empty, write log files in this directory (no effect when -logtostderr=true) + --log_file string If non-empty, use this log file (no effect when -logtostderr=true) + --log_file_max_size uint Defines the maximum size a log file can grow to (no effect when -logtostderr=true). Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) --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) + --one_output If true, only write logs to their native severity level (vs also writing to each lower severity level; no effect when -logtostderr=true) -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) + --skip_log_headers If true, avoid headers when opening log files (no effect when -logtostderr=true) + --stderrthreshold severity logs at or above this threshold go to stderr when writing to files and stderr (no effect when -logtostderr=true or -alsologtostderr=false) (default 2) --user string Specifies the user executing the operation. Useful for auditing operations executed by 3rd party tools. Defaults to the operating system username. -v, --v Level number for the log level verbosity --vmodule moduleSpec comma-separated list of pattern=N settings for file-filtered logging @@ -69,21 +69,21 @@ minikube service help [command] [flags] ``` --add_dir_header If true, adds the file directory to the header of the log messages - --alsologtostderr log to standard error as well as files + --alsologtostderr log to standard error as well as files (no effect when -logtostderr=true) -b, --bootstrapper string The name of the cluster bootstrapper that will set up the Kubernetes cluster. (default "kubeadm") --format string Format to output service URL in. This format will be applied to each url individually and they will be printed one at a time. (default "http://{{.IP}}:{{.Port}}") -h, --help --log_backtrace_at traceLocation when logging hits line file:N, emit a stack trace (default :0) - --log_dir string If non-empty, write log files in this directory - --log_file string If non-empty, use this log file - --log_file_max_size uint Defines the maximum size a log file can grow to. Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) + --log_dir string If non-empty, write log files in this directory (no effect when -logtostderr=true) + --log_file string If non-empty, use this log file (no effect when -logtostderr=true) + --log_file_max_size uint Defines the maximum size a log file can grow to (no effect when -logtostderr=true). Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) --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) + --one_output If true, only write logs to their native severity level (vs also writing to each lower severity level; no effect when -logtostderr=true) -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) + --skip_log_headers If true, avoid headers when opening log files (no effect when -logtostderr=true) + --stderrthreshold severity logs at or above this threshold go to stderr when writing to files and stderr (no effect when -logtostderr=true or -alsologtostderr=false) (default 2) --user string Specifies the user executing the operation. Useful for auditing operations executed by 3rd party tools. Defaults to the operating system username. -v, --v Level number for the log level verbosity --vmodule moduleSpec comma-separated list of pattern=N settings for file-filtered logging @@ -111,21 +111,21 @@ minikube service list [flags] ``` --add_dir_header If true, adds the file directory to the header of the log messages - --alsologtostderr log to standard error as well as files + --alsologtostderr log to standard error as well as files (no effect when -logtostderr=true) -b, --bootstrapper string The name of the cluster bootstrapper that will set up the Kubernetes cluster. (default "kubeadm") --format string Format to output service URL in. This format will be applied to each url individually and they will be printed one at a time. (default "http://{{.IP}}:{{.Port}}") -h, --help --log_backtrace_at traceLocation when logging hits line file:N, emit a stack trace (default :0) - --log_dir string If non-empty, write log files in this directory - --log_file string If non-empty, use this log file - --log_file_max_size uint Defines the maximum size a log file can grow to. Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) + --log_dir string If non-empty, write log files in this directory (no effect when -logtostderr=true) + --log_file string If non-empty, use this log file (no effect when -logtostderr=true) + --log_file_max_size uint Defines the maximum size a log file can grow to (no effect when -logtostderr=true). Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) --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) + --one_output If true, only write logs to their native severity level (vs also writing to each lower severity level; no effect when -logtostderr=true) -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) + --skip_log_headers If true, avoid headers when opening log files (no effect when -logtostderr=true) + --stderrthreshold severity logs at or above this threshold go to stderr when writing to files and stderr (no effect when -logtostderr=true or -alsologtostderr=false) (default 2) --user string Specifies the user executing the operation. Useful for auditing operations executed by 3rd party tools. Defaults to the operating system username. -v, --v Level number for the log level verbosity --vmodule moduleSpec comma-separated list of pattern=N settings for file-filtered logging diff --git a/site/content/en/docs/commands/ssh-host.md b/site/content/en/docs/commands/ssh-host.md index 0900dbbbdd..26f49e5402 100644 --- a/site/content/en/docs/commands/ssh-host.md +++ b/site/content/en/docs/commands/ssh-host.md @@ -28,20 +28,20 @@ minikube ssh-host [flags] ``` --add_dir_header If true, adds the file directory to the header of the log messages - --alsologtostderr log to standard error as well as files + --alsologtostderr log to standard error as well as files (no effect when -logtostderr=true) -b, --bootstrapper string The name of the cluster bootstrapper that will set up the Kubernetes cluster. (default "kubeadm") -h, --help --log_backtrace_at traceLocation when logging hits line file:N, emit a stack trace (default :0) - --log_dir string If non-empty, write log files in this directory - --log_file string If non-empty, use this log file - --log_file_max_size uint Defines the maximum size a log file can grow to. Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) + --log_dir string If non-empty, write log files in this directory (no effect when -logtostderr=true) + --log_file string If non-empty, use this log file (no effect when -logtostderr=true) + --log_file_max_size uint Defines the maximum size a log file can grow to (no effect when -logtostderr=true). Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) --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) + --one_output If true, only write logs to their native severity level (vs also writing to each lower severity level; no effect when -logtostderr=true) -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) + --skip_log_headers If true, avoid headers when opening log files (no effect when -logtostderr=true) + --stderrthreshold severity logs at or above this threshold go to stderr when writing to files and stderr (no effect when -logtostderr=true or -alsologtostderr=false) (default 2) --user string Specifies the user executing the operation. Useful for auditing operations executed by 3rd party tools. Defaults to the operating system username. -v, --v Level number for the log level verbosity --vmodule moduleSpec comma-separated list of pattern=N settings for file-filtered logging diff --git a/site/content/en/docs/commands/ssh-key.md b/site/content/en/docs/commands/ssh-key.md index 935f2fc79c..b8258e678a 100644 --- a/site/content/en/docs/commands/ssh-key.md +++ b/site/content/en/docs/commands/ssh-key.md @@ -27,20 +27,20 @@ minikube ssh-key [flags] ``` --add_dir_header If true, adds the file directory to the header of the log messages - --alsologtostderr log to standard error as well as files + --alsologtostderr log to standard error as well as files (no effect when -logtostderr=true) -b, --bootstrapper string The name of the cluster bootstrapper that will set up the Kubernetes cluster. (default "kubeadm") -h, --help --log_backtrace_at traceLocation when logging hits line file:N, emit a stack trace (default :0) - --log_dir string If non-empty, write log files in this directory - --log_file string If non-empty, use this log file - --log_file_max_size uint Defines the maximum size a log file can grow to. Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) + --log_dir string If non-empty, write log files in this directory (no effect when -logtostderr=true) + --log_file string If non-empty, use this log file (no effect when -logtostderr=true) + --log_file_max_size uint Defines the maximum size a log file can grow to (no effect when -logtostderr=true). Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) --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) + --one_output If true, only write logs to their native severity level (vs also writing to each lower severity level; no effect when -logtostderr=true) -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) + --skip_log_headers If true, avoid headers when opening log files (no effect when -logtostderr=true) + --stderrthreshold severity logs at or above this threshold go to stderr when writing to files and stderr (no effect when -logtostderr=true or -alsologtostderr=false) (default 2) --user string Specifies the user executing the operation. Useful for auditing operations executed by 3rd party tools. Defaults to the operating system username. -v, --v Level number for the log level verbosity --vmodule moduleSpec comma-separated list of pattern=N settings for file-filtered logging diff --git a/site/content/en/docs/commands/ssh.md b/site/content/en/docs/commands/ssh.md index 906e805968..6755ac293a 100644 --- a/site/content/en/docs/commands/ssh.md +++ b/site/content/en/docs/commands/ssh.md @@ -28,20 +28,20 @@ minikube ssh [flags] ``` --add_dir_header If true, adds the file directory to the header of the log messages - --alsologtostderr log to standard error as well as files + --alsologtostderr log to standard error as well as files (no effect when -logtostderr=true) -b, --bootstrapper string The name of the cluster bootstrapper that will set up the Kubernetes cluster. (default "kubeadm") -h, --help --log_backtrace_at traceLocation when logging hits line file:N, emit a stack trace (default :0) - --log_dir string If non-empty, write log files in this directory - --log_file string If non-empty, use this log file - --log_file_max_size uint Defines the maximum size a log file can grow to. Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) + --log_dir string If non-empty, write log files in this directory (no effect when -logtostderr=true) + --log_file string If non-empty, use this log file (no effect when -logtostderr=true) + --log_file_max_size uint Defines the maximum size a log file can grow to (no effect when -logtostderr=true). Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) --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) + --one_output If true, only write logs to their native severity level (vs also writing to each lower severity level; no effect when -logtostderr=true) -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) + --skip_log_headers If true, avoid headers when opening log files (no effect when -logtostderr=true) + --stderrthreshold severity logs at or above this threshold go to stderr when writing to files and stderr (no effect when -logtostderr=true or -alsologtostderr=false) (default 2) --user string Specifies the user executing the operation. Useful for auditing operations executed by 3rd party tools. Defaults to the operating system username. -v, --v Level number for the log level verbosity --vmodule moduleSpec comma-separated list of pattern=N settings for file-filtered logging diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index 06ab5adfda..8822c1f16e 100644 --- a/site/content/en/docs/commands/start.md +++ b/site/content/en/docs/commands/start.md @@ -122,20 +122,20 @@ minikube start [flags] ``` --add_dir_header If true, adds the file directory to the header of the log messages - --alsologtostderr log to standard error as well as files + --alsologtostderr log to standard error as well as files (no effect when -logtostderr=true) -b, --bootstrapper string The name of the cluster bootstrapper that will set up the Kubernetes cluster. (default "kubeadm") -h, --help --log_backtrace_at traceLocation when logging hits line file:N, emit a stack trace (default :0) - --log_dir string If non-empty, write log files in this directory - --log_file string If non-empty, use this log file - --log_file_max_size uint Defines the maximum size a log file can grow to. Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) + --log_dir string If non-empty, write log files in this directory (no effect when -logtostderr=true) + --log_file string If non-empty, use this log file (no effect when -logtostderr=true) + --log_file_max_size uint Defines the maximum size a log file can grow to (no effect when -logtostderr=true). Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) --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) + --one_output If true, only write logs to their native severity level (vs also writing to each lower severity level; no effect when -logtostderr=true) -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) + --skip_log_headers If true, avoid headers when opening log files (no effect when -logtostderr=true) + --stderrthreshold severity logs at or above this threshold go to stderr when writing to files and stderr (no effect when -logtostderr=true or -alsologtostderr=false) (default 2) --user string Specifies the user executing the operation. Useful for auditing operations executed by 3rd party tools. Defaults to the operating system username. -v, --v Level number for the log level verbosity --vmodule moduleSpec comma-separated list of pattern=N settings for file-filtered logging diff --git a/site/content/en/docs/commands/status.md b/site/content/en/docs/commands/status.md index b2a4483e95..12e157f4c6 100644 --- a/site/content/en/docs/commands/status.md +++ b/site/content/en/docs/commands/status.md @@ -34,20 +34,20 @@ minikube status [flags] ``` --add_dir_header If true, adds the file directory to the header of the log messages - --alsologtostderr log to standard error as well as files + --alsologtostderr log to standard error as well as files (no effect when -logtostderr=true) -b, --bootstrapper string The name of the cluster bootstrapper that will set up the Kubernetes cluster. (default "kubeadm") -h, --help --log_backtrace_at traceLocation when logging hits line file:N, emit a stack trace (default :0) - --log_dir string If non-empty, write log files in this directory - --log_file string If non-empty, use this log file - --log_file_max_size uint Defines the maximum size a log file can grow to. Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) + --log_dir string If non-empty, write log files in this directory (no effect when -logtostderr=true) + --log_file string If non-empty, use this log file (no effect when -logtostderr=true) + --log_file_max_size uint Defines the maximum size a log file can grow to (no effect when -logtostderr=true). Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) --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) + --one_output If true, only write logs to their native severity level (vs also writing to each lower severity level; no effect when -logtostderr=true) -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) + --skip_log_headers If true, avoid headers when opening log files (no effect when -logtostderr=true) + --stderrthreshold severity logs at or above this threshold go to stderr when writing to files and stderr (no effect when -logtostderr=true or -alsologtostderr=false) (default 2) --user string Specifies the user executing the operation. Useful for auditing operations executed by 3rd party tools. Defaults to the operating system username. -v, --v Level number for the log level verbosity --vmodule moduleSpec comma-separated list of pattern=N settings for file-filtered logging diff --git a/site/content/en/docs/commands/stop.md b/site/content/en/docs/commands/stop.md index cfdc1bbbf6..e9c6948a64 100644 --- a/site/content/en/docs/commands/stop.md +++ b/site/content/en/docs/commands/stop.md @@ -31,20 +31,20 @@ minikube stop [flags] ``` --add_dir_header If true, adds the file directory to the header of the log messages - --alsologtostderr log to standard error as well as files + --alsologtostderr log to standard error as well as files (no effect when -logtostderr=true) -b, --bootstrapper string The name of the cluster bootstrapper that will set up the Kubernetes cluster. (default "kubeadm") -h, --help --log_backtrace_at traceLocation when logging hits line file:N, emit a stack trace (default :0) - --log_dir string If non-empty, write log files in this directory - --log_file string If non-empty, use this log file - --log_file_max_size uint Defines the maximum size a log file can grow to. Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) + --log_dir string If non-empty, write log files in this directory (no effect when -logtostderr=true) + --log_file string If non-empty, use this log file (no effect when -logtostderr=true) + --log_file_max_size uint Defines the maximum size a log file can grow to (no effect when -logtostderr=true). Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) --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) + --one_output If true, only write logs to their native severity level (vs also writing to each lower severity level; no effect when -logtostderr=true) -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) + --skip_log_headers If true, avoid headers when opening log files (no effect when -logtostderr=true) + --stderrthreshold severity logs at or above this threshold go to stderr when writing to files and stderr (no effect when -logtostderr=true or -alsologtostderr=false) (default 2) --user string Specifies the user executing the operation. Useful for auditing operations executed by 3rd party tools. Defaults to the operating system username. -v, --v Level number for the log level verbosity --vmodule moduleSpec comma-separated list of pattern=N settings for file-filtered logging diff --git a/site/content/en/docs/commands/tunnel.md b/site/content/en/docs/commands/tunnel.md index caea57de2c..f80e6534cc 100644 --- a/site/content/en/docs/commands/tunnel.md +++ b/site/content/en/docs/commands/tunnel.md @@ -28,20 +28,20 @@ minikube tunnel [flags] ``` --add_dir_header If true, adds the file directory to the header of the log messages - --alsologtostderr log to standard error as well as files + --alsologtostderr log to standard error as well as files (no effect when -logtostderr=true) -b, --bootstrapper string The name of the cluster bootstrapper that will set up the Kubernetes cluster. (default "kubeadm") -h, --help --log_backtrace_at traceLocation when logging hits line file:N, emit a stack trace (default :0) - --log_dir string If non-empty, write log files in this directory - --log_file string If non-empty, use this log file - --log_file_max_size uint Defines the maximum size a log file can grow to. Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) + --log_dir string If non-empty, write log files in this directory (no effect when -logtostderr=true) + --log_file string If non-empty, use this log file (no effect when -logtostderr=true) + --log_file_max_size uint Defines the maximum size a log file can grow to (no effect when -logtostderr=true). Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) --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) + --one_output If true, only write logs to their native severity level (vs also writing to each lower severity level; no effect when -logtostderr=true) -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) + --skip_log_headers If true, avoid headers when opening log files (no effect when -logtostderr=true) + --stderrthreshold severity logs at or above this threshold go to stderr when writing to files and stderr (no effect when -logtostderr=true or -alsologtostderr=false) (default 2) --user string Specifies the user executing the operation. Useful for auditing operations executed by 3rd party tools. Defaults to the operating system username. -v, --v Level number for the log level verbosity --vmodule moduleSpec comma-separated list of pattern=N settings for file-filtered logging diff --git a/site/content/en/docs/commands/unpause.md b/site/content/en/docs/commands/unpause.md index fbe17a1ad6..dadea53e52 100644 --- a/site/content/en/docs/commands/unpause.md +++ b/site/content/en/docs/commands/unpause.md @@ -33,20 +33,20 @@ minikube unpause [flags] ``` --add_dir_header If true, adds the file directory to the header of the log messages - --alsologtostderr log to standard error as well as files + --alsologtostderr log to standard error as well as files (no effect when -logtostderr=true) -b, --bootstrapper string The name of the cluster bootstrapper that will set up the Kubernetes cluster. (default "kubeadm") -h, --help --log_backtrace_at traceLocation when logging hits line file:N, emit a stack trace (default :0) - --log_dir string If non-empty, write log files in this directory - --log_file string If non-empty, use this log file - --log_file_max_size uint Defines the maximum size a log file can grow to. Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) + --log_dir string If non-empty, write log files in this directory (no effect when -logtostderr=true) + --log_file string If non-empty, use this log file (no effect when -logtostderr=true) + --log_file_max_size uint Defines the maximum size a log file can grow to (no effect when -logtostderr=true). Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) --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) + --one_output If true, only write logs to their native severity level (vs also writing to each lower severity level; no effect when -logtostderr=true) -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) + --skip_log_headers If true, avoid headers when opening log files (no effect when -logtostderr=true) + --stderrthreshold severity logs at or above this threshold go to stderr when writing to files and stderr (no effect when -logtostderr=true or -alsologtostderr=false) (default 2) --user string Specifies the user executing the operation. Useful for auditing operations executed by 3rd party tools. Defaults to the operating system username. -v, --v Level number for the log level verbosity --vmodule moduleSpec comma-separated list of pattern=N settings for file-filtered logging diff --git a/site/content/en/docs/commands/update-check.md b/site/content/en/docs/commands/update-check.md index dde834875e..94b473419e 100644 --- a/site/content/en/docs/commands/update-check.md +++ b/site/content/en/docs/commands/update-check.md @@ -21,20 +21,20 @@ minikube update-check [flags] ``` --add_dir_header If true, adds the file directory to the header of the log messages - --alsologtostderr log to standard error as well as files + --alsologtostderr log to standard error as well as files (no effect when -logtostderr=true) -b, --bootstrapper string The name of the cluster bootstrapper that will set up the Kubernetes cluster. (default "kubeadm") -h, --help --log_backtrace_at traceLocation when logging hits line file:N, emit a stack trace (default :0) - --log_dir string If non-empty, write log files in this directory - --log_file string If non-empty, use this log file - --log_file_max_size uint Defines the maximum size a log file can grow to. Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) + --log_dir string If non-empty, write log files in this directory (no effect when -logtostderr=true) + --log_file string If non-empty, use this log file (no effect when -logtostderr=true) + --log_file_max_size uint Defines the maximum size a log file can grow to (no effect when -logtostderr=true). Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) --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) + --one_output If true, only write logs to their native severity level (vs also writing to each lower severity level; no effect when -logtostderr=true) -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) + --skip_log_headers If true, avoid headers when opening log files (no effect when -logtostderr=true) + --stderrthreshold severity logs at or above this threshold go to stderr when writing to files and stderr (no effect when -logtostderr=true or -alsologtostderr=false) (default 2) --user string Specifies the user executing the operation. Useful for auditing operations executed by 3rd party tools. Defaults to the operating system username. -v, --v Level number for the log level verbosity --vmodule moduleSpec comma-separated list of pattern=N settings for file-filtered logging diff --git a/site/content/en/docs/commands/update-context.md b/site/content/en/docs/commands/update-context.md index afa140db35..0cce1711a7 100644 --- a/site/content/en/docs/commands/update-context.md +++ b/site/content/en/docs/commands/update-context.md @@ -22,20 +22,20 @@ minikube update-context [flags] ``` --add_dir_header If true, adds the file directory to the header of the log messages - --alsologtostderr log to standard error as well as files + --alsologtostderr log to standard error as well as files (no effect when -logtostderr=true) -b, --bootstrapper string The name of the cluster bootstrapper that will set up the Kubernetes cluster. (default "kubeadm") -h, --help --log_backtrace_at traceLocation when logging hits line file:N, emit a stack trace (default :0) - --log_dir string If non-empty, write log files in this directory - --log_file string If non-empty, use this log file - --log_file_max_size uint Defines the maximum size a log file can grow to. Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) + --log_dir string If non-empty, write log files in this directory (no effect when -logtostderr=true) + --log_file string If non-empty, use this log file (no effect when -logtostderr=true) + --log_file_max_size uint Defines the maximum size a log file can grow to (no effect when -logtostderr=true). Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) --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) + --one_output If true, only write logs to their native severity level (vs also writing to each lower severity level; no effect when -logtostderr=true) -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) + --skip_log_headers If true, avoid headers when opening log files (no effect when -logtostderr=true) + --stderrthreshold severity logs at or above this threshold go to stderr when writing to files and stderr (no effect when -logtostderr=true or -alsologtostderr=false) (default 2) --user string Specifies the user executing the operation. Useful for auditing operations executed by 3rd party tools. Defaults to the operating system username. -v, --v Level number for the log level verbosity --vmodule moduleSpec comma-separated list of pattern=N settings for file-filtered logging diff --git a/site/content/en/docs/commands/version.md b/site/content/en/docs/commands/version.md index b7babba989..cc603f7f27 100644 --- a/site/content/en/docs/commands/version.md +++ b/site/content/en/docs/commands/version.md @@ -29,20 +29,20 @@ minikube version [flags] ``` --add_dir_header If true, adds the file directory to the header of the log messages - --alsologtostderr log to standard error as well as files + --alsologtostderr log to standard error as well as files (no effect when -logtostderr=true) -b, --bootstrapper string The name of the cluster bootstrapper that will set up the Kubernetes cluster. (default "kubeadm") -h, --help --log_backtrace_at traceLocation when logging hits line file:N, emit a stack trace (default :0) - --log_dir string If non-empty, write log files in this directory - --log_file string If non-empty, use this log file - --log_file_max_size uint Defines the maximum size a log file can grow to. Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) + --log_dir string If non-empty, write log files in this directory (no effect when -logtostderr=true) + --log_file string If non-empty, use this log file (no effect when -logtostderr=true) + --log_file_max_size uint Defines the maximum size a log file can grow to (no effect when -logtostderr=true). Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800) --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) + --one_output If true, only write logs to their native severity level (vs also writing to each lower severity level; no effect when -logtostderr=true) -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) + --skip_log_headers If true, avoid headers when opening log files (no effect when -logtostderr=true) + --stderrthreshold severity logs at or above this threshold go to stderr when writing to files and stderr (no effect when -logtostderr=true or -alsologtostderr=false) (default 2) --user string Specifies the user executing the operation. Useful for auditing operations executed by 3rd party tools. Defaults to the operating system username. -v, --v Level number for the log level verbosity --vmodule moduleSpec comma-separated list of pattern=N settings for file-filtered logging From 90fabe158e631a4375ea84905dfedebbec27b1fc Mon Sep 17 00:00:00 2001 From: Sharif Elgamal Date: Wed, 22 Jun 2022 12:13:31 -0700 Subject: [PATCH 194/545] fix grammar for common minikube start output --- cmd/minikube/cmd/start_flags.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/minikube/cmd/start_flags.go b/cmd/minikube/cmd/start_flags.go index 19e256f2a3..cee165e658 100644 --- a/cmd/minikube/cmd/start_flags.go +++ b/cmd/minikube/cmd/start_flags.go @@ -575,7 +575,7 @@ func generateNewConfigFromFlags(cmd *cobra.Command, k8sVersion string, rtime str 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)}) + out.Styled(style.Notice, "Using {{.driver_name}} driver with root privileges", out.V{"driver_name": driver.FullName(drvName)}) } if si.StorageDriver == "btrfs" { klog.Info("auto-setting LocalStorageCapacityIsolation to false because using btrfs storage driver") From 3cad9348c15564ea5bf3f426ad197dfc38a87ad9 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Wed, 22 Jun 2022 19:30:36 +0000 Subject: [PATCH 195/545] Update auto-generated docs and translations --- translations/de.json | 2 +- translations/es.json | 2 +- translations/fr.json | 1 + translations/ja.json | 2 +- translations/ko.json | 2 +- translations/pl.json | 2 +- translations/ru.json | 2 +- translations/strings.txt | 2 +- translations/zh-CN.json | 2 +- 9 files changed, 9 insertions(+), 8 deletions(-) diff --git a/translations/de.json b/translations/de.json index 6a35202a9b..1528eb36cc 100644 --- a/translations/de.json +++ b/translations/de.json @@ -843,7 +843,7 @@ "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": "", + "Using {{.driver_name}} driver with root privileges": "", "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 cbeb108c2a..7a93a45820 100644 --- a/translations/es.json +++ b/translations/es.json @@ -846,7 +846,7 @@ "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": "", + "Using {{.driver_name}} driver with root privileges": "", "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 225ea286e8..0569bc0b62 100644 --- a/translations/fr.json +++ b/translations/fr.json @@ -814,6 +814,7 @@ "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 root privileges": "", "Using {{.driver_name}} driver with the root privilege": "Utilisation du pilote {{.driver_name}} avec le privilège root", "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", diff --git a/translations/ja.json b/translations/ja.json index fcdec7201e..328f22ee8b 100644 --- a/translations/ja.json +++ b/translations/ja.json @@ -849,7 +849,7 @@ "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": "", + "Using {{.driver_name}} driver with root privileges": "", "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 809f800cce..eb938c7f45 100644 --- a/translations/ko.json +++ b/translations/ko.json @@ -847,7 +847,7 @@ "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": "", + "Using {{.driver_name}} driver with root privileges": "", "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 ed53cfa5dc..ff9360471d 100644 --- a/translations/pl.json +++ b/translations/pl.json @@ -856,7 +856,7 @@ "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": "", + "Using {{.driver_name}} driver with root privileges": "", "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 7cf78155de..02ae9f01b1 100644 --- a/translations/ru.json +++ b/translations/ru.json @@ -783,7 +783,7 @@ "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": "", + "Using {{.driver_name}} driver with root privileges": "", "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 b8aaaf1598..e7de2eea68 100644 --- a/translations/strings.txt +++ b/translations/strings.txt @@ -783,7 +783,7 @@ "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": "", + "Using {{.driver_name}} driver with root privileges": "", "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 5800e29540..0cc9f36a5e 100644 --- a/translations/zh-CN.json +++ b/translations/zh-CN.json @@ -956,7 +956,7 @@ "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": "", + "Using {{.driver_name}} driver with root privileges": "", "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 207003f24b825b461be46a01d8f4a7c5bd1e20e6 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Wed, 22 Jun 2022 12:38:33 -0700 Subject: [PATCH 196/545] release minikube 1.26 --- CHANGELOG.md | 97 ++++++++++++++++++++++++++++++++++++++++++++++++++++ Makefile | 2 +- 2 files changed, 98 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 51ef9ce530..d0f93b4f12 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,102 @@ # Release Notes +## Version 1.26.0 - 2022-06-22 + +Features: +* Add `headlamp` addon [#14315](https://github.com/kubernetes/minikube/pull/14315) +* Add `InAccel FPGA Operator` addon [#12995](https://github.com/kubernetes/minikube/pull/12995) + +QEMU: +* Only set highmem=off for darwin if qemu version is below 7.0 or memory is below 3GB [#14291](https://github.com/kubernetes/minikube/pull/14291) +* Define qemu as a qemu2 driver alias [#14284](https://github.com/kubernetes/minikube/pull/14284) +* Allow users to supply custom QEMU firmware path [#14283](https://github.com/kubernetes/minikube/pull/14283) + +Minor Improvements: +* Add eBPF related kernel options [#14316](https://github.com/kubernetes/minikube/pull/14316) +* Add bind address flag for `minikube tunnel` [#14245](https://github.com/kubernetes/minikube/pull/14245) +* Add active column for `minikube profile list` [#14079](https://github.com/kubernetes/minikube/pull/14079) +* Add documentation URL to the addon list table [#14123](https://github.com/kubernetes/minikube/pull/14123) +* `minikube config defaults kubernetes-version` lists all currently supported Kubernetes versions [#13775](https://github.com/kubernetes/minikube/pull/13775) +* Support starting minikube with the Podman driver on NixOS systems [#12739](https://github.com/kubernetes/minikube/pull/12739) + +Bug Fixes: +* Fix terminated commands not writing to audit log [#13307](https://github.com/kubernetes/minikube/pull/13307) +* Fix Podman port mapping publish on macOS [#14290](https://github.com/kubernetes/minikube/pull/14290) +* Fix `minikube delete` deleting networks from other profiles [#14279](https://github.com/kubernetes/minikube/pull/14279) + +Version Upgrades: +* Bump Kubernetes version default: v1.24.1 and latest: v1.24.1 [#14197](https://github.com/kubernetes/minikube/pull/14197) +* ISO: Upgrade Docker from 20.10.14 to 20.10.16 [#14153](https://github.com/kubernetes/minikube/pull/14153) +* ISO: Upgrade kernel from 4.19.235 to 5.10.57 [#12707](https://github.com/kubernetes/minikube/pull/12707) +* Upgrade Dashboard addon from v2.5.1 to v2.6.0 & MetricsScraper from v1.0.7 to v1.0.8 [#14269](https://github.com/kubernetes/minikube/pull/14269) +* Upgrade gcp-auth-webhook from v0.0.8 to v0.0.9 [#14372](https://github.com/kubernetes/minikube/pull/14372) +* Upgrade nginx image from v1.2.0 to v1.2.1 [#14317](https://github.com/kubernetes/minikube/pull/14317) + +**Important Changes in Pre-Release Versions** +Features: +* Add configure option to registry-aliases addon [#13912](https://github.com/kubernetes/minikube/pull/13912) +* Add support for building aarch64 ISO [#13762](https://github.com/kubernetes/minikube/pull/13762) +* Support rootless Podman driver (Usage: `minikube config set rootless true`) [#13829](https://github.com/kubernetes/minikube/pull/13829) + +QEMU: +* Add support for the QEMU driver [#13639](https://github.com/kubernetes/minikube/pull/13639) +* Fix qemu firmware path locations [#14182](https://github.com/kubernetes/minikube/pull/14182) +* Re-establish apiserver tunnel on restart [#14183](https://github.com/kubernetes/minikube/pull/14183) + +For a more detailed changelog, including changes occurring in pre-release versions, see [CHANGELOG.md](https://github.com/kubernetes/minikube/blob/master/CHANGELOG.md). + +Thank you to our contributors for this release! + +- Alex Andrews +- Anders F Björklund +- Elias Koromilas +- Francis Laniel +- Giildo +- Harsh Vardhan +- Jack Zhang +- Jeff MAURY +- Kevin Grigorenko +- Kian-Meng Ang +- Leonardo Grasso +- Medya Ghazizadeh +- Nikhil Sharma +- Nils Fahldieck +- Pablo Caderno +- Peter Becich +- Predrag Rogic +- Santhosh Nagaraj S +- Sharif Elgamal +- Steven Powell +- Toshiaki Inukai +- klaases +- lakshkeswani +- layakdev +- lilongfeng +- simonren-tes +- ziyi-xie +- 李龙峰 + +Thank you to our PR reviewers for this release! + +- spowelljr (76 comments) +- sharifelgamal (11 comments) +- medyagh (8 comments) +- afbjorklund (6 comments) +- kakkoyun (2 comments) +- knrt10 (2 comments) +- mprimeaux (2 comments) +- shu-mutou (2 comments) +- javierhonduco (1 comments) +- nburlett (1 comments) + +Thank you to our triage members for this release! + +- spowelljr (39 comments) +- RA489 (30 comments) +- sharifelgamal (27 comments) +- afbjorklund (14 comments) +- klaases (14 comments) + ## Version 1.26.0-beta.1 - 2022-05-17 QEMU driver enhancements: diff --git a/Makefile b/Makefile index 10e4e80866..9daf7b3f75 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ # Bump these on release - and please check ISO_VERSION for correctness. VERSION_MAJOR ?= 1 VERSION_MINOR ?= 26 -VERSION_BUILD ?= 0-beta.1 +VERSION_BUILD ?= 0 RAW_VERSION=$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_BUILD) VERSION ?= v$(RAW_VERSION) From 9d11601ec2d11ae609607f2246c0790beace1d78 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Wed, 22 Jun 2022 13:05:31 -0700 Subject: [PATCH 197/545] Bump Kubernetes version default: v1.24.2 and latest: v1.24.2 --- pkg/minikube/constants/constants.go | 4 ++-- site/content/en/docs/commands/start.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/minikube/constants/constants.go b/pkg/minikube/constants/constants.go index 82ada2797c..0d5d8e8dcc 100644 --- a/pkg/minikube/constants/constants.go +++ b/pkg/minikube/constants/constants.go @@ -32,10 +32,10 @@ var ( const ( // DefaultKubernetesVersion is the default Kubernetes version - DefaultKubernetesVersion = "v1.24.1" + DefaultKubernetesVersion = "v1.24.2" // NewestKubernetesVersion is the newest Kubernetes version to test against // NOTE: You may need to update coreDNS & etcd versions in pkg/minikube/bootstrapper/images/images.go - NewestKubernetesVersion = "v1.24.1" + NewestKubernetesVersion = "v1.24.2" // OldestKubernetesVersion is the oldest Kubernetes version to test against OldestKubernetesVersion = "v1.16.0" // NoKubernetesVersion is the version used when users does NOT want to install kubernetes diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index 0dae65262b..eb11b7f6ea 100644 --- a/site/content/en/docs/commands/start.md +++ b/site/content/en/docs/commands/start.md @@ -71,7 +71,7 @@ minikube start [flags] --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/iso/minikube-v1.26.0-amd64.iso,https://github.com/kubernetes/minikube/releases/download/v1.26.0/minikube-v1.26.0-amd64.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.26.0-amd64.iso,https://storage.googleapis.com/minikube/iso/minikube-v1.26.0.iso,https://github.com/kubernetes/minikube/releases/download/v1.26.0/minikube-v1.26.0.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.26.0.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.24.1, 'latest' for v1.24.1). Defaults to 'stable'. + --kubernetes-version string The Kubernetes version that the minikube VM will use (ex: v1.2.3, 'stable' for v1.24.2, 'latest' for v1.24.2). Defaults to 'stable'. --kvm-gpu Enable experimental NVIDIA GPU support in minikube --kvm-hidden Hide the hypervisor signature from the guest in minikube (kvm2 driver only) --kvm-network string The KVM default network name. (kvm2 driver only) (default "default") From 627b38a9cc7b7c2e3dd3fccedfb636fb0b4611c2 Mon Sep 17 00:00:00 2001 From: Sharif Elgamal Date: Wed, 22 Jun 2022 14:19:52 -0700 Subject: [PATCH 198/545] fix french translation for changed sentence --- translations/fr.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/translations/fr.json b/translations/fr.json index 0569bc0b62..0c688ddbce 100644 --- a/translations/fr.json +++ b/translations/fr.json @@ -814,8 +814,7 @@ "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 root privileges": "", - "Using {{.driver_name}} driver with the root privilege": "Utilisation du pilote {{.driver_name}} avec le privilège root", + "Using {{.driver_name}} driver with root privileges": "Utilisation du pilote {{.driver_name}} avec le privilège root", "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.", @@ -1014,4 +1013,4 @@ "{{.profile}} profile is not valid: {{.err}}": "Le profil {{.profile}} n'est pas valide : {{.err}}", "{{.type}} is not yet a supported filesystem. We will try anyways!": "{{.type}} n'est pas encore un système de fichiers pris en charge. Nous essaierons quand même !", "{{.url}} is not accessible: {{.error}}": "{{.url}} n'est pas accessible : {{.error}}" -} \ No newline at end of file +} From 28bf7d76d114cd01a5519752e22e6d37cba1c63c Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Wed, 22 Jun 2022 21:31:04 +0000 Subject: [PATCH 199/545] Update auto-generated docs and translations --- translations/fr.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/translations/fr.json b/translations/fr.json index 0c688ddbce..d0a1441f94 100644 --- a/translations/fr.json +++ b/translations/fr.json @@ -1013,4 +1013,4 @@ "{{.profile}} profile is not valid: {{.err}}": "Le profil {{.profile}} n'est pas valide : {{.err}}", "{{.type}} is not yet a supported filesystem. We will try anyways!": "{{.type}} n'est pas encore un système de fichiers pris en charge. Nous essaierons quand même !", "{{.url}} is not accessible: {{.error}}": "{{.url}} n'est pas accessible : {{.error}}" -} +} \ No newline at end of file From 6be53a4b7aa0b9a75141f9aede54bdd8c9ab4367 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Wed, 22 Jun 2022 16:34:37 -0700 Subject: [PATCH 200/545] Update releases.json & releases-v2.json to include v1.26.0 --- deploy/minikube/releases-v2.json | 26 ++++++++++++++++++++++++++ deploy/minikube/releases.json | 8 ++++++++ site/content/en/docs/_index.md | 2 +- 3 files changed, 35 insertions(+), 1 deletion(-) diff --git a/deploy/minikube/releases-v2.json b/deploy/minikube/releases-v2.json index c576714561..a26c0d93da 100644 --- a/deploy/minikube/releases-v2.json +++ b/deploy/minikube/releases-v2.json @@ -1,4 +1,30 @@ [ + { + "checksums": { + "amd64": { + "darwin": "cdfbbbdd01de8e8819d7d917f155c7a7cc6236af1ac97c4ae6f3ff9252b150b7", + "linux": "a988b7c890d9dc34033155b8b721827b3eff0e22c3d436409a8a3310aa564547", + "windows": "08c06e6ddff4f2e47a2d094365aeb85a3ac8ad1b86361db9b06a02f3668bd5a3" + }, + "arm": { + "linux": "5319911f90d173d3f1156082e608c3d7bde5e0d0d5706e61a968972b44e8885d" + }, + "arm64": { + "darwin": "39f90dc37d5cf4b6d150b177a4c9d2967d9d923cd8eb7d5b99268987a0287aba", + "linux": "7b6e79f51e671d2708afe8daea4d0bc0d9464992d9cf3d4415f608205c26a6ff" + }, + "ppc64le": { + "linux": "bc8794ae7b5f3a02151085a316b02a39463dbac279ac0698b9d0edaef562b11e" + }, + "s390x": { + "linux": "efc5765244660a48b6ef3c866b9db3b3a05913ef22c37e0286a221498c88469c" + }, + "darwin": "cdfbbbdd01de8e8819d7d917f155c7a7cc6236af1ac97c4ae6f3ff9252b150b7", + "linux": "a988b7c890d9dc34033155b8b721827b3eff0e22c3d436409a8a3310aa564547", + "windows": "08c06e6ddff4f2e47a2d094365aeb85a3ac8ad1b86361db9b06a02f3668bd5a3" + }, + "name": "v1.26.0" + }, { "checksums": { "amd64": { diff --git a/deploy/minikube/releases.json b/deploy/minikube/releases.json index 9fb41f3f87..994b9beb08 100644 --- a/deploy/minikube/releases.json +++ b/deploy/minikube/releases.json @@ -1,4 +1,12 @@ [ + { + "checksums": { + "darwin": "cdfbbbdd01de8e8819d7d917f155c7a7cc6236af1ac97c4ae6f3ff9252b150b7", + "linux": "a988b7c890d9dc34033155b8b721827b3eff0e22c3d436409a8a3310aa564547", + "windows": "08c06e6ddff4f2e47a2d094365aeb85a3ac8ad1b86361db9b06a02f3668bd5a3" + }, + "name": "v1.26.0" + }, { "checksums": { "darwin": "d125772083a2e9d6f6e8bd9791e3fd0d2cbac071416962a490b1ce19a045f486", diff --git a/site/content/en/docs/_index.md b/site/content/en/docs/_index.md index ee1e4ea062..603e79115a 100644 --- a/site/content/en/docs/_index.md +++ b/site/content/en/docs/_index.md @@ -11,7 +11,7 @@ minikube quickly sets up a local Kubernetes cluster on macOS, Linux, and Windows ![Screenshot](/images/screenshot.png) -🎉 Latest Release: v1.25.2 - Feb 24, 2022 ([changelog](https://github.com/kubernetes/minikube/blob/master/CHANGELOG.md)) +🎉 Latest Release: v1.26.0 - Jun 22, 2022 ([changelog](https://github.com/kubernetes/minikube/blob/master/CHANGELOG.md)) ## Highlights From abc213e51a19ccdba53a721ba440c7c8e2eab12e Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Thu, 23 Jun 2022 11:01:20 -0700 Subject: [PATCH 201/545] only tweet on release, not tag push --- .github/workflows/twitter-bot.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/twitter-bot.yml b/.github/workflows/twitter-bot.yml index 10ad3f1a60..6b9e854491 100644 --- a/.github/workflows/twitter-bot.yml +++ b/.github/workflows/twitter-bot.yml @@ -1,9 +1,6 @@ name: "Tweet the release" on: workflow_dispatch: - push: - tags: - - 'v*' release: types: [published] jobs: From 10ed5f5eae048b3248952a88c22f00a7866a0015 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Thu, 23 Jun 2022 11:23:04 -0700 Subject: [PATCH 202/545] fix update leaderboard --- .github/workflows/leaderboard.yml | 2 -- hack/update_contributions.sh | 8 +++----- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/.github/workflows/leaderboard.yml b/.github/workflows/leaderboard.yml index 53eedcd185..f8675c9e79 100644 --- a/.github/workflows/leaderboard.yml +++ b/.github/workflows/leaderboard.yml @@ -4,8 +4,6 @@ on: push: tags-ignore: - 'v*-beta.*' - release: - types: [published] env: GOPROXY: https://proxy.golang.org GO_VERSION: '1.18.3' diff --git a/hack/update_contributions.sh b/hack/update_contributions.sh index 08060e4b4f..80c790d8f0 100755 --- a/hack/update_contributions.sh +++ b/hack/update_contributions.sh @@ -18,10 +18,8 @@ set -eu -o pipefail DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) -if ! [[ -x "${DIR}/pullsheet" ]]; then - echo >&2 'Installing pullsheet' - go install github.com/google/pullsheet@latest -fi +echo >&2 'Installing pullsheet' +go install github.com/google/pullsheet@latest git fetch --tags -f git pull https://github.com/kubernetes/minikube.git master --tags @@ -71,6 +69,6 @@ while read -r tag_index tag_name tag_start tag_end; do # Print header for page. printf -- "---\ntitle: \"$tag_name - $tag_end\"\nlinkTitle: \"$tag_name - $tag_end\"\nweight: $tag_index\n---\n" > "$destination/$tag_name.html" # Add pullsheet content - $DIR/pullsheet leaderboard --token-path "$TMP_TOKEN" --repos kubernetes/minikube --since "$tag_start" --until "$tag_end" --hide-command --logtostderr=false --stderrthreshold=2 \ + pullsheet leaderboard --token-path "$TMP_TOKEN" --repos kubernetes/minikube --since "$tag_start" --until "$tag_end" --hide-command --logtostderr=false --stderrthreshold=2 \ >> "$destination/$tag_name.html" done <<< "$tags_with_range" From 7f6ad8c3ced87aae8dafa7af37ad5e92afe48f11 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Thu, 23 Jun 2022 18:39:38 +0000 Subject: [PATCH 203/545] Update leaderboard --- .../en/docs/contrib/leaderboard/v1.26.0.html | 519 ++++++++++++++++++ 1 file changed, 519 insertions(+) create mode 100644 site/content/en/docs/contrib/leaderboard/v1.26.0.html diff --git a/site/content/en/docs/contrib/leaderboard/v1.26.0.html b/site/content/en/docs/contrib/leaderboard/v1.26.0.html new file mode 100644 index 0000000000..d16b56804d --- /dev/null +++ b/site/content/en/docs/contrib/leaderboard/v1.26.0.html @@ -0,0 +1,519 @@ +--- +title: "v1.26.0 - 2022-06-22" +linkTitle: "v1.26.0 - 2022-06-22" +weight: -106 +--- + + + kubernetes/minikube - Leaderboard + + + + + + + + +

kubernetes/minikube

+
2022-02-24 — 2022-06-22
+ + +

Reviewers

+ + +
+

Most Influential

+

# of Merged PRs reviewed

+
+ +
+ +
+

Most Helpful

+

# of words written in merged PRs

+
+ +
+ +
+

Most Demanding

+

# of Review Comments in merged PRs

+
+ +
+ + +

Pull Requests

+ + +
+

Most Active

+

# of Pull Requests Merged

+
+ +
+ +
+

Big Movers

+

Lines of code (delta)

+
+ +
+ +
+

Most difficult to review

+

Average PR size (added+changed)

+
+ +
+ + +

Issues

+ + +
+

Most Active

+

# of comments

+
+ +
+ +
+

Most Helpful

+

# of words (excludes authored)

+
+ +
+ +
+

Top Closers

+

# of issues closed (excludes authored)

+
+ +
+ + + + From ef3d645d8aaa90dc42431f9c546aed73ff621446 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Thu, 23 Jun 2022 13:11:18 -0700 Subject: [PATCH 204/545] fix time-to-k8s --- hack/benchmark/time-to-k8s/chart.go | 2 -- hack/benchmark/time-to-k8s/cpu.go | 2 -- hack/benchmark/time-to-k8s/page.go | 23 ++++++++++++----------- 3 files changed, 12 insertions(+), 15 deletions(-) diff --git a/hack/benchmark/time-to-k8s/chart.go b/hack/benchmark/time-to-k8s/chart.go index e0ebcbcc18..6d35f9ad74 100644 --- a/hack/benchmark/time-to-k8s/chart.go +++ b/hack/benchmark/time-to-k8s/chart.go @@ -275,8 +275,6 @@ func createChart(chartPath string, values []plotter.Values, totals []float64, na return err } - data.TimeChart = chartPath - return nil } diff --git a/hack/benchmark/time-to-k8s/cpu.go b/hack/benchmark/time-to-k8s/cpu.go index a69d106726..0f90d0e1b6 100644 --- a/hack/benchmark/time-to-k8s/cpu.go +++ b/hack/benchmark/time-to-k8s/cpu.go @@ -97,8 +97,6 @@ func createCPUChart(chartPath string, values []plotter.Values, names []string) e return err } - data.CPUChart = chartPath - return nil } diff --git a/hack/benchmark/time-to-k8s/page.go b/hack/benchmark/time-to-k8s/page.go index 36cfb6f5b5..14bc5b2825 100644 --- a/hack/benchmark/time-to-k8s/page.go +++ b/hack/benchmark/time-to-k8s/page.go @@ -18,9 +18,10 @@ package main import ( "flag" - "fmt" "log" "os" + "os/exec" + "strings" "text/template" "time" ) @@ -31,12 +32,12 @@ linkTitle: "{{.Version}} Benchmark" weight: -{{.Weight}} --- -![time-to-k8s]({{.TimeChart}}) +![time-to-k8s](/images/benchmarks/timeToK8s/{{.Version}}-time.png) {{.TimeMarkdown}} -![cpu-to-k8s]({{.CPUChart}}) +![cpu-to-k8s](/images/benchmarks/timeToK8s/{{.Version}}-cpu.png) {{.CPUMarkdown}} ` @@ -44,9 +45,7 @@ weight: -{{.Weight}} type Data struct { Version string Weight string - TimeChart string TimeMarkdown string - CPUChart string CPUMarkdown string } @@ -59,8 +58,13 @@ func main() { flag.Parse() - t := time.Now() - data.Weight = fmt.Sprintf("%d%d%d", t.Year(), t.Month(), t.Day()) + data.Weight = time.Now().Format("20060102") + + version, err := exec.Command("minikube", "version", "--short").Output() + if err != nil { + log.Fatalf("failed to get minikube version: %v", err) + } + data.Version = strings.Split(string(version), "\n")[0] // map of the apps (minikube, kind, k3d) and their runs apps := make(map[string]runs) @@ -89,7 +93,6 @@ func main() { // generate page and save tmpl, err := template.New("msg").Parse(page) - if err != nil { log.Fatal(err) } @@ -98,11 +101,9 @@ func main() { if err != nil { log.Fatalf("fail to create file under path %s, with err %s", *pagePath, err) } + defer f.Close() if err = tmpl.Execute(f, data); err != nil { log.Fatalf("fail to populate the page with err %s", err) } - - f.Close() - } From ab4deec35dbdc28d4fc2d8b21de92652fdb3eb8f Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Thu, 23 Jun 2022 13:25:56 -0700 Subject: [PATCH 205/545] undo defer --- hack/benchmark/time-to-k8s/page.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hack/benchmark/time-to-k8s/page.go b/hack/benchmark/time-to-k8s/page.go index 14bc5b2825..30cc8c2e6a 100644 --- a/hack/benchmark/time-to-k8s/page.go +++ b/hack/benchmark/time-to-k8s/page.go @@ -101,9 +101,10 @@ func main() { if err != nil { log.Fatalf("fail to create file under path %s, with err %s", *pagePath, err) } - defer f.Close() if err = tmpl.Execute(f, data); err != nil { log.Fatalf("fail to populate the page with err %s", err) } + + f.Close() } From 5e787dbbe96591a216687f00e503c5850d01aed9 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Thu, 23 Jun 2022 21:23:39 +0000 Subject: [PATCH 206/545] add time-to-k8s benchmark for v1.26.0 --- .../en/docs/benchmarks/timeToK8s/v1.26.0.md | 27 ++++++++++++++++++ .../benchmarks/timeToK8s/v1.26.0-cpu.png | Bin 0 -> 28413 bytes .../benchmarks/timeToK8s/v1.26.0-time.png | Bin 0 -> 35686 bytes 3 files changed, 27 insertions(+) create mode 100644 site/content/en/docs/benchmarks/timeToK8s/v1.26.0.md create mode 100644 site/static/images/benchmarks/timeToK8s/v1.26.0-cpu.png create mode 100644 site/static/images/benchmarks/timeToK8s/v1.26.0-time.png diff --git a/site/content/en/docs/benchmarks/timeToK8s/v1.26.0.md b/site/content/en/docs/benchmarks/timeToK8s/v1.26.0.md new file mode 100644 index 0000000000..7b3ae23aec --- /dev/null +++ b/site/content/en/docs/benchmarks/timeToK8s/v1.26.0.md @@ -0,0 +1,27 @@ +--- +title: "v1.26.0 Benchmark" +linkTitle: "v1.26.0 Benchmark" +weight: -20220623 +--- + +![time-to-k8s](/images/benchmarks/timeToK8s/v1.26.0-time.png) + +| | minikube version: v1.26.0 | kind v0.14.0 go1.18.2 linux/amd64 | k3d version v5.4.3 | +|----------------------|---------------------------|-----------------------------------|--------------------| +| Command Exec | 28.995 | 20.453 | 14.197 | +| API Server Answering | 0.063 | 0.110 | 0.127 | +| Kubernetes SVC | 0.057 | 0.058 | 0.063 | +| DNS SVC | 0.056 | 0.056 | 0.059 | +| App Running | 15.366 | 23.281 | 19.118 | +| DNS Answering | 3.668 | 3.120 | 3.037 | +| Total | 48.204 | 47.077 | 36.601 | + + + +![cpu-to-k8s](/images/benchmarks/timeToK8s/v1.26.0-cpu.png) + +| | minikube version: v1.26.0 | kind v0.14.0 go1.18.2 linux/amd64 | k3d version v5.4.3 | +|--------------------|---------------------------|-----------------------------------|--------------------| +| CPU Utilization(%) | 38.520 | 44.242 | 49.704 | +| CPU Time(seconds) | 18.083 | 20.764 | 18.224 | + diff --git a/site/static/images/benchmarks/timeToK8s/v1.26.0-cpu.png b/site/static/images/benchmarks/timeToK8s/v1.26.0-cpu.png new file mode 100644 index 0000000000000000000000000000000000000000..487fc5582fd07c49d058e9a2f9921ba217ac3463 GIT binary patch literal 28413 zcmeFZXH=Ejwk5jE7*JFc5fBjt6amQs0*V5nARq@11J*{PAp*wZ3o8F~{h=k3Qzhn>QrMcOBhDAP~r< zu3ouCAZ)?^-9jMSj6Z05gIWj#)2~ujE-Bc(9__GIr&KByS$%UgKr`Tkj9|Qi+?9{_ z&93fuEM$}8ar=J2aZj-Fy)BNHC@H@lPK{!Dd5e-FX6H5k&Ta4WXIxw&210Bjx9vZ4 zuV7$#JyXcBe>9|}p)lC8pZ0EO>}h-*fp7n6Bl$zup#J{;@87?hwQb+~{PMB(JZqyL zp}cBY#s+J*;_5d#1e}*Mo%l?hvawD94>hvgleziB=sCeBVzhjQs$Q&3O{+crHt zZ8P4!6uGfF(2$@MJ{P->UPQgnVJ<@0Q83|)Yvp_SIK@Qe2gCL6t2;Q)ovW#+81WWe z9}KnGsFTT`|Gd2N+(L5k<&QLkG@YyA?j2dX1Yx)>`?#n=Yzgd-yn94<-Y$At(%>kqx;@$vC5JUmW%hlPb@8@Kp{ zhs#7PFE1ZGa>S>EmzOt;-;5pa-@e6ZVO-^ZGj;nOSu6ViZ^dk(9x~U z%~|>6=dXnF8s#l(?ApEi)X9^zwYB=8RoJ!8LPsYjr;&R~DVk%$fmWw2oLN~}6V~pX zG!k)I{5W@gpep<=%P?Y~&p=+jF2kUXU9(`ZEL$_%G`z5IEr@S*rod%Qkdret-O$p~ za%OgR^)I?0HZ?xO`uHlt?@iZl+|U&{e}`Lr(`Lgmzf;?{Z}05v+`M^nrG$}@5x%JL z>5hHJ+EcWM6+s-f_qOb%7g-(r$vCa7th_i7={k<@9l3Yw)-APc)7uIPtL@8ctE<68 z^=;d>@td^9BqXdfB*nUHtStlwA1U&rqgE*SZE@PoVd~enmj{^zi_BbHie9|9Ix^RN;s#ZypoNF2>Svw14)DY@ePVQ*(>H zA}%h}8DYc2%WH3ECmqK3qoE;_@i)G`O@M~3z0+4d)u<_%ibK;WZC%!dJ%(T~PsKCm zUXhW0y@YryDch_)hm)Io#(LJ3G6{_z4CEId%2b zTr;b+W$PU~c5qQ1=i{?MI3W;YS%xb^xL4-KcJJC{VQb65!gAhWHa;_xcSxuA+iwfk zjWt`W`2ih#*7m)$gF{0Cj`O3B=zTVNv857Tv_nHf2D-Y3j~=}ySO0W3m6NmcWihe# zjt)x;3om+6QzIkC^;P>@V~C;e-t?lD{nAQGO*mWrojxyKkV#6G=u`y$cr75Wp`jrs zH-&TJG$vrt_ku{=!0E@wBqSu{swbzUq@<_MjJBj>BS!}YnwIyN=eF}2HF_KqCT)cC z$~@iFrk2k2A~rTQ8h%r!rD+{~{dk09rco1~q7!G!$H(WJJC%{4q2CQ@et!Oa`}WDo zR=>IYoayAro0N02Lv@_@zgHr9*H@Pe4Gk?UEF2fcJF-l|-o1O5le73_=fTjhu%%8` zK|xhnS#NtoZEZ?Ax*uxCMMYg36IFC{bjHWWckHE&VmZUitoP-~&OTZ}A))N0y0izq z5_n7dnSK>DwSj?wlCNJq=tW(IYTxxSPEJpAadRi6q%hyTSNx3p^0Pftlan9Q)75e< zP6>z;*XG;0KR?E!i|E%Jx3#t93N)JO|4~&{m9G2asF01ZxcD}4IYjj_KI7o9u(nsH zUw(}LM7Gka4CchIx z_3Q4``|9iK`+ooCHElnSe~cY#Y-qTxq?DqXS>E1$fr&|XcJL<_2GN`G@ndt&gWeb^ ze@aTqjLb}bKfluPm|lyj*8+?Z9*cO2({9US*~MWUAwBPO!16Zj9$-`H*enbjUlf~2yWs~%%rN@(8dc6Jp`}dx- z0%_Jw3`^$=3JRERygrZM+p*(0;^QXeAu1|yCe1f4tZ%AnXyt|#y(Cnsv|OW zU%q^anfZDsgB(%Sm z`T6*2d7SYD?d|H*?{Fs0p1$~u!GC*-Mt&BKP2brE=U=y^>(%i%cYoSsZ9O+UY)AhXHykW3cS5UYjrywS_S*8xvXUq0IclN5^ zygAvLX%s`Am6g>u!jJd`(h-d*35kwR*Q<_=i$nO;@gzk>T`aQx{rfkm8uObSlc__> zK^gaUbBi_*JaIzo)~&RHg4eMIsO~cZ)!Ze`dF%TbC444CgDQm0y9r$k+Io8KFJ7n< zUBWNug(xyo$0SXf@f4lOS`Apgg7 zRyZpzcjnBQ%g^_kI1{BUEYbo46|+q{Slnvs>WmBw@DW4ZMJCAeT>Si^=G_-vT-L*d zY=gHT1+$z!%@DMS#cjB=Fdxeo9NdiDirtRGPRZ53*v}Xf69eqJIPA2sE^HfwYaNvMl^<7ofR)1z$y9yL_?5fwE$Ke<3)1Ez(5IS^B#K{ghukY;6UAz3Q z^FH58XJKjS9~j7_lV#d*O-|wB#ZMpa7GEt}Ut94fu7rh#o?v8@>Q+v@x2?r5BI3q@ zeJ!;w139!r>?XVU%{nW?_){L|laY~~bC%kI@^kJEA-B^WCCrym(l02un1M+)A`xiU zalv$2;npp`Xcl1C&yRQbo9QYm2S-J9e|of~tjOBhI%&tfY!z34F9aUznKN6rZpD{W zWmh1jV+Fo@(N$!x)xNu~s;Y|jVY(d<7|2Ccd3EjHy?YgbZ28VBHaa?|x{8=@ybk6u zI51=aXjPWxa-`# zd#UIXemXonEFmEgBaGu~ zAMOnWIqIeezgMs7Q}34mrHiVtO_)a~*AzP1x7?3D?U4_CnW$so(O0Bnr}OS^%7iftQ5$|&ekh$ZfW^} zutK#0SHe=MW$6DbF=S}8rcZ)J0EKE&K?vfxE*wU+jfL!%) z6ar@KUs95=X?qT8$q^cw>QG)*9-ev}*Uz6nx3#skwB&{tFRAyXxdGgR9N}!b*4|xE z;o;#a<&A4^Z*R*s^OsgvRAgdgoGEh-G1E0QWe=**S+-i9A8T7y{LDAfRpgux+#eg; z-&f|36Y?P`=|}$VE`x!j4{2$n`mFuS1KHOv>hk&rT`za(Q=e8!Zeu&`?FD8`7_^Q| zAMy(bKnMvx`1N(4=qd#*t#sO6`XY{VGd%qK*?D=Pv?9-o!8>G;fJ>?l5w>i4F@|a; ze&q_zN@>n6O=@atkd407Cr_?~5!H6>+NFKrbc&zffy0N=o> z>vgiCbixi+sARNz^*}7f>Lt$H#bLX8_3EU_Nda%_+usNAUI&j$Lv0in=7-|n7m~6y_)XdDW$)&}u76K-7!wvX>O1iG+yLYFkb?YBs>0%B%crZl* z#jKi<*VWZuw}-X3gfz}!e~AE&2m_#J8!M~I^73Eg)P8<`CeOAbRK>-=&8Nuwk$s`+ zMLB%(+qCip$NlANhhpobdj=LHaR^`}KM%g$|kc zJz3GUE6;WUE{L+T-%wP{`ax7_OYEwzSGal8C)Xh|H1t|>omBz3bS6+{4;>#;SZiJc z0v1QRw6qji3WSHVLxQd)+u6av0edEWN-HOsrDPKY2${_6=Ftl*B}k_Nl3<5JBrRL)ykO6{N$iq0!MOFFXgJGbgcS%j3rE z^TPJiSFT>w2Lk0cZD--&s4g!*vGyP^F!0f%N5}%EGsCJvU6p%JY{`X4p{T4}TE8^j zAv7KQI+@Rmc%YPSc_AqPSwi(pg4S(kB?86#7fvgLP9FDzcn^yX%St*_)Kmo zDKWeHTlqYCbm_*88#_cVS=>FM^q8=TY&|m4Ww{JMyt7k;iz}_DD5AJWTSv#<(a}F) zkVl4}hsUSqQ__M4(WNjeYu<<9^6J_ey|4o%1qGCc!SV4<6rskaKPoGe)pIRCGrGI) zaD9Ab+|<-Wblq?f6Z^vK_$%0G6qrWHasF(`VHROwXQTjZ5Rlc=r%zp6T!8nOAJc{` z(_gRyYr6Q?QTdnnsxMD>XPdMsf~aBB4eDaaY4{);SWOlTjgWGP5a@YKj5c@-R2&Zv z4`Ty^on&MzXU?b=I`C>OfqDZqTD9jq03QG;MJ{CA!Yi1@AybFNDR32>vEjceCABtN zCkqV(%Lm;7I0{tfgm6H?w?&s{_FDJ$(2KM;HrfEKBV54GP=@9wC-t4XY4;A`Xd^Q; z)zmCjyRN4LHY1IqNPE)oCu`&@%E)+TJE1Cj(FqNYjLgi;XaQT;P2QQ-v77EIL+QZ# zmlg!Ya3X<=APDh0B+}GZcF-cI2ER1kp4&S%MtAVwK^mItx_6H^X(*;>(n0oEU9#kg z*THH6MBzn%hJ_twYp~cjxH$f5s;Zg=c5=$fSGSk@_QlLgd}NE~|D25Bg(^ItuJ(Ku+*beKn;$%uGy*3JMu2 z8`Yv4uV25Gme>sLKDCxUH#_^v*H`7^olENK?Lcc%{Z(&R48MC&ySceRQ6rrds7@2Y zetphhZ6Nrzqs^D{RP2ccC@v&M559c=elLnGKFN-F$Nex{9@f7-*D{2SZfP@scp*xx ze5^ENvKtl_(>Ot`0{3yIp>Ey1dl#8ZE5xD4k@;(W72%`5k55f7=Y2>Gi%0?3r76@Y zv#uh9LpbOCX8;qCk&#f}0s;=@mOSyGzW2h-ja@b4s;a7>fWT4;aoy0=bRHTbpNVRi znYNjkmb^UBRU-}s@+(*mh#%-K^^qenv9Y>3I*8p!A=|3b()i?Lui~DVckc>a)>=zT zSr`~DX=tngJOH}`pa2%*Y~Y08|6`}2s-aLE;WbnMZos2$tglQUvjA=*aX_nTML5;e zoD&vagSZ4GXrMZB0?4X&2Qr@a!vUZwASZQo^-|fNSYG|m!~6H|KX@=9Daq5_otv8* z>KHdCXOA!~a!L?~R)1fgvZ^ZLR`&II&XXtm0K|Yja7>aIqu#wE@dngWJlMOKnDyn6 z6r}zX0K0G`;H8nLo-4gi=a0=(z*w`2c1^8Mj z0gvY&64CD)$jDI5_Z&HQTttK8=pOXye8k)%;HgFYil0rjniC3SsC6; zWBuZlD}6O@E?1tzN{ZcsPKDm<>!kee>w8yU|LVFL zgoPbJ6$rI)aI=EK!m^DmsH2&gnK=CTQj|Fy4zS)F^PVpd-B1;gB^XYf`d08ZBBB$q zAENcHva+(dSsAGbF+D%tu>zWAV`GEj4{a2Z3S{DZeEq9e3Mra}x<5j1YiizTeGBO? zE{+P@2dxt972%4HDJZxA*u)-`@b>N7goH33pPQNSbYo17+qme|#E&LPcnBs1{vWTd6}E$pJW*mQ~N$S2W0EU>l@ z$AhU~;(B^|G4zXO)7u^|m7eulT3W)1DDkE@6F$v)k?OO?9m0lB@$-Gi<4YiiIMB%d z=w9sFxpS$}bMqkW`uaMwd}KK6mv*pHNkdbUkbnTff?mKPCcTk))8a|1N1M=58F5fh>Jt&o-9<= z(%OJf2vrpjBQql-L*=rB1n?%mh`?#nxKDUR!erNdgb9)cL_FiTN~Ac@q073GKo`G} zZd)DLqWBE-^>gy_P}72nd#p75i8pn1V>2_Yfjq;EN^G8D+qAT_=;bOn+Ts=y&pa#be8>S>-+U9`puiq*$OST z&!u0>DB3RVK+DM|L8o%pITJyb)$=Odzyv>vi|^OQNP*RU`}XZ1lQh}x-85XGFKo@u@bLFU{n7&G+3Dl6CK|U%|&hkR29=8{Ah3{JgxkZ{POS8UZQ8DX1O$(qj%`1~H>1+tv&L zYwZ&Ds9{G8a=Fay+lMCdKB}`XEX@oceLD%?gun*jBT4B-pZWRQ8}91DC#<=Q$^(Of zBqb%eEBqT88-Wc_iR35)(7oBqCnU6j-6=0CW8hU#Qi3GoyRGR3Xx5V_ThoeYS^z&K zhoSnRkaZUty=F`7SEz6KWacPaMeS`{)Dx{TW~O;0!`CCay2D%3I($OT6g9(24Q&l`}Lv z(~^U(8ybOMzkf%rnO?JNYG_zn?DdBHL)=(*w6^9Im$RMd#QGt_v5U*$Q$~>SB845% zV`8DFr%$^{eDkJf`gaAQQOD3w6%g2FtX16o@F`~I4Rju3rqQH99@NM&e^ek2aOUax z0}?K~R*~_&dk3hgrMB;+rlHBt%|)-n@@KR-Fagp-OaTNhWGJnN*QKR17Q3OgQ;GxB znnJzBp`)XH#dvmg!eY7OR-AkunT`22GvGsAUER7^nTpcV;}z4~jK<{^ z6$6zamcPpnSv-}{)O0}u1{wmETM>qj(tces*UfetK8Xe>5_mxl*h_f_e;U_X$GnyRb4)vcx$7MQOycIDg3YN80< z@H!hNTW19j-Xe}10#XZA0d*JA3&4hD@$vUJ>Tm_qeH$8j6r%F9)nLsV>?h!rvGajo z?(Wf1fYRm09lVb7#>gkoUEQMbtr4QwZKE)>LuhCmNljQuZ@)No_NK32Nf;9c0$PBl zmzVCBQ;%Z}pu=@qwl%Qc{*!5KpDhHX&DD90ep$E$%@Pdiug8x?ZH1K}Fd{%hLqh?9 z0Sc|@fpUz&LlK%zPf_?a)zxVa9H?z>K0@Lv;wX>z?=!YMz>6SFm=sE+J$(2Hpc%Q4 ze9xZk2+`WA+HW8uL!RqUZ(Xx(JAsfWQI`S5 z-9y@t5F^NLSQ1cC%Ll7q70=ZB8S9igYzR#u2y+sW=r>_JG0*Z9t`u$Z5J zJ#QPsQVzz>#Ka^b;sVhO=n@CE+xfPX)O$eJ_wQfEuya)o?p{uM0Y)~_mOW7(z>1Q( zXV};`Dh944&{y!5@{~FzCdhyzAbIl@DeAdgXU>#^|JT*|8>ePvL3up& zI7bwl)K6+oOqjK#=_IM?=;<*7uhY}ZMxbAbm>L`z$(GmC)a*ntZgYAM7>WW3if|dh zYhUs^<9${Z--QdWw}wLc-k7f7fF4;e^gKEqO>UCFfvA`Gb8sIB#b9M<0cIv@bO*I2kgP&P>M(4Gs-HViky-o1NK{McDo;vvIUR3s!P zAEuxv#s5JDUztzBZ=(nm7Z;h7x*t`@Ern0UEeIFI^$u>S}9WvG7B-&CL}^-#y_ug2RF&r9D`NF2o3kxTxz5 zhgWCMp2cUGb``O4a7+vi21i6_0^4hA*TdKV_K$Wry0TDh1<#*9C-gq zAwj|N($Wn3vk)A>lHwrQPkcvp7Xt7CsQvu;l8TA|A79{}5ja*prlp~|2G)XhZEkK0 za#d|@T2@w|zzJXguCGFXWgui&ysD}jXfH&^gZ!qQyNcM~wsmW1j8ZRiWt?66Pm#cO}kln2@3w7&x^{DMUqyUi;L4R9D0G(&g^%4v=10 zSSUJQ2b{WELhlOa430pS3-6gT!;MK$p~jYfEsH9xj2XmLf)UAv3yRmF;XjEYf`wd~ zcf;v|Cj;okAe4`ja|sGvag#101vM0{`fb~{`z5m?mxDsmyDYwu-|N`~9d7Tj3(fsk zE=2+xCBmD7*vdBRIwoLoa)|YU?YKI^RHhDM+hWgi`bAUa6<7!$&ow2fmE@=1l8;r4 zYHG@U{sDx=gHwtcyZF%YC zb@fz`H;j^ADESLevyxbmfF9(l`bu+h&VzPMPEO)= z;C!0wcxOFOMTZUs90Hl(fPX{0~pg|})SYL3VZ!`}<;`FLsmu2r3m-Ce%FT3_Gy!Pbg?9Xrl5@o{pI&vPo z9T^t29e@4m6{Sk{U9>CU4M25u(t+@f+WDop*xq&8J_*W@q~w76$iU?~tC9Eqq6xxd zuXd7?1E4cp4v_SsJ}lIpj%E!XR2({w6YiI0fsfAam!A3uIT&qU@rD&my$ z&5#-p?fT?tn4NuLnrq&KsO`feJI71Cta{#IPosXe4zYYX`y{pOk7%# z&z^mULV;`#%@Ilz587i$Vrt6DKKEez!Wja+7$_WgQTg@0p58+0cHsCxkJAR0Twz}I zvJT<+H&_$MGHAvwqRHbM=8dK>(uRhzGSrVE;6{rQMMN|42MI;6IYcAD&mE6I9z5q= zR)1c5xX&9QQe-=!iK5eA6^?JV>#qa`rA8z{oP7P776ukbUU4xoFf`s)Q6cqY@gaB@ zrl27GP!S+z_-D{K#u0&E3ds^ehwKeGczT`}GmPXx%0aHm!a-M3vPFT0R))PqdPj7Y z{rFMnx>1yoF^k3p3SY7oQBy&I2hdJ;$YXJF5zqrh#?z-ybNb)hv32X7V;6!|$UG)C zcY-0Iwz*Dp3hRdZCqHJrNFa=g2Yx<5%mfWQ!lez;;)(2(n0QuYT^=F>1TzR#K)xBN zsp$Kg+uAZ4#Q-w4|E(&;-3SMOP#PIIK?-fSaezI_VqB4PkdPrU0-2$aR$%)QDk9N& zC9C%bFsQY@{@{n(2_lM7jB}u_5JcEiGX|kS;Mef4@0WPJV;P17^B8bP)MXV}5h2qC zZLd?sgIEb`;Cb2`NLlE80i_`?l{q>~tEz@VH-g|Gq=P;)4GoPqt$+_kmUzI4z&&yk0T!ee&rMo)~H8pD1xlNE- zpQs!hLy$u~?#wpRQdT}f{fZlQQ@~L=A(CUSrMY?Q_U+KInV6Yj^m`Q;h+aY9l^zHx zdyewxm-;Z^$hH*Nb6Zv{;X_dSkoPx>mR48mc|l@k09FKo(6Y}G`jeXrw~9m=v{qCY zfgx5l?C#{bdb-wgCb?6r`?tuCOXW0fN=^qQ)L3i(I>Q!-||8Cb%6q5 z0K~BelR^K(>Z1w$Tbu~Hsb3ISJB~5;4!E@IZcxH`MJ1Ay0MiNDwg&z zH8?)BOsccW=k9;svuV>KXiYalc?>{Ipff^d!@DEOzyvLAY@oE9Okbyf005G6!C_Y4 z+1Xi4>@U1gNKJfEQDSz@QnpQ zoS_r68iX@~Stb<8vc9=FJ}yp@iP>0R|Bf4kJJ1o^kDo!y!(bQ+4OJD=5xhl2k2-ys z$^PPINmwi3B9bRriYjT>cx^_TAM}3rL?&incmuA1x&%Dyoy3iFrwN4`z`%8?4eE(+ zOtVWWAQ|M|=C(GH7l!dG>Mg{ckWo^n5$!jeeEcn+l3PGfkY4ADQSoE~3XJsY^QqSM zXc*xXaNDyYjt~{-^8khd$k7=riEdE>a8L&L5R;N3fs3*BmikzTAF`U!$1evko;ZQb z0ViKBl3kkI?b~yZXr)77kSc0;D+04XaaWfpXv4^3aEj4UV-AiKB;d|_bnm;qeR~J# zp`?VFi^~Fg0e5u`tR4n0Z5eF$@As8udMOK$zaC;l>9%0d6P$2oW8a?$Js6&LY~P+G zN{CNyZf+)n|E1vqNl8aH#IFRsyX=o2f$KnOxz3#%w9BO38;216k@6gzHl#1~+_`gh zD92zUDb5!~8c`@fCLQeUIV+x9Z`*pDKv1+aH&=$14NR|;tS%KOGk6@0VA6tZsG&!0bi7XlNYhUxYhuRsvhtqf*ZC0?aEX8%bok#TMTUQ^eNb*vX; zU%1)@&?{{Lb3#L)l9H8$WwHF_iL#{bf=3cpuf}I&cnamgjRW0d4Cd4-PhG8t#XT9h zqzaCcfMhT`KhLzL*tdNVy$PQZ2Ts9k>p0I!-=Tz&uFK`;EWk_x(Vl!j(y zdD+Im`^b0bzaQ%n9y8O^_$f@Cq>c-SFlr0zW#mWBb)z67{bKPRSX$=W&%~lJVMbib za+n(yU0=K`FVB79Li-Enkep8N)$H5MmI$wmmZqi!ATTRS%Y#%@ zaI%EK1d;pJ&9)2M3Dg5OxUaz*bkZ!jMPHspFA8x{U_BD};e#RA1rj9G6+pXK>5yqy z;8Ab^_0g%OyI^-yR+c15fMkY4&qKn144ssiDB*DgA7=~AAHj?sCgP+JYH_Rq&K5v4 zYzfz;q^52hJ_n-x@#8tTMUj!vVLipfqzQ|{yLS*nSwuwEvGyoeXq|#&z+wOqaDHI{ zl7tW@9{^)qmVO5z`9Ql$oBxoTyM%%POKm_vz}x6(bepge;LH6zJ*mbmTt(gzNRaTe zvlg||{q^nUCPGxjgWUGLdkqahxf7+{5$(Fbi=je{p(Am@)5F8c$_lh{v|B%h!=>v+ zdv=}m>iy+`ZLxH+?Cuj^cWt~Y*$JsyMsPiSnb)8@eID)tYYU5e5f~)~vSu>DbWxK#LmO7ZHsu1JZ)ZztJ47VnQ;bBb{M?+tfXxamWGSR8&H!Ws6xE z8G8{qz_YHaQzb#-$zF`b>1agd#jghj9`0li0VpltK9|{uP5@-se)4;eDZmeq4(W39 zCr94w-h*_G0h+S{0wKjcP-ozb&*o0Q7lyE$>Gc-PDvBh*20RQXJ$?~q7z#7&HhrxA z5fSh;1&4%4jTcS`qA=lC86SJ)e}PgDgVN^erPwY9E0u)}x z_0Od6FYx~1zk>eW-ut-IO6uz~fW2~Zl*PrL!eC-x4=p;#GYbPfREH0nS~gSUMn*=* zgY=R_WA>89gU5gJz_8Mx%MYhAn0+Mg?|mV1Wi>UE{@);}Va-u3njAXR-J;>==s?eR zx*6XAfkHr_rLl27U3FSTnWr7m5#_$Pyu24JS%AW`GUdjyva(;fB0o%}!2@WQWO_;Q1AXvct;LU_%L4SF62qgfVNW09|(QyUv z5HuA|4_^U6$4dv20Q@wg!xTPtqteE=bJv3TM#4_#>c%8^z1?T#w}?G3@2kR$s&IyC?F{* zU7yQ|d;V;x(@tHsHE2EGzJA56b3BUkzkQ@uMPYh=X8*w|^bnKNy1y9#G#dHFDQCT3mBWr^ej;^KnHj9CjU@GBe|Bx%@p0dAoZ zFjWwdu4CfjW|Eyb?|prN%tbF~^+NkJ%m6qH92^|je-L2iHvRe#I2FN<< z?EGiXdc+PPzCV5Xgt37vtv2LOZZ0nP)UWG`Bqk^GadG`JKMxR7DYF8p&E3=Uls8W1 z*yt#-GW@mdXV20CGQncS6ltungwsfBFDjeiJUVDQ;K3F9idJq;y?U4Op=G5Vtc?LU0@yQ8Iw z(nY`s!lIZuyY1({w&Br846O|h1>B244(pyTPXPqM8vFYDk^MS->X|S=wQ0+CsEj`9 z-xw-NAdH|<4C(V;)ebyaQe0asOL<$H8tMYr7IM!?v8fZR8YtFWYOt|lc4*1X*RFo~ zgbb(*;L~0@LHOjs0>QnmO5qHfn2aInu~kVb=@OV-nN8$GE8lf_C=Tz$Ip;cRDg;{v zfYVtF7O=1kf{&qu8*HdMpZb%Goq(`g;RD5>TxF!FD2zJ_3a?Tg;;iN6IiT4vbYZyk z%QOxGYNjK$0Tw}s*)n3=bK`qqm#gvu^8|_k8VAlpk5C%@UZmui4|k86ljoEbQU z1v|4i9+K!bK?_EuJOE3)0eE(MmI+Nuj@8hu*o!!>0DK^Izji=~Skn&oXOh8yMHr3} z%%o*LcdpDj z%G$4d&-bJHW8Y_RAHaBE+U5j|Q=ym2wb2ABbBom z4cy6708_c@rcf);PVn}wMr)2qCKPr7G+9V_2A*+y8hvPr-^X+r!;Xr=Ri(y_lsT6So@39ub zKv!2}3+TQJQVM1@pe#bjLx0~tL6J0Ag$Fr!-~du^U4jxvYyq?&^j=z!g(_az12u!7 zm0bexLM|rFlBA2KZd}%fWl>{!yGBxUG-T4d;P!u{?@uR?2O-P=0VczlijkJ`^0drM zX!n@E83#Ys)$K>fp~(SzFkCO!H@iK3`t9MSEq?y~?rv_dC(q8#rlqHoi~!X;wT+Dv zu@CtQDnyqx5b}ATZqP_5OE4Qj{zi)gwE}iBh!ii~+;C7JqHHV;M8W|H?Gm93Cf{p* zo|JC9y}_tz>g#bPOS)`+uU?I|Wpm_y3(xjI zmmE@@lrZe>F#Y`wd(W~g^P}xU)$5%{uiwQ1_(bejU$N&jGZah}^B{Gy2#ueQ9LFDv z*#{?>PM&HEd9w{NHG!}`c33cjbM9x;MXDqC&yRaIqh<8}`i~pTiQC}n^hbwj8lzVY z<>hYC@o?_pNT;Q7fqWscYS=oCWG_5WeJqQo^tiK$Jf&uN=nij~m zHoQkh=+44}g;Rt9-$fgPHAD1WFzAL6HxLn=lq+?!P5i)ageaMC^KDoEHWe1Ak&Jp+ zLs%kjQSzehz+(U?KCgxGwhh$EB$3IPnS3M)41*LEnc&w6N!DdYq5vo`#pOpD3nO{4 zn6*fLg^BM#(N^Ncq<2)6MK=T{A4so3YpYc$*h>w72EtD&WFx+YoN<=V}({J+;EWfp_ZDzc-KLH&8 zBs}f=*RGYL(uPd?i!3T{!2~5KVFpM7juH~5GapAieewjOsem3~p`kc%Mo=Slba-KK zM6D&cMFIlw3W=(j*m;zC)T39?@qAiqXd{4!mnvKY`Ukili`halU3E9@)VPD=0k)Eo zlmsAx>|KOhAub2PUjVZk7$^MvQl=A_BT50T?sZWmqS@ep424fYO-A=X>B^NDZm+%g zxG3_?T`R91$Lu!#yLHx;s&s0uhoeF$RZLHQo5rcB8;J<>C`-iI@x{)7CO*-!5942V znPj}%|B%!M+T;F)bY@0KJ^26nzjShvI`5Nnc=}OH_B31hB)bO!v9W=cj!n87vcZGAK?>b zC$2=DPBt5jy^(k`T8Bd1!0O&pe8z?a*~KpU(C7~|2}r?rce%euB;`ku=p{jU$Dh>u zUw`~>TnWiVHU92&WNK1IvR748L#KaDMvatvx$?Gnj3ttb^?pxyH5bF!t+{ z?RJtklkiE9?Bf3?e|+i6+mu){J3x1%air>l=iwNZnW_&6p@*In57&3T_E7r4`5;^| z+~>Fsd!s=np7`TFk_=CHX#I!J|JNV?v6UbVJBrXeF9ui8jzC`%4$S{9G(f*#O$)bI z)zE-hV&lL2oA>eYB*JD7VZa_B*R1sf)_$?-&Yu4a4E3Lb#Qx9wlpD`C*N|G;MW?XX zgbj+jMFZ%alKg@X9&n~VjU6KOgy6`eH>1JdUkvKrcM$>*NIf)Q%ERlC=nI<~7%Uw& zA%UvF0~^eQpFA>h3U+oR$EAHX^U0H|y?+4L;F%4*JwBkP{{H?Lv(RDy^Q+Dx-3}DB zd&>6F+~Cjq7{e-{#=LibzwYkc?yd!Y5TwRmq6BeCNkF>@+uhV#*Z%!?c0^&A3wLRR zn)Ra1xBi)l1TL)D)(KZ?Wg)WL*knO*KyNfBXAwY`C^v(@CJ54RTzLVG1j>(&0Q!E7 zjg4Rl3v+X85++*~H=6Tja^i=dPW5&@+N9v~Ra@@CsQ~pYhYE*zRoVaYt7wS0dUNN5 zylK07n$l_OGM39pJo2WBy41Q<0YdtLs)hzkraf-PX{GEe32u8TCjy@9g?>L(LEZnn zt9m7cdjO&*-Aw1q)NAem)WyT!H}RnL1?UJ*>Up?|g@uK|(a@d(0n4tL#N$d=FH#1p zCb=wh*v@eXU$_8ntc1&jdY@jxU&_>*c@c)J@@UL9*Tb^_Y4AJUA!I9R>MpV=48Eat z_y9UCMRam9Zo(OB(Tkj$no4aa!#YVboNO%xoYpqTV_T`m6pT_T}j*eVY?XVr{hiRRT_Vyy!ln8$?9vv(Lr1CN(;vaoPalMsD`7-= z`0!DU1NhpS7;4d7jA*0i-+*ZZcDBwJmw{K$rD(Zsv+2$QjxGZEUJe1o24yksDk}W9 zFWY_->S+;J5qc=zBFm-bp6FR^%tUTvd~L?_R{m-tSlHOOtj#qESr5;W7CQRRCv)@~ zJv3Dnh3@Fddkp_DoqI2dpgA}?=5Hus>i?h5|L*<8uIDM$`g}GK3XKWr>W~s|DzQ;$ zh`+wRJbVyTJ&a4B1Z{XM7k0fjTipyxuv^UimvUTbZYcBqGK>i8odd2pGx^;nn=&^6*>!z(FJ^^Zrow9vnpvP(X&!C8nntIu8o;_ z3Z22;;VDM~g0Cy3piU0M@dm4~Gct zVUic+ydLT$=0W~heXgSIrSUEozeqhM6el0u%6Qcjq12i#Yv`(`C$TJP?*1e!t^HPBDjH8Mptw2~Tcb z&G-;Mwjw)DARG^WMyS>22|R`d&_zar#Y4?V#))-9d#K_S&fwJSpm&-qS{YBT`IDle z86IM+3_MOdBN2JwIlW6T(muBTEa#u2s81HPfy?gDDyZ^wN1yGO%VG~!b{;AAXUU(l zNd9Ndo>0I9j2Yck^hJ-_Dv%a=c7?ck1nomWz_)wwPop@Gi04?v{#4}VhIgLHRbA&z2F|CDI5Wxgv1YD&W|vDrG9j9=AbE~5Ng4vt8k_va!mqX zLVVjpRug7cWMB6U|9GNsK@-W)Ed3>R4AcYppyZgNF?K}k1zJyN=gO{#0uo4=*^lQA z@EnzaBkQfVNN8jv#}jD((=#)y92~M&uac3I^L9{?a%ZFYR((Vq3}zCf0t>y-qRV+f zCgQ>pUsy226nRRZN_3qyiWj`RM%Dp z>Pe;M`7wv9A;)k%pOTidbwUW%pueVubz_CNf!VTO`R$6BO2R>$tHU^fV7Mt}SMVsj z1+mPcqFq0K%7vIVe7KF)M3OG)NM6275Z+jwvCVx04V6CSpjd`!$Fjey2)qWk?!yI( zWP|lY17R%`xhg#~(`3;ua~V2xxio~Zw|{>-1ql(N(S%L}I;%&yv`epZ6k4s+X-dG< z4rA0u=zgd#WDLm2xE$>%1@cK4uaP1~Z0-_r^YVZfG(#XmV{}DM7Xx9`KNP-}l(?d~ zp1nMX{EW`z>J$frsJ;e@izGMGxx0Toe=doM?ZC4te!;eJ1}v`#Wl-~M(*s0cmB9yWJE+n5qdhJ zi%G~J^+(zN(#$jrka#Nv#RJ+MqN%J*0Nvj30#S@3p_2hU5bkc5kvsqta9ki=7UnEC znYba0GJM4`!0lZuPmTy!XyXnM92ZzfMK)F~e~+r+;tgbOX!JJF+aPKaH`XR}*MH%- zYLZJn#1!6^En5N%a8z;X;L!ubk_{ns%Mlc_ieYxh0+31PIIIQ3y}f0PjYom?up7+M z!BO?n7)gP%`OK4#si{l-VP+z$lf~#Fp+?#*PWFhAVV)5eE;MO6qHm>({&v#(I8Yja zsfps^@@}6)@RQvfmyK_avWL=_y(h_T-zN$2|V z@)t=mtZfX#Lrmi$v0Pef$Bsco!h8U0b>_`+6UgG`X8L5usi>&doXI?Kjx!(poovZB z;a0WT6cmwIBeWoh3!RStWKBaPt)yYe-1pTeGBgjal7bw2kKPa7V+zwxdxGA@#^T}! z;h9Qq7~21VLcCjVT3KaeXJ@Y~sk#A)xlVrG0r?e4Dg7TrMZT$Td|c$-SF+!i4nIRw zz+YS)E~NK2kom^3Ndetw?3`K>gmT}2fQFp6I3?#8S$}u_P)(XwG}6y(1@-v{X0IK% z2uCz2<{FNYz5_A&PiZ}xyvf4c9LCJt2UA!G*eTy%NZw6K=4C8#GT+)lz*SSq*4-d`CsnGUahq#g#?+)g~{V-S*=fKGSW?T@9P+SA@3B}jQDH! zoe5Aex>0cd3%S>@;N7eFlF~V!g-TAJL$RbI{e!E|3E1aahKK)NL;uGghjw~WU@XaE zc2I7u0(bMlx8UxD-{s+y;dlt`9JOYa1DE+lH5jr9o&YHL%2P-%Z1~WCG(O8wS62s< zzuwRN$Sq9IjQ;Pw=uZv*AHV-U<;V4bB)Z|F@a@n@eRKs=`yHi$enZxV@I)!nrdOQz zZMf&G8@rP~$KsxMBineq3F%wMRa%QBt(%fV42|aI8)92uecOK#i<+M7a#+oE%I|%a zqENj5Bwxe#vmWkIc)!0<$p4}@_)l4e|LG5rG#T2odKd5x#dSFdK3-J5!*u%r-R^~I zl4==dXVo{R0eX-v-~B^sW2r8l2`I-X&qf+%Z}ESl84+zVdz${`4%)wJg82Kn-)7Ac z)<3SUuA+Yl;C=hH^-%4%zxP7AZg&($qfOd# z`2N|uobCU?-2OkE5B>vnWqrjjQYExfOmR==Ez{7J8?Mr1p?8)a$m6 zuP)6zr2viwS!@Th2NpFW&Y}+_E3(uFu?O0cp`KngtV7)7ptYaQZnA=o1)nqSBiPM= zX{Ijwfp9d_+c-3eoR(n5k5z91ZHL<)q^FejK1rCVIQtJ4K)aN1Q*PHi4 z`|;>RQoSRlyE6*Kd1X9bHpIrl0&%p`@h;mH*z4iWkW&v~v$==+Vx-$zTQ%_&wn3fi zY$%9K+JQz7aRmTw@Q#;OQdG>#$ypu01#19ILSaSVpri{43L5lqjg<#A_jlT^FHh<< z*AiVEsTVtHRNgEzFF{1#+d!`O%8Hph7F01ztKjDXTA>C^@2Vzo1+iT3j zSNuH0=J8wUd;x|l{QhS933u#mdS&cAK7FGVI=-6|YXU_AG)e>)P8JodLvjliu#Bbn zm5@>tih-D)kITqYT&S?G;$PcuBh zByWRZX13~b^L=m9ZoCW9JRpXvPl|EUXt!V|D8%ATt>bj@8IFglH{%EYSNK$_4ITh> z7G|G-AW(d^{N(6pG2#svTU$2d*mvTF93@RC1H(#nhMCI^Sm-@n@V4m8=9bR`MSZ;Y z%?&I?Cd3{WCg`lVzPb^YKgBqH1riyYsIT5&EEkOR2>XxH(wj^!%R|iL7CQ+{3J?kX z{Vm5-i^uH8btmM3hHW0hNmwkiCIGTCreWH%mvn;$hRxbxtNiJdq_~1%QJN}-hvR`a z;xH4ML?n{#R3a`9Cj@D^K+(n^E-%FM+<}Oh$w}PpA%}Yu@7%cq1sMV+)RMuzz6^Nr z;lp{S@T<2M13j*bJv-L;Fr0?#JFa0vNZaem3&w`KRgO81rb4nj;^H7B_0r#8URO63 zo;D0GfInF3tixRhr}_HVCTJA)upw^@=40B08W-;43hao8^})B^m@#$+lLP4~uf^6v zJ=~Csh1ks`9c+#}r9`3HJbXhM{>CVbpx`nhKsCqwE(SBJUkmvA`eGW;1B9gjLINha z-b#4l)`*n&cxAk~zkeMJDi}A9X_ruLSvjKnC^E7uTHL)83x^&B=~iU)1OR+oH&(iY zY)0+w-)bkh81*9TW8uNF>RPdRwwEpx>%Y4A;O!E272Yml3-_?OtzxqJ(AXHZJ}ELC zY8-rBtnLo8gKsML?Az!1>m{?5U5w`WiHW0oiDI~s3NQOXnlyxndt|&)O7tY$ zZ!FFJt328rvtPm=2A95F%MBq?)8lk&U^8I^fk1iFPs#UKvjAKaT=q^Ht zormOP(3X{i`)4qPgG*jVCMM{SesSj=T-LvTzf+&2prJ8>AqqpYxB`IW2-C=$g+f>! zOS&%R8)8bOVS5swwK8b^YK8l&7K+2`Hg zoRBx~^ZYK)?|XS7-2Tl!g(D^C*|>!x{aHY?jR_H)O&v^C25&^i*%&p%=IEH1Ok}E< z3YU~z<()Fnf5pS2%8*9cK{)slVmBH;__Pb9IN^K@Pf_ZIIh48X?+D3` z!Bm9&)^82nx7{_f`{F&0+Ak_+V`s8!S z&2MCX$^kzGXU?#&54DdzM!^HYnGsGDhDrxzk8s$w=_M=;WNz@HoX(Z6zg~lMnsgw@ zfNZ*Ee)Ge>{laI@)83Hw#3tLtx3aQEQO6)XnVgzZ*bR~T6ehc0Gqm;heFxPJ`G?f` z7+VqY2>X*P^7wY|_&P64@&qTp?^Uj%^+S|$gd(MFW8&b9t&~PKAroj}47B%IJW~>& zgJ=e^3=^Z$Sx2|Ug7sSd!!IDpp(PP`naGhCMF6ozRSC9RpTBVe&Z~p&O!;0M?(Gw} zaPd#8P&Be@s+%|khH)65W$JSF%&`B`f0gzBwZ!I@>+EKgkqll+R=jNY%8%$)s z2Z~fp;z@FMaInCygfiLn)K&M6ITaV$l2;u5N^7troKR{?Y{w!Ig=zUsZ-7g1hB}XL z5tZ_k1OR`93Y&``)4jXoB^Z>lQqSM)KZc+L-mx&giLGY{SzfXq*Hh&c4e!kpPQ3oNL#gRqE96H<@CsXHPwuVg~H0p zsrEh}NZwbm&sY^(&u2KdpdhK&O`$lLqX}!WaTei_!UFUr|?EONNw; zHr3Y)N*FHAz@5^Tb{Z$<)%Zu$#&QM0E+&(s=by$PLMkjgKfODk%YKtW7B>FC#oTJ( zSKo&&wE9vp&a@Fs4=n-!zuUzm~lrj=6y?y>km#oo} zxAxNf4f0b+`yrChXBOi2z^+s(LI6Mi0-&SWbhx5I5cBx;VV1xOYqi=U3EEA+`9u)| zyUC9}V@Mwvx#?J-$xM+SZqne|6@-I6FvMVQZ?vMc10p(XYUhxAhR82dH}kjVNd+--R;OBTF>%)_+^0lVe0W;UVHg7 zxbo;%9aDo&*IBa&2;kZpB2GUEIedkm-woEWj`soI`=1M{YMA zH#vx;n1LBNvxb_nt$RK?s9;2^n7Eo^e-lPFgi?6rpgdoNWI3?*^6J91HyD70*w9xX z&oa;S{5>$IztSJW7beg83OKaY&U5lK)DtYj<`bt>NP{tlz34IzNkU4sVMS8MZ%t6gTg+;xbs0o$bW7o-I}%U7(p<$EHi|5Qa~C8@!ldjZYC zr9}}qcVJvfT?QqF22RHoP8~pMGCf;wnQ2ap-O;1hmNQb9j3rs_X`e=i-$kMH^Vo}j zs8##0`X6Fj&UJTR84&Qk`;sB~yWTU-C1KfN+Ns*xvGcmmbOlBj=515QV;lR)y=N{= zHtcfXy_^MfiB(EaV(*CMLo`JSfk_j$GN0v5 znAuFHte;JR#q>w}q3P5PG^??#I$9xMiT=IfVvSeq=dZ;c>-a2*S`Bi2diC+fexdP7yGwLfZxq zEAj&FxqE&*0`x(vj2Fi<-nb7gTqu6P z+AwDLnvmluFumV6A;DEu?CHs+C9$Kwy|8!F*;Fhs4SmJ=(eh9N!U79px zM{s=RD3%3-P$;9?IadfLXO0KdhDEE=4$~H2%`6Y?$6ku3=iuB_Q}Ylsj`sm&NEKB} zuwG;9_w?LKZ^vbZvq}pN6M1>wd|0CyD;Vw4&>FxZ!PNkY77?Do37it~s`NB{74;f) z^9N4sygAgG$IHqD2L@tgow|=MZ*pP+%Po9*w{f&5uj1<==K2*`HSOmnl-HOL2!t4- z)+`I8L*b#`uaCnT5%D-U$zMTlkpm9Wir}n04{>wb^{^>WDmILG!GhX~RWDd{ckk6L zso%_0Mt#@!AV)*$7l2Y@^)&hkfI#c$k?xm&eXJ;< zF?!?10wAL-T_QFE)KRf>4#1OZ{*RYjb23+OI_>LTbvYc> SAZCyt+VF>%h-PW(C;tOcfttPm literal 0 HcmV?d00001 diff --git a/site/static/images/benchmarks/timeToK8s/v1.26.0-time.png b/site/static/images/benchmarks/timeToK8s/v1.26.0-time.png new file mode 100644 index 0000000000000000000000000000000000000000..55f9a1580852b1cbae2003041117819f6cc7fade GIT binary patch literal 35686 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 Date: Thu, 23 Jun 2022 14:31:18 -0700 Subject: [PATCH 207/545] fix checking for cri-dockerd on none tests --- hack/jenkins/linux_integration_tests_none.sh | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/hack/jenkins/linux_integration_tests_none.sh b/hack/jenkins/linux_integration_tests_none.sh index 4874847411..1637929b57 100755 --- a/hack/jenkins/linux_integration_tests_none.sh +++ b/hack/jenkins/linux_integration_tests_none.sh @@ -35,8 +35,13 @@ EXPECTED_DEFAULT_DRIVER="kvm2" SUDO_PREFIX="sudo -E " export KUBECONFIG="/root/.kube/config" +if ! kubeadm &>/dev/null; then + echo "WARNING: kubeadm is not installed. will try to install." + curl -LO "https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubeadm" + sudo install kubeadm /usr/local/bin/kubeadm +fi # "none" driver specific cleanup from previous runs. -sudo kubeadm reset -f || true +sudo kubeadm reset -f --cri-socket unix:///var/run/cri-dockerd.sock || true # kubeadm reset may not stop pods immediately docker rm -f $(docker ps -aq) >/dev/null 2>&1 || true @@ -53,7 +58,7 @@ sudo systemctl is-active --quiet kubelet \ # conntrack is required for Kubernetes 1.18 and higher for none driver if ! conntrack --version &>/dev/null; then - echo "WARNING: contrack is not installed. will try to install." + echo "WARNING: conntrack is not installed. will try to install." sudo apt-get update -qq sudo apt-get -qq -y install conntrack fi @@ -66,7 +71,7 @@ if ! which socat &>/dev/null; then fi # cri-dockerd is required for Kubernetes 1.24 and higher for none driver -if ! cri-dockerd &>/dev/null; then +if ! cri-dockerd --version &>/dev/null; then echo "WARNING: cri-dockerd is not installed. will try to install." CRI_DOCKER_VERSION="0737013d3c48992724283d151e8a2a767a1839e9" git clone -n https://github.com/Mirantis/cri-dockerd From 360cc86ce5cb1d3040a886a864c905b153dc0eca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=A2=93=E9=93=AD?= <83150084+NgZiming@users.noreply.github.com> Date: Fri, 24 Jun 2022 22:09:40 +0800 Subject: [PATCH 208/545] fix: panic when environment variables are empty MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit On mac OS, environment variables like: OLDPWD are usually empty. May trigger panics like: ```bash 😄 minikube v1.26.0 on Darwin 11.6.5 panic: runtime error: index out of range [1] with length 1 goroutine 1 [running]: k8s.io/minikube/cmd/minikube/cmd.displayEnviron({0xc000a69a40?, 0x1c, 0xb?}) /private/tmp/minikube-20220623-65769-c2xa25/cmd/minikube/cmd/start.go:445 +0x252 k8s.io/minikube/cmd/minikube/cmd.runStart(0x7316040?, {0x5d07e13?, 0x0?, 0x0?}) /private/tmp/minikube-20220623-65769-c2xa25/cmd/minikube/cmd/start.go:157 +0x245 github.com/spf13/cobra.(*Command).execute(0x7316040, {0x73736d8, 0x0, 0x0}) /Users/brew/Library/Caches/Homebrew/go_mod_cache/pkg/mod/github.com/spf13/cobra@v1.5.0/command.go:876 +0x67b github.com/spf13/cobra.(*Command).ExecuteC(0x7313fc0) /Users/brew/Library/Caches/Homebrew/go_mod_cache/pkg/mod/github.com/spf13/cobra@v1.5.0/command.go:990 +0x3b4 github.com/spf13/cobra.(*Command).Execute(...) /Users/brew/Library/Caches/Homebrew/go_mod_cache/pkg/mod/github.com/spf13/cobra@v1.5.0/command.go:918 k8s.io/minikube/cmd/minikube/cmd.Execute() /private/tmp/minikube-20220623-65769-c2xa25/cmd/minikube/cmd/root.go:170 +0xca5 main.main() /private/tmp/minikube-20220623-65769-c2xa25/cmd/minikube/main.go:88 +0x255 ``` --- cmd/minikube/cmd/start.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go index 96dd95bb84..3a9f6ca313 100644 --- a/cmd/minikube/cmd/start.go +++ b/cmd/minikube/cmd/start.go @@ -441,6 +441,9 @@ func displayVersion(version string) { func displayEnviron(env []string) { for _, kv := range env { bits := strings.SplitN(kv, "=", 2) + if len(bits) < 2 { + continue + } k := bits[0] v := bits[1] if strings.HasPrefix(k, "MINIKUBE_") || k == constants.KubeconfigEnvVar { From 29d717485f97dd14ef1547c005ca8a50015f97dc Mon Sep 17 00:00:00 2001 From: "Paul S. Schweigert" Date: Fri, 24 Jun 2022 13:25:06 -0400 Subject: [PATCH 209/545] update cri-o from v1.22.3 to v1.24.1 Signed-off-by: Paul S. Schweigert --- deploy/iso/minikube-iso/package/crio-bin/crio-bin.hash | 1 + deploy/iso/minikube-iso/package/crio-bin/crio-bin.mk | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/deploy/iso/minikube-iso/package/crio-bin/crio-bin.hash b/deploy/iso/minikube-iso/package/crio-bin/crio-bin.hash index 82c62806a8..86eadbfba1 100644 --- a/deploy/iso/minikube-iso/package/crio-bin/crio-bin.hash +++ b/deploy/iso/minikube-iso/package/crio-bin/crio-bin.hash @@ -26,3 +26,4 @@ sha256 bc53ea8977e252bd9812974c33ff654ee22076598e901464468c5c105a5ef773 v1.22.0. sha256 6e1c0e393cd16af907fabb24e4cc068e27c606c5f1071060d46efdcd29cb5c0d v1.22.1.tar.gz sha256 34097a0f535aa79cf990aaee5d3ff6226663587b188cbee11089f120e7f869e4 v1.22.2.tar.gz sha256 52836549cfa27a688659576be9266f4837357a6fa162b1d0a05fa8da62c724b3 v1.22.3.tar.gz +sha256 03579f33697d9f53722a241e6657b66c28cd4bf587f262319a1fc14eb96f5a32 v1.24.1.tar.gz diff --git a/deploy/iso/minikube-iso/package/crio-bin/crio-bin.mk b/deploy/iso/minikube-iso/package/crio-bin/crio-bin.mk index 7e6c3b8679..4bb1e240e7 100644 --- a/deploy/iso/minikube-iso/package/crio-bin/crio-bin.mk +++ b/deploy/iso/minikube-iso/package/crio-bin/crio-bin.mk @@ -4,8 +4,8 @@ # ################################################################################ -CRIO_BIN_VERSION = v1.22.3 -CRIO_BIN_COMMIT = d93b2dfb8d0f2ad0f8b9061d941e3b216baa5814 +CRIO_BIN_VERSION = v1.24.1 +CRIO_BIN_COMMIT = a3bbde8a77c323aa6a485da9a9046299155c6016 CRIO_BIN_SITE = https://github.com/cri-o/cri-o/archive CRIO_BIN_SOURCE = $(CRIO_BIN_VERSION).tar.gz CRIO_BIN_DEPENDENCIES = host-go libgpgme From d53be776831b38458ade0c93f0e684456247ea03 Mon Sep 17 00:00:00 2001 From: "Paul S. Schweigert" Date: Fri, 24 Jun 2022 14:01:53 -0400 Subject: [PATCH 210/545] update cri-o in dockerfile too Signed-off-by: Paul S. Schweigert --- deploy/kicbase/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/kicbase/Dockerfile b/deploy/kicbase/Dockerfile index 2297b5ae80..52e865a982 100644 --- a/deploy/kicbase/Dockerfile +++ b/deploy/kicbase/Dockerfile @@ -41,7 +41,7 @@ FROM ubuntu:focal-20220316 as kicbase ARG BUILDKIT_VERSION="v0.10.3" ARG FUSE_OVERLAYFS_VERSION="v1.7.1" ARG CONTAINERD_FUSE_OVERLAYFS_VERSION="1.0.3" -ARG CRIO_VERSION="1.22" +ARG CRIO_VERSION="1.24" ARG CRI_DOCKERD_VERSION="0737013d3c48992724283d151e8a2a767a1839e9" ARG TARGETARCH From f6b902b63d70be21b7881e978bcff18600b24f19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=BE=99=E5=B3=B0?= Date: Sun, 26 Jun 2022 10:20:37 +0800 Subject: [PATCH 211/545] look what we plan to do at 2022, find a misspelling --- site/content/en/docs/contrib/roadmap.en.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/content/en/docs/contrib/roadmap.en.md b/site/content/en/docs/contrib/roadmap.en.md index d146bc9267..df3fd377d9 100644 --- a/site/content/en/docs/contrib/roadmap.en.md +++ b/site/content/en/docs/contrib/roadmap.en.md @@ -34,5 +34,5 @@ Please send a PR to suggest any improvements to it. ## (#5) libmachine Refactor -- [ ] Add new driver (with QEMU) to replace HyperKit, primarly for Mac arm64 +- [ ] Add new driver (with QEMU) to replace HyperKit, primarily for Mac arm64 - [ ] Fix the provisioner, remove legacy Swarm, and add support for other runtimes From 441ad91c2160fdd18e6daf00c3f63bbbb8cf5e8b Mon Sep 17 00:00:00 2001 From: Akira Yoshiyama Date: Mon, 21 Mar 2022 13:24:33 +0900 Subject: [PATCH 212/545] Update Japanese translation - removed unused lines which don't exist in strings.txt - translated new lines - fix several lines with a bracket after japanese period --- translations/ja.json | 229 ++++++++++++------------------------------- 1 file changed, 65 insertions(+), 164 deletions(-) diff --git a/translations/ja.json b/translations/ja.json index 328f22ee8b..5cf1bc025a 100644 --- a/translations/ja.json +++ b/translations/ja.json @@ -9,28 +9,23 @@ "'none' driver does not support 'minikube podman-env' command": "'none' ドライバーは 'minikube podman-env' コマンドをサポートしていません", "'none' driver does not support 'minikube ssh' command": "'none' ドライバーは 'minikube ssh' コマンドをサポートしていません", "'none' driver does not support 'minikube ssh-host' command": "'none' ドライバーは 'minikube ssh-host' コマンドをサポートしていません", - "'{{.driver}}' driver reported a issue that could affect the performance.": "'{{.driver}}' ドライバーが性能に影響しうる問題を報告しました。", - "'{{.driver}}' driver reported an issue: {{.error}}": "'{{.driver}}' ドライバーがエラーを報告しました: {{.error}}", - "- \"minikube ssh\" to SSH into minikube's node.\n- \"minikube docker-env\" to point your docker-cli to the docker inside minikube.\n- \"minikube image\" to build images without docker.": "", - "- \"minikube ssh\" to SSH into minikube's node.\n- \"minikube image\" to build images without docker.": "", - "- \"minikube ssh\" to SSH into minikube's node.\n- \"minikube podman-env\" to point your podman-cli to the podman inside minikube.\n- \"minikube image\" to build images without docker.": "", + "- \"minikube ssh\" to SSH into minikube's node.\n- \"minikube docker-env\" to point your docker-cli to the docker inside minikube.\n- \"minikube image\" to build images without docker.": "- 「minikube ssh」で minikube ノードに SSH 接続します。\n- 「minikube docker-env」で docker-cli を minikube 内の docker 用に設定します。\n- 「minikube image」で docker を使わずにイメージをビルドします。", + "- \"minikube ssh\" to SSH into minikube's node.\n- \"minikube image\" to build images without docker.": "- 「minikube ssh」で minikube ノードに SSH 接続します。\n- 「minikube image」で docker を使わずにイメージをビルドします。", + "- \"minikube ssh\" to SSH into minikube's node.\n- \"minikube podman-env\" to point your podman-cli to the podman inside minikube.\n- \"minikube image\" to build images without docker.": "- 「minikube ssh」で minikube ノードに SSH 接続します。\n- 「minikube podman-env」で podman-cli を minikube 内の podman 用に設定します。\n- 「minikube image」で docker を使わずにイメージをビルドします。", "- Delete and recreate minikube cluster\n\t\tminikube delete\n\t\tminikube start --driver={{.driver_name}}": "- minikube クラスターの削除と再作成をしてください\n\t\tminikube delete\n\t\tminikube start --driver={{.driver_name}}", "- Docs https://docs.docker.com/docker-for-mac/#resources": "- ドキュメント https://docs.docker.com/docker-for-mac/#resources", "- Docs https://docs.docker.com/docker-for-windows/#resources": "- ドキュメント https://docs.docker.com/docker-for-windows/#resources", "- Ensure your {{.driver_name}} daemon has access to enough CPU/memory resources.": "- {{.driver_name}} デーモンが十分な CPU/メモリーリソースを利用できることを確認してください。", "- Prune unused {{.driver_name}} images, volumes, networks and abandoned containers.\n\n\t\t\t\t{{.driver_name}} system prune --volumes": "- 使用していない {{.driver_name}} イメージ、ボリューム、ネットワーク、コンテナーを削除してください。\n\n\t\t\t\t{{.driver_name}} system prune --volumes", "- Restart your {{.driver_name}} service": "{{.driver_name}} サービスを再起動してください", - "- {{.logPath}}": "- {{.logPath}}", - "--container-runtime must be set to \"containerd\" or \"cri-o\" for rootless": "", + "--container-runtime must be set to \"containerd\" or \"cri-o\" for rootless": "rootless のために、--container-runtime に「containerd」または「cri-o」を設定しなければなりません。", "--kvm-numa-count range is 1-8": "--kvm-numa-count の範囲は 1～8 です", "--network flag is only valid with the docker/podman and KVM drivers, it will be ignored": "--network フラグは、docker/podman および KVM ドライバーでのみ有効であるため、無視されます", - "1) Recreate the cluster with Kubernetes {{.new}}, by running:\n\t \n\t\t minikube delete{{.profile}}\n\t\t minikube start{{.profile}} --kubernetes-version={{.prefix}}{{.new}}\n\t \n\t\t2) Create a second cluster with Kubernetes {{.new}}, by running:\n\t \n\t\t minikube start -p {{.suggestedName}} --kubernetes-version={{.prefix}}{{.new}}\n\t \n\t\t3) Use the existing cluster at version Kubernetes {{.old}}, by running:\n\t \n\t\t minikube start{{.profile}} --kubernetes-version={{.prefix}}{{.old}}\n\t\t": "", - "1. Click on \"Docker for Desktop\" menu icon\n\t\t\t2. Click \"Preferences\"\n\t\t\t3. Click \"Resources\"\n\t\t\t4. Increase \"CPUs\" slider bar to 2 or higher\n\t\t\t5. Click \"Apply \u0026 Restart\"": "", - "1. Click on \"Docker for Desktop\" menu icon\n\t\t\t2. Click \"Preferences\"\n\t\t\t3. Click \"Resources\"\n\t\t\t4. Increase \"Memory\" slider bar to {{.recommend}} or higher\n\t\t\t5. Click \"Apply \u0026 Restart\"": "", - "1. Open the \"Docker Desktop\" menu by clicking the Docker icon in the system tray\n\t\t2. Click \"Settings\"\n\t\t3. Click \"Resources\"\n\t\t4. Increase \"CPUs\" slider bar to 2 or higher\n\t\t5. Click \"Apply \u0026 Restart\"": "", - "1. Open the \"Docker Desktop\" menu by clicking the Docker icon in the system tray\n\t\t2. Click \"Settings\"\n\t\t3. Click \"Resources\"\n\t\t4. Increase \"Memory\" slider bar to {{.recommend}} or higher\n\t\t5. Click \"Apply \u0026 Restart\"": "", - "127.0.0.1": "127.0.0.1", - "\u003ctarget file absolute path\u003e must be an absolute Path. Relative Path is not allowed (example: \"/home/docker/copied.txt\")": "\u003ctarget file absolute path\u003e は絶対パスでなければなりません。相対パスは使用できません (例:「/home/docker/copied.txt」)", + "1) Recreate the cluster with Kubernetes {{.new}}, by running:\n\t \n\t\t minikube delete{{.profile}}\n\t\t minikube start{{.profile}} --kubernetes-version={{.prefix}}{{.new}}\n\t \n\t\t2) Create a second cluster with Kubernetes {{.new}}, by running:\n\t \n\t\t minikube start -p {{.suggestedName}} --kubernetes-version={{.prefix}}{{.new}}\n\t \n\t\t3) Use the existing cluster at version Kubernetes {{.old}}, by running:\n\t \n\t\t minikube start{{.profile}} --kubernetes-version={{.prefix}}{{.old}}\n\t\t": "1) 次のコマンドで Kubernetes {{.new}} によるクラスターを再構築します:\n\t \n\t\t minikube delete{{.profile}}\n\t\t minikube start{{.profile}} --kubernetes-version={{.prefix}}{{.new}}\n\t \n\t\t2) 次のコマンドで Kubernetes {{.new}} による第 2 のクラスターを作成します:\n\t \n\t\t minikube start -p {{.suggestedName}} --kubernetes-version={{.prefix}}{{.new}}\n\t \n\t\t3) 次のコマンドで Kubernetes {{.old}} による既存クラスターを使用します:\n\t \n\t\t minikube start{{.profile}} --kubernetes-version={{.prefix}}{{.old}}\n\t\t", + "1. Click on \"Docker for Desktop\" menu icon\n\t\t\t2. Click \"Preferences\"\n\t\t\t3. Click \"Resources\"\n\t\t\t4. Increase \"CPUs\" slider bar to 2 or higher\n\t\t\t5. Click \"Apply \u0026 Restart\"": "1. 「Docker for Desktop」メニューアイコンをクリックします\n\t\t\t2. 「Preferences」をクリックします\n\t\t\t3. 「Resources」をクリックします\n\t\t\t4. 「CPUs」スライドバーを 2 以上に増やします\n\t\t\t5. 「Apply \u0026 Restart」をクリックします", + "1. Click on \"Docker for Desktop\" menu icon\n\t\t\t2. Click \"Preferences\"\n\t\t\t3. Click \"Resources\"\n\t\t\t4. Increase \"Memory\" slider bar to {{.recommend}} or higher\n\t\t\t5. Click \"Apply \u0026 Restart\"": "1. 「Docker for Desktop」メニューアイコンをクリックします\n\t\t\t2. 「Preferences」をクリックします\n\t\t\t3. 「Resources」をクリックします\n\t\t\t4. 「Memory」スライドバーを {{.recommend}} 以上に増やします\n\t\t\t5. 「Apply \u0026 Restart」をクリックします", + "1. Open the \"Docker Desktop\" menu by clicking the Docker icon in the system tray\n\t\t2. Click \"Settings\"\n\t\t3. Click \"Resources\"\n\t\t4. Increase \"CPUs\" slider bar to 2 or higher\n\t\t5. Click \"Apply \u0026 Restart\"": "1. システムトレイ中の Docker アイコンをクリックして「Docker Desktop」メニューを開きます\n\t\t\t2. 「Settings」をクリックします\n\t\t\t3. 「Resources」をクリックします\n\t\t\t4. 「CPUs」スライドバーを 2 以上に増やします\n\t\t\t5. 「Apply \u0026 Restart」をクリックします", + "1. Open the \"Docker Desktop\" menu by clicking the Docker icon in the system tray\n\t\t2. Click \"Settings\"\n\t\t3. Click \"Resources\"\n\t\t4. Increase \"Memory\" slider bar to {{.recommend}} or higher\n\t\t5. Click \"Apply \u0026 Restart\"": "1. システムトレイ中の Docker アイコンをクリックして「Docker Desktop」メニューを開きます\n\t\t\t2. 「Settings」をクリックします\n\t\t\t3. 「Resources」をクリックします\n\t\t\t4. 「Memory」スライドバーを {{.recommend}} 以上に増やします\n\t\t\t5. 「Apply \u0026 Restart」をクリックします", "==\u003e Audit \u003c==": "==\u003e Audit \u003c==", "==\u003e Last Start \u003c==": "==\u003e Last Start \u003c==", "A VPN or firewall is interfering with HTTP access to the minikube VM. Alternatively, try a different VM driver: https://minikube.sigs.k8s.io/docs/start/": "VPN、あるいはファイアウォールによって、minkube VM への HTTP アクセスが干渉されています。他の手段として、別の VM ドライバーを試してみてください: https://minikube.sigs.k8s.io/docs/start/", @@ -43,17 +38,15 @@ "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 into minikube as a local cache, or delete, reload the cached images": "ローカルキャッシュとして minikube にイメージを追加するか、キャッシュイメージを削除または再登録します", "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 クラスターのキャッシュに、イメージを追加します", "Add machine IP to NO_PROXY environment variable": "マシンの IP アドレスを NO_PROXY 環境変数に追加します", - "Add, delete, or push a local image into minikube": "ローカルイメージを minikube に追加、削除、またはプッシュします", "Add, remove, or list additional nodes": "追加のノードを追加、削除またはリストアップします", "Adding a control-plane node is not yet supported, setting control-plane flag to false": "", "Adding node {{.name}} to cluster {{.cluster}}": "{{.name}} ノードを {{.cluster}} クラスターに追加します", "Additional help topics": "追加のトピック", - "Additional mount options, such as cache=fscache": "cache=fscache などの追加のマウントオプション", "Adds a node to the given cluster config, and starts it.": "ノードをクラスターの設定に追加して、起動します。", "Adds a node to the given cluster.": "ノードをクラスターに追加します。", "Advanced Commands:": "高度なコマンド:", @@ -63,18 +56,16 @@ "Allow user prompts for more information": "ユーザーによる詳細情報の入力をできるようにします", "Alternative image repository to pull docker images from. This can be used when you have limited access to gcr.io. Set it to \"auto\" to let minikube decide one for you. For Chinese mainland users, you may use local gcr.io mirrors such as registry.cn-hangzhou.aliyuncs.com/google_containers": "Docker イメージを取得するための代替イメージリポジトリー。これは、gcr.io へのアクセスが制限されている場合に使用できます。これを「auto」に設定すると、minikube によって自動的に指定されるようになります。中国本土のユーザーの場合、registry.cn-hangzhou.aliyuncs.com/google_containers などのローカル gcr.io ミラーを使用できます", "Alternatively you could install one of these drivers:": "代わりに、これらのドライバーのいずれかをインストールすることもできます:", - "Amount of RAM to allocate to Kubernetes (format: \u003cnumber\u003e[\u003cunit\u003e], where unit = b, k, m or g).": "Kubernetes に割り当てられた RAM 容量 (形式: \u003cnumber\u003e[\u003cunit\u003e]、unit = b、k、m、g)。", "Amount of time to wait for a service in seconds": "サービスを待機する時間 (秒)", "Amount of time to wait for service in seconds": "サービスを待機する時間 (秒)", "Another hypervisor, such as VirtualBox, is conflicting with KVM. Please stop the other hypervisor, or use --driver to switch to it.": "VirtualBox などの別のハイパーバイザーが、KVM と競合しています。他のハイパーバイザーを停止するか、--driver を使用して切り替えてください。", "Another minikube instance is downloading dependencies... ": "別の minikube のインスタンスが、依存関係をダウンロードしています... ", "Another program is using a file required by minikube. If you are using Hyper-V, try stopping the minikube VM from within the Hyper-V manager": "別のプログラムが、minikube に必要なファイルを使用しています。Hyper-V を使用している場合は、Hyper-V マネージャー内から minikube VM を停止してみてください", "At least needs control plane nodes to enable addon": "アドオンを有効にするには、少なくともコントロールプレーンノードが必要です", - "Auto-pause is already enabled.": "", + "Auto-pause is already enabled.": "自動一時停止は既に有効になっています。", "Automatically selected the {{.driver}} driver": "{{.driver}} ドライバーが自動的に選択されました", "Automatically selected the {{.driver}} driver. Other choices: {{.alternates}}": "{{.driver}} ドライバーが自動的に選択されました。他の選択肢: {{.alternates}}", "Available Commands": "利用可能なコマンド", - "Available Commands:": "利用可能なコマンド:", "Basic Commands:": "基本的なコマンド:", "Because you are using a Docker driver on {{.operating_system}}, the terminal needs to be open to run it.": "Docker ドライバーを {{.operating_system}} 上で使用しているため、実行するにはターミナルを開く必要があります。", "Bind Address: {{.Address}}": "バインドするアドレス: {{.Address}}", @@ -119,12 +110,10 @@ "Connect to LoadBalancer services": "LoadBalancer サービスに接続します", "Consider creating a cluster with larger memory size using `minikube start --memory SIZE_MB` ": "`minikube start --memory SIZE_MB` を使用して、より大きなメモリーサイズのクラスターを作成することを検討してください", "Consider increasing Docker Desktop's memory size.": "Docker Desktop のメモリーサイズを増やすことを検討してください。", - "Container runtime must be set to \\\"containerd\\\" for rootless": "rootless の場合、コンテナーランタイムを「containerd」に設定する必要があります", "Continuously listing/getting the status with optional interval duration.": "任意のインターバル時間で、継続的にステータスをリストアップ/取得します。", "Control Plane could not update, try minikube delete --all --purge": "コントロールプレーンがアップデートできません。minikube delete --all --purge を試してください", "Copy the specified file into minikube": "指定したファイルを minikube にコピーします", - "Copy the specified file into minikube, it will be saved at path \u003ctarget file absolute path\u003e in your minikube.\nDefault target node controlplane and If \u003csource node name\u003e is omitted, It will trying to copy from host.\n\nExample Command : \"minikube cp a.txt /home/docker/b.txt\" +\n \"minikube cp a.txt minikube-m02:/home/docker/b.txt\"\n \"minikube cp minikube-m01:a.txt minikube-m02:/home/docker/b.txt\"": "", - "Copy the specified file into minikube, it will be saved at path \u003ctarget file absolute path\u003e in your minikube.\\nExample Command : \\\"minikube cp a.txt /home/docker/b.txt\\\"\\n \\\"minikube cp a.txt minikube-m02:/home/docker/b.txt\\\"\\n": "指定したファイルを minikube にコピーします。ファイルは minikube 内の \u003ctarget file absolute path\u003e に保存されます。\\nコマンドの例: 「minikube cp a.txt /home/docker/b.txt」\\n 「minikube cp a.txt minikube-m02:/home/docker/b.txt」\\n", + "Copy the specified file into minikube, it will be saved at path \u003ctarget file absolute path\u003e in your minikube.\nDefault target node controlplane and If \u003csource node name\u003e is omitted, It will trying to copy from host.\n\nExample Command : \"minikube cp a.txt /home/docker/b.txt\" +\n \"minikube cp a.txt minikube-m02:/home/docker/b.txt\"\n \"minikube cp minikube-m01:a.txt minikube-m02:/home/docker/b.txt\"": "指定したファイルを minikube にコピーします。ファイルは minikube 内の \u003c対象ファイルの絶対パス\u003e に保存されます。\nデフォルトターゲットノードコントロールプレーンと \u003cソースノード名\u003e が省略された場合、ホストからのファイルコピーを試みます。\n\nコマンド例 : 「minikube cp a.txt /home/docker/b.txt」 +\n 「minikube cp a.txt minikube-m02:/home/docker/b.txt」\n 「minikube cp minikube-m01:a.txt minikube-m02:/home/docker/b.txt」", "Could not determine a Google Cloud project, which might be ok.": "Google Cloud プロジェクトを特定できませんでしたが、問題はないかもしれません。", "Could not find any GCP credentials. Either run `gcloud auth application-default login` or set the GOOGLE_APPLICATION_CREDENTIALS environment variable to the path of your credentials file.": "GCP の認証情報が見つかりませんでした。`gcloud auth application-default login` を実行するか、環境変数 GOOGLE_APPLICATION_CREDENTIALS に認証情報ファイルのパスを設定してください。", "Could not process error from failed deletion": "削除の失敗によるエラーを処理できませんでした", @@ -137,10 +126,8 @@ "Current context is \"{{.context}}\"": "現在のコンテキストは「{{.context}}」です", "DEPRECATED, use `driver` instead.": "非推奨。代わりに `driver` を使用してください。", "DEPRECATED: Replaced by --cni=bridge": "非推奨: --cni=bridge に置き換えられました", - "Default group id used for the mount": "マウント時のデフォルトのグループ ID", - "Default user id used for the mount": "マウント時のデフォルトのユーザー ID", "Delete an image from the local cache.": "ローカルのキャッシュからイメージを削除します。", - "Delete the existing '{{.name}}' cluster using: '{{.delcommand}}', or start the existing '{{.name}}' cluster using: '{{.command}} --driver={{.old}}'": "", + "Delete the existing '{{.name}}' cluster using: '{{.delcommand}}', or start the existing '{{.name}}' cluster using: '{{.command}} --driver={{.old}}'": "'{{.delcommand}}' を使って既存の '{{.name}}' クラスターを削除するか、'{{.command}} --driver={{.old}}' を使って既存の '{{.name}}' クラスターを起動してください", "Deletes a local Kubernetes cluster": "ローカルの Kubernetes クラスターを削除します", "Deletes a local Kubernetes cluster. This command deletes the VM, and removes all\nassociated files.": "ローカルの Kubernetes クラスターを削除します。このコマンドによって、VM とそれに関連付けられているすべてのファイルが削除されます。", "Deletes a node from a cluster.": "クラスターからノードを削除します。", @@ -167,7 +154,6 @@ "Docker inside the VM is unavailable. Try running 'minikube delete' to reset the VM.": "VM 内の Docker が利用できません。'minikube delete' を実行して、VM を初期化してみてください。", "Docs have been saved at - {{.path}}": "ドキュメントは次のパスに保存されました - {{.path}}", "Documentation: {{.url}}": "ドキュメント: {{.url}}", - "Done! kubectl is now configured to use \"{{.name}}\"": "終了しました！kubectl が「{{.name}}」を使用するよう設定されました", "Done! kubectl is now configured to use \"{{.name}}\" cluster and \"{{.ns}}\" namespace by default": "終了しました！kubectl がデフォルトで「{{.name}}」クラスターと「{{.ns}}」ネームスペースを使用するよう設定されました", "Done! minikube is ready without Kubernetes!": "終了しました！minikube は Kubernetes なしで準備完了しました！", "Download complete!": "ダウンロードが完了しました！", @@ -231,11 +217,9 @@ "Examples": "例", "Executing \"{{.command}}\" took an unusually long time: {{.duration}}": "「{{.command}}」の実行が異常に長い時間かかりました: {{.duration}}", "Existing disk is missing new features ({{.error}}). To upgrade, run 'minikube delete'": "既存のディスクに新しい機能がありません ({{.error}})。アップグレードするには、'minikube delete' を実行してください", - "Exiting": "終了します", "Exiting due to {{.fatal_code}}: {{.fatal_msg}}": "{{.fatal_code}} が原因で終了します: {{.fatal_msg}}", - "Exiting.": "終了します。", "Exposed port of the proxyfied dashboard. Set to 0 to pick a random port.": "プロキシー化されたダッシュボードの公開ポート。0 に設定すると、ランダムなポートが選ばれます。", - "External Adapter on which external switch will be created if no external switch is found. (hyperv driver only)": "外部スイッチが見つからない場合に、外部スイッチが作成される外部アダプター。(hyperv ドライバーのみ)", + "External Adapter on which external switch will be created if no external switch is found. (hyperv driver only)": "外部スイッチが見つからない場合に、外部スイッチが作成される外部アダプター (hyperv ドライバーのみ)。", "Fail check if container paused": "コンテナーが一時停止しているかどうかのチェックに失敗しました", "Failed runtime": "ランタイムが失敗しました", "Failed to build image": "イメージのビルドに失敗しました", @@ -247,18 +231,16 @@ "Failed to change permissions for {{.minikube_dir_path}}: {{.error}}": "{{.minikube_dir_path}} に対する権限の変更に失敗しました: {{.error}}", "Failed to check main repository and mirrors for images": "メインリポジトリーとミラーのイメージのチェックに失敗しました", "Failed to configure metallb IP {{.profile}}": "metallb IP {{.profile}} の設定に失敗しました", - "Failed to configure network plugin": "", - "Failed to configure registry-aliases {{.profile}}": "", + "Failed to configure network plugin": "ネットワークプラグインの設定に失敗しました", "Failed to create file": "ファイルの作成に失敗しました", + "Failed to configure registry-aliases {{.profile}}": "", "Failed to create runtime": "ランタイムの作成に失敗しました", "Failed to delete cluster {{.name}}, proceeding with retry anyway.": "{{.name}} クラスターを削除できませんでしたが、処理を続行します。", "Failed to delete cluster {{.name}}.": "{{.name}} クラスターの削除に失敗しました。", "Failed to delete cluster: {{.error}}": "クラスターの削除に失敗しました: {{.error}}", - "Failed to delete cluster: {{.error}}__1": "クラスターの削除に失敗しました: {{.error}}__1", "Failed to delete images": "イメージの削除に失敗しました", "Failed to delete images from config": "設定ファイル中のイメージの削除に失敗しました", "Failed to enable container runtime": "コンテナーランタイムの有効化に失敗しました", - "Failed to get API Server URL": "API サーバー URL の取得に失敗しました", "Failed to get bootstrapper": "ブートストラッパーの取得に失敗しました", "Failed to get command runner": "コマンドランナーの取得に失敗しました", "Failed to get image map": "イメージマップの取得に失敗しました", @@ -292,7 +274,6 @@ "Filter to use only VM Drivers": "VM ドライバーのみ使用するためのフィルタ", "Flags": "フラグ", "Follow": "フォロー", - "For best results, install kubectl: https://kubernetes.io/docs/tasks/tools/install-kubectl/": "最善の結果を得るために、https://kubernetes.io/docs/tasks/tools/install-kubectl/ から kubectl をインストールしてください", "For improved {{.driver}} performance, {{.fix}}": "{{.driver}} の性能向上のため、{{.fix}}", "For more information see: https://minikube.sigs.k8s.io/docs/drivers/{{.driver}}": "追加の詳細情報はこちらを参照してください: https://minikube.sigs.k8s.io/docs/drivers/{{.driver}}", "For more information, see: https://minikube.sigs.k8s.io/docs/reference/drivers/none/": "追加の詳細情報はこちらを参照してください: https://minikube.sigs.k8s.io/docs/reference/drivers/none/", @@ -301,7 +282,7 @@ "Force minikube to perform possibly dangerous operations": "minikube で危険性のある操作を強制的に実行します", "Format output. One of: short|table|json|yaml": "出力フォーマット。short|table|json|yaml のいずれか", "Format to print stdout in. Options include: [text,json]": "標準出力のフォーマット。選択肢: [text,json]", - "Forwards all services in a namespace (defaults to \"false\")": "", + "Forwards all services in a namespace (defaults to \"false\")": "ネームスペース中の全サービスをフォワードします (既定値:「false」)", "Found docker, but the docker service isn't running. Try restarting the docker service.": "docker が見つかりましたが、docker サービスが稼働していません。docker サービスを再起動してみてください。", "Found driver(s) but none were healthy. See above for suggestions how to fix installed drivers.": "ドライバーが見つかりましたが、健全なものがありません。上記のインストール済みドライバーの修正方法の提示を参照してください。", "Found network options:": "ネットワークオプションが見つかりました:", @@ -314,7 +295,7 @@ "Generate unable to parse memory '{{.memory}}': {{.error}}": "メモリー '{{.memory}}' が解析できません: {{.error}}", "Generating certificates and keys ...": "証明書と鍵を作成しています...", "Get or list the current profiles (clusters)": "現在のプロファイル (クラスター) を取得または一覧表示します", - "Gets the logs of the running instance, used for debugging minikube, not user code.": "実行中のインスタンスのログを取得します (ユーザーコードではなく minikube デバッグに使用)", + "Gets the logs of the running instance, used for debugging minikube, not user code.": "実行中のインスタンスのログを取得します (ユーザーコードではなく minikube デバッグに使用)。", "Gets the status of a local Kubernetes cluster": "ローカル Kubernetes クラスターの状態を取得します", "Gets the status of a local Kubernetes cluster.\n\tExit status contains the status of minikube's VM, cluster and Kubernetes encoded on it's bits in this order from right to left.\n\tEg: 7 meaning: 1 (for minikube NOK) + 2 (for cluster NOK) + 4 (for Kubernetes NOK)": "ローカル Kubernetes クラスターの状態を取得します。\n\t終了ステータスは minikube の VM、クラスター、Kubernetes の状態を順に右→左のビット列でエンコードしたものを含みます。\n\t例: 7 = 1 (minikube 異常) + 2 (クラスター異常) + 4 (Kubernetes 異常)", "Gets the value of PROPERTY_NAME from the minikube config file": "minikube 設定ファイル中の PROPERTY_NAME の値を取得します", @@ -332,25 +313,22 @@ "If present, writes to the provided file instead of stdout.": "指定すると、標準出力の代わりに指定されたファイルに出力します。", "If set, automatically updates drivers to the latest version. Defaults to true.": "設定すると、自動的にドライバーを最新バージョンに更新します。デフォルトは true です。", "If set, delete the current cluster if start fails and try again. Defaults to false.": "設定すると、現在のクラスターの起動に失敗した場合はクラスターを削除して再度試行します。デフォルトは false です。", - "If set, disables metrics reporting (CPU and memory usage), this can improve CPU usage. Defaults to false.": "", - "If set, disables optimizations that are set for local Kubernetes. Including decreasing CoreDNS replicas from 2 to 1 and increasing kubeadm housekeeping-interval from 10s to 5m. Defaults to false.": "設定すると、ローカルの Kubernetes 用に設定された最適化を無効化します。CoreDNS レプリカ数を 2 から 1 に減らし、kubeadm の housekeeping-interval を 10 秒から 5 分に増加させることを含みます。デフォルトは false です。", - "If set, disables optimizations that are set for local Kubernetes. Including decreasing CoreDNS replicas from 2 to 1. Defaults to false.": "", + "If set, disables metrics reporting (CPU and memory usage), this can improve CPU usage. Defaults to false.": "設定すると、メトリクス報告 (CPU とメモリー使用量) を無効化します。これは CPU 使用量を改善できます。デフォルト値は false です。", + "If set, disables optimizations that are set for local Kubernetes. Including decreasing CoreDNS replicas from 2 to 1. Defaults to false.": "設定すると、ローカルの Kubernetes 用に設定された最適化を無効化します。CoreDNS レプリカ数を 2 から 1 に減らすことを含みます。デフォルトは false です。", "If set, download tarball of preloaded images if available to improve start time. Defaults to true.": "設定すると、開始時間を改善するため、利用可能であれば、プレロードイメージの tar ボールをダウンロードします。デフォルトは false です。", "If set, force the container runtime to use systemd as cgroup manager. Defaults to false.": "設定すると、cgroup マネージャーとして systemd を使うようコンテナーランタイムに強制します。デフォルトは false です。", "If set, install addons. Defaults to true.": "設定すると、アドオンをインストールします。デフォルトは true です。", - "If set, minikube VM/container will start without starting or configuring Kubernetes. (only works on new clusters)": "設定すると、Kubernetes の起動や設定なしに minikube VM/コンテナーが起動します。(新しいクラスターの際にのみ機能します)", + "If set, minikube VM/container will start without starting or configuring Kubernetes. (only works on new clusters)": "設定すると、Kubernetes の起動や設定なしに minikube VM/コンテナーが起動します (新しいクラスターの際にのみ機能します)。", "If set, pause all namespaces": "設定すると、全ネームスペースを一旦停止します", "If set, unpause all namespaces": "設定すると、全ネームスペースを一旦停止解除します", "If the above advice does not help, please let us know:": "上記アドバイスが参考にならない場合は、我々に教えてください:", "If the host has a firewall:\n\t\t\n\t\t1. Allow a port through the firewall\n\t\t2. Specify \"--port=\u003cport_number\u003e\" for \"minikube mount\"": "ホストにファイアウォールがある場合:\n\t\t\n\t\t1. ファイアウォールを通過するポートを許可する\n\t\t2. 「minikube mount」用の「--port=\u003cポート番号\u003e」を指定する", "If true, cache docker images for the current bootstrapper and load them into the machine. Always false with --driver=none.": "true の場合、現在のブートストラッパーの Docker イメージをキャッシュに保存して、マシンに読み込みます。--driver=none の場合は常に false です。", - "If true, cache docker images for the current bootstrapper and load them into the machine. Always false with --vm-driver=none.": "true の場合、現在のブートストラッパーの Docker イメージをキャッシュに保存して、マシンに読み込みます。--vm-driver=none の場合は常に false です。", "If true, only download and cache files for later use - don't install or start anything.": "true の場合、後の使用のためのファイルのダウンロードとキャッシュ保存のみ行われます。インストールも起動も行いません", "If true, pods might get deleted and restarted on addon enable": "true の場合、有効なアドオンの Pod は削除され、再起動されます", "If true, print web links to addons' documentation if using --output=list (default).": "", "If true, returns list of profiles faster by skipping validating the status of the cluster.": "true の場合、クラスター状態の検証を省略することにより高速にプロファイル一覧を返します。", "If true, the added node will be marked for work. Defaults to true.": "true の場合、追加されたノードはワーカー用としてマークされます。デフォルトは true です。", - "If true, the node added will also be a control plane in addition to a worker.": "true の場合、追加されたノードはワーカーに加えてコントロールプレーンにもなります。", "If true, will perform potentially dangerous operations. Use with discretion.": "true の場合、潜在的に危険な操作を行うことになります。慎重に使用してください。", "If you are running minikube within a VM, consider using --driver=none:": "VM 内で minikube を実行している場合、--driver=none の使用を検討してください:", "If you are still interested to make {{.driver_name}} driver work. The following suggestions might help you get passed this issue:": "{{.driver_name}} ドライバーを機能させることに引き続き興味がある場合。次の提案がこの問題を通過する手助けになるかもしれません:", @@ -370,7 +348,7 @@ "Istio needs {{.minCPUs}} CPUs -- your configuration only allocates {{.cpus}} CPUs": "Istio は {{.minCPUs}} 個の CPU を必要とします -- あなたの設定では {{.cpus}} 個の CPU しか割り当てていません", "Istio needs {{.minMem}}MB of memory -- your configuration only allocates {{.memory}}MB": "Istio は {{.minMem}}MB のメモリーを必要とします -- あなたの設定では、{{.memory}}MB しか割り当てていません", "It seems that you are running in GCE, which means authentication should work without the GCP Auth addon. If you would still like to authenticate using a credentials file, use the --force flag.": "GCE 上で実行しているようですが、これは GCP Auth アドオンなしに認証が機能すべきであることになります。それでもクレデンシャルファイルを使用した認証を希望するのであれば、--force フラグを使用してください。", - "Kicbase images have not been deleted. To delete images run:": "", + "Kicbase images have not been deleted. To delete images run:": "Kicbase イメージが削除されていません。次のコマンドでイメージを削除します:", "Kill the mount process spawned by minikube start": "minikube start によって実行されたマウントプロセスを強制停止します", "Kubelet network plug-in to use (default: auto)": "使用する Kubelet ネットワークプラグイン (既定値: auto)", "Kubernetes requires at least 2 CPU's to start": "Kubernetes は起動に少なくとも 2 個の CPU が必要です", @@ -378,7 +356,6 @@ "Kubernetes {{.version}} is not supported by this release of minikube": "この minikube リリースは Kubernetes {{.version}} をサポートしていません", "Kubernetes: Stopping ...": "Kubernetes: 停止しています...", "Kubernetes: {{.status}}": "", - "Launching Kubernetes ...": "Kubernetes を起動しています...", "Launching proxy ...": "プロキシーを起動しています...", "List all available images from the local cache.": "ローカルキャッシュから利用可能な全イメージを一覧表示します。", "List existing minikube nodes.": "既存の minikube ノードを一覧表示します。", @@ -389,24 +366,23 @@ "List of ports that should be exposed (docker and podman driver only)": "公開する必要のあるポートの一覧 (docker、podman ドライバーのみ)", "Listening to 0.0.0.0 on external docker host {{.host}}. Please be advised": "外部 Docker ホスト {{.host}} 上で 0.0.0.0 をリッスンしています。ご承知おきください", "Listening to {{.listenAddr}}. This is not recommended and can cause a security vulnerability. Use at your own risk": "{{.listenAddr}} をリッスンしています。これは推奨されず、セキュリティー脆弱性になる可能性があります。自己責任で使用してください", - "Lists all available minikube addons as well as their current statuses (enabled/disabled)": "利用可能な minikube アドオンとその現在の状態 (有効 / 無効) を一覧表示します。", + "Lists all available minikube addons as well as their current statuses (enabled/disabled)": "利用可能な minikube アドオンとその現在の状態 (有効 / 無効) を一覧表示します", "Lists all minikube profiles.": "minikube プロファイルを一覧表示します。", "Lists all valid default values for PROPERTY_NAME": "PROPERTY_NAME 用の有効な minikube プロファイルを一覧表示します", - "Lists all valid minikube profiles and detects all possible invalid profiles.": "有効な minikube プロファイルを一覧表示し、無効の可能性のあるプロファイルを全て検知します", + "Lists all valid minikube profiles and detects all possible invalid profiles.": "有効な minikube プロファイルを一覧表示し、無効の可能性のあるプロファイルを全て検知します。", "Lists the URLs for the services in your local cluster": "ローカルクラスターのサービス用 URL を一覧表示します", "Load an image into minikube": "minikube にイメージを読み込ませます", "Local folders to share with Guest via NFS mounts (hyperkit driver only)": "NFS マウントを介してゲストと共有するローカルフォルダー (hyperkit ドライバーのみ)", "Local proxy ignored: not passing {{.name}}={{.value}} to docker env.": "ローカルプロキシーは無視されました: docker env に {{.name}}={{.value}} は渡されません。", "Location of the VPNKit socket used for networking. If empty, disables Hyperkit VPNKitSock, if 'auto' uses Docker for Mac VPNKit connection, otherwise uses the specified VSock (hyperkit driver only)": "ネットワーキングに使用する VPNKit ソケットのロケーション。空の場合、Hyperkit VPNKitSock が無効になり、'auto' の場合、Docker for Mac の VPNKit 接続が使用され、それ以外の場合、指定された VSock が使用されます (hyperkit ドライバーのみ)", - "Location of the minikube iso": "minikube iso の場所", - "Location to fetch kubectl, kubelet, \u0026 kubeadm binaries from.": "", - "Locations to fetch the minikube ISO from.": "minikube ISO の取得元", + "Location to fetch kubectl, kubelet, \u0026 kubeadm binaries from.": "kubectl、kubelet、kubeadm バイナリーの取得元。", + "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 cache for images": "イメージキャッシュを管理します", "Manage images": "イメージを管理します", "Message Size: {{.size}}": "メッセージのサイズ: {{.size}}", - "Minimum VirtualBox Version supported: {{.vers}}, current VirtualBox version: {{.cvers}}": "", + "Minimum VirtualBox Version supported: {{.vers}}, current VirtualBox version: {{.cvers}}": "サポートされた最小の VirtualBox バージョン: {{.vers}}、現在の VirtualBox バージョン: {{.cvers}}", "Modify persistent configuration values": "永続的な設定値を変更します", "More information: https://docs.docker.com/engine/install/linux-postinstall/#your-kernel-does-not-support-cgroup-swap-limit-capabilities": "追加情報: https://docs.docker.com/engine/install/linux-postinstall/#your-kernel-does-not-support-cgroup-swap-limit-capabilities", "Most users should use the newer 'docker' driver instead, which does not require root!": "多くのユーザーはより新しい 'docker' ドライバーを代わりに使用すべきです (root 権限が必要ありません！)", @@ -426,8 +402,8 @@ "No minikube profile was found. ": "minikube プロファイルが見つかりませんでした。", "No possible driver was detected. Try specifying --driver, or see https://minikube.sigs.k8s.io/docs/start/": "利用可能なドライバーが検出されませんでした。--driver 指定を試すか、https://minikube.sigs.k8s.io/docs/start/ を参照してください", "No such addon {{.name}}": "{{.name}} というアドオンはありません", - "No valid URL found for tunnel.": "", - "No valid port found for tunnel.": "", + "No valid URL found for tunnel.": "トンネル用の有効な URL が見つかりません。", + "No valid port found for tunnel.": "トンネル用の有効なポートが見つかりません。", "Node {{.name}} failed to start, deleting and trying again.": "{{.name}} ノードは起動に失敗しました (削除、再試行します)。", "Node {{.name}} was successfully deleted.": "{{.name}} ノードは正常に削除されました。", "Node {{.nodeName}} does not exist.": "{{.nodeName}} ノードは存在しません。", @@ -435,7 +411,6 @@ "None of the known repositories in your location are accessible. Using {{.image_repository_name}} as fallback.": "ロケーション内でアクセス可能な既知リポジトリーはありません。フォールバックとして {{.image_repository_name}} を使用します。", "Noticed you have an activated docker-env on {{.driver_name}} driver in this terminal:": "通知: このターミナルでは、{{.driver_name}} ドライバーの docker-env が有効になっています:", "Noticed you have an activated podman-env on {{.driver_name}} driver in this terminal:": "通知: このターミナルでは、{{.driver_name}} ドライバーの podman-env が有効になっています:", - "Number of CPUs allocated to the minikube VM": "minikube VM に割り当てられた CPU の数", "Number of extra disks created and attached to the minikube VM (currently only implemented for hyperkit and kvm2 drivers)": "作成して minikube VM に接続する追加ディスク数 (現在、hyperkit と kvm2 ドライバーでのみ実装されています)", "Number of lines back to go within the log": "ログ中で遡る行数", "OS release is {{.pretty_name}}": "OS リリースは {{.pretty_name}} です", @@ -452,7 +427,6 @@ "Operations on nodes": "ノードの操作", "Options: {{.options}}": "オプション: {{.options}}", "Output format. Accepted values: [json, yaml]": "", - "Output format. Accepted values: [json]": "出力フォーマット。利用可能な値: [json]", "Outputs minikube shell completion for the given shell (bash, zsh or fish)\n\n\tThis depends on the bash-completion binary. Example installation instructions:\n\tOS X:\n\t\t$ brew install bash-completion\n\t\t$ source $(brew --prefix)/etc/bash_completion\n\t\t$ minikube completion bash \u003e ~/.minikube-completion # for bash users\n\t\t$ minikube completion zsh \u003e ~/.minikube-completion # for zsh users\n\t\t$ source ~/.minikube-completion\n\t\t$ minikube completion fish \u003e ~/.config/fish/completions/minikube.fish # for fish users\n\tUbuntu:\n\t\t$ apt-get install bash-completion\n\t\t$ source /etc/bash_completion\n\t\t$ source \u003c(minikube completion bash) # for bash users\n\t\t$ source \u003c(minikube completion zsh) # for zsh users\n\t\t$ minikube completion fish \u003e ~/.config/fish/completions/minikube.fish # for fish users\n\n\tAdditionally, you may want to output the completion to a file and source in your .bashrc\n\n\tNote for zsh users: [1] zsh completions are only supported in versions of zsh \u003e= 5.2\n\tNote for fish users: [2] please refer to this docs for more details https://fishshell.com/docs/current/#tab-completion\n": "指定されたシェル用の minikube シェル補完コマンドを出力 (bash、zsh、fish)\n\n\tbash-completion バイナリーに依存しています。インストールコマンドの例:\n\tOS X:\n\t\t$ brew install bash-completion\n\t\t$ source $(brew --prefix)/etc/bash_completion\n\t\t$ minikube completion bash \u003e ~/.minikube-completion # bash ユーザー用\n\t\t$ minikube completion zsh \u003e ~/.minikube-completion # zsh ユーザー用\n\t\t$ source ~/.minikube-completion\n\t\t$ minikube completion fish \u003e ~/.config/fish/completions/minikube.fish # fish ユーザー用\n\tUbuntu:\n\t\t$ apt-get install bash-completion\n\t\t$ source /etc/bash_completion\n\t\t$ source \u003c(minikube completion bash) # bash ユーザー用\n\t\t$ source \u003c(minikube completion zsh) # zsh ユーザー用\n\t\t$ minikube completion fish \u003e ~/.config/fish/completions/minikube.fish # fish ユーザー用\n\n\tさらに、補完コマンドをファイルに出力して .bashrc 内で source を実行するとよいでしょう\n\n\t注意 (zsh ユーザー): [1] zsh 補完コマンドは zsh バージョン \u003e= 5.2 でのみサポートしています\n\t注意 (fish ユーザー): [2] 詳細はこちらのドキュメントを参照してください https://fishshell.com/docs/current/#tab-completion\n", "Overwrite image even if same image:tag name exists": "同じ image:tag 名が存在していてもイメージを上書きします", "Path to the Dockerfile to use (optional)": "使用する Dockerfile へのパス (任意)", @@ -466,8 +440,7 @@ "Please either authenticate to the registry or use --base-image flag to use a different registry.": "レジストリーに認証するか、--base-image フラグで別のレジストリーを指定するかどちらを行ってください。", "Please enter a value:": "値を入力してください:", "Please free up disk or prune images.": "ディスクを解放するか、イメージを削除してください。", - "Please increase Desktop's disk size.": "", - "Please increse Desktop's disk size.": "Desktop のディスクサイズを増やしてください。", + "Please increase Desktop's disk size.": "Desktop のディスクサイズを増やしてください。", "Please install the minikube hyperkit VM driver, or select an alternative --driver": "minikube hyperkit VM ドライバーをインストールするか、--driver で別のドライバーを選択してください", "Please install the minikube kvm2 VM driver, or select an alternative --driver": "minikube kvm2 VM ドライバーをインストールするか、--driver で別のドライバーを選択してください", "Please make sure the service you are looking for is deployed or is in the correct namespace.": "探しているサービスがデプロイされている、あるいは正しいネームスペース中にあることを確認してください。", @@ -482,7 +455,6 @@ "Please specify the directory to be mounted: \n\tminikube mount \u003csource directory\u003e:\u003ctarget directory\u003e (example: \"/host-home:/vm-home\")": "マウントするディレクトリーを指定してください: \n\tminikube mount \u003cソースディレクトリー\u003e:\u003cターゲットディレクトリー\u003e (例:「/host-home:/vm-home」)", "Please specify the path to copy: \n\tminikube cp \u003csource file path\u003e \u003ctarget file absolute path\u003e (example: \"minikube cp a/b.txt /copied.txt\")": "コピーするパスを指定してください: \n\tminikube cp \u003cソースファイルのパス\u003e \u003cターゲットファイルの絶対パス\u003e (例:「minikube cp a/b.txt /copied.txt」)", "Please try purging minikube using `minikube delete --all --purge`": "`minikube delete --all --purge` を使用して minikube の削除を試してください", - "Please upgrade the '{{.driver_executable}}'. {{.documentation_url}}": "'{{.driver_executable}}' をアップグレードしてください。{{.documentation_url}}", "Please visit the following link for documentation around this: \n\thttps://help.github.com/en/packages/using-github-packages-with-your-projects-ecosystem/configuring-docker-for-use-with-github-packages#authenticating-to-github-packages\n": "関連するドキュメントへの次のリンクを参照してください: \n\thttps://help.github.com/en/packages/using-github-packages-with-your-projects-ecosystem/configuring-docker-for-use-with-github-packages#authenticating-to-github-packages\n", "Populates the specified folder with documentation in markdown about minikube": "指定されたフォルダーに、minikube に関するマークダウンのドキュメントを生成します", "PowerShell is running in constrained mode, which is incompatible with Hyper-V scripting.": "PowerShell は制約付きモードで実行されています (Hyper-V スクリプティングと互換性がありません)。", @@ -517,17 +489,13 @@ "Reinstall VirtualBox and verify that it is not blocked: System Preferences -\u003e Security \u0026 Privacy -\u003e General -\u003e Some system software was blocked from loading": "VirtualBox を再インストールして、ブロックされていないことを検証してください: システム環境設定 -\u003e セキュリティーとプライバシー -\u003e 一般 -\u003e いくつかのシステムソフトウェアの読み込みがブロックされました", "Related issue: {{.url}}": "関連イシュー: {{.url}}", "Related issues:": "関連イシュー:", - "Relaunching Kubernetes using {{.bootstrapper}} ...": "{{.bootstrapper}} を使用して Kubernetes を再起動しています...", "Remove one or more images": "1 つまたは複数のイメージを削除します", "Remove the invalid --docker-opt or --insecure-registry flag if one was provided": "無効な --docker-opt または --insecure-registry フラグを指定している場合、これを削除してください", "Removed all traces of the \"{{.name}}\" cluster.": "クラスター「{{.name}}」の全てのトレースを削除しました。", "Removing {{.directory}} ...": "{{.directory}} を削除しています...", "Requested cpu count {{.requested_cpus}} is greater than the available cpus of {{.avail_cpus}}": "要求された CPU 数 {{.requested_cpus}} は利用可能な CPU 数 {{.avail_cpus}} より大きいです", "Requested cpu count {{.requested_cpus}} is less than the minimum allowed of {{.minimum_cpus}}": "要求された CPU 数 {{.requested_cpus}} が許可される最小 CPU 数 {{.minimum_cpus}} 未満です", - "Requested disk size {{.requested_size}} is less than minimum of {{.minimum_size}}": "要求されたディスクサイズ {{.requested_size}} が最小値 {{.minimum_size}} 未満です", - "Requested memory allocation ({{.memory}}MB) is less than the default memory allocation of {{.default_memorysize}}MB. Beware that minikube might not work correctly or crash unexpectedly.": "要求されたメモリー割り当て ({{.memory}}MB) がデフォルトのメモリー割り当て {{.default_memorysize}} MB 未満です。minikube が正常に動作しないか、予期せずクラッシュする可能性があることに注意してください。", "Requested memory allocation ({{.requested}}MB) is less than the recommended minimum {{.recommend}}MB. Deployments may fail.": "要求されたメモリー割り当て ({{.requested}}MB) が推奨の最小値 {{.recommend}}MB 未満です。デプロイは失敗するかもしれません。", - "Requested memory allocation {{.requested_size}} is less than the minimum allowed of {{.minimum_size}}": "要求されたメモリー割り当て {{.requested_size}} が許可される最小値 {{.minimum_size}} 未満です", "Requested memory allocation {{.requested}}MB is more than your system limit {{.system_limit}}MB.": "要求されたメモリー割り当て {{.requested}}MB がシステム制限 {{.system_limit}}MB より大きいです。", "Requested memory allocation {{.requested}}MiB is less than the usable minimum of {{.minimum_memory}}MB": "要求されたメモリー割り当て {{.requested}}MiB が実用最小値 {{.minimum_memory}}MB 未満です", "Reset Docker to factory defaults": "Docker を出荷既定値にリセットしてください", @@ -537,10 +505,8 @@ "Restarting the {{.name}} service may improve performance.": "{{.name}} サービス再起動で性能が改善するかもしれません。", "Retrieve the ssh host key of the specified node": "指定したノードの SSH ホスト鍵を取得します", "Retrieve the ssh host key of the specified node.": "指定したノードの SSH ホスト鍵を取得します。", - "Retrieve the ssh identity key path of the specified cluster": "指定したクラスターの SSH 鍵のパスを取得します", "Retrieve the ssh identity key path of the specified node": "指定したノードの SSH 鍵のパスを取得します", "Retrieve the ssh identity key path of the specified node, and writes it to STDOUT.": "指定したノードの SSH 鍵のパスを取得し、標準出力に書き出します。", - "Retrieves the IP address of the running cluster": "実行中のクラスターの IP アドレスを取得します", "Retrieves the IP address of the running cluster, checks it\n\t\t\twith IP in kubeconfig, and corrects kubeconfig if incorrect.": "実行中のクラスターの IP アドレスを取得し、kubeconfig 中の IP アドレスを用いてチェックします\n\t\t\t正しくない場合は kubeconfig を修正します。", "Retrieves the IP address of the specified node": "指定したノードの IP アドレスを取得します", "Retrieves the IP address of the specified node, and writes it to STDOUT.": "指定したノードの IP アドレスを取得し、標準出力に書き出します。", @@ -581,7 +547,7 @@ "Setting profile failed": "プロファイルの設定に失敗しました", "Show a list of global command-line options (applies to all commands).": "(全コマンドに適用される) グローバルコマンドラインオプションの一覧を表示します。", "Show only log entries which point to known problems": "既知の問題を示すログエントリーのみ表示します", - "Show only the audit logs": "", + "Show only the audit logs": "監査ログのみ表示します", "Show only the most recent journal entries, and continuously print new entries as they are appended to the journal.": "直近のジャーナルエントリーのみ表示し、ジャーナルに追加された新しいエントリーを連続して表示します。", "Simulate numa node count in minikube, supported numa node count range is 1-8 (kvm2 driver only)": "minikube 中の NUMA ノードカウントをシミュレートします (対応 NUMA ノードカウント範囲は 1～8 (kvm2 ドライバーのみ))", "Skipped switching kubectl context for {{.profile_name}} because --keep-context was set.": "--keep-context が設定されたので、{{.profile_name}} 用 kubectl コンテキストの切替をスキップしました。", @@ -595,14 +561,13 @@ "Sorry, the url provided with the --registry-mirror flag is invalid: {{.url}}": "申し訳ありませんが、--registry-mirror フラグとともに指定された URL は無効です: {{.url}}", "Sorry, {{.driver}} does not allow mounts to be changed after container creation (previous mount: '{{.old}}', new mount: '{{.new}})'": "申し訳ありませんが、{{.driver}} はコンテナーの生成後にマウントを変更できません (旧マウント: '{{.old}}'、新マウント: '{{.new}})'", "Source {{.path}} can not be empty": "ソース {{.path}} は空にできません", - "Specified Kubernetes version {{.specified}} is less than the oldest supported version: {{.oldest}}": "指定された Kubernetes バージョン {{.specified}} はサポートされたバージョン {{.oldest}} より古いです", - "Specified Kubernetes version {{.specified}} is less than the oldest supported version: {{.oldest}}. Use `minikube config defaults kubernetes-version` for details.": "", - "Specified Kubernetes version {{.specified}} is newer than the newest supported version: {{.newest}}. Use `minikube config defaults kubernetes-version` for details.": "", - "Specified Major version of Kubernetes {{.specifiedMajor}} is newer than the newest supported Major version: {{.newestMajor}}": "", + "Specified Kubernetes version {{.specified}} is less than the oldest supported version: {{.oldest}}. Use `minikube config defaults kubernetes-version` for details.": "指定された Kubernetes バージョン {{.specified}} はサポートされた最古バージョン {{.oldest}} より古いです。詳細は `minikube config defaults kubernetes-version` を使用してください。", + "Specified Kubernetes version {{.specified}} is newer than the newest supported version: {{.newest}}. Use `minikube config defaults kubernetes-version` for details.": "指定された Kubernetes バージョン {{.specified}} はサポートされた最新バージョン {{.newest}} より新しいです。詳細は `minikube config defaults kubernetes-version` を使用してください。", + "Specified Major version of Kubernetes {{.specifiedMajor}} is newer than the newest supported Major version: {{.newestMajor}}": "指定された Kubernetes {{.specifiedMajor}} メジャーバージョンはサポートされた最新バージョン {{.newestMajor}} より新しいです", "Specify --kubernetes-version in v\u003cmajor\u003e.\u003cminor.\u003cbuild\u003e form. example: 'v1.1.14'": "v\u003cメジャー\u003e.\u003cマイナー.\u003cビルド\u003e 形式で --kubernetes-version 値を指定します。例: 'v1.1.14'", "Specify an alternate --host-only-cidr value, such as 172.16.0.1/24": "代わりの --host-only-cidr 値を指定します (172.16.0.1/24 など)", - "Specify arbitrary flags to pass to the Docker daemon. (format: key=value)": "Docker デーモンに渡す任意のフラグを指定します。(形式: key=value)", - "Specify arbitrary flags to pass to the build. (format: key=value)": "ビルドに渡す任意のフラグを指定します。(形式: key=value)", + "Specify arbitrary flags to pass to the Docker daemon. (format: key=value)": "Docker デーモンに渡す任意のフラグを指定します (形式: key=value)。", + "Specify arbitrary flags to pass to the build. (format: key=value)": "ビルドに渡す任意のフラグを指定します (形式: key=value)。", "Specifying extra disks is currently only supported for the following drivers: {{.supported_drivers}}. If you can contribute to add this feature, please create a PR.": "追加ディスク指定は現在 {{.supported_drivers}} ドライバーのみ対応しています。本機能の追加に貢献可能な場合、PR を作成してください。", "StartHost failed, but will try again: {{.error}}": "StartHost に失敗しましたが、再度試してみます: {{.error}}", "Starting control plane node {{.name}} in cluster {{.cluster}}": "{{.cluster}} クラスター中のコントロールプレーンの {{.name}} ノードを起動しています", @@ -610,7 +575,6 @@ "Starting tunnel for service {{.service}}.": "{{.service}} サービス用のトンネルを起動しています。", "Starting worker node {{.name}} in cluster {{.cluster}}": "{{.cluster}} クラスター中の {{.name}} ワーカーノードを起動しています", "Starts a local Kubernetes cluster": "ローカルの Kubernetes クラスターを起動します", - "Starts a local kubernetes cluster": "ローカルの Kubernetes クラスターを起動します", "Starts a node.": "ノードを起動します。", "Starts an existing stopped node in a cluster.": "クラスター中の既存の停止ノードを起動します。", "Startup with {{.old_driver}} driver failed, trying with alternate driver {{.new_driver}}: {{.error}}": "{{.old_driver}} ドライバーを用いた始動に失敗しましたが、代わりの {{.new_driver}} ドライバーで再試行しています: {{.error}}", @@ -620,7 +584,7 @@ "Stops a local Kubernetes cluster. This command stops the underlying VM or container, but keeps user data intact. The cluster can be started again with the \"start\" command.": "ローカルの Kubernetes クラスターを停止します。このコマンドは下位層の VM またはコンテナーを停止しますが、ユーザーデータは損なわれずに保持します。クラスターは「start」コマンドで再起動できます。", "Stops a node in a cluster.": "クラスター中のノードを停止します。", "Stops a running local Kubernetes cluster": "ローカル Kubernetes クラスターを停止します", - "Subnet to be used on kic cluster. If left empty, minikube will choose subnet address, beginning from 192.168.49.0. (docker and podman driver only)": "", + "Subnet to be used on kic cluster. If left empty, minikube will choose subnet address, beginning from 192.168.49.0. (docker and podman driver only)": "kic クラスター上で使用されるサブネット。空のままの場合、minikube は 192.168.49.0 で始まるサブネットを選択します (docker、podman ドライバーのみ)。", "Successfully added {{.name}} to {{.cluster}}!": "{{.cluster}} への {{.name}} 追加に成功しました！", "Successfully deleted all profiles": "全てのプロファイルの削除に成功しました", "Successfully mounted {{.sourcePath}} to {{.destinationPath}}": "{{.destinationPath}} への {{.sourcePath}} のマウントに成功しました", @@ -628,7 +592,6 @@ "Successfully started node {{.name}}!": "{{.name}} ノードの起動に成功しました！", "Successfully stopped node {{.name}}": "{{.name}} ノードの停止に成功しました", "Suggestion: {{.advice}}": "提案: {{.advice}}", - "Suggestion: {{.fix}}": "提案: {{.fix}}", "System only has {{.size}}MiB available, less than the required {{.req}}MiB for Kubernetes": "システムは Kubernetes 用に要求された {{.req}}MiB より少ない {{.size}}MiB のみ利用可能です", "Tag images": "イメージのタグ付与", "Tag to apply to the new image (optional)": "新しいイメージに適用するタグ (任意)", @@ -636,51 +599,39 @@ "Target directory {{.path}} must be an absolute path": "ターゲットディレクトリー {{.path}} は絶対パスでなければなりません。", "Target {{.path}} can not be empty": "ターゲット {{.path}} は空にできません", "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 \"{{.name}}\" container runtime requires CNI": "「{{.name}}」コンテナーランタイムは CNI が必要です", + "The \"{{.driver_name}}\" driver should not be used with root privileges. If you wish to continue as root, use --force.": "「{{.driver_name}}」ドライバーは root 権限で使用すべきではありません。root での継続を希望する場合、--force を使用してください。", + "The \"{{.name}}\" container runtime requires CNI": "", "The 'none' driver is designed for experts who need to integrate with an existing VM": "'none' ドライバーは既存 VM の統合が必要なエキスパートに向けて設計されています。", - "The 'none' driver provides limited isolation and may reduce system security and reliability.": "ドライバーに 'none' を指定すると、分離が制限され、システムのセキュリティーと信頼性が低下する可能性があります", "The '{{.addonName}}' addon is enabled": "'{{.addonName}}' アドオンが有効です", "The '{{.driver}}' driver requires elevated permissions. The following commands will be executed:\n\n{{ .example }}\n": "'{{.driver}}' ドライバーは権限昇格が必要です。次のコマンドを実行してください:\n\n{{ .example }}\n", "The '{{.driver}}' provider was not found: {{.error}}": "'{{.driver}}' プロバイダーが見つかりません: {{.error}}", "The '{{.name}} driver does not support multiple profiles: https://minikube.sigs.k8s.io/docs/reference/drivers/none/": "'{{.name}} ドライバーは複数のプロファイルをサポートしていません: https://minikube.sigs.k8s.io/docs/reference/drivers/none/", "The '{{.name}}' driver does not respect the --cpus flag": "'{{.name}}' ドライバーは --cpus フラグを無視します", "The '{{.name}}' driver does not respect the --memory flag": "'{{.name}}' ドライバーは --memory フラグを無視します", - "The --image-repository flag you provided contains Scheme: {{.scheme}}, which will be removed automatically": "", - "The --image-repository flag your provided contains Scheme: {{.scheme}}, which will be removed automatically": "指定された --image-repository フラグは {{.scheme}} スキームを含んでいますので、自動的に削除されます", - "The --image-repository flag your provided ended with a trailing / that could cause conflict in kuberentes, removed automatically": "指定された --image-repository フラグは kubernetes で競合の原因となりうる / が末尾に付いていますので、自動的に削除されます", - "The --image-repository flag your provided ended with a trailing / that could cause conflict in kubernetes, removed automatically": "", + "The --image-repository flag you provided contains Scheme: {{.scheme}}, which will be removed automatically": "指定された --image-repository フラグは {{.scheme}} スキームを含んでいますので、自動的に削除されます", + "The --image-repository flag your provided ended with a trailing / that could cause conflict in kubernetes, removed automatically": "指定された --image-repository フラグは kubernetes で競合の原因となりうる / が末尾に付いていますので、自動的に削除されます", "The CIDR to be used for service cluster IPs.": "サービスクラスター IP に使用される CIDR。", "The CIDR to be used for the minikube VM (virtualbox driver only)": "minikube VM に使用される CIDR (virtualbox ドライバーのみ)", "The KVM QEMU connection URI. (kvm2 driver only)": "KVM QEMU 接続 URI (kvm2 ドライバーのみ)", "The KVM default network name. (kvm2 driver only)": "KVM デフォルトネットワーク名 (kvm2 ドライバーのみ)", "The KVM driver is unable to resurrect this old VM. Please run `minikube delete` to delete it and try again.": "KVM ドライバーはこの古い VM を復元できません。`minikube delete` で VM を削除して、再度試行してください。", - "The KVM network name. (kvm2 driver only)": "KVM ネットワーク名 (kvm2 ドライバーのみ)", - "The OLM addon has stopped working, for more details visit: https://github.com/operator-framework/operator-lifecycle-manager/issues/2534": "", + "The OLM addon has stopped working, for more details visit: https://github.com/operator-framework/operator-lifecycle-manager/issues/2534": "OLM アドオンが機能停止しました。詳細はこちらを参照してください: https://github.com/operator-framework/operator-lifecycle-manager/issues/2534", "The VM driver crashed. Run 'minikube start --alsologtostderr -v=8' to see the VM driver error message": "VM ドライバーがクラッシュしました。'minikube start --alsologtostderr -v=8' を実行して、VM ドライバーのエラーメッセージを参照してください", "The VM driver exited with an error, and may be corrupt. Run 'minikube start' with --alsologtostderr -v=8 to see the error": "VM ドライバーがエラー停止したため、破損している可能性があります。'minikube start --alsologtostderr -v=8' を実行して、エラーを参照してください", "The VM that minikube is configured for no longer exists. Run 'minikube delete'": "minikube が設定された VM はもう存在しません。'minikube delete' を実行してください", "The ambassador addon has stopped working as of v1.23.0, for more details visit: https://github.com/datawire/ambassador-operator/issues/73": "v1.23.0 で ambassador アドオンは機能を停止しました。 詳細はこちらを参照してください: https://github.com/datawire/ambassador-operator/issues/73", "The apiserver listening port": "API サーバーリスニングポート", - "The apiserver name which is used in the generated certificate for kubernetes. This can be used if you want to make the apiserver available from outside the machine": "Kubernetes 用に生成された証明書で使用される API サーバー名。マシンの外部から API サーバーを利用できるようにする場合に使用します", - "The argument to pass the minikube mount command on start": "起動時に minikube マウントコマンドを渡す引数", "The argument to pass the minikube mount command on start.": "起動時に minikube マウントコマンドを渡す引数。", "The authoritative apiserver hostname for apiserver certificates and connectivity. This can be used if you want to make the apiserver available from outside the machine": "API サーバーの証明書と接続のための、権威 API サーバーホスト名。マシン外部から API サーバーに接続できるようにしたい場合に使用します。", "The base image to use for docker/podman drivers. Intended for local development.": "Docker/Podman ドライバーで使用されるベースイメージ。ローカルデプロイ用です。", "The certificate hostname provided appears to be invalid (may be a minikube bug, try 'minikube delete')": "提供された証明書ホスト名が無効のようです (minikube のバグかも知れません。'minikube delete' を試してください)", "The cluster dns domain name used in the Kubernetes cluster": "Kubernetes クラスターで使用されるクラスター DNS ドメイン名", - "The cluster dns domain name used in the kubernetes cluster": "Kubernetes クラスターで使用されるクラスター DNS ドメイン名", "The cluster {{.cluster}} already exists which means the --nodes parameter will be ignored. Use \"minikube node add\" to add nodes to an existing cluster.": "{{.cluster}} クラスターは既に存在するので、--nodes パラメーターは無視されます。「minikube node add」を使って、既存クラスターにノードを追加してください。", - "The container runtime to be used (docker, crio, containerd)": "使用されるコンテナーランタイム (docker、crio、containerd)", "The control plane for \"{{.name}}\" is paused!": "「{{.name}}」用コントロールプレーンは一時停止中です！", "The control plane node \"{{.name}}\" does not exist.": "「{{.name}}」コントロールプレーンノードが存在しません。", "The control plane node is not running (state={{.state}})": "コントロールプレーンノードは実行中ではありません (state={{.state}})", "The control plane node must be running for this command": "このコマンドではコントロールプレーンノードが実行中でなければなりません", - "The cri socket path to be used": "使用される CRI ソケットパス", "The cri socket path to be used.": "使用される CRI ソケットパス。", "The docker-env command is incompatible with multi-node clusters. Use the 'registry' add-on: https://minikube.sigs.k8s.io/docs/handbook/registry/": "docker-env コマンドはマルチノードクラスターと互換性がありません。'registry' アドオンを使用してください: https://minikube.sigs.k8s.io/docs/handbook/registry/", "The docker-env command is only compatible with the \"docker\" runtime, but this cluster was configured to use the \"{{.runtime}}\" runtime.": "docker-env コマンドは「docker」ランタイムとだけ互換性がありますが、このクラスターは「{{.runtime}}」ランタイムを使用するよう設定されています。", @@ -693,12 +644,10 @@ "The image '{{.imageName}}' was not found; unable to add it to cache.": "'{{.imageName}}' イメージは見つかりませんでした (キャッシュに追加できません)。", "The initial time interval for each check that wait performs in seconds": "実行待機チェックの初期時間間隔 (秒)", "The kubeadm binary within the Docker container is not executable": "Docker コンテナー内の kubeadm バイナリーが実行可能形式ではありません", - "The kubernetes version that the minikube VM will use (ex: v1.2.3)": "minikube VM で使用する Kubernetes バージョン (例: v1.2.3)", "The machine-driver specified is failing to start. Try running 'docker-machine-driver-\u003ctype\u003e version'": "指定された machine-driver は起動に失敗しました。'docker-machine-driver-\u003ctype\u003e version' を実行してみてください", "The minikube VM is offline. Please run 'minikube start' to start it again.": "minikube VM がオフラインです。'minikube start' を実行して minikube VM を再起動してください。", "The minikube {{.driver_name}} container exited unexpectedly.": "minikube {{.driver_name}} コンテナーは想定外で終了しました。", "The minimum required version for podman is \"{{.minVersion}}\". your version is \"{{.currentVersion}}\". minikube might not work. use at your own risk. To install latest version please see https://podman.io/getting-started/installation.html": "minikube が要求する podman のバージョンは「{{.minVersion}}」です。あなたのバージョンは「{{.currentVersion}}」です。minikube は動作しないかも知れません。自己責任で使用してください。最新バージョンのインストールには https://podman.io/getting-started/installation.html を参照してください。", - "The name of the network plugin": "ネットワークプラグインの名前", "The named space to activate after start": "起動後にアクティベートするネームスペース", "The node to build on. Defaults to the primary control plane.": "構築するノード。デフォルトは最初のコントロールプレーンです。", "The node to check status for. Defaults to control plane. Leave blank with default format for status on all nodes.": "状態をチェックするノード。デフォルトはコントロールプレーンです。デフォルトフォーマットの空白のままにすると、全ノードの状態になります。", @@ -711,7 +660,6 @@ "The node {{.name}} has ran out of memory.": "{{.name}} ノードはメモリーを使い果たしました。", "The node {{.name}} network is not available. Please verify network settings.": "{{.name}} ノードはネットワークが使用不能です。ネットワーク設定を検証してください。", "The none driver is not compatible with multi-node clusters.": "ノードドライバーはマルチノードクラスターと互換性がありません。", - "The number of bytes to use for 9p packet payload": "9p パケットペイロードに使用するバイト数", "The number of nodes to spin up. Defaults to 1.": "起動するノード数。デフォルトは 1。", "The output format. One of 'json', 'table'": "出力形式。'json', 'table' のいずれか", "The path on the file system where the docs in markdown need to be saved": "markdown で書かれたドキュメントの保存先のファイルシステムパス", @@ -719,7 +667,7 @@ "The path on the file system where the testing docs in markdown need to be saved": "markdown で書かれたテストドキュメントの保存先のファイルシステムパス", "The podman service within '{{.cluster}}' is not active": "'{{.cluster}}' 内の podman サービスが active ではありません", "The podman-env command is incompatible with multi-node clusters. Use the 'registry' add-on: https://minikube.sigs.k8s.io/docs/handbook/registry/": "podman-env コマンドはマルチノードクラスターと互換性がありません。'registry' アドオンを使用してください: https://minikube.sigs.k8s.io/docs/handbook/registry/", - "The podman-env command is only compatible with the \"crio\" runtime, but this cluster was configured to use the \"{{.runtime}}\" runtime.": "", + "The podman-env command is only compatible with the \"crio\" runtime, but this cluster was configured to use the \"{{.runtime}}\" runtime.": "podman-env コマンドは「crio」ランタイムのみ互換性がありますが、このクラスターは「{{.runtime}}」ランタイムを使用するよう設定されています。", "The requested memory allocation of {{.requested}}MiB does not leave room for system overhead (total system memory: {{.system_limit}}MiB). You may face stability issues.": "要求された {{.requested}}MiB のメモリー割当は、システムのオーバーヘッド (合計システムメモリー: {{.system_limit}}MiB) に十分な空きを残しません。安定性の問題に直面するかも知れません。", "The service namespace": "サービスネームスペース", "The service/ingress {{.resource}} requires privileged ports to be exposed: {{.ports}}": "{{.resource}} service/ingress は次の公開用特権ポートを要求します: {{.ports}}", @@ -727,9 +675,7 @@ "The time interval for each check that wait performs in seconds": "実行待機チェックの時間間隔 (秒)", "The value passed to --format is invalid": "--format の値が無効です", "The value passed to --format is invalid: {{.error}}": "--format の値が無効です: {{.error}}", - "The {{.driver_name}} driver should not be used with root privileges.": "{{.driver_name}} ドライバーをルート権限で使用しないでください", "There are a couple ways to enable the required file sharing:\n1. Enable \"Use the WSL 2 based engine\" in Docker Desktop\nor\n2. Enable file sharing in Docker Desktop for the %s%s directory": "必要なファイル共有を有効にする方法が 2 つあります:\n1. Docker Desktop 中の「Use the WSL 2 based engine」を有効にする\nまたは\n2. %s%s ディレクトリー用の Docker Desktop でファイル共有を有効にする", - "There's a new version for '{{.driver_executable}}'. Please consider upgrading. {{.documentation_url}}": "新バージョンの '{{.driver_executable}}' があります。アップグレードを検討してください。{{.documentation_url}}", "These --extra-config parameters are invalid: {{.invalid_extra_opts}}": "次の --extra-config パラメーターは無効です: {{.invalid_extra_opts}}", "These changes will take effect upon a minikube delete and then a minikube start": "これらの変更は minikube delete の後に minikube start を実行すると反映されます", "Things to try without Kubernetes ...": "Kubernetes なしで試すべきこと ...", @@ -741,16 +687,12 @@ "This is a known issue with BTRFS storage driver, there is a workaround, please checkout the issue on GitHub": "これは BTRFS ストレージドライバーの既知の問題です (回避策があります)。GitHub の issue を確認してください", "This is unusual - you may want to investigate using \"{{.command}}\"": "これは異常です - 「{{.command}}」を使って調査できます", "This will keep the existing kubectl context and will create a minikube context.": "これにより既存の kubectl コンテキストが保持され、minikube コンテキストが作成されます。", - "This will start the mount daemon and automatically mount files into minikube": "これによりマウントデーモンが起動し、ファイルが minikube に自動的にマウントされます", "This will start the mount daemon and automatically mount files into minikube.": "これによりマウントデーモンが起動し、ファイルが minikube に自動的にマウントされます。", "This {{.type}} is having trouble accessing https://{{.repository}}": "この {{.type}} は https://{{.repository}} アクセスにおける問題があります", "Tip: To remove this root owned cluster, run: sudo {{.cmd}}": "ヒント: この root 所有クラスターの削除コマンド: sudo {{.cmd}}", - "Tip: To remove this root owned cluster, run: sudo {{.cmd}} delete": "ヒント: この root 所有クラスターの削除コマンド: sudo {{.cmd}} delete", "To access Headlamp, use the following command:\nminikube service headlamp -n headlamp\n\n": "", "To authenticate in Headlamp, fetch the Authentication Token using the following command:\n\nexport SECRET=$(kubectl get secrets --namespace headlamp -o custom-columns=\":metadata.name\" | grep \"headlamp-token\")\nkubectl get secret $SECRET --namespace headlamp --template=\\{\\{.data.token\\}\\} | base64 --decode\n\t\t\t\n": "", "To connect to this cluster, use: --context={{.name}}": "このクラスターに接続するためには、--context={{.name}} を使用します", - "To connect to this cluster, use: kubectl --context={{.name}}": "このクラスターに接続するためには、kubectl --context={{.name}} を使用します", - "To connect to this cluster, use: kubectl --context={{.name}}__1": "このクラスターに接続するためには、kubectl --context={{.name}} を使用します", "To connect to this cluster, use: kubectl --context={{.profile_name}}": "このクラスターに接続するためには、kubectl --context={{.profile_name}} を使用します", "To disable beta notices, run: 'minikube config set WantBetaUpdateNotification false'": "ベータ通知を無効にするためには、'minikube config set WantBetaUpdateNotification false' を実行します", "To disable this notice, run: 'minikube config set WantUpdateNotification false'\n": "この通知を無効にするためには、'minikube config set WantUpdateNotification false' を実行します\n", @@ -764,10 +706,10 @@ "Troubleshooting Commands:": "トラブルシュート用コマンド:", "Try 'minikube delete' to force new SSL certificates to be installed": "新しい SSL 証明書を強制インストールするためには、'minikube delete' を試してください", "Try 'minikube delete', and disable any conflicting VPN or firewall software": "'minikube delete' を試して、衝突している VPN あるいはファイアウォールソフトウェアを無効化してください", - "Try one or more of the following to free up space on the device:\n\t\n\t\t\t1. Run \"docker system prune\" to remove unused Docker data (optionally with \"-a\")\n\t\t\t2. Increase the storage allocated to Docker for Desktop by clicking on:\n\t\t\t\tDocker icon \u003e Preferences \u003e Resources \u003e Disk Image Size\n\t\t\t3. Run \"minikube ssh -- docker system prune\" if using the Docker container runtime": "", - "Try one or more of the following to free up space on the device:\n\t\n\t\t\t1. Run \"sudo podman system prune\" to remove unused podman data\n\t\t\t2. Run \"minikube ssh -- docker system prune\" if using the Docker container runtime": "", + "Try one or more of the following to free up space on the device:\n\t\n\t\t\t1. Run \"docker system prune\" to remove unused Docker data (optionally with \"-a\")\n\t\t\t2. Increase the storage allocated to Docker for Desktop by clicking on:\n\t\t\t\tDocker icon \u003e Preferences \u003e Resources \u003e Disk Image Size\n\t\t\t3. Run \"minikube ssh -- docker system prune\" if using the Docker container runtime": "このデバイスで容量を開放するために、次のうち 1 つ以上を試してください:\n\t\n\t\t\t1. 「sudo docker system prune」を実行して未使用の Docker データを削除する (オプションで「-a」も付与して)\n\t\t\t2. 以下のクリックで Docker for Desktop に割り当てるストレージを増やす\n\t\t\t\tDocker icon \u003e Preferences \u003e Resources \u003e Disk Image Size\n\t\t\t3. Docker コンテナランタイムを使用する場合、「minikube ssh -- docker system prune」を実行する", + "Try one or more of the following to free up space on the device:\n\t\n\t\t\t1. Run \"sudo podman system prune\" to remove unused podman data\n\t\t\t2. Run \"minikube ssh -- docker system prune\" if using the Docker container runtime": "このデバイスで容量を開放するために、次のうち 1 つ以上を試してください:\n\t\n\t\t\t1. 「sudo podman system prune」を実行して未使用の podman データを削除する\n\t\t\t2. Docker コンテナランタイムを使用している場合、「minikube ssh -- docker system prune」を実行する", "Trying to delete invalid profile {{.profile}}": "無効なプロファイル {{.profile}} を削除中", - "Tunnel successfully started": "", + "Tunnel successfully started": "トンネルが無事開始しました", "Unable to bind flags": "フラグをバインドできません", "Unable to create dedicated network, this might result in cluster IP change after restart: {{.error}}": "独立したネットワークの作成ができず、再起動後にクラスター IP が変更される結果になるかも知れません: {{.error}}", "Unable to enable dashboard": "ダッシュボードが有効になりません", @@ -776,7 +718,6 @@ "Unable to generate docs": "ドキュメントを生成できません", "Unable to generate the documentation. Please ensure that the path specified is a directory, exists \u0026 you have permission to write to it.": "ドキュメントを生成できません。指定されたパスが、書き込み権限が付与された既存のディレクトリーかどうか確認してください。", "Unable to get CPU info: {{.err}}": "CPU 情報が取得できません: {{.err}}", - "Unable to get bootstrapper: {{.error}}": "ブートストラッパーを取得できません: {{.error}}", "Unable to get command runner": "コマンドランナーを取得できません", "Unable to get control plane status: {{.error}}": "コントロールプレーンの状態を取得できません: {{.error}}", "Unable to get current user": "現在のユーザーを取得できません", @@ -785,17 +726,13 @@ "Unable to get runtime": "ランタイムを取得できません", "Unable to kill mount process: {{.error}}": "mount プロセスを停止できません: {{.error}}", "Unable to list profiles: {{.error}}": "プロファイルのリストを作成できません: {{.error}}", - "Unable to load cached images from config file.": "キャッシュされたイメージを設定ファイルから読み込めません。", "Unable to load cached images: {{.error}}": "キャッシュされたイメージを読み込めません: {{.error}}", "Unable to load config: {{.error}}": "設定を読み込めません: {{.error}}", "Unable to load host": "ホストを読み込めません", "Unable to load profile: {{.error}}": "プロファイルを読み込めません: {{.error}}", "Unable to parse \"{{.kubernetes_version}}\": {{.error}}": "「{{.kubernetes_version}}」を解析できません: {{.error}}", - "Unable to parse default Kubernetes version from constants: {{.error}}": "定数からデフォルトの Kubernetes バージョンを解析できません: {{.error}}", "Unable to parse memory '{{.memory}}': {{.error}}": "メモリー '{{.memory}}' を解析できません: {{.error}}", - "Unable to parse oldest Kubernetes version from constants: {{.error}}": "定数から最古の Kubernetes バージョンを解析できません: {{.error}}", "Unable to pick a default driver. Here is what was considered, in preference order:": "デフォルトドライバーを採用できませんでした。こちらが可能性の高い順に考えられる事です:", - "Unable to pull images, which may be OK: {{.error}}": "イメージを取得できませんが、問題ありません。{{.error}}", "Unable to push cached images: {{.error}}": "キャッシュされたイメージを登録できません: {{.error}}", "Unable to remove machine directory": "マシンディレクトリーを削除できません", "Unable to restart cluster, will reset it: {{.error}}": "クラスターを再起動できません (リセットします): {{.error}}", @@ -808,7 +745,6 @@ "Unpause": "再稼働", "Unpaused {{.count}} containers": "{{.count}} 個のコンテナーを再稼働させました", "Unpaused {{.count}} containers in: {{.namespaces}}": "次のネームスペースに存在する {{.count}} 個のコンテナーを再稼働させました: {{.namespaces}}", - "Unpausing node {{.name}} ...": "{{.name}} ノードを再稼働させています ...", "Unpausing node {{.name}} ... ": "{{.name}} ノードを再稼働させています ... ", "Unset the KUBECONFIG environment variable, or verify that it does not point to an empty or otherwise invalid path": "環境変数 KUBECONFIG をセット解除するか、同変数が空または不正なパスに設定されていないことを確認してください", "Unset variables instead of setting them": "変数をセットせず解除します", @@ -817,7 +753,6 @@ "Update server returned an empty list": "空リストを返したサーバーを更新してください", "Updating the running {{.driver_name}} \"{{.cluster}}\" {{.machine_type}} ...": "実行中の {{.driver_name}} 「{{.cluster}}」 {{.machine_type}} を更新しています...", "Upgrade to QEMU v3.1.0+, run 'virt-host-validate', or ensure that you are not running in a nested VM environment.": "QEMU v3.1.0 以降にアップグレードするか、'virt-host-validate' を実行するか、ネストされた VM 環境中で実行されていないことを確認してください。", - "Upgrading from Kubernetes {{.old}} to {{.new}}": "Kubernetes を {{.old}} から {{.new}} にアップグレードしています", "Usage": "使用法", "Usage: minikube completion SHELL": "使用法: minikube completion SHELL", "Usage: minikube delete": "使用法: minikube delete", @@ -838,24 +773,20 @@ "User name '{{.username}}' is not valid": "ユーザー名 '{{.username}}' は無効です", "User name must be 60 chars or less.": "ユーザー名は 60 文字以内でなければなりません。", "Userspace file server is shutdown": "ユーザースペースのファイルサーバーが停止しました", - "Userspace file server:": "ユーザースペースのファイルサーバー:", "Userspace file server: ": "ユーザースペースのファイルサーバー: ", "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 rootless Docker driver was required, but the current Docker does not seem rootless. Try 'docker context use rootless' .": "rootless Docker ドライバー使用が必要でしたが、現在の Docker は rootless が必要ないようです。'docker context use rootless' を試してみてください。", + "Using rootless driver was required, but the current driver does not seem rootless": "rootless ドライバー使用が必要でしたが、現在のドライバーは rootless が必要ないようです", + "Using rootless {{.driver_name}} driver": "rootless {{.driver_name}} ドライバー使用", "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 root privileges": "", - "VM driver is one of: %v": "VM ドライバーは次のいずれかです: %v", + "Using {{.driver_name}} driver with root privileges": "root 権限を持つ {{.driver_name}} ドライバーを使用", "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 ネットワークを検証してください", - "Validation unable to parse disk size '{{.diskSize}}': {{.error}}": "検証機能がディスクのサイズ '{{.diskSize}}' をパースできませんでした: {{.error}}", "Verify that your HTTP_PROXY and HTTPS_PROXY environment variables are set correctly.": "HTTP_PROXY と HTTPS_PROXY 環境変数が正しく設定されているかを確認してください。", - "Verify the IP address of the running cluster in kubeconfig.": "kubeconfig 内の実行中のクラスターの IP アドレスを確認してください。", "Verifying Kubernetes components...": "Kubernetes コンポーネントを検証しています...", "Verifying dashboard health ...": "ダッシュボードの状態を検証しています...", "Verifying proxy health ...": "プロキシーの状態を検証しています...", @@ -868,34 +799,27 @@ "VirtualBox is unable to find its network interface. Try upgrading to the latest release and rebooting.": "VirtualBox はネットワークインターフェイスを検出できません。最新版にアップデートして、OS を再起動してみてください。", "Virtualization support is disabled on your computer. If you are running minikube within a VM, try '--driver=docker'. Otherwise, consult your systems BIOS manual for how to enable virtualization.": "このコンピューターでは仮想化サポートが無効です。VM 内で minikube を実行する場合、'--driver=docker' を試してみてください。そうでなければ、仮想化を有効化する方法を BIOS の説明書を調べてください。", "Wait failed: {{.error}}": "待機に失敗しました: {{.error}}", - "Wait until Kubernetes core services are healthy before exiting": "終了する前に、Kubernetes コアサービスが正常になるまで待機してください", "Want kubectl {{.version}}? Try 'minikube kubectl -- get pods -A'": "kubectl {{.version}} が必要ですか？ 'minikube kubectl -- get pods -A' を試してみてください", "Where to root the NFS Shares, defaults to /nfsshares (hyperkit driver only)": "NFS 共有のルートに指定する場所。デフォルトは /nfsshares (hyperkit ドライバーのみ)", "Whether to use external switch over Default Switch if virtual switch not explicitly specified. (hyperv driver only)": "仮想スイッチが明示的に設定されていない場合、Default Switch 越しに外部のスイッチを使用するかどうか (Hyper-V ドライバーのみ)。", "With --network-plugin=cni, you will need to provide your own CNI. See --cni flag as a user-friendly alternative": "--network-plugin=cni を用いる場合、自身の CNI を提供する必要があります。便利な代替策として --cni フラグを参照してください", "You appear to be using a proxy, but your NO_PROXY environment does not include the minikube IP ({{.ip_address}}).": "プロキシーを使用しようとしていますが、minikube の IP ({{.ip_address}}) が NO_PROXY 環境変数に含まれていません。", - "You appear to be using a proxy, but your NO_PROXY environment does not include the minikube IP ({{.ip_address}}). Please see {{.documentation_url}} for more details": "プロキシーを使用しようとしていますが、minikube の IP ({{.ip_address}}) が NO_PROXY 環境変数に含まれていません。詳細は {{.documentation_url}} を参照してください", "You are trying to run a windows .exe binary inside WSL. For better integration please use a Linux binary instead (Download at https://minikube.sigs.k8s.io/docs/start/.). Otherwise if you still want to do this, you can do it using --force": "WSL 内で Windows の .exe バイナリーを実行しようとしています。これより優れた統合として、Linux バイナリーを代わりに使用してください (https://minikube.sigs.k8s.io/docs/start/ でダウンロードしてください)。そうではなく、引き続きこのバイナリーを使用したい場合、--force オプションを使用してください", - "You are trying to run amd64 binary on M1 system. Please consider running darwin/arm64 binary instead (Download at {{.url}}.)": "M1 システム上で amd64 バイナリーを実行しようとしています。darwin/arm64 バイナリーを代わりに実行することをご検討ください ({{.url}} でダウンロードしてください)。", - "You are trying to run the amd64 binary on an M1 system.\nPlease consider running the darwin/arm64 binary instead.\nDownload at {{.url}}": "", - "You can also use 'minikube kubectl -- get pods' to invoke a matching version": "一致するバージョンを実行するために、'minikube kubectl -- get pods' も使用できます", - "You can create one using 'minikube start'.\n\t\t": "", - "You can delete them using the following command(s):": "次のコマンドで削除できます:", + "You are trying to run the amd64 binary on an M1 system.\nPlease consider running the darwin/arm64 binary instead.\nDownload at {{.url}}": "M1 システム上で amd64 バイナリーを実行しようとしています。\ndarwin/arm64 バイナリーを代わりに実行することをご検討ください。\n{{.url}} でダウンロードしてください。", + "You can create one using 'minikube start'.\n\t\t": "'minikube start' を使って新しいものを作成できます。\n\t\t", "You can delete them using the following command(s): ": "次のコマンドで削除できます: ", "You can force an unsupported Kubernetes version via the --force flag": "--force フラグを介して、サポート外の Kubernetes バージョンを強制的に使用できます", "You cannot add or remove extra disks for an existing minikube cluster. Please first delete the cluster.": "既存の minikube クラスターに対して、外部ディスクを追加または削除できません。最初にクラスターを削除してください。", "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 file. The GCP Auth addon 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 authenticated with a service account that does not have an associated JSON file. The GCP Auth addon requires credentials with a JSON file 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", "You may need to manually remove the \"{{.name}}\" VM from your hypervisor": "ハイパーバイザーから「{{.name}}」VM を手動で削除することが必要かもしれません", "You may need to stop the Hyper-V Manager and run `minikube delete` again.": "Hyper-V マネージャーを停止して、'minikube delete' を再度実行する必要があるかもしれません。", "You might be using an amd64 version of minikube on a M1 Mac, use the arm64 version of minikube instead": "M1 Mac 上で amd64 版 minikube を使用しているかもしれません。代わりに arm64 版 minikube を使用してください", - "You must specify a service name": "サービス名を指定する必要があります", - "You must specify service name(s) or --all": "", + "You must specify service name(s) or --all": "サービス名か --all を指定する必要があります", "Your GCP credentials will now be mounted into every pod created in the {{.name}} cluster.": "あなたの GCP クレデンシャルは、{{.name}} クラスターに作成された各 Pod にマウントされます。", "Your cgroup does not allow setting memory.": "あなたの cgroup ではメモリーの設定ができません。", "Your host does not support KVM virtualization. Ensure that qemu-kvm is installed, and run 'virt-host-validate' to debug the problem": "ホストが KVM 仮想化をサポートしていません。 qemu-kvm がインストールされていることを確認し、'virt-host-validate' を実行して問題を調査してください", @@ -903,10 +827,9 @@ "Your host is failing to route packets to the minikube VM. If you have VPN software, try turning it off or configuring it so that it does not re-route traffic to the VM IP. If not, check your VM environment routing options.": "ホストが minikube の VM へのパケットルーティングに失敗しています。VPN ソフトウェアがある場合、VPN を無効にするか、VM の IP アドレスにトラフィックを再ルーティングしないように VPN を設定してください。VPN ソフトウェアがない場合、VM 環境のルーティングオプションを確認してください。", "Your minikube config refers to an unsupported driver. Erase ~/.minikube, and try again.": "minikube 設定がサポートされていないドライバーを参照しています。 ~/.minikube を削除して、もう一度試してください。", "Your minikube vm is not running, try minikube start.": "minikube の VM が実行されていません。minikube start を試してみてください。", - "Your user lacks permissions to the minikube profile directory. Run: 'sudo chown -R $USER $HOME/.minikube; chmod -R u+wrx $HOME/.minikube' to fix": "", + "Your user lacks permissions to the minikube profile directory. Run: 'sudo chown -R $USER $HOME/.minikube; chmod -R u+wrx $HOME/.minikube' to fix": "アカウントが minikube プロファイルディレクトリーへの書き込み権限を持っていません。問題修正のため、'sudo chown -R $USER $HOME/.minikube; chmod -R u+wrx $HOME/.minikube' を実行してください", "[WARNING] For full functionality, the 'csi-hostpath-driver' addon requires the 'volumesnapshots' addon to be enabled.\n\nYou can enable 'volumesnapshots' addon by running: 'minikube addons enable volumesnapshots'\n": "[警告] フル機能のために、'csi-hostpath-driver' アドオンが 'volumesnapshots' アドオンの有効化を要求しています。\n\n'minikube addons enable volumesnapshots' を実行して 'volumesnapshots' を有効化できます\n", - "[{{.id}}] {{.msg}} {{.error}}": "[{{.id}}] {{.msg}} {{.error}}", - "adding node": "ノードを追加しています", + "\"minikube cache\" will be deprecated in upcoming versions, please switch to \"minikube image load\"": "「minikube cache」は今後のバージョンで廃止予定になりますので、「minikube image load」に切り替えてください", "addon '{{.name}}' is currently not enabled.\nTo enable this addon run:\nminikube addons enable {{.name}}": "'{{.name}}' アドオンは現在無効になっています。\n有効にするためには、以下のコマンドを実行してください。 \nminikube addons enable {{.name}}", "addon '{{.name}}' is not a valid addon packaged with minikube.\nTo see the list of available addons run:\nminikube addons list": "'{{.name}}' は minikube にパッケージングされた有効なアドオンではありません。\n利用可能なアドオンの一覧を表示するためには、以下のコマンドを実行してください。 \nminikube addons list", "addons modifies minikube addons files using subcommands like \"minikube addons enable dashboard\"": "addons コマンドは「minikube addons enable dashboard」のようなサブコマンドを使用することで、minikube アドオンファイルを修正します", @@ -917,9 +840,8 @@ "call with cleanup=true to remove old tunnels": "cleanup=true で呼び出すことで、古いトンネルを削除してください", "cancel any existing scheduled stop requests": "既存のスケジュール済み停止要求をキャンセルしてください", "cannot specify --kubernetes-version with --no-kubernetes,\nto unset a global config run:\n\n$ minikube config unset kubernetes-version": "--kubernetes-version と --no-kubernetes を同時に指定できません。\nグローバル設定を解除するコマンド:\n\n$ minikube config unset kubernetes-version", - "config modifies minikube config files using subcommands like \"minikube config set driver kvm\"\nConfigurable fields:\n\n": "config コマンドは「minikube config set driver kvm」のようにサブコマンドを使用して、minikube 設定ファイルを編集します。 \n設定可能なフィールド:\n\n", "config modifies minikube config files using subcommands like \"minikube config set driver kvm2\"\nConfigurable fields: \n\n": "config コマンドは「minikube config set driver kvm2」のようにサブコマンドを使用して、minikube 設定ファイルを編集します。 \n設定可能なフィールド:\n\n", - "config view failed": "設定表示が失敗しました", + "config view failed": "", "containers paused status: {{.paused}}": "コンテナー停止状態: {{.paused}}", "dashboard service is not running: {{.error}}": "ダッシュボードサービスが実行していません: {{.error}}", "delete ctx": "", @@ -929,7 +851,7 @@ "dry-run validation complete!": "dry-run の検証が終了しました！", "enable failed": "有効化に失敗しました", "error creating clientset": "clientset 作成中にエラー", - "error creatings urls": "", + "error creatings urls": "URL 作成でエラー", "error getting defaults: {{.error}}": "", "error getting primary control plane": "最初のコントロールプレーン取得中にエラー", "error getting ssh port": "SSH ポートを取得中にエラー", @@ -937,15 +859,13 @@ "error parsing the input ip address for mount": "マウント用に入力された IP アドレスをパース中にエラー", "error provisioning guest": "ゲストのプロビジョン中にエラー", "error starting tunnel": "トンネル開始中にエラー", - "error stopping tunnel": "トンネル停止中にエラー", "error: --output must be 'text', 'yaml' or 'json'": "エラー: --output は 'text'、'yaml'、'json' のいずれかでなければなりません", "error: --output must be 'yaml' or 'json'": "エラー: --output は 'yaml'、'json' のいずれかでなければなりません", "experimental": "実験的", "failed to add node": "ノード追加に失敗しました", "failed to open browser: {{.error}}": "ブラウザー起動に失敗しました: {{.error}}", "failed to save config": "設定保存に失敗しました", - "failed to set cloud shell kubelet config options": "クラウドシェル kubelet 設定オプションの設定に失敗しました", - "failed to set extra option": "", + "failed to set extra option": "追加オプションの設定に失敗しました", "failed to start node": "ノード開始に失敗しました", "fish completion failed": "fish のコマンド補完に失敗しました", "fish completion.": "fish のコマンド補完です。", @@ -961,19 +881,14 @@ "kubectl proxy": "", "libmachine failed": "libmachine が失敗しました", "list displays all valid default settings for PROPERTY_NAME\nAcceptable fields: \n\n": "PROPERTY_NAME 用の有効なデフォルト設定を全て表示します。\n受け入れ可能なフィールド:\n\n", - "list versions of all components included with minikube. (the cluster must be running)": "minikube に含まれる全コンポーネントのバージョン一覧を出力します。(クラスターが実行中でなければなりません)", + "list versions of all components included with minikube. (the cluster must be running)": "minikube に含まれる全コンポーネントのバージョン一覧を出力します (クラスターが実行中でなければなりません)。", "loading profile": "プロファイルを読み込み中", - "logdir set failed": "logdir 設定が失敗しました", - "max time to wait per Kubernetes core services to be healthy.": "Kubernetes のコアサービスが正常稼働するまでの最大待機時間", "max time to wait per Kubernetes or host to be healthy.": "Kubernetes またはホストが正常稼働するまでの最大待機時間", "minikube addons list --output OUTPUT. json, list": "minikube addons list --output OUTPUT. json, list", - "minikube does not support the BTRFS storage driver yet, there is a workaround, add the following flag to your start command `--feature-gates=\"LocalStorageCapacityIsolation=false\"`": "", - "minikube is exiting due to an error. If the above message is not useful, open an issue:": "minikube がエラーで終了しました。上記メッセージが有用でない場合、Issue を作成してください: ", + "minikube does not support the BTRFS storage driver yet, there is a workaround, add the following flag to your start command `--feature-gates=\"LocalStorageCapacityIsolation=false\"`": "minikube はまだ BTRFS ストレージドライバーに対応していませんが、回避策があります。次のフラグを start コマンドに追加してください: `--feature-gates=\"LocalStorageCapacityIsolation=false\"` ", "minikube is missing files relating to your guest environment. This can be fixed by running 'minikube delete'": "minikube はあなたのゲスト環境に関連するファイルを見失いました。これは 'minikube delete' を実行することで修正できます", "minikube is not meant for production use. You are opening non-local traffic": "minikube は本番適用を意図されたものではありません。あなたは非ローカルのトラフィックを開こうとしています", - "minikube is not yet compatible with ChromeOS": "minikube はまだ ChromeOS と互換性がありません", "minikube is unable to access the Google Container Registry. You may need to configure it to use a HTTP proxy.": "minikube が Google Container Registry に接続できません。 HTTP プロキシーを使用するように設定する必要があるかもしれません。", - "minikube is unable to connect to the VM: {{.error}}\n\n\tThis is likely due to one of two reasons:\n\n\t- VPN or firewall interference\n\t- {{.hypervisor}} network configuration issue\n\n\tSuggested workarounds:\n\n\t- Disable your local VPN or firewall software\n\t- Configure your local VPN or firewall to allow access to {{.ip}}\n\t- Restart or reinstall {{.hypervisor}}\n\t- Use an alternative --vm-driver\n\t- Use --force to override this connectivity check": "minikube が VM に接続できません: {{.error}}\n\n\t考えられる理由は以下の 2 つです:\n\n\t- VPN またはファイアウォールによる干渉\n\t- {{.hypervisor}} のネットワーク設定の問題\n\n\t回避策には以下があります:\n\n\t- ローカルの VPN またはファイアウォールを無効化\n\t- {{.ip}} へのアクセスを許可するようにローカルの VPN またはファイアウォールを設定\n\t- {{.hypervisor}} を再起動または再インストール\n\t- 代わりの --vm-driver を使用\n\t- --force を使用してこの接続チェックを上書き", "minikube is unable to connect to the VM: {{.error}}\n\n\tThis is likely due to one of two reasons:\n\n\t- VPN or firewall interference\n\t- {{.hypervisor}} network configuration issue\n\n\tSuggested workarounds:\n\n\t- Disable your local VPN or firewall software\n\t- Configure your local VPN or firewall to allow access to {{.ip}}\n\t- Restart or reinstall {{.hypervisor}}\n\t- Use an alternative --vm-driver\n\t- Use --force to override this connectivity check\n\t": "minikube が VM に接続できません: {{.error}}\n\n\t考えられる理由は以下の 2 つです:\n\n\t- VPN またはファイアウォールによる干渉\n\t- {{.hypervisor}} のネットワーク設定の問題\n\n\t回避策には以下があります:\n\n\t- ローカルの VPN またはファイアウォールを無効化\n\t- {{.ip}} へのアクセスを許可するようにローカルの VPN またはファイアウォールを設定\n\t- {{.hypervisor}} を再起動または再インストール\n\t- 代わりの --vm-driver を使用\n\t- --force を使用してこの接続チェックを上書き\n\t", "minikube profile was successfully set to {{.profile_name}}": "無事 minikube のプロファイルが {{.profile_name}} に設定されました", "minikube provisions and manages local Kubernetes clusters optimized for development workflows.": "minikube は、開発ワークフロー用に最適化されたローカル Kubernetes クラスターを構築・管理します。", @@ -995,29 +910,23 @@ "numa node is only supported on k8s v1.18 and later": "NUMA ノードは k8s v1.18 以降でのみサポートされます", "output layout (EXPERIMENTAL, JSON only): 'nodes' or 'cluster'": "出力形式 (実験的、JSON のみ): 'nodes' または 'cluster'", "pause Kubernetes": "Kubernetes を一時停止させます", - "pause containers": "コンテナーを一時停止させます", - "preload extraction failed: \"No space left on device\"": "", - "preload extraction failed: \\\"No space left on device\\\"": "プリロードの展開に失敗しました: 「デバイスに空きスペースがありません」", + "preload extraction failed: \"No space left on device\"": "プリロードの展開に失敗しました: 「デバイスに空きスペースがありません」", "profile sets the current minikube profile, or gets the current profile if no arguments are provided. This is used to run and manage multiple minikube instance. You can return to the default minikube profile by running `minikube profile default`": "profile は現在の minikube プロファイルを設定します (profile に引数を指定しない場合、現在のプロファイルを取得します)。このコマンドは複数の minikube インスタンスを管理するのに使用されます。`minikube profile default` でデフォルトの minikube プロファイルを返します", "provisioning host for node": "ノード用ホストの構築中", "reload cached images.": "登録済のイメージを再登録します。", "reloads images previously added using the 'cache add' subcommand": "以前 'cache add' サブコマンドを用いて登録されたイメージを再登録します", "retrieving node": "ノードを取得しています", - "saving node": "ノードを保存しています", "scheduled stop is not supported on the none driver, skipping scheduling": "none ドライバーでは予定停止がサポートされていません (予約をスキップします)", "service {{.namespace_name}}/{{.service_name}} has no node port": "サービス {{.namespace_name}}/{{.service_name}} は NodePort がありません", "set tunnel bind address, empty or '*' indicates the tunnel should be available for all interfaces": "", - "startup failed": "起動に失敗しました", "stat failed": "stat に失敗しました", "status json failure": "status json に失敗しました", "status text failure": "status text に失敗しました", "too many arguments ({{.ArgCount}}).\nusage: minikube config set PROPERTY_NAME PROPERTY_VALUE": "引数 ({{.ArgCount}} 個) が多すぎます。\n使用法: minikube config set PROPERTY_NAME PROPERTY_VALUE", "tunnel creates a route to services deployed with type LoadBalancer and sets their Ingress to their ClusterIP. for a detailed example see https://minikube.sigs.k8s.io/docs/tasks/loadbalancer": "tunnel は LoadBalancer タイプで作成されたサービスへのルートを作成し、Ingress をサービスの ClusterIP に設定します。詳細例は https://minikube.sigs.k8s.io/docs/tasks/loadbalancer を参照してください", - "tunnel makes services of type LoadBalancer accessible on localhost": "tunnel は LoadBalancer タイプのサービスを localhost からアクセス可能にします", "unable to bind flags": "フラグをバインドできません", "unable to daemonize: {{.err}}": "デーモン化できません: {{.err}}", "unable to delete minikube config folder": "minikube の設定フォルダーを削除できません", - "unable to set logtostderr": "logtostderr を設定できません", "unpause Kubernetes": "Kubernetes を停止解除します", "unset failed": "unset に失敗しました", "unsets PROPERTY_NAME from the minikube config file. Can be overwritten by flags or environmental variables": "minikube 設定ファイルから PROPERTY_NAME の設定を解除します。フラグまたは環境変数で上書き可能です", @@ -1042,30 +951,22 @@ "zsh completion.": "zsh のコマンド補完です。", "{{ .name }}: Suggestion: {{ .suggestion}}": "{{ .name }}: 提案: {{ .suggestion}}", "{{.Driver}} is currently using the {{.StorageDriver}} storage driver, consider switching to overlay2 for better performance": "{{.Driver}} は現在 {{.StorageDriver}} ストレージドライバーを使用しています。性能向上のため overlay2 への切替を検討してください", - "{{.cluster}} IP has been updated to point at {{.ip}}": "{{.cluster}} の IP アドレスは {{.ip}} に更新されました", - "{{.cluster}} IP was already correctly configured for {{.ip}}": "{{.cluster}} の IP アドレスはすでに {{.ip}} に設定されています", - "{{.count}} nodes stopped.": "{{.count}} 台のノードが停止しました。", "{{.count}} node{{if gt .count 1}}s{{end}} stopped.": "{{.count}} 台のノードが停止しました。", "{{.driver_name}} \"{{.cluster}}\" {{.machine_type}} is missing, will recreate.": "{{.driver_name}} 「 {{.cluster}} 」 {{.machine_type}} がありません。再生成します。", "{{.driver_name}} couldn't proceed because {{.driver_name}} service is not healthy.": "{{.driver_name}} サービスが正常ではないため、{{.driver_name}} は機能しません。", "{{.driver_name}} has less than 2 CPUs available, but Kubernetes requires at least 2 to be available": "{{.driver_name}} で利用できる CPU が 2 個未満ですが、Kubernetes を使用するには 2 個以上の CPU が必要です", "{{.driver_name}} has only {{.container_limit}}MB memory but you specified {{.specified_memory}}MB": "{{.driver_name}} は {{.container_limit}}MB のメモリーしか使用できませんが、{{.specified_memory}}MB のメモリー使用を指定されました", - "{{.driver}} does not appear to be installed": "{{.driver}} がインストールされていないようです", - "{{.driver}} does not appear to be installed, but is specified by an existing profile. Please run 'minikube delete' or install {{.driver}}": "{{.driver}} がインストールされていないようですが、既存のプロファイルから指定されています。'minikube delete' を実行するか、{{.driver}} をインストールしてください", "{{.driver}} only has {{.size}}MiB available, less than the required {{.req}}MiB for Kubernetes": "{{.driver}} は Kubernetes に必要な {{.req}}MiB 未満の {{.size}}MiB しか使用できません", "{{.name}} doesn't have images.": "{{.name}} はイメージがありません。", "{{.name}} has following images:": "{{.name}} は次のイメージがあります:", "{{.name}} has no available configuration options": "{{.name}} には利用可能な設定オプションがありません", "{{.name}} is already running": "{{.name}} はすでに実行中です", "{{.name}} was successfully configured": "{{.name}} は正常に設定されました", - "{{.n}} is nearly out of disk space, which may cause deployments to fail! ({{.p}}% of capacity)": "{{.n}} はほとんどディスクがいっぱいで、デプロイが失敗する原因になりかねません！(容量の {{.p}}%)", - "{{.n}} is nearly out of disk space, which may cause deployments to fail! ({{.p}}% of capacity). You can pass '--force' to skip this check.": "", - "{{.n}} is out of disk space! (/var is at {{.p}}% of capacity)": "{{.n}} はディスクがいっぱいです！(/var は容量の {{.p}}% です)", - "{{.n}} is out of disk space! (/var is at {{.p}}% of capacity). You can pass '--force' to skip this check.": "", + "{{.n}} is nearly out of disk space, which may cause deployments to fail! ({{.p}}% of capacity). You can pass '--force' to skip this check.": "{{.n}} はほとんどディスクがいっぱいで、デプロイが失敗する原因になりかねません！(容量の {{.p}}%)。'--force' を指定するとこのチェックをスキップできます。", + "{{.n}} is out of disk space! (/var is at {{.p}}% of capacity). You can pass '--force' to skip this check.": "{{.n}} はディスクがいっぱいです！(/var は容量の {{.p}}% です)。'--force' を指定するとこのチェックをスキップできます。", "{{.ociBin}} rmi {{.images}}": "", "{{.ocibin}} is taking an unsually long time to respond, consider restarting {{.ocibin}}": "{{.ocibin}} の反応が異常なほど長時間かかっています。{{.ocibin}} の再起動を検討してください", "{{.path}} is version {{.client_version}}, which may have incompatibilites with Kubernetes {{.cluster_version}}.": "{{.path}} のバージョンは {{.client_version}} で、Kubernetes {{.cluster_version}} と互換性がないかもしれません。", - "{{.path}} is v{{.client_version}}, which may be incompatible with Kubernetes v{{.cluster_version}}.": "{{.path}} のバージョンは {{.client_version}} で、Kubernetes v{{.cluster_version}} と互換性がないかもしれません。", "{{.prefix}}minikube {{.version}} on {{.platform}}": "{{.platform}} 上の {{.prefix}}minikube {{.version}}", "{{.profile}} profile is not valid: {{.err}}": "{{.profile}} プロファイルは無効です: {{.err}}", "{{.type}} is not yet a supported filesystem. We will try anyways!": "{{.type}} は未サポートのファイルシステムです。とにかくやってみます！", From e460f917aa64c67efd5c10eeb695cf5dee112cf2 Mon Sep 17 00:00:00 2001 From: Akira YOSHIYAMA Date: Sat, 26 Mar 2022 18:53:02 +0900 Subject: [PATCH 213/545] Update translations/ja.json Co-authored-by: Toshiaki Inukai <82919057+t-inu@users.noreply.github.com> --- translations/ja.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/translations/ja.json b/translations/ja.json index 5cf1bc025a..ef5f921717 100644 --- a/translations/ja.json +++ b/translations/ja.json @@ -113,7 +113,7 @@ "Continuously listing/getting the status with optional interval duration.": "任意のインターバル時間で、継続的にステータスをリストアップ/取得します。", "Control Plane could not update, try minikube delete --all --purge": "コントロールプレーンがアップデートできません。minikube delete --all --purge を試してください", "Copy the specified file into minikube": "指定したファイルを minikube にコピーします", - "Copy the specified file into minikube, it will be saved at path \u003ctarget file absolute path\u003e in your minikube.\nDefault target node controlplane and If \u003csource node name\u003e is omitted, It will trying to copy from host.\n\nExample Command : \"minikube cp a.txt /home/docker/b.txt\" +\n \"minikube cp a.txt minikube-m02:/home/docker/b.txt\"\n \"minikube cp minikube-m01:a.txt minikube-m02:/home/docker/b.txt\"": "指定したファイルを minikube にコピーします。ファイルは minikube 内の \u003c対象ファイルの絶対パス\u003e に保存されます。\nデフォルトターゲットノードコントロールプレーンと \u003cソースノード名\u003e が省略された場合、ホストからのファイルコピーを試みます。\n\nコマンド例 : 「minikube cp a.txt /home/docker/b.txt」 +\n 「minikube cp a.txt minikube-m02:/home/docker/b.txt」\n 「minikube cp minikube-m01:a.txt minikube-m02:/home/docker/b.txt」", + "Copy the specified file into minikube, it will be saved at path \u003ctarget file absolute path\u003e in your minikube.\nDefault target node controlplane and If \u003csource node name\u003e is omitted, It will trying to copy from host.\n\nExample Command : \"minikube cp a.txt /home/docker/b.txt\" +\n \"minikube cp a.txt minikube-m02:/home/docker/b.txt\"\n \"minikube cp minikube-m01:a.txt minikube-m02:/home/docker/b.txt\"": "指定したファイルを minikube にコピーします。ファイルは minikube 内の \u003c対象ファイルの絶対パス\u003e に保存されます。\nデフォルトターゲットノードコントロールプレーンと \u003cソースノード名\u003e が省略された場合、ホストからのファイルコピーを試みます。\n\nコマンド例 : 「minikube cp a.txt /home/docker/b.txt」 +\n 「minikube cp a.txt minikube-m02:/home/docker/b.txt」\n 「minikube cp minikube-m01:a.txt minikube-m02:/home/docker/b.txt」", "Could not determine a Google Cloud project, which might be ok.": "Google Cloud プロジェクトを特定できませんでしたが、問題はないかもしれません。", "Could not find any GCP credentials. Either run `gcloud auth application-default login` or set the GOOGLE_APPLICATION_CREDENTIALS environment variable to the path of your credentials file.": "GCP の認証情報が見つかりませんでした。`gcloud auth application-default login` を実行するか、環境変数 GOOGLE_APPLICATION_CREDENTIALS に認証情報ファイルのパスを設定してください。", "Could not process error from failed deletion": "削除の失敗によるエラーを処理できませんでした", From f60aa26c8b23f8d3c01fde23f5a581e1273d93bc Mon Sep 17 00:00:00 2001 From: zhouguowei Date: Mon, 27 Jun 2022 09:50:27 +0800 Subject: [PATCH 214/545] prbot need a strike --- cmd/performance/mkcmp/cmd/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/performance/mkcmp/cmd/README.md b/cmd/performance/mkcmp/cmd/README.md index 6df5693501..13dade54cf 100644 --- a/cmd/performance/mkcmp/cmd/README.md +++ b/cmd/performance/mkcmp/cmd/README.md @@ -15,8 +15,8 @@ make out/mkcmp ./out/mkcmp ./out/minikube pr://400 ``` -mkcmp is primarily used for our prbot, which comments mkcmp output on valid PRs [example](https://github.com/kubernetes/minikube/pull/10430#issuecomment-776311409). -To make changes to the prbot output, submitting a PR to change mkcmp code should be sufficient. +mkcmp is primarily used for our pr-bot, which comments mkcmp output on valid PRs [example](https://github.com/kubernetes/minikube/pull/10430#issuecomment-776311409). +To make changes to the pr-bot output, submitting a PR to change mkcmp code should be sufficient. Note: STDOUT from mkcmp is *exactly* what is commented on github, so we want it to be in Markdown. From 2364e988b3f7121c6353c48261b84fb17f4e6826 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 27 Jun 2022 17:47:09 +0000 Subject: [PATCH 215/545] Updating kicbase image to v0.0.32-1656350719-14420 --- pkg/drivers/kic/types.go | 8 ++++---- site/content/en/docs/commands/start.md | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/drivers/kic/types.go b/pkg/drivers/kic/types.go index 67a6c5c55f..ac390c0f1e 100644 --- a/pkg/drivers/kic/types.go +++ b/pkg/drivers/kic/types.go @@ -24,13 +24,13 @@ import ( const ( // Version is the current version of kic - Version = "v0.0.32" + Version = "v0.0.32-1656350719-14420" // SHA of the kic base image - baseImageSHA = "9190bd2393eae887316c97a74370b7d5dad8f0b2ef91ac2662bc36f7ef8e0b95" + baseImageSHA = "e7b7f38d1a2eba7828afc2c4c3d24e1d391db431976e47aa6dc5c7a6b038ca4e" // The name of the GCR kicbase repository - gcrRepo = "gcr.io/k8s-minikube/kicbase" + gcrRepo = "gcr.io/k8s-minikube/kicbase-builds" // The name of the Dockerhub kicbase repository - dockerhubRepo = "docker.io/kicbase/stable" + dockerhubRepo = "docker.io/kicbase/build" ) var ( diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index eb11b7f6ea..524229a730 100644 --- a/site/content/en/docs/commands/start.md +++ b/site/content/en/docs/commands/start.md @@ -26,7 +26,7 @@ minikube start [flags] --apiserver-names strings A set of apiserver names which are used in the generated certificate for kubernetes. This can be used if you want to make the apiserver available from outside the machine --apiserver-port int The apiserver listening port (default 8443) --auto-update-drivers If set, automatically updates drivers to the latest version. Defaults to true. (default true) - --base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase:v0.0.32@sha256:9190bd2393eae887316c97a74370b7d5dad8f0b2ef91ac2662bc36f7ef8e0b95") + --base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase-builds:v0.0.32-1656350719-14420@sha256:e7b7f38d1a2eba7828afc2c4c3d24e1d391db431976e47aa6dc5c7a6b038ca4e") --binary-mirror string Location to fetch kubectl, kubelet, & kubeadm binaries from. --cache-images If true, cache docker images for the current bootstrapper and load them into the machine. Always false with --driver=none. (default true) --cert-expiration duration Duration until minikube certificate expiration, defaults to three years (26280h). (default 26280h0m0s) From 645d9ccbd79371ce86e1cd3891b96276d627bfa3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 27 Jun 2022 18:10:49 +0000 Subject: [PATCH 216/545] Bump github.com/google/go-containerregistry from 0.9.0 to 0.10.0 Bumps [github.com/google/go-containerregistry](https://github.com/google/go-containerregistry) from 0.9.0 to 0.10.0. - [Release notes](https://github.com/google/go-containerregistry/releases) - [Changelog](https://github.com/google/go-containerregistry/blob/main/.goreleaser.yml) - [Commits](https://github.com/google/go-containerregistry/compare/v0.9.0...v0.10.0) --- updated-dependencies: - dependency-name: github.com/google/go-containerregistry dependency-type: direct:production update-type: version-update:semver-minor ... 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 5842f2081a..1b845f35cd 100644 --- a/go.mod +++ b/go.mod @@ -23,7 +23,7 @@ require ( github.com/elazarl/goproxy v0.0.0-20210110162100-a92cc753f88e github.com/golang-collections/collections v0.0.0-20130729185459-604e922904d3 github.com/google/go-cmp v0.5.8 - github.com/google/go-containerregistry v0.9.0 + github.com/google/go-containerregistry v0.10.0 github.com/google/slowjam v1.0.0 github.com/google/uuid v1.3.0 github.com/hashicorp/go-getter v1.6.2 diff --git a/go.sum b/go.sum index 6e46b115c2..52f40c7cb5 100644 --- a/go.sum +++ b/go.sum @@ -661,8 +661,8 @@ github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE= github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -github.com/google/go-containerregistry v0.9.0 h1:5Ths7RjxyFV0huKChQTgY6fLzvHhZMpLTFNja8U0/0w= -github.com/google/go-containerregistry v0.9.0/go.mod h1:9eq4BnSufyT1kHNffX+vSXVonaJ7yaIOulrKZejMxnQ= +github.com/google/go-containerregistry v0.10.0 h1:qd/fv2nQajGZJenaNcdaghlwSPjQ0NphN9hzArr2WWg= +github.com/google/go-containerregistry v0.10.0/go.mod h1:C7uwbB1QUAtvnknyd3ethxJRd4gtEjU/9WLXzckfI1Y= github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ= github.com/google/go-github/v43 v43.0.0 h1:y+GL7LIsAIF2NZlJ46ZoC/D1W1ivZasT0lnWHMYPZ+U= github.com/google/go-github/v43 v43.0.0/go.mod h1:ZkTvvmCXBvsfPpTHXnH/d2hP9Y0cTbvN9kr5xqyXOIc= From fea3208e6685b56bf1589c9d822bf607d663ecfb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 27 Jun 2022 18:11:11 +0000 Subject: [PATCH 217/545] Bump cloud.google.com/go/storage from 1.22.1 to 1.23.0 Bumps [cloud.google.com/go/storage](https://github.com/googleapis/google-cloud-go) from 1.22.1 to 1.23.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/pubsub/v1.22.1...pubsub/v1.23.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 | 4 ++-- go.sum | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 5842f2081a..7e66493a36 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.22.1 + cloud.google.com/go/storage v1.23.0 contrib.go.opencensus.io/exporter/stackdriver v0.13.12 github.com/Delta456/box-cli-maker/v2 v2.2.2 github.com/GoogleCloudPlatform/docker-credential-gcr v0.0.0-20210713212222-faed5e8b8ca2 @@ -105,7 +105,7 @@ require ( ) require ( - cloud.google.com/go v0.102.0 // indirect + cloud.google.com/go v0.102.1 // indirect cloud.google.com/go/compute v1.7.0 // indirect cloud.google.com/go/iam v0.3.0 // indirect cloud.google.com/go/monitoring v1.1.0 // indirect diff --git a/go.sum b/go.sum index 6e46b115c2..6579a5b1a0 100644 --- a/go.sum +++ b/go.sum @@ -34,8 +34,9 @@ cloud.google.com/go v0.94.1/go.mod h1:qAlAugsXlC+JWO+Bke5vCtc9ONxjQT3drlTTnAplMW 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.2/go.mod h1:4Xra9TjzAeYHrl5+oeLlzbM2k3mjVhZh4UqTZ//w99A= -cloud.google.com/go v0.102.0 h1:DAq3r8y4mDgyB/ZPJ9v/5VJNqjgJAxTn6ZYLlUywOu8= cloud.google.com/go v0.102.0/go.mod h1:oWcCzKlqJ5zgHQt9YsaeTY9KzIvjyy0ArmiBUgpQ+nc= +cloud.google.com/go v0.102.1 h1:vpK6iQWv/2uUeFJth4/cBHsQAGjn1iIE6AAlxipRaA0= +cloud.google.com/go v0.102.1/go.mod h1:XZ77E9qnTEnrgEOvr4xzfdX5TRo7fB4T2F4O6+34hIU= cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= @@ -69,8 +70,9 @@ cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohl 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.1 h1:F6IlQJZrZM++apn9V5/VfS3gbTUYg98PS3EMQAzqtfg= cloud.google.com/go/storage v1.22.1/go.mod h1:S8N1cAStu7BOeFfE8KAQzmyyLkK8p/vmRq6kuBTW58Y= +cloud.google.com/go/storage v1.23.0 h1:wWRIaDURQA8xxHguFCshYepGlrWIrbBnAmc7wfg07qY= +cloud.google.com/go/storage v1.23.0/go.mod h1:vOEEDNFnciUMhBeT6hsJIn3ieU5cFRmzeLgDvXzfIXc= 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= From 671ba90c1a3ed1eb0ffd26493b8c45833f285bfd Mon Sep 17 00:00:00 2001 From: "Paul S. Schweigert" Date: Mon, 27 Jun 2022 18:18:31 -0400 Subject: [PATCH 218/545] use the right hash Signed-off-by: Paul S. Schweigert --- deploy/iso/minikube-iso/package/crio-bin/crio-bin.hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/iso/minikube-iso/package/crio-bin/crio-bin.hash b/deploy/iso/minikube-iso/package/crio-bin/crio-bin.hash index 86eadbfba1..14ed7e6fa8 100644 --- a/deploy/iso/minikube-iso/package/crio-bin/crio-bin.hash +++ b/deploy/iso/minikube-iso/package/crio-bin/crio-bin.hash @@ -26,4 +26,4 @@ sha256 bc53ea8977e252bd9812974c33ff654ee22076598e901464468c5c105a5ef773 v1.22.0. sha256 6e1c0e393cd16af907fabb24e4cc068e27c606c5f1071060d46efdcd29cb5c0d v1.22.1.tar.gz sha256 34097a0f535aa79cf990aaee5d3ff6226663587b188cbee11089f120e7f869e4 v1.22.2.tar.gz sha256 52836549cfa27a688659576be9266f4837357a6fa162b1d0a05fa8da62c724b3 v1.22.3.tar.gz -sha256 03579f33697d9f53722a241e6657b66c28cd4bf587f262319a1fc14eb96f5a32 v1.24.1.tar.gz +sha256 5543b96b668e964a24d5fc4af9a0e51e4c571c4c4bec5f0cf2cfd5df76debd7f v1.24.1.tar.gz From 80fd24741c4806d82c1d41a41383f2d1c5157284 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Mon, 27 Jun 2022 16:21:13 -0700 Subject: [PATCH 219/545] add binary checksums to release GitHub page --- hack/jenkins/release_github_page.sh | 6 +++++- hack/jenkins/release_update_releases_json.go | 4 +++- hack/jenkins/release_update_releases_json.sh | 6 +++--- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/hack/jenkins/release_github_page.sh b/hack/jenkins/release_github_page.sh index c4ddbbaf82..2124b1a16a 100755 --- a/hack/jenkins/release_github_page.sh +++ b/hack/jenkins/release_github_page.sh @@ -61,7 +61,11 @@ ${RELEASE_NOTES} See [Getting Started](https://minikube.sigs.k8s.io/docs/start/) -## ISO Checksum +## Binary Checksums + +$(cat binary_checksums.txt) + +## ISO Checksums amd64: \`${ISO_SHA256_AMD64}\` arm64: \`${ISO_SHA256_ARM64}\`" diff --git a/hack/jenkins/release_update_releases_json.go b/hack/jenkins/release_update_releases_json.go index 577ec03374..6d55a8f6fd 100644 --- a/hack/jenkins/release_update_releases_json.go +++ b/hack/jenkins/release_update_releases_json.go @@ -163,7 +163,9 @@ func getSHA(operatingSystem, arch string) (string, error) { return "", fmt.Errorf("failed to read file %q: %v", filePath, err) } // trim off new line character - return string(b[:len(b)-1]), nil + sha := string(b[:len(b)-1]) + fmt.Printf("%s-%s: `%s`\n", operatingSystem, arch, sha) + return sha, nil } func updateJSON(path string, r releases) error { diff --git a/hack/jenkins/release_update_releases_json.sh b/hack/jenkins/release_update_releases_json.sh index ceda9ae838..3beb0fc1d1 100755 --- a/hack/jenkins/release_update_releases_json.sh +++ b/hack/jenkins/release_update_releases_json.sh @@ -41,7 +41,7 @@ git status if ! [[ "${VERSION_BUILD}" =~ ^[0-9]+$ ]]; then go run "${DIR}/release_update_releases_json.go" --releases-file deploy/minikube/releases-beta.json --version "$TAGNAME" --legacy - go run "${DIR}/release_update_releases_json.go" --releases-file deploy/minikube/releases-beta-v2.json --version "$TAGNAME" + go run "${DIR}/release_update_releases_json.go" --releases-file deploy/minikube/releases-beta-v2.json --version "$TAGNAME" > binary_checksums.txt git add -A git commit -m "Update releases-beta.json & releases-beta-v2.json to include ${TAGNAME}" @@ -56,13 +56,13 @@ if ! [[ "${VERSION_BUILD}" =~ ^[0-9]+$ ]]; then gsutil cp deploy/minikube/releases-beta-v2.json gs://minikube/releases-beta-v2.json else go run "${DIR}/release_update_releases_json.go" --releases-file deploy/minikube/releases.json --version "$TAGNAME" --legacy - go run "${DIR}/release_update_releases_json.go" --releases-file deploy/minikube/releases-v2.json --version "$TAGNAME" + go run "${DIR}/release_update_releases_json.go" --releases-file deploy/minikube/releases-v2.json --version "$TAGNAME" > binary_checksums.txt #Update the front page of our documentation now=$(date +"%b %d, %Y") sed -i "s/Latest Release: .* (/Latest Release: ${TAGNAME} - ${now} (/" site/content/en/docs/_index.md - git add -A + git add deploy/minikube/* git commit -m "Update releases.json & releases-v2.json to include ${TAGNAME}" git remote add minikube-bot git@github.com:minikube-bot/minikube.git git push -f minikube-bot jenkins-releases.json-${TAGNAME} From 65e096b5fe1236a1120503c6b1a87502688cd704 Mon Sep 17 00:00:00 2001 From: "Paul S. Schweigert" Date: Tue, 28 Jun 2022 14:45:52 -0400 Subject: [PATCH 220/545] bump go to v1.18 in Makefile Signed-off-by: Paul S. Schweigert --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 9daf7b3f75..3f695e253a 100644 --- a/Makefile +++ b/Makefile @@ -44,7 +44,7 @@ KVM_GO_VERSION ?= $(GO_VERSION:.0=) INSTALL_SIZE ?= $(shell du out/minikube-windows-amd64.exe | cut -f1) BUILDROOT_BRANCH ?= 2021.02.12 # the go version on the line below is for the ISO and does not need to be updated often -GOLANG_OPTIONS = GO_VERSION=1.17 GO_HASH_FILE=$(PWD)/deploy/iso/minikube-iso/go.hash +GOLANG_OPTIONS = GO_VERSION=1.18 GO_HASH_FILE=$(PWD)/deploy/iso/minikube-iso/go.hash BUILDROOT_OPTIONS = BR2_EXTERNAL=../../deploy/iso/minikube-iso $(GOLANG_OPTIONS) REGISTRY ?= gcr.io/k8s-minikube From b503d47f9451e9fc44f72ad85bb6231891f264e5 Mon Sep 17 00:00:00 2001 From: "Paul S. Schweigert" Date: Tue, 28 Jun 2022 15:58:17 -0400 Subject: [PATCH 221/545] updating go hash Signed-off-by: Paul S. Schweigert --- Makefile | 2 +- deploy/iso/minikube-iso/go.hash | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 3f695e253a..9da3223b4f 100644 --- a/Makefile +++ b/Makefile @@ -44,7 +44,7 @@ KVM_GO_VERSION ?= $(GO_VERSION:.0=) INSTALL_SIZE ?= $(shell du out/minikube-windows-amd64.exe | cut -f1) BUILDROOT_BRANCH ?= 2021.02.12 # the go version on the line below is for the ISO and does not need to be updated often -GOLANG_OPTIONS = GO_VERSION=1.18 GO_HASH_FILE=$(PWD)/deploy/iso/minikube-iso/go.hash +GOLANG_OPTIONS = GO_VERSION=1.18.3 GO_HASH_FILE=$(PWD)/deploy/iso/minikube-iso/go.hash BUILDROOT_OPTIONS = BR2_EXTERNAL=../../deploy/iso/minikube-iso $(GOLANG_OPTIONS) REGISTRY ?= gcr.io/k8s-minikube diff --git a/deploy/iso/minikube-iso/go.hash b/deploy/iso/minikube-iso/go.hash index d35d6ed572..0326f72785 100644 --- a/deploy/iso/minikube-iso/go.hash +++ b/deploy/iso/minikube-iso/go.hash @@ -1,3 +1,4 @@ # From https://golang.org/dl/ sha256 3a70e5055509f347c0fb831ca07a2bf3b531068f349b14a3c652e9b5b67beb5d go1.17.src.tar.gz +sha256 0012386ddcbb5f3350e407c679923811dbd283fcdc421724931614a842ecbc2d go1.18.src.tar.gz sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE From 07922bab1047f2cb40de17820bef73dd38c32ad6 Mon Sep 17 00:00:00 2001 From: "Paul S. Schweigert" Date: Tue, 28 Jun 2022 16:11:55 -0400 Subject: [PATCH 222/545] add patch version to hash Signed-off-by: Paul S. Schweigert --- deploy/iso/minikube-iso/go.hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/iso/minikube-iso/go.hash b/deploy/iso/minikube-iso/go.hash index 0326f72785..8690f1e4d8 100644 --- a/deploy/iso/minikube-iso/go.hash +++ b/deploy/iso/minikube-iso/go.hash @@ -1,4 +1,4 @@ # From https://golang.org/dl/ sha256 3a70e5055509f347c0fb831ca07a2bf3b531068f349b14a3c652e9b5b67beb5d go1.17.src.tar.gz -sha256 0012386ddcbb5f3350e407c679923811dbd283fcdc421724931614a842ecbc2d go1.18.src.tar.gz +sha256 0012386ddcbb5f3350e407c679923811dbd283fcdc421724931614a842ecbc2d go1.18.3.src.tar.gz sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE From b767af49b5b85b227311341afa6f7850084594a6 Mon Sep 17 00:00:00 2001 From: "Paul S. Schweigert" Date: Tue, 28 Jun 2022 17:10:56 -0400 Subject: [PATCH 223/545] update build docs for different archs Signed-off-by: Paul S. Schweigert --- site/content/en/docs/contrib/building/iso.md | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/site/content/en/docs/contrib/building/iso.md b/site/content/en/docs/contrib/building/iso.md index f739aef819..a573565fa6 100644 --- a/site/content/en/docs/contrib/building/iso.md +++ b/site/content/en/docs/contrib/building/iso.md @@ -35,19 +35,26 @@ cd minikube ### Building +To build for x86 ```shell $ make buildroot-image -$ make out/minikube.iso +$ make out/minikube-amd64.iso +``` + +To build for ARM +```shell +$ make buildroot-image +$ make out/minikube-arm64.iso ``` The build will occur inside a docker container. If you want to do this on -baremetal, replace `make out/minikube.iso` with `IN_DOCKER=1 make out/minikube.iso`. -The bootable ISO image will be available in `out/minikube.iso`. +baremetal, replace `make out/minikube-.iso` with `IN_DOCKER=1 make out/minikube-.iso`. +The bootable ISO image will be available in `out/minikube-.iso`. ### Using a local ISO image ```shell -$ ./out/minikube start --iso-url=file://$(pwd)/out/minikube.iso +$ ./out/minikube start --iso-url=file://$(pwd)/out/minikube-.iso ``` ### Modifying buildroot components From b83c9640b5b2165fa52e816ce84abddd97e9c1b1 Mon Sep 17 00:00:00 2001 From: Jeff MAURY Date: Wed, 29 Jun 2022 10:01:29 +0200 Subject: [PATCH 224/545] Fix french translation Signed-off-by: Jeff MAURY --- translations/fr.json | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/translations/fr.json b/translations/fr.json index d0a1441f94..7f21582aaa 100644 --- a/translations/fr.json +++ b/translations/fr.json @@ -49,7 +49,7 @@ "Add machine IP to NO_PROXY environment variable": "Ajouter l'IP de la machine à la variable d'environnement NO_PROXY", "Add, delete, or push a local image into minikube": "Ajouter, supprimer ou pousser une image locale dans minikube", "Add, remove, or list additional nodes": "Ajouter, supprimer ou lister des nœuds supplémentaires", - "Adding a control-plane node is not yet supported, setting control-plane flag to false": "", + "Adding a control-plane node is not yet supported, setting control-plane flag to false": "L'ajout d'un nœud de plan de contrôle n'est pas encore pris en charge, définition de l'indicateur control-plane à false", "Adding node {{.name}} to cluster {{.cluster}}": "Ajout du nœud {{.name}} au cluster {{.cluster}}", "Additional help topics": "Rubriques d'aide supplémentaires", "Additional mount options, such as cache=fscache": "Options de montage supplémentaires, telles que cache=fscache", @@ -315,7 +315,7 @@ "Go template format string for the config view output. The format for Go templates can be found here: https://golang.org/pkg/text/template/\nFor the list of accessible variables for the template, see the struct values here: https://godoc.org/k8s.io/minikube/cmd/minikube/cmd/config#ConfigViewTemplate": "Go chaîne de format de modèle pour la sortie de la vue de configuration. Le format des modèles Go peut être trouvé ici : https://golang.org/pkg/text/template/\nPour la liste des variables accessibles pour le modèle, voir les valeurs de structure ici : https://godoc.org/k8s .io/minikube/cmd/minikube/cmd/config#ConfigViewTemplate", "Go template format string for the status output. The format for Go templates can be found here: https://golang.org/pkg/text/template/\nFor the list accessible variables for the template, see the struct values here: https://godoc.org/k8s.io/minikube/cmd/minikube/cmd#Status": "Go chaîne de format de modèle pour la sortie d'état. Le format des modèles Go peut être trouvé ici : https://golang.org/pkg/text/template/\nPour la liste des variables accessibles pour le modèle, consultez les valeurs de structure ici : https://godoc.org/k8s. io/minikube/cmd/minikube/cmd#Status", "Group ID: {{.groupID}}": "Identifiant du groupe: {{.groupID}}", - "Headlamp can display more detailed information when metrics-server is installed. To install it, run:\n\nminikube{{.profileArg}} addons enable metrics-server\t\n\n": "", + "Headlamp can display more detailed information when metrics-server is installed. To install it, run:\n\nminikube{{.profileArg}} addons enable metrics-server\t\n\n": "Headlamp peut afficher des informations plus détaillées lorsque metrics-server est installé. Pour l'installer, exécutez :\n\nminikube{{.profileArg}} addons enable metrics-server\t\n\n", "Hide the hypervisor signature from the guest in minikube (kvm2 driver only)": "Masque la signature de l'hyperviseur de l'invité dans minikube (pilote kvm2 uniquement).", "Hyperkit is broken. Upgrade to the latest hyperkit version and/or Docker for Desktop. Alternatively, you may choose an alternate --driver": "Hyperkit ne fonctionne pas. Mettez à niveau vers la dernière version d'hyperkit et/ou Docker for Desktop. Alternativement, vous pouvez choisir un autre --driver", "Hyperkit networking is broken. Try disabling Internet Sharing: System Preference \u003e Sharing \u003e Internet Sharing. \nAlternatively, you can try upgrading to the latest hyperkit version, or using an alternate driver.": "Le réseau Hyperkit est cassé. Essayez de désactiver le partage Internet : Préférence système \u003e Partage \u003e Partage Internet. \nVous pouvez également essayer de mettre à niveau vers la dernière version d'hyperkit ou d'utiliser un autre pilote.", @@ -339,7 +339,7 @@ "If true, cache docker images for the current bootstrapper and load them into the machine. Always false with --driver=none.": "Si vrai, met en cache les images Docker pour le programme d'amorçage actuel et les charge dans la machine. Toujours faux avec --driver=none.", "If true, only download and cache files for later use - don't install or start anything.": "Si la valeur est \"true\", téléchargez les fichiers et mettez-les en cache uniquement pour une utilisation future. Ne lancez pas d'installation et ne commencez aucun processus.", "If true, pods might get deleted and restarted on addon enable": "Si vrai, les pods peuvent être supprimés et redémarrés lors addon enable", - "If true, print web links to addons' documentation if using --output=list (default).": "", + "If true, print web links to addons' documentation if using --output=list (default).": "Si vrai, affiche les liens Web vers la documentation des addons si vous utilisez --output=list (défaut).", "If true, returns list of profiles faster by skipping validating the status of the cluster.": "Si vrai, renvoie la liste des profils plus rapidement en ignorant la validation de l'état du cluster.", "If true, the added node will be marked for work. Defaults to true.": "Si vrai, le nœud ajouté sera marqué pour le travail. La valeur par défaut est true.", "If true, the node added will also be a control plane in addition to a worker.": "Si vrai, le nœud ajouté sera également un plan de contrôle en plus d'un travailleur.", @@ -445,7 +445,7 @@ "Outputs minikube shell completion for the given shell (bash, zsh or fish)\n\n\tThis depends on the bash-completion binary. Example installation instructions:\n\tOS X:\n\t\t$ brew install bash-completion\n\t\t$ source $(brew --prefix)/etc/bash_completion\n\t\t$ minikube completion bash \u003e ~/.minikube-completion # for bash users\n\t\t$ minikube completion zsh \u003e ~/.minikube-completion # for zsh users\n\t\t$ source ~/.minikube-completion\n\t\t$ minikube completion fish \u003e ~/.config/fish/completions/minikube.fish # for fish users\n\tUbuntu:\n\t\t$ apt-get install bash-completion\n\t\t$ source /etc/bash_completion\n\t\t$ source \u003c(minikube completion bash) # for bash users\n\t\t$ source \u003c(minikube completion zsh) # for zsh users\n\t\t$ minikube completion fish \u003e ~/.config/fish/completions/minikube.fish # for fish users\n\n\tAdditionally, you may want to output the completion to a file and source in your .bashrc\n\n\tNote for zsh users: [1] zsh completions are only supported in versions of zsh \u003e= 5.2\n\tNote for fish users: [2] please refer to this docs for more details https://fishshell.com/docs/current/#tab-completion\n": "Affiche la complétion du shell minikube pour le shell donné (bash, zsh ou fish)\n\n\tCela dépend du binaire bash-completion. Exemple d'instructions d'installation :\n\tOS X :\n\t\t$ brew install bash-completion\n\t\t$ source $(brew --prefix)/etc/bash_completion\n\t\t$ minikube completion bash \u003e ~/.minikube-completion # pour les utilisateurs bash\n\t\t$ minikube completion zsh \u003e ~/.minikube-completion # pour les utilisateurs zsh\n\t\t$ source ~/.minikube-completion\n\t\t$ minikube completion fish \u003e ~/.config/fish/completions/minikube.fish # pour les utilisateurs de fish\n\tUbuntu:\n\t\t$ apt-get install bash-completion\n\t \t$ source /etc/bash_completion\n\t\t$ source \u003c(minikube completion bash) # pour les utilisateurs bash\n\t\t$ source \u003c(minikube completion zsh) # pour les utilisateurs zsh\n\t \t$ minikube completion fish \u003e ~/.config/fish/completions/minikube.fish # pour les utilisateurs de fish\n\n\tDe plus, vous voudrez peut-être sortir la complétion dans un fichier et une source dans votre .bashrc\n n\tRemarque pour les utilisateurs de zsh : [1] les complétions zsh ne sont prises en charge que dans les versions de zsh \u003e= 5.2\n\tRemarque pour les utilisateurs de fish : [2] veuillez vous référer à cette documentation pour plus de détails https://fishshell.com/docs/current/#tab-completion\n", "Overwrite image even if same image:tag name exists": "Écraser l'image même si la même image:balise existe", "Path to the Dockerfile to use (optional)": "Chemin d'accès au Dockerfile à utiliser (facultatif)", - "Path to the qemu firmware file. Defaults: For Linux, the default firmware location. For macOS, the brew installation location. For Windows, C:\\Program Files\\qemu\\share": "", + "Path to the qemu firmware file. Defaults: For Linux, the default firmware location. For macOS, the brew installation location. For Windows, C:\\Program Files\\qemu\\share": "Chemin d'accès au fichier du micrologiciel qemu. Valeurs par défaut : pour Linux, l'emplacement du micrologiciel par défaut. Pour macOS, l'emplacement d'installation de brew. Pour Windows, C:\\Program Files\\qemu\\share", "Pause": "Pause", "Paused {{.count}} containers": "{{.count}} conteneurs suspendus", "Paused {{.count}} containers in: {{.namespaces}}": "{{.count}} conteneurs suspendus dans : {{.namespaces}}", @@ -456,7 +456,7 @@ "Please either authenticate to the registry or use --base-image flag to use a different registry.": "Veuillez vous authentifier auprès du registre ou utiliser l'indicateur --base-image pour utiliser un registre différent.", "Please enter a value:": "Entrer un nombre, SVP:", "Please free up disk or prune images.": "Veuillez libérer le disque ou élaguer les images.", - "Please increase Desktop's disk size.": "", + "Please increase Desktop's disk size.": "Veuillez augmenter la taille du disque de Desktop.", "Please increse Desktop's disk size.": "Veuillez augmenter la taille du disque du bureau.", "Please install the minikube hyperkit VM driver, or select an alternative --driver": "Veuillez installer le pilote minikube hyperkit VM, ou sélectionnez un --driver alternatif", "Please install the minikube kvm2 VM driver, or select an alternative --driver": "Veuillez installer le pilote minikube kvm2 VM, ou sélectionnez un --driver alternatif", @@ -711,15 +711,15 @@ "This can also be done automatically by setting the env var CHANGE_MINIKUBE_NONE_USER=true": "Cette opération peut également être réalisée en définissant la variable d'environment \"CHANGE_MINIKUBE_NONE_USER=true\".", "This control plane is not running! (state={{.state}})": "Ce plan de contrôle ne fonctionne pas ! (état={{.state}})", "This driver does not yet work on your architecture. Maybe try --driver=none": "Ce pilote ne fonctionne pas encore sur votre architecture. Essayez peut-être --driver=none", - "This flag is currently unsupported.": "", + "This flag is currently unsupported.": "Cet indicateur n'est actuellement pas pris en charge.", "This is a known issue with BTRFS storage driver, there is a workaround, please checkout the issue on GitHub": "Il s'agit d'un problème connu avec le pilote de stockage BTRFS, il existe une solution de contournement, veuillez vérifier le problème sur GitHub", "This is unusual - you may want to investigate using \"{{.command}}\"": "C'est inhabituel - vous voudrez peut-être investiguer en utilisant \"{{.command}}\"", "This will keep the existing kubectl context and will create a minikube context.": "Cela permet de conserver le contexte kubectl existent et de créer un contexte minikube.", "This will start the mount daemon and automatically mount files into minikube.": "Cela démarrera le démon de montage et montera automatiquement les fichiers dans minikube.", "This {{.type}} is having trouble accessing https://{{.repository}}": "Ce {{.type}} rencontre des difficultés pour accéder à https://{{.repository}}", "Tip: To remove this root owned cluster, run: sudo {{.cmd}}": "Astuce : Pour supprimer ce cluster appartenant à la racine, exécutez : sudo {{.cmd}}", - "To access Headlamp, use the following command:\nminikube service headlamp -n headlamp\n\n": "", - "To authenticate in Headlamp, fetch the Authentication Token using the following command:\n\nexport SECRET=$(kubectl get secrets --namespace headlamp -o custom-columns=\":metadata.name\" | grep \"headlamp-token\")\nkubectl get secret $SECRET --namespace headlamp --template=\\{\\{.data.token\\}\\} | base64 --decode\n\t\t\t\n": "", + "To access Headlamp, use the following command:\nminikube service headlamp -n headlamp\n\n": "Pour accéder à Headlamp, utilisez la commande suivante :\nminikube service headlamp -n headlamp\n\n", + "To authenticate in Headlamp, fetch the Authentication Token using the following command:\n\nexport SECRET=$(kubectl get secrets --namespace headlamp -o custom-columns=\":metadata.name\" | grep \"headlamp-token\")\nkubectl get secret $SECRET --namespace headlamp --template=\\{\\{.data.token\\}\\} | base64 --decode\n\t\t\t\n": "Pour vous authentifier dans Headlamp, récupérez le jeton d'authentification à l'aide de la commande suivante :\n\nexport SECRET=$(kubectl get secrets --namespace headlamp -o custom-columns=\":metadata.name\" | grep \"headlamp-token \")\nkubectl get secret $SECRET --namespace headlamp --template=\\{\\{.data.token\\}\\} | base64 --decode\n\t\t\t\n", "To connect to this cluster, use: --context={{.name}}": "Pour vous connecter à ce cluster, utilisez : --context={{.name}}", "To connect to this cluster, use: kubectl --context={{.profile_name}}": "Pour vous connecter à ce cluster, utilisez : kubectl --context={{.profile_name}}", "To disable beta notices, run: 'minikube config set WantBetaUpdateNotification false'": "Pour désactiver les notifications bêta, exécutez : 'minikube config set WantBetaUpdateNotification false'", @@ -868,7 +868,7 @@ "addon '{{.name}}' is not a valid addon packaged with minikube.\nTo see the list of available addons run:\nminikube addons list": "Le module '{{.name}}' n'est pas un module valide fourni avec minikube.\nPour voir la liste des modules disponibles, exécutez :\nminikube addons list", "addons modifies minikube addons files using subcommands like \"minikube addons enable dashboard\"": "addons modifie les fichiers de modules minikube à l'aide de sous-commandes telles que \"minikube addons enable dashboard\"", "arm64 VM drivers do not currently support containerd or crio container runtimes. See https://github.com/kubernetes/minikube/issues/14146 for details.": "Les pilotes de machine virtuelle arm64 ne prennent actuellement pas en charge les runtimes de conteneur containerd ou crio. Voir https://github.com/kubernetes/minikube/issues/14146 pour plus de détails.", - "arm64 VM drivers do not currently support the crio container runtime. See https://github.com/kubernetes/minikube/issues/14146 for details.": "", + "arm64 VM drivers do not currently support the crio container runtime. See https://github.com/kubernetes/minikube/issues/14146 for details.": "Les pilotes de machine virtuelle arm64 ne prennent actuellement pas en charge l'environnement d'exécution du conteneur crio. Voir https://github.com/kubernetes/minikube/issues/14146 pour plus de détails.", "auto-pause addon is an alpha feature and still in early development. Please file issues to help us make it better.": "Le module auto-pause est une fonctionnalité alpha et encore en développement précoce. Veuillez signaler les problèmes pour nous aider à l'améliorer.", "bash completion failed": "échec de la complétion bash", "bash completion.": "complétion bash", @@ -955,7 +955,7 @@ "retrieving node": "récupération du nœud", "scheduled stop is not supported on the none driver, skipping scheduling": "l'arrêt programmé n'est pas pris en charge sur le pilote none, programmation non prise en compte", "service {{.namespace_name}}/{{.service_name}} has no node port": "le service {{.namespace_name}}/{{.service_name}} n'a pas de port de nœud", - "set tunnel bind address, empty or '*' indicates the tunnel should be available for all interfaces": "", + "set tunnel bind address, empty or '*' indicates the tunnel should be available for all interfaces": "définit l'adresse de liaison du tunnel, vide ou '*' indique que le tunnel doit être disponible pour toutes les interfaces", "stat failed": "stat en échec", "status json failure": "état du JSON en échec", "status text failure": "état du texte en échec", From 50f8f9da1eeeab4cb62c946b86560a78cbc9c658 Mon Sep 17 00:00:00 2001 From: "Paul S. Schweigert" Date: Wed, 29 Jun 2022 20:14:21 -0400 Subject: [PATCH 225/545] update docker linux crio test Signed-off-by: Paul S. Schweigert --- test/integration/docker_test.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/test/integration/docker_test.go b/test/integration/docker_test.go index 3f61b10b42..30e8b0dd07 100644 --- a/test/integration/docker_test.go +++ b/test/integration/docker_test.go @@ -123,12 +123,11 @@ func validateContainerdSystemd(ctx context.Context, t *testing.T, profile string // validateCrioSystemd makes sure the --force-systemd flag worked with the cri-o container runtime func validateCrioSystemd(ctx context.Context, t *testing.T, profile string) { - rr, err := Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "ssh", "cat /etc/crio/crio.conf")) + rr, err := Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "ssh", "cat /etc/crio/crio.conf.d/02-crio.conf")) if err != nil { t.Errorf("failed to get cri-o cgroup driver. args %q: %v", rr.Command(), err) } - // cri-o defaults to `systemd` if `cgroup_manager` not set, so we remove `cgroup_manager` on force - if strings.Contains(rr.Output(), "cgroup_manager = ") { + if strings.Contains(rr.Output(), "cgroup_manager = systemd") { t.Fatalf("expected systemd cgroup driver, got: %v", rr.Output()) } } From 140e3e20579471d339970a7fa73d3b886b258e0b Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Thu, 30 Jun 2022 12:45:15 +0900 Subject: [PATCH 226/545] rootless: recommend containerd over cri-o containerd seems more stable for rootless Workaround for issue 14400 Signed-off-by: Akihiro Suda --- site/content/en/docs/drivers/docker.md | 2 +- site/content/en/docs/drivers/includes/podman_usage.inc | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/site/content/en/docs/drivers/docker.md b/site/content/en/docs/drivers/docker.md index 685802cccb..65f3f60664 100644 --- a/site/content/en/docs/drivers/docker.md +++ b/site/content/en/docs/drivers/docker.md @@ -49,7 +49,7 @@ 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". +The `--container-runtime` flag must be set to "containerd" or "cri-o". "containerd" is recommended. {{% /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 bb0395eacb..7acb1a5d3a 100644 --- a/site/content/en/docs/drivers/includes/podman_usage.inc +++ b/site/content/en/docs/drivers/includes/podman_usage.inc @@ -4,7 +4,7 @@ This is an experimental driver. Please use it only for experimental reasons unti ## Usage -It's recommended to run minikube with the podman driver and [CRI-O container runtime](https://cri-o.io/): +It's recommended to run minikube with the podman driver and [CRI-O container runtime](https://cri-o.io/) (expect when using Rootless Podman): ```shell minikube start --driver=podman --container-runtime=cri-o @@ -31,4 +31,10 @@ To use Podman without `sudo` (i.e., Rootless Podman), set the `rootless` propert minikube config set rootless true ``` +For Rootless Podman, it is recommended to set `--container-runtime` to `containerd`: + +```shell +minikube start --driver=podman --container-runtime=containerd +``` + See the [Rootless Docker](https://minikube.sigs.k8s.io/docs/drivers/docker/#rootless-docker) section for the requirements and the restrictions. From 08b3c8d4d607c3a26535cd330bc4ad553fe44ec5 Mon Sep 17 00:00:00 2001 From: "Paul S. Schweigert" Date: Thu, 30 Jun 2022 08:16:25 -0400 Subject: [PATCH 227/545] add quotes Signed-off-by: Paul S. Schweigert --- test/integration/docker_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integration/docker_test.go b/test/integration/docker_test.go index 30e8b0dd07..c67883d063 100644 --- a/test/integration/docker_test.go +++ b/test/integration/docker_test.go @@ -127,7 +127,7 @@ func validateCrioSystemd(ctx context.Context, t *testing.T, profile string) { if err != nil { t.Errorf("failed to get cri-o cgroup driver. args %q: %v", rr.Command(), err) } - if strings.Contains(rr.Output(), "cgroup_manager = systemd") { + if strings.Contains(rr.Output(), "cgroup_manager = \"systemd\"") { t.Fatalf("expected systemd cgroup driver, got: %v", rr.Output()) } } From a1c71987949a080ebcb9d092f1fe4c348bd11abd Mon Sep 17 00:00:00 2001 From: "Paul S. Schweigert" Date: Thu, 30 Jun 2022 14:20:56 -0400 Subject: [PATCH 228/545] fix Signed-off-by: Paul S. Schweigert --- test/integration/docker_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integration/docker_test.go b/test/integration/docker_test.go index c67883d063..0d1ebea891 100644 --- a/test/integration/docker_test.go +++ b/test/integration/docker_test.go @@ -127,7 +127,7 @@ func validateCrioSystemd(ctx context.Context, t *testing.T, profile string) { if err != nil { t.Errorf("failed to get cri-o cgroup driver. args %q: %v", rr.Command(), err) } - if strings.Contains(rr.Output(), "cgroup_manager = \"systemd\"") { + if !strings.Contains(rr.Output(), "cgroup_manager = \"systemd\"") { t.Fatalf("expected systemd cgroup driver, got: %v", rr.Output()) } } From b28e6de4ba37ffec66170588afce60c61d1bcd44 Mon Sep 17 00:00:00 2001 From: "Paul S. Schweigert" Date: Thu, 30 Jun 2022 16:02:01 -0400 Subject: [PATCH 229/545] fixes Signed-off-by: Paul S. Schweigert --- 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 9da3223b4f..dade861afe 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.26.0 +ISO_VERSION ?= v1.26.0-1656448385-14420 # 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 404359a48a..a559ad089e 100644 --- a/pkg/minikube/download/iso.go +++ b/pkg/minikube/download/iso.go @@ -41,7 +41,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/iso" + isoBucket := "minikube-builds/iso/14420" return []string{ fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s-%s.iso", isoBucket, v, runtime.GOARCH), fmt.Sprintf("https://github.com/kubernetes/minikube/releases/download/%s/minikube-%s-%s.iso", v, v, runtime.GOARCH), diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index 524229a730..c48cb44c94 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/iso/minikube-v1.26.0-amd64.iso,https://github.com/kubernetes/minikube/releases/download/v1.26.0/minikube-v1.26.0-amd64.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.26.0-amd64.iso,https://storage.googleapis.com/minikube/iso/minikube-v1.26.0.iso,https://github.com/kubernetes/minikube/releases/download/v1.26.0/minikube-v1.26.0.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.26.0.iso]) + --iso-url strings Locations to fetch the minikube ISO from. (default [https://storage.googleapis.com/minikube-builds/iso/14420/minikube-v1.26.0-1656448385-14420-amd64.iso,https://github.com/kubernetes/minikube/releases/download/v1.26.0-1656448385-14420/minikube-v1.26.0-1656448385-14420-amd64.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.26.0-1656448385-14420-amd64.iso,https://storage.googleapis.com/minikube-builds/iso/14420/minikube-v1.26.0-1656448385-14420.iso,https://github.com/kubernetes/minikube/releases/download/v1.26.0-1656448385-14420/minikube-v1.26.0-1656448385-14420.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.26.0-1656448385-14420.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.24.2, 'latest' for v1.24.2). Defaults to 'stable'. --kvm-gpu Enable experimental NVIDIA GPU support in minikube From 79cd77cc0affadce5fc2e204e8c07e467ea36880 Mon Sep 17 00:00:00 2001 From: "Paul S. Schweigert" Date: Thu, 30 Jun 2022 17:11:48 -0400 Subject: [PATCH 230/545] remove CI iso build docs section Signed-off-by: Paul S. Schweigert --- site/content/en/docs/contrib/building/iso.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/site/content/en/docs/contrib/building/iso.md b/site/content/en/docs/contrib/building/iso.md index f739aef819..b3bc0b6513 100644 --- a/site/content/en/docs/contrib/building/iso.md +++ b/site/content/en/docs/contrib/building/iso.md @@ -97,6 +97,3 @@ We publish CI builds of minikube, built at every Pull Request. Builds are availa - - -We also publish CI builds of minikube-iso, built at every Pull Request that touches deploy/iso/minikube-iso. Builds are available at: - -- From e248effcaca276ec813ce94aeab88ced9e3cc62b Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Thu, 30 Jun 2022 16:28:26 -0700 Subject: [PATCH 231/545] add solution message for when cri-docker is missing --- pkg/minikube/reason/known_issues.go | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/pkg/minikube/reason/known_issues.go b/pkg/minikube/reason/known_issues.go index 3791c1d04f..aec1f5123c 100644 --- a/pkg/minikube/reason/known_issues.go +++ b/pkg/minikube/reason/known_issues.go @@ -1147,6 +1147,26 @@ var runtimeIssues = []match{ Regexp: re(`sudo systemctl start docker: exit status 5`), GOOS: []string{"linux"}, }, + { + Kind: Kind{ + ID: "RT_DOCKER_MISSING_CRI_DOCKER_NONE", + ExitCode: ExRuntimeUnavailable, + Advice: `Using Kubernetes v1.24+ with the Docker runtime requires cri-docker to be installed`, + URL: "https://minikube.sigs.k8s.io/docs/reference/drivers/none", + Issues: []int{14410}, + }, + Regexp: re(`Unit file cri-docker\.socket does not exist`), + GOOS: []string{"linux"}, + }, + { + Kind: Kind{ + ID: "RT_DOCKER_MISSING_CRI_DOCKER", + ExitCode: ExRuntimeUnavailable, + Advice: `This cluster was created before minikube v1.26.0 and doesn't have cri-docker installed. Please run 'minikube delete' and then start minikube again`, + Issues: []int{14410}, + }, + Regexp: re(`cannot stat '\/var\/run\/cri-dockerd\.sock': No such file or directory`), + }, { Kind: Kind{ ID: "RT_CRIO_EXIT_5", From eda35dcdf4d9484a0cc92ca083f199dac3b6d9e6 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Fri, 1 Jul 2022 09:23:05 -0700 Subject: [PATCH 232/545] run generate-docs --- 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 | 2 ++ translations/strings.txt | 2 ++ translations/zh-CN.json | 2 ++ 9 files changed, 18 insertions(+) diff --git a/translations/de.json b/translations/de.json index 1528eb36cc..bb8b00ef3f 100644 --- a/translations/de.json +++ b/translations/de.json @@ -733,6 +733,7 @@ "Things to try without Kubernetes ...": "Dinge, die man ohne Kubernetes ausprobieren kann ...", "This addon does not have an endpoint defined for the 'addons open' command.\nYou can add one by annotating a service with the label {{.labelName}}:{{.addonName}}": "Dieses Addon hat keinen definierte Endpoint für den Befehl 'addons open'\nSie können einen definieren, indem Sie den Service mit dem Label {{.labelName}}:{{.addonName}} versehen (anotate)", "This can also be done automatically by setting the env var CHANGE_MINIKUBE_NONE_USER=true": "Dies kann auch automatisch erfolgen, indem Sie die env var CHANGE_MINIKUBE_NONE_USER = true setzen", + "This cluster was created before minikube v1.26.0 and doesn't have cri-docker installed. Please run 'minikube delete' and then start minikube again": "", "This control plane is not running! (state={{.state}})": "Diese Kontroll-Ebene läuft nicht! (state={{.state}})", "This driver does not yet work on your architecture. Maybe try --driver=none": "Dieser Treiber funktioniert noch nicht mit dieser Architektur. Versuche --driver=none zu verwenden", "This flag is currently unsupported.": "", @@ -834,6 +835,7 @@ "User name must be 60 chars or less.": "Der Benutzername kann 60 oder weniger Zeichen lang sein", "Userspace file server is shutdown": "Userspace File Server ist heruntergefahren", "Userspace file server: ": "Userspace File Server:", + "Using Kubernetes v1.24+ with the Docker runtime requires cri-docker to be installed": "", "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)", diff --git a/translations/es.json b/translations/es.json index 7a93a45820..4804ad173e 100644 --- a/translations/es.json +++ b/translations/es.json @@ -736,6 +736,7 @@ "Things to try without Kubernetes ...": "", "This addon does not have an endpoint defined for the 'addons open' command.\nYou can add one by annotating a service with the label {{.labelName}}:{{.addonName}}": "", "This can also be done automatically by setting the env var CHANGE_MINIKUBE_NONE_USER=true": "El proceso se puede automatizar si se define la variable de entorno CHANGE_MINIKUBE_NONE_USER=true", + "This cluster was created before minikube v1.26.0 and doesn't have cri-docker installed. Please run 'minikube delete' and then start minikube again": "", "This control plane is not running! (state={{.state}})": "", "This driver does not yet work on your architecture. Maybe try --driver=none": "", "This flag is currently unsupported.": "", @@ -837,6 +838,7 @@ "User name must be 60 chars or less.": "", "Userspace file server is shutdown": "", "Userspace file server: ": "", + "Using Kubernetes v1.24+ with the Docker runtime requires cri-docker to be installed": "", "Using image repository {{.name}}": "Utilizando el repositorio de imágenes {{.name}}", "Using image {{.registry}}{{.image}}": "", "Using image {{.registry}}{{.image}} (global image repository)": "", diff --git a/translations/fr.json b/translations/fr.json index 7f21582aaa..b5a7c5d4ea 100644 --- a/translations/fr.json +++ b/translations/fr.json @@ -709,6 +709,7 @@ "Things to try without Kubernetes ...": "Choses à essayer sans Kubernetes ...", "This addon does not have an endpoint defined for the 'addons open' command.\nYou can add one by annotating a service with the label {{.labelName}}:{{.addonName}}": "Ce module n'a pas de point de terminaison défini pour la commande 'addons open'.\nVous pouvez en ajouter un en annotant un service avec le libellé {{.labelName}} :{{.addonName}}", "This can also be done automatically by setting the env var CHANGE_MINIKUBE_NONE_USER=true": "Cette opération peut également être réalisée en définissant la variable d'environment \"CHANGE_MINIKUBE_NONE_USER=true\".", + "This cluster was created before minikube v1.26.0 and doesn't have cri-docker installed. Please run 'minikube delete' and then start minikube again": "", "This control plane is not running! (state={{.state}})": "Ce plan de contrôle ne fonctionne pas ! (état={{.state}})", "This driver does not yet work on your architecture. Maybe try --driver=none": "Ce pilote ne fonctionne pas encore sur votre architecture. Essayez peut-être --driver=none", "This flag is currently unsupported.": "Cet indicateur n'est actuellement pas pris en charge.", @@ -805,6 +806,7 @@ "User name must be 60 chars or less.": "Le nom d'utilisateur doit comporter 60 caractères ou moins.", "Userspace file server is shutdown": "Le serveur de fichiers de l'espace utilisateur est arrêté", "Userspace file server: ": "Serveur de fichiers de l'espace utilisateur :", + "Using Kubernetes v1.24+ with the Docker runtime requires cri-docker to be installed": "", "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)", diff --git a/translations/ja.json b/translations/ja.json index 328f22ee8b..8f966cb344 100644 --- a/translations/ja.json +++ b/translations/ja.json @@ -735,6 +735,7 @@ "Things to try without Kubernetes ...": "Kubernetes なしで試すべきこと ...", "This addon does not have an endpoint defined for the 'addons open' command.\nYou can add one by annotating a service with the label {{.labelName}}:{{.addonName}}": "このアドオンは 'addons open' コマンド用に定義されたエンドポイントがありません。\nサービスに {{.labelName}}:{{.addonName}} ラベルを付与することでエンドポイントを追加できます", "This can also be done automatically by setting the env var CHANGE_MINIKUBE_NONE_USER=true": "これは環境変数 CHANGE_MINIKUBE_NONE_USER=true を設定して自動的に行うこともできます", + "This cluster was created before minikube v1.26.0 and doesn't have cri-docker installed. Please run 'minikube delete' and then start minikube again": "", "This control plane is not running! (state={{.state}})": "このコントロールプレーンは動作していません！(state={{.state}})", "This driver does not yet work on your architecture. Maybe try --driver=none": "このドライバーはあなたのアーキテクチャではまだ機能しません。もしかしたら、--driver=none を試してみてください", "This flag is currently unsupported.": "", @@ -840,6 +841,7 @@ "Userspace file server is shutdown": "ユーザースペースのファイルサーバーが停止しました", "Userspace file server:": "ユーザースペースのファイルサーバー:", "Userspace file server: ": "ユーザースペースのファイルサーバー: ", + "Using Kubernetes v1.24+ with the Docker runtime requires cri-docker to be installed": "", "Using image repository {{.name}}": "{{.name}} イメージリポジトリーを使用しています", "Using image {{.registry}}{{.image}}": "{{.registry}}{{.image}} イメージを使用しています", "Using image {{.registry}}{{.image}} (global image repository)": "{{.registry}}{{.image}} イメージ (グローバルイメージリポジトリー) を使用しています", diff --git a/translations/ko.json b/translations/ko.json index eb938c7f45..87e5854597 100644 --- a/translations/ko.json +++ b/translations/ko.json @@ -739,6 +739,7 @@ "Things to try without Kubernetes ...": "", "This addon does not have an endpoint defined for the 'addons open' command.\nYou can add one by annotating a service with the label {{.labelName}}:{{.addonName}}": "", "This can also be done automatically by setting the env var CHANGE_MINIKUBE_NONE_USER=true": "", + "This cluster was created before minikube v1.26.0 and doesn't have cri-docker installed. Please run 'minikube delete' and then start minikube again": "", "This control plane is not running! (state={{.state}})": "", "This driver does not yet work on your architecture. Maybe try --driver=none": "", "This flag is currently unsupported.": "", @@ -838,6 +839,7 @@ "User name must be 60 chars or less.": "", "Userspace file server is shutdown": "", "Userspace file server: ": "", + "Using Kubernetes v1.24+ with the Docker runtime requires cri-docker to be installed": "", "Using image repository {{.name}}": "", "Using image {{.registry}}{{.image}}": "", "Using image {{.registry}}{{.image}} (global image repository)": "", diff --git a/translations/pl.json b/translations/pl.json index ff9360471d..69b3e16ca6 100644 --- a/translations/pl.json +++ b/translations/pl.json @@ -750,6 +750,7 @@ "Things to try without Kubernetes ...": "", "This addon does not have an endpoint defined for the 'addons open' command.\nYou can add one by annotating a service with the label {{.labelName}}:{{.addonName}}": "", "This can also be done automatically by setting the env var CHANGE_MINIKUBE_NONE_USER=true": "", + "This cluster was created before minikube v1.26.0 and doesn't have cri-docker installed. Please run 'minikube delete' and then start minikube again": "", "This control plane is not running! (state={{.state}})": "", "This driver does not yet work on your architecture. Maybe try --driver=none": "", "This flag is currently unsupported.": "", @@ -847,6 +848,7 @@ "User name must be 60 chars or less.": "", "Userspace file server is shutdown": "", "Userspace file server: ": "", + "Using Kubernetes v1.24+ with the Docker runtime requires cri-docker to be installed": "", "Using image repository {{.name}}": "", "Using image {{.registry}}{{.image}}": "", "Using image {{.registry}}{{.image}} (global image repository)": "", diff --git a/translations/ru.json b/translations/ru.json index 02ae9f01b1..38d03aa5e3 100644 --- a/translations/ru.json +++ b/translations/ru.json @@ -681,6 +681,7 @@ "Things to try without Kubernetes ...": "", "This addon does not have an endpoint defined for the 'addons open' command.\nYou can add one by annotating a service with the label {{.labelName}}:{{.addonName}}": "", "This can also be done automatically by setting the env var CHANGE_MINIKUBE_NONE_USER=true": "", + "This cluster was created before minikube v1.26.0 and doesn't have cri-docker installed. Please run 'minikube delete' and then start minikube again": "", "This control plane is not running! (state={{.state}})": "", "This driver does not yet work on your architecture. Maybe try --driver=none": "", "This flag is currently unsupported.": "", @@ -774,6 +775,7 @@ "User name must be 60 chars or less.": "", "Userspace file server is shutdown": "", "Userspace file server: ": "", + "Using Kubernetes v1.24+ with the Docker runtime requires cri-docker to be installed": "", "Using image repository {{.name}}": "", "Using image {{.registry}}{{.image}}": "Используется образ {{.registry}}{{.image}}", "Using image {{.registry}}{{.image}} (global image repository)": "", diff --git a/translations/strings.txt b/translations/strings.txt index e7de2eea68..527bdae499 100644 --- a/translations/strings.txt +++ b/translations/strings.txt @@ -681,6 +681,7 @@ "Things to try without Kubernetes ...": "", "This addon does not have an endpoint defined for the 'addons open' command.\nYou can add one by annotating a service with the label {{.labelName}}:{{.addonName}}": "", "This can also be done automatically by setting the env var CHANGE_MINIKUBE_NONE_USER=true": "", + "This cluster was created before minikube v1.26.0 and doesn't have cri-docker installed. Please run 'minikube delete' and then start minikube again": "", "This control plane is not running! (state={{.state}})": "", "This driver does not yet work on your architecture. Maybe try --driver=none": "", "This flag is currently unsupported.": "", @@ -774,6 +775,7 @@ "User name must be 60 chars or less.": "", "Userspace file server is shutdown": "", "Userspace file server: ": "", + "Using Kubernetes v1.24+ with the Docker runtime requires cri-docker to be installed": "", "Using image repository {{.name}}": "", "Using image {{.registry}}{{.image}}": "", "Using image {{.registry}}{{.image}} (global image repository)": "", diff --git a/translations/zh-CN.json b/translations/zh-CN.json index 0cc9f36a5e..24a7d37b14 100644 --- a/translations/zh-CN.json +++ b/translations/zh-CN.json @@ -838,6 +838,7 @@ "Things to try without Kubernetes ...": "", "This addon does not have an endpoint defined for the 'addons open' command.\nYou can add one by annotating a service with the label {{.labelName}}:{{.addonName}}": "", "This can also be done automatically by setting the env var CHANGE_MINIKUBE_NONE_USER=true": "此操作还可通过设置环境变量 CHANGE_MINIKUBE_NONE_USER=true 自动完成", + "This cluster was created before minikube v1.26.0 and doesn't have cri-docker installed. Please run 'minikube delete' and then start minikube again": "", "This control plane is not running! (state={{.state}})": "", "This driver does not yet work on your architecture. Maybe try --driver=none": "", "This flag is currently unsupported.": "", @@ -946,6 +947,7 @@ "User name must be 60 chars or less.": "", "Userspace file server is shutdown": "", "Userspace file server: ": "", + "Using Kubernetes v1.24+ with the Docker runtime requires cri-docker to be installed": "", "Using image repository {{.name}}": "正在使用镜像存储库 {{.name}}", "Using image {{.registry}}{{.image}}": "", "Using image {{.registry}}{{.image}} (global image repository)": "", From 9f856abb8f39528b878fe015981ed45a603471b2 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Thu, 30 Jun 2022 13:16:17 -0700 Subject: [PATCH 233/545] update base images --- deploy/addons/auto-pause/Dockerfile | 2 +- deploy/iso/minikube-iso/Dockerfile | 2 +- deploy/kicbase/Dockerfile | 4 ++-- deploy/prow/Dockerfile | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/deploy/addons/auto-pause/Dockerfile b/deploy/addons/auto-pause/Dockerfile index cd217d9e2d..118a70420c 100644 --- a/deploy/addons/auto-pause/Dockerfile +++ b/deploy/addons/auto-pause/Dockerfile @@ -1,2 +1,2 @@ -FROM golang:1.8 +FROM golang:1.18 ADD auto-pause-hook /auto-pause-hook diff --git a/deploy/iso/minikube-iso/Dockerfile b/deploy/iso/minikube-iso/Dockerfile index 1068e0f6fb..6035c52fe0 100644 --- a/deploy/iso/minikube-iso/Dockerfile +++ b/deploy/iso/minikube-iso/Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM ubuntu:18.04 +FROM ubuntu:20.04 RUN apt-get update \ && apt-get install -y apt dpkg apt-utils ca-certificates software-properties-common \ diff --git a/deploy/kicbase/Dockerfile b/deploy/kicbase/Dockerfile index 52e865a982..9384b88842 100644 --- a/deploy/kicbase/Dockerfile +++ b/deploy/kicbase/Dockerfile @@ -19,7 +19,7 @@ # multi-stage docker build so we can build auto-pause for arm64 -FROM golang:1.17 as auto-pause +FROM golang:1.18 as auto-pause WORKDIR /src # auto-pause depends on core minikube code so we need to pass the whole source code as the context # copy in the minimal amount of source code possible @@ -36,7 +36,7 @@ RUN if [ "$PREBUILT_AUTO_PAUSE" != "true" ]; then cd ./cmd/auto-pause/ && go bui # start from ubuntu 20.04, this image is reasonably small as a starting point # for a kubernetes node image, it doesn't contain much we don't need -FROM ubuntu:focal-20220316 as kicbase +FROM ubuntu:focal-20220531 as kicbase ARG BUILDKIT_VERSION="v0.10.3" ARG FUSE_OVERLAYFS_VERSION="v1.7.1" diff --git a/deploy/prow/Dockerfile b/deploy/prow/Dockerfile index 7a99642b02..90311fffff 100644 --- a/deploy/prow/Dockerfile +++ b/deploy/prow/Dockerfile @@ -15,7 +15,7 @@ # Includes tools used for kubernetes/minikube CI # NOTE: we attempt to avoid unnecessary tools and image layers while # supporting kubernetes builds, minikube installation, etc. -FROM debian:buster +FROM debian:bullseye # arg that specifies the go version to install ARG GO_VERSION From d803ca58d2d5daa3f8e057834263937e34d0f208 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Fri, 1 Jul 2022 18:10:53 +0000 Subject: [PATCH 234/545] 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 1528eb36cc..1e8bb4c60f 100644 --- a/translations/de.json +++ b/translations/de.json @@ -489,6 +489,7 @@ "PowerShell is running in constrained mode, which is incompatible with Hyper-V scripting.": "PowerShell läuft im constrained mode, welcher nicht kompatibel mit Hyper-V Scripting ist.", "Powering off \"{{.profile_name}}\" via SSH ...": "{{.profile_name}}\" wird über SSH ausgeschaltet...", "Preparing Kubernetes {{.k8sVersion}} on {{.runtime}} {{.runtimeVersion}} ...": "Vorbereiten von Kubernetes {{.k8sVersion}} auf {{.runtime}} {{.runtimeVersion}}...", + "Preparing {{.runtime}} {{.runtimeVersion}} ...": "", "Print current and latest version number": "Gebe die aktuelle und die aktuellste verfügbare Versionsnummer aus", "Print just the version number.": "Gebe nur die Versionsnummer aus", "Print the version of minikube": "Gebe die Version von Minikube aus", @@ -606,6 +607,7 @@ "Specifying extra disks is currently only supported for the following drivers: {{.supported_drivers}}. If you can contribute to add this feature, please create a PR.": "Das Spezifizieren von extra Disks ist derzeit nur von den folgenden Treibern unterstützt: {{.supported_drivers}}. Wenn du dieses Feature beisteuern kannst, erstelle bitte einen PR.", "StartHost failed, but will try again: {{.error}}": "StartHost fehlgeschlagen, aber es wird noch einmal versucht: {{.error}}", "Starting control plane node {{.name}} in cluster {{.cluster}}": "Starte Control Plane Node {{.name}} in Cluster {{.cluster}}", + "Starting minikube without Kubernetes in cluster {{.cluster}}": "", "Starting minikube without Kubernetes {{.name}} in cluster {{.cluster}}": "Starte Minikube ohne Kubernetes {{.name}} in Cluster {{.cluster}}", "Starting tunnel for service {{.service}}.": "Start Tunnel für den Service {{.service}}", "Starting worker node {{.name}} in cluster {{.cluster}}": "Starte Worker Node {{.name}} in Cluster {{.cluster}}", diff --git a/translations/es.json b/translations/es.json index 7a93a45820..5e153c2092 100644 --- a/translations/es.json +++ b/translations/es.json @@ -496,6 +496,7 @@ "PowerShell is running in constrained mode, which is incompatible with Hyper-V scripting.": "", "Powering off \"{{.profile_name}}\" via SSH ...": "Apagando \"{{.profile_name}}\" mediante SSH...", "Preparing Kubernetes {{.k8sVersion}} on {{.runtime}} {{.runtimeVersion}} ...": "Preparando Kubernetes {{.k8sVersion}} en {{.runtime}} {{.runtimeVersion}}...", + "Preparing {{.runtime}} {{.runtimeVersion}} ...": "", "Print current and latest version number": "", "Print just the version number.": "", "Print the version of minikube": "", @@ -611,7 +612,7 @@ "Specifying extra disks is currently only supported for the following drivers: {{.supported_drivers}}. If you can contribute to add this feature, please create a PR.": "", "StartHost failed, but will try again: {{.error}}": "", "Starting control plane node {{.name}} in cluster {{.cluster}}": "", - "Starting minikube without Kubernetes {{.name}} in cluster {{.cluster}}": "", + "Starting minikube without Kubernetes in cluster {{.cluster}}": "", "Starting tunnel for service {{.service}}.": "", "Starting worker node {{.name}} in cluster {{.cluster}}": "", "Starts a local Kubernetes cluster": "", diff --git a/translations/fr.json b/translations/fr.json index 7f21582aaa..c2cf0da51d 100644 --- a/translations/fr.json +++ b/translations/fr.json @@ -477,6 +477,7 @@ "PowerShell is running in constrained mode, which is incompatible with Hyper-V scripting.": "PowerShell s'exécute en mode contraint, ce qui est incompatible avec les scripts Hyper-V.", "Powering off \"{{.profile_name}}\" via SSH ...": "Mise hors tension du profil \"{{.profile_name}}\" via SSH…", "Preparing Kubernetes {{.k8sVersion}} on {{.runtime}} {{.runtimeVersion}} ...": "Préparation de Kubernetes {{.k8sVersion}} sur {{.runtime}} {{.runtimeVersion}}...", + "Preparing {{.runtime}} {{.runtimeVersion}} ...": "", "Print current and latest version number": "Imprimer le numéro de version actuel et le plus récent", "Print just the version number.": "Imprimez uniquement le numéro de version.", "Print the version of minikube": "Imprimer la version de minikube", @@ -595,6 +596,7 @@ "Specifying extra disks is currently only supported for the following drivers: {{.supported_drivers}}. If you can contribute to add this feature, please create a PR.": "La spécification de disques supplémentaires n'est actuellement prise en charge que pour les pilotes suivants : {{.supported_drivers}}. Si vous pouvez contribuer à ajouter cette fonctionnalité, veuillez créer un PR.", "StartHost failed, but will try again: {{.error}}": "StartHost a échoué, mais va réessayer : {{.error}}", "Starting control plane node {{.name}} in cluster {{.cluster}}": "Démarrage du noeud de plan de contrôle {{.name}} dans le cluster {{.cluster}}", + "Starting minikube without Kubernetes in cluster {{.cluster}}": "", "Starting minikube without Kubernetes {{.name}} in cluster {{.cluster}}": "Démarrage de minikube sans Kubernetes {{.name}} dans le cluster {{.cluster}}", "Starting node {{.name}} in cluster {{.cluster}}": "Démarrage du noeud {{.name}} dans le cluster {{.cluster}}", "Starting tunnel for service {{.service}}.": "Tunnel de démarrage pour le service {{.service}}.", diff --git a/translations/ja.json b/translations/ja.json index 328f22ee8b..e70b9626f2 100644 --- a/translations/ja.json +++ b/translations/ja.json @@ -488,6 +488,7 @@ "PowerShell is running in constrained mode, which is incompatible with Hyper-V scripting.": "PowerShell は制約付きモードで実行されています (Hyper-V スクリプティングと互換性がありません)。", "Powering off \"{{.profile_name}}\" via SSH ...": "SSH 経由で「{{.profile_name}}」の電源をオフにしています...", "Preparing Kubernetes {{.k8sVersion}} on {{.runtime}} {{.runtimeVersion}} ...": "{{.runtime}} {{.runtimeVersion}} で Kubernetes {{.k8sVersion}} を準備しています...", + "Preparing {{.runtime}} {{.runtimeVersion}} ...": "", "Print current and latest version number": "使用中および最新の minikube バージョン番号を表示します", "Print just the version number.": "バージョン番号だけ表示します。", "Print the version of minikube": "minikube バージョンを表示します", @@ -606,6 +607,7 @@ "Specifying extra disks is currently only supported for the following drivers: {{.supported_drivers}}. If you can contribute to add this feature, please create a PR.": "追加ディスク指定は現在 {{.supported_drivers}} ドライバーのみ対応しています。本機能の追加に貢献可能な場合、PR を作成してください。", "StartHost failed, but will try again: {{.error}}": "StartHost に失敗しましたが、再度試してみます: {{.error}}", "Starting control plane node {{.name}} in cluster {{.cluster}}": "{{.cluster}} クラスター中のコントロールプレーンの {{.name}} ノードを起動しています", + "Starting minikube without Kubernetes in cluster {{.cluster}}": "", "Starting minikube without Kubernetes {{.name}} in cluster {{.cluster}}": "{{.cluster}} クラスター中の Kubernetes なしで minikube {{.name}} を起動しています", "Starting tunnel for service {{.service}}.": "{{.service}} サービス用のトンネルを起動しています。", "Starting worker node {{.name}} in cluster {{.cluster}}": "{{.cluster}} クラスター中の {{.name}} ワーカーノードを起動しています", diff --git a/translations/ko.json b/translations/ko.json index eb938c7f45..872226dd2c 100644 --- a/translations/ko.json +++ b/translations/ko.json @@ -510,6 +510,7 @@ "PowerShell is running in constrained mode, which is incompatible with Hyper-V scripting.": "", "Powering off \"{{.profile_name}}\" via SSH ...": "", "Preparing Kubernetes {{.k8sVersion}} on {{.runtime}} {{.runtimeVersion}} ...": "쿠버네티스 {{.k8sVersion}} 을 {{.runtime}} {{.runtimeVersion}} 런타임으로 설치하는 중", + "Preparing {{.runtime}} {{.runtimeVersion}} ...": "", "Print current and latest version number": "현재 그리고 최신 버전을 출력합니다", "Print just the version number.": "", "Print the version of minikube": "minikube 의 버전을 출력합니다", @@ -624,7 +625,7 @@ "Specifying extra disks is currently only supported for the following drivers: {{.supported_drivers}}. If you can contribute to add this feature, please create a PR.": "", "StartHost failed, but will try again: {{.error}}": "", "Starting control plane node {{.name}} in cluster {{.cluster}}": "{{.cluster}} 클러스터의 {{.name}} 컨트롤 플레인 노드를 시작하는 중", - "Starting minikube without Kubernetes {{.name}} in cluster {{.cluster}}": "", + "Starting minikube without Kubernetes in cluster {{.cluster}}": "", "Starting node": "노드를 시작하는 중", "Starting node {{.name}} in cluster {{.cluster}}": "{{.cluster}} 클러스터의 {{.name}} 노드를 시작하는 중", "Starting tunnel for service {{.service}}.": "{{.service}} 서비스의 터널을 시작하는 중", diff --git a/translations/pl.json b/translations/pl.json index ff9360471d..f644aa687e 100644 --- a/translations/pl.json +++ b/translations/pl.json @@ -507,6 +507,7 @@ "PowerShell is running in constrained mode, which is incompatible with Hyper-V scripting.": "PowerShell jest uruchomiony w trybie ograniczonym, co jest niekompatybilne ze skryptowaniem w wirtualizacji z użyciem Hyper-V", "Powering off \"{{.profile_name}}\" via SSH ...": "Wyłączanie klastra \"{{.profile_name}}\" przez SSH ...", "Preparing Kubernetes {{.k8sVersion}} on {{.runtime}} {{.runtimeVersion}} ...": "Przygotowywanie Kubernetesa {{.k8sVersion}} na {{.runtime}} {{.runtimeVersion}}...", + "Preparing {{.runtime}} {{.runtimeVersion}} ...": "", "Print current and latest version number": "Wyświetl aktualną i najnowszą wersję", "Print just the version number.": "Wyświetl tylko numer wersji", "Print the version of minikube": "Wyświetl wersję minikube", @@ -626,7 +627,7 @@ "Specifying extra disks is currently only supported for the following drivers: {{.supported_drivers}}. If you can contribute to add this feature, please create a PR.": "", "StartHost failed, but will try again: {{.error}}": "", "Starting control plane node {{.name}} in cluster {{.cluster}}": "", - "Starting minikube without Kubernetes {{.name}} in cluster {{.cluster}}": "", + "Starting minikube without Kubernetes in cluster {{.cluster}}": "", "Starting tunnel for service {{.service}}.": "", "Starting worker node {{.name}} in cluster {{.cluster}}": "", "Starts a local Kubernetes cluster": "", diff --git a/translations/ru.json b/translations/ru.json index 02ae9f01b1..fa949bed3b 100644 --- a/translations/ru.json +++ b/translations/ru.json @@ -460,6 +460,7 @@ "PowerShell is running in constrained mode, which is incompatible with Hyper-V scripting.": "", "Powering off \"{{.profile_name}}\" via SSH ...": "Выключается \"{{.profile_name}}\" через SSH ...", "Preparing Kubernetes {{.k8sVersion}} on {{.runtime}} {{.runtimeVersion}} ...": "Подготавливается Kubernetes {{.k8sVersion}} на {{.runtime}} {{.runtimeVersion}} ...", + "Preparing {{.runtime}} {{.runtimeVersion}} ...": "", "Print current and latest version number": "", "Print just the version number.": "", "Print the version of minikube": "", @@ -571,7 +572,7 @@ "Specifying extra disks is currently only supported for the following drivers: {{.supported_drivers}}. If you can contribute to add this feature, please create a PR.": "", "StartHost failed, but will try again: {{.error}}": "", "Starting control plane node {{.name}} in cluster {{.cluster}}": "Запускается control plane узел {{.name}} в кластере {{.cluster}}", - "Starting minikube without Kubernetes {{.name}} in cluster {{.cluster}}": "", + "Starting minikube without Kubernetes in cluster {{.cluster}}": "", "Starting tunnel for service {{.service}}.": "", "Starting worker node {{.name}} in cluster {{.cluster}}": "", "Starts a local Kubernetes cluster": "", diff --git a/translations/strings.txt b/translations/strings.txt index e7de2eea68..059d6493b7 100644 --- a/translations/strings.txt +++ b/translations/strings.txt @@ -460,6 +460,7 @@ "PowerShell is running in constrained mode, which is incompatible with Hyper-V scripting.": "", "Powering off \"{{.profile_name}}\" via SSH ...": "", "Preparing Kubernetes {{.k8sVersion}} on {{.runtime}} {{.runtimeVersion}} ...": "", + "Preparing {{.runtime}} {{.runtimeVersion}} ...": "", "Print current and latest version number": "", "Print just the version number.": "", "Print the version of minikube": "", @@ -571,7 +572,7 @@ "Specifying extra disks is currently only supported for the following drivers: {{.supported_drivers}}. If you can contribute to add this feature, please create a PR.": "", "StartHost failed, but will try again: {{.error}}": "", "Starting control plane node {{.name}} in cluster {{.cluster}}": "", - "Starting minikube without Kubernetes {{.name}} in cluster {{.cluster}}": "", + "Starting minikube without Kubernetes in cluster {{.cluster}}": "", "Starting tunnel for service {{.service}}.": "", "Starting worker node {{.name}} in cluster {{.cluster}}": "", "Starts a local Kubernetes cluster": "", diff --git a/translations/zh-CN.json b/translations/zh-CN.json index 0cc9f36a5e..6d02e3e2e2 100644 --- a/translations/zh-CN.json +++ b/translations/zh-CN.json @@ -579,6 +579,7 @@ "PowerShell is running in constrained mode, which is incompatible with Hyper-V scripting.": "", "Powering off \"{{.profile_name}}\" via SSH ...": "正在通过 SSH 关闭“{{.profile_name}}”…", "Preparing Kubernetes {{.k8sVersion}} on {{.runtime}} {{.runtimeVersion}} ...": "正在 {{.runtime}} {{.runtimeVersion}} 中准备 Kubernetes {{.k8sVersion}}…", + "Preparing {{.runtime}} {{.runtimeVersion}} ...": "", "Print current and latest version number": "打印当前和最新版本版本", "Print just the version number.": "", "Print the version of minikube": "打印 minikube 版本", @@ -707,7 +708,7 @@ "Specifying extra disks is currently only supported for the following drivers: {{.supported_drivers}}. If you can contribute to add this feature, please create a PR.": "", "StartHost failed, but will try again: {{.error}}": "", "Starting control plane node {{.name}} in cluster {{.cluster}}": "", - "Starting minikube without Kubernetes {{.name}} in cluster {{.cluster}}": "", + "Starting minikube without Kubernetes in cluster {{.cluster}}": "", "Starting tunnel for service {{.service}}.": "", "Starting worker node {{.name}} in cluster {{.cluster}}": "", "Starts a local Kubernetes cluster": "", From 69ad31612da731996d33ecda7f5aa7aff978b3f4 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Fri, 1 Jul 2022 18:51:14 +0000 Subject: [PATCH 235/545] Updating kicbase image to v0.0.32-1656700284-14481 --- pkg/drivers/kic/types.go | 4 ++-- site/content/en/docs/commands/start.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/drivers/kic/types.go b/pkg/drivers/kic/types.go index ac390c0f1e..cef1d64c70 100644 --- a/pkg/drivers/kic/types.go +++ b/pkg/drivers/kic/types.go @@ -24,9 +24,9 @@ import ( const ( // Version is the current version of kic - Version = "v0.0.32-1656350719-14420" + Version = "v0.0.32-1656700284-14481" // SHA of the kic base image - baseImageSHA = "e7b7f38d1a2eba7828afc2c4c3d24e1d391db431976e47aa6dc5c7a6b038ca4e" + baseImageSHA = "96d18f055abcf72b9f587e13317d6f9b5bb6f60e9fa09d6c51e11defaf9bf842" // The name of the GCR kicbase repository gcrRepo = "gcr.io/k8s-minikube/kicbase-builds" // The name of the Dockerhub kicbase repository diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index c48cb44c94..c29525bb4f 100644 --- a/site/content/en/docs/commands/start.md +++ b/site/content/en/docs/commands/start.md @@ -26,7 +26,7 @@ minikube start [flags] --apiserver-names strings A set of apiserver names which are used in the generated certificate for kubernetes. This can be used if you want to make the apiserver available from outside the machine --apiserver-port int The apiserver listening port (default 8443) --auto-update-drivers If set, automatically updates drivers to the latest version. Defaults to true. (default true) - --base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase-builds:v0.0.32-1656350719-14420@sha256:e7b7f38d1a2eba7828afc2c4c3d24e1d391db431976e47aa6dc5c7a6b038ca4e") + --base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase-builds:v0.0.32-1656700284-14481@sha256:96d18f055abcf72b9f587e13317d6f9b5bb6f60e9fa09d6c51e11defaf9bf842") --binary-mirror string Location to fetch kubectl, kubelet, & kubeadm binaries from. --cache-images If true, cache docker images for the current bootstrapper and load them into the machine. Always false with --driver=none. (default true) --cert-expiration duration Duration until minikube certificate expiration, defaults to three years (26280h). (default 26280h0m0s) From 2224cd3ac44328accec2deb0bc722be095125257 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Fri, 1 Jul 2022 22:21:24 +0000 Subject: [PATCH 236/545] Updating ISO to v1.26.0-1656700267-14481 --- 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 dade861afe..a89fa9203d 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.26.0-1656448385-14420 +ISO_VERSION ?= v1.26.0-1656700267-14481 # 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 a559ad089e..d7196b85ea 100644 --- a/pkg/minikube/download/iso.go +++ b/pkg/minikube/download/iso.go @@ -41,7 +41,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/14420" + isoBucket := "minikube-builds/iso/14481" return []string{ fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s-%s.iso", isoBucket, v, runtime.GOARCH), fmt.Sprintf("https://github.com/kubernetes/minikube/releases/download/%s/minikube-%s-%s.iso", v, v, runtime.GOARCH), diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index c29525bb4f..15a7354d34 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/14420/minikube-v1.26.0-1656448385-14420-amd64.iso,https://github.com/kubernetes/minikube/releases/download/v1.26.0-1656448385-14420/minikube-v1.26.0-1656448385-14420-amd64.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.26.0-1656448385-14420-amd64.iso,https://storage.googleapis.com/minikube-builds/iso/14420/minikube-v1.26.0-1656448385-14420.iso,https://github.com/kubernetes/minikube/releases/download/v1.26.0-1656448385-14420/minikube-v1.26.0-1656448385-14420.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.26.0-1656448385-14420.iso]) + --iso-url strings Locations to fetch the minikube ISO from. (default [https://storage.googleapis.com/minikube-builds/iso/14481/minikube-v1.26.0-1656700267-14481-amd64.iso,https://github.com/kubernetes/minikube/releases/download/v1.26.0-1656700267-14481/minikube-v1.26.0-1656700267-14481-amd64.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.26.0-1656700267-14481-amd64.iso,https://storage.googleapis.com/minikube-builds/iso/14481/minikube-v1.26.0-1656700267-14481.iso,https://github.com/kubernetes/minikube/releases/download/v1.26.0-1656700267-14481/minikube-v1.26.0-1656700267-14481.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.26.0-1656700267-14481.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.24.2, 'latest' for v1.24.2). Defaults to 'stable'. --kvm-gpu Enable experimental NVIDIA GPU support in minikube From 9d44b9cc4ca7f6cc132ac8523e25c9005e9ad405 Mon Sep 17 00:00:00 2001 From: inifares23lab Date: Sun, 3 Jul 2022 14:25:01 +0200 Subject: [PATCH 237/545] add verifiedMaintainer field to Addon --- pkg/minikube/assets/addons.go | 95 ++++++++++++++++++----------------- 1 file changed, 49 insertions(+), 46 deletions(-) diff --git a/pkg/minikube/assets/addons.go b/pkg/minikube/assets/addons.go index 6b227b02d3..d27bb2ea83 100755 --- a/pkg/minikube/assets/addons.go +++ b/pkg/minikube/assets/addons.go @@ -35,12 +35,13 @@ import ( // Addon is a named list of assets, that can be enabled type Addon struct { - Assets []*BinAsset - enabled bool - addonName string - Maintainer string - Docs string - Images map[string]string + Assets []*BinAsset + enabled bool + addonName string + Maintainer string + VerifiedMaintainer string + Docs string + Images map[string]string // Registries currently only shows the default registry of images Registries map[string]string @@ -53,15 +54,16 @@ type NetworkInfo struct { } // NewAddon creates a new Addon -func NewAddon(assets []*BinAsset, enabled bool, addonName string, maintainer string, docs string, images map[string]string, registries map[string]string) *Addon { +func NewAddon(assets []*BinAsset, enabled bool, addonName string, maintainer string, verifiedMaintainer string, docs string, images map[string]string, registries map[string]string) *Addon { a := &Addon{ - Assets: assets, - enabled: enabled, - addonName: addonName, - Maintainer: maintainer, - Docs: docs, - Images: images, - Registries: registries, + Assets: assets, + enabled: enabled, + addonName: addonName, + Maintainer: maintainer, + VerifiedMaintainer: verifiedMaintainer, + Docs: docs, + Images: images, + Registries: registries, } return a } @@ -118,7 +120,7 @@ var Addons = map[string]*Addon{ "0640"), // GuestPersistentDir - }, false, "auto-pause", "Google", "", map[string]string{ + }, false, "auto-pause", "Google", "", "", map[string]string{ "AutoPauseHook": "k8s-minikube/auto-pause-hook:v0.0.2@sha256:c76be418df5ca9c66d0d11c2c68461acbf4072c1cdfc17e64729c5ef4d5a4128", }, map[string]string{ "AutoPauseHook": "gcr.io", @@ -135,7 +137,7 @@ var Addons = map[string]*Addon{ MustBinAsset(addons.DashboardAssets, "dashboard/dashboard-sa.yaml", vmpath.GuestAddonsDir, "dashboard-sa.yaml", "0640"), MustBinAsset(addons.DashboardAssets, "dashboard/dashboard-secret.yaml", vmpath.GuestAddonsDir, "dashboard-secret.yaml", "0640"), MustBinAsset(addons.DashboardAssets, "dashboard/dashboard-svc.yaml", vmpath.GuestAddonsDir, "dashboard-svc.yaml", "0640"), - }, false, "dashboard", "Kubernetes", "https://minikube.sigs.k8s.io/docs/handbook/dashboard/", map[string]string{ + }, false, "dashboard", "", "Kubernetes", "https://minikube.sigs.k8s.io/docs/handbook/dashboard/", map[string]string{ "Dashboard": "kubernetesui/dashboard:v2.6.0@sha256:4af9580485920635d888efe1eddbd67e12f9d5d84dba87100e93feb4e46636b3", "MetricsScraper": "kubernetesui/metrics-scraper:v1.0.8@sha256:76049887f07a0476dc93efc2d3569b9529bf982b22d29f356092ce206e98765c", }, nil), @@ -145,21 +147,21 @@ var Addons = map[string]*Addon{ vmpath.GuestAddonsDir, "storageclass.yaml", "0640"), - }, true, "default-storageclass", "Kubernetes", "https://minikube.sigs.k8s.io/docs/handbook/persistent_volumes/", nil, nil), + }, true, "default-storageclass", "", "Kubernetes", "https://minikube.sigs.k8s.io/docs/handbook/persistent_volumes/", nil, nil), "pod-security-policy": NewAddon([]*BinAsset{ MustBinAsset(addons.PodSecurityPolicyAssets, "pod-security-policy/pod-security-policy.yaml.tmpl", vmpath.GuestAddonsDir, "pod-security-policy.yaml", "0640"), - }, false, "pod-security-policy", "", "", nil, nil), + }, false, "pod-security-policy", "", "", "", nil, nil), "storage-provisioner": NewAddon([]*BinAsset{ MustBinAsset(addons.StorageProvisionerAssets, "storage-provisioner/storage-provisioner.yaml.tmpl", vmpath.GuestAddonsDir, "storage-provisioner.yaml", "0640"), - }, true, "storage-provisioner", "Google", "", map[string]string{ + }, true, "storage-provisioner", "Google", "", "", map[string]string{ "StorageProvisioner": fmt.Sprintf("k8s-minikube/storage-provisioner:%s", version.GetStorageProvisionerVersion()), }, map[string]string{ "StorageProvisioner": "gcr.io", @@ -185,7 +187,7 @@ var Addons = map[string]*Addon{ vmpath.GuestAddonsDir, "storage-provisioner-glusterfile.yaml", "0640"), - }, false, "storage-provisioner-gluster", "", "", map[string]string{ + }, false, "storage-provisioner-gluster", "", "", "", map[string]string{ "Heketi": "heketi/heketi:10@sha256:76d5a6a3b7cf083d1e99efa1c15abedbc5c8b73bef3ade299ce9a4c16c9660f8", "GlusterfileProvisioner": "gluster/glusterfile-provisioner:latest@sha256:9961a35cb3f06701958e202324141c30024b195579e5eb1704599659ddea5223", "GlusterfsServer": "nixpanic/glusterfs-server:pr_fake-disk@sha256:3c58ae9d4e2007758954879d3f4095533831eb757c64ca6a0e32d1fc53fb6034", @@ -223,7 +225,7 @@ var Addons = map[string]*Addon{ vmpath.GuestAddonsDir, "kibana-svc.yaml", "0640"), - }, false, "efk", "3rd party (Elastic)", "", map[string]string{ + }, false, "efk", "3rd party (Elastic)", "", "", map[string]string{ "Elasticsearch": "elasticsearch:v5.6.2@sha256:7e95b32a7a2aad0c0db5c881e4a1ce8b7e53236144ae9d9cfb5fbe5608af4ab2", "FluentdElasticsearch": "fluentd-elasticsearch:v2.0.2@sha256:d0480bbf2d0de2344036fa3f7034cf7b4b98025a89c71d7f1f1845ac0e7d5a97", "Alpine": "alpine:3.6@sha256:66790a2b79e1ea3e1dabac43990c54aca5d1ddf268d9a5a0285e4167c8b24475", @@ -239,7 +241,7 @@ var Addons = map[string]*Addon{ vmpath.GuestAddonsDir, "ingress-deploy.yaml", "0640"), - }, false, "ingress", "", "https://kubernetes.io/docs/tasks/access-application-cluster/ingress-minikube/", map[string]string{ + }, false, "ingress", "", "", "https://kubernetes.io/docs/tasks/access-application-cluster/ingress-minikube/", map[string]string{ // https://github.com/kubernetes/ingress-nginx/blob/c32f9a43279425920c41ba2e54dfcb1a54c0daf7/deploy/static/provider/kind/deploy.yaml#L834 "IngressController": "ingress-nginx/controller:v1.2.1@sha256:5516d103a9c2ecc4f026efbd4b40662ce22dc1f824fb129ed121460aaa5c47f8", // https://github.com/kubernetes/ingress-nginx/blob/fc38b9f2aa2d68ee00c417cf97e727b77a00c175/deploy/static/provider/kind/deploy.yaml#L621 @@ -255,7 +257,7 @@ var Addons = map[string]*Addon{ vmpath.GuestAddonsDir, "istio-operator.yaml", "0640"), - }, false, "istio-provisioner", "3rd party (Istio)", "https://istio.io/latest/docs/setup/platform-setup/minikube/", map[string]string{ + }, false, "istio-provisioner", "3rd party (Istio)", "", "https://istio.io/latest/docs/setup/platform-setup/minikube/", map[string]string{ "IstioOperator": "istio/operator:1.12.2@sha256:42c7609872882cb88728a1592561b4046dac6d05b6002cbdc815b84c86a24f08", }, nil), "istio": NewAddon([]*BinAsset{ @@ -264,14 +266,14 @@ var Addons = map[string]*Addon{ vmpath.GuestAddonsDir, "istio-default-profile.yaml", "0640"), - }, false, "istio", "3rd party (Istio)", "https://istio.io/latest/docs/setup/platform-setup/minikube/", nil, nil), + }, false, "istio", "3rd party (Istio)", "", "https://istio.io/latest/docs/setup/platform-setup/minikube/", nil, nil), "kong": NewAddon([]*BinAsset{ MustBinAsset(addons.KongAssets, "kong/kong-ingress-controller.yaml.tmpl", vmpath.GuestAddonsDir, "kong-ingress-controller.yaml", "0640"), - }, false, "kong", "3rd party (Kong HQ)", "https://minikube.sigs.k8s.io/docs/handbook/addons/kong-ingress/", map[string]string{ + }, false, "kong", "3rd party (Kong HQ)", "", "https://minikube.sigs.k8s.io/docs/handbook/addons/kong-ingress/", map[string]string{ "Kong": "kong:2.7@sha256:4d3e93207305ace881fe9e95ac27717b6fbdd9e0ec1873c34e94908a4f4c9335", "KongIngress": "kong/kubernetes-ingress-controller:2.1.1@sha256:60e4102ab2da7f61e9c478747f0762d06a6166b5f300526b237ed7354c3cb4c8", }, nil), @@ -281,7 +283,7 @@ var Addons = map[string]*Addon{ vmpath.GuestAddonsDir, "pod.yaml", "0640"), - }, false, "kubevirt", "3rd party (KubeVirt)", "https://minikube.sigs.k8s.io/docs/tutorials/kubevirt/", map[string]string{ + }, false, "kubevirt", "3rd party (KubeVirt)", "", "https://minikube.sigs.k8s.io/docs/tutorials/kubevirt/", map[string]string{ "Kubectl": "bitnami/kubectl:1.17@sha256:de642e973d3d0ef60e4d0a1f92286a9fdae245535c5990d4762bbe86fcf95887", }, nil), "metrics-server": NewAddon([]*BinAsset{ @@ -305,7 +307,7 @@ var Addons = map[string]*Addon{ vmpath.GuestAddonsDir, "metrics-server-service.yaml", "0640"), - }, false, "metrics-server", "Kubernetes", "", map[string]string{ + }, false, "metrics-server", "Kubernetes", "", "", map[string]string{ "MetricsServer": "metrics-server/metrics-server:v0.6.1@sha256:5ddc6458eb95f5c70bd13fdab90cbd7d6ad1066e5b528ad1dcb28b76c5fb2f00", }, map[string]string{ "MetricsServer": "k8s.gcr.io", @@ -321,7 +323,7 @@ var Addons = map[string]*Addon{ vmpath.GuestAddonsDir, "olm.yaml", "0640"), - }, false, "olm", "3rd party (Operator Framework)", "", map[string]string{ + }, false, "olm", "3rd party (Operator Framework)", "", "", map[string]string{ "OLM": "operator-framework/olm@sha256:e74b2ac57963c7f3ba19122a8c31c9f2a0deb3c0c5cac9e5323ccffd0ca198ed", // operator-framework/community-operators was deprecated: https://github.com/operator-framework/community-operators#repository-is-obsolete; switching to OperatorHub.io instead "UpstreamCommunityOperators": "operatorhubio/catalog@sha256:e08a1cd21fe72dd1be92be738b4bf1515298206dac5479c17a4b3ed119e30bd4", @@ -345,7 +347,7 @@ var Addons = map[string]*Addon{ vmpath.GuestAddonsDir, "registry-proxy.yaml", "0640"), - }, false, "registry", "Google", "", map[string]string{ + }, false, "registry", "Google", "", "", map[string]string{ "Registry": "registry:2.7.1@sha256:d5459fcb27aecc752520df4b492b08358a1912fcdfa454f7d2101d4b09991daa", "KubeRegistryProxy": "google_containers/kube-registry-proxy:0.4@sha256:1040f25a5273de0d72c54865a8efd47e3292de9fb8e5353e3fa76736b854f2da", }, map[string]string{ @@ -357,7 +359,7 @@ var Addons = map[string]*Addon{ vmpath.GuestAddonsDir, "registry-creds-rc.yaml", "0640"), - }, false, "registry-creds", "3rd party (UPMC Enterprises)", "https://minikube.sigs.k8s.io/docs/handbook/registry/", map[string]string{ + }, false, "registry-creds", "3rd party (UPMC Enterprises)", "", "https://minikube.sigs.k8s.io/docs/handbook/registry/", map[string]string{ "RegistryCreds": "upmcenterprises/registry-creds:1.10@sha256:93a633d4f2b76a1c66bf19c664dbddc56093a543de6d54320f19f585ccd7d605", }, nil), "registry-aliases": NewAddon([]*BinAsset{ @@ -386,7 +388,7 @@ var Addons = map[string]*Addon{ vmpath.GuestAddonsDir, "patch-coredns-job.yaml", "0640"), - }, false, "registry-aliases", "", "", map[string]string{ + }, false, "registry-aliases", "", "", "", map[string]string{ "CoreDNSPatcher": "rhdevelopers/core-dns-patcher@sha256:9220ff32f690c3d889a52afb59ca6fcbbdbd99e5370550cc6fd249adea8ed0a9", "Alpine": "alpine:3.11@sha256:0bd0e9e03a022c3b0226667621da84fc9bf562a9056130424b5bfbd8bcb0397f", "Pause": "google_containers/pause:3.1@sha256:f78411e19d84a252e53bff71a4407a5686c46983a2c2eeed83929b888179acea", @@ -400,7 +402,7 @@ var Addons = map[string]*Addon{ vmpath.GuestAddonsDir, "freshpod-rc.yaml", "0640"), - }, false, "freshpod", "Google", "https://github.com/GoogleCloudPlatform/freshpod", map[string]string{ + }, false, "freshpod", "Google", "", "https://github.com/GoogleCloudPlatform/freshpod", map[string]string{ "FreshPod": "google-samples/freshpod:v0.0.1@sha256:b9efde5b509da3fd2959519c4147b653d0c5cefe8a00314e2888e35ecbcb46f9", }, map[string]string{ "FreshPod": "gcr.io", @@ -411,7 +413,7 @@ var Addons = map[string]*Addon{ vmpath.GuestAddonsDir, "nvidia-driver-installer.yaml", "0640"), - }, false, "nvidia-driver-installer", "Google", "https://minikube.sigs.k8s.io/docs/tutorials/nvidia_gpu/", map[string]string{ + }, false, "nvidia-driver-installer", "Google", "", "https://minikube.sigs.k8s.io/docs/tutorials/nvidia_gpu/", map[string]string{ "NvidiaDriverInstaller": "minikube-nvidia-driver-installer:e2d9b43228decf5d6f7dce3f0a85d390f138fa01", "Pause": "pause:2.0@sha256:9ce5316f9752b8347484ab0f6778573af15524124d52b93230b9a0dcc987e73e", }, map[string]string{ @@ -424,7 +426,7 @@ var Addons = map[string]*Addon{ vmpath.GuestAddonsDir, "nvidia-gpu-device-plugin.yaml", "0640"), - }, false, "nvidia-gpu-device-plugin", "3rd party (Nvidia)", "https://minikube.sigs.k8s.io/docs/tutorials/nvidia_gpu/", map[string]string{ + }, false, "nvidia-gpu-device-plugin", "3rd party (Nvidia)", "", "https://minikube.sigs.k8s.io/docs/tutorials/nvidia_gpu/", map[string]string{ "NvidiaDevicePlugin": "nvidia-gpu-device-plugin@sha256:4b036e8844920336fa48f36edeb7d4398f426d6a934ba022848deed2edbf09aa", }, map[string]string{ "NvidiaDevicePlugin": "k8s.gcr.io", @@ -440,7 +442,7 @@ var Addons = map[string]*Addon{ vmpath.GuestAddonsDir, "logviewer-rbac.yaml", "0640"), - }, false, "logviewer", "", "", map[string]string{ + }, false, "logviewer", "", "", "", map[string]string{ "LogViewer": "ivans3/minikube-log-viewer:latest@sha256:75854f45305cc47d17b04c6c588fa60777391761f951e3a34161ddf1f1b06405", }, nil), "gvisor": NewAddon([]*BinAsset{ @@ -459,7 +461,7 @@ var Addons = map[string]*Addon{ vmpath.GuestGvisorDir, constants.GvisorConfigTomlTargetName, "0640"), - }, false, "gvisor", "Google", "https://github.com/kubernetes/minikube/blob/master/deploy/addons/gvisor/README.md", map[string]string{ + }, false, "gvisor", "Google", "", "https://github.com/kubernetes/minikube/blob/master/deploy/addons/gvisor/README.md", map[string]string{ "GvisorAddon": "k8s-minikube/gvisor-addon:3@sha256:23eb17d48a66fc2b09c31454fb54ecae520c3e9c9197ef17fcb398b4f31d505a", }, map[string]string{ "GvisorAddon": "gcr.io", @@ -480,7 +482,7 @@ var Addons = map[string]*Addon{ vmpath.GuestAddonsDir, "helm-tiller-svc.yaml", "0640"), - }, false, "helm-tiller", "3rd party (Helm)", "https://v2.helm.sh/docs/using_helm/", map[string]string{ + }, false, "helm-tiller", "3rd party (Helm)", "", "https://v2.helm.sh/docs/using_helm/", map[string]string{ "Tiller": "helm/tiller:v2.17.0@sha256:4c43eb385032945cad047d2350e4945d913b90b3ab43ee61cecb32a495c6df0f", }, map[string]string{ // GCR is deprecated in helm @@ -493,7 +495,7 @@ var Addons = map[string]*Addon{ vmpath.GuestAddonsDir, "ingress-dns-pod.yaml", "0640"), - }, false, "ingress-dns", "Google", "https://minikube.sigs.k8s.io/docs/handbook/addons/ingress-dns/", map[string]string{ + }, false, "ingress-dns", "Google", "", "https://minikube.sigs.k8s.io/docs/handbook/addons/ingress-dns/", map[string]string{ "IngressDNS": "k8s-minikube/minikube-ingress-dns:0.0.2@sha256:4abe27f9fc03fedab1d655e2020e6b165faf3bf6de1088ce6cf215a75b78f05f", }, map[string]string{ "IngressDNS": "gcr.io", @@ -509,7 +511,7 @@ var Addons = map[string]*Addon{ vmpath.GuestAddonsDir, "metallb-config.yaml", "0640"), - }, false, "metallb", "3rd party (MetalLB)", "", map[string]string{ + }, false, "metallb", "3rd party (MetalLB)", "", "", map[string]string{ "Speaker": "metallb/speaker:v0.9.6@sha256:c66585a805bed1a3b829d8fb4a4aab9d87233497244ebff96f1b88f1e7f8f991", "Controller": "metallb/controller:v0.9.6@sha256:fbfdb9d3f55976b0ee38f3309d83a4ca703efcf15d6ca7889cd8189142286502", }, nil), @@ -529,7 +531,7 @@ var Addons = map[string]*Addon{ vmpath.GuestAddonsDir, "ambassadorinstallation.yaml", "0640"), - }, false, "ambassador", "3rd party (Ambassador)", "https://minikube.sigs.k8s.io/docs/tutorials/ambassador_ingress_controller/", map[string]string{ + }, false, "ambassador", "3rd party (Ambassador)", "", "https://minikube.sigs.k8s.io/docs/tutorials/ambassador_ingress_controller/", map[string]string{ "AmbassadorOperator": "datawire/ambassador-operator:v1.2.3@sha256:492f33e0828a371aa23331d75c11c251b21499e31287f026269e3f6ec6da34ed", }, map[string]string{ "AmbassadorOperator": "quay.io", @@ -550,7 +552,7 @@ var Addons = map[string]*Addon{ vmpath.GuestAddonsDir, "gcp-auth-webhook.yaml", "0640"), - }, false, "gcp-auth", "Google", "https://minikube.sigs.k8s.io/docs/handbook/addons/gcp-auth/", map[string]string{ + }, false, "gcp-auth", "Google", "", "https://minikube.sigs.k8s.io/docs/handbook/addons/gcp-auth/", map[string]string{ "KubeWebhookCertgen": "k8s.gcr.io/ingress-nginx/kube-webhook-certgen:v1.0@sha256:f3b6b39a6062328c095337b4cadcefd1612348fdd5190b1dcbcb9b9e90bd8068", "GCPAuthWebhook": "k8s-minikube/gcp-auth-webhook:v0.0.9@sha256:25e1c616444d5b2b404c43ce878f320a265fd663b4fcd4c2ad5c12de316612da", }, map[string]string{ @@ -589,7 +591,7 @@ var Addons = map[string]*Addon{ vmpath.GuestAddonsDir, "volume-snapshot-controller-deployment.yaml", "0640"), - }, false, "volumesnapshots", "Kubernetes", "https://minikube.sigs.k8s.io/docs/tutorials/volume_snapshots_and_csi/", map[string]string{ + }, false, "volumesnapshots", "Kubernetes", "", "https://minikube.sigs.k8s.io/docs/tutorials/volume_snapshots_and_csi/", map[string]string{ "SnapshotController": "sig-storage/snapshot-controller:v4.0.0@sha256:00fcc441ea9f72899c25eed61d602272a2a58c5f0014332bdcb5ac24acef08e4", }, map[string]string{ "SnapshotController": "k8s.gcr.io", @@ -660,7 +662,7 @@ var Addons = map[string]*Addon{ vmpath.GuestAddonsDir, "csi-hostpath-storageclass.yaml", "0640"), - }, false, "csi-hostpath-driver", "Kubernetes", "https://minikube.sigs.k8s.io/docs/tutorials/volume_snapshots_and_csi/", map[string]string{ + }, false, "csi-hostpath-driver", "Kubernetes", "", "https://minikube.sigs.k8s.io/docs/tutorials/volume_snapshots_and_csi/", map[string]string{ "Attacher": "sig-storage/csi-attacher:v3.1.0@sha256:50c3cfd458fc8e0bf3c8c521eac39172009382fc66dc5044a330d137c6ed0b09", "HostMonitorAgent": "sig-storage/csi-external-health-monitor-agent:v0.2.0@sha256:c20d4a4772599e68944452edfcecc944a1df28c19e94b942d526ca25a522ea02", "HostMonitorController": "sig-storage/csi-external-health-monitor-controller:v0.2.0@sha256:14988b598a180cc0282f3f4bc982371baf9a9c9b80878fb385f8ae8bd04ecf16", @@ -687,7 +689,7 @@ var Addons = map[string]*Addon{ vmpath.GuestAddonsDir, "portainer.yaml", "0640"), - }, false, "portainer", "Portainer.io", "", map[string]string{ + }, false, "portainer", "Portainer.io", "", "", map[string]string{ "Portainer": "portainer/portainer-ce:latest@sha256:4f126c5114b63e9d1bceb4b368944d14323329a9a0d4e7bb7eb53c9b7435d498", }, nil), "inaccel": NewAddon([]*BinAsset{ @@ -696,7 +698,7 @@ var Addons = map[string]*Addon{ vmpath.GuestAddonsDir, "fpga-operator.yaml", "0640"), - }, false, "inaccel", "InAccel ", "", map[string]string{ + }, false, "inaccel", "InAccel ", "", "", map[string]string{ "Helm3": "alpine/helm:3.9.0@sha256:9f4bf4d24241f983910550b1fe8688571cd684046500abe58cef14308f9cb19e", }, map[string]string{ "Helm3": "docker.io", @@ -707,7 +709,7 @@ var Addons = map[string]*Addon{ MustBinAsset(addons.HeadlampAssets, "headlamp/headlamp-deployment.yaml.tmpl", vmpath.GuestAddonsDir, "headlamp-deployment.yaml", "6040"), MustBinAsset(addons.HeadlampAssets, "headlamp/headlamp-serviceaccount.yaml", vmpath.GuestAddonsDir, "headlamp-serviceaccount.yaml", "6040"), MustBinAsset(addons.HeadlampAssets, "headlamp/headlamp-clusterrolebinding.yaml", vmpath.GuestAddonsDir, "headlamp-clusterrolebinding.yaml", "6040"), - }, false, "headlamp", "kinvolk.io", "https://minikube.sigs.k8s.io/docs/handbook/addons/headlamp/", + }, false, "headlamp", "kinvolk.io", "", "https://minikube.sigs.k8s.io/docs/handbook/addons/headlamp/", map[string]string{ "Headlamp": "kinvolk/headlamp:v0.9.0@sha256:465aaee6518f3fdd032965eccd6a8f49e924d144b1c86115bad613872672ec02", }, @@ -925,3 +927,4 @@ func GenerateTemplateData(addon *Addon, cfg config.KubernetesConfig, netInfo Net } return opts } + From dfb4860cec3648295934c694a48632541e2deaf9 Mon Sep 17 00:00:00 2001 From: inifares23lab Date: Sun, 3 Jul 2022 14:42:40 +0200 Subject: [PATCH 238/545] display warning for addons with unverified Maintainer --- cmd/minikube/cmd/config/enable.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/cmd/minikube/cmd/config/enable.go b/cmd/minikube/cmd/config/enable.go index 36c38c1ed8..2a6ce1566f 100644 --- a/cmd/minikube/cmd/config/enable.go +++ b/cmd/minikube/cmd/config/enable.go @@ -23,6 +23,7 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" "k8s.io/minikube/pkg/addons" + "k8s.io/minikube/pkg/minikube/assets" "k8s.io/minikube/pkg/minikube/config" "k8s.io/minikube/pkg/minikube/constants" "k8s.io/minikube/pkg/minikube/exit" @@ -52,6 +53,10 @@ var addonsEnableCmd = &cobra.Command{ if addon == "olm" { out.Styled(style.Warning, "The OLM addon has stopped working, for more details visit: https://github.com/operator-framework/operator-lifecycle-manager/issues/2534") } + addonBundle, ok := assets.Addons[addon] + if ok && addonBundle.VerifiedMaintainer == "" { + out.Styled(style.Warning, fmt.Sprintf("The %s addon doesn't have a verified maintainer.", addon)) + } viper.Set(config.AddonImages, images) viper.Set(config.AddonRegistries, registries) err := addons.SetAndSave(ClusterFlagValue(), addon, "true") From 75a2631baf917d37a07ff79d553a898de987a33c Mon Sep 17 00:00:00 2001 From: peizhouyu Date: Fri, 1 Jul 2022 11:38:36 +0800 Subject: [PATCH 239/545] update start help info Indicate --network-plugin flag is deprecated in flag description --- cmd/minikube/cmd/start_flags.go | 2 +- site/content/en/docs/commands/start.md | 2 +- 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 | 2 +- translations/strings.txt | 2 +- translations/zh-CN.json | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/cmd/minikube/cmd/start_flags.go b/cmd/minikube/cmd/start_flags.go index cee165e658..e186bc45ab 100644 --- a/cmd/minikube/cmd/start_flags.go +++ b/cmd/minikube/cmd/start_flags.go @@ -176,7 +176,7 @@ func initMinikubeFlags() { startCmd.Flags().String(mountUID, defaultMountUID, mountUIDDescription) startCmd.Flags().StringSlice(config.AddonListFlag, nil, "Enable addons. see `minikube addons list` for a list of valid addon names.") startCmd.Flags().String(criSocket, "", "The cri socket path to be used.") - startCmd.Flags().String(networkPlugin, "", "Kubelet network plug-in to use (default: auto)") + startCmd.Flags().String(networkPlugin, "", "DEPRECATED: Replaced by --cni") startCmd.Flags().Bool(enableDefaultCNI, false, "DEPRECATED: Replaced by --cni=bridge") startCmd.Flags().String(cniFlag, "", "CNI plug-in to use. Valid options: auto, bridge, calico, cilium, flannel, kindnet, or path to a CNI manifest (default: auto)") startCmd.Flags().StringSlice(waitComponents, kverify.DefaultWaitList, fmt.Sprintf("comma separated list of Kubernetes components to verify and wait for after starting a cluster. defaults to %q, available options: %q . other acceptable values are 'all' or 'none', 'true' and 'false'", strings.Join(kverify.DefaultWaitList, ","), strings.Join(kverify.AllComponentsList, ","))) diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index eb11b7f6ea..be00b65629 100644 --- a/site/content/en/docs/commands/start.md +++ b/site/content/en/docs/commands/start.md @@ -93,7 +93,7 @@ minikube start [flags] --nat-nic-type string NIC Type used for nat network. One of Am79C970A, Am79C973, 82540EM, 82543GC, 82545EM, or virtio (virtualbox driver only) (default "virtio") --native-ssh Use native Golang SSH client (default true). Set to 'false' to use the command line 'ssh' command when accessing the docker machine. Useful for the machine drivers when they will not start with 'Waiting for SSH'. (default true) --network string network to run minikube with. Now it is used by docker/podman and KVM drivers. If left empty, minikube will create a new network. - --network-plugin string Kubelet network plug-in to use (default: auto) + --network-plugin string DEPRECATED: Replaced by --cni. --nfs-share strings Local folders to share with Guest via NFS mounts (hyperkit driver only) --nfs-shares-root string Where to root the NFS Shares, defaults to /nfsshares (hyperkit driver only) (default "/nfsshares") --no-kubernetes If set, minikube VM/container will start without starting or configuring Kubernetes. (only works on new clusters) diff --git a/translations/de.json b/translations/de.json index 1528eb36cc..b2c5e3ae56 100644 --- a/translations/de.json +++ b/translations/de.json @@ -373,7 +373,7 @@ "It seems that you are running in GCE, which means authentication should work without the GCP Auth addon. If you would still like to authenticate using a credentials file, use the --force flag.": "Es scheint, dass Sie GCE verwenden, was bedeutet, dass Authentifizierung auch ohne die GCP Auth Addons funktionieren sollte. Wenn Sie dennoch mittels Credential-Datei authentifizieren möchten, verwenden Sie --force.", "Kicbase images have not been deleted. To delete images run:": "", "Kill the mount process spawned by minikube start": "Töte den Mount-Prozess, der durch minikube start gestartet wurde", - "Kubelet network plug-in to use (default: auto)": "Verwendetes Kublet network plug-in (default: auto)", + "DEPRECATED: Replaced by --cni": "DEPRECATED: Ersetzt durch --cni", "Kubernetes requires at least 2 CPU's to start": "Kubernetes benötigt mindestens 2 CPU's um zu starten", "Kubernetes {{.new}} is now available. If you would like to upgrade, specify: --kubernetes-version={{.prefix}}{{.new}}": "Kubernetes {{.new}} ist nun verfügbar. Falls Sie aktualisieren möchten, verwenden Sie: --kubernetes-version={{.prefix}}{{.new}}", "Kubernetes {{.version}} is not supported by this release of minikube": "Kubernetes {{.version}} wird von diesem Minikube Release nicht unterstützt", diff --git a/translations/es.json b/translations/es.json index 7a93a45820..375515830b 100644 --- a/translations/es.json +++ b/translations/es.json @@ -381,7 +381,7 @@ "It seems that you are running in GCE, which means authentication should work without the GCP Auth addon. If you would still like to authenticate using a credentials file, use the --force flag.": "", "Kicbase images have not been deleted. To delete images run:": "", "Kill the mount process spawned by minikube start": "", - "Kubelet network plug-in to use (default: auto)": "", + "DEPRECATED: Replaced by --cni": "", "Kubernetes requires at least 2 CPU's to start": "", "Kubernetes {{.new}} is now available. If you would like to upgrade, specify: --kubernetes-version={{.prefix}}{{.new}}": "", "Kubernetes {{.version}} is not supported by this release of minikube": "", diff --git a/translations/fr.json b/translations/fr.json index 7f21582aaa..59968babaf 100644 --- a/translations/fr.json +++ b/translations/fr.json @@ -364,7 +364,7 @@ "It seems that you are running in GCE, which means authentication should work without the GCP Auth addon. If you would still like to authenticate using a credentials file, use the --force flag.": "Il semble que vous exécutiez GCE, ce qui signifie que l'authentification devrait fonctionner sans le module GCP Auth. Si vous souhaitez toujours vous authentifier à l'aide d'un fichier d'informations d'identification, utilisez l'indicateur --force.", "Kicbase images have not been deleted. To delete images run:": "Les images Kicbase n'ont pas été supprimées. Pour supprimer des images, exécutez :", "Kill the mount process spawned by minikube start": "Tuez le processus de montage généré par le démarrage de minikube", - "Kubelet network plug-in to use (default: auto)": "Plug-in réseau Kubelet à utiliser (par défaut : auto)", + "DEPRECATED: Replaced by --cni": "Déprécié: remplacé par --cni", "Kubernetes requires at least 2 CPU's to start": "Kubernetes nécessite au moins 2 processeurs pour démarrer", "Kubernetes {{.new}} is now available. If you would like to upgrade, specify: --kubernetes-version={{.prefix}}{{.new}}": "Kubernetes {{.new}} est désormais disponible. Si vous souhaitez effectuer une mise à niveau, spécifiez : --kubernetes-version={{.prefix}}{{.new}}", "Kubernetes {{.version}} is not supported by this release of minikube": "Kubernetes {{.version}} n'est pas pris en charge par cette version de minikube", diff --git a/translations/ja.json b/translations/ja.json index 328f22ee8b..0b99073d10 100644 --- a/translations/ja.json +++ b/translations/ja.json @@ -372,7 +372,7 @@ "It seems that you are running in GCE, which means authentication should work without the GCP Auth addon. If you would still like to authenticate using a credentials file, use the --force flag.": "GCE 上で実行しているようですが、これは GCP Auth アドオンなしに認証が機能すべきであることになります。それでもクレデンシャルファイルを使用した認証を希望するのであれば、--force フラグを使用してください。", "Kicbase images have not been deleted. To delete images run:": "", "Kill the mount process spawned by minikube start": "minikube start によって実行されたマウントプロセスを強制停止します", - "Kubelet network plug-in to use (default: auto)": "使用する Kubelet ネットワークプラグイン (既定値: auto)", + "DEPRECATED: Replaced by --cni": "非推奨: --cniに置き換えられました", "Kubernetes requires at least 2 CPU's to start": "Kubernetes は起動に少なくとも 2 個の CPU が必要です", "Kubernetes {{.new}} is now available. If you would like to upgrade, specify: --kubernetes-version={{.prefix}}{{.new}}": "Kubernetes {{.new}} が利用可能です。アップグレードしたい場合、--kubernetes-version={{.prefix}}{{.new}} を指定してください", "Kubernetes {{.version}} is not supported by this release of minikube": "この minikube リリースは Kubernetes {{.version}} をサポートしていません", diff --git a/translations/ko.json b/translations/ko.json index eb938c7f45..8acce770c4 100644 --- a/translations/ko.json +++ b/translations/ko.json @@ -397,7 +397,7 @@ "It seems that you are running in GCE, which means authentication should work without the GCP Auth addon. If you would still like to authenticate using a credentials file, use the --force flag.": "", "Kicbase images have not been deleted. To delete images run:": "", "Kill the mount process spawned by minikube start": "", - "Kubelet network plug-in to use (default: auto)": "", + "DEPRECATED: Replaced by --cni": "", "Kubernetes requires at least 2 CPU's to start": "", "Kubernetes {{.new}} is now available. If you would like to upgrade, specify: --kubernetes-version={{.prefix}}{{.new}}": "이제 {{.new}} 버전의 쿠버네티스를 사용할 수 있습니다. 업그레이드를 원하신다면 다음과 같이 지정하세요: --kubernetes-version={{.prefix}}{{.new}}", "Kubernetes {{.version}} is not supported by this release of minikube": "{{.version}} 버전의 쿠버네티스는 설치되어 있는 버전의 minikube에서 지원되지 않습니다.", diff --git a/translations/pl.json b/translations/pl.json index ff9360471d..c7ff400e7b 100644 --- a/translations/pl.json +++ b/translations/pl.json @@ -385,7 +385,7 @@ "It seems that you are running in GCE, which means authentication should work without the GCP Auth addon. If you would still like to authenticate using a credentials file, use the --force flag.": "", "Kicbase images have not been deleted. To delete images run:": "", "Kill the mount process spawned by minikube start": "", - "Kubelet network plug-in to use (default: auto)": "", + "DEPRECATED: Replaced by --cni": "", "Kubernetes requires at least 2 CPU's to start": "", "Kubernetes {{.new}} is now available. If you would like to upgrade, specify: --kubernetes-version={{.prefix}}{{.new}}": "", "Kubernetes {{.version}} is not supported by this release of minikube": "", diff --git a/translations/ru.json b/translations/ru.json index 02ae9f01b1..02ad12e831 100644 --- a/translations/ru.json +++ b/translations/ru.json @@ -350,7 +350,7 @@ "It seems that you are running in GCE, which means authentication should work without the GCP Auth addon. If you would still like to authenticate using a credentials file, use the --force flag.": "", "Kicbase images have not been deleted. To delete images run:": "", "Kill the mount process spawned by minikube start": "", - "Kubelet network plug-in to use (default: auto)": "", + "DEPRECATED: Replaced by --cni": "", "Kubernetes requires at least 2 CPU's to start": "", "Kubernetes {{.new}} is now available. If you would like to upgrade, specify: --kubernetes-version={{.prefix}}{{.new}}": "Доступен Kubernetes {{.new}}. Для обновления, укажите: --kubernetes-version={{.prefix}}{{.new}}", "Kubernetes {{.version}} is not supported by this release of minikube": "", diff --git a/translations/strings.txt b/translations/strings.txt index e7de2eea68..3de71627cd 100644 --- a/translations/strings.txt +++ b/translations/strings.txt @@ -350,7 +350,7 @@ "It seems that you are running in GCE, which means authentication should work without the GCP Auth addon. If you would still like to authenticate using a credentials file, use the --force flag.": "", "Kicbase images have not been deleted. To delete images run:": "", "Kill the mount process spawned by minikube start": "", - "Kubelet network plug-in to use (default: auto)": "", + "DEPRECATED: Replaced by --cni": "", "Kubernetes requires at least 2 CPU's to start": "", "Kubernetes {{.new}} is now available. If you would like to upgrade, specify: --kubernetes-version={{.prefix}}{{.new}}": "", "Kubernetes {{.version}} is not supported by this release of minikube": "", diff --git a/translations/zh-CN.json b/translations/zh-CN.json index 0cc9f36a5e..b227afb3e5 100644 --- a/translations/zh-CN.json +++ b/translations/zh-CN.json @@ -456,7 +456,7 @@ "It seems that you are running in GCE, which means authentication should work without the GCP Auth addon. If you would still like to authenticate using a credentials file, use the --force flag.": "", "Kicbase images have not been deleted. To delete images run:": "", "Kill the mount process spawned by minikube start": "", - "Kubelet network plug-in to use (default: auto)": "", + "DEPRECATED: Replaced by --cni": "已弃用，改用 --cni 来代替", "Kubernetes requires at least 2 CPU's to start": "", "Kubernetes {{.new}} is now available. If you would like to upgrade, specify: --kubernetes-version={{.new}}": "Kubernetes {{.new}} 现在可用了。如果您想升级，请指定 --kubernetes-version={{.new}}", "Kubernetes {{.new}} is now available. If you would like to upgrade, specify: --kubernetes-version={{.prefix}}{{.new}}": "", From 98ed41baa851b7fa4fe0a5c06e6a657831d3f53f Mon Sep 17 00:00:00 2001 From: Jeff MAURY Date: Mon, 4 Jul 2022 11:41:39 +0200 Subject: [PATCH 240/545] Fix french translation Signed-off-by: Jeff MAURY --- translations/fr.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/translations/fr.json b/translations/fr.json index d5b86815bd..0651c84a55 100644 --- a/translations/fr.json +++ b/translations/fr.json @@ -477,7 +477,7 @@ "PowerShell is running in constrained mode, which is incompatible with Hyper-V scripting.": "PowerShell s'exécute en mode contraint, ce qui est incompatible avec les scripts Hyper-V.", "Powering off \"{{.profile_name}}\" via SSH ...": "Mise hors tension du profil \"{{.profile_name}}\" via SSH…", "Preparing Kubernetes {{.k8sVersion}} on {{.runtime}} {{.runtimeVersion}} ...": "Préparation de Kubernetes {{.k8sVersion}} sur {{.runtime}} {{.runtimeVersion}}...", - "Preparing {{.runtime}} {{.runtimeVersion}} ...": "", + "Preparing {{.runtime}} {{.runtimeVersion}} ...": "Préparation de {{.runtime}} {{.runtimeVersion}} ...", "Print current and latest version number": "Imprimer le numéro de version actuel et le plus récent", "Print just the version number.": "Imprimez uniquement le numéro de version.", "Print the version of minikube": "Imprimer la version de minikube", @@ -596,7 +596,7 @@ "Specifying extra disks is currently only supported for the following drivers: {{.supported_drivers}}. If you can contribute to add this feature, please create a PR.": "La spécification de disques supplémentaires n'est actuellement prise en charge que pour les pilotes suivants : {{.supported_drivers}}. Si vous pouvez contribuer à ajouter cette fonctionnalité, veuillez créer un PR.", "StartHost failed, but will try again: {{.error}}": "StartHost a échoué, mais va réessayer : {{.error}}", "Starting control plane node {{.name}} in cluster {{.cluster}}": "Démarrage du noeud de plan de contrôle {{.name}} dans le cluster {{.cluster}}", - "Starting minikube without Kubernetes in cluster {{.cluster}}": "", + "Starting minikube without Kubernetes in cluster {{.cluster}}": "Démarrage de minikube sans Kubernetes dans le cluster {{.cluster}}", "Starting minikube without Kubernetes {{.name}} in cluster {{.cluster}}": "Démarrage de minikube sans Kubernetes {{.name}} dans le cluster {{.cluster}}", "Starting node {{.name}} in cluster {{.cluster}}": "Démarrage du noeud {{.name}} dans le cluster {{.cluster}}", "Starting tunnel for service {{.service}}.": "Tunnel de démarrage pour le service {{.service}}.", @@ -711,7 +711,7 @@ "Things to try without Kubernetes ...": "Choses à essayer sans Kubernetes ...", "This addon does not have an endpoint defined for the 'addons open' command.\nYou can add one by annotating a service with the label {{.labelName}}:{{.addonName}}": "Ce module n'a pas de point de terminaison défini pour la commande 'addons open'.\nVous pouvez en ajouter un en annotant un service avec le libellé {{.labelName}} :{{.addonName}}", "This can also be done automatically by setting the env var CHANGE_MINIKUBE_NONE_USER=true": "Cette opération peut également être réalisée en définissant la variable d'environment \"CHANGE_MINIKUBE_NONE_USER=true\".", - "This cluster was created before minikube v1.26.0 and doesn't have cri-docker installed. Please run 'minikube delete' and then start minikube again": "", + "This cluster was created before minikube v1.26.0 and doesn't have cri-docker installed. Please run 'minikube delete' and then start minikube again": "Ce cluster a été créé avant minikube v1.26.0 et n'a pas installé cri-docker. Veuillez exécuter 'minikube delete' puis redémarrer minikube", "This control plane is not running! (state={{.state}})": "Ce plan de contrôle ne fonctionne pas ! (état={{.state}})", "This driver does not yet work on your architecture. Maybe try --driver=none": "Ce pilote ne fonctionne pas encore sur votre architecture. Essayez peut-être --driver=none", "This flag is currently unsupported.": "Cet indicateur n'est actuellement pas pris en charge.", @@ -808,7 +808,7 @@ "User name must be 60 chars or less.": "Le nom d'utilisateur doit comporter 60 caractères ou moins.", "Userspace file server is shutdown": "Le serveur de fichiers de l'espace utilisateur est arrêté", "Userspace file server: ": "Serveur de fichiers de l'espace utilisateur :", - "Using Kubernetes v1.24+ with the Docker runtime requires cri-docker to be installed": "", + "Using Kubernetes v1.24+ with the Docker runtime requires cri-docker to be installed": "L'utilisation de Kubernetes v1.24+ avec le runtime Docker nécessite l'installation de cri-docker", "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)", From a7958c13dace333017cda9fed5a85f3c79edd313 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Jul 2022 18:05:18 +0000 Subject: [PATCH 241/545] Bump google.golang.org/api from 0.85.0 to 0.86.0 Bumps [google.golang.org/api](https://github.com/googleapis/google-api-go-client) from 0.85.0 to 0.86.0. - [Release notes](https://github.com/googleapis/google-api-go-client/releases) - [Changelog](https://github.com/googleapis/google-api-go-client/blob/main/CHANGES.md) - [Commits](https://github.com/googleapis/google-api-go-client/compare/v0.85.0...v0.86.0) --- updated-dependencies: - dependency-name: google.golang.org/api dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 10 +++++----- go.sum | 15 ++++++++++----- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/go.mod b/go.mod index abe3665042..fc1019a5f9 100644 --- a/go.mod +++ b/go.mod @@ -74,13 +74,13 @@ require ( golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4 golang.org/x/exp v0.0.0-20210220032938-85be41e4509f golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 - golang.org/x/oauth2 v0.0.0-20220608161450-d0670ef3b1eb + golang.org/x/oauth2 v0.0.0-20220622183110-fd043fe589d2 golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f - golang.org/x/sys v0.0.0-20220615213510-4f61da869c0c + golang.org/x/sys v0.0.0-20220624220833-87e55d714810 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 golang.org/x/text v0.3.7 gonum.org/v1/plot v0.11.0 - google.golang.org/api v0.85.0 + google.golang.org/api v0.86.0 gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 // indirect gopkg.in/yaml.v2 v2.4.0 k8s.io/api v0.24.2 @@ -213,11 +213,11 @@ require ( go.uber.org/multierr v1.8.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-20220617184016-355a448f1bc9 // indirect + golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e // indirect golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f // indirect google.golang.org/appengine v1.6.7 // indirect - google.golang.org/genproto v0.0.0-20220617124728-180714bec0ad // indirect + google.golang.org/genproto v0.0.0-20220624142145-8cd45d7dbd1f // indirect google.golang.org/grpc v1.47.0 // indirect google.golang.org/protobuf v1.28.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect diff --git a/go.sum b/go.sum index 5728f96c42..745a21cddd 100644 --- a/go.sum +++ b/go.sum @@ -1637,8 +1637,9 @@ golang.org/x/net v0.0.0-20220325170049-de3da57026de/go.mod h1:CfG3xpIq0wQ8r1q4Su golang.org/x/net v0.0.0-20220412020605-290c469a71a5/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220607020251-c690dde0001d/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -golang.org/x/net v0.0.0-20220617184016-355a448f1bc9 h1:Yqz/iviulwKwAREEeUd3nbBFn0XuyJqkoft2IlrvOhc= golang.org/x/net v0.0.0-20220617184016-355a448f1bc9/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e h1:TsQ7F31D3bUCLeqPT0u+yjp1guoArKaNKmCr22PYgTQ= +golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= 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= @@ -1661,8 +1662,9 @@ golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= golang.org/x/oauth2 v0.0.0-20220309155454-6242fa91716a/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= -golang.org/x/oauth2 v0.0.0-20220608161450-d0670ef3b1eb h1:8tDJ3aechhddbdPAxpycgXHJRMLpk/Ab+aa4OgdN5/g= golang.org/x/oauth2 v0.0.0-20220608161450-d0670ef3b1eb/go.mod h1:jaDAt6Dkxork7LmZnYtzbRWj0W47D86a3TGe0YHBvmE= +golang.org/x/oauth2 v0.0.0-20220622183110-fd043fe589d2 h1:+jnHzr9VPj32ykQVai5DNahi9+NSp7yYuCsl5eAQtL0= +golang.org/x/oauth2 v0.0.0-20220622183110-fd043fe589d2/go.mod h1:jaDAt6Dkxork7LmZnYtzbRWj0W47D86a3TGe0YHBvmE= 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= @@ -1809,8 +1811,9 @@ golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220517195934-5e4e11fc645e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220610221304-9f5ed59c137d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220615213510-4f61da869c0c h1:aFV+BgZ4svzjfabn8ERpuB4JI4N6/rdy1iusx77G3oU= golang.org/x/sys v0.0.0-20220615213510-4f61da869c0c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220624220833-87e55d714810 h1:rHZQSjJdAI4Xf5Qzeh2bBc5YJIkPFVM6oDtMFYmgws0= +golang.org/x/sys v0.0.0-20220624220833-87e55d714810/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-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY= @@ -1998,8 +2001,9 @@ google.golang.org/api v0.75.0/go.mod h1:pU9QmyHLnzlpar1Mjt4IbapUCy8J+6HD6GeELN69 google.golang.org/api v0.78.0/go.mod h1:1Sg78yoMLOhlQTeF+ARBoytAcH1NNyyl390YMy6rKmw= google.golang.org/api v0.80.0/go.mod h1:xY3nI94gbvBrE0J6NHXhxOmW97HG7Khjkku6AFB3Hyg= google.golang.org/api v0.84.0/go.mod h1:NTsGnUFJMYROtiquksZHBWtHfeMC7iYthki7Eq3pa8o= -google.golang.org/api v0.85.0 h1:8rJoHuRxx+vCmZtAO/3k1dRLvYNVyTJtZ5oaFZvhgvc= google.golang.org/api v0.85.0/go.mod h1:AqZf8Ep9uZ2pyTvgL+x0D3Zt0eoT9b5E8fmzfu6FO2g= +google.golang.org/api v0.86.0 h1:ZAnyOHQFIuWso1BodVfSaRyffD74T9ERGFa3k1fNk/U= +google.golang.org/api v0.86.0/go.mod h1:+Sem1dnrKlrXMR/X0bPnMWyluQe4RsNoYfmNLhOIkzw= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -2105,8 +2109,9 @@ google.golang.org/genproto v0.0.0-20220518221133-4f43b3371335/go.mod h1:RAyBrSAP google.golang.org/genproto v0.0.0-20220523171625-347a074981d8/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4= google.golang.org/genproto v0.0.0-20220608133413-ed9918b62aac/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA= google.golang.org/genproto v0.0.0-20220616135557-88e70c0c3a90/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA= -google.golang.org/genproto v0.0.0-20220617124728-180714bec0ad h1:kqrS+lhvaMHCxul6sKQvKJ8nAAhlVItmZV822hYFH/U= google.golang.org/genproto v0.0.0-20220617124728-180714bec0ad/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA= +google.golang.org/genproto v0.0.0-20220624142145-8cd45d7dbd1f h1:hJ/Y5SqPXbarffmAsApliUlcvMU+wScNGfyop4bZm8o= +google.golang.org/genproto v0.0.0-20220624142145-8cd45d7dbd1f/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA= google.golang.org/grpc v0.0.0-20160317175043-d3ddb4469d5a/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.8.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= From 6bebac4638e90c1aec2a4218ef2dc67c1dfaf7ad Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Jul 2022 18:05:39 +0000 Subject: [PATCH 242/545] Bump github.com/shirou/gopsutil/v3 from 3.22.5 to 3.22.6 Bumps [github.com/shirou/gopsutil/v3](https://github.com/shirou/gopsutil) from 3.22.5 to 3.22.6. - [Release notes](https://github.com/shirou/gopsutil/releases) - [Commits](https://github.com/shirou/gopsutil/compare/v3.22.5...v3.22.6) --- updated-dependencies: - dependency-name: github.com/shirou/gopsutil/v3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 4 ++-- go.sum | 12 +++++++----- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/go.mod b/go.mod index abe3665042..13fa2b990b 100644 --- a/go.mod +++ b/go.mod @@ -61,7 +61,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 github.com/russross/blackfriday v1.6.0 // indirect github.com/samalba/dockerclient v0.0.0-20160414174713-91d7393ff859 // indirect - github.com/shirou/gopsutil/v3 v3.22.5 + github.com/shirou/gopsutil/v3 v3.22.6 github.com/spf13/cobra v1.5.0 github.com/spf13/pflag v1.0.5 github.com/spf13/viper v1.12.0 @@ -222,7 +222,7 @@ require ( google.golang.org/protobuf v1.28.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/ini.v1 v1.66.4 // indirect - gopkg.in/yaml.v3 v3.0.0 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 // indirect sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect diff --git a/go.sum b/go.sum index 5728f96c42..08d642ec4f 100644 --- a/go.sum +++ b/go.sum @@ -1263,8 +1263,8 @@ github.com/securego/gosec/v2 v2.9.1/go.mod h1:oDcDLcatOJxkCGaCaq8lua1jTnYf6Sou4w github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c/go.mod h1:/PevMnwAxekIXwN8qQyfc5gl2NlkB3CQlkizAbOkeBs= github.com/shirou/gopsutil/v3 v3.21.10/go.mod h1:t75NhzCZ/dYyPQjyQmrAYP6c8+LCdFANeBMdLPCNnew= -github.com/shirou/gopsutil/v3 v3.22.5 h1:atX36I/IXgFiB81687vSiBI5zrMsxcIBkP9cQMJQoJA= -github.com/shirou/gopsutil/v3 v3.22.5/go.mod h1:so9G9VzeHt/hsd0YwqprnjHnfARAUktauykSbr+y2gA= +github.com/shirou/gopsutil/v3 v3.22.6 h1:FnHOFOh+cYAM0C30P+zysPISzlknLC5Z1G4EAElznfQ= +github.com/shirou/gopsutil/v3 v3.22.6/go.mod h1:EdIubSnZhbAvBS1yJ7Xi+AShB/hxwLHOMz4MCYz7yMs= github.com/shurcooL/go v0.0.0-20180423040247-9e1955d9fb6e/go.mod h1:TDJrrUr11Vxrven61rcy3hJMUqaf/CLWYhHNPmT14Lk= github.com/shurcooL/go-goon v0.0.0-20170922171312-37c2f522c041/go.mod h1:N5mDOmsrJOB+vfqUK+7DmDyjhSLIIBnXo9lvZJj3MWQ= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= @@ -1329,6 +1329,7 @@ github.com/stretchr/objx v0.0.0-20180129172003-8a3f7159479f/go.mod h1:HFkY916IF+ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= +github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/testify v0.0.0-20170130113145-4d4bfba8f1d1/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v0.0.0-20180303142811-b89eecf5ca5d/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.1.4/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= @@ -1338,8 +1339,9 @@ github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81P github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.5 h1:s5PTfem8p8EbKQOctVV53k6jCJt3UX4IEJzwh+C324Q= +github.com/stretchr/testify v1.7.5/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= github.com/subosito/gotenv v1.3.0 h1:mjC+YW8QpAdXibNi+vNWgzmgBH4+5l5dCXv8cNysBLI= github.com/subosito/gotenv v1.3.0/go.mod h1:YzJjq/33h7nrwdY+iHMhEOEEbW0ovIz0tB6t6PwAXzs= @@ -2207,8 +2209,8 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.0 h1:hjy8E9ON/egN1tAYqKb61G10WtihqetD4sz2H+8nIeA= -gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo= gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk= From 08dbe304af706f04924c1c52c0778f48e238b7bd Mon Sep 17 00:00:00 2001 From: Niels de Vos Date: Wed, 6 Jul 2022 17:13:07 +0200 Subject: [PATCH 243/545] storage-provisioner-gluster: use the Gluster project's container-image Use docker.io/gluster/gluster-centos:latest instead of a temporary image that had a change which needed to get merged. All required features are included in the 'official' container-image. Signed-off-by: Niels de Vos --- deploy/addons/aliyun_mirror.json | 4 ++-- pkg/minikube/assets/addons.go | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/deploy/addons/aliyun_mirror.json b/deploy/addons/aliyun_mirror.json index b0d3a0b135..6d9ace5283 100644 --- a/deploy/addons/aliyun_mirror.json +++ b/deploy/addons/aliyun_mirror.json @@ -24,7 +24,7 @@ "k8s.gcr.io/sig-storage/csi-snapshotter": "registry.cn-hangzhou.aliyuncs.com/google_containers/csi-snapshotter", "k8s.gcr.io/sig-storage/csi-provisioner": "registry.cn-hangzhou.aliyuncs.com/google_containers/csi-provisioner", "registry": "registry.cn-hangzhou.aliyuncs.com/google_containers/registry", - "quay.io/nixpanic/glusterfs-server": "registry.cn-hangzhou.aliyuncs.com/google_containers/glusterfs-server", + "docker.io/gluster/gluster-centos": "registry.cn-hangzhou.aliyuncs.com/google_containers/glusterfs-server", "heketi/heketi": "registry.cn-hangzhou.aliyuncs.com/google_containers/heketi", "coredns/coredns": "registry.cn-hangzhou.aliyuncs.com/google_containers/coredns", "kindest/kindnetd": "registry.cn-hangzhou.aliyuncs.com/google_containers/kindnetd", @@ -99,4 +99,4 @@ "gcr.io/google_containers/pause": "registry.cn-hangzhou.aliyuncs.com/google_containers/pause", "k8s.gcr.io/metrics-server/metrics-server": "registry.cn-hangzhou.aliyuncs.com/google_containers/metrics-server", "gcr.io/google_containers/kube-registry-proxy": "registry.cn-hangzhou.aliyuncs.com/google_containers/kube-registry-proxy" -} \ No newline at end of file +} diff --git a/pkg/minikube/assets/addons.go b/pkg/minikube/assets/addons.go index 6b227b02d3..47b7bd139c 100755 --- a/pkg/minikube/assets/addons.go +++ b/pkg/minikube/assets/addons.go @@ -188,10 +188,8 @@ var Addons = map[string]*Addon{ }, false, "storage-provisioner-gluster", "", "", map[string]string{ "Heketi": "heketi/heketi:10@sha256:76d5a6a3b7cf083d1e99efa1c15abedbc5c8b73bef3ade299ce9a4c16c9660f8", "GlusterfileProvisioner": "gluster/glusterfile-provisioner:latest@sha256:9961a35cb3f06701958e202324141c30024b195579e5eb1704599659ddea5223", - "GlusterfsServer": "nixpanic/glusterfs-server:pr_fake-disk@sha256:3c58ae9d4e2007758954879d3f4095533831eb757c64ca6a0e32d1fc53fb6034", - }, map[string]string{ - "GlusterfsServer": "quay.io", - }), + "GlusterfsServer": "gluster/gluster-centos:latest@sha256:8167034b9abf2d16581f3f4571507ce7d716fb58b927d7627ef72264f802e908", + }, nil), "efk": NewAddon([]*BinAsset{ MustBinAsset(addons.EfkAssets, "efk/elasticsearch-rc.yaml.tmpl", From 83dac80538dbe3897f48294923637e0e3aad802a Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Wed, 6 Jul 2022 20:20:32 +0000 Subject: [PATCH 244/545] Update auto-generated docs and translations --- site/content/en/docs/commands/start.md | 2 +- 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 | 2 +- translations/strings.txt | 2 +- translations/zh-CN.json | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index 3df1f36f7f..1f47ac18d1 100644 --- a/site/content/en/docs/commands/start.md +++ b/site/content/en/docs/commands/start.md @@ -93,7 +93,7 @@ minikube start [flags] --nat-nic-type string NIC Type used for nat network. One of Am79C970A, Am79C973, 82540EM, 82543GC, 82545EM, or virtio (virtualbox driver only) (default "virtio") --native-ssh Use native Golang SSH client (default true). Set to 'false' to use the command line 'ssh' command when accessing the docker machine. Useful for the machine drivers when they will not start with 'Waiting for SSH'. (default true) --network string network to run minikube with. Now it is used by docker/podman and KVM drivers. If left empty, minikube will create a new network. - --network-plugin string DEPRECATED: Replaced by --cni. + --network-plugin string DEPRECATED: Replaced by --cni --nfs-share strings Local folders to share with Guest via NFS mounts (hyperkit driver only) --nfs-shares-root string Where to root the NFS Shares, defaults to /nfsshares (hyperkit driver only) (default "/nfsshares") --no-kubernetes If set, minikube VM/container will start without starting or configuring Kubernetes. (only works on new clusters) diff --git a/translations/de.json b/translations/de.json index eaaa046b31..0635de4bd1 100644 --- a/translations/de.json +++ b/translations/de.json @@ -130,6 +130,7 @@ "Creating {{.driver_name}} {{.machine_type}} (CPUs={{.number_of_cpus}}, Memory={{.memory_size}}MB, Disk={{.disk_size}}MB) ...": "Erstelle {{.driver_name}} {{.machine_type}} (CPUs={{.number_of_cpus}}, Speicher={{.memory_size}}MB, Disk={{.disk_size}}MB ...", "Current context is \"{{.context}}\"": "Der aktuelle Kontext ist \"{{.context}}\"", "DEPRECATED, use `driver` instead.": "Veraltet, benuzten Sie `driver` stattdessen.", + "DEPRECATED: Replaced by --cni": "DEPRECATED: Ersetzt durch --cni", "DEPRECATED: Replaced by --cni=bridge": "Veraltet: Wurde durch --cni=bridge ersetzt", "Delete an image from the local cache.": "Lösche ein Image aus dem lokalen Cache.", "Delete the existing '{{.name}}' cluster using: '{{.delcommand}}', or start the existing '{{.name}}' cluster using: '{{.command}} --driver={{.old}}'": "Löschen Sie den existierenden {{.name}} Cluster mittels: '{{.delcommand}}' oder starten Sie den existierenden '{{.name}}' Cluster mittels: '{{.command}} --driver={{.old}}", @@ -373,7 +374,6 @@ "It seems that you are running in GCE, which means authentication should work without the GCP Auth addon. If you would still like to authenticate using a credentials file, use the --force flag.": "Es scheint, dass Sie GCE verwenden, was bedeutet, dass Authentifizierung auch ohne die GCP Auth Addons funktionieren sollte. Wenn Sie dennoch mittels Credential-Datei authentifizieren möchten, verwenden Sie --force.", "Kicbase images have not been deleted. To delete images run:": "", "Kill the mount process spawned by minikube start": "Töte den Mount-Prozess, der durch minikube start gestartet wurde", - "DEPRECATED: Replaced by --cni": "DEPRECATED: Ersetzt durch --cni", "Kubernetes requires at least 2 CPU's to start": "Kubernetes benötigt mindestens 2 CPU's um zu starten", "Kubernetes {{.new}} is now available. If you would like to upgrade, specify: --kubernetes-version={{.prefix}}{{.new}}": "Kubernetes {{.new}} ist nun verfügbar. Falls Sie aktualisieren möchten, verwenden Sie: --kubernetes-version={{.prefix}}{{.new}}", "Kubernetes {{.version}} is not supported by this release of minikube": "Kubernetes {{.version}} wird von diesem Minikube Release nicht unterstützt", diff --git a/translations/es.json b/translations/es.json index 11e2aa8a09..8ba0093c15 100644 --- a/translations/es.json +++ b/translations/es.json @@ -132,6 +132,7 @@ "Creating {{.driver_name}} {{.machine_type}} (CPUs={{.number_of_cpus}}, Memory={{.memory_size}}MB, Disk={{.disk_size}}MB) ...": "Creando {{.driver_name}} {{.machine_type}} (CPUs={{.number_of_cpus}}, Memory={{.memory_size}}MB, Disk={{.disk_size}}MB) ...", "Current context is \"{{.context}}\"": "Contexto actual \"{{.context}}\"", "DEPRECATED, use `driver` instead.": "OBSOLETO, usa `driver` en su lugar", + "DEPRECATED: Replaced by --cni": "", "DEPRECATED: Replaced by --cni=bridge": "OBSOLETO: Reemplazalo con --cni=bridge", "Default group id used for the mount": "ID de grupo por defecto usado para el montaje", "Default user id used for the mount": "ID de usuario por defecto usado para el montaje", @@ -381,7 +382,6 @@ "It seems that you are running in GCE, which means authentication should work without the GCP Auth addon. If you would still like to authenticate using a credentials file, use the --force flag.": "", "Kicbase images have not been deleted. To delete images run:": "", "Kill the mount process spawned by minikube start": "", - "DEPRECATED: Replaced by --cni": "", "Kubernetes requires at least 2 CPU's to start": "", "Kubernetes {{.new}} is now available. If you would like to upgrade, specify: --kubernetes-version={{.prefix}}{{.new}}": "", "Kubernetes {{.version}} is not supported by this release of minikube": "", diff --git a/translations/fr.json b/translations/fr.json index 4a86c0713d..de76b6f707 100644 --- a/translations/fr.json +++ b/translations/fr.json @@ -133,6 +133,7 @@ "Creating {{.driver_name}} {{.machine_type}} (CPUs={{.number_of_cpus}}, Memory={{.memory_size}}MB, Disk={{.disk_size}}MB) ...": "Création de {{.machine_type}} {{.driver_name}} (CPUs={{.number_of_cpus}}, Mémoire={{.memory_size}}MB, Disque={{.disk_size}}MB)...", "Current context is \"{{.context}}\"": "Le contexte courant est \"{{.context}}\"", "DEPRECATED, use `driver` instead.": "DÉPRÉCIÉ, utilisez plutôt `driver`.", + "DEPRECATED: Replaced by --cni": "Déprécié: remplacé par --cni", "DEPRECATED: Replaced by --cni=bridge": "DÉPRÉCIÉ : remplacé par --cni=bridge", "Default group id used for the mount": "ID de groupe par défaut utilisé pour le montage", "Default user id used for the mount": "ID utilisateur par défaut utilisé pour le montage", @@ -364,7 +365,6 @@ "It seems that you are running in GCE, which means authentication should work without the GCP Auth addon. If you would still like to authenticate using a credentials file, use the --force flag.": "Il semble que vous exécutiez GCE, ce qui signifie que l'authentification devrait fonctionner sans le module GCP Auth. Si vous souhaitez toujours vous authentifier à l'aide d'un fichier d'informations d'identification, utilisez l'indicateur --force.", "Kicbase images have not been deleted. To delete images run:": "Les images Kicbase n'ont pas été supprimées. Pour supprimer des images, exécutez :", "Kill the mount process spawned by minikube start": "Tuez le processus de montage généré par le démarrage de minikube", - "DEPRECATED: Replaced by --cni": "Déprécié: remplacé par --cni", "Kubernetes requires at least 2 CPU's to start": "Kubernetes nécessite au moins 2 processeurs pour démarrer", "Kubernetes {{.new}} is now available. If you would like to upgrade, specify: --kubernetes-version={{.prefix}}{{.new}}": "Kubernetes {{.new}} est désormais disponible. Si vous souhaitez effectuer une mise à niveau, spécifiez : --kubernetes-version={{.prefix}}{{.new}}", "Kubernetes {{.version}} is not supported by this release of minikube": "Kubernetes {{.version}} n'est pas pris en charge par cette version de minikube", diff --git a/translations/ja.json b/translations/ja.json index d9c0d4b3b0..2953adc1a8 100644 --- a/translations/ja.json +++ b/translations/ja.json @@ -136,6 +136,7 @@ "Creating {{.driver_name}} {{.machine_type}} (CPUs={{.number_of_cpus}}, Memory={{.memory_size}}MB, Disk={{.disk_size}}MB) ...": "{{.driver_name}} {{.machine_type}} (CPUs={{.number_of_cpus}}, Memory={{.memory_size}}MB, Disk={{.disk_size}}MB) を作成しています...", "Current context is \"{{.context}}\"": "現在のコンテキストは「{{.context}}」です", "DEPRECATED, use `driver` instead.": "非推奨。代わりに `driver` を使用してください。", + "DEPRECATED: Replaced by --cni": "非推奨: --cniに置き換えられました", "DEPRECATED: Replaced by --cni=bridge": "非推奨: --cni=bridge に置き換えられました", "Default group id used for the mount": "マウント時のデフォルトのグループ ID", "Default user id used for the mount": "マウント時のデフォルトのユーザー ID", @@ -372,7 +373,6 @@ "It seems that you are running in GCE, which means authentication should work without the GCP Auth addon. If you would still like to authenticate using a credentials file, use the --force flag.": "GCE 上で実行しているようですが、これは GCP Auth アドオンなしに認証が機能すべきであることになります。それでもクレデンシャルファイルを使用した認証を希望するのであれば、--force フラグを使用してください。", "Kicbase images have not been deleted. To delete images run:": "", "Kill the mount process spawned by minikube start": "minikube start によって実行されたマウントプロセスを強制停止します", - "DEPRECATED: Replaced by --cni": "非推奨: --cniに置き換えられました", "Kubernetes requires at least 2 CPU's to start": "Kubernetes は起動に少なくとも 2 個の CPU が必要です", "Kubernetes {{.new}} is now available. If you would like to upgrade, specify: --kubernetes-version={{.prefix}}{{.new}}": "Kubernetes {{.new}} が利用可能です。アップグレードしたい場合、--kubernetes-version={{.prefix}}{{.new}} を指定してください", "Kubernetes {{.version}} is not supported by this release of minikube": "この minikube リリースは Kubernetes {{.version}} をサポートしていません", diff --git a/translations/ko.json b/translations/ko.json index fece51b804..ff2652b372 100644 --- a/translations/ko.json +++ b/translations/ko.json @@ -140,6 +140,7 @@ "Creating {{.driver_name}} {{.machine_type}} (CPUs={{.number_of_cpus}}, Memory={{.memory_size}}MB, Disk={{.disk_size}}MB) ...": "{{.driver_name}} {{.machine_type}} (CPUs={{.number_of_cpus}}, Memory={{.memory_size}}MB, Disk={{.disk_size}}MB) 를 생성하는 중 ...", "Current context is \"{{.context}}\"": "", "DEPRECATED, use `driver` instead.": "DEPRECATED 되었습니다, 'driver' 를 사용하세요", + "DEPRECATED: Replaced by --cni": "", "DEPRECATED: Replaced by --cni=bridge": "", "Default group id used for the mount": "마운트를 위한 디폴트 group id", "Default user id used for the mount": "마운트를 위한 디폴트 user id", @@ -397,7 +398,6 @@ "It seems that you are running in GCE, which means authentication should work without the GCP Auth addon. If you would still like to authenticate using a credentials file, use the --force flag.": "", "Kicbase images have not been deleted. To delete images run:": "", "Kill the mount process spawned by minikube start": "", - "DEPRECATED: Replaced by --cni": "", "Kubernetes requires at least 2 CPU's to start": "", "Kubernetes {{.new}} is now available. If you would like to upgrade, specify: --kubernetes-version={{.prefix}}{{.new}}": "이제 {{.new}} 버전의 쿠버네티스를 사용할 수 있습니다. 업그레이드를 원하신다면 다음과 같이 지정하세요: --kubernetes-version={{.prefix}}{{.new}}", "Kubernetes {{.version}} is not supported by this release of minikube": "{{.version}} 버전의 쿠버네티스는 설치되어 있는 버전의 minikube에서 지원되지 않습니다.", diff --git a/translations/pl.json b/translations/pl.json index 500c16b622..76744769f7 100644 --- a/translations/pl.json +++ b/translations/pl.json @@ -138,6 +138,7 @@ "Creating {{.driver_name}} {{.machine_type}} (CPUs={{.number_of_cpus}}, Memory={{.memory_size}}MB, Disk={{.disk_size}}MB) ...": "", "Current context is \"{{.context}}\"": "Obecny kontekst to \"{{.context}}\"", "DEPRECATED, use `driver` instead.": "PRZESTARZAŁE, użyj zamiast tego `driver`", + "DEPRECATED: Replaced by --cni": "", "DEPRECATED: Replaced by --cni=bridge": "PRZESTARZAŁE, zostało zastąpione przez --cni=bridge", "Default group id used for the mount": "Domyślne id groupy użyte dla montowania", "Default user id used for the mount": "Domyślne id użytkownika użyte dla montowania ", @@ -385,7 +386,6 @@ "It seems that you are running in GCE, which means authentication should work without the GCP Auth addon. If you would still like to authenticate using a credentials file, use the --force flag.": "", "Kicbase images have not been deleted. To delete images run:": "", "Kill the mount process spawned by minikube start": "", - "DEPRECATED: Replaced by --cni": "", "Kubernetes requires at least 2 CPU's to start": "", "Kubernetes {{.new}} is now available. If you would like to upgrade, specify: --kubernetes-version={{.prefix}}{{.new}}": "", "Kubernetes {{.version}} is not supported by this release of minikube": "", diff --git a/translations/ru.json b/translations/ru.json index 59270975fa..bf9067b064 100644 --- a/translations/ru.json +++ b/translations/ru.json @@ -125,6 +125,7 @@ "Creating {{.driver_name}} {{.machine_type}} (CPUs={{.number_of_cpus}}, Memory={{.memory_size}}MB, Disk={{.disk_size}}MB) ...": "", "Current context is \"{{.context}}\"": "", "DEPRECATED, use `driver` instead.": "", + "DEPRECATED: Replaced by --cni": "", "DEPRECATED: Replaced by --cni=bridge": "", "Delete an image from the local cache.": "", "Delete the existing '{{.name}}' cluster using: '{{.delcommand}}', or start the existing '{{.name}}' cluster using: '{{.command}} --driver={{.old}}'": "", @@ -350,7 +351,6 @@ "It seems that you are running in GCE, which means authentication should work without the GCP Auth addon. If you would still like to authenticate using a credentials file, use the --force flag.": "", "Kicbase images have not been deleted. To delete images run:": "", "Kill the mount process spawned by minikube start": "", - "DEPRECATED: Replaced by --cni": "", "Kubernetes requires at least 2 CPU's to start": "", "Kubernetes {{.new}} is now available. If you would like to upgrade, specify: --kubernetes-version={{.prefix}}{{.new}}": "Доступен Kubernetes {{.new}}. Для обновления, укажите: --kubernetes-version={{.prefix}}{{.new}}", "Kubernetes {{.version}} is not supported by this release of minikube": "", diff --git a/translations/strings.txt b/translations/strings.txt index 01734012f1..7dd30d3eaa 100644 --- a/translations/strings.txt +++ b/translations/strings.txt @@ -125,6 +125,7 @@ "Creating {{.driver_name}} {{.machine_type}} (CPUs={{.number_of_cpus}}, Memory={{.memory_size}}MB, Disk={{.disk_size}}MB) ...": "", "Current context is \"{{.context}}\"": "", "DEPRECATED, use `driver` instead.": "", + "DEPRECATED: Replaced by --cni": "", "DEPRECATED: Replaced by --cni=bridge": "", "Delete an image from the local cache.": "", "Delete the existing '{{.name}}' cluster using: '{{.delcommand}}', or start the existing '{{.name}}' cluster using: '{{.command}} --driver={{.old}}'": "", @@ -350,7 +351,6 @@ "It seems that you are running in GCE, which means authentication should work without the GCP Auth addon. If you would still like to authenticate using a credentials file, use the --force flag.": "", "Kicbase images have not been deleted. To delete images run:": "", "Kill the mount process spawned by minikube start": "", - "DEPRECATED: Replaced by --cni": "", "Kubernetes requires at least 2 CPU's to start": "", "Kubernetes {{.new}} is now available. If you would like to upgrade, specify: --kubernetes-version={{.prefix}}{{.new}}": "", "Kubernetes {{.version}} is not supported by this release of minikube": "", diff --git a/translations/zh-CN.json b/translations/zh-CN.json index dddaca3f46..899e5e2a89 100644 --- a/translations/zh-CN.json +++ b/translations/zh-CN.json @@ -158,6 +158,7 @@ "Creating {{.driver_name}} {{.machine_type}} (CPUs={{.number_of_cpus}}, Memory={{.memory_size}}MB, Disk={{.disk_size}}MB) ...": "", "Current context is \"{{.context}}\"": "当前的上下文为 \"{{.context}}\"", "DEPRECATED, use `driver` instead.": "", + "DEPRECATED: Replaced by --cni": "已弃用，改用 --cni 来代替", "DEPRECATED: Replaced by --cni=bridge": "", "Default group id used for the mount": "用于挂载默认的 group id", "Default user id used for the mount": "用于挂载默认的 user id", @@ -456,7 +457,6 @@ "It seems that you are running in GCE, which means authentication should work without the GCP Auth addon. If you would still like to authenticate using a credentials file, use the --force flag.": "", "Kicbase images have not been deleted. To delete images run:": "", "Kill the mount process spawned by minikube start": "", - "DEPRECATED: Replaced by --cni": "已弃用，改用 --cni 来代替", "Kubernetes requires at least 2 CPU's to start": "", "Kubernetes {{.new}} is now available. If you would like to upgrade, specify: --kubernetes-version={{.new}}": "Kubernetes {{.new}} 现在可用了。如果您想升级，请指定 --kubernetes-version={{.new}}", "Kubernetes {{.new}} is now available. If you would like to upgrade, specify: --kubernetes-version={{.prefix}}{{.new}}": "", From 21e00cf79673bbf2116967dcd0ecc1e543b6b3ad Mon Sep 17 00:00:00 2001 From: inifares23lab Date: Wed, 6 Jul 2022 23:21:51 +0200 Subject: [PATCH 245/545] formatting with 'gofmt -w -s .' --- cmd/minikube/cmd/config/enable.go | 10 +++++----- pkg/minikube/assets/addons.go | 11 +++++------ 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/cmd/minikube/cmd/config/enable.go b/cmd/minikube/cmd/config/enable.go index 2a6ce1566f..5a16827935 100644 --- a/cmd/minikube/cmd/config/enable.go +++ b/cmd/minikube/cmd/config/enable.go @@ -23,7 +23,7 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" "k8s.io/minikube/pkg/addons" - "k8s.io/minikube/pkg/minikube/assets" + "k8s.io/minikube/pkg/minikube/assets" "k8s.io/minikube/pkg/minikube/config" "k8s.io/minikube/pkg/minikube/constants" "k8s.io/minikube/pkg/minikube/exit" @@ -53,10 +53,10 @@ var addonsEnableCmd = &cobra.Command{ if addon == "olm" { out.Styled(style.Warning, "The OLM addon has stopped working, for more details visit: https://github.com/operator-framework/operator-lifecycle-manager/issues/2534") } - addonBundle, ok := assets.Addons[addon] - if ok && addonBundle.VerifiedMaintainer == "" { - out.Styled(style.Warning, fmt.Sprintf("The %s addon doesn't have a verified maintainer.", addon)) - } + addonBundle, ok := assets.Addons[addon] + if ok && addonBundle.VerifiedMaintainer == "" { + out.Styled(style.Warning, fmt.Sprintf("The %s addon doesn't have a verified maintainer.", addon)) + } viper.Set(config.AddonImages, images) viper.Set(config.AddonRegistries, registries) err := addons.SetAndSave(ClusterFlagValue(), addon, "true") diff --git a/pkg/minikube/assets/addons.go b/pkg/minikube/assets/addons.go index d27bb2ea83..e2e3b2068b 100755 --- a/pkg/minikube/assets/addons.go +++ b/pkg/minikube/assets/addons.go @@ -39,7 +39,7 @@ type Addon struct { enabled bool addonName string Maintainer string - VerifiedMaintainer string + VerifiedMaintainer string Docs string Images map[string]string @@ -60,8 +60,8 @@ func NewAddon(assets []*BinAsset, enabled bool, addonName string, maintainer str enabled: enabled, addonName: addonName, Maintainer: maintainer, - VerifiedMaintainer: verifiedMaintainer, - Docs: docs, + VerifiedMaintainer: verifiedMaintainer, + Docs: docs, Images: images, Registries: registries, } @@ -442,7 +442,7 @@ var Addons = map[string]*Addon{ vmpath.GuestAddonsDir, "logviewer-rbac.yaml", "0640"), - }, false, "logviewer", "", "", "", map[string]string{ + }, false, "logviewer", "", "", "", map[string]string{ "LogViewer": "ivans3/minikube-log-viewer:latest@sha256:75854f45305cc47d17b04c6c588fa60777391761f951e3a34161ddf1f1b06405", }, nil), "gvisor": NewAddon([]*BinAsset{ @@ -531,7 +531,7 @@ var Addons = map[string]*Addon{ vmpath.GuestAddonsDir, "ambassadorinstallation.yaml", "0640"), - }, false, "ambassador", "3rd party (Ambassador)", "", "https://minikube.sigs.k8s.io/docs/tutorials/ambassador_ingress_controller/", map[string]string{ + }, false, "ambassador", "3rd party (Ambassador)", "", "https://minikube.sigs.k8s.io/docs/tutorials/ambassador_ingress_controller/", map[string]string{ "AmbassadorOperator": "datawire/ambassador-operator:v1.2.3@sha256:492f33e0828a371aa23331d75c11c251b21499e31287f026269e3f6ec6da34ed", }, map[string]string{ "AmbassadorOperator": "quay.io", @@ -927,4 +927,3 @@ func GenerateTemplateData(addon *Addon, cfg config.KubernetesConfig, netInfo Net } return opts } - From 6338d6ac7c6a7fe56c5bab374c803c3942b6fa34 Mon Sep 17 00:00:00 2001 From: Siddhant Date: Thu, 7 Jul 2022 08:01:22 +0530 Subject: [PATCH 246/545] Kubernetes dashboard --- deploy/addons/aliyun_mirror.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/addons/aliyun_mirror.json b/deploy/addons/aliyun_mirror.json index 6d9ace5283..acf57285ac 100644 --- a/deploy/addons/aliyun_mirror.json +++ b/deploy/addons/aliyun_mirror.json @@ -1,5 +1,5 @@ { - "kubernetesui/dashboard": "registry.cn-hangzhou.aliyuncs.com/google_containers/dashboard", + "hub.docker.com/r/kubernetesui/dashboard": "registry.cn-hangzhou.aliyuncs.com/google_containers/dashboard", "kubernetesui/metrics-scraper": "registry.cn-hangzhou.aliyuncs.com/google_containers/metrics-scraper", "gcr.io/k8s-minikube/auto-pause-hook": "registry.cn-hangzhou.aliyuncs.com/google_containers/auto-pause-hook", "quay.io/operator-framework/olm": "registry.cn-hangzhou.aliyuncs.com/google_containers/olm", From fe356d5f174095aa9ad8a6fb456bcdb1f2db1972 Mon Sep 17 00:00:00 2001 From: Siddhant Date: Thu, 7 Jul 2022 08:02:44 +0530 Subject: [PATCH 247/545] k8s metrics-scraper --- deploy/addons/aliyun_mirror.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/addons/aliyun_mirror.json b/deploy/addons/aliyun_mirror.json index acf57285ac..4265265f91 100644 --- a/deploy/addons/aliyun_mirror.json +++ b/deploy/addons/aliyun_mirror.json @@ -1,6 +1,6 @@ { "hub.docker.com/r/kubernetesui/dashboard": "registry.cn-hangzhou.aliyuncs.com/google_containers/dashboard", - "kubernetesui/metrics-scraper": "registry.cn-hangzhou.aliyuncs.com/google_containers/metrics-scraper", + "hub.docker.com/r/kubernetesui/metrics-scraper": "registry.cn-hangzhou.aliyuncs.com/google_containers/metrics-scraper", "gcr.io/k8s-minikube/auto-pause-hook": "registry.cn-hangzhou.aliyuncs.com/google_containers/auto-pause-hook", "quay.io/operator-framework/olm": "registry.cn-hangzhou.aliyuncs.com/google_containers/olm", "quay.io/operator-framework/upstream-community-operators": "registry.cn-hangzhou.aliyuncs.com/google_containers/upstream-community-operators", From 57e93f601cbcff72b4507168c04ab1163cb3e435 Mon Sep 17 00:00:00 2001 From: Siddhant Date: Thu, 7 Jul 2022 08:04:58 +0530 Subject: [PATCH 248/545] fixed broken link for kube-registry-proxy --- deploy/addons/aliyun_mirror.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/addons/aliyun_mirror.json b/deploy/addons/aliyun_mirror.json index 4265265f91..d36ca87d7b 100644 --- a/deploy/addons/aliyun_mirror.json +++ b/deploy/addons/aliyun_mirror.json @@ -4,7 +4,7 @@ "gcr.io/k8s-minikube/auto-pause-hook": "registry.cn-hangzhou.aliyuncs.com/google_containers/auto-pause-hook", "quay.io/operator-framework/olm": "registry.cn-hangzhou.aliyuncs.com/google_containers/olm", "quay.io/operator-framework/upstream-community-operators": "registry.cn-hangzhou.aliyuncs.com/google_containers/upstream-community-operators", - "k8s.gcr.io/kube-registry-proxy": "registry.cn-hangzhou.aliyuncs.com/google_containers/kube-registry-proxy", + "hub.docker.com/r/solsson/kube-registry-proxy": "registry.cn-hangzhou.aliyuncs.com/google_containers/kube-registry-proxy", "upmcenterprises/registry-creds": "registry.cn-hangzhou.aliyuncs.com/google_containers/registry-creds", "quay.io/rhdevelopers/core-dns-patcher": "registry.cn-hangzhou.aliyuncs.com/google_containers/core-dns-patcher", "nvidia/k8s-device-plugin": "registry.cn-hangzhou.aliyuncs.com/google_containers/k8s-device-plugin", From 6c2ea268ea821b60327baccca0a21fc2f990040f Mon Sep 17 00:00:00 2001 From: Siddhant Date: Thu, 7 Jul 2022 08:06:27 +0530 Subject: [PATCH 249/545] registry-creds --- deploy/addons/aliyun_mirror.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/addons/aliyun_mirror.json b/deploy/addons/aliyun_mirror.json index d36ca87d7b..8f185af3c8 100644 --- a/deploy/addons/aliyun_mirror.json +++ b/deploy/addons/aliyun_mirror.json @@ -5,7 +5,7 @@ "quay.io/operator-framework/olm": "registry.cn-hangzhou.aliyuncs.com/google_containers/olm", "quay.io/operator-framework/upstream-community-operators": "registry.cn-hangzhou.aliyuncs.com/google_containers/upstream-community-operators", "hub.docker.com/r/solsson/kube-registry-proxy": "registry.cn-hangzhou.aliyuncs.com/google_containers/kube-registry-proxy", - "upmcenterprises/registry-creds": "registry.cn-hangzhou.aliyuncs.com/google_containers/registry-creds", + "github.com/upmc-enterprises/registry-creds": "registry.cn-hangzhou.aliyuncs.com/google_containers/registry-creds", "quay.io/rhdevelopers/core-dns-patcher": "registry.cn-hangzhou.aliyuncs.com/google_containers/core-dns-patcher", "nvidia/k8s-device-plugin": "registry.cn-hangzhou.aliyuncs.com/google_containers/k8s-device-plugin", "ivans3/minikube-log-viewer": "registry.cn-hangzhou.aliyuncs.com/google_containers/minikube-log-viewer", From 9d2f7093d2deba429b9c129d7912def7aa57845f Mon Sep 17 00:00:00 2001 From: Siddhant Date: Thu, 7 Jul 2022 08:07:26 +0530 Subject: [PATCH 250/545] Nvidia k8s-device-plugin --- deploy/addons/aliyun_mirror.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/addons/aliyun_mirror.json b/deploy/addons/aliyun_mirror.json index 8f185af3c8..cc3b469a27 100644 --- a/deploy/addons/aliyun_mirror.json +++ b/deploy/addons/aliyun_mirror.json @@ -7,7 +7,7 @@ "hub.docker.com/r/solsson/kube-registry-proxy": "registry.cn-hangzhou.aliyuncs.com/google_containers/kube-registry-proxy", "github.com/upmc-enterprises/registry-creds": "registry.cn-hangzhou.aliyuncs.com/google_containers/registry-creds", "quay.io/rhdevelopers/core-dns-patcher": "registry.cn-hangzhou.aliyuncs.com/google_containers/core-dns-patcher", - "nvidia/k8s-device-plugin": "registry.cn-hangzhou.aliyuncs.com/google_containers/k8s-device-plugin", + "github.com/NVIDIA/k8s-device-plugin": "registry.cn-hangzhou.aliyuncs.com/google_containers/k8s-device-plugin", "ivans3/minikube-log-viewer": "registry.cn-hangzhou.aliyuncs.com/google_containers/minikube-log-viewer", "cryptexlabs/minikube-ingress-dns": "registry.cn-hangzhou.aliyuncs.com/google_containers/minikube-ingress-dns", "quay.io/datawire/ambassador-operator": "registry.cn-hangzhou.aliyuncs.com/google_containers/ambassador-operator", From 55df5e76060475058f1eacfe5feba8b33cf185bb Mon Sep 17 00:00:00 2001 From: Siddhant Date: Thu, 7 Jul 2022 08:08:10 +0530 Subject: [PATCH 251/545] minikube-log-viewer --- deploy/addons/aliyun_mirror.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/addons/aliyun_mirror.json b/deploy/addons/aliyun_mirror.json index cc3b469a27..6080142229 100644 --- a/deploy/addons/aliyun_mirror.json +++ b/deploy/addons/aliyun_mirror.json @@ -8,7 +8,7 @@ "github.com/upmc-enterprises/registry-creds": "registry.cn-hangzhou.aliyuncs.com/google_containers/registry-creds", "quay.io/rhdevelopers/core-dns-patcher": "registry.cn-hangzhou.aliyuncs.com/google_containers/core-dns-patcher", "github.com/NVIDIA/k8s-device-plugin": "registry.cn-hangzhou.aliyuncs.com/google_containers/k8s-device-plugin", - "ivans3/minikube-log-viewer": "registry.cn-hangzhou.aliyuncs.com/google_containers/minikube-log-viewer", + "github.com/ivans3/minikube-log-viewer": "registry.cn-hangzhou.aliyuncs.com/google_containers/minikube-log-viewer", "cryptexlabs/minikube-ingress-dns": "registry.cn-hangzhou.aliyuncs.com/google_containers/minikube-ingress-dns", "quay.io/datawire/ambassador-operator": "registry.cn-hangzhou.aliyuncs.com/google_containers/ambassador-operator", "jettech/kube-webhook-certgen": "registry.cn-hangzhou.aliyuncs.com/google_containers/kube-webhook-certgen", From f3ade07bdb4f9c5e73e50ed5b4fe78c9e95d79e6 Mon Sep 17 00:00:00 2001 From: Siddhant Date: Thu, 7 Jul 2022 08:09:12 +0530 Subject: [PATCH 252/545] minikube-ingress-dns --- deploy/addons/aliyun_mirror.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/addons/aliyun_mirror.json b/deploy/addons/aliyun_mirror.json index 6080142229..64518cc47f 100644 --- a/deploy/addons/aliyun_mirror.json +++ b/deploy/addons/aliyun_mirror.json @@ -9,7 +9,7 @@ "quay.io/rhdevelopers/core-dns-patcher": "registry.cn-hangzhou.aliyuncs.com/google_containers/core-dns-patcher", "github.com/NVIDIA/k8s-device-plugin": "registry.cn-hangzhou.aliyuncs.com/google_containers/k8s-device-plugin", "github.com/ivans3/minikube-log-viewer": "registry.cn-hangzhou.aliyuncs.com/google_containers/minikube-log-viewer", - "cryptexlabs/minikube-ingress-dns": "registry.cn-hangzhou.aliyuncs.com/google_containers/minikube-ingress-dns", + "hub.docker.com/r/cryptexlabs/minikube-ingress-dns": "registry.cn-hangzhou.aliyuncs.com/google_containers/minikube-ingress-dns", "quay.io/datawire/ambassador-operator": "registry.cn-hangzhou.aliyuncs.com/google_containers/ambassador-operator", "jettech/kube-webhook-certgen": "registry.cn-hangzhou.aliyuncs.com/google_containers/kube-webhook-certgen", "gcr.io/k8s-minikube/gcp-auth-webhook": "registry.cn-hangzhou.aliyuncs.com/google_containers/gcp-auth-webhook", From 44d719df6e98c425831141275ef3cc5cf70dd353 Mon Sep 17 00:00:00 2001 From: Siddhant Date: Thu, 7 Jul 2022 08:10:21 +0530 Subject: [PATCH 253/545] kube-webhook-certgen --- deploy/addons/aliyun_mirror.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/addons/aliyun_mirror.json b/deploy/addons/aliyun_mirror.json index 64518cc47f..50ae2de8e1 100644 --- a/deploy/addons/aliyun_mirror.json +++ b/deploy/addons/aliyun_mirror.json @@ -11,7 +11,7 @@ "github.com/ivans3/minikube-log-viewer": "registry.cn-hangzhou.aliyuncs.com/google_containers/minikube-log-viewer", "hub.docker.com/r/cryptexlabs/minikube-ingress-dns": "registry.cn-hangzhou.aliyuncs.com/google_containers/minikube-ingress-dns", "quay.io/datawire/ambassador-operator": "registry.cn-hangzhou.aliyuncs.com/google_containers/ambassador-operator", - "jettech/kube-webhook-certgen": "registry.cn-hangzhou.aliyuncs.com/google_containers/kube-webhook-certgen", + "hub.docker.com/r/jettech/kube-webhook-certgen": "registry.cn-hangzhou.aliyuncs.com/google_containers/kube-webhook-certgen", "gcr.io/k8s-minikube/gcp-auth-webhook": "registry.cn-hangzhou.aliyuncs.com/google_containers/gcp-auth-webhook", "k8s.gcr.io/sig-storage/snapshot-controller": "registry.cn-hangzhou.aliyuncs.com/google_containers/snapshot-controller", "k8s.gcr.io/sig-storage/csi-attacher": "registry.cn-hangzhou.aliyuncs.com/google_containers/csi-attacher", From 4a6dd344d93cb240eeb5cca6caecacc4e8c52e24 Mon Sep 17 00:00:00 2001 From: Siddhant Date: Thu, 7 Jul 2022 08:11:22 +0530 Subject: [PATCH 254/545] gcp-auth-webhook --- deploy/addons/aliyun_mirror.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/addons/aliyun_mirror.json b/deploy/addons/aliyun_mirror.json index 50ae2de8e1..a070ec3086 100644 --- a/deploy/addons/aliyun_mirror.json +++ b/deploy/addons/aliyun_mirror.json @@ -12,7 +12,7 @@ "hub.docker.com/r/cryptexlabs/minikube-ingress-dns": "registry.cn-hangzhou.aliyuncs.com/google_containers/minikube-ingress-dns", "quay.io/datawire/ambassador-operator": "registry.cn-hangzhou.aliyuncs.com/google_containers/ambassador-operator", "hub.docker.com/r/jettech/kube-webhook-certgen": "registry.cn-hangzhou.aliyuncs.com/google_containers/kube-webhook-certgen", - "gcr.io/k8s-minikube/gcp-auth-webhook": "registry.cn-hangzhou.aliyuncs.com/google_containers/gcp-auth-webhook", + "console.cloud.google.com/gcr/images/k8s-minikube/GLOBAL/gcp-auth-webhook": "registry.cn-hangzhou.aliyuncs.com/google_containers/gcp-auth-webhook", "k8s.gcr.io/sig-storage/snapshot-controller": "registry.cn-hangzhou.aliyuncs.com/google_containers/snapshot-controller", "k8s.gcr.io/sig-storage/csi-attacher": "registry.cn-hangzhou.aliyuncs.com/google_containers/csi-attacher", "k8s.gcr.io/sig-storage/csi-external-health-monitor-agent": "registry.cn-hangzhou.aliyuncs.com/google_containers/csi-external-health-monitor-agent", From 072e973338cb384c5d592a3be0ee3353803771c6 Mon Sep 17 00:00:00 2001 From: Siddhant Date: Thu, 7 Jul 2022 08:11:50 +0530 Subject: [PATCH 255/545] auto-pause-hook --- deploy/addons/aliyun_mirror.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/addons/aliyun_mirror.json b/deploy/addons/aliyun_mirror.json index a070ec3086..6ddce62f33 100644 --- a/deploy/addons/aliyun_mirror.json +++ b/deploy/addons/aliyun_mirror.json @@ -1,7 +1,7 @@ { "hub.docker.com/r/kubernetesui/dashboard": "registry.cn-hangzhou.aliyuncs.com/google_containers/dashboard", "hub.docker.com/r/kubernetesui/metrics-scraper": "registry.cn-hangzhou.aliyuncs.com/google_containers/metrics-scraper", - "gcr.io/k8s-minikube/auto-pause-hook": "registry.cn-hangzhou.aliyuncs.com/google_containers/auto-pause-hook", + "console.cloud.google.com/gcr/images/k8s-minikube/GLOBAL/auto-pause-hook": "registry.cn-hangzhou.aliyuncs.com/google_containers/auto-pause-hook", "quay.io/operator-framework/olm": "registry.cn-hangzhou.aliyuncs.com/google_containers/olm", "quay.io/operator-framework/upstream-community-operators": "registry.cn-hangzhou.aliyuncs.com/google_containers/upstream-community-operators", "hub.docker.com/r/solsson/kube-registry-proxy": "registry.cn-hangzhou.aliyuncs.com/google_containers/kube-registry-proxy", From 176e5d5fc7b521144819790d333378d51d7f30d0 Mon Sep 17 00:00:00 2001 From: Siddhant Date: Thu, 7 Jul 2022 08:19:15 +0530 Subject: [PATCH 256/545] updated all k8s.gcr addons --- deploy/addons/aliyun_mirror.json | 122 +++++++++++++++---------------- 1 file changed, 61 insertions(+), 61 deletions(-) diff --git a/deploy/addons/aliyun_mirror.json b/deploy/addons/aliyun_mirror.json index 6ddce62f33..6323919821 100644 --- a/deploy/addons/aliyun_mirror.json +++ b/deploy/addons/aliyun_mirror.json @@ -4,7 +4,7 @@ "console.cloud.google.com/gcr/images/k8s-minikube/GLOBAL/auto-pause-hook": "registry.cn-hangzhou.aliyuncs.com/google_containers/auto-pause-hook", "quay.io/operator-framework/olm": "registry.cn-hangzhou.aliyuncs.com/google_containers/olm", "quay.io/operator-framework/upstream-community-operators": "registry.cn-hangzhou.aliyuncs.com/google_containers/upstream-community-operators", - "hub.docker.com/r/solsson/kube-registry-proxy": "registry.cn-hangzhou.aliyuncs.com/google_containers/kube-registry-proxy", + "github.com/kubernetes/k8s.gcr.io/kube-registry-proxy": "registry.cn-hangzhou.aliyuncs.com/google_containers/kube-registry-proxy", "github.com/upmc-enterprises/registry-creds": "registry.cn-hangzhou.aliyuncs.com/google_containers/registry-creds", "quay.io/rhdevelopers/core-dns-patcher": "registry.cn-hangzhou.aliyuncs.com/google_containers/core-dns-patcher", "github.com/NVIDIA/k8s-device-plugin": "registry.cn-hangzhou.aliyuncs.com/google_containers/k8s-device-plugin", @@ -13,75 +13,75 @@ "quay.io/datawire/ambassador-operator": "registry.cn-hangzhou.aliyuncs.com/google_containers/ambassador-operator", "hub.docker.com/r/jettech/kube-webhook-certgen": "registry.cn-hangzhou.aliyuncs.com/google_containers/kube-webhook-certgen", "console.cloud.google.com/gcr/images/k8s-minikube/GLOBAL/gcp-auth-webhook": "registry.cn-hangzhou.aliyuncs.com/google_containers/gcp-auth-webhook", - "k8s.gcr.io/sig-storage/snapshot-controller": "registry.cn-hangzhou.aliyuncs.com/google_containers/snapshot-controller", - "k8s.gcr.io/sig-storage/csi-attacher": "registry.cn-hangzhou.aliyuncs.com/google_containers/csi-attacher", - "k8s.gcr.io/sig-storage/csi-external-health-monitor-agent": "registry.cn-hangzhou.aliyuncs.com/google_containers/csi-external-health-monitor-agent", - "k8s.gcr.io/sig-storage/csi-external-health-monitor-controller": "registry.cn-hangzhou.aliyuncs.com/google_containers/csi-external-health-monitor-controller", - "k8s.gcr.io/sig-storage/csi-node-driver-registrar": "registry.cn-hangzhou.aliyuncs.com/google_containers/csi-node-driver-registrar", - "k8s.gcr.io/sig-storage/hostpathplugin": "registry.cn-hangzhou.aliyuncs.com/google_containers/hostpathplugin", - "k8s.gcr.io/sig-storage/livenessprobe": "registry.cn-hangzhou.aliyuncs.com/google_containers/livenessprobe", - "k8s.gcr.io/sig-storage/csi-resizer": "registry.cn-hangzhou.aliyuncs.com/google_containers/csi-resizer", - "k8s.gcr.io/sig-storage/csi-snapshotter": "registry.cn-hangzhou.aliyuncs.com/google_containers/csi-snapshotter", - "k8s.gcr.io/sig-storage/csi-provisioner": "registry.cn-hangzhou.aliyuncs.com/google_containers/csi-provisioner", + "github.com/kubernetes/k8s.gcr.io/sig-storage/snapshot-controller": "registry.cn-hangzhou.aliyuncs.com/google_containers/snapshot-controller", + "github.com/kubernetes/k8s.gcr.io/sig-storage/csi-attacher": "registry.cn-hangzhou.aliyuncs.com/google_containers/csi-attacher", + "github.com/kubernetes/k8s.gcr.io/sig-storage/csi-external-health-monitor-agent": "registry.cn-hangzhou.aliyuncs.com/google_containers/csi-external-health-monitor-agent", + "github.com/kubernetes/k8s.gcr.io/sig-storage/csi-external-health-monitor-controller": "registry.cn-hangzhou.aliyuncs.com/google_containers/csi-external-health-monitor-controller", + "github.com/kubernetes/k8s.gcr.io/sig-storage/csi-node-driver-registrar": "registry.cn-hangzhou.aliyuncs.com/google_containers/csi-node-driver-registrar", + "github.com/kubernetes/k8s.gcr.io/sig-storage/hostpathplugin": "registry.cn-hangzhou.aliyuncs.com/google_containers/hostpathplugin", + "github.com/kubernetes/k8s.gcr.io/sig-storage/livenessprobe": "registry.cn-hangzhou.aliyuncs.com/google_containers/livenessprobe", + "github.com/kubernetes/k8s.gcr.io/sig-storage/csi-resizer": "registry.cn-hangzhou.aliyuncs.com/google_containers/csi-resizer", + "github.com/kubernetes/k8s.gcr.io/sig-storage/csi-snapshotter": "registry.cn-hangzhou.aliyuncs.com/google_containers/csi-snapshotter", + "github.com/kubernetes/k8s.gcr.io/sig-storage/csi-provisioner": "registry.cn-hangzhou.aliyuncs.com/google_containers/csi-provisioner", "registry": "registry.cn-hangzhou.aliyuncs.com/google_containers/registry", "docker.io/gluster/gluster-centos": "registry.cn-hangzhou.aliyuncs.com/google_containers/glusterfs-server", "heketi/heketi": "registry.cn-hangzhou.aliyuncs.com/google_containers/heketi", "coredns/coredns": "registry.cn-hangzhou.aliyuncs.com/google_containers/coredns", "kindest/kindnetd": "registry.cn-hangzhou.aliyuncs.com/google_containers/kindnetd", - "k8s.gcr.io/ingress-nginx/controller": "registry.cn-hangzhou.aliyuncs.com/google_containers/nginx-ingress-controller", + "github.com/kubernetes/k8s.gcr.io/ingress-nginx/controller": "registry.cn-hangzhou.aliyuncs.com/google_containers/nginx-ingress-controller", "gcr.io/cloud-builders/gcs-fetcher": "registry.cn-hangzhou.aliyuncs.com/cloud-builders/gcs-fetcher", "gcr.io/google-samples/freshpod": "registry.cn-hangzhou.aliyuncs.com/google_containers/freshpod", "gcr.io/k8s-minikube/gvisor-addon": "registry.cn-hangzhou.aliyuncs.com/google_containers/gvisor-addon", "gcr.io/k8s-minikube/kicbase": "registry.cn-hangzhou.aliyuncs.com/google_containers/kicbase", "gcr.io/k8s-minikube/storage-provisioner": "registry.cn-hangzhou.aliyuncs.com/google_containers/storage-provisioner", "gcr.io/kubernetes-helm/tiller": "registry.cn-hangzhou.aliyuncs.com/google_containers/tiller", - "k8s.gcr.io/addon-resizer": "registry.cn-hangzhou.aliyuncs.com/google_containers/addon-resizer", - "k8s.gcr.io/busybox": "registry.cn-hangzhou.aliyuncs.com/google_containers/busybox", - "k8s.gcr.io/cluster-autoscaler": "registry.cn-hangzhou.aliyuncs.com/google_containers/cluster-autoscaler", - "k8s.gcr.io/coredns/coredns": "registry.cn-hangzhou.aliyuncs.com/google_containers/coredns", - "k8s.gcr.io/defaultbackend": "registry.cn-hangzhou.aliyuncs.com/google_containers/defaultbackend", - "k8s.gcr.io/echoserver": "registry.cn-hangzhou.aliyuncs.com/google_containers/echoserver", - "k8s.gcr.io/elasticsearch": "registry.cn-hangzhou.aliyuncs.com/google_containers/elasticsearch", - "k8s.gcr.io/etcd": "registry.cn-hangzhou.aliyuncs.com/google_containers/etcd", - "k8s.gcr.io/etcd-amd64": "registry.cn-hangzhou.aliyuncs.com/google_containers/etcd-amd64", - "k8s.gcr.io/exechealthz-amd64": "registry.cn-hangzhou.aliyuncs.com/google_containers/exechealthz-amd64", - "k8s.gcr.io/flannel-amd64": "registry.cn-hangzhou.aliyuncs.com/google_containers/flannel-amd64", - "k8s.gcr.io/fluentd-elasticsearch": "registry.cn-hangzhou.aliyuncs.com/google_containers/fluentd-elasticsearch", - "k8s.gcr.io/heapster": "registry.cn-hangzhou.aliyuncs.com/google_containers/heapster", - "k8s.gcr.io/heapster_grafana": "registry.cn-hangzhou.aliyuncs.com/google_containers/heapster_grafana", - "k8s.gcr.io/heapster_influxdb": "registry.cn-hangzhou.aliyuncs.com/google_containers/heapster_influxdb", - "k8s.gcr.io/heapster-amd64": "registry.cn-hangzhou.aliyuncs.com/google_containers/heapster-amd64", - "k8s.gcr.io/heapster-grafana-amd64": "registry.cn-hangzhou.aliyuncs.com/google_containers/heapster-grafana-amd64", - "k8s.gcr.io/heapster-influxdb-amd64": "registry.cn-hangzhou.aliyuncs.com/google_containers/heapster-influxdb-amd64", - "k8s.gcr.io/k8s-dns-dnsmasq-nanny-amd64": "registry.cn-hangzhou.aliyuncs.com/google_containers/k8s-dns-dnsmasq-nanny-amd64", - "k8s.gcr.io/k8s-dns-kube-dns-amd64": "registry.cn-hangzhou.aliyuncs.com/google_containers/k8s-dns-kube-dns-amd64", - "k8s.gcr.io/k8s-dns-node-cache": "registry.cn-hangzhou.aliyuncs.com/google_containers/k8s-dns-node-cache", - "k8s.gcr.io/k8s-dns-sidecar-amd64": "registry.cn-hangzhou.aliyuncs.com/google_containers/k8s-dns-sidecar-amd64", - "k8s.gcr.io/kube-addon-manager": "registry.cn-hangzhou.aliyuncs.com/google_containers/kube-addon-manager", - "k8s.gcr.io/kube-addon-manager-amd64": "registry.cn-hangzhou.aliyuncs.com/google_containers/kube-addon-manager-amd64", - "k8s.gcr.io/kube-apiserver": "registry.cn-hangzhou.aliyuncs.com/google_containers/kube-apiserver", - "k8s.gcr.io/kube-apiserver-amd64": "registry.cn-hangzhou.aliyuncs.com/google_containers/kube-apiserver-amd64", - "k8s.gcr.io/kube-controller-manager": "registry.cn-hangzhou.aliyuncs.com/google_containers/kube-controller-manager", - "k8s.gcr.io/kube-controller-manager-amd64": "registry.cn-hangzhou.aliyuncs.com/google_containers/kube-controller-manager-amd64", - "k8s.gcr.io/kube-cross": "registry.cn-hangzhou.aliyuncs.com/google_containers/kube-cross", - "k8s.gcr.io/kube-dnsmasq-amd64": "registry.cn-hangzhou.aliyuncs.com/google_containers/kube-dnsmasq-amd64", - "k8s.gcr.io/kube-proxy": "registry.cn-hangzhou.aliyuncs.com/google_containers/kube-proxy", - "k8s.gcr.io/kube-proxy-amd64": "registry.cn-hangzhou.aliyuncs.com/google_containers/kube-proxy-amd64", - "k8s.gcr.io/kube-scheduler": "registry.cn-hangzhou.aliyuncs.com/google_containers/kube-scheduler", - "k8s.gcr.io/kube-scheduler-amd64": "registry.cn-hangzhou.aliyuncs.com/google_containers/kube-scheduler-amd64", - "k8s.gcr.io/kube-state-metrics": "registry.cn-hangzhou.aliyuncs.com/google_containers/kube-state-metrics", - "k8s.gcr.io/kubedns-amd64": "registry.cn-hangzhou.aliyuncs.com/google_containers/kubedns-amd64", - "k8s.gcr.io/kubernetes-dashboard-amd64": "registry.cn-hangzhou.aliyuncs.com/google_containers/kubernetes-dashboard-amd64", - "k8s.gcr.io/metrics-server-amd64": "registry.cn-hangzhou.aliyuncs.com/google_containers/metrics-server-amd64", - "k8s.gcr.io/minikube-nvidia-driver-installer": "registry.cn-hangzhou.aliyuncs.com/google_containers/minikube-nvidia-driver-installer", - "k8s.gcr.io/mongodb-install": "registry.cn-hangzhou.aliyuncs.com/google_containers/mongodb-install", - "k8s.gcr.io/nginx-slim": "registry.cn-hangzhou.aliyuncs.com/google_containers/nginx-slim", - "k8s.gcr.io/nvidia-gpu-device-plugin": "registry.cn-hangzhou.aliyuncs.com/google_containers/nvidia-gpu-device-plugin", - "k8s.gcr.io/pause": "registry.cn-hangzhou.aliyuncs.com/google_containers/pause", - "k8s.gcr.io/pause-amd64": "registry.cn-hangzhou.aliyuncs.com/google_containers/pause-amd64", - "k8s.gcr.io/spark": "registry.cn-hangzhou.aliyuncs.com/google_containers/spark", - "k8s.gcr.io/spartakus-amd64": "registry.cn-hangzhou.aliyuncs.com/google_containers/spartakus-amd64", - "k8s.gcr.io/zeppelin": "registry.cn-hangzhou.aliyuncs.com/google_containers/zeppelin", + "github.com/kubernetes/k8s.gcr.io/addon-resizer": "registry.cn-hangzhou.aliyuncs.com/google_containers/addon-resizer", + "github.com/kubernetes/k8s.gcr.io/busybox": "registry.cn-hangzhou.aliyuncs.com/google_containers/busybox", + "github.com/kubernetes/k8s.gcr.io/cluster-autoscaler": "registry.cn-hangzhou.aliyuncs.com/google_containers/cluster-autoscaler", + "github.com/kubernetes/k8s.gcr.io/coredns/coredns": "registry.cn-hangzhou.aliyuncs.com/google_containers/coredns", + "github.com/kubernetes/k8s.gcr.io/defaultbackend": "registry.cn-hangzhou.aliyuncs.com/google_containers/defaultbackend", + "github.com/kubernetes/k8s.gcr.io/echoserver": "registry.cn-hangzhou.aliyuncs.com/google_containers/echoserver", + "github.com/kubernetes/k8s.gcr.io/elasticsearch": "registry.cn-hangzhou.aliyuncs.com/google_containers/elasticsearch", + "github.com/kubernetes/k8s.gcr.io/etcd": "registry.cn-hangzhou.aliyuncs.com/google_containers/etcd", + "github.com/kubernetes/k8s.gcr.io/etcd-amd64": "registry.cn-hangzhou.aliyuncs.com/google_containers/etcd-amd64", + "github.com/kubernetes/k8s.gcr.io/exechealthz-amd64": "registry.cn-hangzhou.aliyuncs.com/google_containers/exechealthz-amd64", + "github.com/kubernetes/k8s.gcr.io/flannel-amd64": "registry.cn-hangzhou.aliyuncs.com/google_containers/flannel-amd64", + "github.com/kubernetes/k8s.gcr.io/fluentd-elasticsearch": "registry.cn-hangzhou.aliyuncs.com/google_containers/fluentd-elasticsearch", + "github.com/kubernetes/k8s.gcr.io/heapster": "registry.cn-hangzhou.aliyuncs.com/google_containers/heapster", + "github.com/kubernetes/k8s.gcr.io/heapster_grafana": "registry.cn-hangzhou.aliyuncs.com/google_containers/heapster_grafana", + "github.com/kubernetes/k8s.gcr.io/heapster_influxdb": "registry.cn-hangzhou.aliyuncs.com/google_containers/heapster_influxdb", + "github.com/kubernetes/k8s.gcr.io/heapster-amd64": "registry.cn-hangzhou.aliyuncs.com/google_containers/heapster-amd64", + "github.com/kubernetes/k8s.gcr.io/heapster-grafana-amd64": "registry.cn-hangzhou.aliyuncs.com/google_containers/heapster-grafana-amd64", + "github.com/kubernetes/k8s.gcr.io/heapster-influxdb-amd64": "registry.cn-hangzhou.aliyuncs.com/google_containers/heapster-influxdb-amd64", + "github.com/kubernetes/k8s.gcr.io/k8s-dns-dnsmasq-nanny-amd64": "registry.cn-hangzhou.aliyuncs.com/google_containers/k8s-dns-dnsmasq-nanny-amd64", + "github.com/kubernetes/k8s.gcr.io/k8s-dns-kube-dns-amd64": "registry.cn-hangzhou.aliyuncs.com/google_containers/k8s-dns-kube-dns-amd64", + "github.com/kubernetes/k8s.gcr.io/k8s-dns-node-cache": "registry.cn-hangzhou.aliyuncs.com/google_containers/k8s-dns-node-cache", + "github.com/kubernetes/k8s.gcr.io/k8s-dns-sidecar-amd64": "registry.cn-hangzhou.aliyuncs.com/google_containers/k8s-dns-sidecar-amd64", + "github.com/kubernetes/k8s.gcr.io/kube-addon-manager": "registry.cn-hangzhou.aliyuncs.com/google_containers/kube-addon-manager", + "github.com/kubernetes/k8s.gcr.io/kube-addon-manager-amd64": "registry.cn-hangzhou.aliyuncs.com/google_containers/kube-addon-manager-amd64", + "github.com/kubernetes/k8s.gcr.io/kube-apiserver": "registry.cn-hangzhou.aliyuncs.com/google_containers/kube-apiserver", + "github.com/kubernetes/k8s.gcr.io/kube-apiserver-amd64": "registry.cn-hangzhou.aliyuncs.com/google_containers/kube-apiserver-amd64", + "github.com/kubernetes/k8s.gcr.io/kube-controller-manager": "registry.cn-hangzhou.aliyuncs.com/google_containers/kube-controller-manager", + "github.com/kubernetes/k8s.gcr.io/kube-controller-manager-amd64": "registry.cn-hangzhou.aliyuncs.com/google_containers/kube-controller-manager-amd64", + "github.com/kubernetes/k8s.gcr.io/kube-cross": "registry.cn-hangzhou.aliyuncs.com/google_containers/kube-cross", + "github.com/kubernetes/k8s.gcr.io/kube-dnsmasq-amd64": "registry.cn-hangzhou.aliyuncs.com/google_containers/kube-dnsmasq-amd64", + "github.com/kubernetes/k8s.gcr.io/kube-proxy": "registry.cn-hangzhou.aliyuncs.com/google_containers/kube-proxy", + "github.com/kubernetes/k8s.gcr.io/kube-proxy-amd64": "registry.cn-hangzhou.aliyuncs.com/google_containers/kube-proxy-amd64", + "github.com/kubernetes/k8s.gcr.io/kube-scheduler": "registry.cn-hangzhou.aliyuncs.com/google_containers/kube-scheduler", + "github.com/kubernetes/k8s.gcr.io/kube-scheduler-amd64": "registry.cn-hangzhou.aliyuncs.com/google_containers/kube-scheduler-amd64", + "github.com/kubernetes/k8s.gcr.io/kube-state-metrics": "registry.cn-hangzhou.aliyuncs.com/google_containers/kube-state-metrics", + "github.com/kubernetes/k8s.gcr.io/kubedns-amd64": "registry.cn-hangzhou.aliyuncs.com/google_containers/kubedns-amd64", + "github.com/kubernetes/k8s.gcr.io/kubernetes-dashboard-amd64": "registry.cn-hangzhou.aliyuncs.com/google_containers/kubernetes-dashboard-amd64", + "github.com/kubernetes/k8s.gcr.io/metrics-server-amd64": "registry.cn-hangzhou.aliyuncs.com/google_containers/metrics-server-amd64", + "github.com/kubernetes/k8s.gcr.io/minikube-nvidia-driver-installer": "registry.cn-hangzhou.aliyuncs.com/google_containers/minikube-nvidia-driver-installer", + "github.com/kubernetes/k8s.gcr.io/mongodb-install": "registry.cn-hangzhou.aliyuncs.com/google_containers/mongodb-install", + "github.com/kubernetes/k8s.gcr.io/nginx-slim": "registry.cn-hangzhou.aliyuncs.com/google_containers/nginx-slim", + "github.com/kubernetes/k8s.gcr.io/nvidia-gpu-device-plugin": "registry.cn-hangzhou.aliyuncs.com/google_containers/nvidia-gpu-device-plugin", + "github.com/kubernetes/k8s.gcr.io/pause": "registry.cn-hangzhou.aliyuncs.com/google_containers/pause", + "github.com/kubernetes/k8s.gcr.io/pause-amd64": "registry.cn-hangzhou.aliyuncs.com/google_containers/pause-amd64", + "github.com/kubernetes/k8s.gcr.io/spark": "registry.cn-hangzhou.aliyuncs.com/google_containers/spark", + "github.com/kubernetes/k8s.gcr.io/spartakus-amd64": "registry.cn-hangzhou.aliyuncs.com/google_containers/spartakus-amd64", + "github.com/kubernetes/k8s.gcr.io/zeppelin": "registry.cn-hangzhou.aliyuncs.com/google_containers/zeppelin", "quay.io/coreos/configmap-reload": "registry.cn-hangzhou.aliyuncs.com/coreos_containers/configmap-reload", "quay.io/coreos/grafana-watcher": "registry.cn-hangzhou.aliyuncs.com/coreos_containers/grafana-watcher", "quay.io/coreos/hyperkube": "registry.cn-hangzhou.aliyuncs.com/coreos_containers/hyperkube", @@ -94,9 +94,9 @@ "quay.io/kubernetes-service-catalog/service-catalog": "registry.cn-hangzhou.aliyuncs.com/kubernetes-service-catalog/service-catalog", "quay.io/prometheus/alertmanager": "registry.cn-hangzhou.aliyuncs.com/google_containers/alertmanager", "quay.io/prometheus/prometheus": "registry.cn-hangzhou.aliyuncs.com/google_containers/prometheus", - "k8s.gcr.io/ingress-nginx/kube-webhook-certgen": "registry.cn-hangzhou.aliyuncs.com/google_containers/kube-webhook-certgen", + "github.com/kubernetes/k8s.gcr.io/ingress-nginx/kube-webhook-certgen": "registry.cn-hangzhou.aliyuncs.com/google_containers/kube-webhook-certgen", "gcr.io/k8s-minikube/minikube-ingress-dns": "registry.cn-hangzhou.aliyuncs.com/google_containers/minikube-ingress-dns", "gcr.io/google_containers/pause": "registry.cn-hangzhou.aliyuncs.com/google_containers/pause", - "k8s.gcr.io/metrics-server/metrics-server": "registry.cn-hangzhou.aliyuncs.com/google_containers/metrics-server", + "github.com/kubernetes/k8s.gcr.io/metrics-server/metrics-server": "registry.cn-hangzhou.aliyuncs.com/google_containers/metrics-server", "gcr.io/google_containers/kube-registry-proxy": "registry.cn-hangzhou.aliyuncs.com/google_containers/kube-registry-proxy" } From 820acb07bdb7a2fc2eed2402e476a04c348bddc1 Mon Sep 17 00:00:00 2001 From: Siddhant Date: Thu, 7 Jul 2022 08:20:52 +0530 Subject: [PATCH 257/545] google cloud registry --- deploy/addons/aliyun_mirror.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/addons/aliyun_mirror.json b/deploy/addons/aliyun_mirror.json index 6323919821..1858530a08 100644 --- a/deploy/addons/aliyun_mirror.json +++ b/deploy/addons/aliyun_mirror.json @@ -23,7 +23,7 @@ "github.com/kubernetes/k8s.gcr.io/sig-storage/csi-resizer": "registry.cn-hangzhou.aliyuncs.com/google_containers/csi-resizer", "github.com/kubernetes/k8s.gcr.io/sig-storage/csi-snapshotter": "registry.cn-hangzhou.aliyuncs.com/google_containers/csi-snapshotter", "github.com/kubernetes/k8s.gcr.io/sig-storage/csi-provisioner": "registry.cn-hangzhou.aliyuncs.com/google_containers/csi-provisioner", - "registry": "registry.cn-hangzhou.aliyuncs.com/google_containers/registry", + "console.cloud.google.com/gcr/images/google-containers/GLOBAL": "registry.cn-hangzhou.aliyuncs.com/google_containers/registry", "docker.io/gluster/gluster-centos": "registry.cn-hangzhou.aliyuncs.com/google_containers/glusterfs-server", "heketi/heketi": "registry.cn-hangzhou.aliyuncs.com/google_containers/heketi", "coredns/coredns": "registry.cn-hangzhou.aliyuncs.com/google_containers/coredns", From 441d4ede68d0bde28572b2d16b13984b0fa918c3 Mon Sep 17 00:00:00 2001 From: Siddhant Date: Thu, 7 Jul 2022 08:22:17 +0530 Subject: [PATCH 258/545] gluster-centos --- deploy/addons/aliyun_mirror.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/addons/aliyun_mirror.json b/deploy/addons/aliyun_mirror.json index 1858530a08..2bebef943c 100644 --- a/deploy/addons/aliyun_mirror.json +++ b/deploy/addons/aliyun_mirror.json @@ -24,7 +24,7 @@ "github.com/kubernetes/k8s.gcr.io/sig-storage/csi-snapshotter": "registry.cn-hangzhou.aliyuncs.com/google_containers/csi-snapshotter", "github.com/kubernetes/k8s.gcr.io/sig-storage/csi-provisioner": "registry.cn-hangzhou.aliyuncs.com/google_containers/csi-provisioner", "console.cloud.google.com/gcr/images/google-containers/GLOBAL": "registry.cn-hangzhou.aliyuncs.com/google_containers/registry", - "docker.io/gluster/gluster-centos": "registry.cn-hangzhou.aliyuncs.com/google_containers/glusterfs-server", + "hub.docker.com/r/gluster/gluster-centos": "registry.cn-hangzhou.aliyuncs.com/google_containers/glusterfs-server", "heketi/heketi": "registry.cn-hangzhou.aliyuncs.com/google_containers/heketi", "coredns/coredns": "registry.cn-hangzhou.aliyuncs.com/google_containers/coredns", "kindest/kindnetd": "registry.cn-hangzhou.aliyuncs.com/google_containers/kindnetd", From 598842d61d228cdd40ce84caffac0e7a1b6aa8f5 Mon Sep 17 00:00:00 2001 From: Siddhant Date: Thu, 7 Jul 2022 08:22:46 +0530 Subject: [PATCH 259/545] heketi --- deploy/addons/aliyun_mirror.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/addons/aliyun_mirror.json b/deploy/addons/aliyun_mirror.json index 2bebef943c..dc42d79516 100644 --- a/deploy/addons/aliyun_mirror.json +++ b/deploy/addons/aliyun_mirror.json @@ -25,7 +25,7 @@ "github.com/kubernetes/k8s.gcr.io/sig-storage/csi-provisioner": "registry.cn-hangzhou.aliyuncs.com/google_containers/csi-provisioner", "console.cloud.google.com/gcr/images/google-containers/GLOBAL": "registry.cn-hangzhou.aliyuncs.com/google_containers/registry", "hub.docker.com/r/gluster/gluster-centos": "registry.cn-hangzhou.aliyuncs.com/google_containers/glusterfs-server", - "heketi/heketi": "registry.cn-hangzhou.aliyuncs.com/google_containers/heketi", + "github.com/heketi/heketi": "registry.cn-hangzhou.aliyuncs.com/google_containers/heketi", "coredns/coredns": "registry.cn-hangzhou.aliyuncs.com/google_containers/coredns", "kindest/kindnetd": "registry.cn-hangzhou.aliyuncs.com/google_containers/kindnetd", "github.com/kubernetes/k8s.gcr.io/ingress-nginx/controller": "registry.cn-hangzhou.aliyuncs.com/google_containers/nginx-ingress-controller", From 90a7e70e08b504329ad6fc168cce956408ff2a98 Mon Sep 17 00:00:00 2001 From: Siddhant Date: Thu, 7 Jul 2022 08:23:16 +0530 Subject: [PATCH 260/545] coredns --- deploy/addons/aliyun_mirror.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/addons/aliyun_mirror.json b/deploy/addons/aliyun_mirror.json index dc42d79516..f782991904 100644 --- a/deploy/addons/aliyun_mirror.json +++ b/deploy/addons/aliyun_mirror.json @@ -26,7 +26,7 @@ "console.cloud.google.com/gcr/images/google-containers/GLOBAL": "registry.cn-hangzhou.aliyuncs.com/google_containers/registry", "hub.docker.com/r/gluster/gluster-centos": "registry.cn-hangzhou.aliyuncs.com/google_containers/glusterfs-server", "github.com/heketi/heketi": "registry.cn-hangzhou.aliyuncs.com/google_containers/heketi", - "coredns/coredns": "registry.cn-hangzhou.aliyuncs.com/google_containers/coredns", + "github.com/coredns/coredns": "registry.cn-hangzhou.aliyuncs.com/google_containers/coredns", "kindest/kindnetd": "registry.cn-hangzhou.aliyuncs.com/google_containers/kindnetd", "github.com/kubernetes/k8s.gcr.io/ingress-nginx/controller": "registry.cn-hangzhou.aliyuncs.com/google_containers/nginx-ingress-controller", "gcr.io/cloud-builders/gcs-fetcher": "registry.cn-hangzhou.aliyuncs.com/cloud-builders/gcs-fetcher", From f686234f2d5c15df3c9710167a508c1ce8f6a6c8 Mon Sep 17 00:00:00 2001 From: Siddhant Date: Thu, 7 Jul 2022 08:24:24 +0530 Subject: [PATCH 261/545] kindnetd --- deploy/addons/aliyun_mirror.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/addons/aliyun_mirror.json b/deploy/addons/aliyun_mirror.json index f782991904..dcc6cee3ca 100644 --- a/deploy/addons/aliyun_mirror.json +++ b/deploy/addons/aliyun_mirror.json @@ -27,7 +27,7 @@ "hub.docker.com/r/gluster/gluster-centos": "registry.cn-hangzhou.aliyuncs.com/google_containers/glusterfs-server", "github.com/heketi/heketi": "registry.cn-hangzhou.aliyuncs.com/google_containers/heketi", "github.com/coredns/coredns": "registry.cn-hangzhou.aliyuncs.com/google_containers/coredns", - "kindest/kindnetd": "registry.cn-hangzhou.aliyuncs.com/google_containers/kindnetd", + "hub.docker.com/r/kindest/kindnetd": "registry.cn-hangzhou.aliyuncs.com/google_containers/kindnetd", "github.com/kubernetes/k8s.gcr.io/ingress-nginx/controller": "registry.cn-hangzhou.aliyuncs.com/google_containers/nginx-ingress-controller", "gcr.io/cloud-builders/gcs-fetcher": "registry.cn-hangzhou.aliyuncs.com/cloud-builders/gcs-fetcher", "gcr.io/google-samples/freshpod": "registry.cn-hangzhou.aliyuncs.com/google_containers/freshpod", From 0d21debeb8216e8513858e25feea333abc41c0d8 Mon Sep 17 00:00:00 2001 From: Siddhant Date: Thu, 7 Jul 2022 08:26:26 +0530 Subject: [PATCH 262/545] grc.io --- deploy/addons/aliyun_mirror.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/deploy/addons/aliyun_mirror.json b/deploy/addons/aliyun_mirror.json index dcc6cee3ca..bd043b208b 100644 --- a/deploy/addons/aliyun_mirror.json +++ b/deploy/addons/aliyun_mirror.json @@ -29,12 +29,12 @@ "github.com/coredns/coredns": "registry.cn-hangzhou.aliyuncs.com/google_containers/coredns", "hub.docker.com/r/kindest/kindnetd": "registry.cn-hangzhou.aliyuncs.com/google_containers/kindnetd", "github.com/kubernetes/k8s.gcr.io/ingress-nginx/controller": "registry.cn-hangzhou.aliyuncs.com/google_containers/nginx-ingress-controller", - "gcr.io/cloud-builders/gcs-fetcher": "registry.cn-hangzhou.aliyuncs.com/cloud-builders/gcs-fetcher", - "gcr.io/google-samples/freshpod": "registry.cn-hangzhou.aliyuncs.com/google_containers/freshpod", - "gcr.io/k8s-minikube/gvisor-addon": "registry.cn-hangzhou.aliyuncs.com/google_containers/gvisor-addon", - "gcr.io/k8s-minikube/kicbase": "registry.cn-hangzhou.aliyuncs.com/google_containers/kicbase", - "gcr.io/k8s-minikube/storage-provisioner": "registry.cn-hangzhou.aliyuncs.com/google_containers/storage-provisioner", - "gcr.io/kubernetes-helm/tiller": "registry.cn-hangzhou.aliyuncs.com/google_containers/tiller", + "console.cloud.google.com/gcr.io/cloud-builders/gcs-fetcher": "registry.cn-hangzhou.aliyuncs.com/cloud-builders/gcs-fetcher", + "console.cloud.google.com/gcr.io/google-samples/freshpod": "registry.cn-hangzhou.aliyuncs.com/google_containers/freshpod", + "console.cloud.google.com/gcr.io/k8s-minikube/gvisor-addon": "registry.cn-hangzhou.aliyuncs.com/google_containers/gvisor-addon", + "console.cloud.google.com/gcr.io/k8s-minikube/kicbase": "registry.cn-hangzhou.aliyuncs.com/google_containers/kicbase", + "console.cloud.google.com/gcr.io/k8s-minikube/storage-provisioner": "registry.cn-hangzhou.aliyuncs.com/google_containers/storage-provisioner", + "console.cloud.google.com/gcr.io/kubernetes-helm/tiller": "registry.cn-hangzhou.aliyuncs.com/google_containers/tiller", "github.com/kubernetes/k8s.gcr.io/addon-resizer": "registry.cn-hangzhou.aliyuncs.com/google_containers/addon-resizer", "github.com/kubernetes/k8s.gcr.io/busybox": "registry.cn-hangzhou.aliyuncs.com/google_containers/busybox", "github.com/kubernetes/k8s.gcr.io/cluster-autoscaler": "registry.cn-hangzhou.aliyuncs.com/google_containers/cluster-autoscaler", @@ -95,8 +95,8 @@ "quay.io/prometheus/alertmanager": "registry.cn-hangzhou.aliyuncs.com/google_containers/alertmanager", "quay.io/prometheus/prometheus": "registry.cn-hangzhou.aliyuncs.com/google_containers/prometheus", "github.com/kubernetes/k8s.gcr.io/ingress-nginx/kube-webhook-certgen": "registry.cn-hangzhou.aliyuncs.com/google_containers/kube-webhook-certgen", - "gcr.io/k8s-minikube/minikube-ingress-dns": "registry.cn-hangzhou.aliyuncs.com/google_containers/minikube-ingress-dns", - "gcr.io/google_containers/pause": "registry.cn-hangzhou.aliyuncs.com/google_containers/pause", + "console.cloud.google.com/gcr.io/k8s-minikube/minikube-ingress-dns": "registry.cn-hangzhou.aliyuncs.com/google_containers/minikube-ingress-dns", + "console.cloud.google.com/gcr.io/google_containers/pause": "registry.cn-hangzhou.aliyuncs.com/google_containers/pause", "github.com/kubernetes/k8s.gcr.io/metrics-server/metrics-server": "registry.cn-hangzhou.aliyuncs.com/google_containers/metrics-server", - "gcr.io/google_containers/kube-registry-proxy": "registry.cn-hangzhou.aliyuncs.com/google_containers/kube-registry-proxy" + "console.cloud.google.com/gcr.io/google_containers/kube-registry-proxy": "registry.cn-hangzhou.aliyuncs.com/google_containers/kube-registry-proxy" } From 8858959ce3701c68a5469902e7c61c8121f14be2 Mon Sep 17 00:00:00 2001 From: Siddhant Date: Thu, 7 Jul 2022 09:32:34 +0530 Subject: [PATCH 263/545] added docker.io to images. --- deploy/addons/aliyun_mirror.json | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/deploy/addons/aliyun_mirror.json b/deploy/addons/aliyun_mirror.json index 6d9ace5283..0c8c838cc7 100644 --- a/deploy/addons/aliyun_mirror.json +++ b/deploy/addons/aliyun_mirror.json @@ -1,17 +1,17 @@ { - "kubernetesui/dashboard": "registry.cn-hangzhou.aliyuncs.com/google_containers/dashboard", - "kubernetesui/metrics-scraper": "registry.cn-hangzhou.aliyuncs.com/google_containers/metrics-scraper", + "docker.io/kubernetesui/dashboard": "registry.cn-hangzhou.aliyuncs.com/google_containers/dashboard", + "docker.io/kubernetesui/metrics-scraper": "registry.cn-hangzhou.aliyuncs.com/google_containers/metrics-scraper", "gcr.io/k8s-minikube/auto-pause-hook": "registry.cn-hangzhou.aliyuncs.com/google_containers/auto-pause-hook", "quay.io/operator-framework/olm": "registry.cn-hangzhou.aliyuncs.com/google_containers/olm", "quay.io/operator-framework/upstream-community-operators": "registry.cn-hangzhou.aliyuncs.com/google_containers/upstream-community-operators", "k8s.gcr.io/kube-registry-proxy": "registry.cn-hangzhou.aliyuncs.com/google_containers/kube-registry-proxy", - "upmcenterprises/registry-creds": "registry.cn-hangzhou.aliyuncs.com/google_containers/registry-creds", + "docker.io/upmcenterprises/registry-creds": "registry.cn-hangzhou.aliyuncs.com/google_containers/registry-creds", "quay.io/rhdevelopers/core-dns-patcher": "registry.cn-hangzhou.aliyuncs.com/google_containers/core-dns-patcher", - "nvidia/k8s-device-plugin": "registry.cn-hangzhou.aliyuncs.com/google_containers/k8s-device-plugin", - "ivans3/minikube-log-viewer": "registry.cn-hangzhou.aliyuncs.com/google_containers/minikube-log-viewer", - "cryptexlabs/minikube-ingress-dns": "registry.cn-hangzhou.aliyuncs.com/google_containers/minikube-ingress-dns", + "docker.io/nvidia/k8s-device-plugin": "registry.cn-hangzhou.aliyuncs.com/google_containers/k8s-device-plugin", + "docker.io/ivans3/minikube-log-viewer": "registry.cn-hangzhou.aliyuncs.com/google_containers/minikube-log-viewer", + "docker.io/cryptexlabs/minikube-ingress-dns": "registry.cn-hangzhou.aliyuncs.com/google_containers/minikube-ingress-dns", "quay.io/datawire/ambassador-operator": "registry.cn-hangzhou.aliyuncs.com/google_containers/ambassador-operator", - "jettech/kube-webhook-certgen": "registry.cn-hangzhou.aliyuncs.com/google_containers/kube-webhook-certgen", + "docker.io/jettech/kube-webhook-certgen": "registry.cn-hangzhou.aliyuncs.com/google_containers/kube-webhook-certgen", "gcr.io/k8s-minikube/gcp-auth-webhook": "registry.cn-hangzhou.aliyuncs.com/google_containers/gcp-auth-webhook", "k8s.gcr.io/sig-storage/snapshot-controller": "registry.cn-hangzhou.aliyuncs.com/google_containers/snapshot-controller", "k8s.gcr.io/sig-storage/csi-attacher": "registry.cn-hangzhou.aliyuncs.com/google_containers/csi-attacher", @@ -23,11 +23,11 @@ "k8s.gcr.io/sig-storage/csi-resizer": "registry.cn-hangzhou.aliyuncs.com/google_containers/csi-resizer", "k8s.gcr.io/sig-storage/csi-snapshotter": "registry.cn-hangzhou.aliyuncs.com/google_containers/csi-snapshotter", "k8s.gcr.io/sig-storage/csi-provisioner": "registry.cn-hangzhou.aliyuncs.com/google_containers/csi-provisioner", - "registry": "registry.cn-hangzhou.aliyuncs.com/google_containers/registry", + "docker.io/registry": "registry.cn-hangzhou.aliyuncs.com/google_containers/registry", "docker.io/gluster/gluster-centos": "registry.cn-hangzhou.aliyuncs.com/google_containers/glusterfs-server", - "heketi/heketi": "registry.cn-hangzhou.aliyuncs.com/google_containers/heketi", - "coredns/coredns": "registry.cn-hangzhou.aliyuncs.com/google_containers/coredns", - "kindest/kindnetd": "registry.cn-hangzhou.aliyuncs.com/google_containers/kindnetd", + "docker.io/heketi/heketi": "registry.cn-hangzhou.aliyuncs.com/google_containers/heketi", + "docker.io/coredns/coredns": "registry.cn-hangzhou.aliyuncs.com/google_containers/coredns", + "docker.io/kindest/kindnetd": "registry.cn-hangzhou.aliyuncs.com/google_containers/kindnetd", "k8s.gcr.io/ingress-nginx/controller": "registry.cn-hangzhou.aliyuncs.com/google_containers/nginx-ingress-controller", "gcr.io/cloud-builders/gcs-fetcher": "registry.cn-hangzhou.aliyuncs.com/cloud-builders/gcs-fetcher", "gcr.io/google-samples/freshpod": "registry.cn-hangzhou.aliyuncs.com/google_containers/freshpod", From 2a43f3347a0933df9424b475c66707ad7bc910ea Mon Sep 17 00:00:00 2001 From: inifares23lab Date: Thu, 7 Jul 2022 15:22:43 +0200 Subject: [PATCH 264/545] update maintainer field for addons --- pkg/minikube/assets/addons.go | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkg/minikube/assets/addons.go b/pkg/minikube/assets/addons.go index e2e3b2068b..564ea3b4fc 100755 --- a/pkg/minikube/assets/addons.go +++ b/pkg/minikube/assets/addons.go @@ -137,7 +137,7 @@ var Addons = map[string]*Addon{ MustBinAsset(addons.DashboardAssets, "dashboard/dashboard-sa.yaml", vmpath.GuestAddonsDir, "dashboard-sa.yaml", "0640"), MustBinAsset(addons.DashboardAssets, "dashboard/dashboard-secret.yaml", vmpath.GuestAddonsDir, "dashboard-secret.yaml", "0640"), MustBinAsset(addons.DashboardAssets, "dashboard/dashboard-svc.yaml", vmpath.GuestAddonsDir, "dashboard-svc.yaml", "0640"), - }, false, "dashboard", "", "Kubernetes", "https://minikube.sigs.k8s.io/docs/handbook/dashboard/", map[string]string{ + }, false, "dashboard", "Kubernetes", "", "https://minikube.sigs.k8s.io/docs/handbook/dashboard/", map[string]string{ "Dashboard": "kubernetesui/dashboard:v2.6.0@sha256:4af9580485920635d888efe1eddbd67e12f9d5d84dba87100e93feb4e46636b3", "MetricsScraper": "kubernetesui/metrics-scraper:v1.0.8@sha256:76049887f07a0476dc93efc2d3569b9529bf982b22d29f356092ce206e98765c", }, nil), @@ -147,14 +147,14 @@ var Addons = map[string]*Addon{ vmpath.GuestAddonsDir, "storageclass.yaml", "0640"), - }, true, "default-storageclass", "", "Kubernetes", "https://minikube.sigs.k8s.io/docs/handbook/persistent_volumes/", nil, nil), + }, true, "default-storageclass", "Kubernetes", "", "https://minikube.sigs.k8s.io/docs/handbook/persistent_volumes/", nil, nil), "pod-security-policy": NewAddon([]*BinAsset{ MustBinAsset(addons.PodSecurityPolicyAssets, "pod-security-policy/pod-security-policy.yaml.tmpl", vmpath.GuestAddonsDir, "pod-security-policy.yaml", "0640"), - }, false, "pod-security-policy", "", "", "", nil, nil), + }, false, "pod-security-policy", "3rd party (pod-security-policy)", "", "", nil, nil), "storage-provisioner": NewAddon([]*BinAsset{ MustBinAsset(addons.StorageProvisionerAssets, "storage-provisioner/storage-provisioner.yaml.tmpl", @@ -187,7 +187,7 @@ var Addons = map[string]*Addon{ vmpath.GuestAddonsDir, "storage-provisioner-glusterfile.yaml", "0640"), - }, false, "storage-provisioner-gluster", "", "", "", map[string]string{ + }, false, "storage-provisioner-gluster", "3rd party (Gluster)", "", "", map[string]string{ "Heketi": "heketi/heketi:10@sha256:76d5a6a3b7cf083d1e99efa1c15abedbc5c8b73bef3ade299ce9a4c16c9660f8", "GlusterfileProvisioner": "gluster/glusterfile-provisioner:latest@sha256:9961a35cb3f06701958e202324141c30024b195579e5eb1704599659ddea5223", "GlusterfsServer": "nixpanic/glusterfs-server:pr_fake-disk@sha256:3c58ae9d4e2007758954879d3f4095533831eb757c64ca6a0e32d1fc53fb6034", @@ -241,7 +241,7 @@ var Addons = map[string]*Addon{ vmpath.GuestAddonsDir, "ingress-deploy.yaml", "0640"), - }, false, "ingress", "", "", "https://kubernetes.io/docs/tasks/access-application-cluster/ingress-minikube/", map[string]string{ + }, false, "ingress", "3rd party (Ingress)", "", "https://kubernetes.io/docs/tasks/access-application-cluster/ingress-minikube/", map[string]string{ // https://github.com/kubernetes/ingress-nginx/blob/c32f9a43279425920c41ba2e54dfcb1a54c0daf7/deploy/static/provider/kind/deploy.yaml#L834 "IngressController": "ingress-nginx/controller:v1.2.1@sha256:5516d103a9c2ecc4f026efbd4b40662ce22dc1f824fb129ed121460aaa5c47f8", // https://github.com/kubernetes/ingress-nginx/blob/fc38b9f2aa2d68ee00c417cf97e727b77a00c175/deploy/static/provider/kind/deploy.yaml#L621 @@ -388,7 +388,7 @@ var Addons = map[string]*Addon{ vmpath.GuestAddonsDir, "patch-coredns-job.yaml", "0640"), - }, false, "registry-aliases", "", "", "", map[string]string{ + }, false, "registry-aliases", "3rd party (registry-aliases)", "", "", map[string]string{ "CoreDNSPatcher": "rhdevelopers/core-dns-patcher@sha256:9220ff32f690c3d889a52afb59ca6fcbbdbd99e5370550cc6fd249adea8ed0a9", "Alpine": "alpine:3.11@sha256:0bd0e9e03a022c3b0226667621da84fc9bf562a9056130424b5bfbd8bcb0397f", "Pause": "google_containers/pause:3.1@sha256:f78411e19d84a252e53bff71a4407a5686c46983a2c2eeed83929b888179acea", @@ -442,7 +442,7 @@ var Addons = map[string]*Addon{ vmpath.GuestAddonsDir, "logviewer-rbac.yaml", "0640"), - }, false, "logviewer", "", "", "", map[string]string{ + }, false, "logviewer", "3rd party (ivans3)", "", "", map[string]string{ "LogViewer": "ivans3/minikube-log-viewer:latest@sha256:75854f45305cc47d17b04c6c588fa60777391761f951e3a34161ddf1f1b06405", }, nil), "gvisor": NewAddon([]*BinAsset{ @@ -689,7 +689,7 @@ var Addons = map[string]*Addon{ vmpath.GuestAddonsDir, "portainer.yaml", "0640"), - }, false, "portainer", "Portainer.io", "", "", map[string]string{ + }, false, "portainer", "3rd party (Portainer.io)", "", "", map[string]string{ "Portainer": "portainer/portainer-ce:latest@sha256:4f126c5114b63e9d1bceb4b368944d14323329a9a0d4e7bb7eb53c9b7435d498", }, nil), "inaccel": NewAddon([]*BinAsset{ @@ -698,7 +698,7 @@ var Addons = map[string]*Addon{ vmpath.GuestAddonsDir, "fpga-operator.yaml", "0640"), - }, false, "inaccel", "InAccel ", "", "", map[string]string{ + }, false, "inaccel", "3rd party (InAccel [info@inaccel.com])", "", "", map[string]string{ "Helm3": "alpine/helm:3.9.0@sha256:9f4bf4d24241f983910550b1fe8688571cd684046500abe58cef14308f9cb19e", }, map[string]string{ "Helm3": "docker.io", @@ -709,7 +709,7 @@ var Addons = map[string]*Addon{ MustBinAsset(addons.HeadlampAssets, "headlamp/headlamp-deployment.yaml.tmpl", vmpath.GuestAddonsDir, "headlamp-deployment.yaml", "6040"), MustBinAsset(addons.HeadlampAssets, "headlamp/headlamp-serviceaccount.yaml", vmpath.GuestAddonsDir, "headlamp-serviceaccount.yaml", "6040"), MustBinAsset(addons.HeadlampAssets, "headlamp/headlamp-clusterrolebinding.yaml", vmpath.GuestAddonsDir, "headlamp-clusterrolebinding.yaml", "6040"), - }, false, "headlamp", "kinvolk.io", "", "https://minikube.sigs.k8s.io/docs/handbook/addons/headlamp/", + }, false, "headlamp", "3rd party (kinvolk.io)", "", "https://minikube.sigs.k8s.io/docs/handbook/addons/headlamp/", map[string]string{ "Headlamp": "kinvolk/headlamp:v0.9.0@sha256:465aaee6518f3fdd032965eccd6a8f49e924d144b1c86115bad613872672ec02", }, From e0b089847da26ae653a2f6bf826dec0d8bf3aa5b Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Fri, 8 Jul 2022 11:57:05 -0700 Subject: [PATCH 265/545] add QEMU tests --- hack/jenkins/linux_integration_tests_kvm.sh | 1 - hack/jenkins/linux_integration_tests_none.sh | 1 - .../linux_integration_tests_virtualbox.sh | 1 - hack/jenkins/minikube_set_pending.sh | 6 +--- hack/jenkins/osx_integration_tests_docker.sh | 1 - .../jenkins/osx_integration_tests_hyperkit.sh | 1 - hack/jenkins/osx_integration_tests_qemu.sh | 36 +++++++++++++++++++ .../osx_integration_tests_virtualbox.sh | 3 -- .../jenkins/test-flake-chart/report_flakes.sh | 4 +-- .../content/en/docs/contrib/test_flakes.en.md | 5 +-- 10 files changed, 42 insertions(+), 17 deletions(-) create mode 100755 hack/jenkins/osx_integration_tests_qemu.sh diff --git a/hack/jenkins/linux_integration_tests_kvm.sh b/hack/jenkins/linux_integration_tests_kvm.sh index ac120ca52c..86cd7cfbb1 100755 --- a/hack/jenkins/linux_integration_tests_kvm.sh +++ b/hack/jenkins/linux_integration_tests_kvm.sh @@ -29,7 +29,6 @@ OS="linux" ARCH="amd64" DRIVER="kvm2" JOB_NAME="KVM_Linux" -EXPECTED_DEFAULT_DRIVER="kvm2" # We pick kvm as our gvisor testbed because it is fast & reliable EXTRA_TEST_ARGS="-gvisor" diff --git a/hack/jenkins/linux_integration_tests_none.sh b/hack/jenkins/linux_integration_tests_none.sh index 1637929b57..fbcaedc1bc 100755 --- a/hack/jenkins/linux_integration_tests_none.sh +++ b/hack/jenkins/linux_integration_tests_none.sh @@ -30,7 +30,6 @@ ARCH="amd64" DRIVER="none" JOB_NAME="none_Linux" EXTRA_START_ARGS="--bootstrapper=kubeadm" -EXPECTED_DEFAULT_DRIVER="kvm2" SUDO_PREFIX="sudo -E " export KUBECONFIG="/root/.kube/config" diff --git a/hack/jenkins/linux_integration_tests_virtualbox.sh b/hack/jenkins/linux_integration_tests_virtualbox.sh index 7bd5e0205f..489c161667 100755 --- a/hack/jenkins/linux_integration_tests_virtualbox.sh +++ b/hack/jenkins/linux_integration_tests_virtualbox.sh @@ -30,6 +30,5 @@ ARCH="amd64" DRIVER="virtualbox" JOB_NAME="VirtualBox_Linux" EXTRA_TEST_ARGS="" -EXPECTED_DEFAULT_DRIVER="kvm2" source ./common.sh 2h diff --git a/hack/jenkins/minikube_set_pending.sh b/hack/jenkins/minikube_set_pending.sh index cd35c0959f..dd38c91a30 100755 --- a/hack/jenkins/minikube_set_pending.sh +++ b/hack/jenkins/minikube_set_pending.sh @@ -29,10 +29,6 @@ set -eux -o pipefail jobs=( 'Hyperkit_macOS' 'Hyper-V_Windows' - # 'VirtualBox_Linux' - # 'VirtualBox_macOS' - # 'VirtualBox_Windows' - # 'KVM-GPU_Linux' - Disabled 'KVM_Linux' 'KVM_Linux_containerd' 'KVM_Linux_crio' @@ -45,8 +41,8 @@ jobs=( 'Docker_Linux_crio' 'Docker_macOS' 'Docker_Windows' - # 'Podman_Linux' 'Docker_Cloud_Shell' + 'QEMU_macOS' ) STARTED_LIST_REMOTE="gs://minikube-builds/logs/${ghprbPullId}/${BUILD_NUMBER}/started_environments.txt" diff --git a/hack/jenkins/osx_integration_tests_docker.sh b/hack/jenkins/osx_integration_tests_docker.sh index ff987a96b8..dac107abb4 100755 --- a/hack/jenkins/osx_integration_tests_docker.sh +++ b/hack/jenkins/osx_integration_tests_docker.sh @@ -31,7 +31,6 @@ OS="darwin" DRIVER="docker" JOB_NAME="Docker_macOS" EXTRA_TEST_ARGS="" -EXPECTED_DEFAULT_DRIVER="docker" EXTERNAL="yes" begin=$(date +%s) diff --git a/hack/jenkins/osx_integration_tests_hyperkit.sh b/hack/jenkins/osx_integration_tests_hyperkit.sh index a8efe9ba0d..c76fc851f3 100755 --- a/hack/jenkins/osx_integration_tests_hyperkit.sh +++ b/hack/jenkins/osx_integration_tests_hyperkit.sh @@ -31,7 +31,6 @@ OS="darwin" DRIVER="hyperkit" JOB_NAME="Hyperkit_macOS" EXTRA_TEST_ARGS="" -EXPECTED_DEFAULT_DRIVER="hyperkit" EXTERNAL="yes" source common.sh diff --git a/hack/jenkins/osx_integration_tests_qemu.sh b/hack/jenkins/osx_integration_tests_qemu.sh new file mode 100755 index 0000000000..c8571c5dc4 --- /dev/null +++ b/hack/jenkins/osx_integration_tests_qemu.sh @@ -0,0 +1,36 @@ +#!/bin/bash + +# Copyright 2022 The Kubernetes Authors All rights reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + + +# This script runs the integration tests on an OSX machine for the Hyperkit Driver + +# The script expects the following env variables: +# MINIKUBE_LOCATION: GIT_COMMIT from upstream build. +# COMMIT: Actual commit ID from upstream build +# EXTRA_BUILD_ARGS (optional): Extra args to be passed into the minikube integrations tests +# access_token: The GitHub API access token. Injected by the Jenkins credential provider. + + +set -ex + +ARCH="arm64" +OS="darwin" +DRIVER="qemu2" +JOB_NAME="QEMU_macOS" +EXTRA_TEST_ARGS="" +EXTERNAL="yes" + +source common.sh diff --git a/hack/jenkins/osx_integration_tests_virtualbox.sh b/hack/jenkins/osx_integration_tests_virtualbox.sh index d20e90a41b..bd1fba191e 100755 --- a/hack/jenkins/osx_integration_tests_virtualbox.sh +++ b/hack/jenkins/osx_integration_tests_virtualbox.sh @@ -29,8 +29,5 @@ ARCH="amd64" DRIVER="virtualbox" JOB_NAME="VirtualBox_macOS" EXTRA_START_ARGS="--bootstrapper=kubeadm" -# hyperkit behaves better, so it has higher precedence. -# Assumes that hyperkit is also installed on the VirtualBox CI host. -EXPECTED_DEFAULT_DRIVER="hyperkit" source common.sh diff --git a/hack/jenkins/test-flake-chart/report_flakes.sh b/hack/jenkins/test-flake-chart/report_flakes.sh index b5d7a052f2..ec2f91e1e2 100755 --- a/hack/jenkins/test-flake-chart/report_flakes.sh +++ b/hack/jenkins/test-flake-chart/report_flakes.sh @@ -85,9 +85,9 @@ awk -F, 'NR>1 { | sort -g -t, -k2,2 \ >> "$TMP_FAILED_RATES" -# Filter out arm64 and crio tests until they're more stable +# Filter out arm64, crio, and QEMU tests until they're more stable TMP_FAILED_RATES_FILTERED=$(mktemp) -grep -v "arm64\|crio" "$TMP_FAILED_RATES" > "$TMP_FAILED_RATES_FILTERED" +grep -v "arm64\|crio\|QEMU" "$TMP_FAILED_RATES" > "$TMP_FAILED_RATES_FILTERED" FAILED_RATES_LINES=$(wc -l < "$TMP_FAILED_RATES_FILTERED") if [[ "$FAILED_RATES_LINES" -eq 0 ]]; then diff --git a/site/content/en/docs/contrib/test_flakes.en.md b/site/content/en/docs/contrib/test_flakes.en.md index 8315ed8bb0..d3183db4da 100644 --- a/site/content/en/docs/contrib/test_flakes.en.md +++ b/site/content/en/docs/contrib/test_flakes.en.md @@ -17,8 +17,9 @@ description: > |Linux|kvm2|crio|[KVM_Linux_crio](https://storage.googleapis.com/minikube-flake-rate/flake_chart.html?env=KVM_Linux_crio&period=last90)| |Linux|virtualbox|docker|[VirtualBox_Linux](https://storage.googleapis.com/minikube-flake-rate/flake_chart.html?env=VirtualBox_Linux&period=last90)| |Linux|none|docker|[none_Linux](https://storage.googleapis.com/minikube-flake-rate/flake_chart.html?env=none_Linux&period=last90)| -|MacOS|docker|docker|[Docker_macOS](https://storage.googleapis.com/minikube-flake-rate/flake_chart.html?env=Docker_macOS&period=last90)| -|MacOS|hyperkit|docker|[Hyperkit_macOS](https://storage.googleapis.com/minikube-flake-rate/flake_chart.html?env=Hyperkit_macOS&period=last90)| +|macOS|docker|docker|[Docker_macOS](https://storage.googleapis.com/minikube-flake-rate/flake_chart.html?env=Docker_macOS&period=last90)| +|macOS|hyperkit|docker|[Hyperkit_macOS](https://storage.googleapis.com/minikube-flake-rate/flake_chart.html?env=Hyperkit_macOS&period=last90)| +|macOS|qemu2|docker|[QEMU_macOS](https://storage.googleapis.com/minikube-flake-rate/flake_chart.html?env=QEMU_macOS&period=last90)| |Windows|docker|docker|[Docker_Windows](https://storage.googleapis.com/minikube-flake-rate/flake_chart.html?env=Docker_Windows&period=last90)| |Windows|hyperv|docker|[Hyper-V_Windows](https://storage.googleapis.com/minikube-flake-rate/flake_chart.html?env=Hyper-V_Windows&period=last90)| |Cloud Shell|docker|docker|[Docker_Cloud_Shell](https://storage.googleapis.com/minikube-flake-rate/flake_chart.html?env=Docker_Cloud_Shell&period=last90)| From d3f65501a575d0da07596f11a472e2f76c8121f1 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Fri, 8 Jul 2022 13:18:38 -0700 Subject: [PATCH 266/545] update Docker from 20.10.16 to 20.10.17 --- .../package/containerd-bin-aarch64/containerd-bin.hash | 1 + .../aarch64/package/containerd-bin-aarch64/containerd-bin.mk | 4 ++-- .../arch/aarch64/package/docker-bin-aarch64/docker-bin.hash | 1 + .../arch/aarch64/package/docker-bin-aarch64/docker-bin.mk | 2 +- .../arch/x86_64/package/containerd-bin/containerd-bin.hash | 1 + .../arch/x86_64/package/containerd-bin/containerd-bin.mk | 4 ++-- .../arch/x86_64/package/docker-bin/docker-bin.hash | 1 + .../minikube-iso/arch/x86_64/package/docker-bin/docker-bin.mk | 2 +- deploy/iso/minikube-iso/package/runc-master/runc-master.hash | 1 + deploy/iso/minikube-iso/package/runc-master/runc-master.mk | 4 ++-- deploy/kicbase/Dockerfile | 2 +- 11 files changed, 14 insertions(+), 9 deletions(-) diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd-bin.hash b/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd-bin.hash index cf10f80480..2e62fe3485 100644 --- a/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd-bin.hash +++ b/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd-bin.hash @@ -15,3 +15,4 @@ sha256 85a531725f15e2d136131119d42af4507a5389e0947015152075c4c93816fb5c v1.4.12. sha256 7507913ba169c103ab67bc51bec31cd977d4348d7bc842da32b7eab5f930a14b v1.5.10.tar.gz sha256 02b79d5e2b07b5e64cd28f1fe84395ee11eef95fc49fd923a9ab93022b148be6 v1.5.11.tar.gz sha256 f422e21e35705d1e741c1f3280813e43f811eaff4dcc5cdafac8b8952b15f468 v1.6.4.tar.gz +sha265 27afb673c20d53aa5c31aec07b38eb7e4dc911e7e1f0c76fac9513bbf070bd24 v1.6.6.tar.gz diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd-bin.mk b/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd-bin.mk index 5bc21069cd..c92faee4ed 100644 --- a/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd-bin.mk +++ b/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd-bin.mk @@ -3,8 +3,8 @@ # containerd # ################################################################################ -CONTAINERD_BIN_AARCH64_VERSION = v1.6.4 -CONTAINERD_BIN_AARCH64_COMMIT = 212e8b6fa2f44b9c21b2798135fc6fb7c53efc16 +CONTAINERD_BIN_AARCH64_VERSION = v1.6.6 +CONTAINERD_BIN_AARCH64_COMMIT = 10c12954828e7c7c9b6e0ea9b0c02b01407d3ae1 CONTAINERD_BIN_AARCH64_SITE = https://github.com/containerd/containerd/archive CONTAINERD_BIN_AARCH64_SOURCE = $(CONTAINERD_BIN_AARCH64_VERSION).tar.gz CONTAINERD_BIN_AARCH64_DEPENDENCIES = host-go libgpgme diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/docker-bin.hash b/deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/docker-bin.hash index f0bc48bec2..d80c91ae08 100644 --- a/deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/docker-bin.hash +++ b/deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/docker-bin.hash @@ -1,3 +1,4 @@ sha256 ea971edc1179088bfd25edd04a0c12848143d15cb8202ebb93a6a08973464fd0 docker-20.10.14.tgz sha256 46102273fab8d6b8a7cf248a928ebaa4bee43114001c593b0d07092a34a439e1 docker-20.10.15.tgz sha256 2f35d8d422b63a59279084c159c9092b63b6d974a7fcd868167aee4cc5f79f3b docker-20.10.16.tgz +sha256 969210917b5548621a2b541caf00f86cc6963c6cf0fb13265b9731c3b98974d9 docker-20.10.17.tgz diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/docker-bin.mk b/deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/docker-bin.mk index 899fc5a49b..e100d80120 100644 --- a/deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/docker-bin.mk +++ b/deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/docker-bin.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_BIN_AARCH64_VERSION = 20.10.16 +DOCKER_BIN_AARCH64_VERSION = 20.10.17 DOCKER_BIN_AARCH64_SITE = https://download.docker.com/linux/static/stable/aarch64 DOCKER_BIN_AARCH64_SOURCE = docker-$(DOCKER_BIN_AARCH64_VERSION).tgz diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/containerd-bin.hash b/deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/containerd-bin.hash index cf10f80480..afe1cb7af2 100644 --- a/deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/containerd-bin.hash +++ b/deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/containerd-bin.hash @@ -15,3 +15,4 @@ sha256 85a531725f15e2d136131119d42af4507a5389e0947015152075c4c93816fb5c v1.4.12. sha256 7507913ba169c103ab67bc51bec31cd977d4348d7bc842da32b7eab5f930a14b v1.5.10.tar.gz sha256 02b79d5e2b07b5e64cd28f1fe84395ee11eef95fc49fd923a9ab93022b148be6 v1.5.11.tar.gz sha256 f422e21e35705d1e741c1f3280813e43f811eaff4dcc5cdafac8b8952b15f468 v1.6.4.tar.gz +sha256 27afb673c20d53aa5c31aec07b38eb7e4dc911e7e1f0c76fac9513bbf070bd24 v1.6.6.tar.gz diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/containerd-bin.mk b/deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/containerd-bin.mk index 8cb5501d2a..f07d8d0009 100644 --- a/deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/containerd-bin.mk +++ b/deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/containerd-bin.mk @@ -3,8 +3,8 @@ # containerd # ################################################################################ -CONTAINERD_BIN_VERSION = v1.6.4 -CONTAINERD_BIN_COMMIT = 212e8b6fa2f44b9c21b2798135fc6fb7c53efc16 +CONTAINERD_BIN_VERSION = v1.6.6 +CONTAINERD_BIN_COMMIT = 10c12954828e7c7c9b6e0ea9b0c02b01407d3ae1 CONTAINERD_BIN_SITE = https://github.com/containerd/containerd/archive CONTAINERD_BIN_SOURCE = $(CONTAINERD_BIN_VERSION).tar.gz CONTAINERD_BIN_DEPENDENCIES = host-go libgpgme diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/docker-bin/docker-bin.hash b/deploy/iso/minikube-iso/arch/x86_64/package/docker-bin/docker-bin.hash index daeaddd23b..c493eb2d3e 100644 --- a/deploy/iso/minikube-iso/arch/x86_64/package/docker-bin/docker-bin.hash +++ b/deploy/iso/minikube-iso/arch/x86_64/package/docker-bin/docker-bin.hash @@ -37,3 +37,4 @@ sha256 39edf7c8d773939ff5e4d318ae565691a9c7e754ed768e172757e58898fb7079 docker- sha256 7ca4aeeed86619909ae584ce3405da3766d495f98904ffbd9d859add26b83af5 docker-20.10.14.tgz sha256 9ccfc39305ae1d8882d18c9c431544fca82913d6df717409ac2244ac58c4f070 docker-20.10.15.tgz sha256 b43ac6c4d2f0b64e445c6564860e4fccd6331f4a61815a60642c7748b53c59ff docker-20.10.16.tgz +sha256 969210917b5548621a2b541caf00f86cc6963c6cf0fb13265b9731c3b98974d9 docker-20.10.17.tgz diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/docker-bin/docker-bin.mk b/deploy/iso/minikube-iso/arch/x86_64/package/docker-bin/docker-bin.mk index 997b5e41f8..070e5bc971 100644 --- a/deploy/iso/minikube-iso/arch/x86_64/package/docker-bin/docker-bin.mk +++ b/deploy/iso/minikube-iso/arch/x86_64/package/docker-bin/docker-bin.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_BIN_VERSION = 20.10.16 +DOCKER_BIN_VERSION = 20.10.17 DOCKER_BIN_SITE = https://download.docker.com/linux/static/stable/x86_64 DOCKER_BIN_SOURCE = docker-$(DOCKER_BIN_VERSION).tgz diff --git a/deploy/iso/minikube-iso/package/runc-master/runc-master.hash b/deploy/iso/minikube-iso/package/runc-master/runc-master.hash index fe79ecbc65..24aaf72b9c 100644 --- a/deploy/iso/minikube-iso/package/runc-master/runc-master.hash +++ b/deploy/iso/minikube-iso/package/runc-master/runc-master.hash @@ -14,3 +14,4 @@ sha256 50cc479cabf6e7edb9070a7c28b3460b0acc2a01650fc5934f5037cb96b9e2cf 4144b638 sha256 1f47e3ff66cdcca1f890b15e74e884c4ff81d16d1044cc9900a1eb10cfb3d8e7 52b36a2dd837e8462de8e01458bf02cf9eea47dd.tar.gz sha256 91525356b71fbf8e05deddc955d3f40e0d4aedcb15d26bdd2850a9986852ae5b f46b6ba2c9314cfc8caae24a32ec5fe9ef1059fe.tar.gz sha256 49fbb25fda9fc416ec79a23e5382d504a8972a88247fe074f63ab71b6f38a0a0 52de29d7e0f8c0899bd7efb8810dd07f0073fa87.tar.gz +sha256 0ccce82b1d9c058d8fd7443d261c96fd7a803f2775bcb1fec2bdb725bc7640f6 a916309fff0f838eb94e928713dbc3c0d0ac7aa4.tar.gz diff --git a/deploy/iso/minikube-iso/package/runc-master/runc-master.mk b/deploy/iso/minikube-iso/package/runc-master/runc-master.mk index 75ecfa9192..76e71abc63 100644 --- a/deploy/iso/minikube-iso/package/runc-master/runc-master.mk +++ b/deploy/iso/minikube-iso/package/runc-master/runc-master.mk @@ -4,8 +4,8 @@ # ################################################################################ -# As of 2022-03-28, v1.1.1 -RUNC_MASTER_VERSION = 52de29d7e0f8c0899bd7efb8810dd07f0073fa87 +# As of 2022-05-11, v1.1.2 +RUNC_MASTER_VERSION = a916309fff0f838eb94e928713dbc3c0d0ac7aa4 RUNC_MASTER_SITE = https://github.com/opencontainers/runc/archive RUNC_MASTER_SOURCE = $(RUNC_MASTER_VERSION).tar.gz RUNC_MASTER_LICENSE = Apache-2.0 diff --git a/deploy/kicbase/Dockerfile b/deploy/kicbase/Dockerfile index 9384b88842..d3fe55d701 100644 --- a/deploy/kicbase/Dockerfile +++ b/deploy/kicbase/Dockerfile @@ -177,7 +177,7 @@ RUN export ARCH=$(dpkg --print-architecture | sed 's/ppc64el/ppc64le/') && \ clean-install containers-common conmon containernetworking-plugins crun; \ fi -# install cri-o based on https://github.com/cri-o/cri-o/blob/release-1.22/README.md#installing-cri-o +# install cri-o based on https://github.com/cri-o/cri-o/blob/release-1.24/README.md#installing-cri-o RUN export ARCH=$(dpkg --print-architecture | sed 's/ppc64el/ppc64le/' | sed 's/armhf/arm-v7/') && \ if [ "$ARCH" != "ppc64le" ] && [ "$ARCH" != "arm-v7" ]; then sh -c "echo 'deb https://downloadcontent.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable:/cri-o:/${CRIO_VERSION}/xUbuntu_20.04/ /' > /etc/apt/sources.list.d/devel:kubic:libcontainers:stable:cri-o:${CRIO_VERSION}.list" && \ curl -LO https://downloadcontent.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable:/cri-o:/${CRIO_VERSION}/xUbuntu_20.04/Release.key && \ From 1ba8dd2f04a088081bbc8e0c29578c49065f4df9 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Fri, 8 Jul 2022 16:46:29 -0700 Subject: [PATCH 267/545] add docker-env --- gui/advancedview.cpp | 6 ++++ gui/advancedview.h | 2 ++ gui/basicview.cpp | 7 ++++- gui/basicview.h | 2 ++ gui/operator.cpp | 67 ++++++++++++++++++++++++++++++++++++++------ gui/operator.h | 1 + gui/window.cpp | 2 +- 7 files changed, 77 insertions(+), 10 deletions(-) diff --git a/gui/advancedview.cpp b/gui/advancedview.cpp index 94e1ba78de..38921decfe 100644 --- a/gui/advancedview.cpp +++ b/gui/advancedview.cpp @@ -39,6 +39,7 @@ AdvancedView::AdvancedView(QIcon icon) deleteButton = new QPushButton(tr("Delete")); refreshButton = new QPushButton(tr("Refresh")); createButton = new QPushButton(tr("Create")); + dockerEnvButton = new QPushButton(tr("docker-env")); sshButton = new QPushButton(tr("SSH")); dashboardButton = new QPushButton(tr("Dashboard")); basicButton = new QPushButton(tr("Basic View")); @@ -56,6 +57,7 @@ AdvancedView::AdvancedView(QIcon icon) bottomButtonLayout->addWidget(stopButton); bottomButtonLayout->addWidget(pauseButton); bottomButtonLayout->addWidget(deleteButton); + bottomButtonLayout->addWidget(dockerEnvButton); bottomButtonLayout->addWidget(sshButton); bottomButtonLayout->addWidget(dashboardButton); @@ -78,6 +80,7 @@ AdvancedView::AdvancedView(QIcon icon) connect(deleteButton, &QAbstractButton::clicked, this, &AdvancedView::delete_); connect(refreshButton, &QAbstractButton::clicked, this, &AdvancedView::refresh); connect(createButton, &QAbstractButton::clicked, this, &AdvancedView::askName); + connect(dockerEnvButton, &QAbstractButton::clicked, this, &AdvancedView::dockerEnv); connect(sshButton, &QAbstractButton::clicked, this, &AdvancedView::ssh); connect(dashboardButton, &QAbstractButton::clicked, this, &AdvancedView::dashboard); connect(basicButton, &QAbstractButton::clicked, this, &AdvancedView::basic); @@ -113,8 +116,10 @@ void AdvancedView::update(Cluster cluster) deleteButton->setEnabled(exists); dashboardButton->setEnabled(isRunning); #if __linux__ || __APPLE__ + dockerEnvButton->setEnabled(isRunning); sshButton->setEnabled(exists); #else + dockerEnvButton->setEnabled(false); sshButton->setEnabled(false); #endif pauseButton->setText(getPauseLabel(isPaused)); @@ -273,6 +278,7 @@ void AdvancedView::disableButtons() stopButton->setEnabled(false); pauseButton->setEnabled(false); deleteButton->setEnabled(false); + dockerEnvButton->setEnabled(false); sshButton->setEnabled(false); dashboardButton->setEnabled(false); basicButton->setEnabled(false); diff --git a/gui/advancedview.h b/gui/advancedview.h index 93e4f0167a..f9ebbd723d 100644 --- a/gui/advancedview.h +++ b/gui/advancedview.h @@ -32,6 +32,7 @@ signals: void pause(); void delete_(); void refresh(); + void dockerEnv(); void ssh(); void dashboard(); void basic(); @@ -47,6 +48,7 @@ private: QPushButton *pauseButton; QPushButton *deleteButton; QPushButton *refreshButton; + QPushButton *dockerEnvButton; QPushButton *sshButton; QPushButton *dashboardButton; QPushButton *basicButton; diff --git a/gui/basicview.cpp b/gui/basicview.cpp index f0e4b1ead2..8d19ec9d97 100644 --- a/gui/basicview.cpp +++ b/gui/basicview.cpp @@ -11,6 +11,7 @@ BasicView::BasicView() pauseButton = new QPushButton(tr("Pause")); deleteButton = new QPushButton(tr("Delete")); refreshButton = new QPushButton(tr("Refresh")); + dockerEnvButton = new QPushButton(tr("docker-env")); sshButton = new QPushButton(tr("SSH")); dashboardButton = new QPushButton(tr("Dashboard")); advancedButton = new QPushButton(tr("Advanced View")); @@ -24,6 +25,7 @@ BasicView::BasicView() buttonLayout->addWidget(pauseButton); buttonLayout->addWidget(deleteButton); buttonLayout->addWidget(refreshButton); + buttonLayout->addWidget(dockerEnvButton); buttonLayout->addWidget(sshButton); buttonLayout->addWidget(dashboardButton); buttonLayout->addWidget(advancedButton); @@ -34,6 +36,7 @@ BasicView::BasicView() connect(pauseButton, &QAbstractButton::clicked, this, &BasicView::pause); connect(deleteButton, &QAbstractButton::clicked, this, &BasicView::delete_); connect(refreshButton, &QAbstractButton::clicked, this, &BasicView::refresh); + connect(dockerEnvButton, &QAbstractButton::clicked, this, &BasicView::dockerEnv); connect(sshButton, &QAbstractButton::clicked, this, &BasicView::ssh); connect(dashboardButton, &QAbstractButton::clicked, this, &BasicView::dashboard); connect(advancedButton, &QAbstractButton::clicked, this, &BasicView::advanced); @@ -57,7 +60,6 @@ static QString getStartLabel(bool isRunning) void BasicView::update(Cluster cluster) { - startButton->setEnabled(true); advancedButton->setEnabled(true); refreshButton->setEnabled(true); @@ -69,8 +71,10 @@ void BasicView::update(Cluster cluster) deleteButton->setEnabled(exists); dashboardButton->setEnabled(isRunning); #if __linux__ || __APPLE__ + dockerEnvButton->setEnabled(isRunning); sshButton->setEnabled(exists); #else + dockerEnvButton->setEnabled(false); sshButton->setEnabled(false); #endif pauseButton->setText(getPauseLabel(isPaused)); @@ -83,6 +87,7 @@ void BasicView::disableButtons() stopButton->setEnabled(false); deleteButton->setEnabled(false); pauseButton->setEnabled(false); + dockerEnvButton->setEnabled(false); sshButton->setEnabled(false); dashboardButton->setEnabled(false); advancedButton->setEnabled(false); diff --git a/gui/basicview.h b/gui/basicview.h index 4d93e62c4d..11d313cad9 100644 --- a/gui/basicview.h +++ b/gui/basicview.h @@ -22,6 +22,7 @@ signals: void pause(); void delete_(); void refresh(); + void dockerEnv(); void ssh(); void dashboard(); void advanced(); @@ -32,6 +33,7 @@ private: QPushButton *pauseButton; QPushButton *deleteButton; QPushButton *refreshButton; + QPushButton *dockerEnvButton; QPushButton *sshButton; QPushButton *dashboardButton; QPushButton *advancedButton; diff --git a/gui/operator.cpp b/gui/operator.cpp index 336573fae3..b8fb185185 100644 --- a/gui/operator.cpp +++ b/gui/operator.cpp @@ -27,6 +27,7 @@ Operator::Operator(AdvancedView *advancedView, BasicView *basicView, CommandRunn connect(m_basicView, &BasicView::pause, this, &Operator::pauseOrUnpauseMinikube); connect(m_basicView, &BasicView::delete_, this, &Operator::deleteMinikube); connect(m_basicView, &BasicView::refresh, this, &Operator::updateClusters); + connect(m_basicView, &BasicView::dockerEnv, this, &Operator::dockerEnv); connect(m_basicView, &BasicView::ssh, this, &Operator::sshConsole); connect(m_basicView, &BasicView::dashboard, this, &Operator::dashboardBrowser); connect(m_basicView, &BasicView::advanced, this, &Operator::toAdvancedView); @@ -36,6 +37,7 @@ Operator::Operator(AdvancedView *advancedView, BasicView *basicView, CommandRunn connect(m_advancedView, &AdvancedView::pause, this, &Operator::pauseOrUnpauseMinikube); connect(m_advancedView, &AdvancedView::delete_, this, &Operator::deleteMinikube); connect(m_advancedView, &AdvancedView::refresh, this, &Operator::updateClusters); + connect(m_advancedView, &AdvancedView::dockerEnv, this, &Operator::dockerEnv); connect(m_advancedView, &AdvancedView::ssh, this, &Operator::sshConsole); connect(m_advancedView, &AdvancedView::dashboard, this, &Operator::dashboardBrowser); connect(m_advancedView, &AdvancedView::basic, this, &Operator::toBasicView); @@ -151,7 +153,7 @@ void Operator::toBasicView() { m_isBasicView = true; m_stackedWidget->setCurrentIndex(0); - m_parent->resize(200, 275); + m_parent->resize(200, 300); updateButtons(); } @@ -304,6 +306,8 @@ static QString minikubePath() void Operator::sshConsole() { QString program = minikubePath(); + QString commandArgs = QString("ssh -p %1").arg(selectedClusterName()); + QString command = QString("%1 %2").arg(program, commandArgs); #ifndef QT_NO_TERMWIDGET QMainWindow *mainWindow = new QMainWindow(); int startnow = 0; // set shell program first @@ -317,8 +321,7 @@ void Operator::sshConsole() console->setTerminalFont(font); console->setColorScheme("Tango"); console->setShellProgram(program); - QStringList args = { "ssh", "-p", selectedClusterName() }; - console->setArgs(args); + console->setArgs({ commandArgs }); console->startShellProgram(); QObject::connect(console, SIGNAL(finished()), mainWindow, SLOT(close())); @@ -328,9 +331,10 @@ void Operator::sshConsole() mainWindow->setCentralWidget(console); mainWindow->show(); #elif __APPLE__ - QString command = program + " ssh -p " + selectedClusterName(); - QStringList arguments = { "-e", "tell app \"Terminal\"", "-e", "activate", - "-e", "do script \"" + command + "\"", "-e", "end tell" }; + QStringList arguments = { "-e", "tell app \"Terminal\"", + "-e", "do script \"" + command + "\"", + "-e", "activate", + "-e", "end tell" }; QProcess *process = new QProcess(this); process->start("/usr/bin/osascript", arguments); #else @@ -342,9 +346,56 @@ void Operator::sshConsole() } } - QStringList arguments = { "-e", QString("%1 ssh -p %2").arg(program, selectedClusterName()) }; QProcess *process = new QProcess(this); - process->start(QStandardPaths::findExecutable(terminal), arguments); + process->start(QStandardPaths::findExecutable(terminal), { "-e", commmand }); +#endif +} + +void Operator::dockerEnv() +{ + QString program = minikubePath(); + QString commandArgs = QString("$(%1 -p %2 docker-env)").arg(program, selectedClusterName()); + QString command = QString("eval %1").arg(commandArgs); +#ifndef QT_NO_TERMWIDGET + QMainWindow *mainWindow = new QMainWindow(); + int startnow = 0; // set shell program first + + QTermWidget *console = new QTermWidget(startnow); + + QFont font = QApplication::font(); + font.setFamily("Monospace"); + font.setPointSize(10); + + console->setTerminalFont(font); + console->setColorScheme("Tango"); + console->setShellProgram("eval"); + console->setArgs({ commandArgs }); + console->startShellProgram(); + + QObject::connect(console, SIGNAL(finished()), mainWindow, SLOT(close())); + + mainWindow->setWindowTitle(nameLabel->text()); + mainWindow->resize(800, 400); + mainWindow->setCentralWidget(console); + mainWindow->show(); +#elif __APPLE__ + QStringList arguments = { "-e", "tell app \"Terminal\"", + "-e", "do script \"" + command + "\"", + "-e", "activate", + "-e", "end tell" }; + QProcess *process = new QProcess(this); + process->start("/usr/bin/osascript", arguments); +#else + QString terminal = qEnvironmentVariable("TERMINAL"); + if (terminal.isEmpty()) { + terminal = "x-terminal-emulator"; + if (QStandardPaths::findExecutable(terminal).isEmpty()) { + terminal = "xterm"; + } + } + + QProcess *process = new QProcess(this); + process->start(QStandardPaths::findExecutable(terminal), { "-e", command }); #endif } diff --git a/gui/operator.h b/gui/operator.h index 69239911b2..b5670d6e2f 100644 --- a/gui/operator.h +++ b/gui/operator.h @@ -47,6 +47,7 @@ private: QString selectedClusterName(); Cluster selectedCluster(); void sshConsole(); + void dockerEnv(); void dashboardBrowser(); void dashboardClose(); void pauseMinikube(); diff --git a/gui/window.cpp b/gui/window.cpp index aada74c8de..02c1e5aa83 100644 --- a/gui/window.cpp +++ b/gui/window.cpp @@ -116,7 +116,7 @@ Window::Window() layout = new QVBoxLayout; layout->addWidget(stackedWidget); setLayout(layout); - resize(200, 275); + resize(200, 300); setWindowTitle(tr("minikube")); setWindowIcon(*trayIconIcon); } From 9f579cdad3c01d22b0c7089097fc0453a47c1d35 Mon Sep 17 00:00:00 2001 From: Steven Powell <44844360+spowelljr@users.noreply.github.com> Date: Fri, 8 Jul 2022 21:06:16 -0700 Subject: [PATCH 268/545] Update runc-master.hash --- deploy/iso/minikube-iso/package/runc-master/runc-master.hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/iso/minikube-iso/package/runc-master/runc-master.hash b/deploy/iso/minikube-iso/package/runc-master/runc-master.hash index 24aaf72b9c..822cce4098 100644 --- a/deploy/iso/minikube-iso/package/runc-master/runc-master.hash +++ b/deploy/iso/minikube-iso/package/runc-master/runc-master.hash @@ -14,4 +14,4 @@ sha256 50cc479cabf6e7edb9070a7c28b3460b0acc2a01650fc5934f5037cb96b9e2cf 4144b638 sha256 1f47e3ff66cdcca1f890b15e74e884c4ff81d16d1044cc9900a1eb10cfb3d8e7 52b36a2dd837e8462de8e01458bf02cf9eea47dd.tar.gz sha256 91525356b71fbf8e05deddc955d3f40e0d4aedcb15d26bdd2850a9986852ae5b f46b6ba2c9314cfc8caae24a32ec5fe9ef1059fe.tar.gz sha256 49fbb25fda9fc416ec79a23e5382d504a8972a88247fe074f63ab71b6f38a0a0 52de29d7e0f8c0899bd7efb8810dd07f0073fa87.tar.gz -sha256 0ccce82b1d9c058d8fd7443d261c96fd7a803f2775bcb1fec2bdb725bc7640f6 a916309fff0f838eb94e928713dbc3c0d0ac7aa4.tar.gz +sha256 9bb3be747237647cd232a47796d855e44fe295493f9661a4013835393ea65d46 a916309fff0f838eb94e928713dbc3c0d0ac7aa4.tar.gz From 0aa97aa153cb6590c195710db232ea3a30a2899f Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Sat, 9 Jul 2022 08:30:59 +0000 Subject: [PATCH 269/545] Updating ISO to v1.26.0-1657340101-14534 --- 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 a89fa9203d..fe71b9f60a 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.26.0-1656700267-14481 +ISO_VERSION ?= v1.26.0-1657340101-14534 # 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 d7196b85ea..a32c447c23 100644 --- a/pkg/minikube/download/iso.go +++ b/pkg/minikube/download/iso.go @@ -41,7 +41,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/14481" + isoBucket := "minikube-builds/iso/14534" return []string{ fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s-%s.iso", isoBucket, v, runtime.GOARCH), fmt.Sprintf("https://github.com/kubernetes/minikube/releases/download/%s/minikube-%s-%s.iso", v, v, runtime.GOARCH), diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index fa4b168ce4..a74aa329d1 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/14481/minikube-v1.26.0-1656700267-14481-amd64.iso,https://github.com/kubernetes/minikube/releases/download/v1.26.0-1656700267-14481/minikube-v1.26.0-1656700267-14481-amd64.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.26.0-1656700267-14481-amd64.iso,https://storage.googleapis.com/minikube-builds/iso/14481/minikube-v1.26.0-1656700267-14481.iso,https://github.com/kubernetes/minikube/releases/download/v1.26.0-1656700267-14481/minikube-v1.26.0-1656700267-14481.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.26.0-1656700267-14481.iso]) + --iso-url strings Locations to fetch the minikube ISO from. (default [https://storage.googleapis.com/minikube-builds/iso/14534/minikube-v1.26.0-1657340101-14534-amd64.iso,https://github.com/kubernetes/minikube/releases/download/v1.26.0-1657340101-14534/minikube-v1.26.0-1657340101-14534-amd64.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.26.0-1657340101-14534-amd64.iso,https://storage.googleapis.com/minikube-builds/iso/14534/minikube-v1.26.0-1657340101-14534.iso,https://github.com/kubernetes/minikube/releases/download/v1.26.0-1657340101-14534/minikube-v1.26.0-1657340101-14534.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.26.0-1657340101-14534.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.24.2, 'latest' for v1.24.2). Defaults to 'stable'. --kvm-gpu Enable experimental NVIDIA GPU support in minikube From 444f21fc7122391a785c53c5e866c651cbda6a38 Mon Sep 17 00:00:00 2001 From: "Christoph \"criztovyl\" Schulz" Date: Mon, 4 Jul 2022 11:19:24 +0200 Subject: [PATCH 270/545] Fix overwriting err #14424 podman start minikube returned with exit code 125 --- pkg/drivers/kic/kic.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkg/drivers/kic/kic.go b/pkg/drivers/kic/kic.go index 7ea6739868..a877d2a0b8 100644 --- a/pkg/drivers/kic/kic.go +++ b/pkg/drivers/kic/kic.go @@ -399,8 +399,7 @@ func (d *Driver) Restart() error { func (d *Driver) Start() error { if err := oci.StartContainer(d.NodeConfig.OCIBinary, d.MachineName); err != nil { oci.LogContainerDebug(d.OCIBinary, d.MachineName) - _, err := oci.DaemonInfo(d.OCIBinary) - if err != nil { + if _, err := oci.DaemonInfo(d.OCIBinary); err != nil { return errors.Wrapf(oci.ErrDaemonInfo, "debug daemon info %q", d.MachineName) } return errors.Wrap(err, "start") From 6b1f3ea1f31a511609face2474e8ce807e5d10f6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Jul 2022 18:07:07 +0000 Subject: [PATCH 271/545] Bump go.opentelemetry.io/otel from 1.7.0 to 1.8.0 Bumps [go.opentelemetry.io/otel](https://github.com/open-telemetry/opentelemetry-go) from 1.7.0 to 1.8.0. - [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.7.0...v1.8.0) --- updated-dependencies: - dependency-name: go.opentelemetry.io/otel dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 4 ++-- go.sum | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index aecee4e6bf..45f7219cf8 100644 --- a/go.mod +++ b/go.mod @@ -67,9 +67,9 @@ require ( github.com/spf13/viper v1.12.0 github.com/zchee/go-vmnet v0.0.0-20161021174912-97ebf9174097 go.opencensus.io v0.23.0 - go.opentelemetry.io/otel v1.7.0 + go.opentelemetry.io/otel v1.8.0 go.opentelemetry.io/otel/sdk v1.7.0 - go.opentelemetry.io/otel/trace v1.7.0 + go.opentelemetry.io/otel/trace v1.8.0 golang.org/x/build v0.0.0-20190927031335-2835ba2e683f golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4 golang.org/x/exp v0.0.0-20210220032938-85be41e4509f diff --git a/go.sum b/go.sum index 920307f0ab..ceefe2f2f8 100644 --- a/go.sum +++ b/go.sum @@ -1447,8 +1447,9 @@ go.opentelemetry.io/contrib v0.20.0/go.mod h1:G/EtFaa6qaN7+LxqfIAT3GiZa7Wv5DTBUz go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.20.0/go.mod h1:2AboqHi0CiIZU0qwhtUfCYD1GeUzvvIXWNkhDt7ZMG4= 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.7.0 h1:Z2lA3Tdch0iDcrhJXDIlC94XE+bxok1F9B+4Lz/lGsM= go.opentelemetry.io/otel v1.7.0/go.mod h1:5BdUoMIz5WEs0vt0CUEMtSSaTSHBBVwrhnz7+nrD5xk= +go.opentelemetry.io/otel v1.8.0 h1:zcvBFizPbpa1q7FehvFiHbQwGzmPILebO0tyqIR5Djg= +go.opentelemetry.io/otel v1.8.0/go.mod h1:2pkj+iMj0o03Y+cW6/m8Y4WkRdYN3AvCXCnzRMp9yvM= go.opentelemetry.io/otel/exporters/otlp v0.20.0/go.mod h1:YIieizyaN77rtLJra0buKiNBOm9XQfkPEKBeuhoMwAM= go.opentelemetry.io/otel/metric v0.20.0/go.mod h1:598I5tYlH1vzBjn+BTuhzTCSb/9debfNp6R3s7Pr1eU= go.opentelemetry.io/otel/metric v0.28.0 h1:o5YNh+jxACMODoAo1bI7OES0RUW4jAMae0Vgs2etWAQ= @@ -1459,8 +1460,9 @@ go.opentelemetry.io/otel/sdk v1.7.0/go.mod h1:uTEOTwaqIVuTGiJN7ii13Ibp75wJmYUDe3 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.7.0 h1:O37Iogk1lEkMRXewVtZ1BBTVn5JEp8GrJvP92bJqC6o= go.opentelemetry.io/otel/trace v1.7.0/go.mod h1:fzLSB9nqR2eXzxPXb2JW9IKE+ScyXA48yyE4TNvoHqU= +go.opentelemetry.io/otel/trace v1.8.0 h1:cSy0DF9eGI5WIfNwZ1q2iUyGj00tGzP24dE1lOlHrfY= +go.opentelemetry.io/otel/trace v1.8.0/go.mod h1:0Bt3PXY8w+3pheS3hQUt+wow8b1ojPaTBoTCh2zIFI4= 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 a892b2a892027ffee26ef340daf61e3d3d60df61 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Jul 2022 18:07:14 +0000 Subject: [PATCH 272/545] Bump k8s.io/klog/v2 from 2.70.0 to 2.70.1 Bumps [k8s.io/klog/v2](https://github.com/kubernetes/klog) from 2.70.0 to 2.70.1. - [Release notes](https://github.com/kubernetes/klog/releases) - [Changelog](https://github.com/kubernetes/klog/blob/main/RELEASE.md) - [Commits](https://github.com/kubernetes/klog/compare/v2.70.0...v2.70.1) --- updated-dependencies: - dependency-name: k8s.io/klog/v2 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 aecee4e6bf..b9b9205b91 100644 --- a/go.mod +++ b/go.mod @@ -88,7 +88,7 @@ require ( k8s.io/client-go v0.24.2 k8s.io/cluster-bootstrap v0.0.0 k8s.io/component-base v0.24.2 - k8s.io/klog/v2 v2.70.0 + k8s.io/klog/v2 v2.70.1 k8s.io/kubectl v0.24.2 k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 libvirt.org/go/libvirt v1.8004.0 diff --git a/go.sum b/go.sum index 920307f0ab..1ac3b9a26e 100644 --- a/go.sum +++ b/go.sum @@ -2277,8 +2277,8 @@ k8s.io/klog/v2 v2.3.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= k8s.io/klog/v2 v2.4.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= k8s.io/klog/v2 v2.9.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec= k8s.io/klog/v2 v2.60.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= -k8s.io/klog/v2 v2.70.0 h1:GMmmjoFOrNepPN0ZeGCzvD2Gh5IKRwdFx8W5PBxVTQU= -k8s.io/klog/v2 v2.70.0/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= +k8s.io/klog/v2 v2.70.1 h1:7aaoSdahviPmR+XkS7FyxlkkXs6tHISSG03RxleQAVQ= +k8s.io/klog/v2 v2.70.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6/go.mod h1:UuqjUnNftUyPE5H64/qeyjQoUZhGpeFDVdxjTeEVN2o= k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd/go.mod h1:WOJ3KddDSol4tAGcJo0Tvi+dK12EcqSLqcWsryKMpfM= k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw= From 5157e25223b8ef7f71c8c9ea5646f349a24162fc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Jul 2022 18:07:23 +0000 Subject: [PATCH 273/545] Bump go.opentelemetry.io/otel/trace from 1.7.0 to 1.8.0 Bumps [go.opentelemetry.io/otel/trace](https://github.com/open-telemetry/opentelemetry-go) from 1.7.0 to 1.8.0. - [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.7.0...v1.8.0) --- updated-dependencies: - dependency-name: go.opentelemetry.io/otel/trace dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 4 ++-- go.sum | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index aecee4e6bf..45f7219cf8 100644 --- a/go.mod +++ b/go.mod @@ -67,9 +67,9 @@ require ( github.com/spf13/viper v1.12.0 github.com/zchee/go-vmnet v0.0.0-20161021174912-97ebf9174097 go.opencensus.io v0.23.0 - go.opentelemetry.io/otel v1.7.0 + go.opentelemetry.io/otel v1.8.0 go.opentelemetry.io/otel/sdk v1.7.0 - go.opentelemetry.io/otel/trace v1.7.0 + go.opentelemetry.io/otel/trace v1.8.0 golang.org/x/build v0.0.0-20190927031335-2835ba2e683f golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4 golang.org/x/exp v0.0.0-20210220032938-85be41e4509f diff --git a/go.sum b/go.sum index 920307f0ab..ceefe2f2f8 100644 --- a/go.sum +++ b/go.sum @@ -1447,8 +1447,9 @@ go.opentelemetry.io/contrib v0.20.0/go.mod h1:G/EtFaa6qaN7+LxqfIAT3GiZa7Wv5DTBUz go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.20.0/go.mod h1:2AboqHi0CiIZU0qwhtUfCYD1GeUzvvIXWNkhDt7ZMG4= 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.7.0 h1:Z2lA3Tdch0iDcrhJXDIlC94XE+bxok1F9B+4Lz/lGsM= go.opentelemetry.io/otel v1.7.0/go.mod h1:5BdUoMIz5WEs0vt0CUEMtSSaTSHBBVwrhnz7+nrD5xk= +go.opentelemetry.io/otel v1.8.0 h1:zcvBFizPbpa1q7FehvFiHbQwGzmPILebO0tyqIR5Djg= +go.opentelemetry.io/otel v1.8.0/go.mod h1:2pkj+iMj0o03Y+cW6/m8Y4WkRdYN3AvCXCnzRMp9yvM= go.opentelemetry.io/otel/exporters/otlp v0.20.0/go.mod h1:YIieizyaN77rtLJra0buKiNBOm9XQfkPEKBeuhoMwAM= go.opentelemetry.io/otel/metric v0.20.0/go.mod h1:598I5tYlH1vzBjn+BTuhzTCSb/9debfNp6R3s7Pr1eU= go.opentelemetry.io/otel/metric v0.28.0 h1:o5YNh+jxACMODoAo1bI7OES0RUW4jAMae0Vgs2etWAQ= @@ -1459,8 +1460,9 @@ go.opentelemetry.io/otel/sdk v1.7.0/go.mod h1:uTEOTwaqIVuTGiJN7ii13Ibp75wJmYUDe3 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.7.0 h1:O37Iogk1lEkMRXewVtZ1BBTVn5JEp8GrJvP92bJqC6o= go.opentelemetry.io/otel/trace v1.7.0/go.mod h1:fzLSB9nqR2eXzxPXb2JW9IKE+ScyXA48yyE4TNvoHqU= +go.opentelemetry.io/otel/trace v1.8.0 h1:cSy0DF9eGI5WIfNwZ1q2iUyGj00tGzP24dE1lOlHrfY= +go.opentelemetry.io/otel/trace v1.8.0/go.mod h1:0Bt3PXY8w+3pheS3hQUt+wow8b1ojPaTBoTCh2zIFI4= 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 3d59a58f8bc35a30bbbef0039b68011126b33dd2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Jul 2022 18:07:42 +0000 Subject: [PATCH 274/545] Bump github.com/cheggaaa/pb/v3 from 3.0.8 to 3.1.0 Bumps [github.com/cheggaaa/pb/v3](https://github.com/cheggaaa/pb) from 3.0.8 to 3.1.0. - [Release notes](https://github.com/cheggaaa/pb/releases) - [Commits](https://github.com/cheggaaa/pb/compare/v3.0.8...v3.1.0) --- updated-dependencies: - dependency-name: github.com/cheggaaa/pb/v3 dependency-type: direct:production update-type: version-update:semver-minor ... 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 aecee4e6bf..83747b425a 100644 --- a/go.mod +++ b/go.mod @@ -15,7 +15,7 @@ require ( github.com/briandowns/spinner v1.11.1 github.com/c4milo/gotoolkit v0.0.0-20190525173301-67483a18c17a // indirect github.com/cenkalti/backoff/v4 v4.1.3 - github.com/cheggaaa/pb/v3 v3.0.8 + github.com/cheggaaa/pb/v3 v3.1.0 github.com/cloudevents/sdk-go/v2 v2.10.1 github.com/docker/docker v20.10.17+incompatible github.com/docker/go-units v0.4.0 diff --git a/go.sum b/go.sum index 920307f0ab..1a4b3085e2 100644 --- a/go.sum +++ b/go.sum @@ -258,8 +258,8 @@ github.com/chavacava/garif v0.0.0-20210405164556-e8a0a408d6af/go.mod h1:Qjyv4H3/ github.com/checkpoint-restore/go-criu/v4 v4.1.0/go.mod h1:xUQBLp4RLc5zJtWY++yjOoMoB5lihDt7fai+75m+rGw= github.com/checkpoint-restore/go-criu/v5 v5.3.0/go.mod h1:E/eQpaFtUKGOOSEBZgmKAcn+zUUwWxqcaKZlF54wK8E= github.com/cheggaaa/pb v1.0.27/go.mod h1:pQciLPpbU0oxA0h+VJYYLxO+XeDQb5pZijXscXHm81s= -github.com/cheggaaa/pb/v3 v3.0.8 h1:bC8oemdChbke2FHIIGy9mn4DPJ2caZYQnfbRqwmdCoA= -github.com/cheggaaa/pb/v3 v3.0.8/go.mod h1:UICbiLec/XO6Hw6k+BHEtHeQFzzBH4i2/qk/ow1EJTA= +github.com/cheggaaa/pb/v3 v3.1.0 h1:3uouEsl32RL7gTiQsuaXD4Bzbfl5tGztXGUvXbs4O04= +github.com/cheggaaa/pb/v3 v3.1.0/go.mod h1:YjrevcBqadFDaGQKRdmZxTY42pXEqda48Ea3lt0K/BE= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= From 94099972231509b2b5d895e2a3300494845709f7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Jul 2022 18:28:47 +0000 Subject: [PATCH 275/545] Bump actions/setup-go from 3.2.0 to 3.2.1 Bumps [actions/setup-go](https://github.com/actions/setup-go) from 3.2.0 to 3.2.1. - [Release notes](https://github.com/actions/setup-go/releases) - [Commits](https://github.com/actions/setup-go/compare/b22fbbc2921299758641fab08929b4ac52b32923...84cbf8094393cdc5fe1fe1671ff2647332956b1a) --- updated-dependencies: - dependency-name: actions/setup-go dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/build.yml | 6 +++--- .github/workflows/docs.yml | 2 +- .github/workflows/functional_verified.yml | 4 ++-- .github/workflows/leaderboard.yml | 2 +- .github/workflows/master.yml | 16 ++++++++-------- .github/workflows/pr.yml | 16 ++++++++-------- .github/workflows/sync-minikube.yml | 2 +- .github/workflows/time-to-k8s-public-chart.yml | 4 ++-- .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-gopogh-version.yml | 2 +- .github/workflows/update-gotestsum-version.yml | 2 +- .github/workflows/update-k8s-versions.yml | 2 +- .github/workflows/update-kubadm-constants.yml | 2 +- .github/workflows/yearly-leaderboard.yml | 2 +- 17 files changed, 35 insertions(+), 35 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d300bfafe8..3626036419 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,7 +21,7 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5 - - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 + - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a with: go-version: ${{env.GO_VERSION}} - name: Download Dependencies @@ -47,7 +47,7 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5 - - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 + - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a with: go-version: ${{env.GO_VERSION}} - name: Install libvirt @@ -65,7 +65,7 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5 - - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 + - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a with: go-version: ${{env.GO_VERSION}} - name: Install libvirt diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 96bd80c0f4..409ebb4d0d 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -16,7 +16,7 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5 - - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 + - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a with: go-version: ${{env.GO_VERSION}} - name: Generate Docs diff --git a/.github/workflows/functional_verified.yml b/.github/workflows/functional_verified.yml index 71f364b502..8f5aeedd7e 100644 --- a/.github/workflows/functional_verified.yml +++ b/.github/workflows/functional_verified.yml @@ -35,7 +35,7 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5 - - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 + - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a with: go-version: ${{env.GO_VERSION}} - name: Download Dependencies @@ -114,7 +114,7 @@ jobs: echo "--------------------------" hostname || true echo "--------------------------" - - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 + - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/leaderboard.yml b/.github/workflows/leaderboard.yml index f8675c9e79..4687012c91 100644 --- a/.github/workflows/leaderboard.yml +++ b/.github/workflows/leaderboard.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5 - - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 + - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a with: go-version: ${{env.GO_VERSION}} - name: Update Leaderboard diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 5ea90c9b41..3960f26216 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -25,7 +25,7 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5 - - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 + - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a with: go-version: ${{env.GO_VERSION}} - name: Download Dependencies @@ -51,7 +51,7 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5 - - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 + - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a with: go-version: ${{env.GO_VERSION}} - name: Install libvirt @@ -69,7 +69,7 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5 - - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 + - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a with: go-version: ${{env.GO_VERSION}} - name: Install libvirt @@ -116,7 +116,7 @@ jobs: echo "--------------------------" docker ps || true echo "--------------------------" - - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 + - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a with: go-version: ${{env.GO_VERSION}} - name: Install gopogh @@ -215,7 +215,7 @@ jobs: echo "--------------------------" docker ps || true echo "--------------------------" - - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 + - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a with: go-version: ${{env.GO_VERSION}} - name: Install gopogh @@ -318,7 +318,7 @@ jobs: echo "--------------------------" podman ps || true echo "--------------------------" - - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 + - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a with: go-version: ${{env.GO_VERSION}} - name: Install gopogh @@ -403,7 +403,7 @@ jobs: curl -LO "https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/darwin/amd64/kubectl" sudo install kubectl /usr/local/bin/kubectl kubectl version --client=true - - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 + - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a with: go-version: ${{env.GO_VERSION}} - name: Install gopogh @@ -501,7 +501,7 @@ jobs: curl -LO "https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl" sudo install kubectl /usr/local/bin/kubectl kubectl version --client=true - - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 + - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a with: go-version: ${{env.GO_VERSION}} # conntrack is required for kubernetes 1.18 and higher diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index b74554b42a..94fc5c0caf 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -23,7 +23,7 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5 - - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 + - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a with: go-version: ${{env.GO_VERSION}} - name: Download Dependencies @@ -49,7 +49,7 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5 - - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 + - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a with: go-version: ${{env.GO_VERSION}} - name: Install libvirt @@ -67,7 +67,7 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5 - - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 + - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a with: go-version: ${{env.GO_VERSION}} - name: Install libvirt @@ -114,7 +114,7 @@ jobs: echo "--------------------------" docker ps || true echo "--------------------------" - - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 + - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a with: go-version: ${{env.GO_VERSION}} - name: Install gopogh @@ -213,7 +213,7 @@ jobs: echo "--------------------------" docker ps || true echo "--------------------------" - - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 + - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a with: go-version: ${{env.GO_VERSION}} - name: Install gopogh @@ -317,7 +317,7 @@ jobs: echo "--------------------------" podman ps || true echo "--------------------------" - - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 + - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a with: go-version: ${{env.GO_VERSION}} - name: Install gopogh @@ -403,7 +403,7 @@ jobs: curl -LO "https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/darwin/amd64/kubectl" sudo install kubectl /usr/local/bin/kubectl kubectl version --client=true - - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 + - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a with: go-version: ${{env.GO_VERSION}} - name: Install gopogh @@ -502,7 +502,7 @@ jobs: curl -LO "https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl" sudo install kubectl /usr/local/bin/kubectl kubectl version --client=true - - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 + - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a with: go-version: ${{env.GO_VERSION}} # conntrack is required for kubernetes 1.18 and higher diff --git a/.github/workflows/sync-minikube.yml b/.github/workflows/sync-minikube.yml index 2487c5231d..ee20277a9d 100644 --- a/.github/workflows/sync-minikube.yml +++ b/.github/workflows/sync-minikube.yml @@ -23,7 +23,7 @@ jobs: path: ./image-syncer - name: Set up Go - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 + uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/time-to-k8s-public-chart.yml b/.github/workflows/time-to-k8s-public-chart.yml index d6861b7bba..56fbb1d262 100644 --- a/.github/workflows/time-to-k8s-public-chart.yml +++ b/.github/workflows/time-to-k8s-public-chart.yml @@ -20,7 +20,7 @@ jobs: AWS_DEFAULT_REGION: 'us-west-1' steps: - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5 - - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 + - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a with: go-version: ${{env.GO_VERSION}} - name: Benchmark time-to-k8s for Docker driver with Docker runtime @@ -44,7 +44,7 @@ jobs: curl -LO "https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/darwin/amd64/kubectl" sudo install kubectl /usr/local/bin/kubectl kubectl version --client=true - - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 + - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a with: go-version: ${{env.GO_VERSION}} - name: Disable firewall diff --git a/.github/workflows/time-to-k8s.yml b/.github/workflows/time-to-k8s.yml index 331bb6ee79..034dd99f52 100644 --- a/.github/workflows/time-to-k8s.yml +++ b/.github/workflows/time-to-k8s.yml @@ -16,7 +16,7 @@ jobs: - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5 - name: Checkout submodules run: git submodule update --init - - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 + - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a with: go-version: ${{env.GO_VERSION}} - name: time-to-k8s Benchmark diff --git a/.github/workflows/translations.yml b/.github/workflows/translations.yml index 1566bc8641..1ebdaf72d4 100644 --- a/.github/workflows/translations.yml +++ b/.github/workflows/translations.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5 - - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 + - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a with: go-version: ${{env.GO_VERSION}} - name: Install libvirt diff --git a/.github/workflows/update-golang-version.yml b/.github/workflows/update-golang-version.yml index 0ad5234b23..744e6607c0 100644 --- a/.github/workflows/update-golang-version.yml +++ b/.github/workflows/update-golang-version.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5 - - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 + - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a with: go-version: ${{env.GO_VERSION}} - name: Bump Golang Versions diff --git a/.github/workflows/update-golint-version.yml b/.github/workflows/update-golint-version.yml index fddc0a1844..acd3ae7848 100644 --- a/.github/workflows/update-golint-version.yml +++ b/.github/workflows/update-golint-version.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5 - - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 + - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a with: go-version: ${{env.GO_VERSION}} - name: Bump Golint Versions diff --git a/.github/workflows/update-gopogh-version.yml b/.github/workflows/update-gopogh-version.yml index 16ff8995f4..372d765d87 100644 --- a/.github/workflows/update-gopogh-version.yml +++ b/.github/workflows/update-gopogh-version.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5 - - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 + - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a with: go-version: ${{env.GO_VERSION}} - name: Bump gopogh Versions diff --git a/.github/workflows/update-gotestsum-version.yml b/.github/workflows/update-gotestsum-version.yml index e46292170f..d881a89350 100644 --- a/.github/workflows/update-gotestsum-version.yml +++ b/.github/workflows/update-gotestsum-version.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5 - - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 + - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a with: go-version: ${{env.GO_VERSION}} - name: Bump Gotestsum Versions diff --git a/.github/workflows/update-k8s-versions.yml b/.github/workflows/update-k8s-versions.yml index 26d7162285..f6fb9345d7 100644 --- a/.github/workflows/update-k8s-versions.yml +++ b/.github/workflows/update-k8s-versions.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5 - - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 + - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a with: go-version: ${{env.GO_VERSION}} - name: Bump Kubernetes Versions diff --git a/.github/workflows/update-kubadm-constants.yml b/.github/workflows/update-kubadm-constants.yml index 40227e1111..9a888d582e 100644 --- a/.github/workflows/update-kubadm-constants.yml +++ b/.github/workflows/update-kubadm-constants.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5 - - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 + - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a with: go-version: ${{env.GO_VERSION}} - name: Bump Kubeadm Constants for Kubernetes Images diff --git a/.github/workflows/yearly-leaderboard.yml b/.github/workflows/yearly-leaderboard.yml index 3402d493da..5493890d31 100644 --- a/.github/workflows/yearly-leaderboard.yml +++ b/.github/workflows/yearly-leaderboard.yml @@ -20,7 +20,7 @@ jobs: AWS_DEFAULT_REGION: 'us-west-1' steps: - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5 - - uses: actions/setup-go@b22fbbc2921299758641fab08929b4ac52b32923 + - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a with: go-version: ${{env.GO_VERSION}} - name: Update Yearly Leaderboard From 163448dde88ebe43d6d8210fe7c510a6ca2db9d3 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Mon, 11 Jul 2022 11:57:24 -0700 Subject: [PATCH 276/545] fix bioldlerplate --- hack/jenkins/osx_integration_tests_qemu.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/jenkins/osx_integration_tests_qemu.sh b/hack/jenkins/osx_integration_tests_qemu.sh index c8571c5dc4..07841761db 100755 --- a/hack/jenkins/osx_integration_tests_qemu.sh +++ b/hack/jenkins/osx_integration_tests_qemu.sh @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 2022 The Kubernetes Authors All rights reserved. -# +# # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at From d920d7e305c159f99998d0ad1420045bfde550fc Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Mon, 11 Jul 2022 14:39:15 -0700 Subject: [PATCH 277/545] add arm64 Homebrew dir to PATH env --- hack/jenkins/common.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hack/jenkins/common.sh b/hack/jenkins/common.sh index 22a492274b..cceb3f7d61 100755 --- a/hack/jenkins/common.sh +++ b/hack/jenkins/common.sh @@ -77,6 +77,9 @@ function retry_github_status() { } if [ "$(uname)" = "Darwin" ]; then + if [ "$ARCH" = "arm64" ]; then + export PATH=$PATH:/opt/homebrew/bin + fi if ! bash setup_docker_desktop_macos.sh; then retry_github_status "${COMMIT}" "${JOB_NAME}" "failure" "${access_token}" "${public_log_url}" "Jenkins: docker failed to start" exit 1 From 66957ea6ee346a69a381b903bfa8c2acf0d2facd Mon Sep 17 00:00:00 2001 From: klaases Date: Mon, 11 Jul 2022 15:03:49 -0700 Subject: [PATCH 278/545] None-driver: check cri-dockerd & dockerd runtimes --- pkg/minikube/cruntime/docker.go | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkg/minikube/cruntime/docker.go b/pkg/minikube/cruntime/docker.go index 93d370e730..5a256f5d05 100644 --- a/pkg/minikube/cruntime/docker.go +++ b/pkg/minikube/cruntime/docker.go @@ -106,8 +106,17 @@ func (r *Docker) SocketPath() string { // Available returns an error if it is not possible to use this runtime on a host func (r *Docker) Available() error { - _, err := exec.LookPath("docker") - return err + var err error + if _, err = exec.LookPath("docker"); err == nil { + return nil + } + if _, err = exec.LookPath("cri-dockerd"); err == nil { + return nil + } + if _, err = exec.LookPath("dockerd"); err == nil { + return nil + } + return errors.New("runtimes were not found: docker, cri-dockerd, dockerd") } // Active returns if docker is active on the host From 475fce47770ea3c5f427a2fdf545931265d9c80e Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Mon, 11 Jul 2022 16:17:49 -0700 Subject: [PATCH 279/545] add building e2e-darwin-arm64 --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index a89fa9203d..30b6d7b35c 100644 --- a/Makefile +++ b/Makefile @@ -269,7 +269,7 @@ out/minikube-linux-armv6: $(SOURCE_FILES) $(ASSET_FILES) $(Q)GOOS=linux GOARCH=arm GOARM=6 \ go build -tags "$(MINIKUBE_BUILD_TAGS)" -ldflags="$(MINIKUBE_LDFLAGS)" -a -o $@ k8s.io/minikube/cmd/minikube -.PHONY: e2e-linux-amd64 e2e-linux-arm64 e2e-darwin-amd64 e2e-windows-amd64.exe +.PHONY: e2e-linux-amd64 e2e-linux-arm64 e2e-darwin-amd64 e2e-darwin-arm64 e2e-windows-amd64.exe e2e-linux-amd64: out/e2e-linux-amd64 ## build end2end binary for Linux x86 64bit e2e-linux-arm64: out/e2e-linux-arm64 ## build end2end binary for Linux ARM 64bit e2e-darwin-amd64: out/e2e-darwin-amd64 ## build end2end binary for Darwin x86 64bit @@ -442,7 +442,7 @@ darwin: minikube-darwin-amd64 ## Build minikube for Darwin 64bit linux: minikube-linux-amd64 ## Build minikube for Linux 64bit .PHONY: e2e-cross -e2e-cross: e2e-linux-amd64 e2e-linux-arm64 e2e-darwin-amd64 e2e-windows-amd64.exe ## End-to-end cross test +e2e-cross: e2e-linux-amd64 e2e-linux-arm64 e2e-darwin-amd64 e2e-darwin-arm64 e2e-windows-amd64.exe ## End-to-end cross test .PHONY: checksum checksum: ## Generate checksums From eb64361170e8d1f4db4202284ab1a87bd7fd8996 Mon Sep 17 00:00:00 2001 From: klaases Date: Mon, 11 Jul 2022 16:52:54 -0700 Subject: [PATCH 280/545] Always check for docker ahead of cri-dockerd --- pkg/minikube/cruntime/docker.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/minikube/cruntime/docker.go b/pkg/minikube/cruntime/docker.go index 5a256f5d05..521f0f7f90 100644 --- a/pkg/minikube/cruntime/docker.go +++ b/pkg/minikube/cruntime/docker.go @@ -107,8 +107,8 @@ func (r *Docker) SocketPath() string { // Available returns an error if it is not possible to use this runtime on a host func (r *Docker) Available() error { var err error - if _, err = exec.LookPath("docker"); err == nil { - return nil + if _, err = exec.LookPath("docker"); err != nil { + return err } if _, err = exec.LookPath("cri-dockerd"); err == nil { return nil @@ -116,7 +116,7 @@ func (r *Docker) Available() error { if _, err = exec.LookPath("dockerd"); err == nil { return nil } - return errors.New("runtimes were not found: docker, cri-dockerd, dockerd") + return errors.New("runtimes were not found: cri-dockerd, dockerd") } // Active returns if docker is active on the host From 73f231c3f148d0316e9a19749c3ee47c761ab345 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Mon, 11 Jul 2022 10:08:03 -0700 Subject: [PATCH 281/545] update conmon from v2.0.24 to v2.1.2 --- deploy/iso/minikube-iso/package/conmon/conmon.hash | 1 + deploy/iso/minikube-iso/package/conmon/conmon.mk | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/deploy/iso/minikube-iso/package/conmon/conmon.hash b/deploy/iso/minikube-iso/package/conmon/conmon.hash index 09179132d1..ae93257e04 100644 --- a/deploy/iso/minikube-iso/package/conmon/conmon.hash +++ b/deploy/iso/minikube-iso/package/conmon/conmon.hash @@ -9,3 +9,4 @@ sha256 d82ad6c1e315f8310ed75fe6905f81dce61b61d55a156e9e04c9855e78e1e165 v2.0.6.t sha256 abe4e1cc02505c81857c1eeced008a24b4dd41659d42a1e3395754fb063aef36 v2.0.7.tar.gz sha256 a116b8422c65778bd677c29f55b3ceaae07d09da336f71bdc68fc7bb83d50e03 v2.0.17.tar.gz sha256 e00bc44a8bd783fd417a5c90d3b8c15035ddc69b18350a31258e7f79aec8c697 v2.0.24.tar.gz +sha256 8ba76eb54c319197235fd39c3a5b5a975b5a21e02cd4be985b8619220a497a0e v2.1.2.tar.gz diff --git a/deploy/iso/minikube-iso/package/conmon/conmon.mk b/deploy/iso/minikube-iso/package/conmon/conmon.mk index 44a8535781..0d567aaf24 100644 --- a/deploy/iso/minikube-iso/package/conmon/conmon.mk +++ b/deploy/iso/minikube-iso/package/conmon/conmon.mk @@ -4,8 +4,8 @@ # ################################################################################ -CONMON_VERSION = v2.0.24 -CONMON_COMMIT = 9cbc71d699291dfb14e7c1e348a0d48feff7a27d +CONMON_VERSION = v2.1.2 +CONMON_COMMIT = 2bc95ee697e87d5f7b77063cf83fc32739addafe CONMON_SITE = https://github.com/containers/conmon/archive CONMON_SOURCE = $(CONMON_VERSION).tar.gz CONMON_LICENSE = Apache-2.0 From d89f43518e81e2fb63bc76242c68f5d94697dcd9 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Tue, 12 Jul 2022 11:40:58 -0700 Subject: [PATCH 282/545] fix incorrect user and profile in audit logging --- cmd/minikube/cmd/root.go | 43 ++++++++++++++++++++----------------- pkg/minikube/audit/audit.go | 2 +- 2 files changed, 24 insertions(+), 21 deletions(-) diff --git a/cmd/minikube/cmd/root.go b/cmd/minikube/cmd/root.go index 6b7b13d082..dea3f0ee57 100644 --- a/cmd/minikube/cmd/root.go +++ b/cmd/minikube/cmd/root.go @@ -44,16 +44,19 @@ import ( "k8s.io/minikube/pkg/version" ) -var dirs = [...]string{ - localpath.MiniPath(), - localpath.MakeMiniPath("certs"), - localpath.MakeMiniPath("machines"), - localpath.MakeMiniPath("cache"), - localpath.MakeMiniPath("config"), - localpath.MakeMiniPath("addons"), - localpath.MakeMiniPath("files"), - localpath.MakeMiniPath("logs"), -} +var ( + dirs = [...]string{ + localpath.MiniPath(), + localpath.MakeMiniPath("certs"), + localpath.MakeMiniPath("machines"), + localpath.MakeMiniPath("cache"), + localpath.MakeMiniPath("config"), + localpath.MakeMiniPath("addons"), + localpath.MakeMiniPath("files"), + localpath.MakeMiniPath("logs"), + } + auditID string +) // RootCmd represents the base command when called without any subcommands var RootCmd = &cobra.Command{ @@ -71,6 +74,11 @@ 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.") } + var err error + auditID, err = audit.LogCommandStart() + if err != nil { + klog.Errorf("failed to log command start to audit: %v", err) + } // 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. @@ -78,21 +86,16 @@ var RootCmd = &cobra.Command{ os.Setenv(constants.MinikubeRootlessEnv, "true") } }, + PersistentPostRun: func(cmd *cobra.Command, args []string) { + if err := audit.LogCommandEnd(auditID); err != nil { + klog.Errorf("failed to log command end to audit: %v", err) + } + }, } // Execute adds all child commands to the root command sets flags appropriately. // This is called by main.main(). It only needs to happen once to the rootCmd. func Execute() { - auditID, err := audit.LogCommandStart() - if err != nil { - klog.Errorf("failed to log command start to audit: %v", err) - } - defer func() { - err := audit.LogCommandEnd(auditID) - if err != nil { - klog.Errorf("failed to log command end to audit: %v", err) - } - }() // Check whether this is a windows binary (.exe) running inisde WSL. if runtime.GOOS == "windows" && detect.IsMicrosoftWSL() { var found = false diff --git a/pkg/minikube/audit/audit.go b/pkg/minikube/audit/audit.go index e119429dad..d85315ad6a 100644 --- a/pkg/minikube/audit/audit.go +++ b/pkg/minikube/audit/audit.go @@ -58,7 +58,7 @@ func args() string { // Log details about the executed command. func LogCommandStart() (string, error) { - if len(os.Args) < 2 || !shouldLog() { + if !shouldLog() { return "", nil } id := uuid.New().String() From e796ff8d90730c3142d6d436b955f2de2cc58521 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Tue, 12 Jul 2022 12:57:53 -0700 Subject: [PATCH 283/545] fix GUI build for Linux & Windows --- gui/operator.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gui/operator.cpp b/gui/operator.cpp index b8fb185185..dbc2e5eb30 100644 --- a/gui/operator.cpp +++ b/gui/operator.cpp @@ -347,7 +347,7 @@ void Operator::sshConsole() } QProcess *process = new QProcess(this); - process->start(QStandardPaths::findExecutable(terminal), { "-e", commmand }); + process->start(QStandardPaths::findExecutable(terminal), { "-e", command }); #endif } From a145c03b88b9aaff6d0fa46299864307ef51a5df Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 12 Jul 2022 20:03:58 +0000 Subject: [PATCH 284/545] 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.8.2 to 1.8.3. - [Release notes](https://github.com/GoogleCloudPlatform/opentelemetry-operations-go/releases) - [Commits](https://github.com/GoogleCloudPlatform/opentelemetry-operations-go/compare/exporter/trace/v1.8.2...exporter/trace/v1.8.3) --- updated-dependencies: - dependency-name: github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 6 +++--- go.sum | 16 ++++++++-------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/go.mod b/go.mod index aecee4e6bf..438e27cc1b 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ require ( contrib.go.opencensus.io/exporter/stackdriver v0.13.12 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.8.2 + github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.8.3 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 @@ -88,7 +88,7 @@ require ( k8s.io/client-go v0.24.2 k8s.io/cluster-bootstrap v0.0.0 k8s.io/component-base v0.24.2 - k8s.io/klog/v2 v2.70.0 + k8s.io/klog/v2 v2.70.1 k8s.io/kubectl v0.24.2 k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 libvirt.org/go/libvirt v1.8004.0 @@ -112,7 +112,7 @@ require ( 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/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.32.2 // indirect + github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.32.3 // indirect github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd // indirect github.com/Microsoft/go-winio v0.5.2 // indirect github.com/PuerkitoBio/purell v1.1.1 // indirect diff --git a/go.sum b/go.sum index 920307f0ab..6ee90c2e3b 100644 --- a/go.sum +++ b/go.sum @@ -121,10 +121,10 @@ github.com/Delta456/box-cli-maker/v2 v2.2.2/go.mod h1:idItIMZeyx3bg73XwSgsLeZd+g github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24/go.mod h1:4UJr5HIiMZrwgkSPdsjy2uOQExX/WEILpIrO9UPGuXs= 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.8.2 h1:Dg+BIoU7Xz5QAj9VgDyhl5sz8Uz1IE1O6NAdJ1/Lmyk= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.8.2/go.mod h1:vCKAVz9WbhvBYuqNignSpjoyMtBT/CFELC3z98onw4o= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.32.2 h1:lw6BPuBgZKGwl4jm8xrU7AGnK8ohy7UT9hPM1+S16ts= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.32.2/go.mod h1:j+FS9VBW3mwtHBmm9KOJEy5Tq68fCp7fE/R9bV/flIM= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.8.3 h1:i84ZOPT35YCJROyuf97VP/VEdYhQce/8NTLOWq5tqJw= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.8.3/go.mod h1:3+qm+VCJbVmQ9uscVz+8h1rRkJEy9ZNFGgpT1XB9mPg= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.32.3 h1:FhsH8qgWFkkPlPXBZ68uuT/FH/R+DLTtVPxjLEBs1v4= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.32.3/go.mod h1:9a+Opaevo9fybhUvQkEG7fR6Zk7pYrW/s9NC4fODFIQ= 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/Masterminds/goutils v1.1.0/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU= @@ -1445,13 +1445,13 @@ 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.31.0 h1:woM+Mb4d0A+Dxa3rYPenSN5ZeS9qHUvE8rlObiLRXTY= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.32.0 h1:mac9BKRqwaX6zxHPDe3pvmWpwuuIM0vuXv2juCnQevE= go.opentelemetry.io/otel v0.20.0/go.mod h1:Y3ugLH2oa81t5QO+Lty+zXf8zC9L26ax4Nzoxm/dooo= go.opentelemetry.io/otel v1.7.0 h1:Z2lA3Tdch0iDcrhJXDIlC94XE+bxok1F9B+4Lz/lGsM= go.opentelemetry.io/otel v1.7.0/go.mod h1:5BdUoMIz5WEs0vt0CUEMtSSaTSHBBVwrhnz7+nrD5xk= go.opentelemetry.io/otel/exporters/otlp v0.20.0/go.mod h1:YIieizyaN77rtLJra0buKiNBOm9XQfkPEKBeuhoMwAM= go.opentelemetry.io/otel/metric v0.20.0/go.mod h1:598I5tYlH1vzBjn+BTuhzTCSb/9debfNp6R3s7Pr1eU= -go.opentelemetry.io/otel/metric v0.28.0 h1:o5YNh+jxACMODoAo1bI7OES0RUW4jAMae0Vgs2etWAQ= +go.opentelemetry.io/otel/metric v0.30.0 h1:Hs8eQZ8aQgs0U49diZoaS6Uaxw3+bBE3lcMUKBFIk3c= 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.7.0 h1:4OmStpcKVOfvDOgCt7UriAPtKolwIhxpnSNI/yK+1B0= @@ -2277,8 +2277,8 @@ k8s.io/klog/v2 v2.3.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= k8s.io/klog/v2 v2.4.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= k8s.io/klog/v2 v2.9.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec= k8s.io/klog/v2 v2.60.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= -k8s.io/klog/v2 v2.70.0 h1:GMmmjoFOrNepPN0ZeGCzvD2Gh5IKRwdFx8W5PBxVTQU= -k8s.io/klog/v2 v2.70.0/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= +k8s.io/klog/v2 v2.70.1 h1:7aaoSdahviPmR+XkS7FyxlkkXs6tHISSG03RxleQAVQ= +k8s.io/klog/v2 v2.70.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6/go.mod h1:UuqjUnNftUyPE5H64/qeyjQoUZhGpeFDVdxjTeEVN2o= k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd/go.mod h1:WOJ3KddDSol4tAGcJo0Tvi+dK12EcqSLqcWsryKMpfM= k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw= From 912c0d26f1f6964706c4968d5438fc72985a7b19 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 12 Jul 2022 20:04:28 +0000 Subject: [PATCH 285/545] Bump libvirt.org/go/libvirt from 1.8004.0 to 1.8005.0 Bumps [libvirt.org/go/libvirt](https://gitlab.com/libvirt/libvirt-go-module) from 1.8004.0 to 1.8005.0. - [Release notes](https://gitlab.com/libvirt/libvirt-go-module/tags) - [Commits](https://gitlab.com/libvirt/libvirt-go-module/compare/v1.8004.0...v1.8005.0) --- updated-dependencies: - dependency-name: libvirt.org/go/libvirt dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index aecee4e6bf..da144af36e 100644 --- a/go.mod +++ b/go.mod @@ -88,10 +88,10 @@ require ( k8s.io/client-go v0.24.2 k8s.io/cluster-bootstrap v0.0.0 k8s.io/component-base v0.24.2 - k8s.io/klog/v2 v2.70.0 + k8s.io/klog/v2 v2.70.1 k8s.io/kubectl v0.24.2 k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 - libvirt.org/go/libvirt v1.8004.0 + libvirt.org/go/libvirt v1.8005.0 sigs.k8s.io/sig-storage-lib-external-provisioner/v6 v6.3.0 ) diff --git a/go.sum b/go.sum index 920307f0ab..1a1befdff1 100644 --- a/go.sum +++ b/go.sum @@ -2277,8 +2277,8 @@ k8s.io/klog/v2 v2.3.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= k8s.io/klog/v2 v2.4.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= k8s.io/klog/v2 v2.9.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec= k8s.io/klog/v2 v2.60.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= -k8s.io/klog/v2 v2.70.0 h1:GMmmjoFOrNepPN0ZeGCzvD2Gh5IKRwdFx8W5PBxVTQU= -k8s.io/klog/v2 v2.70.0/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= +k8s.io/klog/v2 v2.70.1 h1:7aaoSdahviPmR+XkS7FyxlkkXs6tHISSG03RxleQAVQ= +k8s.io/klog/v2 v2.70.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6/go.mod h1:UuqjUnNftUyPE5H64/qeyjQoUZhGpeFDVdxjTeEVN2o= k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd/go.mod h1:WOJ3KddDSol4tAGcJo0Tvi+dK12EcqSLqcWsryKMpfM= k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw= @@ -2294,8 +2294,8 @@ k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/ k8s.io/utils v0.0.0-20210802155522-efc7438f0176/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 h1:HNSDgDCrr/6Ly3WEGKZftiE7IY19Vz2GdbOCyI4qqhc= k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= -libvirt.org/go/libvirt v1.8004.0 h1:SKa5hQNKQfc1VjU4LqLMorqPCxC1lplnz8LwLiMrPyM= -libvirt.org/go/libvirt v1.8004.0/go.mod h1:1WiFE8EjZfq+FCVog+rvr1yatKbKZ9FaFMZgEqxEJqQ= +libvirt.org/go/libvirt v1.8005.0 h1:ULUpl7QQv4ETJLY7lTAtLdSQOe7xIgZ5Ml303UR6j14= +libvirt.org/go/libvirt v1.8005.0/go.mod h1:1WiFE8EjZfq+FCVog+rvr1yatKbKZ9FaFMZgEqxEJqQ= mvdan.cc/gofumpt v0.1.1/go.mod h1:yXG1r1WqZVKWbVRtBWKWX9+CxGYfA51nSomhM0woR48= mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed/go.mod h1:Xkxe497xwlCKkIaQYRfC7CSLworTXY9RMqwhhCm+8Nc= mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b/go.mod h1:2odslEg/xrtNQqCYg2/jCoyKnw3vv5biOc3JnIcYfL4= From 5ac37e4e933ace8e32c84c32e82ab10c3e5d47ae Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 12 Jul 2022 21:01:14 +0000 Subject: [PATCH 286/545] Bump go.opentelemetry.io/otel/sdk from 1.7.0 to 1.8.0 Bumps [go.opentelemetry.io/otel/sdk](https://github.com/open-telemetry/opentelemetry-go) from 1.7.0 to 1.8.0. - [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.7.0...v1.8.0) --- updated-dependencies: - dependency-name: go.opentelemetry.io/otel/sdk dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index 9b207de354..d6fe24a946 100644 --- a/go.mod +++ b/go.mod @@ -68,7 +68,7 @@ require ( github.com/zchee/go-vmnet v0.0.0-20161021174912-97ebf9174097 go.opencensus.io v0.23.0 go.opentelemetry.io/otel v1.8.0 - go.opentelemetry.io/otel/sdk v1.7.0 + go.opentelemetry.io/otel/sdk v1.8.0 go.opentelemetry.io/otel/trace v1.8.0 golang.org/x/build v0.0.0-20190927031335-2835ba2e683f golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4 diff --git a/go.sum b/go.sum index 0a9e866208..18660938b6 100644 --- a/go.sum +++ b/go.sum @@ -1447,7 +1447,6 @@ go.opentelemetry.io/contrib v0.20.0/go.mod h1:G/EtFaa6qaN7+LxqfIAT3GiZa7Wv5DTBUz go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.20.0/go.mod h1:2AboqHi0CiIZU0qwhtUfCYD1GeUzvvIXWNkhDt7ZMG4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.32.0 h1:mac9BKRqwaX6zxHPDe3pvmWpwuuIM0vuXv2juCnQevE= go.opentelemetry.io/otel v0.20.0/go.mod h1:Y3ugLH2oa81t5QO+Lty+zXf8zC9L26ax4Nzoxm/dooo= -go.opentelemetry.io/otel v1.7.0/go.mod h1:5BdUoMIz5WEs0vt0CUEMtSSaTSHBBVwrhnz7+nrD5xk= go.opentelemetry.io/otel v1.8.0 h1:zcvBFizPbpa1q7FehvFiHbQwGzmPILebO0tyqIR5Djg= go.opentelemetry.io/otel v1.8.0/go.mod h1:2pkj+iMj0o03Y+cW6/m8Y4WkRdYN3AvCXCnzRMp9yvM= go.opentelemetry.io/otel/exporters/otlp v0.20.0/go.mod h1:YIieizyaN77rtLJra0buKiNBOm9XQfkPEKBeuhoMwAM= @@ -1455,12 +1454,11 @@ go.opentelemetry.io/otel/metric v0.20.0/go.mod h1:598I5tYlH1vzBjn+BTuhzTCSb/9deb go.opentelemetry.io/otel/metric v0.30.0 h1:Hs8eQZ8aQgs0U49diZoaS6Uaxw3+bBE3lcMUKBFIk3c= 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.7.0 h1:4OmStpcKVOfvDOgCt7UriAPtKolwIhxpnSNI/yK+1B0= -go.opentelemetry.io/otel/sdk v1.7.0/go.mod h1:uTEOTwaqIVuTGiJN7ii13Ibp75wJmYUDe374q6cZwUU= +go.opentelemetry.io/otel/sdk v1.8.0 h1:xwu69/fNuwbSHWe/0PGS888RmjWY181OmcXDQKu7ZQk= +go.opentelemetry.io/otel/sdk v1.8.0/go.mod h1:uPSfc+yfDH2StDM/Rm35WE8gXSNdvCg023J6HeGNO0c= 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.7.0/go.mod h1:fzLSB9nqR2eXzxPXb2JW9IKE+ScyXA48yyE4TNvoHqU= go.opentelemetry.io/otel/trace v1.8.0 h1:cSy0DF9eGI5WIfNwZ1q2iUyGj00tGzP24dE1lOlHrfY= go.opentelemetry.io/otel/trace v1.8.0/go.mod h1:0Bt3PXY8w+3pheS3hQUt+wow8b1ojPaTBoTCh2zIFI4= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= From 504825ae9e9dc67845f1a51ad476d8cb5312ae76 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Tue, 12 Jul 2022 16:00:31 -0700 Subject: [PATCH 287/545] fix cron pathing on M1 --- hack/jenkins/cron/cleanup_and_reboot_Darwin.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/hack/jenkins/cron/cleanup_and_reboot_Darwin.sh b/hack/jenkins/cron/cleanup_and_reboot_Darwin.sh index 75c7dfedb4..c7d99a605e 100755 --- a/hack/jenkins/cron/cleanup_and_reboot_Darwin.sh +++ b/hack/jenkins/cron/cleanup_and_reboot_Darwin.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Copyright 2019 The Kubernetes Authors All rights reserved. # @@ -18,15 +18,18 @@ set -uf -o pipefail PATH=/usr/local/bin:/sbin:/usr/local/sbin:$PATH +if [ "$(uname -p)" = "arm" ]; then + PATH=$PATH:/opt/homebrew/bin +fi # cleanup shared between Linux and macOS function check_jenkins() { jenkins_pid="$(pidof java)" - if [[ "${jenkins_pid}" = "" ]]; then + if [ "${jenkins_pid}" = "" ]; then return fi pstree "${jenkins_pid}" \ - | egrep -i 'bash|integration|e2e|minikube' \ + | grep -E -i 'bash|integration|e2e|minikube' \ && echo "tests are is running on pid ${jenkins_pid} ..." \ && exit 1 } @@ -42,7 +45,7 @@ logger "cleanup_and_reboot is happening!" killall java # clean docker left overs -docker rm -f -v $(docker ps -aq) >/dev/null 2>&1 || true +docker rm -f -v "$(docker ps -aq)" >/dev/null 2>&1 || true docker volume prune -f || true docker volume ls || true docker system df || true From 5fac416884f2593987011bd7f2caabd5d52f489f Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Wed, 13 Jul 2022 15:50:36 -0700 Subject: [PATCH 288/545] update entrypoint and kindnetd --- deploy/kicbase/entrypoint | 160 ++++++++++++++------- pkg/minikube/bootstrapper/images/images.go | 2 +- 2 files changed, 108 insertions(+), 54 deletions(-) diff --git a/deploy/kicbase/entrypoint b/deploy/kicbase/entrypoint index abbf337a77..687ba2d494 100755 --- a/deploy/kicbase/entrypoint +++ b/deploy/kicbase/entrypoint @@ -33,6 +33,11 @@ grep_allow_nomatch() { grep "$@" || [[ $? == 1 ]] } +# regex_escape_ip converts IP address string $1 to a regex-escaped literal +regex_escape_ip(){ + sed -e 's#\.#\\.#g' -e 's#\[#\\[#g' -e 's#\]#\\]#g' <<<"$1" +} + validate_userns() { if [[ -z "${userns}" ]]; then return @@ -56,43 +61,43 @@ validate_userns() { } overlayfs_preferrable() { - if [[ -z "$userns" ]]; then - # If we are outside userns, we can always assume overlayfs is preferrable - return 0 - fi + if [[ -z "$userns" ]]; then + # If we are outside userns, we can always assume overlayfs is preferrable + return 0 + fi - # Debian 10 and 11 supports overlayfs in userns with a "permit_mount_in_userns" kernel patch, - # but known to be unstable, so we avoid using it https://github.com/moby/moby/issues/42302 - if [[ -e "/sys/module/overlay/parameters/permit_mounts_in_userns" ]]; then - echo "INFO: UserNS: kernel seems supporting overlayfs with permit_mounts_in_userns, but avoiding due to instability." - return 1 - fi + # Debian 10 and 11 supports overlayfs in userns with a "permit_mount_in_userns" kernel patch, + # but known to be unstable, so we avoid using it https://github.com/moby/moby/issues/42302 + if [[ -e "/sys/module/overlay/parameters/permit_mounts_in_userns" ]]; then + echo "INFO: UserNS: kernel seems supporting overlayfs with permit_mounts_in_userns, but avoiding due to instability." + return 1 + fi - # Check overlayfs availability, by attempting to mount it. - # - # Overlayfs inside userns is known to be available for the following environments: - # - Kernel >= 5.11 (but 5.11 and 5.12 have issues on SELinux hosts. Fixed in 5.13.) - # - Ubuntu kernel - # - Debian kernel (but avoided due to instability, see the /sys/module/overlay/... check above) - # - Sysbox - tmp=$(mktemp -d) - mkdir -p "${tmp}/l" "${tmp}/u" "${tmp}/w" "${tmp}/m" - if ! mount -t overlay -o lowerdir="${tmp}/l,upperdir=${tmp}/u,workdir=${tmp}/w" overlay "${tmp}/m"; then - echo "INFO: UserNS: kernel does not seem to support overlayfs." - rm -rf "${tmp}" - return 1 - fi - umount "${tmp}/m" - rm -rf "${tmp}" + # Check overlayfs availability, by attempting to mount it. + # + # Overlayfs inside userns is known to be available for the following environments: + # - Kernel >= 5.11 (but 5.11 and 5.12 have issues on SELinux hosts. Fixed in 5.13.) + # - Ubuntu kernel + # - Debian kernel (but avoided due to instability, see the /sys/module/overlay/... check above) + # - Sysbox + tmp=$(mktemp -d) + mkdir -p "${tmp}/l" "${tmp}/u" "${tmp}/w" "${tmp}/m" + if ! mount -t overlay -o lowerdir="${tmp}/l,upperdir=${tmp}/u,workdir=${tmp}/w" overlay "${tmp}/m"; then + echo "INFO: UserNS: kernel does not seem to support overlayfs." + rm -rf "${tmp}" + return 1 + fi + umount "${tmp}/m" + rm -rf "${tmp}" - # Detect whether SELinux is Enforcing (or Permitted) by grepping /proc/self/attr/current . - # Note that we cannot use `getenforce` command here because /sys/fs/selinux is typically not mounted for containers. - if grep -q "_t:" "/proc/self/attr/current"; then - # When the kernel is before v5.13 and SELinux is enforced, fuse-overlayfs might be safer, so we print a warning (but not an error). - # https://github.com/torvalds/linux/commit/7fa2e79a6bb924fa4b2de5766dab31f0f47b5ab6 - echo "WARN: UserNS: SELinux might be Enforcing. If you see an error related to overlayfs, try setting \`KIND_EXPERIMENTAL_CONTAINERD_SNAPSHOTTER=fuse-overlayfs\` ." >&2 - fi - return 0 + # Detect whether SELinux is Enforcing (or Permitted) by grepping /proc/self/attr/current . + # Note that we cannot use `getenforce` command here because /sys/fs/selinux is typically not mounted for containers. + if grep -q "_t:" "/proc/self/attr/current"; then + # When the kernel is before v5.13 and SELinux is enforced, fuse-overlayfs might be safer, so we print a warning (but not an error). + # https://github.com/torvalds/linux/commit/7fa2e79a6bb924fa4b2de5766dab31f0f47b5ab6 + echo "WARN: UserNS: SELinux might be Enforcing. If you see an error related to overlayfs, try setting \`KIND_EXPERIMENTAL_CONTAINERD_SNAPSHOTTER=fuse-overlayfs\` ." >&2 + fi + return 0 } configure_containerd() { @@ -156,7 +161,7 @@ update-alternatives() { } fix_mount() { - echo 'INFO: ensuring we can execute mount/umount even with userns-remap' + echo 'INFO: ensuring we can execute mount/umount even with userns-remap' # necessary only when userns-remap is enabled on the host, but harmless # The binary /bin/mount should be owned by root and have the setuid bit chown root:root "$(which mount)" "$(which umount)" @@ -231,6 +236,8 @@ fix_cgroup() { return fi echo 'INFO: detected cgroup v1' + # We're looking for the cgroup-path for the cpu controller for the + # current process. this tells us what cgroup-path the container is in. local current_cgroup current_cgroup=$(grep -E '^[^:]*:([^:]*,)?cpu(,[^,:]*)?:.*' /proc/self/cgroup | cut -d: -f3) if [ "$current_cgroup" = "/" ]; then @@ -248,16 +255,14 @@ fix_cgroup() { # See: https://d2iq.com/blog/running-kind-inside-a-kubernetes-cluster-for-continuous-integration # Capture initial state before modifying # - # Basically we're looking for the cgroup-path for the cpu controller for the - # current process. this tells us what cgroup-path the container is in. - # Then we collect the subsystems that are active on this path. + # Then we collect the subsystems that are active on our current process. # We assume the cpu controller is in use on all node containers, # and other controllers use the same sub-path. # # See: https://man7.org/linux/man-pages/man7/cgroups.7.html echo 'INFO: fix cgroup mounts for all subsystems' local cgroup_subsystems - cgroup_subsystems=$(findmnt -lun -o source,target -t cgroup | grep "${current_cgroup}" | awk '{print $2}') + cgroup_subsystems=$(findmnt -lun -o source,target -t cgroup | grep -F "${current_cgroup}" | awk '{print $2}') # Unmount the cgroup subsystems that are not known to runtime used to # run the container we are in. Those subsystems are not properly scoped # (i.e. the root cgroup is exposed, rather than something like docker/xxxx). @@ -268,7 +273,7 @@ fix_cgroup() { # # See https://github.com/kubernetes/kubernetes/issues/109182 local unsupported_cgroups - unsupported_cgroups=$(findmnt -lun -o source,target -t cgroup | grep_allow_nomatch -v "${current_cgroup}" | awk '{print $2}') + unsupported_cgroups=$(findmnt -lun -o source,target -t cgroup | grep_allow_nomatch -v -F "${current_cgroup}" | awk '{print $2}') if [ -n "$unsupported_cgroups" ]; then local mnt echo "$unsupported_cgroups" | @@ -321,9 +326,15 @@ fix_cgroup() { mount --make-rprivate /sys/fs/cgroup echo "${cgroup_subsystems}" | while IFS= read -r subsystem; do - mount_kubelet_cgroup_root "/kubelet" "${subsystem}" - mount_kubelet_cgroup_root "/kubelet.slice" "${subsystem}" + mount_kubelet_cgroup_root /kubelet "${subsystem}" + mount_kubelet_cgroup_root /kubelet.slice "${subsystem}" done + # workaround for hosts not running systemd + # we only do this for kubelet.slice because it's not relevant when not using + # the systemd cgroup driver + if [[ ! "${cgroup_subsystems}" = */sys/fs/cgroup/systemd* ]]; then + mount_kubelet_cgroup_root /kubelet.slice /sys/fs/cgroup/systemd + fi } retryable_fix_cgroup() { @@ -406,13 +417,29 @@ select_iptables() { update-alternatives --set ip6tables "/usr/sbin/ip6tables-${mode}" > /dev/null } +fix_certificate() { + local apiserver_crt_file="/etc/kubernetes/pki/apiserver.crt" + local apiserver_key_file="/etc/kubernetes/pki/apiserver.key" + + # Skip if this Node doesn't run kube-apiserver + if [[ ! -f ${apiserver_crt_file} ]] || [[ ! -f ${apiserver_key_file} ]]; then + return + fi + + # Deletes the certificate for kube-apiserver and generates a new one. + # This is necessary because the old one doesn't match the current IP. + echo 'INFO: clearing and regenerating the certificate for serving the Kubernetes API' >&2 + rm -f ${apiserver_crt_file} ${apiserver_key_file} + kubeadm init phase certs apiserver --config /kind/kubeadm.conf +} + enable_network_magic(){ # well-known docker embedded DNS is at 127.0.0.11:53 local docker_embedded_dns_ip='127.0.0.11' # first we need to detect an IP to use for reaching the docker host local docker_host_ip - docker_host_ip="$( (head -n1 <(getent ahostsv4 'host.docker.internal') | cut -d' ' -f1) || true)" + docker_host_ip="$( (head -n1 <(timeout 5 getent ahostsv4 'host.docker.internal') | cut -d' ' -f1) || true)" # if the ip doesn't exist or is a loopback address use the default gateway if [[ -z "${docker_host_ip}" ]] || [[ $docker_host_ip =~ ^127\.[0-9]+\.[0-9]+\.[0-9]+$ ]]; then docker_host_ip=$(ip -4 route show default | cut -d' ' -f3) @@ -433,8 +460,19 @@ enable_network_magic(){ cp /etc/resolv.conf /etc/resolv.conf.original sed -e "s/${docker_embedded_dns_ip}/${docker_host_ip}/g" /etc/resolv.conf.original >/etc/resolv.conf + local files_to_update=( + /etc/kubernetes/manifests/etcd.yaml + /etc/kubernetes/manifests/kube-apiserver.yaml + /etc/kubernetes/manifests/kube-controller-manager.yaml + /etc/kubernetes/manifests/kube-scheduler.yaml + /etc/kubernetes/controller-manager.conf + /etc/kubernetes/scheduler.conf + /kind/kubeadm.conf + /var/lib/kubelet/kubeadm-flags.env + ) + local should_fix_certificate=false # fixup IPs in manifests ... - curr_ipv4="$( (head -n1 <(getent ahostsv4 "$(hostname)") | cut -d' ' -f1) || true)" + curr_ipv4="$( (head -n1 <(timeout 5 getent ahostsv4 "$(hostname)") | cut -d' ' -f1) || true)" echo "INFO: Detected IPv4 address: ${curr_ipv4}" >&2 if [ -f /kind/old-ipv4 ]; then old_ipv4=$(cat /kind/old-ipv4) @@ -444,17 +482,23 @@ enable_network_magic(){ echo "ERROR: Have an old IPv4 address but no current IPv4 address (!)" >&2 exit 1 fi - # kubernetes manifests are only present on control-plane nodes - sed -i "s#${old_ipv4}#${curr_ipv4}#" /etc/kubernetes/manifests/*.yaml || true - # this is no longer required with autodiscovery - sed -i "s#${old_ipv4}#${curr_ipv4}#" /var/lib/kubelet/kubeadm-flags.env || true + if [[ "${old_ipv4}" != "${curr_ipv4}" ]]; then + should_fix_certificate=true + sed_ipv4_command="s#\b$(regex_escape_ip "${old_ipv4}")\b#${curr_ipv4}#g" + for f in "${files_to_update[@]}"; do + # kubernetes manifests are only present on control-plane nodes + if [[ -f "$f" ]]; then + sed -i "${sed_ipv4_command}" "$f" + fi + done + fi fi if [[ -n $curr_ipv4 ]]; then echo -n "${curr_ipv4}" >/kind/old-ipv4 fi # do IPv6 - curr_ipv6="$( (head -n1 <(getent ahostsv6 "$(hostname)") | cut -d' ' -f1) || true)" + curr_ipv6="$( (head -n1 <(timeout 5 getent ahostsv6 "$(hostname)") | cut -d' ' -f1) || true)" echo "INFO: Detected IPv6 address: ${curr_ipv6}" >&2 if [ -f /kind/old-ipv6 ]; then old_ipv6=$(cat /kind/old-ipv6) @@ -463,14 +507,24 @@ enable_network_magic(){ if [[ -z $curr_ipv6 ]]; then echo "ERROR: Have an old IPv6 address but no current IPv6 address (!)" >&2 fi - # kubernetes manifests are only present on control-plane nodes - sed -i "s#${old_ipv6}#${curr_ipv6}#" /etc/kubernetes/manifests/*.yaml || true - # this is no longer required with autodiscovery - sed -i "s#${old_ipv6}#${curr_ipv6}#" /var/lib/kubelet/kubeadm-flags.env || true + if [[ "${old_ipv6}" != "${curr_ipv6}" ]]; then + should_fix_certificate=true + sed_ipv6_command="s#\b$(regex_escape_ip "${old_ipv6}")\b#${curr_ipv6}#g" + for f in "${files_to_update[@]}"; do + # kubernetes manifests are only present on control-plane nodes + if [[ -f "$f" ]]; then + sed -i "${sed_ipv6_command}" "$f" + fi + done + fi fi if [[ -n $curr_ipv6 ]]; then echo -n "${curr_ipv6}" >/kind/old-ipv6 fi + + if $should_fix_certificate; then + fix_certificate + fi } # validate state diff --git a/pkg/minikube/bootstrapper/images/images.go b/pkg/minikube/bootstrapper/images/images.go index 4492fc6b42..6ee0c36234 100644 --- a/pkg/minikube/bootstrapper/images/images.go +++ b/pkg/minikube/bootstrapper/images/images.go @@ -182,7 +182,7 @@ func KindNet(repo string) string { if repo == "" { repo = "kindest" } - return path.Join(repo, "kindnetd:v20220510-4929dd75") + return path.Join(repo, "kindnetd:v20220607-9a4d8d2a") } // all calico images are from https://docs.projectcalico.org/manifests/calico.yaml From 50c75e951c6020f97265ea8d1682b01c9c80df37 Mon Sep 17 00:00:00 2001 From: klaases Date: Wed, 13 Jul 2022 23:59:54 -0700 Subject: [PATCH 289/545] Ensure k8s ver >= 1.24 for dockerd and cri-dockerd --- pkg/minikube/cruntime/docker.go | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkg/minikube/cruntime/docker.go b/pkg/minikube/cruntime/docker.go index 521f0f7f90..bc2ecab54f 100644 --- a/pkg/minikube/cruntime/docker.go +++ b/pkg/minikube/cruntime/docker.go @@ -106,17 +106,17 @@ func (r *Docker) SocketPath() string { // Available returns an error if it is not possible to use this runtime on a host func (r *Docker) Available() error { - var err error - if _, err = exec.LookPath("docker"); err != nil { - return err + // If Kubernetes version >= 1.24, require both cri-dockerd and dockerd. + if r.KubernetesVersion.GTE(semver.Version{Major: 1, Minor: 24}) { + if _, err := exec.LookPath("cri-dockerd"); err != nil { + return err + } + if _, err := exec.LookPath("dockerd"); err != nil { + return err + } } - if _, err = exec.LookPath("cri-dockerd"); err == nil { - return nil - } - if _, err = exec.LookPath("dockerd"); err == nil { - return nil - } - return errors.New("runtimes were not found: cri-dockerd, dockerd") + _, err := exec.LookPath("docker") + return err } // Active returns if docker is active on the host From 6e22b21bfeec5bc52a7d20735bcd2d7750a1d23f Mon Sep 17 00:00:00 2001 From: Tobias Pfandzelter Date: Thu, 14 Jul 2022 10:27:39 -0700 Subject: [PATCH 290/545] fix inconsistencies in proxy documentation --- site/content/en/docs/handbook/vpn_and_proxy.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/site/content/en/docs/handbook/vpn_and_proxy.md b/site/content/en/docs/handbook/vpn_and_proxy.md index 44e938c167..9042feefb6 100644 --- a/site/content/en/docs/handbook/vpn_and_proxy.md +++ b/site/content/en/docs/handbook/vpn_and_proxy.md @@ -18,7 +18,7 @@ If a HTTP proxy is required to access the internet, you may need to pass the pro * `HTTPS_PROXY` - The URL to your HTTPS proxy * `NO_PROXY` - A comma-separated list of hosts which should not go through the proxy. -The NO_PROXY variable here is important: Without setting it, minikube may not be able to access resources within the VM. minikube uses two IP ranges, which should not go through the proxy: +The NO_PROXY variable here is important: Without setting it, minikube may not be able to access resources within the VM. minikube uses four default IP ranges, which should not go through the proxy: * **192.168.59.0/24**: Used by the minikube VM. Configurable for some hypervisors via `--host-only-cidr` * **192.168.39.0/24**: Used by the minikube kvm2 driver. @@ -34,7 +34,7 @@ One important note: If NO_PROXY is required by non-Kubernetes applications, such ```shell export HTTP_PROXY=http:// export HTTPS_PROXY=https:// -export NO_PROXY=localhost,127.0.0.1,10.96.0.0/12,192.168.59.0/24,192.168.39.0/24 +export NO_PROXY=localhost,127.0.0.1,10.96.0.0/12,192.168.59.0/24,192.168.49.0/24,192.168.39.0/24 minikube start ``` @@ -46,7 +46,7 @@ To make the exported variables permanent, consider adding the declarations to ~/ ```shell set HTTP_PROXY=http:// set HTTPS_PROXY=https:// -set NO_PROXY=localhost,127.0.0.1,10.96.0.0/12,192.168.59.0/24,192.168.39.0/24 +set NO_PROXY=localhost,127.0.0.1,10.96.0.0/12,192.168.59.0/24,192.168.49.0/24,192.168.39.0/24 minikube start ``` From d49a6c8ccfb9d75f3b2b848977d5000d4a530ce8 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Thu, 14 Jul 2022 10:52:46 -0700 Subject: [PATCH 291/545] update docker-env description and add tooltip --- cmd/minikube/cmd/docker-env.go | 2 +- gui/basicview.cpp | 2 ++ site/content/en/docs/commands/docker-env.md | 2 +- translations/de.json | 1 + translations/es.json | 2 +- translations/fr.json | 1 + translations/ja.json | 1 + translations/ko.json | 2 +- translations/pl.json | 1 + translations/ru.json | 2 +- translations/strings.txt | 2 +- translations/zh-CN.json | 1 + 12 files changed, 13 insertions(+), 6 deletions(-) diff --git a/cmd/minikube/cmd/docker-env.go b/cmd/minikube/cmd/docker-env.go index 9f41275188..1d98604173 100644 --- a/cmd/minikube/cmd/docker-env.go +++ b/cmd/minikube/cmd/docker-env.go @@ -241,7 +241,7 @@ func waitForAPIServerProcess(cr command.Runner, start time.Time, timeout time.Du var dockerEnvCmd = &cobra.Command{ Use: "docker-env", Short: "Configure environment to use minikube's Docker daemon", - Long: `Sets up docker env variables; similar to '$(docker-machine env)'.`, + Long: `Sets Docker's env variables to point to the Docker instance inside minikube.`, Run: func(cmd *cobra.Command, args []string) { var err error diff --git a/gui/basicview.cpp b/gui/basicview.cpp index 8d19ec9d97..268eb7ce3a 100644 --- a/gui/basicview.cpp +++ b/gui/basicview.cpp @@ -12,6 +12,8 @@ BasicView::BasicView() deleteButton = new QPushButton(tr("Delete")); refreshButton = new QPushButton(tr("Refresh")); dockerEnvButton = new QPushButton(tr("docker-env")); + dockerEnvButton->setToolTip( + "Sets Docker's env variables to point to the Docker instance inside minikube."); sshButton = new QPushButton(tr("SSH")); dashboardButton = new QPushButton(tr("Dashboard")); advancedButton = new QPushButton(tr("Advanced View")); diff --git a/site/content/en/docs/commands/docker-env.md b/site/content/en/docs/commands/docker-env.md index 30bcbc8439..839d4fe73b 100644 --- a/site/content/en/docs/commands/docker-env.md +++ b/site/content/en/docs/commands/docker-env.md @@ -11,7 +11,7 @@ Configure environment to use minikube's Docker daemon ### Synopsis -Sets up docker env variables; similar to '$(docker-machine env)'. +Sets Docker's env variables to point to the Docker instance inside minikube. ```shell minikube docker-env [flags] diff --git a/translations/de.json b/translations/de.json index 0635de4bd1..bd971849c3 100644 --- a/translations/de.json +++ b/translations/de.json @@ -575,6 +575,7 @@ "Set flag to stop all profiles (clusters)": "Setze Flag um alle Profile (Cluster) zu stoppen", "Set flag to stop cluster after a set amount of time (e.g. --schedule=5m)": "Setze Flag um den Cluster nach einer angegebenen Zeit zu stoppen (z.B. --schedule=5m)", "Set this flag to delete the '.minikube' folder from your user directory.": "Setze dieses Flag um das '.minikube' Verzeichnis aus deinem Benutzer Verzeichnis zu löschen.", + "Sets Docker's env variables to point to the Docker instance inside minikube.": "", "Sets an individual value in a minikube config file": "Setzt einen individuellen Wert in der Minikube Konfigurations-Datei", "Sets the PROPERTY_NAME config value to PROPERTY_VALUE\n\tThese values can be overwritten by flags or environment variables at runtime.": "Setzt den Wert von PROPERTY_NAME zu PROPERTY_VALUE\n\tDiese Werte können durch Parameter oder Umgebungsvariablen zur Laufzeit überschrieben werden.", "Sets up docker env variables; similar to '$(docker-machine env)'.": "Setzt Docker env Variablen; ähnlich wie '$(docker-machine env)'.", diff --git a/translations/es.json b/translations/es.json index 8ba0093c15..6e879950b5 100644 --- a/translations/es.json +++ b/translations/es.json @@ -581,9 +581,9 @@ "Set flag to stop all profiles (clusters)": "", "Set flag to stop cluster after a set amount of time (e.g. --schedule=5m)": "", "Set this flag to delete the '.minikube' folder from your user directory.": "", + "Sets Docker's env variables to point to the Docker instance inside minikube.": "", "Sets an individual value in a minikube config file": "", "Sets the PROPERTY_NAME config value to PROPERTY_VALUE\n\tThese values can be overwritten by flags or environment variables at runtime.": "", - "Sets up docker env variables; similar to '$(docker-machine env)'.": "", "Sets up podman env variables; similar to '$(podman-machine env)'.": "", "Setting profile failed": "", "Show a list of global command-line options (applies to all commands).": "", diff --git a/translations/fr.json b/translations/fr.json index de76b6f707..2255417711 100644 --- a/translations/fr.json +++ b/translations/fr.json @@ -559,6 +559,7 @@ "Set flag to stop all profiles (clusters)": "Définir un indicateur pour arrêter tous les profils (clusters)", "Set flag to stop cluster after a set amount of time (e.g. --schedule=5m)": "Définir un indicateur pour arrêter le cluster après un laps de temps défini (par exemple, --schedule=5m)", "Set this flag to delete the '.minikube' folder from your user directory.": "Définissez cet indicateur pour supprimer le dossier '.minikube' de votre répertoire utilisateur.", + "Sets Docker's env variables to point to the Docker instance inside minikube.": "", "Sets an individual value in a minikube config file": "Définit une valeur individuelle dans un fichier de configuration minikube", "Sets the PROPERTY_NAME config value to PROPERTY_VALUE\n\tThese values can be overwritten by flags or environment variables at runtime.": "Définit la valeur de configuration PROPERTY_NAME sur PROPERTY_VALUE\n\tCes valeurs peuvent être écrasées par des indicateurs ou des variables d'environnement lors de l'exécution.", "Sets up docker env variables; similar to '$(docker-machine env)'.": "Configure les variables d'environnement docker ; similaire à '$(docker-machine env)'.", diff --git a/translations/ja.json b/translations/ja.json index 2953adc1a8..0c21e03399 100644 --- a/translations/ja.json +++ b/translations/ja.json @@ -575,6 +575,7 @@ "Set flag to stop all profiles (clusters)": "全プロファイル (クラスター) を停止します", "Set flag to stop cluster after a set amount of time (e.g. --schedule=5m)": "設定時間後にクラスターを停止します (例: --schedule=5m)", "Set this flag to delete the '.minikube' folder from your user directory.": "あなたのユーザーディレクトリー中の '.minikube' フォルダーを削除します。", + "Sets Docker's env variables to point to the Docker instance inside minikube.": "", "Sets an individual value in a minikube config file": "minikube 設定ファイルの個別の値を設定します", "Sets the PROPERTY_NAME config value to PROPERTY_VALUE\n\tThese values can be overwritten by flags or environment variables at runtime.": "PROPERTY_NAME の設定値を PROPERTY_VALUE に設定します\n\tこれらの値はランタイムのフラグまたは環境変数で上書きできます。", "Sets up docker env variables; similar to '$(docker-machine env)'.": "docker 環境変数を設定します。'$(docker-machine env)' と同様です。", diff --git a/translations/ko.json b/translations/ko.json index ff2652b372..ef9bd5b925 100644 --- a/translations/ko.json +++ b/translations/ko.json @@ -593,9 +593,9 @@ "Set flag to stop all profiles (clusters)": "", "Set flag to stop cluster after a set amount of time (e.g. --schedule=5m)": "", "Set this flag to delete the '.minikube' folder from your user directory.": "", + "Sets Docker's env variables to point to the Docker instance inside minikube.": "", "Sets an individual value in a minikube config file": "", "Sets the PROPERTY_NAME config value to PROPERTY_VALUE\n\tThese values can be overwritten by flags or environment variables at runtime.": "", - "Sets up docker env variables; similar to '$(docker-machine env)'.": "", "Sets up podman env variables; similar to '$(podman-machine env)'.": "", "Setting profile failed": "프로필 설정이 실패하였습니다", "Show a list of global command-line options (applies to all commands).": "", diff --git a/translations/pl.json b/translations/pl.json index 76744769f7..1912b0cc69 100644 --- a/translations/pl.json +++ b/translations/pl.json @@ -595,6 +595,7 @@ "Set flag to stop all profiles (clusters)": "", "Set flag to stop cluster after a set amount of time (e.g. --schedule=5m)": "", "Set this flag to delete the '.minikube' folder from your user directory.": "", + "Sets Docker's env variables to point to the Docker instance inside minikube.": "", "Sets an individual value in a minikube config file": "", "Sets the PROPERTY_NAME config value to PROPERTY_VALUE\n\tThese values can be overwritten by flags or environment variables at runtime.": "", "Sets up docker env variables; similar to '$(docker-machine env)'": "Ustawia zmienne środowiskowe dockera. Podobne do `(docker-machine env)`", diff --git a/translations/ru.json b/translations/ru.json index bf9067b064..327f770eb1 100644 --- a/translations/ru.json +++ b/translations/ru.json @@ -541,9 +541,9 @@ "Set flag to stop all profiles (clusters)": "", "Set flag to stop cluster after a set amount of time (e.g. --schedule=5m)": "", "Set this flag to delete the '.minikube' folder from your user directory.": "", + "Sets Docker's env variables to point to the Docker instance inside minikube.": "", "Sets an individual value in a minikube config file": "", "Sets the PROPERTY_NAME config value to PROPERTY_VALUE\n\tThese values can be overwritten by flags or environment variables at runtime.": "", - "Sets up docker env variables; similar to '$(docker-machine env)'.": "", "Sets up podman env variables; similar to '$(podman-machine env)'.": "", "Setting profile failed": "", "Show a list of global command-line options (applies to all commands).": "", diff --git a/translations/strings.txt b/translations/strings.txt index 7dd30d3eaa..3c2b860c07 100644 --- a/translations/strings.txt +++ b/translations/strings.txt @@ -541,9 +541,9 @@ "Set flag to stop all profiles (clusters)": "", "Set flag to stop cluster after a set amount of time (e.g. --schedule=5m)": "", "Set this flag to delete the '.minikube' folder from your user directory.": "", + "Sets Docker's env variables to point to the Docker instance inside minikube.": "", "Sets an individual value in a minikube config file": "", "Sets the PROPERTY_NAME config value to PROPERTY_VALUE\n\tThese values can be overwritten by flags or environment variables at runtime.": "", - "Sets up docker env variables; similar to '$(docker-machine env)'.": "", "Sets up podman env variables; similar to '$(podman-machine env)'.": "", "Setting profile failed": "", "Show a list of global command-line options (applies to all commands).": "", diff --git a/translations/zh-CN.json b/translations/zh-CN.json index 899e5e2a89..39ecd92f05 100644 --- a/translations/zh-CN.json +++ b/translations/zh-CN.json @@ -675,6 +675,7 @@ "Set flag to stop all profiles (clusters)": "", "Set flag to stop cluster after a set amount of time (e.g. --schedule=5m)": "", "Set this flag to delete the '.minikube' folder from your user directory.": "设置这个标志来删除您用户目录下的 '.minikube' 文件夹。", + "Sets Docker's env variables to point to the Docker instance inside minikube.": "", "Sets an individual value in a minikube config file": "", "Sets the PROPERTY_NAME config value to PROPERTY_VALUE\n\tThese values can be overwritten by flags or environment variables at runtime.": "", "Sets up docker env variables; similar to '$(docker-machine env)'": "设置 docker env 变量；类似于 '$(docker-machine env)'", From af662f6b3ac10af7b530a939906204a7a2814d51 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Thu, 14 Jul 2022 14:22:11 -0700 Subject: [PATCH 292/545] update wording --- cmd/minikube/cmd/docker-env.go | 9 +++++++-- gui/basicview.cpp | 3 ++- site/content/en/docs/commands/docker-env.md | 11 ++++++++--- translations/de.json | 3 ++- translations/es.json | 3 ++- translations/fr.json | 3 ++- translations/ja.json | 3 ++- translations/ko.json | 4 ++-- translations/pl.json | 4 ++-- translations/ru.json | 4 ++-- translations/strings.txt | 4 ++-- translations/zh-CN.json | 3 ++- 12 files changed, 35 insertions(+), 19 deletions(-) diff --git a/cmd/minikube/cmd/docker-env.go b/cmd/minikube/cmd/docker-env.go index 1d98604173..2c436b44ec 100644 --- a/cmd/minikube/cmd/docker-env.go +++ b/cmd/minikube/cmd/docker-env.go @@ -240,8 +240,13 @@ func waitForAPIServerProcess(cr command.Runner, start time.Time, timeout time.Du // dockerEnvCmd represents the docker-env command var dockerEnvCmd = &cobra.Command{ Use: "docker-env", - Short: "Configure environment to use minikube's Docker daemon", - Long: `Sets Docker's env variables to point to the Docker instance inside minikube.`, + Short: "Provides instructions to point your terminal's docker-cli to the Docker Engine inside minikube. (Useful for building docker images directly inside minikube)", + Long: `Provides instructions to point your terminal's docker-cli to the Docker Engine inside minikube. (Useful for building docker images directly inside minikube) + +For example, you can do all docker operations such as docker build, docker run, and docker ps directly on the docker inside minikube. + +Note: You need the docker-cli to be installed on your machine. +docker-cli install instructions: https://minikube.sigs.k8s.io/docs/tutorials/docker_desktop_replacement/#steps`, Run: func(cmd *cobra.Command, args []string) { var err error diff --git a/gui/basicview.cpp b/gui/basicview.cpp index 268eb7ce3a..1b3a32b835 100644 --- a/gui/basicview.cpp +++ b/gui/basicview.cpp @@ -13,7 +13,8 @@ BasicView::BasicView() refreshButton = new QPushButton(tr("Refresh")); dockerEnvButton = new QPushButton(tr("docker-env")); dockerEnvButton->setToolTip( - "Sets Docker's env variables to point to the Docker instance inside minikube."); + "Opens a terminal where the docker-cli points to docker engine inside minikube (Useful " + "for building docker images directly inside minikube)"); sshButton = new QPushButton(tr("SSH")); dashboardButton = new QPushButton(tr("Dashboard")); advancedButton = new QPushButton(tr("Advanced View")); diff --git a/site/content/en/docs/commands/docker-env.md b/site/content/en/docs/commands/docker-env.md index 839d4fe73b..ae4b2761f0 100644 --- a/site/content/en/docs/commands/docker-env.md +++ b/site/content/en/docs/commands/docker-env.md @@ -1,17 +1,22 @@ --- title: "docker-env" description: > - Configure environment to use minikube's Docker daemon + Provides instructions to point your terminal's docker-cli to the Docker Engine inside minikube. (Useful for building docker images directly inside minikube) --- ## minikube docker-env -Configure environment to use minikube's Docker daemon +Provides instructions to point your terminal's docker-cli to the Docker Engine inside minikube. (Useful for building docker images directly inside minikube) ### Synopsis -Sets Docker's env variables to point to the Docker instance inside minikube. +Provides instructions to point your terminal's docker-cli to the Docker Engine inside minikube. (Useful for building docker images directly inside minikube) + +For example, you can do all docker operations such as docker build, docker run, and docker ps directly on the docker inside minikube. + +Note: You need the docker-cli to be installed on your machine. +docker-cli install instructions: https://minikube.sigs.k8s.io/docs/tutorials/docker_desktop_replacement/#steps ```shell minikube docker-env [flags] diff --git a/translations/de.json b/translations/de.json index bd971849c3..aaa2225ac3 100644 --- a/translations/de.json +++ b/translations/de.json @@ -503,6 +503,8 @@ "Profile name '{{.profilename}}' is not valid": "Der Profilename '{{.profilename}}' ist nicht valide", "Profile name should be unique": "Der Profilname sollte einzigartig sein", "Provide VM UUID to restore MAC address (hyperkit driver only)": "Geben Sie die VM-UUID an, um die MAC-Adresse wiederherzustellen (nur Hyperkit-Treiber)", + "Provides instructions to point your terminal's docker-cli to the Docker Engine inside minikube. (Useful for building docker images directly inside minikube)": "", + "Provides instructions to point your terminal's docker-cli to the Docker Engine inside minikube. (Useful for building docker images directly inside minikube)\n\nFor example, you can do all docker operations such as docker build, docker run, and docker ps directly on the docker inside minikube.\n\nNote: You need the docker-cli to be installed on your machine.\ndocker-cli install instructions: https://minikube.sigs.k8s.io/docs/tutorials/docker_desktop_replacement/#steps": "", "Pull images": "Ziehe (pull) Images", "Pull the remote image (no caching)": "Ziehe (pull) das Remote Image (kein Caching)", "Pulling base image ...": "Ziehe das Base Image ...", @@ -575,7 +577,6 @@ "Set flag to stop all profiles (clusters)": "Setze Flag um alle Profile (Cluster) zu stoppen", "Set flag to stop cluster after a set amount of time (e.g. --schedule=5m)": "Setze Flag um den Cluster nach einer angegebenen Zeit zu stoppen (z.B. --schedule=5m)", "Set this flag to delete the '.minikube' folder from your user directory.": "Setze dieses Flag um das '.minikube' Verzeichnis aus deinem Benutzer Verzeichnis zu löschen.", - "Sets Docker's env variables to point to the Docker instance inside minikube.": "", "Sets an individual value in a minikube config file": "Setzt einen individuellen Wert in der Minikube Konfigurations-Datei", "Sets the PROPERTY_NAME config value to PROPERTY_VALUE\n\tThese values can be overwritten by flags or environment variables at runtime.": "Setzt den Wert von PROPERTY_NAME zu PROPERTY_VALUE\n\tDiese Werte können durch Parameter oder Umgebungsvariablen zur Laufzeit überschrieben werden.", "Sets up docker env variables; similar to '$(docker-machine env)'.": "Setzt Docker env Variablen; ähnlich wie '$(docker-machine env)'.", diff --git a/translations/es.json b/translations/es.json index 6e879950b5..1ca6f412ac 100644 --- a/translations/es.json +++ b/translations/es.json @@ -510,6 +510,8 @@ "Profile name '{{.profilename}}' is not valid": "", "Profile name should be unique": "", "Provide VM UUID to restore MAC address (hyperkit driver only)": "Permite especificar un UUID de VM para restaurar la dirección MAC (solo con el controlador de hyperkit)", + "Provides instructions to point your terminal's docker-cli to the Docker Engine inside minikube. (Useful for building docker images directly inside minikube)": "", + "Provides instructions to point your terminal's docker-cli to the Docker Engine inside minikube. (Useful for building docker images directly inside minikube)\n\nFor example, you can do all docker operations such as docker build, docker run, and docker ps directly on the docker inside minikube.\n\nNote: You need the docker-cli to be installed on your machine.\ndocker-cli install instructions: https://minikube.sigs.k8s.io/docs/tutorials/docker_desktop_replacement/#steps": "", "Pull images": "", "Pull the remote image (no caching)": "", "Pulling base image ...": "", @@ -581,7 +583,6 @@ "Set flag to stop all profiles (clusters)": "", "Set flag to stop cluster after a set amount of time (e.g. --schedule=5m)": "", "Set this flag to delete the '.minikube' folder from your user directory.": "", - "Sets Docker's env variables to point to the Docker instance inside minikube.": "", "Sets an individual value in a minikube config file": "", "Sets the PROPERTY_NAME config value to PROPERTY_VALUE\n\tThese values can be overwritten by flags or environment variables at runtime.": "", "Sets up podman env variables; similar to '$(podman-machine env)'.": "", diff --git a/translations/fr.json b/translations/fr.json index 2255417711..316168ffcc 100644 --- a/translations/fr.json +++ b/translations/fr.json @@ -491,6 +491,8 @@ "Profile name '{{.profilename}}' is not valid": "Le nom de profil '{{.profilename}}' n'est pas valide", "Profile name should be unique": "Le nom du profil doit être unique", "Provide VM UUID to restore MAC address (hyperkit driver only)": "Fournit l'identifiant unique universel (UUID) de la VM pour restaurer l'adresse MAC (pilote hyperkit uniquement).", + "Provides instructions to point your terminal's docker-cli to the Docker Engine inside minikube. (Useful for building docker images directly inside minikube)": "", + "Provides instructions to point your terminal's docker-cli to the Docker Engine inside minikube. (Useful for building docker images directly inside minikube)\n\nFor example, you can do all docker operations such as docker build, docker run, and docker ps directly on the docker inside minikube.\n\nNote: You need the docker-cli to be installed on your machine.\ndocker-cli install instructions: https://minikube.sigs.k8s.io/docs/tutorials/docker_desktop_replacement/#steps": "", "Pull images": "Extraction des images", "Pull the remote image (no caching)": "Extraire l'image distante (pas de mise en cache)", "Pulling base image ...": "Extraction de l'image de base...", @@ -559,7 +561,6 @@ "Set flag to stop all profiles (clusters)": "Définir un indicateur pour arrêter tous les profils (clusters)", "Set flag to stop cluster after a set amount of time (e.g. --schedule=5m)": "Définir un indicateur pour arrêter le cluster après un laps de temps défini (par exemple, --schedule=5m)", "Set this flag to delete the '.minikube' folder from your user directory.": "Définissez cet indicateur pour supprimer le dossier '.minikube' de votre répertoire utilisateur.", - "Sets Docker's env variables to point to the Docker instance inside minikube.": "", "Sets an individual value in a minikube config file": "Définit une valeur individuelle dans un fichier de configuration minikube", "Sets the PROPERTY_NAME config value to PROPERTY_VALUE\n\tThese values can be overwritten by flags or environment variables at runtime.": "Définit la valeur de configuration PROPERTY_NAME sur PROPERTY_VALUE\n\tCes valeurs peuvent être écrasées par des indicateurs ou des variables d'environnement lors de l'exécution.", "Sets up docker env variables; similar to '$(docker-machine env)'.": "Configure les variables d'environnement docker ; similaire à '$(docker-machine env)'.", diff --git a/translations/ja.json b/translations/ja.json index 0c21e03399..0c7858920f 100644 --- a/translations/ja.json +++ b/translations/ja.json @@ -502,6 +502,8 @@ "Profile name '{{.profilename}}' is not valid": "プロファイル名 '{{.profilename}}' は無効です", "Profile name should be unique": "プロファイル名は単一でなければなりません", "Provide VM UUID to restore MAC address (hyperkit driver only)": "MAC アドレスを復元するための VM UUID を指定します (hyperkit ドライバーのみ)", + "Provides instructions to point your terminal's docker-cli to the Docker Engine inside minikube. (Useful for building docker images directly inside minikube)": "", + "Provides instructions to point your terminal's docker-cli to the Docker Engine inside minikube. (Useful for building docker images directly inside minikube)\n\nFor example, you can do all docker operations such as docker build, docker run, and docker ps directly on the docker inside minikube.\n\nNote: You need the docker-cli to be installed on your machine.\ndocker-cli install instructions: https://minikube.sigs.k8s.io/docs/tutorials/docker_desktop_replacement/#steps": "", "Pull images": "イメージを取得します", "Pull the remote image (no caching)": "リモートイメージを取得します (キャッシュなし)", "Pulling base image ...": "ベースイメージを取得しています...", @@ -575,7 +577,6 @@ "Set flag to stop all profiles (clusters)": "全プロファイル (クラスター) を停止します", "Set flag to stop cluster after a set amount of time (e.g. --schedule=5m)": "設定時間後にクラスターを停止します (例: --schedule=5m)", "Set this flag to delete the '.minikube' folder from your user directory.": "あなたのユーザーディレクトリー中の '.minikube' フォルダーを削除します。", - "Sets Docker's env variables to point to the Docker instance inside minikube.": "", "Sets an individual value in a minikube config file": "minikube 設定ファイルの個別の値を設定します", "Sets the PROPERTY_NAME config value to PROPERTY_VALUE\n\tThese values can be overwritten by flags or environment variables at runtime.": "PROPERTY_NAME の設定値を PROPERTY_VALUE に設定します\n\tこれらの値はランタイムのフラグまたは環境変数で上書きできます。", "Sets up docker env variables; similar to '$(docker-machine env)'.": "docker 環境変数を設定します。'$(docker-machine env)' と同様です。", diff --git a/translations/ko.json b/translations/ko.json index ef9bd5b925..8a59af7719 100644 --- a/translations/ko.json +++ b/translations/ko.json @@ -112,7 +112,6 @@ "Configuration and Management Commands:": "환경 설정 및 관리 명령어:", "Configure a default route on this Linux host, or use another --driver that does not require it": "", "Configure an external network switch following the official documentation, then add `--hyperv-virtual-switch=\u003cswitch-name\u003e` to `minikube start`": "", - "Configure environment to use minikube's Docker daemon": "", "Configure environment to use minikube's Podman service": "", "Configures the addon w/ADDON_NAME within minikube (example: minikube addons configure registry-creds). For a list of available addons use: minikube addons list": "", "Configuring RBAC rules ...": "RBAC 규칙을 구성하는 중 ...", @@ -524,6 +523,8 @@ "Profile name '{{.profilename}}' is not valid": "", "Profile name should be unique": "", "Provide VM UUID to restore MAC address (hyperkit driver only)": "", + "Provides instructions to point your terminal's docker-cli to the Docker Engine inside minikube. (Useful for building docker images directly inside minikube)": "", + "Provides instructions to point your terminal's docker-cli to the Docker Engine inside minikube. (Useful for building docker images directly inside minikube)\n\nFor example, you can do all docker operations such as docker build, docker run, and docker ps directly on the docker inside minikube.\n\nNote: You need the docker-cli to be installed on your machine.\ndocker-cli install instructions: https://minikube.sigs.k8s.io/docs/tutorials/docker_desktop_replacement/#steps": "", "Pull images": "", "Pull the remote image (no caching)": "", "Pulling base image ...": "베이스 이미지를 다운받는 중 ...", @@ -593,7 +594,6 @@ "Set flag to stop all profiles (clusters)": "", "Set flag to stop cluster after a set amount of time (e.g. --schedule=5m)": "", "Set this flag to delete the '.minikube' folder from your user directory.": "", - "Sets Docker's env variables to point to the Docker instance inside minikube.": "", "Sets an individual value in a minikube config file": "", "Sets the PROPERTY_NAME config value to PROPERTY_VALUE\n\tThese values can be overwritten by flags or environment variables at runtime.": "", "Sets up podman env variables; similar to '$(podman-machine env)'.": "", diff --git a/translations/pl.json b/translations/pl.json index 1912b0cc69..b3a21a6cce 100644 --- a/translations/pl.json +++ b/translations/pl.json @@ -108,7 +108,6 @@ "Configuration and Management Commands:": "Polecenia konfiguracji i zarządzania", "Configure a default route on this Linux host, or use another --driver that does not require it": "", "Configure an external network switch following the official documentation, then add `--hyperv-virtual-switch=\u003cswitch-name\u003e` to `minikube start`": "", - "Configure environment to use minikube's Docker daemon": "", "Configure environment to use minikube's Podman service": "", "Configures the addon w/ADDON_NAME within minikube (example: minikube addons configure registry-creds). For a list of available addons use: minikube addons list": "", "Configuring RBAC rules ...": "Konfigurowanie zasad RBAC ...", @@ -522,6 +521,8 @@ "Profile name '{{.profilename}}' is not valid": "", "Profile name should be unique": "", "Provide VM UUID to restore MAC address (hyperkit driver only)": "", + "Provides instructions to point your terminal's docker-cli to the Docker Engine inside minikube. (Useful for building docker images directly inside minikube)": "", + "Provides instructions to point your terminal's docker-cli to the Docker Engine inside minikube. (Useful for building docker images directly inside minikube)\n\nFor example, you can do all docker operations such as docker build, docker run, and docker ps directly on the docker inside minikube.\n\nNote: You need the docker-cli to be installed on your machine.\ndocker-cli install instructions: https://minikube.sigs.k8s.io/docs/tutorials/docker_desktop_replacement/#steps": "", "Pull images": "", "Pull the remote image (no caching)": "", "Pulling base image ...": "", @@ -595,7 +596,6 @@ "Set flag to stop all profiles (clusters)": "", "Set flag to stop cluster after a set amount of time (e.g. --schedule=5m)": "", "Set this flag to delete the '.minikube' folder from your user directory.": "", - "Sets Docker's env variables to point to the Docker instance inside minikube.": "", "Sets an individual value in a minikube config file": "", "Sets the PROPERTY_NAME config value to PROPERTY_VALUE\n\tThese values can be overwritten by flags or environment variables at runtime.": "", "Sets up docker env variables; similar to '$(docker-machine env)'": "Ustawia zmienne środowiskowe dockera. Podobne do `(docker-machine env)`", diff --git a/translations/ru.json b/translations/ru.json index 327f770eb1..d3439ebad9 100644 --- a/translations/ru.json +++ b/translations/ru.json @@ -99,7 +99,6 @@ "Configuration and Management Commands:": "", "Configure a default route on this Linux host, or use another --driver that does not require it": "", "Configure an external network switch following the official documentation, then add `--hyperv-virtual-switch=\u003cswitch-name\u003e` to `minikube start`": "", - "Configure environment to use minikube's Docker daemon": "", "Configure environment to use minikube's Podman service": "", "Configures the addon w/ADDON_NAME within minikube (example: minikube addons configure registry-creds). For a list of available addons use: minikube addons list": "", "Configuring RBAC rules ...": "", @@ -474,6 +473,8 @@ "Profile name '{{.profilename}}' is not valid": "", "Profile name should be unique": "", "Provide VM UUID to restore MAC address (hyperkit driver only)": "", + "Provides instructions to point your terminal's docker-cli to the Docker Engine inside minikube. (Useful for building docker images directly inside minikube)": "", + "Provides instructions to point your terminal's docker-cli to the Docker Engine inside minikube. (Useful for building docker images directly inside minikube)\n\nFor example, you can do all docker operations such as docker build, docker run, and docker ps directly on the docker inside minikube.\n\nNote: You need the docker-cli to be installed on your machine.\ndocker-cli install instructions: https://minikube.sigs.k8s.io/docs/tutorials/docker_desktop_replacement/#steps": "", "Pull images": "", "Pull the remote image (no caching)": "", "Pulling base image ...": "Скачивается базовый образ ...", @@ -541,7 +542,6 @@ "Set flag to stop all profiles (clusters)": "", "Set flag to stop cluster after a set amount of time (e.g. --schedule=5m)": "", "Set this flag to delete the '.minikube' folder from your user directory.": "", - "Sets Docker's env variables to point to the Docker instance inside minikube.": "", "Sets an individual value in a minikube config file": "", "Sets the PROPERTY_NAME config value to PROPERTY_VALUE\n\tThese values can be overwritten by flags or environment variables at runtime.": "", "Sets up podman env variables; similar to '$(podman-machine env)'.": "", diff --git a/translations/strings.txt b/translations/strings.txt index 3c2b860c07..618de0c47b 100644 --- a/translations/strings.txt +++ b/translations/strings.txt @@ -99,7 +99,6 @@ "Configuration and Management Commands:": "", "Configure a default route on this Linux host, or use another --driver that does not require it": "", "Configure an external network switch following the official documentation, then add `--hyperv-virtual-switch=\u003cswitch-name\u003e` to `minikube start`": "", - "Configure environment to use minikube's Docker daemon": "", "Configure environment to use minikube's Podman service": "", "Configures the addon w/ADDON_NAME within minikube (example: minikube addons configure registry-creds). For a list of available addons use: minikube addons list": "", "Configuring RBAC rules ...": "", @@ -474,6 +473,8 @@ "Profile name '{{.profilename}}' is not valid": "", "Profile name should be unique": "", "Provide VM UUID to restore MAC address (hyperkit driver only)": "", + "Provides instructions to point your terminal's docker-cli to the Docker Engine inside minikube. (Useful for building docker images directly inside minikube)": "", + "Provides instructions to point your terminal's docker-cli to the Docker Engine inside minikube. (Useful for building docker images directly inside minikube)\n\nFor example, you can do all docker operations such as docker build, docker run, and docker ps directly on the docker inside minikube.\n\nNote: You need the docker-cli to be installed on your machine.\ndocker-cli install instructions: https://minikube.sigs.k8s.io/docs/tutorials/docker_desktop_replacement/#steps": "", "Pull images": "", "Pull the remote image (no caching)": "", "Pulling base image ...": "", @@ -541,7 +542,6 @@ "Set flag to stop all profiles (clusters)": "", "Set flag to stop cluster after a set amount of time (e.g. --schedule=5m)": "", "Set this flag to delete the '.minikube' folder from your user directory.": "", - "Sets Docker's env variables to point to the Docker instance inside minikube.": "", "Sets an individual value in a minikube config file": "", "Sets the PROPERTY_NAME config value to PROPERTY_VALUE\n\tThese values can be overwritten by flags or environment variables at runtime.": "", "Sets up podman env variables; similar to '$(podman-machine env)'.": "", diff --git a/translations/zh-CN.json b/translations/zh-CN.json index 39ecd92f05..e66435295d 100644 --- a/translations/zh-CN.json +++ b/translations/zh-CN.json @@ -595,6 +595,8 @@ "Profile name '{{.profilename}}' is not valid": "", "Profile name should be unique": "", "Provide VM UUID to restore MAC address (hyperkit driver only)": "提供虚拟机 UUID 以恢复 MAC 地址（仅限 hyperkit 驱动程序）", + "Provides instructions to point your terminal's docker-cli to the Docker Engine inside minikube. (Useful for building docker images directly inside minikube)": "", + "Provides instructions to point your terminal's docker-cli to the Docker Engine inside minikube. (Useful for building docker images directly inside minikube)\n\nFor example, you can do all docker operations such as docker build, docker run, and docker ps directly on the docker inside minikube.\n\nNote: You need the docker-cli to be installed on your machine.\ndocker-cli install instructions: https://minikube.sigs.k8s.io/docs/tutorials/docker_desktop_replacement/#steps": "", "Pull images": "", "Pull the remote image (no caching)": "", "Pulling base image ...": "", @@ -675,7 +677,6 @@ "Set flag to stop all profiles (clusters)": "", "Set flag to stop cluster after a set amount of time (e.g. --schedule=5m)": "", "Set this flag to delete the '.minikube' folder from your user directory.": "设置这个标志来删除您用户目录下的 '.minikube' 文件夹。", - "Sets Docker's env variables to point to the Docker instance inside minikube.": "", "Sets an individual value in a minikube config file": "", "Sets the PROPERTY_NAME config value to PROPERTY_VALUE\n\tThese values can be overwritten by flags or environment variables at runtime.": "", "Sets up docker env variables; similar to '$(docker-machine env)'": "设置 docker env 变量；类似于 '$(docker-machine env)'", From f1a95fb87aab8dd8d2257fd656bc900a935a3fe0 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Thu, 14 Jul 2022 14:24:39 -0700 Subject: [PATCH 293/545] add newline to GUI tooltip --- gui/basicview.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gui/basicview.cpp b/gui/basicview.cpp index 1b3a32b835..52ba216289 100644 --- a/gui/basicview.cpp +++ b/gui/basicview.cpp @@ -13,8 +13,8 @@ BasicView::BasicView() refreshButton = new QPushButton(tr("Refresh")); dockerEnvButton = new QPushButton(tr("docker-env")); dockerEnvButton->setToolTip( - "Opens a terminal where the docker-cli points to docker engine inside minikube (Useful " - "for building docker images directly inside minikube)"); + "Opens a terminal where the docker-cli points to docker engine inside " + "minikube\n(Useful for building docker images directly inside minikube)"); sshButton = new QPushButton(tr("SSH")); dashboardButton = new QPushButton(tr("Dashboard")); advancedButton = new QPushButton(tr("Advanced View")); From 4e3ae182fc23727764d20a7016342d1e3cec68b6 Mon Sep 17 00:00:00 2001 From: Siddhant Date: Fri, 15 Jul 2022 09:47:26 +0530 Subject: [PATCH 294/545] Added docker.io to a few files in addons.go --- pkg/minikube/assets/addons.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkg/minikube/assets/addons.go b/pkg/minikube/assets/addons.go index 47b7bd139c..faa0cfb83a 100755 --- a/pkg/minikube/assets/addons.go +++ b/pkg/minikube/assets/addons.go @@ -136,8 +136,8 @@ var Addons = map[string]*Addon{ MustBinAsset(addons.DashboardAssets, "dashboard/dashboard-secret.yaml", vmpath.GuestAddonsDir, "dashboard-secret.yaml", "0640"), MustBinAsset(addons.DashboardAssets, "dashboard/dashboard-svc.yaml", vmpath.GuestAddonsDir, "dashboard-svc.yaml", "0640"), }, false, "dashboard", "Kubernetes", "https://minikube.sigs.k8s.io/docs/handbook/dashboard/", map[string]string{ - "Dashboard": "kubernetesui/dashboard:v2.6.0@sha256:4af9580485920635d888efe1eddbd67e12f9d5d84dba87100e93feb4e46636b3", - "MetricsScraper": "kubernetesui/metrics-scraper:v1.0.8@sha256:76049887f07a0476dc93efc2d3569b9529bf982b22d29f356092ce206e98765c", + "Dashboard": "docker.io/kubernetesui/dashboard:v2.6.0@sha256:4af9580485920635d888efe1eddbd67e12f9d5d84dba87100e93feb4e46636b3", + "MetricsScraper": "docker.io/kubernetesui/metrics-scraper:v1.0.8@sha256:76049887f07a0476dc93efc2d3569b9529bf982b22d29f356092ce206e98765c", }, nil), "default-storageclass": NewAddon([]*BinAsset{ MustBinAsset(addons.DefaultStorageClassAssets, @@ -186,9 +186,9 @@ var Addons = map[string]*Addon{ "storage-provisioner-glusterfile.yaml", "0640"), }, false, "storage-provisioner-gluster", "", "", map[string]string{ - "Heketi": "heketi/heketi:10@sha256:76d5a6a3b7cf083d1e99efa1c15abedbc5c8b73bef3ade299ce9a4c16c9660f8", + "Heketi": "docker.io/heketi/heketi:10@sha256:76d5a6a3b7cf083d1e99efa1c15abedbc5c8b73bef3ade299ce9a4c16c9660f8", "GlusterfileProvisioner": "gluster/glusterfile-provisioner:latest@sha256:9961a35cb3f06701958e202324141c30024b195579e5eb1704599659ddea5223", - "GlusterfsServer": "gluster/gluster-centos:latest@sha256:8167034b9abf2d16581f3f4571507ce7d716fb58b927d7627ef72264f802e908", + "GlusterfsServer": "docker.io/gluster/gluster-centos:latest@sha256:8167034b9abf2d16581f3f4571507ce7d716fb58b927d7627ef72264f802e908", }, nil), "efk": NewAddon([]*BinAsset{ MustBinAsset(addons.EfkAssets, @@ -356,7 +356,7 @@ var Addons = map[string]*Addon{ "registry-creds-rc.yaml", "0640"), }, false, "registry-creds", "3rd party (UPMC Enterprises)", "https://minikube.sigs.k8s.io/docs/handbook/registry/", map[string]string{ - "RegistryCreds": "upmcenterprises/registry-creds:1.10@sha256:93a633d4f2b76a1c66bf19c664dbddc56093a543de6d54320f19f585ccd7d605", + "RegistryCreds": "docker.io/upmcenterprises/registry-creds:1.10@sha256:93a633d4f2b76a1c66bf19c664dbddc56093a543de6d54320f19f585ccd7d605", }, nil), "registry-aliases": NewAddon([]*BinAsset{ MustBinAsset(addons.RegistryAliasesAssets, @@ -439,7 +439,7 @@ var Addons = map[string]*Addon{ "logviewer-rbac.yaml", "0640"), }, false, "logviewer", "", "", map[string]string{ - "LogViewer": "ivans3/minikube-log-viewer:latest@sha256:75854f45305cc47d17b04c6c588fa60777391761f951e3a34161ddf1f1b06405", + "LogViewer": "docker.io/ivans3/minikube-log-viewer:latest@sha256:75854f45305cc47d17b04c6c588fa60777391761f951e3a34161ddf1f1b06405", }, nil), "gvisor": NewAddon([]*BinAsset{ MustBinAsset(addons.GvisorAssets, From d9263acf8d3e4584dab1a8eff6f46010cfc49bbc Mon Sep 17 00:00:00 2001 From: Santhosh Nagaraj S Date: Thu, 7 Jul 2022 12:11:20 +0530 Subject: [PATCH 295/545] Fix Post installation tip for headlamp Signed-off-by: Santhosh Nagaraj S --- cmd/minikube/cmd/config/enable.go | 28 +++++++++++++++++++++------- cmd/minikube/cmd/config/flags.go | 7 +++++++ translations/de.json | 1 - translations/es.json | 1 - translations/ja.json | 1 - translations/ko.json | 1 - translations/pl.json | 1 - translations/ru.json | 1 - translations/strings.txt | 1 - translations/zh-CN.json | 1 - 10 files changed, 28 insertions(+), 15 deletions(-) diff --git a/cmd/minikube/cmd/config/enable.go b/cmd/minikube/cmd/config/enable.go index 36c38c1ed8..df1ab66576 100644 --- a/cmd/minikube/cmd/config/enable.go +++ b/cmd/minikube/cmd/config/enable.go @@ -20,6 +20,7 @@ import ( "errors" "fmt" + "github.com/blang/semver/v4" "github.com/spf13/cobra" "github.com/spf13/viper" "k8s.io/minikube/pkg/addons" @@ -29,6 +30,7 @@ import ( "k8s.io/minikube/pkg/minikube/out" "k8s.io/minikube/pkg/minikube/reason" "k8s.io/minikube/pkg/minikube/style" + "k8s.io/minikube/pkg/util" ) var addonsEnableCmd = &cobra.Command{ @@ -75,16 +77,28 @@ var addonsEnableCmd = &cobra.Command{ minikube service headlamp -n headlamp `) - out.Styled(style.Tip, `To authenticate in Headlamp, fetch the Authentication Token using the following command: + tokenGenerationTip := "To authenticate in Headlamp, fetch the Authentication Token using the following command:" + createSvcAccountToken := "kubectl create token headlamp --duration 24h -n headlamp" + getSvcAccountToken := `export SECRET=$(kubectl get secrets --namespace headlamp -o custom-columns=":metadata.name" | grep "headlamp-token") +kubectl get secret $SECRET --namespace headlamp --template=\{\{.data.token\}\} | base64 --decode` -export SECRET=$(kubectl get secrets --namespace headlamp -o custom-columns=":metadata.name" | grep "headlamp-token") -kubectl get secret $SECRET --namespace headlamp --template=\{\{.data.token\}\} | base64 --decode - -`) + clusterName := ClusterFlagValue() + clusterVersion := ClusterKubernetesVersion(clusterName) + parsedClusterVersion, err := util.ParseKubernetesVersion(clusterVersion) + if err != nil { + tokenGenerationTip = fmt.Sprintf("%s\nIf Kubernetes Version is <1.24:\n%s\n\nIf Kubernetes Version is >=1.24:\n%s\n", tokenGenerationTip, createSvcAccountToken, getSvcAccountToken) + } else { + if parsedClusterVersion.GTE(semver.Version{Major: 1, Minor: 24}) { + tokenGenerationTip = fmt.Sprintf("%s\n%s", tokenGenerationTip, createSvcAccountToken) + } else { + tokenGenerationTip = fmt.Sprintf("%s\n%s", tokenGenerationTip, getSvcAccountToken) + } + } + out.Styled(style.Tip, fmt.Sprintf("%s\n", tokenGenerationTip)) tipProfileArg := "" - if ClusterFlagValue() != constants.DefaultClusterName { - tipProfileArg = fmt.Sprintf(" -p %s", ClusterFlagValue()) + if clusterName != constants.DefaultClusterName { + tipProfileArg = fmt.Sprintf(" -p %s", clusterName) } out.Styled(style.Tip, `Headlamp can display more detailed information when metrics-server is installed. To install it, run: diff --git a/cmd/minikube/cmd/config/flags.go b/cmd/minikube/cmd/config/flags.go index 5a978ab08b..c1f6ef38c6 100644 --- a/cmd/minikube/cmd/config/flags.go +++ b/cmd/minikube/cmd/config/flags.go @@ -19,9 +19,16 @@ package config import ( "github.com/spf13/viper" "k8s.io/minikube/pkg/minikube/config" + "k8s.io/minikube/pkg/minikube/mustload" ) // ClusterFlagValue returns the current cluster name based on flags func ClusterFlagValue() string { return viper.GetString(config.ProfileName) } + +// ClusterKubernetesVersion returns the current Kubernetes version of the cluster +func ClusterKubernetesVersion(clusterProfile string) string { + _, cc := mustload.Partial(clusterProfile) + return cc.KubernetesConfig.KubernetesVersion +} diff --git a/translations/de.json b/translations/de.json index 34af9eab77..05872c3754 100644 --- a/translations/de.json +++ b/translations/de.json @@ -748,7 +748,6 @@ "Tip: To remove this root owned cluster, run: sudo {{.cmd}}": "Tip: Um diesen zu root gehörenden Cluster zu entfernen, führe {{.cmd}} aus", "Tip: To remove this root owned cluster, run: sudo {{.cmd}} delete": "Tipp: Um diesen Root-Cluster zu entfernen, führen Sie Folgendes aus: sudo {{.cmd}} delete", "To access Headlamp, use the following command:\nminikube service headlamp -n headlamp\n\n": "", - "To authenticate in Headlamp, fetch the Authentication Token using the following command:\n\nexport SECRET=$(kubectl get secrets --namespace headlamp -o custom-columns=\":metadata.name\" | grep \"headlamp-token\")\nkubectl get secret $SECRET --namespace headlamp --template=\\{\\{.data.token\\}\\} | base64 --decode\n\t\t\t\n": "", "To connect to this cluster, use: --context={{.name}}": "Um zu diesem Cluster zu verbinden, verwende --context={{.name}}", "To connect to this cluster, use: kubectl --context={{.name}}": "Verwenden Sie zum Herstellen einer Verbindung zu diesem Cluster: kubectl --context = {{.name}}", "To connect to this cluster, use: kubectl --context={{.name}}__1": "Verwenden Sie zum Herstellen einer Verbindung zu diesem Cluster: kubectl --context = {{.name}}", diff --git a/translations/es.json b/translations/es.json index 675623bc93..c3e1bf53b2 100644 --- a/translations/es.json +++ b/translations/es.json @@ -750,7 +750,6 @@ "Tip: To remove this root owned cluster, run: sudo {{.cmd}}": "", "Tip: To remove this root owned cluster, run: sudo {{.cmd}} delete": "Para eliminar este clúster de raíz, ejecuta: sudo {{.cmd}} delete", "To access Headlamp, use the following command:\nminikube service headlamp -n headlamp\n\n": "", - "To authenticate in Headlamp, fetch the Authentication Token using the following command:\n\nexport SECRET=$(kubectl get secrets --namespace headlamp -o custom-columns=\":metadata.name\" | grep \"headlamp-token\")\nkubectl get secret $SECRET --namespace headlamp --template=\\{\\{.data.token\\}\\} | base64 --decode\n\t\t\t\n": "", "To connect to this cluster, use: --context={{.name}}": "", "To connect to this cluster, use: kubectl --context={{.name}}": "Para conectarte a este clúster, usa: kubectl --context={{.name}}", "To connect to this cluster, use: kubectl --context={{.name}}__1": "Para conectarte a este clúster, usa: kubectl --context={{.name}}", diff --git a/translations/ja.json b/translations/ja.json index 30281d2dec..5db2d2e0d3 100644 --- a/translations/ja.json +++ b/translations/ja.json @@ -750,7 +750,6 @@ "Tip: To remove this root owned cluster, run: sudo {{.cmd}}": "ヒント: この root 所有クラスターの削除コマンド: sudo {{.cmd}}", "Tip: To remove this root owned cluster, run: sudo {{.cmd}} delete": "ヒント: この root 所有クラスターの削除コマンド: sudo {{.cmd}} delete", "To access Headlamp, use the following command:\nminikube service headlamp -n headlamp\n\n": "", - "To authenticate in Headlamp, fetch the Authentication Token using the following command:\n\nexport SECRET=$(kubectl get secrets --namespace headlamp -o custom-columns=\":metadata.name\" | grep \"headlamp-token\")\nkubectl get secret $SECRET --namespace headlamp --template=\\{\\{.data.token\\}\\} | base64 --decode\n\t\t\t\n": "", "To connect to this cluster, use: --context={{.name}}": "このクラスターに接続するためには、--context={{.name}} を使用します", "To connect to this cluster, use: kubectl --context={{.name}}": "このクラスターに接続するためには、kubectl --context={{.name}} を使用します", "To connect to this cluster, use: kubectl --context={{.name}}__1": "このクラスターに接続するためには、kubectl --context={{.name}} を使用します", diff --git a/translations/ko.json b/translations/ko.json index ea7513e6f7..1517ccd6b0 100644 --- a/translations/ko.json +++ b/translations/ko.json @@ -751,7 +751,6 @@ "This {{.type}} is having trouble accessing https://{{.repository}}": "", "Tip: To remove this root owned cluster, run: sudo {{.cmd}}": "", "To access Headlamp, use the following command:\nminikube service headlamp -n headlamp\n\n": "", - "To authenticate in Headlamp, fetch the Authentication Token using the following command:\n\nexport SECRET=$(kubectl get secrets --namespace headlamp -o custom-columns=\":metadata.name\" | grep \"headlamp-token\")\nkubectl get secret $SECRET --namespace headlamp --template=\\{\\{.data.token\\}\\} | base64 --decode\n\t\t\t\n": "", "To connect to this cluster, use: --context={{.name}}": "", "To connect to this cluster, use: kubectl --context={{.profile_name}}": "", "To disable beta notices, run: 'minikube config set WantBetaUpdateNotification false'": "", diff --git a/translations/pl.json b/translations/pl.json index f7de39e4fb..65142f8831 100644 --- a/translations/pl.json +++ b/translations/pl.json @@ -762,7 +762,6 @@ "This {{.type}} is having trouble accessing https://{{.repository}}": "", "Tip: To remove this root owned cluster, run: sudo {{.cmd}}": "", "To access Headlamp, use the following command:\nminikube service headlamp -n headlamp\n\n": "", - "To authenticate in Headlamp, fetch the Authentication Token using the following command:\n\nexport SECRET=$(kubectl get secrets --namespace headlamp -o custom-columns=\":metadata.name\" | grep \"headlamp-token\")\nkubectl get secret $SECRET --namespace headlamp --template=\\{\\{.data.token\\}\\} | base64 --decode\n\t\t\t\n": "", "To connect to this cluster, use: --context={{.name}}": "", "To connect to this cluster, use: kubectl --context={{.name}}": "Aby połączyć się z klastrem użyj: kubectl --context={{.name}}", "To connect to this cluster, use: kubectl --context={{.profile_name}}": "Aby połaczyć się z klastrem użyj: kubectl --context={{.profile_name}}", diff --git a/translations/ru.json b/translations/ru.json index 8a8569128b..80e0500460 100644 --- a/translations/ru.json +++ b/translations/ru.json @@ -693,7 +693,6 @@ "This {{.type}} is having trouble accessing https://{{.repository}}": "", "Tip: To remove this root owned cluster, run: sudo {{.cmd}}": "", "To access Headlamp, use the following command:\nminikube service headlamp -n headlamp\n\n": "", - "To authenticate in Headlamp, fetch the Authentication Token using the following command:\n\nexport SECRET=$(kubectl get secrets --namespace headlamp -o custom-columns=\":metadata.name\" | grep \"headlamp-token\")\nkubectl get secret $SECRET --namespace headlamp --template=\\{\\{.data.token\\}\\} | base64 --decode\n\t\t\t\n": "", "To connect to this cluster, use: --context={{.name}}": "", "To connect to this cluster, use: kubectl --context={{.profile_name}}": "", "To disable beta notices, run: 'minikube config set WantBetaUpdateNotification false'": "", diff --git a/translations/strings.txt b/translations/strings.txt index 9ec196ba12..fa30ac43e1 100644 --- a/translations/strings.txt +++ b/translations/strings.txt @@ -693,7 +693,6 @@ "This {{.type}} is having trouble accessing https://{{.repository}}": "", "Tip: To remove this root owned cluster, run: sudo {{.cmd}}": "", "To access Headlamp, use the following command:\nminikube service headlamp -n headlamp\n\n": "", - "To authenticate in Headlamp, fetch the Authentication Token using the following command:\n\nexport SECRET=$(kubectl get secrets --namespace headlamp -o custom-columns=\":metadata.name\" | grep \"headlamp-token\")\nkubectl get secret $SECRET --namespace headlamp --template=\\{\\{.data.token\\}\\} | base64 --decode\n\t\t\t\n": "", "To connect to this cluster, use: --context={{.name}}": "", "To connect to this cluster, use: kubectl --context={{.profile_name}}": "", "To disable beta notices, run: 'minikube config set WantBetaUpdateNotification false'": "", diff --git a/translations/zh-CN.json b/translations/zh-CN.json index 64f945dc5c..2b934003f7 100644 --- a/translations/zh-CN.json +++ b/translations/zh-CN.json @@ -852,7 +852,6 @@ "Tip: To remove this root owned cluster, run: sudo {{.cmd}}": "", "Tip: To remove this root owned cluster, run: sudo {{.cmd}} delete": "提示：要移除这个由根用户拥有的集群，请运行 sudo {{.cmd}} delete", "To access Headlamp, use the following command:\nminikube service headlamp -n headlamp\n\n": "", - "To authenticate in Headlamp, fetch the Authentication Token using the following command:\n\nexport SECRET=$(kubectl get secrets --namespace headlamp -o custom-columns=\":metadata.name\" | grep \"headlamp-token\")\nkubectl get secret $SECRET --namespace headlamp --template=\\{\\{.data.token\\}\\} | base64 --decode\n\t\t\t\n": "", "To connect to this cluster, use: --context={{.name}}": "", "To connect to this cluster, use: kubectl --context={{.name}}": "如需连接到此集群，请使用 kubectl --context={{.name}}", "To connect to this cluster, use: kubectl --context={{.name}}__1": "如需连接到此集群，请使用 kubectl --context={{.name}}", From 709cd5812cb39e9a489749c8677f7b9d606cc5a9 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Fri, 15 Jul 2022 13:07:49 -0700 Subject: [PATCH 296/545] optimize audit logging --- pkg/minikube/audit/audit.go | 22 ++++++++++------------ pkg/minikube/audit/logFile.go | 5 +++++ pkg/minikube/audit/logFile_test.go | 11 +++++++---- pkg/minikube/audit/report_test.go | 9 +++++---- 4 files changed, 27 insertions(+), 20 deletions(-) diff --git a/pkg/minikube/audit/audit.go b/pkg/minikube/audit/audit.go index d85315ad6a..2f945f7cee 100644 --- a/pkg/minikube/audit/audit.go +++ b/pkg/minikube/audit/audit.go @@ -90,7 +90,13 @@ func LogCommandEnd(id string) error { if err != nil { return fmt.Errorf("failed to convert logs to rows: %v", err) } - auditContents := "" + // have to truncate the audit log while closed as Windows can't truncate an open file + if err := os.Truncate(localpath.AuditLog(), 0); err != nil { + return fmt.Errorf("failed to truncate audit log: %v", err) + } + if err := openAuditLog(); err != nil { + return err + } var entriesNeedsToUpdate int for _, v := range rowSlice { if v.id == id { @@ -102,21 +108,13 @@ func LogCommandEnd(id string) error { if err != nil { return err } - auditContents += string(auditLog) + "\n" + if _, err = currentLogFile.WriteString(string(auditLog) + "\n"); err != nil { + return fmt.Errorf("failed to write to audit log: %v", err) + } } if entriesNeedsToUpdate == 0 { return fmt.Errorf("failed to find a log row with id equals to %v", id) } - // have to truncate the audit log while closed as Windows can't truncate an open file - if err := os.Truncate(localpath.AuditLog(), 0); err != nil { - return fmt.Errorf("failed to truncate audit log: %v", err) - } - if err := openAuditLog(); err != nil { - return err - } - if _, err = currentLogFile.Write([]byte(auditContents)); err != nil { - return fmt.Errorf("failed to write to audit log: %v", err) - } return nil } diff --git a/pkg/minikube/audit/logFile.go b/pkg/minikube/audit/logFile.go index 437114aa8d..6f2fd8e2e7 100644 --- a/pkg/minikube/audit/logFile.go +++ b/pkg/minikube/audit/logFile.go @@ -30,6 +30,10 @@ var currentLogFile *os.File // openAuditLog opens the audit log file or creates it if it doesn't exist. func openAuditLog() error { + // this is so we can manually set the log file for tests + if currentLogFile != nil { + return nil + } lp := localpath.AuditLog() f, err := os.OpenFile(lp, os.O_APPEND|os.O_CREATE|os.O_RDWR, 0644) if err != nil { @@ -44,6 +48,7 @@ func closeAuditLog() { if err := currentLogFile.Close(); err != nil { klog.Errorf("failed to close the audit log: %v", err) } + currentLogFile = nil } // appendToLog appends the row to the log file. diff --git a/pkg/minikube/audit/logFile_test.go b/pkg/minikube/audit/logFile_test.go index 9167911084..a7ea9751ff 100644 --- a/pkg/minikube/audit/logFile_test.go +++ b/pkg/minikube/audit/logFile_test.go @@ -36,27 +36,30 @@ func TestLogFile(t *testing.T) { if err := openAuditLog(); err != nil { t.Fatal(err) } + closeAuditLog() }) t.Run("AppendToLog", func(t *testing.T) { - defer closeAuditLog() f, err := os.CreateTemp("", "audit.json") if err != nil { t.Fatalf("Error creating temporary file: %v", err) } defer os.Remove(f.Name()) - oldLogFile := *currentLogFile - defer func() { currentLogFile = &oldLogFile }() currentLogFile = f + defer closeAuditLog() r := newRow("start", "-v", "user1", "v0.17.1", time.Now(), uuid.New().String()) if err := appendToLog(r); err != nil { t.Fatalf("Error appendingToLog: %v", err) } + currentLogFile, err = os.Open(f.Name()) + if err != nil { + t.Fatal(err) + } b := make([]byte, 100) - if _, err := f.Read(b); err != nil && err != io.EOF { + if _, err := currentLogFile.Read(b); err != nil && err != io.EOF { t.Errorf("Log was not appended to file: %v", err) } }) diff --git a/pkg/minikube/audit/report_test.go b/pkg/minikube/audit/report_test.go index 0e23a7acee..0f00725b49 100644 --- a/pkg/minikube/audit/report_test.go +++ b/pkg/minikube/audit/report_test.go @@ -17,6 +17,7 @@ limitations under the License. package audit import ( + "io" "os" "testing" ) @@ -30,18 +31,18 @@ func TestReport(t *testing.T) { s := `{"data":{"args":"-p mini1","command":"start","endTime":"Wed, 03 Feb 2021 15:33:05 MST","profile":"mini1","startTime":"Wed, 03 Feb 2021 15:30:33 MST","user":"user1"},"datacontenttype":"application/json","id":"9b7593cb-fbec-49e5-a3ce-bdc2d0bfb208","source":"https://minikube.sigs.k8s.io/","specversion":"1.0","type":"io.k8s.si gs.minikube.audit"} {"data":{"args":"-p mini1","command":"start","endTime":"Wed, 03 Feb 2021 15:33:05 MST","profile":"mini1","startTime":"Wed, 03 Feb 2021 15:30:33 MST","user":"user1"},"datacontenttype":"application/json","id":"9b7593cb-fbec-49e5-a3ce-bdc2d0bfb208","source":"https://minikube.sigs.k8s.io/","specversion":"1.0","type":"io.k8s.si gs.minikube.audit"} -{"data":{"args":"--user user2","command":"logs","endTime":"Tue, 02 Feb 2021 16:46:20 MST","profile":"minikube","startTime":"Tue, 02 Feb 2021 16:46:00 MST","user":"user2"},"datacontenttype":"application/json","id":"fec03227-2484-48b6-880a-88fd010b5efd","source":"https://minikube.sigs.k8s.io/","specversion":"1.0","type":"io.k8s.sigs.minikube.audit"}` +{"data":{"args":"--user user2","command":"logs","endTime":"Tue, 02 Feb 2021 16:46:20 MST","profile":"minikube","startTime":"Tue, 02 Feb 2021 16:46:00 MST","user":"user2"},"datacontenttype":"application/json","id":"fec03227-2484-48b6-880a-88fd010b5efd","source":"https://minikube.sigs.k8s.io/","specversion":"1.0","type":"io.k8s.sigs.minikube.audit"} +` if _, err := f.WriteString(s); err != nil { t.Fatalf("failed writing to file: %v", err) } - if _, err := f.Seek(0, 0); err != nil { + if _, err := f.Seek(0, io.SeekStart); err != nil { t.Fatalf("failed seeking to start of file: %v", err) } - oldLogFile := *currentLogFile - defer func() { currentLogFile = &oldLogFile }() currentLogFile = f + defer closeAuditLog() wantedLines := 2 r, err := Report(wantedLines) From 9cdd2d6b37a9b057c04622f8aa3190d40b91a81c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 15 Jul 2022 20:52:19 +0000 Subject: [PATCH 297/545] Bump k8s.io/component-base from 0.24.2 to 0.24.3 Bumps [k8s.io/component-base](https://github.com/kubernetes/component-base) from 0.24.2 to 0.24.3. - [Release notes](https://github.com/kubernetes/component-base/releases) - [Commits](https://github.com/kubernetes/component-base/compare/v0.24.2...v0.24.3) --- updated-dependencies: - dependency-name: k8s.io/component-base dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 8 ++++---- go.sum | 12 ++++++++---- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/go.mod b/go.mod index b32cea4481..1bf3af949c 100644 --- a/go.mod +++ b/go.mod @@ -83,11 +83,11 @@ require ( google.golang.org/api v0.86.0 gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 // indirect gopkg.in/yaml.v2 v2.4.0 - k8s.io/api v0.24.2 - k8s.io/apimachinery v0.24.2 - k8s.io/client-go v0.24.2 + k8s.io/api v0.24.3 + k8s.io/apimachinery v0.24.3 + k8s.io/client-go v0.24.3 k8s.io/cluster-bootstrap v0.0.0 - k8s.io/component-base v0.24.2 + k8s.io/component-base v0.24.3 k8s.io/klog/v2 v2.70.1 k8s.io/kubectl v0.24.2 k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 diff --git a/go.sum b/go.sum index 2f5d3f1853..0e7a97d274 100644 --- a/go.sum +++ b/go.sum @@ -2236,15 +2236,17 @@ k8s.io/api v0.20.1/go.mod h1:KqwcCVogGxQY3nBlRpwt+wpAMF/KjaCc7RpywacvqUo= k8s.io/api v0.20.4/go.mod h1:++lNL1AJMkDymriNniQsWRkMDzRaX2Y/POTUi8yvqYQ= k8s.io/api v0.20.6/go.mod h1:X9e8Qag6JV/bL5G6bU8sdVRltWKmdHsFUGS3eVndqE8= k8s.io/api v0.22.4/go.mod h1:Rgs+9gIGYC5laXQSZZ9JqT5NevNgoGiOdVWi1BAB3qk= -k8s.io/api v0.24.2 h1:g518dPU/L7VRLxWfcadQn2OnsiGWVOadTLpdnqgY2OI= k8s.io/api v0.24.2/go.mod h1:AHqbSkTm6YrQ0ObxjO3Pmp/ubFF/KuM7jU+3khoBsOg= +k8s.io/api v0.24.3 h1:tt55QEmKd6L2k5DP6G/ZzdMQKvG5ro4H4teClqm0sTY= +k8s.io/api v0.24.3/go.mod h1:elGR/XSZrS7z7cSZPzVWaycpJuGIw57j9b95/1PdJNI= k8s.io/apimachinery v0.19.1/go.mod h1:DnPGDnARWFvYa3pMHgSxtbZb7gpzzAZ1pTfaUNDVlmA= k8s.io/apimachinery v0.20.1/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU= k8s.io/apimachinery v0.20.4/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU= k8s.io/apimachinery v0.20.6/go.mod h1:ejZXtW1Ra6V1O5H8xPBGz+T3+4gfkTCeExAHKU57MAc= k8s.io/apimachinery v0.22.4/go.mod h1:yU6oA6Gnax9RrxGzVvPFFJ+mpnW6PBSqp0sx0I0HHW0= -k8s.io/apimachinery v0.24.2 h1:5QlH9SL2C8KMcrNJPor+LbXVTaZRReml7svPEh4OKDM= k8s.io/apimachinery v0.24.2/go.mod h1:82Bi4sCzVBdpYjyI4jY6aHX+YCUchUIrZrXKedjd2UM= +k8s.io/apimachinery v0.24.3 h1:hrFiNSA2cBZqllakVYyH/VyEh4B581bQRmqATJSeQTg= +k8s.io/apimachinery v0.24.3/go.mod h1:82Bi4sCzVBdpYjyI4jY6aHX+YCUchUIrZrXKedjd2UM= k8s.io/apiserver v0.20.1/go.mod h1:ro5QHeQkgMS7ZGpvf4tSMx6bBOgPfE+f52KwvXfScaU= k8s.io/apiserver v0.20.4/go.mod h1:Mc80thBKOyy7tbvFtB4kJv1kbdD0eIH8k8vianJcbFM= k8s.io/apiserver v0.20.6/go.mod h1:QIJXNt6i6JB+0YQRNcS0hdRHJlMhflFmsBDeSgT1r8Q= @@ -2253,16 +2255,18 @@ k8s.io/client-go v0.19.1/go.mod h1:AZOIVSI9UUtQPeJD3zJFp15CEhSjRgAuQP5PWRJrCIQ= k8s.io/client-go v0.20.1/go.mod h1:/zcHdt1TeWSd5HoUe6elJmHSQ6uLLgp4bIJHVEuy+/Y= k8s.io/client-go v0.20.4/go.mod h1:LiMv25ND1gLUdBeYxBIwKpkSC5IsozMMmOOeSJboP+k= k8s.io/client-go v0.20.6/go.mod h1:nNQMnOvEUEsOzRRFIIkdmYOjAZrC8bgq0ExboWSU1I0= -k8s.io/client-go v0.24.2 h1:CoXFSf8if+bLEbinDqN9ePIDGzcLtqhfd6jpfnwGOFA= k8s.io/client-go v0.24.2/go.mod h1:zg4Xaoo+umDsfCWr4fCnmLEtQXyCNXCvJuSsglNcV30= +k8s.io/client-go v0.24.3 h1:Nl1840+6p4JqkFWEW2LnMKU667BUxw03REfLAVhuKQY= +k8s.io/client-go v0.24.3/go.mod h1:AAovolf5Z9bY1wIg2FZ8LPQlEdKHjLI7ZD4rw920BJw= k8s.io/cluster-bootstrap v0.22.4 h1:2ZhV/1K4GiCrnmDHHbBnN3bERWn+Nxrtxmxp6uYYThI= k8s.io/cluster-bootstrap v0.22.4/go.mod h1:fTQZ6u9G6fg2LHhB8nEgZLnXIhCDSRYuLUUS5pgW8RY= k8s.io/code-generator v0.24.2/go.mod h1:dpVhs00hTuTdTY6jvVxvTFCk6gSMrtfRydbhZwHI15w= k8s.io/component-base v0.20.1/go.mod h1:guxkoJnNoh8LNrbtiQOlyp2Y2XFCZQmrcg2n/DeYNLk= k8s.io/component-base v0.20.4/go.mod h1:t4p9EdiagbVCJKrQ1RsA5/V4rFQNDfRlevJajlGwgjI= k8s.io/component-base v0.20.6/go.mod h1:6f1MPBAeI+mvuts3sIdtpjljHWBQ2cIy38oBIWMYnrM= -k8s.io/component-base v0.24.2 h1:kwpQdoSfbcH+8MPN4tALtajLDfSfYxBDYlXobNWI6OU= k8s.io/component-base v0.24.2/go.mod h1:ucHwW76dajvQ9B7+zecZAP3BVqvrHoOxm8olHEg0nmM= +k8s.io/component-base v0.24.3 h1:u99WjuHYCRJjS1xeLOx72DdRaghuDnuMgueiGMFy1ec= +k8s.io/component-base v0.24.3/go.mod h1:bqom2IWN9Lj+vwAkPNOv2TflsP1PeVDIwIN0lRthxYY= k8s.io/component-helpers v0.24.2/go.mod h1:TRQPBQKfmqkmV6c0HAmUs8cXVNYYYLsXy4zu8eODi9g= k8s.io/cri-api v0.17.3/go.mod h1:X1sbHmuXhwaHs9xxYffLqJogVsnI+f6cPRcgPel7ywM= k8s.io/cri-api v0.20.1/go.mod h1:2JRbKt+BFLTjtrILYVqQK5jqhI+XNdF6UiGMgczeBCI= From 4abb2413ef58b3c3a1eeefa817a7745f5b48ee79 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 15 Jul 2022 21:34:53 +0000 Subject: [PATCH 298/545] Bump k8s.io/kubectl from 0.24.2 to 0.24.3 Bumps [k8s.io/kubectl](https://github.com/kubernetes/kubectl) from 0.24.2 to 0.24.3. - [Release notes](https://github.com/kubernetes/kubectl/releases) - [Commits](https://github.com/kubernetes/kubectl/compare/v0.24.2...v0.24.3) --- updated-dependencies: - dependency-name: k8s.io/kubectl dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 16 ++++++---------- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/go.mod b/go.mod index 1bf3af949c..5d5ad0a84a 100644 --- a/go.mod +++ b/go.mod @@ -89,7 +89,7 @@ require ( k8s.io/cluster-bootstrap v0.0.0 k8s.io/component-base v0.24.3 k8s.io/klog/v2 v2.70.1 - k8s.io/kubectl v0.24.2 + k8s.io/kubectl v0.24.3 k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 libvirt.org/go/libvirt v1.8005.0 sigs.k8s.io/sig-storage-lib-external-provisioner/v6 v6.3.0 diff --git a/go.sum b/go.sum index 0e7a97d274..f249320fa2 100644 --- a/go.sum +++ b/go.sum @@ -2236,7 +2236,6 @@ k8s.io/api v0.20.1/go.mod h1:KqwcCVogGxQY3nBlRpwt+wpAMF/KjaCc7RpywacvqUo= k8s.io/api v0.20.4/go.mod h1:++lNL1AJMkDymriNniQsWRkMDzRaX2Y/POTUi8yvqYQ= k8s.io/api v0.20.6/go.mod h1:X9e8Qag6JV/bL5G6bU8sdVRltWKmdHsFUGS3eVndqE8= k8s.io/api v0.22.4/go.mod h1:Rgs+9gIGYC5laXQSZZ9JqT5NevNgoGiOdVWi1BAB3qk= -k8s.io/api v0.24.2/go.mod h1:AHqbSkTm6YrQ0ObxjO3Pmp/ubFF/KuM7jU+3khoBsOg= k8s.io/api v0.24.3 h1:tt55QEmKd6L2k5DP6G/ZzdMQKvG5ro4H4teClqm0sTY= k8s.io/api v0.24.3/go.mod h1:elGR/XSZrS7z7cSZPzVWaycpJuGIw57j9b95/1PdJNI= k8s.io/apimachinery v0.19.1/go.mod h1:DnPGDnARWFvYa3pMHgSxtbZb7gpzzAZ1pTfaUNDVlmA= @@ -2244,30 +2243,27 @@ k8s.io/apimachinery v0.20.1/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRp k8s.io/apimachinery v0.20.4/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU= k8s.io/apimachinery v0.20.6/go.mod h1:ejZXtW1Ra6V1O5H8xPBGz+T3+4gfkTCeExAHKU57MAc= k8s.io/apimachinery v0.22.4/go.mod h1:yU6oA6Gnax9RrxGzVvPFFJ+mpnW6PBSqp0sx0I0HHW0= -k8s.io/apimachinery v0.24.2/go.mod h1:82Bi4sCzVBdpYjyI4jY6aHX+YCUchUIrZrXKedjd2UM= k8s.io/apimachinery v0.24.3 h1:hrFiNSA2cBZqllakVYyH/VyEh4B581bQRmqATJSeQTg= k8s.io/apimachinery v0.24.3/go.mod h1:82Bi4sCzVBdpYjyI4jY6aHX+YCUchUIrZrXKedjd2UM= k8s.io/apiserver v0.20.1/go.mod h1:ro5QHeQkgMS7ZGpvf4tSMx6bBOgPfE+f52KwvXfScaU= k8s.io/apiserver v0.20.4/go.mod h1:Mc80thBKOyy7tbvFtB4kJv1kbdD0eIH8k8vianJcbFM= k8s.io/apiserver v0.20.6/go.mod h1:QIJXNt6i6JB+0YQRNcS0hdRHJlMhflFmsBDeSgT1r8Q= -k8s.io/cli-runtime v0.24.2/go.mod h1:1LIhKL2RblkhfG4v5lZEt7FtgFG5mVb8wqv5lE9m5qY= +k8s.io/cli-runtime v0.24.3/go.mod h1:In84wauoMOqa7JDvDSXGbf8lTNlr70fOGpYlYfJtSqA= k8s.io/client-go v0.19.1/go.mod h1:AZOIVSI9UUtQPeJD3zJFp15CEhSjRgAuQP5PWRJrCIQ= k8s.io/client-go v0.20.1/go.mod h1:/zcHdt1TeWSd5HoUe6elJmHSQ6uLLgp4bIJHVEuy+/Y= k8s.io/client-go v0.20.4/go.mod h1:LiMv25ND1gLUdBeYxBIwKpkSC5IsozMMmOOeSJboP+k= k8s.io/client-go v0.20.6/go.mod h1:nNQMnOvEUEsOzRRFIIkdmYOjAZrC8bgq0ExboWSU1I0= -k8s.io/client-go v0.24.2/go.mod h1:zg4Xaoo+umDsfCWr4fCnmLEtQXyCNXCvJuSsglNcV30= k8s.io/client-go v0.24.3 h1:Nl1840+6p4JqkFWEW2LnMKU667BUxw03REfLAVhuKQY= k8s.io/client-go v0.24.3/go.mod h1:AAovolf5Z9bY1wIg2FZ8LPQlEdKHjLI7ZD4rw920BJw= k8s.io/cluster-bootstrap v0.22.4 h1:2ZhV/1K4GiCrnmDHHbBnN3bERWn+Nxrtxmxp6uYYThI= k8s.io/cluster-bootstrap v0.22.4/go.mod h1:fTQZ6u9G6fg2LHhB8nEgZLnXIhCDSRYuLUUS5pgW8RY= -k8s.io/code-generator v0.24.2/go.mod h1:dpVhs00hTuTdTY6jvVxvTFCk6gSMrtfRydbhZwHI15w= +k8s.io/code-generator v0.24.3/go.mod h1:dpVhs00hTuTdTY6jvVxvTFCk6gSMrtfRydbhZwHI15w= k8s.io/component-base v0.20.1/go.mod h1:guxkoJnNoh8LNrbtiQOlyp2Y2XFCZQmrcg2n/DeYNLk= k8s.io/component-base v0.20.4/go.mod h1:t4p9EdiagbVCJKrQ1RsA5/V4rFQNDfRlevJajlGwgjI= k8s.io/component-base v0.20.6/go.mod h1:6f1MPBAeI+mvuts3sIdtpjljHWBQ2cIy38oBIWMYnrM= -k8s.io/component-base v0.24.2/go.mod h1:ucHwW76dajvQ9B7+zecZAP3BVqvrHoOxm8olHEg0nmM= k8s.io/component-base v0.24.3 h1:u99WjuHYCRJjS1xeLOx72DdRaghuDnuMgueiGMFy1ec= k8s.io/component-base v0.24.3/go.mod h1:bqom2IWN9Lj+vwAkPNOv2TflsP1PeVDIwIN0lRthxYY= -k8s.io/component-helpers v0.24.2/go.mod h1:TRQPBQKfmqkmV6c0HAmUs8cXVNYYYLsXy4zu8eODi9g= +k8s.io/component-helpers v0.24.3/go.mod h1:/1WNW8TfBOijQ1ED2uCHb4wtXYWDVNMqUll8h36iNVo= k8s.io/cri-api v0.17.3/go.mod h1:X1sbHmuXhwaHs9xxYffLqJogVsnI+f6cPRcgPel7ywM= k8s.io/cri-api v0.20.1/go.mod h1:2JRbKt+BFLTjtrILYVqQK5jqhI+XNdF6UiGMgczeBCI= k8s.io/cri-api v0.20.4/go.mod h1:2JRbKt+BFLTjtrILYVqQK5jqhI+XNdF6UiGMgczeBCI= @@ -2289,10 +2285,10 @@ k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e/go.mod h1:vHXdDvt9+2spS2R k8s.io/kube-openapi v0.0.0-20211109043538-20434351676c/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw= k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 h1:Gii5eqf+GmIEwGNKQYQClCayuJCe2/4fZUvF7VG99sU= k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42/go.mod h1:Z/45zLw8lUo4wdiUkI+v/ImEGAvu3WatcZl3lPMR4Rk= -k8s.io/kubectl v0.24.2 h1:+RfQVhth8akUmIc2Ge8krMl/pt66V7210ka3RE/p0J4= -k8s.io/kubectl v0.24.2/go.mod h1:+HIFJc0bA6Tzu5O/YcuUt45APAxnNL8LeMuXwoiGsPg= +k8s.io/kubectl v0.24.3 h1:PqY8ho/S/KuE2/hCC3Iee7X+lOtARYo0LQsNzvV/edE= +k8s.io/kubectl v0.24.3/go.mod h1:PYLcvw96sC1NLbxZEDbdlOEd6/C76VIWjGmWV5QjSk0= k8s.io/kubernetes v1.13.0/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk= -k8s.io/metrics v0.24.2/go.mod h1:5NWURxZ6Lz5gj8TFU83+vdWIVASx7W8lwPpHYCqopMo= +k8s.io/metrics v0.24.3/go.mod h1:p1M0lhMySWfhISkSd3HEj8xIgrVnJTK3PPhFq2rA3To= k8s.io/utils v0.0.0-20200729134348-d5654de09c73/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20210802155522-efc7438f0176/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= From ffcd98937aa418a4c80d7f42a820382acad2d896 Mon Sep 17 00:00:00 2001 From: Siddhant Date: Sat, 16 Jul 2022 09:04:08 +0530 Subject: [PATCH 299/545] Added docker.io to registry --- pkg/minikube/assets/addons.go | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/pkg/minikube/assets/addons.go b/pkg/minikube/assets/addons.go index faa0cfb83a..e4cc46c460 100755 --- a/pkg/minikube/assets/addons.go +++ b/pkg/minikube/assets/addons.go @@ -136,9 +136,12 @@ var Addons = map[string]*Addon{ MustBinAsset(addons.DashboardAssets, "dashboard/dashboard-secret.yaml", vmpath.GuestAddonsDir, "dashboard-secret.yaml", "0640"), MustBinAsset(addons.DashboardAssets, "dashboard/dashboard-svc.yaml", vmpath.GuestAddonsDir, "dashboard-svc.yaml", "0640"), }, false, "dashboard", "Kubernetes", "https://minikube.sigs.k8s.io/docs/handbook/dashboard/", map[string]string{ - "Dashboard": "docker.io/kubernetesui/dashboard:v2.6.0@sha256:4af9580485920635d888efe1eddbd67e12f9d5d84dba87100e93feb4e46636b3", - "MetricsScraper": "docker.io/kubernetesui/metrics-scraper:v1.0.8@sha256:76049887f07a0476dc93efc2d3569b9529bf982b22d29f356092ce206e98765c", - }, nil), + "Dashboard": "kubernetesui/dashboard:v2.6.0@sha256:4af9580485920635d888efe1eddbd67e12f9d5d84dba87100e93feb4e46636b3", + "MetricsScraper": "kubernetesui/metrics-scraper:v1.0.8@sha256:76049887f07a0476dc93efc2d3569b9529bf982b22d29f356092ce206e98765c", + }, map[string]string{ + "Dashboard": "docker.io", + "MetricsScraper": "docker.io", + }), "default-storageclass": NewAddon([]*BinAsset{ MustBinAsset(addons.DefaultStorageClassAssets, "storageclass/storageclass.yaml.tmpl", @@ -186,10 +189,13 @@ var Addons = map[string]*Addon{ "storage-provisioner-glusterfile.yaml", "0640"), }, false, "storage-provisioner-gluster", "", "", map[string]string{ - "Heketi": "docker.io/heketi/heketi:10@sha256:76d5a6a3b7cf083d1e99efa1c15abedbc5c8b73bef3ade299ce9a4c16c9660f8", + "Heketi": "heketi/heketi:10@sha256:76d5a6a3b7cf083d1e99efa1c15abedbc5c8b73bef3ade299ce9a4c16c9660f8", "GlusterfileProvisioner": "gluster/glusterfile-provisioner:latest@sha256:9961a35cb3f06701958e202324141c30024b195579e5eb1704599659ddea5223", - "GlusterfsServer": "docker.io/gluster/gluster-centos:latest@sha256:8167034b9abf2d16581f3f4571507ce7d716fb58b927d7627ef72264f802e908", - }, nil), + "GlusterfsServer": "gluster/gluster-centos:latest@sha256:8167034b9abf2d16581f3f4571507ce7d716fb58b927d7627ef72264f802e908", + }, map[string]string{ + "Heketi": "docker.io", + "GlusterfsServer": "docker.io", + }), "efk": NewAddon([]*BinAsset{ MustBinAsset(addons.EfkAssets, "efk/elasticsearch-rc.yaml.tmpl", @@ -356,8 +362,10 @@ var Addons = map[string]*Addon{ "registry-creds-rc.yaml", "0640"), }, false, "registry-creds", "3rd party (UPMC Enterprises)", "https://minikube.sigs.k8s.io/docs/handbook/registry/", map[string]string{ - "RegistryCreds": "docker.io/upmcenterprises/registry-creds:1.10@sha256:93a633d4f2b76a1c66bf19c664dbddc56093a543de6d54320f19f585ccd7d605", - }, nil), + "RegistryCreds": "upmcenterprises/registry-creds:1.10@sha256:93a633d4f2b76a1c66bf19c664dbddc56093a543de6d54320f19f585ccd7d605", + }, map[string]string{ + "RegistryCreds": "docker.io", + }), "registry-aliases": NewAddon([]*BinAsset{ MustBinAsset(addons.RegistryAliasesAssets, "registry-aliases/registry-aliases-sa.tmpl", @@ -439,8 +447,10 @@ var Addons = map[string]*Addon{ "logviewer-rbac.yaml", "0640"), }, false, "logviewer", "", "", map[string]string{ - "LogViewer": "docker.io/ivans3/minikube-log-viewer:latest@sha256:75854f45305cc47d17b04c6c588fa60777391761f951e3a34161ddf1f1b06405", - }, nil), + "LogViewer": "ivans3/minikube-log-viewer:latest@sha256:75854f45305cc47d17b04c6c588fa60777391761f951e3a34161ddf1f1b06405", + }, map[string]string{ + "LogViewer": "docker.io", + }), "gvisor": NewAddon([]*BinAsset{ MustBinAsset(addons.GvisorAssets, "gvisor/gvisor-pod.yaml.tmpl", From 053950640c43805212adf4353280f0791c309aec Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Sat, 16 Jul 2022 04:47:24 +0000 Subject: [PATCH 300/545] Updating ISO to v1.26.0-1657933211-14545 --- 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 fe71b9f60a..3853886799 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.26.0-1657340101-14534 +ISO_VERSION ?= v1.26.0-1657933211-14545 # 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 a32c447c23..dbca002244 100644 --- a/pkg/minikube/download/iso.go +++ b/pkg/minikube/download/iso.go @@ -41,7 +41,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/14534" + isoBucket := "minikube-builds/iso/14545" return []string{ fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s-%s.iso", isoBucket, v, runtime.GOARCH), fmt.Sprintf("https://github.com/kubernetes/minikube/releases/download/%s/minikube-%s-%s.iso", v, v, runtime.GOARCH), diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index a74aa329d1..926add118e 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/14534/minikube-v1.26.0-1657340101-14534-amd64.iso,https://github.com/kubernetes/minikube/releases/download/v1.26.0-1657340101-14534/minikube-v1.26.0-1657340101-14534-amd64.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.26.0-1657340101-14534-amd64.iso,https://storage.googleapis.com/minikube-builds/iso/14534/minikube-v1.26.0-1657340101-14534.iso,https://github.com/kubernetes/minikube/releases/download/v1.26.0-1657340101-14534/minikube-v1.26.0-1657340101-14534.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.26.0-1657340101-14534.iso]) + --iso-url strings Locations to fetch the minikube ISO from. (default [https://storage.googleapis.com/minikube-builds/iso/14545/minikube-v1.26.0-1657933211-14545-amd64.iso,https://github.com/kubernetes/minikube/releases/download/v1.26.0-1657933211-14545/minikube-v1.26.0-1657933211-14545-amd64.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.26.0-1657933211-14545-amd64.iso,https://storage.googleapis.com/minikube-builds/iso/14545/minikube-v1.26.0-1657933211-14545.iso,https://github.com/kubernetes/minikube/releases/download/v1.26.0-1657933211-14545/minikube-v1.26.0-1657933211-14545.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.26.0-1657933211-14545.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.24.2, 'latest' for v1.24.2). Defaults to 'stable'. --kvm-gpu Enable experimental NVIDIA GPU support in minikube From 584c9efc3417eaa1e4c58e683eaf61fb634889e6 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 18 Jul 2022 08:04:06 +0000 Subject: [PATCH 301/545] bump default/newest kubernetes versions --- pkg/minikube/constants/constants.go | 4 ++-- site/content/en/docs/commands/start.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/minikube/constants/constants.go b/pkg/minikube/constants/constants.go index 0d5d8e8dcc..3233e23015 100644 --- a/pkg/minikube/constants/constants.go +++ b/pkg/minikube/constants/constants.go @@ -32,10 +32,10 @@ var ( const ( // DefaultKubernetesVersion is the default Kubernetes version - DefaultKubernetesVersion = "v1.24.2" + DefaultKubernetesVersion = "v1.24.3" // NewestKubernetesVersion is the newest Kubernetes version to test against // NOTE: You may need to update coreDNS & etcd versions in pkg/minikube/bootstrapper/images/images.go - NewestKubernetesVersion = "v1.24.2" + NewestKubernetesVersion = "v1.24.3" // OldestKubernetesVersion is the oldest Kubernetes version to test against OldestKubernetesVersion = "v1.16.0" // NoKubernetesVersion is the version used when users does NOT want to install kubernetes diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index a74aa329d1..720324cc24 100644 --- a/site/content/en/docs/commands/start.md +++ b/site/content/en/docs/commands/start.md @@ -71,7 +71,7 @@ minikube start [flags] --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/14534/minikube-v1.26.0-1657340101-14534-amd64.iso,https://github.com/kubernetes/minikube/releases/download/v1.26.0-1657340101-14534/minikube-v1.26.0-1657340101-14534-amd64.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.26.0-1657340101-14534-amd64.iso,https://storage.googleapis.com/minikube-builds/iso/14534/minikube-v1.26.0-1657340101-14534.iso,https://github.com/kubernetes/minikube/releases/download/v1.26.0-1657340101-14534/minikube-v1.26.0-1657340101-14534.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.26.0-1657340101-14534.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.24.2, 'latest' for v1.24.2). Defaults to 'stable'. + --kubernetes-version string The Kubernetes version that the minikube VM will use (ex: v1.2.3, 'stable' for v1.24.3, 'latest' for v1.24.3). Defaults to 'stable'. --kvm-gpu Enable experimental NVIDIA GPU support in minikube --kvm-hidden Hide the hypervisor signature from the guest in minikube (kvm2 driver only) --kvm-network string The KVM default network name. (kvm2 driver only) (default "default") From 8ac93ceccc1c3fe825d776796da89c7853365e3e Mon Sep 17 00:00:00 2001 From: Siddhant Khisty Date: Wed, 20 Jul 2022 10:38:49 +0530 Subject: [PATCH 302/545] Made requested changes --- pkg/minikube/assets/addons.go | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkg/minikube/assets/addons.go b/pkg/minikube/assets/addons.go index e4cc46c460..2a3ad2077d 100755 --- a/pkg/minikube/assets/addons.go +++ b/pkg/minikube/assets/addons.go @@ -195,6 +195,7 @@ var Addons = map[string]*Addon{ }, map[string]string{ "Heketi": "docker.io", "GlusterfsServer": "docker.io", + "GlusterfileProvisioner": "docker.io", }), "efk": NewAddon([]*BinAsset{ MustBinAsset(addons.EfkAssets, @@ -247,11 +248,13 @@ var Addons = map[string]*Addon{ // https://github.com/kubernetes/ingress-nginx/blob/c32f9a43279425920c41ba2e54dfcb1a54c0daf7/deploy/static/provider/kind/deploy.yaml#L834 "IngressController": "ingress-nginx/controller:v1.2.1@sha256:5516d103a9c2ecc4f026efbd4b40662ce22dc1f824fb129ed121460aaa5c47f8", // https://github.com/kubernetes/ingress-nginx/blob/fc38b9f2aa2d68ee00c417cf97e727b77a00c175/deploy/static/provider/kind/deploy.yaml#L621 - "KubeWebhookCertgenCreate": "k8s.gcr.io/ingress-nginx/kube-webhook-certgen:v1.1.1@sha256:64d8c73dca984af206adf9d6d7e46aa550362b1d7a01f3a0a91b20cc67868660", + "KubeWebhookCertgenCreate": "ingress-nginx/kube-webhook-certgen:v1.1.1@sha256:64d8c73dca984af206adf9d6d7e46aa550362b1d7a01f3a0a91b20cc67868660", // https://github.com/kubernetes/ingress-nginx/blob/fc38b9f2aa2d68ee00c417cf97e727b77a00c175/deploy/static/provider/kind/deploy.yaml#L673 - "KubeWebhookCertgenPatch": "k8s.gcr.io/ingress-nginx/kube-webhook-certgen:v1.1.1@sha256:64d8c73dca984af206adf9d6d7e46aa550362b1d7a01f3a0a91b20cc67868660", + "KubeWebhookCertgenPatch": "ingress-nginx/kube-webhook-certgen:v1.1.1@sha256:64d8c73dca984af206adf9d6d7e46aa550362b1d7a01f3a0a91b20cc67868660", }, map[string]string{ "IngressController": "k8s.gcr.io", + "KubeWebhookCertgenCreate": "k8s.gcr.io", + "KubeWebhookCertgenPatch": "k8s.gcr.io", }), "istio-provisioner": NewAddon([]*BinAsset{ MustBinAsset(addons.IstioProvisionerAssets, @@ -559,10 +562,11 @@ var Addons = map[string]*Addon{ "gcp-auth-webhook.yaml", "0640"), }, false, "gcp-auth", "Google", "https://minikube.sigs.k8s.io/docs/handbook/addons/gcp-auth/", map[string]string{ - "KubeWebhookCertgen": "k8s.gcr.io/ingress-nginx/kube-webhook-certgen:v1.0@sha256:f3b6b39a6062328c095337b4cadcefd1612348fdd5190b1dcbcb9b9e90bd8068", + "KubeWebhookCertgen": "ingress-nginx/kube-webhook-certgen:v1.0@sha256:f3b6b39a6062328c095337b4cadcefd1612348fdd5190b1dcbcb9b9e90bd8068", "GCPAuthWebhook": "k8s-minikube/gcp-auth-webhook:v0.0.9@sha256:25e1c616444d5b2b404c43ce878f320a265fd663b4fcd4c2ad5c12de316612da", }, map[string]string{ "GCPAuthWebhook": "gcr.io", + "KubeWebhookCertgen": "k8s.gcr.io", }), "volumesnapshots": NewAddon([]*BinAsset{ // make sure the order of apply. `csi-hostpath-snapshotclass` must be the first position, because it depends on `snapshot.storage.k8s.io_volumesnapshotclasses` From bd6dd11c09e2049d3239ad2e7fe797f10801889b Mon Sep 17 00:00:00 2001 From: Akira YOSHIYAMA Date: Wed, 20 Jul 2022 15:05:06 +0900 Subject: [PATCH 303/545] Update translations/ja.json Co-authored-by: atoato88 --- translations/ja.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/translations/ja.json b/translations/ja.json index ef5f921717..758b9cb023 100644 --- a/translations/ja.json +++ b/translations/ja.json @@ -601,7 +601,7 @@ "Test docs have been saved at - {{.path}}": "テストドキュメントは {{.path}} に保存されました", "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.": "「{{.driver_name}}」ドライバーは root 権限で使用すべきではありません。root での継続を希望する場合、--force を使用してください。", - "The \"{{.name}}\" container runtime requires CNI": "", + "The \"{{.name}}\" container runtime requires CNI": "「{{.name}}」コンテナーランタイムは CNI が必要です", "The 'none' driver is designed for experts who need to integrate with an existing VM": "'none' ドライバーは既存 VM の統合が必要なエキスパートに向けて設計されています。", "The '{{.addonName}}' addon is enabled": "'{{.addonName}}' アドオンが有効です", "The '{{.driver}}' driver requires elevated permissions. The following commands will be executed:\n\n{{ .example }}\n": "'{{.driver}}' ドライバーは権限昇格が必要です。次のコマンドを実行してください:\n\n{{ .example }}\n", From da0acc4edf29cb6be44aa43cd901d9365097d354 Mon Sep 17 00:00:00 2001 From: Akira YOSHIYAMA Date: Wed, 20 Jul 2022 15:05:15 +0900 Subject: [PATCH 304/545] Update translations/ja.json Co-authored-by: atoato88 --- translations/ja.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/translations/ja.json b/translations/ja.json index 758b9cb023..4d647874bf 100644 --- a/translations/ja.json +++ b/translations/ja.json @@ -841,7 +841,7 @@ "cancel any existing scheduled stop requests": "既存のスケジュール済み停止要求をキャンセルしてください", "cannot specify --kubernetes-version with --no-kubernetes,\nto unset a global config run:\n\n$ minikube config unset kubernetes-version": "--kubernetes-version と --no-kubernetes を同時に指定できません。\nグローバル設定を解除するコマンド:\n\n$ minikube config unset kubernetes-version", "config modifies minikube config files using subcommands like \"minikube config set driver kvm2\"\nConfigurable fields: \n\n": "config コマンドは「minikube config set driver kvm2」のようにサブコマンドを使用して、minikube 設定ファイルを編集します。 \n設定可能なフィールド:\n\n", - "config view failed": "", + "config view failed": "設定表示が失敗しました", "containers paused status: {{.paused}}": "コンテナー停止状態: {{.paused}}", "dashboard service is not running: {{.error}}": "ダッシュボードサービスが実行していません: {{.error}}", "delete ctx": "", From 7dfe7e65e4e731260ed85d42f66763872163ea55 Mon Sep 17 00:00:00 2001 From: inifares23lab Date: Thu, 7 Jul 2022 15:28:03 +0200 Subject: [PATCH 305/545] when enable addons differentiate message for maintainer and verified maintainer --- cmd/minikube/cmd/config/enable.go | 16 ++++++++++++++-- pkg/minikube/assets/addons.go | 8 ++++---- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/cmd/minikube/cmd/config/enable.go b/cmd/minikube/cmd/config/enable.go index 5a16827935..4d65cd78c8 100644 --- a/cmd/minikube/cmd/config/enable.go +++ b/cmd/minikube/cmd/config/enable.go @@ -54,8 +54,20 @@ var addonsEnableCmd = &cobra.Command{ out.Styled(style.Warning, "The OLM addon has stopped working, for more details visit: https://github.com/operator-framework/operator-lifecycle-manager/issues/2534") } addonBundle, ok := assets.Addons[addon] - if ok && addonBundle.VerifiedMaintainer == "" { - out.Styled(style.Warning, fmt.Sprintf("The %s addon doesn't have a verified maintainer.", addon)) + if ok { + maintainer := addonBundle.Maintainer + if maintainer == "Google" || maintainer == "Kubernetes" { + out.Styled(style.Tip, `{{.addon}} is an addon maintained by {{.maintainer}}. For any concerns contact minikube on GitHub. +You can view the list of minikube maintainers at: https://github.com/kubernetes/minikube/blob/master/OWNERS`, + out.V{"addon": addon, "maintainer": maintainer}) + } else { + out.Styled(style.Warning, `{{.addon}} is a 3rd party addon and not maintained or verified by minikube maintainers, enable at your own risk.`, + out.V{"addon": addon}) + if addonBundle.VerifiedMaintainer != "" { + out.Styled(style.Tip, `{{.addon}} is maintained by {{.maintainer}} for any concerns contact {{.verifiedMaintainer}} on GitHub.`, + out.V{"addon": addon, "maintainer": maintainer, "verifiedMaintainer": addonBundle.VerifiedMaintainer}) + } + } } viper.Set(config.AddonImages, images) viper.Set(config.AddonRegistries, registries) diff --git a/pkg/minikube/assets/addons.go b/pkg/minikube/assets/addons.go index 564ea3b4fc..9a819ad7b2 100755 --- a/pkg/minikube/assets/addons.go +++ b/pkg/minikube/assets/addons.go @@ -154,7 +154,7 @@ var Addons = map[string]*Addon{ vmpath.GuestAddonsDir, "pod-security-policy.yaml", "0640"), - }, false, "pod-security-policy", "3rd party (pod-security-policy)", "", "", nil, nil), + }, false, "pod-security-policy", "3rd party (unknown)", "", "", nil, nil), "storage-provisioner": NewAddon([]*BinAsset{ MustBinAsset(addons.StorageProvisionerAssets, "storage-provisioner/storage-provisioner.yaml.tmpl", @@ -241,7 +241,7 @@ var Addons = map[string]*Addon{ vmpath.GuestAddonsDir, "ingress-deploy.yaml", "0640"), - }, false, "ingress", "3rd party (Ingress)", "", "https://kubernetes.io/docs/tasks/access-application-cluster/ingress-minikube/", map[string]string{ + }, false, "ingress", "Kubernetes", "", "https://kubernetes.io/docs/tasks/access-application-cluster/ingress-minikube/", map[string]string{ // https://github.com/kubernetes/ingress-nginx/blob/c32f9a43279425920c41ba2e54dfcb1a54c0daf7/deploy/static/provider/kind/deploy.yaml#L834 "IngressController": "ingress-nginx/controller:v1.2.1@sha256:5516d103a9c2ecc4f026efbd4b40662ce22dc1f824fb129ed121460aaa5c47f8", // https://github.com/kubernetes/ingress-nginx/blob/fc38b9f2aa2d68ee00c417cf97e727b77a00c175/deploy/static/provider/kind/deploy.yaml#L621 @@ -388,7 +388,7 @@ var Addons = map[string]*Addon{ vmpath.GuestAddonsDir, "patch-coredns-job.yaml", "0640"), - }, false, "registry-aliases", "3rd party (registry-aliases)", "", "", map[string]string{ + }, false, "registry-aliases", "3rd party (unknown)", "", "", map[string]string{ "CoreDNSPatcher": "rhdevelopers/core-dns-patcher@sha256:9220ff32f690c3d889a52afb59ca6fcbbdbd99e5370550cc6fd249adea8ed0a9", "Alpine": "alpine:3.11@sha256:0bd0e9e03a022c3b0226667621da84fc9bf562a9056130424b5bfbd8bcb0397f", "Pause": "google_containers/pause:3.1@sha256:f78411e19d84a252e53bff71a4407a5686c46983a2c2eeed83929b888179acea", @@ -442,7 +442,7 @@ var Addons = map[string]*Addon{ vmpath.GuestAddonsDir, "logviewer-rbac.yaml", "0640"), - }, false, "logviewer", "3rd party (ivans3)", "", "", map[string]string{ + }, false, "logviewer", "3rd party (unknown)", "", "", map[string]string{ "LogViewer": "ivans3/minikube-log-viewer:latest@sha256:75854f45305cc47d17b04c6c588fa60777391761f951e3a34161ddf1f1b06405", }, nil), "gvisor": NewAddon([]*BinAsset{ From 36402ec720e87a2f0c159ace4e0e705918d3d3a0 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 25 Jul 2022 10:02:17 +0000 Subject: [PATCH 306/545] bump golint versions --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 23171b71fb..71032b8547 100644 --- a/Makefile +++ b/Makefile @@ -76,7 +76,7 @@ MINIKUBE_RELEASES_URL=https://github.com/kubernetes/minikube/releases/download KERNEL_VERSION ?= 5.10.57 # latest from https://github.com/golangci/golangci-lint/releases # update this only by running `make update-golint-version` -GOLINT_VERSION ?= v1.46.2 +GOLINT_VERSION ?= v1.47.2 # Limit number of default jobs, to avoid the CI builds running out of memory GOLINT_JOBS ?= 4 # see https://github.com/golangci/golangci-lint#memory-usage-of-golangci-lint From 5487e8ccc5fff0d1308c3f5b2953773f69b3d95a Mon Sep 17 00:00:00 2001 From: HarshCasper Date: Mon, 25 Jul 2022 18:00:53 +0530 Subject: [PATCH 307/545] CI: add macos-11 to remove deprecated macos-10.15 --- .github/workflows/master.yml | 2 +- .github/workflows/pr.yml | 2 +- .github/workflows/time-to-k8s-public-chart.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 3960f26216..7f1e537c9b 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -395,7 +395,7 @@ jobs: JOB_NAME: "functional_virtualbox_macos" GOPOGH_RESULT: "" SHELL: "/bin/bash" # To prevent https://github.com/kubernetes/minikube/issues/6643 - runs-on: macos-10.15 + runs-on: macos-11 steps: - name: Install kubectl shell: bash diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 94fc5c0caf..58a3b57468 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -395,7 +395,7 @@ jobs: JOB_NAME: "functional_virtualbox_macos" GOPOGH_RESULT: "" SHELL: "/bin/bash" # To prevent https://github.com/kubernetes/minikube/issues/6643 - runs-on: macos-10.15 + runs-on: macos-11 steps: - name: Install kubectl shell: bash diff --git a/.github/workflows/time-to-k8s-public-chart.yml b/.github/workflows/time-to-k8s-public-chart.yml index 56fbb1d262..2792e451cc 100644 --- a/.github/workflows/time-to-k8s-public-chart.yml +++ b/.github/workflows/time-to-k8s-public-chart.yml @@ -31,7 +31,7 @@ jobs: ./hack/benchmark/time-to-k8s/public-chart/public-chart.sh docker containerd time-to-k8s-public-chart-virtualbox: if: github.repository == 'kubernetes/minikube' - runs-on: macos-10.15 + runs-on: macos-11 env: AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} From 07ced2457e0f09a258e49f16debd0e831b11011d Mon Sep 17 00:00:00 2001 From: Jeff MAURY Date: Mon, 25 Jul 2022 17:12:11 +0200 Subject: [PATCH 308/545] Fix french translation Signed-off-by: Jeff MAURY --- translations/fr.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/translations/fr.json b/translations/fr.json index 316168ffcc..114f79d38d 100644 --- a/translations/fr.json +++ b/translations/fr.json @@ -491,8 +491,8 @@ "Profile name '{{.profilename}}' is not valid": "Le nom de profil '{{.profilename}}' n'est pas valide", "Profile name should be unique": "Le nom du profil doit être unique", "Provide VM UUID to restore MAC address (hyperkit driver only)": "Fournit l'identifiant unique universel (UUID) de la VM pour restaurer l'adresse MAC (pilote hyperkit uniquement).", - "Provides instructions to point your terminal's docker-cli to the Docker Engine inside minikube. (Useful for building docker images directly inside minikube)": "", - "Provides instructions to point your terminal's docker-cli to the Docker Engine inside minikube. (Useful for building docker images directly inside minikube)\n\nFor example, you can do all docker operations such as docker build, docker run, and docker ps directly on the docker inside minikube.\n\nNote: You need the docker-cli to be installed on your machine.\ndocker-cli install instructions: https://minikube.sigs.k8s.io/docs/tutorials/docker_desktop_replacement/#steps": "", + "Provides instructions to point your terminal's docker-cli to the Docker Engine inside minikube. (Useful for building docker images directly inside minikube)": "Fournit des instructions pour pointer le docker-cli de votre terminal vers le moteur Docker à l'intérieur de minikube. (Utile pour créer des images docker directement dans minikube)", + "Provides instructions to point your terminal's docker-cli to the Docker Engine inside minikube. (Useful for building docker images directly inside minikube)\n\nFor example, you can do all docker operations such as docker build, docker run, and docker ps directly on the docker inside minikube.\n\nNote: You need the docker-cli to be installed on your machine.\ndocker-cli install instructions: https://minikube.sigs.k8s.io/docs/tutorials/docker_desktop_replacement/#steps": "Fournit des instructions pour pointer le docker-cli de votre terminal vers le moteur Docker à l'intérieur de minikube. (Utile pour créer des images docker directement dans minikube)\n\nPar exemple, vous pouvez effectuer toutes les opérations docker telles que docker build, docker run et docker ps directement sur le docker à l'intérieur de minikube.\n\nRemarque : Vous avez besoin du docker- cli à installer sur votre machine.\ndocker-cli instructions d'installation : https://minikube.sigs.k8s.io/docs/tutorials/docker_desktop_replacement/#steps", "Pull images": "Extraction des images", "Pull the remote image (no caching)": "Extraire l'image distante (pas de mise en cache)", "Pulling base image ...": "Extraction de l'image de base...", From 00ac4064200de2b4bab26e4b3602b0ce282338a4 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Mon, 25 Jul 2022 09:59:13 -0700 Subject: [PATCH 309/545] fix linting --- test/integration/driver_install_or_update_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/integration/driver_install_or_update_test.go b/test/integration/driver_install_or_update_test.go index c7aafde80a..81d16c2516 100644 --- a/test/integration/driver_install_or_update_test.go +++ b/test/integration/driver_install_or_update_test.go @@ -194,7 +194,7 @@ func TestHyperkitDriverSkipUpgrade(t *testing.T) { for _, tc := range tests { t.Run(tc.name, func(t *testing.T) { - mkDir, drvPath, err := prepareTempMinikubeDirWithHyperkitDriver(t, tc.name, tc.path) + mkDir, drvPath, err := prepareTempMinikubeDirWithHyperkitDriver(t, tc.path) if err != nil { t.Fatalf("Failed to prepare tempdir. test: %s, got: %v", tc.name, err) } @@ -242,7 +242,7 @@ func driverVersion(path string) (string, error) { // prepareTempMinikubeDirWithHyperkitDriver creates a temp .minikube directory // with structure essential to testing of hyperkit driver updates -func prepareTempMinikubeDirWithHyperkitDriver(t *testing.T, name, driver string) (string, string, error) { +func prepareTempMinikubeDirWithHyperkitDriver(t *testing.T, driver string) (string, string, error) { temp := t.TempDir() mkDir := filepath.Join(temp, ".minikube") mkBinDir := filepath.Join(mkDir, "bin") From 72d4674d58553d3b5ca269bb8ec3a9120000c600 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 25 Jul 2022 17:28:28 +0000 Subject: [PATCH 310/545] Update auto-generated docs and translations --- translations/ja.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/translations/ja.json b/translations/ja.json index 3686a182f7..804fa14d30 100644 --- a/translations/ja.json +++ b/translations/ja.json @@ -233,8 +233,8 @@ "Failed to check main repository and mirrors for images": "メインリポジトリーとミラーのイメージのチェックに失敗しました", "Failed to configure metallb IP {{.profile}}": "metallb IP {{.profile}} の設定に失敗しました", "Failed to configure network plugin": "ネットワークプラグインの設定に失敗しました", - "Failed to create file": "ファイルの作成に失敗しました", "Failed to configure registry-aliases {{.profile}}": "", + "Failed to create file": "ファイルの作成に失敗しました", "Failed to create runtime": "ランタイムの作成に失敗しました", "Failed to delete cluster {{.name}}, proceeding with retry anyway.": "{{.name}} クラスターを削除できませんでしたが、処理を続行します。", "Failed to delete cluster {{.name}}.": "{{.name}} クラスターの削除に失敗しました。", @@ -834,7 +834,6 @@ "Your minikube vm is not running, try minikube start.": "minikube の VM が実行されていません。minikube start を試してみてください。", "Your user lacks permissions to the minikube profile directory. Run: 'sudo chown -R $USER $HOME/.minikube; chmod -R u+wrx $HOME/.minikube' to fix": "アカウントが minikube プロファイルディレクトリーへの書き込み権限を持っていません。問題修正のため、'sudo chown -R $USER $HOME/.minikube; chmod -R u+wrx $HOME/.minikube' を実行してください", "[WARNING] For full functionality, the 'csi-hostpath-driver' addon requires the 'volumesnapshots' addon to be enabled.\n\nYou can enable 'volumesnapshots' addon by running: 'minikube addons enable volumesnapshots'\n": "[警告] フル機能のために、'csi-hostpath-driver' アドオンが 'volumesnapshots' アドオンの有効化を要求しています。\n\n'minikube addons enable volumesnapshots' を実行して 'volumesnapshots' を有効化できます\n", - "\"minikube cache\" will be deprecated in upcoming versions, please switch to \"minikube image load\"": "「minikube cache」は今後のバージョンで廃止予定になりますので、「minikube image load」に切り替えてください", "addon '{{.name}}' is currently not enabled.\nTo enable this addon run:\nminikube addons enable {{.name}}": "'{{.name}}' アドオンは現在無効になっています。\n有効にするためには、以下のコマンドを実行してください。 \nminikube addons enable {{.name}}", "addon '{{.name}}' is not a valid addon packaged with minikube.\nTo see the list of available addons run:\nminikube addons list": "'{{.name}}' は minikube にパッケージングされた有効なアドオンではありません。\n利用可能なアドオンの一覧を表示するためには、以下のコマンドを実行してください。 \nminikube addons list", "addons modifies minikube addons files using subcommands like \"minikube addons enable dashboard\"": "addons コマンドは「minikube addons enable dashboard」のようなサブコマンドを使用することで、minikube アドオンファイルを修正します", From 928d76b17deca32627f26a6a2d4270060a7660ea Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Jul 2022 18:05:30 +0000 Subject: [PATCH 311/545] Bump cloud.google.com/go/storage from 1.23.0 to 1.24.0 Bumps [cloud.google.com/go/storage](https://github.com/googleapis/google-cloud-go) from 1.23.0 to 1.24.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/pubsub/v1.23.0...pubsub/v1.24.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 | 3 +-- go.sum | 8 ++------ 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/go.mod b/go.mod index 1bf3af949c..9fbe9d3481 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.23.0 + cloud.google.com/go/storage v1.24.0 contrib.go.opencensus.io/exporter/stackdriver v0.13.12 github.com/Delta456/box-cli-maker/v2 v2.2.2 github.com/GoogleCloudPlatform/docker-credential-gcr v0.0.0-20210713212222-faed5e8b8ca2 @@ -157,7 +157,6 @@ require ( github.com/google/gofuzz v1.1.0 // indirect github.com/googleapis/enterprise-certificate-proxy v0.1.0 // indirect github.com/googleapis/gax-go/v2 v2.4.0 // 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 diff --git a/go.sum b/go.sum index 0e7a97d274..ae040e0540 100644 --- a/go.sum +++ b/go.sum @@ -71,8 +71,8 @@ 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.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo= cloud.google.com/go/storage v1.22.1/go.mod h1:S8N1cAStu7BOeFfE8KAQzmyyLkK8p/vmRq6kuBTW58Y= -cloud.google.com/go/storage v1.23.0 h1:wWRIaDURQA8xxHguFCshYepGlrWIrbBnAmc7wfg07qY= -cloud.google.com/go/storage v1.23.0/go.mod h1:vOEEDNFnciUMhBeT6hsJIn3ieU5cFRmzeLgDvXzfIXc= +cloud.google.com/go/storage v1.24.0 h1:a4N0gIkx83uoVFGz8B2eAV3OhN90QoWF5OZWLKl39ig= +cloud.google.com/go/storage v1.24.0/go.mod h1:3xrJEFMXBsQLgxwThyjuD3aYlroL0TMRec1ypGUQ0KE= 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= @@ -722,7 +722,6 @@ github.com/googleapis/gax-go/v2 v2.4.0/go.mod h1:XOTVJ59hdnfJLIP/dh8n5CGryZR2LxK 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/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= @@ -1639,7 +1638,6 @@ golang.org/x/net v0.0.0-20220325170049-de3da57026de/go.mod h1:CfG3xpIq0wQ8r1q4Su golang.org/x/net v0.0.0-20220412020605-290c469a71a5/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220607020251-c690dde0001d/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -golang.org/x/net v0.0.0-20220617184016-355a448f1bc9/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e h1:TsQ7F31D3bUCLeqPT0u+yjp1guoArKaNKmCr22PYgTQ= golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= @@ -1813,7 +1811,6 @@ golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220517195934-5e4e11fc645e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220610221304-9f5ed59c137d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220615213510-4f61da869c0c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220624220833-87e55d714810 h1:rHZQSjJdAI4Xf5Qzeh2bBc5YJIkPFVM6oDtMFYmgws0= golang.org/x/sys v0.0.0-20220624220833-87e55d714810/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= @@ -2003,7 +2000,6 @@ google.golang.org/api v0.75.0/go.mod h1:pU9QmyHLnzlpar1Mjt4IbapUCy8J+6HD6GeELN69 google.golang.org/api v0.78.0/go.mod h1:1Sg78yoMLOhlQTeF+ARBoytAcH1NNyyl390YMy6rKmw= google.golang.org/api v0.80.0/go.mod h1:xY3nI94gbvBrE0J6NHXhxOmW97HG7Khjkku6AFB3Hyg= google.golang.org/api v0.84.0/go.mod h1:NTsGnUFJMYROtiquksZHBWtHfeMC7iYthki7Eq3pa8o= -google.golang.org/api v0.85.0/go.mod h1:AqZf8Ep9uZ2pyTvgL+x0D3Zt0eoT9b5E8fmzfu6FO2g= google.golang.org/api v0.86.0 h1:ZAnyOHQFIuWso1BodVfSaRyffD74T9ERGFa3k1fNk/U= google.golang.org/api v0.86.0/go.mod h1:+Sem1dnrKlrXMR/X0bPnMWyluQe4RsNoYfmNLhOIkzw= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= From afe362bd60b5cd6291466140bee7709fe4c5afe0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Jul 2022 20:30:46 +0000 Subject: [PATCH 312/545] Bump google.golang.org/api from 0.86.0 to 0.88.0 Bumps [google.golang.org/api](https://github.com/googleapis/google-api-go-client) from 0.86.0 to 0.88.0. - [Release notes](https://github.com/googleapis/google-api-go-client/releases) - [Changelog](https://github.com/googleapis/google-api-go-client/blob/main/CHANGES.md) - [Commits](https://github.com/googleapis/google-api-go-client/compare/v0.86.0...v0.88.0) --- updated-dependencies: - dependency-name: google.golang.org/api dependency-type: direct:production update-type: version-update:semver-minor ... 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 efeb87c105..7256cd0391 100644 --- a/go.mod +++ b/go.mod @@ -80,7 +80,7 @@ require ( golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 golang.org/x/text v0.3.7 gonum.org/v1/plot v0.11.0 - google.golang.org/api v0.86.0 + google.golang.org/api v0.88.0 gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 // indirect gopkg.in/yaml.v2 v2.4.0 k8s.io/api v0.24.3 diff --git a/go.sum b/go.sum index 77ea7e0faa..9485cfb1f7 100644 --- a/go.sum +++ b/go.sum @@ -2000,8 +2000,8 @@ google.golang.org/api v0.75.0/go.mod h1:pU9QmyHLnzlpar1Mjt4IbapUCy8J+6HD6GeELN69 google.golang.org/api v0.78.0/go.mod h1:1Sg78yoMLOhlQTeF+ARBoytAcH1NNyyl390YMy6rKmw= google.golang.org/api v0.80.0/go.mod h1:xY3nI94gbvBrE0J6NHXhxOmW97HG7Khjkku6AFB3Hyg= google.golang.org/api v0.84.0/go.mod h1:NTsGnUFJMYROtiquksZHBWtHfeMC7iYthki7Eq3pa8o= -google.golang.org/api v0.86.0 h1:ZAnyOHQFIuWso1BodVfSaRyffD74T9ERGFa3k1fNk/U= -google.golang.org/api v0.86.0/go.mod h1:+Sem1dnrKlrXMR/X0bPnMWyluQe4RsNoYfmNLhOIkzw= +google.golang.org/api v0.88.0 h1:MPwxQRqpyskYhr2iNyfsQ8R06eeyhe7UEuR30p136ZQ= +google.golang.org/api v0.88.0/go.mod h1:+Sem1dnrKlrXMR/X0bPnMWyluQe4RsNoYfmNLhOIkzw= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= From c3643f5ee2ab57cdf7268f4874c476fb9a7304a7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Jul 2022 20:30:50 +0000 Subject: [PATCH 313/545] Bump github.com/google/go-containerregistry from 0.10.0 to 0.11.0 Bumps [github.com/google/go-containerregistry](https://github.com/google/go-containerregistry) from 0.10.0 to 0.11.0. - [Release notes](https://github.com/google/go-containerregistry/releases) - [Changelog](https://github.com/google/go-containerregistry/blob/main/.goreleaser.yml) - [Commits](https://github.com/google/go-containerregistry/compare/v0.10.0...v0.11.0) --- updated-dependencies: - dependency-name: github.com/google/go-containerregistry dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 18 +++++++++--------- go.sum | 35 ++++++++++++++++++++--------------- 2 files changed, 29 insertions(+), 24 deletions(-) diff --git a/go.mod b/go.mod index efeb87c105..c82cf253f4 100644 --- a/go.mod +++ b/go.mod @@ -23,7 +23,7 @@ require ( github.com/elazarl/goproxy v0.0.0-20210110162100-a92cc753f88e github.com/golang-collections/collections v0.0.0-20130729185459-604e922904d3 github.com/google/go-cmp v0.5.8 - github.com/google/go-containerregistry v0.10.0 + github.com/google/go-containerregistry v0.11.0 github.com/google/slowjam v1.0.0 github.com/google/uuid v1.3.0 github.com/hashicorp/go-getter v1.6.2 @@ -73,10 +73,10 @@ require ( golang.org/x/build v0.0.0-20190927031335-2835ba2e683f golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4 golang.org/x/exp v0.0.0-20210220032938-85be41e4509f - golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 - golang.org/x/oauth2 v0.0.0-20220622183110-fd043fe589d2 + golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 + golang.org/x/oauth2 v0.0.0-20220718184931-c8730f7fcb92 golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f - golang.org/x/sys v0.0.0-20220624220833-87e55d714810 + golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 golang.org/x/text v0.3.7 gonum.org/v1/plot v0.11.0 @@ -126,12 +126,12 @@ require ( github.com/cespare/xxhash/v2 v2.1.2 // indirect github.com/containerd/cgroups v1.0.1 // indirect github.com/containerd/containerd v1.5.2 // indirect - github.com/containerd/stargz-snapshotter/estargz v0.11.4 // indirect + github.com/containerd/stargz-snapshotter/estargz v0.12.0 // indirect github.com/coreos/go-systemd/v22 v22.3.2 // indirect github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect github.com/cyphar/filepath-securejoin v0.2.3 // indirect github.com/davecgh/go-spew v1.1.1 // indirect - github.com/docker/cli v20.10.16+incompatible // indirect + github.com/docker/cli v20.10.17+incompatible // indirect github.com/docker/distribution v2.8.1+incompatible // indirect github.com/docker/docker-credential-helpers v0.6.4 // indirect github.com/emicklei/go-restful v2.9.5+incompatible // indirect @@ -167,7 +167,7 @@ require ( github.com/jmespath/go-jmespath v0.4.0 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect - github.com/klauspost/compress v1.15.4 // indirect + github.com/klauspost/compress v1.15.8 // indirect github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect github.com/magiconair/properties v1.8.6 // indirect github.com/mailru/easyjson v0.7.6 // indirect @@ -197,7 +197,7 @@ require ( github.com/prometheus/prometheus v2.5.0+incompatible // indirect 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/sirupsen/logrus v1.9.0 // indirect github.com/spf13/afero v1.8.2 // indirect github.com/spf13/cast v1.5.0 // indirect github.com/spf13/jwalterweatherman v1.1.0 // indirect @@ -212,7 +212,7 @@ require ( go.uber.org/multierr v1.8.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-20220624214902-1bab6f366d9e // indirect + golang.org/x/net v0.0.0-20220708220712-1185a9018129 // indirect golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f // indirect google.golang.org/appengine v1.6.7 // indirect diff --git a/go.sum b/go.sum index 77ea7e0faa..48cf4a1454 100644 --- a/go.sum +++ b/go.sum @@ -345,8 +345,8 @@ github.com/containerd/imgcrypt v1.1.1/go.mod h1:xpLnwiQmEUJPvQoAapeb2SNCxz7Xr6PJ github.com/containerd/nri v0.0.0-20201007170849-eb1350a75164/go.mod h1:+2wGSDGFYfE5+So4M5syatU0N0f0LbWpuqyMi4/BE8c= github.com/containerd/nri v0.0.0-20210316161719-dbaa18c31c14/go.mod h1:lmxnXF6oMkbqs39FiCt1s0R2HSMhcLel9vNL3m4AaeY= github.com/containerd/nri v0.1.0/go.mod h1:lmxnXF6oMkbqs39FiCt1s0R2HSMhcLel9vNL3m4AaeY= -github.com/containerd/stargz-snapshotter/estargz v0.11.4 h1:LjrYUZpyOhiSaU7hHrdR82/RBoxfGWSaC0VeSSMXqnk= -github.com/containerd/stargz-snapshotter/estargz v0.11.4/go.mod h1:7vRJIcImfY8bpifnMjt+HTJoQxASq7T28MYbP15/Nf0= +github.com/containerd/stargz-snapshotter/estargz v0.12.0 h1:idtwRTLjk2erqiYhPWy2L844By8NRFYEwYHcXhoIWPM= +github.com/containerd/stargz-snapshotter/estargz v0.12.0/go.mod h1:AIQ59TewBFJ4GOPEQXujcrJ/EKxh5xXZegW1rkR1P/M= github.com/containerd/ttrpc v0.0.0-20190828154514-0e0f228740de/go.mod h1:PvCDdDGpgqzQIzDW1TphrGLssLDZp2GuS+X5DkEJB8o= github.com/containerd/ttrpc v0.0.0-20190828172938-92c8520ef9f8/go.mod h1:PvCDdDGpgqzQIzDW1TphrGLssLDZp2GuS+X5DkEJB8o= github.com/containerd/ttrpc v0.0.0-20191028202541-4f1b8fe65a5c/go.mod h1:LPm1u0xBw8r8NOKoOdNMeVHSawSsltak+Ihv+etqsE8= @@ -418,8 +418,8 @@ github.com/dgrijalva/jwt-go v0.0.0-20170104182250-a601269ab70c/go.mod h1:E3ru+11 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= github.com/dnaeon/go-vcr v1.0.1/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyGc8n1E= -github.com/docker/cli v20.10.16+incompatible h1:aLQ8XowgKpR3/IysPj8qZQJBVQ+Qws61icFuZl6iKYs= -github.com/docker/cli v20.10.16+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= +github.com/docker/cli v20.10.17+incompatible h1:eO2KS7ZFeov5UJeaDmIs1NFEDRf32PaqRpvoEkKBy5M= +github.com/docker/cli v20.10.17+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/distribution v0.0.0-20190905152932-14b96e55d84c/go.mod h1:0+TTO4EOBfRPhZXAeF1Vu+W3hHZ8eLp8PgKVZlcvtFY= github.com/docker/distribution v2.7.1-0.20190205005809-0d3efadf0154+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= @@ -663,8 +663,8 @@ github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE= github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -github.com/google/go-containerregistry v0.10.0 h1:qd/fv2nQajGZJenaNcdaghlwSPjQ0NphN9hzArr2WWg= -github.com/google/go-containerregistry v0.10.0/go.mod h1:C7uwbB1QUAtvnknyd3ethxJRd4gtEjU/9WLXzckfI1Y= +github.com/google/go-containerregistry v0.11.0 h1:Xt8x1adcREjFcmDoDK8OdOsjxu90PHkGuwNP8GiHMLM= +github.com/google/go-containerregistry v0.11.0/go.mod h1:BBaYtsHPHA42uEgAvd/NejvAfPSlz281sJWqupjSxfk= github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ= github.com/google/go-github/v43 v43.0.0 h1:y+GL7LIsAIF2NZlJ46ZoC/D1W1ivZasT0lnWHMYPZ+U= github.com/google/go-github/v43 v43.0.0/go.mod h1:ZkTvvmCXBvsfPpTHXnH/d2hP9Y0cTbvN9kr5xqyXOIc= @@ -899,9 +899,9 @@ github.com/klauspost/compress v1.11.3/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYs github.com/klauspost/compress v1.11.13/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= github.com/klauspost/compress v1.13.4/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg= github.com/klauspost/compress v1.13.5/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= -github.com/klauspost/compress v1.15.1/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= -github.com/klauspost/compress v1.15.4 h1:1kn4/7MepF/CHmYub99/nNX8az0IJjfSOU/jbnTVfqQ= -github.com/klauspost/compress v1.15.4/go.mod h1:PhcZ0MbTNciWF3rruxRgKxI5NkcHHrHUDtV4Yw2GlzU= +github.com/klauspost/compress v1.15.7/go.mod h1:PhcZ0MbTNciWF3rruxRgKxI5NkcHHrHUDtV4Yw2GlzU= +github.com/klauspost/compress v1.15.8 h1:JahtItbkWjf2jzm/T+qgMxkP9EMHsqEUA6vCMGmXvhA= +github.com/klauspost/compress v1.15.8/go.mod h1:PhcZ0MbTNciWF3rruxRgKxI5NkcHHrHUDtV4Yw2GlzU= github.com/klauspost/cpuid v1.2.0 h1:NMpwD2G9JSFOE1/TJjGSo5zG7Yb2bTe7eq1jH+irmeE= github.com/klauspost/cpuid v1.2.0/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= @@ -1275,8 +1275,9 @@ github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMB github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= -github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE= github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= +github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0= +github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/sivchari/tenv v1.4.7/go.mod h1:5nF+bITvkebQVanjU6IuMbvIot/7ReNsUV7I5NbprB0= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= @@ -1569,8 +1570,9 @@ golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.5.0/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= -golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 h1:kQgndtyPBW/JIYERgdxfwMYh3AVStj88WQTlNDi2a+o= golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY= +golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 h1:6zppjxzCulZykYSLyVDYbneBfbaBIQPYMevg0bEwv2s= +golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -1638,8 +1640,9 @@ golang.org/x/net v0.0.0-20220325170049-de3da57026de/go.mod h1:CfG3xpIq0wQ8r1q4Su golang.org/x/net v0.0.0-20220412020605-290c469a71a5/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220607020251-c690dde0001d/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e h1:TsQ7F31D3bUCLeqPT0u+yjp1guoArKaNKmCr22PYgTQ= golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/net v0.0.0-20220708220712-1185a9018129 h1:vucSRfWwTsoXro7P+3Cjlr6flUMtzCwzlvkxEQtHHB0= +golang.org/x/net v0.0.0-20220708220712-1185a9018129/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= 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= @@ -1663,8 +1666,9 @@ golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j golang.org/x/oauth2 v0.0.0-20220309155454-6242fa91716a/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= golang.org/x/oauth2 v0.0.0-20220608161450-d0670ef3b1eb/go.mod h1:jaDAt6Dkxork7LmZnYtzbRWj0W47D86a3TGe0YHBvmE= -golang.org/x/oauth2 v0.0.0-20220622183110-fd043fe589d2 h1:+jnHzr9VPj32ykQVai5DNahi9+NSp7yYuCsl5eAQtL0= golang.org/x/oauth2 v0.0.0-20220622183110-fd043fe589d2/go.mod h1:jaDAt6Dkxork7LmZnYtzbRWj0W47D86a3TGe0YHBvmE= +golang.org/x/oauth2 v0.0.0-20220718184931-c8730f7fcb92 h1:oVlhw3Oe+1reYsE2Nqu19PDJfLzwdU3QUUrG86rLK68= +golang.org/x/oauth2 v0.0.0-20220718184931-c8730f7fcb92/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg= 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= @@ -1811,8 +1815,9 @@ golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220517195934-5e4e11fc645e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220610221304-9f5ed59c137d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220624220833-87e55d714810 h1:rHZQSjJdAI4Xf5Qzeh2bBc5YJIkPFVM6oDtMFYmgws0= golang.org/x/sys v0.0.0-20220624220833-87e55d714810/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 h1:0A+M6Uqn+Eje4kHMK80dtF3JCXC4ykBgQG4Fe06QRhQ= +golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/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-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY= @@ -1944,7 +1949,7 @@ golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.6/go.mod h1:LGqMHiF4EqQNHR1JncWGqT5BVaXmza+X+BDGol+dOxo= golang.org/x/tools v0.1.7/go.mod h1:LGqMHiF4EqQNHR1JncWGqT5BVaXmza+X+BDGol+dOxo= golang.org/x/tools v0.1.10-0.20220218145154-897bd77cd717/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E= -golang.org/x/tools v0.1.10 h1:QjFRCZxdOhBJ/UNgnBZLbNV13DlbnK0quyivTnXJM20= +golang.org/x/tools v0.1.11 h1:loJ25fNOEhSXfHrpoGj91eCUThwdNX6u24rO1xnNteY= 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= From a7dc4435c505ccce40578f359cf0dc967eba0dc0 Mon Sep 17 00:00:00 2001 From: klaases Date: Fri, 22 Jul 2022 21:24:57 +0000 Subject: [PATCH 314/545] reason codes for not found cri-dockerd and dockerd --- pkg/minikube/reason/reason.go | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/pkg/minikube/reason/reason.go b/pkg/minikube/reason/reason.go index e990ebce4d..7ecfd27c9f 100644 --- a/pkg/minikube/reason/reason.go +++ b/pkg/minikube/reason/reason.go @@ -460,4 +460,25 @@ var ( `), Style: style.SeeNoEvil, } + + NotFoundCriDockerD = Kind{ + ID: "NOT_FOUND_CRI_DOCKERD", + ExitCode: ExProgramNotFound, + Advice: translate.T(`The none driver with Kubernetes v1.24+ requires cri-dockerd. + + Please install cri-dockerd using these instructions: + + https://github.com/Mirantis/cri-dockerd#build-and-install`), + Style: style.Docker, + } + NotFoundDockerD = Kind{ + ID: "NOT_FOUND_DOCKERD", + ExitCode: ExProgramNotFound, + Advice: translate.T(`The none driver with Kubernetes v1.24+ requires dockerd. + + Please install dockerd using these instructions: + + https://docs.docker.com/engine/reference/commandline/dockerd/`), + Style: style.Docker, + } ) From 1ec4a14acda7b073eeb56580bd36153ee17d9ea5 Mon Sep 17 00:00:00 2001 From: klaases Date: Fri, 22 Jul 2022 21:29:06 +0000 Subject: [PATCH 315/545] add check for none driver --- pkg/minikube/driver/driver.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkg/minikube/driver/driver.go b/pkg/minikube/driver/driver.go index 88be616ed1..332daf7537 100644 --- a/pkg/minikube/driver/driver.go +++ b/pkg/minikube/driver/driver.go @@ -157,6 +157,11 @@ func IsMock(name string) bool { return name == Mock } +// IsNone checks if the driver is a none +func IsNone(name string) bool { + return name == None +} + // IsKVM checks if the driver is a KVM[2] func IsKVM(name string) bool { return name == KVM2 || name == AliasKVM From 237e21b530f14247628c95a5bc65b0596f1ba1f8 Mon Sep 17 00:00:00 2001 From: klaases Date: Fri, 22 Jul 2022 21:34:20 +0000 Subject: [PATCH 316/545] exit if required cri-dockerd/dockerd are not found --- pkg/minikube/machine/start.go | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/pkg/minikube/machine/start.go b/pkg/minikube/machine/start.go index 895d2993d8..c525cdfc16 100644 --- a/pkg/minikube/machine/start.go +++ b/pkg/minikube/machine/start.go @@ -28,6 +28,7 @@ import ( "strings" "time" + "github.com/blang/semver" "github.com/docker/machine/libmachine" "github.com/docker/machine/libmachine/drivers" "github.com/docker/machine/libmachine/engine" @@ -313,6 +314,23 @@ func postStartSetup(h *host.Host, mc config.ClusterConfig) error { return nil } + if driver.IsNone(h.DriverName) { + // If Kubernetes version >= 1.24, require both cri-dockerd and dockerd. + k8sVer, err := semver.ParseTolerant(mc.KubernetesConfig.KubernetesVersion) + if err != nil { + klog.Errorf("unable to parse Kubernetes version: %s", mc.KubernetesConfig.KubernetesVersion) + return err + } + if k8sVer.GTE(semver.Version{Major: 1, Minor: 24}) { + if _, err := exec.LookPath("cri-dockerd"); err != nil { + exit.Message(reason.NotFoundCriDockerD, "") + } + if _, err := exec.LookPath("dockerd"); err != nil { + exit.Message(reason.NotFoundDockerD, "") + } + } + } + klog.Infof("creating required directories: %v", requiredDirectories) r, err := CommandRunner(h) From 8f3ffb6be1c2ecc0ed994f5437fee52d198338e9 Mon Sep 17 00:00:00 2001 From: klaases Date: Mon, 25 Jul 2022 18:34:19 +0000 Subject: [PATCH 317/545] correct dockerd installation instructions --- pkg/minikube/reason/reason.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/minikube/reason/reason.go b/pkg/minikube/reason/reason.go index 7ecfd27c9f..33de37a39f 100644 --- a/pkg/minikube/reason/reason.go +++ b/pkg/minikube/reason/reason.go @@ -478,7 +478,7 @@ var ( Please install dockerd using these instructions: - https://docs.docker.com/engine/reference/commandline/dockerd/`), + https://docs.docker.com/engine/install/`), Style: style.Docker, } ) From 522914302edd6499536f91a6289a49af1d257081 Mon Sep 17 00:00:00 2001 From: klaases Date: Mon, 25 Jul 2022 21:10:34 +0000 Subject: [PATCH 318/545] =?UTF-8?q?add=20line=20break=20before:=20"?= =?UTF-8?q?=F0=9F=92=A1=20=20Suggestion=20..."?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/minikube/machine/start.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/minikube/machine/start.go b/pkg/minikube/machine/start.go index c525cdfc16..fc003d7a1d 100644 --- a/pkg/minikube/machine/start.go +++ b/pkg/minikube/machine/start.go @@ -323,10 +323,10 @@ func postStartSetup(h *host.Host, mc config.ClusterConfig) error { } if k8sVer.GTE(semver.Version{Major: 1, Minor: 24}) { if _, err := exec.LookPath("cri-dockerd"); err != nil { - exit.Message(reason.NotFoundCriDockerD, "") + exit.Message(reason.NotFoundCriDockerD, "\n\n") } if _, err := exec.LookPath("dockerd"); err != nil { - exit.Message(reason.NotFoundDockerD, "") + exit.Message(reason.NotFoundDockerD, "\n\n") } } } From 61181650bc8a336517d52ce51057ef2ec61922bf Mon Sep 17 00:00:00 2001 From: klaases Date: Mon, 25 Jul 2022 21:29:34 +0000 Subject: [PATCH 319/545] apply lowercase trailing "d's" --- pkg/minikube/machine/start.go | 4 ++-- pkg/minikube/reason/reason.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/minikube/machine/start.go b/pkg/minikube/machine/start.go index fc003d7a1d..45db1129e6 100644 --- a/pkg/minikube/machine/start.go +++ b/pkg/minikube/machine/start.go @@ -323,10 +323,10 @@ func postStartSetup(h *host.Host, mc config.ClusterConfig) error { } if k8sVer.GTE(semver.Version{Major: 1, Minor: 24}) { if _, err := exec.LookPath("cri-dockerd"); err != nil { - exit.Message(reason.NotFoundCriDockerD, "\n\n") + exit.Message(reason.NotFoundCriDockerd, "\n\n") } if _, err := exec.LookPath("dockerd"); err != nil { - exit.Message(reason.NotFoundDockerD, "\n\n") + exit.Message(reason.NotFoundDockerd, "\n\n") } } } diff --git a/pkg/minikube/reason/reason.go b/pkg/minikube/reason/reason.go index 33de37a39f..fd14b3a255 100644 --- a/pkg/minikube/reason/reason.go +++ b/pkg/minikube/reason/reason.go @@ -461,7 +461,7 @@ var ( Style: style.SeeNoEvil, } - NotFoundCriDockerD = Kind{ + NotFoundCriDockerd = Kind{ ID: "NOT_FOUND_CRI_DOCKERD", ExitCode: ExProgramNotFound, Advice: translate.T(`The none driver with Kubernetes v1.24+ requires cri-dockerd. @@ -471,7 +471,7 @@ var ( https://github.com/Mirantis/cri-dockerd#build-and-install`), Style: style.Docker, } - NotFoundDockerD = Kind{ + NotFoundDockerd = Kind{ ID: "NOT_FOUND_DOCKERD", ExitCode: ExProgramNotFound, Advice: translate.T(`The none driver with Kubernetes v1.24+ requires dockerd. From 7b8dc1c2fc57d3e03a5dd66659e17bf6e9263373 Mon Sep 17 00:00:00 2001 From: klaases Date: Mon, 25 Jul 2022 21:54:29 +0000 Subject: [PATCH 320/545] Revert "remove error messaging from cruntime library" This reverts commit a5308bbbebd399cc650c5c756a2591df44a1c187. --- pkg/minikube/cruntime/docker.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkg/minikube/cruntime/docker.go b/pkg/minikube/cruntime/docker.go index bc2ecab54f..f5d0f3919b 100644 --- a/pkg/minikube/cruntime/docker.go +++ b/pkg/minikube/cruntime/docker.go @@ -38,6 +38,7 @@ import ( "k8s.io/minikube/pkg/minikube/config" "k8s.io/minikube/pkg/minikube/docker" "k8s.io/minikube/pkg/minikube/download" + "k8s.io/minikube/pkg/minikube/out" "k8s.io/minikube/pkg/minikube/style" "k8s.io/minikube/pkg/minikube/sysinit" ) @@ -109,9 +110,11 @@ func (r *Docker) Available() error { // If Kubernetes version >= 1.24, require both cri-dockerd and dockerd. if r.KubernetesVersion.GTE(semver.Version{Major: 1, Minor: 24}) { if _, err := exec.LookPath("cri-dockerd"); err != nil { + out.ErrT(style.Fatal, `cri-dockerd is not installed, please install using these instructions: https://github.com/Mirantis/cri-dockerd#build-and-install, {{.error}}`, out.V{"error": err}) return err } if _, err := exec.LookPath("dockerd"); err != nil { + out.ErrT(style.Fatal, `dockerd is not installed, please install using these instructions: https://docs.docker.com/engine/reference/commandline/dockerd/, {{.error}}`, out.V{"error": err}) return err } } From 2db1b36ae671c94ea3aca5179fe0f9cf9dde86ce Mon Sep 17 00:00:00 2001 From: klaases Date: Mon, 25 Jul 2022 21:57:01 +0000 Subject: [PATCH 321/545] Revert "Add installtion instructions URLs" This reverts commit 8b6fdbf4c78cc2c09ce29248800605f761a39450. --- pkg/minikube/cruntime/docker.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkg/minikube/cruntime/docker.go b/pkg/minikube/cruntime/docker.go index f5d0f3919b..bc2ecab54f 100644 --- a/pkg/minikube/cruntime/docker.go +++ b/pkg/minikube/cruntime/docker.go @@ -38,7 +38,6 @@ import ( "k8s.io/minikube/pkg/minikube/config" "k8s.io/minikube/pkg/minikube/docker" "k8s.io/minikube/pkg/minikube/download" - "k8s.io/minikube/pkg/minikube/out" "k8s.io/minikube/pkg/minikube/style" "k8s.io/minikube/pkg/minikube/sysinit" ) @@ -110,11 +109,9 @@ func (r *Docker) Available() error { // If Kubernetes version >= 1.24, require both cri-dockerd and dockerd. if r.KubernetesVersion.GTE(semver.Version{Major: 1, Minor: 24}) { if _, err := exec.LookPath("cri-dockerd"); err != nil { - out.ErrT(style.Fatal, `cri-dockerd is not installed, please install using these instructions: https://github.com/Mirantis/cri-dockerd#build-and-install, {{.error}}`, out.V{"error": err}) return err } if _, err := exec.LookPath("dockerd"); err != nil { - out.ErrT(style.Fatal, `dockerd is not installed, please install using these instructions: https://docs.docker.com/engine/reference/commandline/dockerd/, {{.error}}`, out.V{"error": err}) return err } } From 948212ff3f15c966c01b04ecc24460f6744aad2e Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Tue, 26 Jul 2022 00:03:39 +0000 Subject: [PATCH 322/545] Update auto-generated docs and translations --- translations/de.json | 3 +++ translations/es.json | 3 +++ translations/fr.json | 3 +++ translations/ja.json | 3 +++ translations/ko.json | 3 +++ translations/pl.json | 3 +++ translations/ru.json | 3 +++ translations/strings.txt | 3 +++ translations/zh-CN.json | 3 +++ 9 files changed, 27 insertions(+) diff --git a/translations/de.json b/translations/de.json index 63e9480373..5354b7b399 100644 --- a/translations/de.json +++ b/translations/de.json @@ -1025,6 +1025,9 @@ "zsh completion.": "", "{{ .name }}: Suggestion: {{ .suggestion}}": "{{ .name }}: Vorschlag: {{ .suggestion}}", "{{.Driver}} is currently using the {{.StorageDriver}} storage driver, consider switching to overlay2 for better performance": "{{.Driver}} verwendet derzeit den {{.StorageDriver}} Storage Treiber, erwäge zu overlay2 zu wechseln für bessere Performance", + "{{.addon}} is a 3rd party addon and not maintained or verified by minikube maintainers, enable at your own risk.": "", + "{{.addon}} is an addon maintained by {{.maintainer}}. For any concerns contact minikube on GitHub.\nYou can view the list of minikube maintainers at: https://github.com/kubernetes/minikube/blob/master/OWNERS": "", + "{{.addon}} is maintained by {{.maintainer}} for any concerns contact {{.verifiedMaintainer}} on GitHub.": "", "{{.count}} node{{if gt .count 1}}s{{end}} stopped.": "{{.count}} Node{{if gt .count 1}}s{{end}} angehalten.", "{{.driver_name}} \"{{.cluster}}\" {{.machine_type}} is missing, will recreate.": "{{.driver_name}} \"{{.cluster}}\" {{.machine_type}} fehlt, wird neu erstellt.", "{{.driver_name}} couldn't proceed because {{.driver_name}} service is not healthy.": "{{.driver_name}} konnte nicht weiterlaufen, da {{.driver_name}} Service nicht funktional ist.", diff --git a/translations/es.json b/translations/es.json index 349105c1de..7487f30b36 100644 --- a/translations/es.json +++ b/translations/es.json @@ -1020,6 +1020,9 @@ "{{ .name }}: Suggestion: {{ .suggestion}}": "{{ .name }}: Sugerencia: {{ .suggestion}}", "{{ .name }}: {{ .rejection }}": "{{ .name }}: {{ .rejection }}", "{{.Driver}} is currently using the {{.StorageDriver}} storage driver, consider switching to overlay2 for better performance": "", + "{{.addon}} is a 3rd party addon and not maintained or verified by minikube maintainers, enable at your own risk.": "", + "{{.addon}} is an addon maintained by {{.maintainer}}. For any concerns contact minikube on GitHub.\nYou can view the list of minikube maintainers at: https://github.com/kubernetes/minikube/blob/master/OWNERS": "", + "{{.addon}} is maintained by {{.maintainer}} for any concerns contact {{.verifiedMaintainer}} on GitHub.": "", "{{.count}} node{{if gt .count 1}}s{{end}} stopped.": "", "{{.driver_name}} \"{{.cluster}}\" {{.machine_type}} is missing, will recreate.": "", "{{.driver_name}} couldn't proceed because {{.driver_name}} service is not healthy.": "", diff --git a/translations/fr.json b/translations/fr.json index 114f79d38d..c7edf9e16e 100644 --- a/translations/fr.json +++ b/translations/fr.json @@ -995,6 +995,9 @@ "{{ .name }}: Suggestion: {{ .suggestion}}": "{{ .name }}: Suggestion: {{ .suggestion}}", "{{ .name }}: {{ .rejection }}": "{{ .name }} : {{ .rejection }}", "{{.Driver}} is currently using the {{.StorageDriver}} storage driver, consider switching to overlay2 for better performance": "{{.Driver}} utilise actuellement le pilote de stockage {{.StorageDriver}}, envisagez de passer à overlay2 pour de meilleures performances", + "{{.addon}} is a 3rd party addon and not maintained or verified by minikube maintainers, enable at your own risk.": "", + "{{.addon}} is an addon maintained by {{.maintainer}}. For any concerns contact minikube on GitHub.\nYou can view the list of minikube maintainers at: https://github.com/kubernetes/minikube/blob/master/OWNERS": "", + "{{.addon}} is maintained by {{.maintainer}} for any concerns contact {{.verifiedMaintainer}} on GitHub.": "", "{{.count}} node{{if gt .count 1}}s{{end}} stopped.": "{{.count}} nœud{{if gt .count 1}}s{{end}} arrêté{{if gt .count 1}}s{{end}}.", "{{.driver_name}} \"{{.cluster}}\" {{.machine_type}} is missing, will recreate.": "{{.driver_name}} \"{{.cluster}}\" {{.machine_type}} est manquant, il va être recréé.", "{{.driver_name}} couldn't proceed because {{.driver_name}} service is not healthy.": "{{.driver_name}} n'a pas pu continuer car le service {{.driver_name}} n'est pas fonctionnel.", diff --git a/translations/ja.json b/translations/ja.json index 804fa14d30..fe410ab790 100644 --- a/translations/ja.json +++ b/translations/ja.json @@ -955,6 +955,9 @@ "zsh completion.": "zsh のコマンド補完です。", "{{ .name }}: Suggestion: {{ .suggestion}}": "{{ .name }}: 提案: {{ .suggestion}}", "{{.Driver}} is currently using the {{.StorageDriver}} storage driver, consider switching to overlay2 for better performance": "{{.Driver}} は現在 {{.StorageDriver}} ストレージドライバーを使用しています。性能向上のため overlay2 への切替を検討してください", + "{{.addon}} is a 3rd party addon and not maintained or verified by minikube maintainers, enable at your own risk.": "", + "{{.addon}} is an addon maintained by {{.maintainer}}. For any concerns contact minikube on GitHub.\nYou can view the list of minikube maintainers at: https://github.com/kubernetes/minikube/blob/master/OWNERS": "", + "{{.addon}} is maintained by {{.maintainer}} for any concerns contact {{.verifiedMaintainer}} on GitHub.": "", "{{.count}} node{{if gt .count 1}}s{{end}} stopped.": "{{.count}} 台のノードが停止しました。", "{{.driver_name}} \"{{.cluster}}\" {{.machine_type}} is missing, will recreate.": "{{.driver_name}} 「 {{.cluster}} 」 {{.machine_type}} がありません。再生成します。", "{{.driver_name}} couldn't proceed because {{.driver_name}} service is not healthy.": "{{.driver_name}} サービスが正常ではないため、{{.driver_name}} は機能しません。", diff --git a/translations/ko.json b/translations/ko.json index cc845f8b60..5e5ff9fb4a 100644 --- a/translations/ko.json +++ b/translations/ko.json @@ -1029,6 +1029,9 @@ "zsh completion.": "", "{{ .name }}: Suggestion: {{ .suggestion}}": "", "{{.Driver}} is currently using the {{.StorageDriver}} storage driver, consider switching to overlay2 for better performance": "", + "{{.addon}} is a 3rd party addon and not maintained or verified by minikube maintainers, enable at your own risk.": "", + "{{.addon}} is an addon maintained by {{.maintainer}}. For any concerns contact minikube on GitHub.\nYou can view the list of minikube maintainers at: https://github.com/kubernetes/minikube/blob/master/OWNERS": "", + "{{.addon}} is maintained by {{.maintainer}} for any concerns contact {{.verifiedMaintainer}} on GitHub.": "", "{{.count}} nodes stopped.": "{{.count}}개의 노드가 중지되었습니다.", "{{.count}} node{{if gt .count 1}}s{{end}} stopped.": "", "{{.driver_name}} \"{{.cluster}}\" {{.machine_type}} is missing, will recreate.": "", diff --git a/translations/pl.json b/translations/pl.json index f3fb9ad605..c6239aec9e 100644 --- a/translations/pl.json +++ b/translations/pl.json @@ -1035,6 +1035,9 @@ "{{ .name }}: Suggestion: {{ .suggestion}}": "", "{{.Driver}} is currently using the {{.StorageDriver}} storage driver, consider switching to overlay2 for better performance": "", "{{.addonName}} was successfully enabled": "{{.addonName}} został aktywowany pomyślnie", + "{{.addon}} is a 3rd party addon and not maintained or verified by minikube maintainers, enable at your own risk.": "", + "{{.addon}} is an addon maintained by {{.maintainer}}. For any concerns contact minikube on GitHub.\nYou can view the list of minikube maintainers at: https://github.com/kubernetes/minikube/blob/master/OWNERS": "", + "{{.addon}} is maintained by {{.maintainer}} for any concerns contact {{.verifiedMaintainer}} on GitHub.": "", "{{.count}} node{{if gt .count 1}}s{{end}} stopped.": "", "{{.driver_name}} \"{{.cluster}}\" {{.machine_type}} is missing, will recreate.": "", "{{.driver_name}} couldn't proceed because {{.driver_name}} service is not healthy.": "", diff --git a/translations/ru.json b/translations/ru.json index 5b7205cad2..3f1462e1cd 100644 --- a/translations/ru.json +++ b/translations/ru.json @@ -952,6 +952,9 @@ "zsh completion.": "", "{{ .name }}: Suggestion: {{ .suggestion}}": "", "{{.Driver}} is currently using the {{.StorageDriver}} storage driver, consider switching to overlay2 for better performance": "", + "{{.addon}} is a 3rd party addon and not maintained or verified by minikube maintainers, enable at your own risk.": "", + "{{.addon}} is an addon maintained by {{.maintainer}}. For any concerns contact minikube on GitHub.\nYou can view the list of minikube maintainers at: https://github.com/kubernetes/minikube/blob/master/OWNERS": "", + "{{.addon}} is maintained by {{.maintainer}} for any concerns contact {{.verifiedMaintainer}} on GitHub.": "", "{{.count}} node{{if gt .count 1}}s{{end}} stopped.": "Остановлено узлов: {{.count}}.", "{{.driver_name}} \"{{.cluster}}\" {{.machine_type}} is missing, will recreate.": "", "{{.driver_name}} couldn't proceed because {{.driver_name}} service is not healthy.": "", diff --git a/translations/strings.txt b/translations/strings.txt index 4d08f8763e..f71cf96679 100644 --- a/translations/strings.txt +++ b/translations/strings.txt @@ -952,6 +952,9 @@ "zsh completion.": "", "{{ .name }}: Suggestion: {{ .suggestion}}": "", "{{.Driver}} is currently using the {{.StorageDriver}} storage driver, consider switching to overlay2 for better performance": "", + "{{.addon}} is a 3rd party addon and not maintained or verified by minikube maintainers, enable at your own risk.": "", + "{{.addon}} is an addon maintained by {{.maintainer}}. For any concerns contact minikube on GitHub.\nYou can view the list of minikube maintainers at: https://github.com/kubernetes/minikube/blob/master/OWNERS": "", + "{{.addon}} is maintained by {{.maintainer}} for any concerns contact {{.verifiedMaintainer}} on GitHub.": "", "{{.count}} node{{if gt .count 1}}s{{end}} stopped.": "", "{{.driver_name}} \"{{.cluster}}\" {{.machine_type}} is missing, will recreate.": "", "{{.driver_name}} couldn't proceed because {{.driver_name}} service is not healthy.": "", diff --git a/translations/zh-CN.json b/translations/zh-CN.json index 365b11927f..0de43b9326 100644 --- a/translations/zh-CN.json +++ b/translations/zh-CN.json @@ -1144,6 +1144,9 @@ "zsh completion.": "", "{{ .name }}: Suggestion: {{ .suggestion}}": "", "{{.Driver}} is currently using the {{.StorageDriver}} storage driver, consider switching to overlay2 for better performance": "", + "{{.addon}} is a 3rd party addon and not maintained or verified by minikube maintainers, enable at your own risk.": "", + "{{.addon}} is an addon maintained by {{.maintainer}}. For any concerns contact minikube on GitHub.\nYou can view the list of minikube maintainers at: https://github.com/kubernetes/minikube/blob/master/OWNERS": "", + "{{.addon}} is maintained by {{.maintainer}} for any concerns contact {{.verifiedMaintainer}} on GitHub.": "", "{{.count}} node{{if gt .count 1}}s{{end}} stopped.": "", "{{.driver_name}} \"{{.cluster}}\" {{.machine_type}} is missing, will recreate.": "", "{{.driver_name}} couldn't proceed because {{.driver_name}} service is not healthy.": "", From 9acac16652bb80d238b4b5649aef9f9b42e857de Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Tue, 26 Jul 2022 09:22:33 -0700 Subject: [PATCH 323/545] update kindnetd --- pkg/minikube/bootstrapper/images/images.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/minikube/bootstrapper/images/images.go b/pkg/minikube/bootstrapper/images/images.go index 6ee0c36234..81f6210064 100644 --- a/pkg/minikube/bootstrapper/images/images.go +++ b/pkg/minikube/bootstrapper/images/images.go @@ -182,7 +182,7 @@ func KindNet(repo string) string { if repo == "" { repo = "kindest" } - return path.Join(repo, "kindnetd:v20220607-9a4d8d2a") + return path.Join(repo, "kindnetd:v20220726-ed811e41") } // all calico images are from https://docs.projectcalico.org/manifests/calico.yaml From 67912f1eeb06750546746e5f7b38694fbd0dbc32 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Tue, 26 Jul 2022 11:35:28 -0700 Subject: [PATCH 324/545] update gcp-auth-webhook --- pkg/minikube/assets/addons.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/minikube/assets/addons.go b/pkg/minikube/assets/addons.go index 8663d1d810..3ae79e4e3a 100755 --- a/pkg/minikube/assets/addons.go +++ b/pkg/minikube/assets/addons.go @@ -552,7 +552,7 @@ var Addons = map[string]*Addon{ "0640"), }, false, "gcp-auth", "Google", "", "https://minikube.sigs.k8s.io/docs/handbook/addons/gcp-auth/", map[string]string{ "KubeWebhookCertgen": "k8s.gcr.io/ingress-nginx/kube-webhook-certgen:v1.0@sha256:f3b6b39a6062328c095337b4cadcefd1612348fdd5190b1dcbcb9b9e90bd8068", - "GCPAuthWebhook": "k8s-minikube/gcp-auth-webhook:v0.0.9@sha256:25e1c616444d5b2b404c43ce878f320a265fd663b4fcd4c2ad5c12de316612da", + "GCPAuthWebhook": "k8s-minikube/gcp-auth-webhook:v0.0.10@sha256:1ce1510da2a4af923e678d487ec0a78f4a8f2a65206a3aa8de659a196ae98d0f", }, map[string]string{ "GCPAuthWebhook": "gcr.io", }), From 73f11ee11142b9a6da7a0e9d3d29f287654597c9 Mon Sep 17 00:00:00 2001 From: Siddhant Date: Wed, 27 Jul 2022 03:05:41 +0530 Subject: [PATCH 325/545] add missing registries --- pkg/minikube/assets/addons.go | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/pkg/minikube/assets/addons.go b/pkg/minikube/assets/addons.go index 2a3ad2077d..154f1f39fb 100755 --- a/pkg/minikube/assets/addons.go +++ b/pkg/minikube/assets/addons.go @@ -237,6 +237,7 @@ var Addons = map[string]*Addon{ "Elasticsearch": "k8s.gcr.io", "FluentdElasticsearch": "k8s.gcr.io", "Kibana": "docker.elastic.co", + "Alpine": "docker.io", }), "ingress": NewAddon([]*BinAsset{ MustBinAsset(addons.IngressAssets, @@ -264,7 +265,9 @@ var Addons = map[string]*Addon{ "0640"), }, false, "istio-provisioner", "3rd party (Istio)", "https://istio.io/latest/docs/setup/platform-setup/minikube/", map[string]string{ "IstioOperator": "istio/operator:1.12.2@sha256:42c7609872882cb88728a1592561b4046dac6d05b6002cbdc815b84c86a24f08", - }, nil), + }, map[string]string{ + "IstioOperator": "docker.io", + }), "istio": NewAddon([]*BinAsset{ MustBinAsset(addons.IstioAssets, "istio/istio-default-profile.yaml.tmpl", @@ -281,7 +284,10 @@ var Addons = map[string]*Addon{ }, false, "kong", "3rd party (Kong HQ)", "https://minikube.sigs.k8s.io/docs/handbook/addons/kong-ingress/", map[string]string{ "Kong": "kong:2.7@sha256:4d3e93207305ace881fe9e95ac27717b6fbdd9e0ec1873c34e94908a4f4c9335", "KongIngress": "kong/kubernetes-ingress-controller:2.1.1@sha256:60e4102ab2da7f61e9c478747f0762d06a6166b5f300526b237ed7354c3cb4c8", - }, nil), + }, map[string]string{ + "Kong": "docker.io", + "KongIngress": "docker.io", + }), "kubevirt": NewAddon([]*BinAsset{ MustBinAsset(addons.KubevirtAssets, "kubevirt/pod.yaml.tmpl", @@ -290,7 +296,9 @@ var Addons = map[string]*Addon{ "0640"), }, false, "kubevirt", "3rd party (KubeVirt)", "https://minikube.sigs.k8s.io/docs/tutorials/kubevirt/", map[string]string{ "Kubectl": "bitnami/kubectl:1.17@sha256:de642e973d3d0ef60e4d0a1f92286a9fdae245535c5990d4762bbe86fcf95887", - }, nil), + }, map[string]string{ + "Kubectl": "docker.io", + }), "metrics-server": NewAddon([]*BinAsset{ MustBinAsset(addons.MetricsServerAssets, "metrics-server/metrics-apiservice.yaml.tmpl", @@ -357,6 +365,7 @@ var Addons = map[string]*Addon{ "KubeRegistryProxy": "google_containers/kube-registry-proxy:0.4@sha256:1040f25a5273de0d72c54865a8efd47e3292de9fb8e5353e3fa76736b854f2da", }, map[string]string{ "KubeRegistryProxy": "gcr.io", + "Registry": "docker.io", }), "registry-creds": NewAddon([]*BinAsset{ MustBinAsset(addons.RegistryCredsAssets, @@ -402,6 +411,7 @@ var Addons = map[string]*Addon{ }, map[string]string{ "CoreDNSPatcher": "quay.io", "Pause": "gcr.io", + "Alpine": "docker.io", }), "freshpod": NewAddon([]*BinAsset{ MustBinAsset(addons.FreshpodAssets, @@ -523,7 +533,10 @@ var Addons = map[string]*Addon{ }, false, "metallb", "3rd party (MetalLB)", "", map[string]string{ "Speaker": "metallb/speaker:v0.9.6@sha256:c66585a805bed1a3b829d8fb4a4aab9d87233497244ebff96f1b88f1e7f8f991", "Controller": "metallb/controller:v0.9.6@sha256:fbfdb9d3f55976b0ee38f3309d83a4ca703efcf15d6ca7889cd8189142286502", - }, nil), + }, map[string]string{ + "Speaker": "docker.io", + "Controller": "docker.io", + }), "ambassador": NewAddon([]*BinAsset{ MustBinAsset(addons.AmbassadorAssets, "ambassador/ambassador-operator-crds.yaml.tmpl", @@ -701,7 +714,9 @@ var Addons = map[string]*Addon{ "0640"), }, false, "portainer", "Portainer.io", "", map[string]string{ "Portainer": "portainer/portainer-ce:latest@sha256:4f126c5114b63e9d1bceb4b368944d14323329a9a0d4e7bb7eb53c9b7435d498", - }, nil), + }, map[string]string{ + "Portainer": "docker.io", + }), "inaccel": NewAddon([]*BinAsset{ MustBinAsset(addons.InAccelAssets, "inaccel/fpga-operator.yaml.tmpl", From a166af4fdcfd0f0424a7b1cface79392f9b5f6d7 Mon Sep 17 00:00:00 2001 From: Siddhant Date: Wed, 27 Jul 2022 04:47:29 +0530 Subject: [PATCH 326/545] Added Linters --- deploy/addons/aliyun_mirror.json | 2 +- pkg/minikube/assets/addons.go | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/deploy/addons/aliyun_mirror.json b/deploy/addons/aliyun_mirror.json index 0c8c838cc7..4ce5afae05 100644 --- a/deploy/addons/aliyun_mirror.json +++ b/deploy/addons/aliyun_mirror.json @@ -99,4 +99,4 @@ "gcr.io/google_containers/pause": "registry.cn-hangzhou.aliyuncs.com/google_containers/pause", "k8s.gcr.io/metrics-server/metrics-server": "registry.cn-hangzhou.aliyuncs.com/google_containers/metrics-server", "gcr.io/google_containers/kube-registry-proxy": "registry.cn-hangzhou.aliyuncs.com/google_containers/kube-registry-proxy" -} +} \ No newline at end of file diff --git a/pkg/minikube/assets/addons.go b/pkg/minikube/assets/addons.go index b9c6cac19e..c448c74c33 100755 --- a/pkg/minikube/assets/addons.go +++ b/pkg/minikube/assets/addons.go @@ -255,9 +255,9 @@ var Addons = map[string]*Addon{ // https://github.com/kubernetes/ingress-nginx/blob/fc38b9f2aa2d68ee00c417cf97e727b77a00c175/deploy/static/provider/kind/deploy.yaml#L673 "KubeWebhookCertgenPatch": "ingress-nginx/kube-webhook-certgen:v1.1.1@sha256:64d8c73dca984af206adf9d6d7e46aa550362b1d7a01f3a0a91b20cc67868660", }, map[string]string{ - "IngressController": "k8s.gcr.io", + "IngressController": "k8s.gcr.io", "KubeWebhookCertgenCreate": "k8s.gcr.io", - "KubeWebhookCertgenPatch": "k8s.gcr.io", + "KubeWebhookCertgenPatch": "k8s.gcr.io", }), "istio-provisioner": NewAddon([]*BinAsset{ MustBinAsset(addons.IstioProvisionerAssets, @@ -287,7 +287,7 @@ var Addons = map[string]*Addon{ "Kong": "kong:2.7@sha256:4d3e93207305ace881fe9e95ac27717b6fbdd9e0ec1873c34e94908a4f4c9335", "KongIngress": "kong/kubernetes-ingress-controller:2.1.1@sha256:60e4102ab2da7f61e9c478747f0762d06a6166b5f300526b237ed7354c3cb4c8", }, map[string]string{ - "Kong": "docker.io", + "Kong": "docker.io", "KongIngress": "docker.io", }), "kubevirt": NewAddon([]*BinAsset{ @@ -536,8 +536,8 @@ var Addons = map[string]*Addon{ "Speaker": "metallb/speaker:v0.9.6@sha256:c66585a805bed1a3b829d8fb4a4aab9d87233497244ebff96f1b88f1e7f8f991", "Controller": "metallb/controller:v0.9.6@sha256:fbfdb9d3f55976b0ee38f3309d83a4ca703efcf15d6ca7889cd8189142286502", }, map[string]string{ - "Speaker": "docker.io", - "Controller": "docker.io", + "Speaker": "docker.io", + "Controller": "docker.io", }), "ambassador": NewAddon([]*BinAsset{ MustBinAsset(addons.AmbassadorAssets, @@ -580,7 +580,7 @@ var Addons = map[string]*Addon{ "KubeWebhookCertgen": "ingress-nginx/kube-webhook-certgen:v1.0@sha256:f3b6b39a6062328c095337b4cadcefd1612348fdd5190b1dcbcb9b9e90bd8068", "GCPAuthWebhook": "k8s-minikube/gcp-auth-webhook:v0.0.9@sha256:25e1c616444d5b2b404c43ce878f320a265fd663b4fcd4c2ad5c12de316612da", }, map[string]string{ - "GCPAuthWebhook": "gcr.io", + "GCPAuthWebhook": "gcr.io", "KubeWebhookCertgen": "k8s.gcr.io", }), "volumesnapshots": NewAddon([]*BinAsset{ @@ -717,7 +717,7 @@ var Addons = map[string]*Addon{ }, false, "portainer", "3rd party (Portainer.io)", "", "", map[string]string{ "Portainer": "portainer/portainer-ce:latest@sha256:4f126c5114b63e9d1bceb4b368944d14323329a9a0d4e7bb7eb53c9b7435d498", }, map[string]string{ - "Portainer": "docker.io", + "Portainer": "docker.io", }), "inaccel": NewAddon([]*BinAsset{ MustBinAsset(addons.InAccelAssets, From 5b2080f78205fca7b5d3f2a586626318a452a188 Mon Sep 17 00:00:00 2001 From: anoop142 Date: Thu, 28 Jul 2022 12:50:01 +0530 Subject: [PATCH 327/545] Fix url index out of range error in service * if there is no node port, service panics accessing url * since the length of array is 3 when there is no node port, accessing u[3] results in index out of range --- cmd/minikube/cmd/service.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/cmd/minikube/cmd/service.go b/cmd/minikube/cmd/service.go index bc1b7198ae..eebc2ee0c2 100644 --- a/cmd/minikube/cmd/service.go +++ b/cmd/minikube/cmd/service.go @@ -260,6 +260,12 @@ func mutateURLs(serviceName string, urls []string) ([]string, error) { func openURLs(urls [][]string) { for _, u := range urls { + + if len(u) < 4{ + klog.Warning("No URL found") + continue + } + _, err := url.Parse(u[3]) if err != nil { klog.Warningf("failed to parse url %q: %v (will not open)", u[3], err) From 3ce31b2f9de58c886b2443e6475d58e4fc460924 Mon Sep 17 00:00:00 2001 From: mtardy Date: Thu, 28 Jul 2022 09:59:34 +0200 Subject: [PATCH 328/545] Move err check statement in bsutil pkg --- pkg/minikube/bootstrapper/bsutil/binaries.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/minikube/bootstrapper/bsutil/binaries.go b/pkg/minikube/bootstrapper/bsutil/binaries.go index 52648af457..2800f489df 100644 --- a/pkg/minikube/bootstrapper/bsutil/binaries.go +++ b/pkg/minikube/bootstrapper/bsutil/binaries.go @@ -81,10 +81,10 @@ func TransferBinaries(cfg config.KubernetesConfig, c command.Runner, sm sysinit. func binariesExist(cfg config.KubernetesConfig, c command.Runner) (bool, error) { dir := binRoot(cfg.KubernetesVersion) rr, err := c.RunCmd(exec.Command("sudo", "ls", dir)) - stdout := rr.Stdout.String() if err != nil { return false, err } + stdout := rr.Stdout.String() foundBinaries := map[string]struct{}{} for _, binary := range strings.Split(stdout, "\n") { foundBinaries[binary] = struct{}{} From 9a6c00e9226fec651dfd0a4eeba0d7b0e56b67c3 Mon Sep 17 00:00:00 2001 From: mtardy Date: Thu, 28 Jul 2022 10:11:01 +0200 Subject: [PATCH 329/545] Add error checks in sysinit pkg --- pkg/minikube/sysinit/openrc.go | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pkg/minikube/sysinit/openrc.go b/pkg/minikube/sysinit/openrc.go index 6d1b68ed23..83f8ab0813 100644 --- a/pkg/minikube/sysinit/openrc.go +++ b/pkg/minikube/sysinit/openrc.go @@ -108,8 +108,11 @@ func (s *OpenRC) Start(svc string) error { defer cb() rr, err := s.r.RunCmd(exec.CommandContext(ctx, "sudo", "service", svc, "start")) + if err != nil { + return err + } klog.Infof("start output: %s", rr.Output()) - return err + return nil } // Disable does nothing @@ -149,8 +152,11 @@ func (s *OpenRC) Unmask(svc string) error { // Restart restarts a service func (s *OpenRC) Restart(svc string) error { rr, err := s.r.RunCmd(exec.Command("sudo", "service", svc, "restart")) + if err != nil { + return err + } klog.Infof("restart output: %s", rr.Output()) - return err + return nil } // Reload reloads a service @@ -162,8 +168,11 @@ func (s *OpenRC) Reload(svc string) error { // Stop stops a service func (s *OpenRC) Stop(svc string) error { rr, err := s.r.RunCmd(exec.Command("sudo", "service", svc, "stop")) + if err != nil { + return err + } klog.Infof("stop output: %s", rr.Output()) - return err + return nil } // ForceStop stops a service with prejuidice From 23b66e564502829ee616787a0e5678b8b2a5ebf3 Mon Sep 17 00:00:00 2001 From: klaases Date: Thu, 28 Jul 2022 19:47:26 +0000 Subject: [PATCH 330/545] add "and the docker container-runtime" --- pkg/minikube/reason/reason.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/minikube/reason/reason.go b/pkg/minikube/reason/reason.go index fd14b3a255..cd839e6e25 100644 --- a/pkg/minikube/reason/reason.go +++ b/pkg/minikube/reason/reason.go @@ -464,7 +464,7 @@ var ( NotFoundCriDockerd = Kind{ ID: "NOT_FOUND_CRI_DOCKERD", ExitCode: ExProgramNotFound, - Advice: translate.T(`The none driver with Kubernetes v1.24+ requires cri-dockerd. + Advice: translate.T(`The none driver with Kubernetes v1.24+ and the docker container-runtime requires cri-dockerd. Please install cri-dockerd using these instructions: From f5b83d4f17589580a6f3f2e048ea841d5f2ba2cd Mon Sep 17 00:00:00 2001 From: klaases Date: Thu, 28 Jul 2022 19:48:29 +0000 Subject: [PATCH 331/545] add "and the docker container-runtime" for dockerd --- pkg/minikube/reason/reason.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/minikube/reason/reason.go b/pkg/minikube/reason/reason.go index cd839e6e25..d8eebd74bb 100644 --- a/pkg/minikube/reason/reason.go +++ b/pkg/minikube/reason/reason.go @@ -474,7 +474,7 @@ var ( NotFoundDockerd = Kind{ ID: "NOT_FOUND_DOCKERD", ExitCode: ExProgramNotFound, - Advice: translate.T(`The none driver with Kubernetes v1.24+ requires dockerd. + Advice: translate.T(`The none driver with Kubernetes v1.24+ and the docker container-runtime requires dockerd. Please install dockerd using these instructions: From 14ba8260031726974adae620fb315f83f6b2d997 Mon Sep 17 00:00:00 2001 From: klaases Date: Thu, 28 Jul 2022 22:25:21 +0000 Subject: [PATCH 332/545] add check for docker container-runtime --- pkg/minikube/machine/start.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg/minikube/machine/start.go b/pkg/minikube/machine/start.go index 45db1129e6..37f2cc4320 100644 --- a/pkg/minikube/machine/start.go +++ b/pkg/minikube/machine/start.go @@ -314,7 +314,8 @@ func postStartSetup(h *host.Host, mc config.ClusterConfig) error { return nil } - if driver.IsNone(h.DriverName) { + // If none driver with docker container-runtime, require cri-dockerd and dockerd. + if driver.IsNone(h.DriverName) && mc.KubernetesConfig.ContainerRuntime == constants.Docker { // If Kubernetes version >= 1.24, require both cri-dockerd and dockerd. k8sVer, err := semver.ParseTolerant(mc.KubernetesConfig.KubernetesVersion) if err != nil { From 217770379dfbea105561a27eb8e257fe2249020c Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Fri, 29 Jul 2022 17:16:58 +0000 Subject: [PATCH 333/545] Update auto-generated docs and translations --- site/content/en/docs/contrib/errorcodes.en.md | 4 ++++ translations/de.json | 3 +++ translations/es.json | 3 +++ translations/fr.json | 3 +++ translations/ja.json | 3 +++ translations/ko.json | 3 +++ translations/pl.json | 3 +++ translations/ru.json | 3 +++ translations/strings.txt | 3 +++ translations/zh-CN.json | 3 +++ 10 files changed, 31 insertions(+) diff --git a/site/content/en/docs/contrib/errorcodes.en.md b/site/content/en/docs/contrib/errorcodes.en.md index 42705e32ac..063b7531d1 100644 --- a/site/content/en/docs/contrib/errorcodes.en.md +++ b/site/content/en/docs/contrib/errorcodes.en.md @@ -436,6 +436,10 @@ a too new Kubernetes version was specified for minikube to use "K8S_DOWNGRADE_UNSUPPORTED" (Exit code ExControlPlaneUnsupported) minikube was unable to safely downgrade installed Kubernetes version +"NOT_FOUND_CRI_DOCKERD" (Exit code ExProgramNotFound) + +"NOT_FOUND_DOCKERD" (Exit code ExProgramNotFound) + ## Error Codes diff --git a/translations/de.json b/translations/de.json index 5354b7b399..6243d5c08e 100644 --- a/translations/de.json +++ b/translations/de.json @@ -1,4 +1,5 @@ { + "\n\n": "", "\"The '{{.minikube_addon}}' addon is disabled": "Das {{.minikube_addon}} Addon ist deaktiviert", "\"minikube cache\" will be deprecated in upcoming versions, please switch to \"minikube image load\"": "\"minikube cache\" wird in der nächsten Version veraltet (deprecated) sein, bitte wechsle zu \"minikube image load\"", "\"{{.context}}\" context has been updated to point to {{.hostname}}:{{.port}}": "Der Kontext \"{{.context}}\" wurde aktualisiert, um auf {{.hostname}}:{{.port}} zu zeigen", @@ -714,6 +715,8 @@ "The node {{.name}} has ran out of memory.": "Der Node {{.name}} hat keinen verfügbaren Speicher mehr.", "The node {{.name}} network is not available. Please verify network settings.": "Das Netzwerk des Node {{.name}}", "The none driver is not compatible with multi-node clusters.": "Der 'none' Treiber ist nicht kompatibel mit Multi-Node Clustern.", + "The none driver with Kubernetes v1.24+ and the docker container-runtime requires cri-dockerd.\n\t\t\n\t\tPlease install cri-dockerd using these instructions:\n\n\t\thttps://github.com/Mirantis/cri-dockerd#build-and-install": "", + "The none driver with Kubernetes v1.24+ and the docker container-runtime requires dockerd.\n\t\t\n\t\tPlease install dockerd using these instructions:\n\n\t\thttps://docs.docker.com/engine/install/": "", "The number of nodes to spin up. Defaults to 1.": "Die Anzahl der zu startenden Nodes. Default: 1", "The output format. One of 'json', 'table'": "Das Ausgabe Format. (Entweder 'json' oder 'table')", "The path on the file system where the docs in markdown need to be saved": "Der Pfad auf dem Dateisystem indem die Dokumente in Markdown gespeichert werden müssen", diff --git a/translations/es.json b/translations/es.json index 7487f30b36..6b8932c24f 100644 --- a/translations/es.json +++ b/translations/es.json @@ -1,4 +1,5 @@ { + "\n\n": "", "\"The '{{.minikube_addon}}' addon is disabled": "El complemento \"{{.minikube_addon}}\" está desactivado", "\"minikube cache\" will be deprecated in upcoming versions, please switch to \"minikube image load\"": "", "\"{{.context}}\" context has been updated to point to {{.hostname}}:{{.port}}": "El contexto \"{{.context}}\" ha sido actualizado para apuntar a {{.hostname}}:{{.port}}", @@ -715,6 +716,8 @@ "The node {{.name}} has ran out of memory.": "", "The node {{.name}} network is not available. Please verify network settings.": "", "The none driver is not compatible with multi-node clusters.": "", + "The none driver with Kubernetes v1.24+ and the docker container-runtime requires cri-dockerd.\n\t\t\n\t\tPlease install cri-dockerd using these instructions:\n\n\t\thttps://github.com/Mirantis/cri-dockerd#build-and-install": "", + "The none driver with Kubernetes v1.24+ and the docker container-runtime requires dockerd.\n\t\t\n\t\tPlease install dockerd using these instructions:\n\n\t\thttps://docs.docker.com/engine/install/": "", "The number of nodes to spin up. Defaults to 1.": "", "The output format. One of 'json', 'table'": "", "The path on the file system where the docs in markdown need to be saved": "", diff --git a/translations/fr.json b/translations/fr.json index c7edf9e16e..60ce412224 100644 --- a/translations/fr.json +++ b/translations/fr.json @@ -1,4 +1,5 @@ { + "\n\n": "", "\"The '{{.minikube_addon}}' addon is disabled": "Le module \"{{.minikube_addon}}\" est désactivé", "\"minikube cache\" will be deprecated in upcoming versions, please switch to \"minikube image load\"": "\"minikube cache\" sera obsolète dans les prochaines versions, veuillez passer à \"minikube image load\"", "\"{{.context}}\" context has been updated to point to {{.hostname}}:{{.port}}": "Le contexte \"{{.context}}\" a été mis à jour pour pointer vers {{.hostname}}:{{.port}}", @@ -691,6 +692,8 @@ "The node {{.name}} has ran out of memory.": "Le nœud {{.name}} est à court de mémoire.", "The node {{.name}} network is not available. Please verify network settings.": "Le réseau du nœud {{.name}} n'est pas disponible. Veuillez vérifier les paramètres réseau.", "The none driver is not compatible with multi-node clusters.": "Le pilote none n'est pas compatible avec les clusters multi-nœuds.", + "The none driver with Kubernetes v1.24+ and the docker container-runtime requires cri-dockerd.\n\t\t\n\t\tPlease install cri-dockerd using these instructions:\n\n\t\thttps://github.com/Mirantis/cri-dockerd#build-and-install": "", + "The none driver with Kubernetes v1.24+ and the docker container-runtime requires dockerd.\n\t\t\n\t\tPlease install dockerd using these instructions:\n\n\t\thttps://docs.docker.com/engine/install/": "", "The number of bytes to use for 9p packet payload": "Le nombre d'octets à utiliser pour la charge utile du paquet 9p", "The number of nodes to spin up. Defaults to 1.": "Le nombre de nœuds à faire tourner. La valeur par défaut est 1.", "The output format. One of 'json', 'table'": "Le format de sortie. 'json' ou 'table'", diff --git a/translations/ja.json b/translations/ja.json index fe410ab790..80499bb8de 100644 --- a/translations/ja.json +++ b/translations/ja.json @@ -1,4 +1,5 @@ { + "\n\n": "", "\"The '{{.minikube_addon}}' addon is disabled": "'{{.minikube_addon}}' アドオンが無効です", "\"minikube cache\" will be deprecated in upcoming versions, please switch to \"minikube image load\"": "「minikube cache」は今後のバージョンで廃止予定になりますので、「minikube image load」に切り替えてください", "\"{{.context}}\" context has been updated to point to {{.hostname}}:{{.port}}": "「{{.context}}」コンテキストが更新されて、{{.hostname}}:{{.port}} を指すようになりました", @@ -664,6 +665,8 @@ "The node {{.name}} has ran out of memory.": "{{.name}} ノードはメモリーを使い果たしました。", "The node {{.name}} network is not available. Please verify network settings.": "{{.name}} ノードはネットワークが使用不能です。ネットワーク設定を検証してください。", "The none driver is not compatible with multi-node clusters.": "ノードドライバーはマルチノードクラスターと互換性がありません。", + "The none driver with Kubernetes v1.24+ and the docker container-runtime requires cri-dockerd.\n\t\t\n\t\tPlease install cri-dockerd using these instructions:\n\n\t\thttps://github.com/Mirantis/cri-dockerd#build-and-install": "", + "The none driver with Kubernetes v1.24+ and the docker container-runtime requires dockerd.\n\t\t\n\t\tPlease install dockerd using these instructions:\n\n\t\thttps://docs.docker.com/engine/install/": "", "The number of nodes to spin up. Defaults to 1.": "起動するノード数。デフォルトは 1。", "The output format. One of 'json', 'table'": "出力形式。'json', 'table' のいずれか", "The path on the file system where the docs in markdown need to be saved": "markdown で書かれたドキュメントの保存先のファイルシステムパス", diff --git a/translations/ko.json b/translations/ko.json index 5e5ff9fb4a..4d2522c5db 100644 --- a/translations/ko.json +++ b/translations/ko.json @@ -1,4 +1,5 @@ { + "\n\n": "", "\"The '{{.minikube_addon}}' addon is disabled": "\"The '{{.minikube_addon}}' 이 비활성화되었습니다", "\"minikube cache\" will be deprecated in upcoming versions, please switch to \"minikube image load\"": "", "\"{{.context}}\" context has been updated to point to {{.hostname}}:{{.port}}": "\"{{.context}}\" 컨텍스트가 {{.hostname}}:{{.port}}로 갱신되었습니다.", @@ -719,6 +720,8 @@ "The node {{.name}} has ran out of memory.": "", "The node {{.name}} network is not available. Please verify network settings.": "", "The none driver is not compatible with multi-node clusters.": "", + "The none driver with Kubernetes v1.24+ and the docker container-runtime requires cri-dockerd.\n\t\t\n\t\tPlease install cri-dockerd using these instructions:\n\n\t\thttps://github.com/Mirantis/cri-dockerd#build-and-install": "", + "The none driver with Kubernetes v1.24+ and the docker container-runtime requires dockerd.\n\t\t\n\t\tPlease install dockerd using these instructions:\n\n\t\thttps://docs.docker.com/engine/install/": "", "The number of nodes to spin up. Defaults to 1.": "", "The output format. One of 'json', 'table'": "", "The path on the file system where the docs in markdown need to be saved": "", diff --git a/translations/pl.json b/translations/pl.json index c6239aec9e..d55d1174d1 100644 --- a/translations/pl.json +++ b/translations/pl.json @@ -1,4 +1,5 @@ { + "\n\n": "", "\"The '{{.minikube_addon}}' addon is disabled": "", "\"minikube cache\" will be deprecated in upcoming versions, please switch to \"minikube image load\"": "", "\"{{.context}}\" context has been updated to point to {{.hostname}}:{{.port}}": "", @@ -730,6 +731,8 @@ "The node {{.name}} has ran out of memory.": "", "The node {{.name}} network is not available. Please verify network settings.": "", "The none driver is not compatible with multi-node clusters.": "", + "The none driver with Kubernetes v1.24+ and the docker container-runtime requires cri-dockerd.\n\t\t\n\t\tPlease install cri-dockerd using these instructions:\n\n\t\thttps://github.com/Mirantis/cri-dockerd#build-and-install": "", + "The none driver with Kubernetes v1.24+ and the docker container-runtime requires dockerd.\n\t\t\n\t\tPlease install dockerd using these instructions:\n\n\t\thttps://docs.docker.com/engine/install/": "", "The number of nodes to spin up. Defaults to 1.": "", "The output format. One of 'json', 'table'": "", "The path on the file system where the docs in markdown need to be saved": "", diff --git a/translations/ru.json b/translations/ru.json index 3f1462e1cd..a9a85c5eec 100644 --- a/translations/ru.json +++ b/translations/ru.json @@ -1,4 +1,5 @@ { + "\n\n": "", "\"The '{{.minikube_addon}}' addon is disabled": "\"Дополнение '{{.minikube_addon}}' выключено", "\"minikube cache\" will be deprecated in upcoming versions, please switch to \"minikube image load\"": "", "\"{{.context}}\" context has been updated to point to {{.hostname}}:{{.port}}": "Контекст \"{{.context}}\" был обновлён и теперь указывает на {{.hostname}}:{{.port}}", @@ -661,6 +662,8 @@ "The node {{.name}} has ran out of memory.": "", "The node {{.name}} network is not available. Please verify network settings.": "", "The none driver is not compatible with multi-node clusters.": "", + "The none driver with Kubernetes v1.24+ and the docker container-runtime requires cri-dockerd.\n\t\t\n\t\tPlease install cri-dockerd using these instructions:\n\n\t\thttps://github.com/Mirantis/cri-dockerd#build-and-install": "", + "The none driver with Kubernetes v1.24+ and the docker container-runtime requires dockerd.\n\t\t\n\t\tPlease install dockerd using these instructions:\n\n\t\thttps://docs.docker.com/engine/install/": "", "The number of nodes to spin up. Defaults to 1.": "", "The output format. One of 'json', 'table'": "", "The path on the file system where the docs in markdown need to be saved": "", diff --git a/translations/strings.txt b/translations/strings.txt index f71cf96679..9d7bd85439 100644 --- a/translations/strings.txt +++ b/translations/strings.txt @@ -1,4 +1,5 @@ { + "\n\n": "", "\"The '{{.minikube_addon}}' addon is disabled": "", "\"minikube cache\" will be deprecated in upcoming versions, please switch to \"minikube image load\"": "", "\"{{.context}}\" context has been updated to point to {{.hostname}}:{{.port}}": "", @@ -661,6 +662,8 @@ "The node {{.name}} has ran out of memory.": "", "The node {{.name}} network is not available. Please verify network settings.": "", "The none driver is not compatible with multi-node clusters.": "", + "The none driver with Kubernetes v1.24+ and the docker container-runtime requires cri-dockerd.\n\t\t\n\t\tPlease install cri-dockerd using these instructions:\n\n\t\thttps://github.com/Mirantis/cri-dockerd#build-and-install": "", + "The none driver with Kubernetes v1.24+ and the docker container-runtime requires dockerd.\n\t\t\n\t\tPlease install dockerd using these instructions:\n\n\t\thttps://docs.docker.com/engine/install/": "", "The number of nodes to spin up. Defaults to 1.": "", "The output format. One of 'json', 'table'": "", "The path on the file system where the docs in markdown need to be saved": "", diff --git a/translations/zh-CN.json b/translations/zh-CN.json index 0de43b9326..1ed42c693b 100644 --- a/translations/zh-CN.json +++ b/translations/zh-CN.json @@ -1,4 +1,5 @@ { + "\n\n": "", "\"The '{{.minikube_addon}}' addon is disabled": "'{{.minikube_addon}}' 插件已被禁用", "\"minikube cache\" will be deprecated in upcoming versions, please switch to \"minikube image load\"": "", "\"{{.context}}\" context has been updated to point to {{.hostname}}:{{.port}}": "", @@ -818,6 +819,8 @@ "The node {{.name}} has ran out of memory.": "", "The node {{.name}} network is not available. Please verify network settings.": "", "The none driver is not compatible with multi-node clusters.": "", + "The none driver with Kubernetes v1.24+ and the docker container-runtime requires cri-dockerd.\n\t\t\n\t\tPlease install cri-dockerd using these instructions:\n\n\t\thttps://github.com/Mirantis/cri-dockerd#build-and-install": "", + "The none driver with Kubernetes v1.24+ and the docker container-runtime requires dockerd.\n\t\t\n\t\tPlease install dockerd using these instructions:\n\n\t\thttps://docs.docker.com/engine/install/": "", "The number of nodes to spin up. Defaults to 1.": "", "The output format. One of 'json', 'table'": "输出的格式。'json' 或者 'table'", "The path on the file system where the docs in markdown need to be saved": "", From 8cdcc8ddbfb7b4b1f01d8991b4dc9fbaf6026223 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Fri, 29 Jul 2022 17:47:20 +0000 Subject: [PATCH 334/545] Updating kicbase image to v0.0.32-1659115536-14579 --- pkg/drivers/kic/types.go | 4 ++-- site/content/en/docs/commands/start.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/drivers/kic/types.go b/pkg/drivers/kic/types.go index cef1d64c70..546ce4e449 100644 --- a/pkg/drivers/kic/types.go +++ b/pkg/drivers/kic/types.go @@ -24,9 +24,9 @@ import ( const ( // Version is the current version of kic - Version = "v0.0.32-1656700284-14481" + Version = "v0.0.32-1659115536-14579" // SHA of the kic base image - baseImageSHA = "96d18f055abcf72b9f587e13317d6f9b5bb6f60e9fa09d6c51e11defaf9bf842" + baseImageSHA = "73b259e144d926189cf169ae5b46bbec4e08e4e2f2bd87296054c3244f70feb8" // The name of the GCR kicbase repository gcrRepo = "gcr.io/k8s-minikube/kicbase-builds" // The name of the Dockerhub kicbase repository diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index a74aa329d1..e7efce3139 100644 --- a/site/content/en/docs/commands/start.md +++ b/site/content/en/docs/commands/start.md @@ -26,7 +26,7 @@ minikube start [flags] --apiserver-names strings A set of apiserver names which are used in the generated certificate for kubernetes. This can be used if you want to make the apiserver available from outside the machine --apiserver-port int The apiserver listening port (default 8443) --auto-update-drivers If set, automatically updates drivers to the latest version. Defaults to true. (default true) - --base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase-builds:v0.0.32-1656700284-14481@sha256:96d18f055abcf72b9f587e13317d6f9b5bb6f60e9fa09d6c51e11defaf9bf842") + --base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase-builds:v0.0.32-1659115536-14579@sha256:73b259e144d926189cf169ae5b46bbec4e08e4e2f2bd87296054c3244f70feb8") --binary-mirror string Location to fetch kubectl, kubelet, & kubeadm binaries from. --cache-images If true, cache docker images for the current bootstrapper and load them into the machine. Always false with --driver=none. (default true) --cert-expiration duration Duration until minikube certificate expiration, defaults to three years (26280h). (default 26280h0m0s) From 48a2e76f87061d24714039dfe1700137d8d97166 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Mon, 1 Aug 2022 09:23:08 -0700 Subject: [PATCH 335/545] fix registry when custom images provided --- pkg/addons/addons.go | 2 +- pkg/minikube/assets/addons.go | 13 +++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/pkg/addons/addons.go b/pkg/addons/addons.go index 662ee119bc..ec07d8cdfa 100644 --- a/pkg/addons/addons.go +++ b/pkg/addons/addons.go @@ -221,7 +221,7 @@ func EnableOrDisableAddon(cc *config.ClusterConfig, name string, val string) err out.WarningT("At least needs control plane nodes to enable addon") } - data := assets.GenerateTemplateData(addon, cc.KubernetesConfig, networkInfo, images, customRegistries, enable) + data := assets.GenerateTemplateData(addon, cc, networkInfo, images, customRegistries, enable) return enableOrDisableAddonInternal(cc, addon, runner, data, enable) } diff --git a/pkg/minikube/assets/addons.go b/pkg/minikube/assets/addons.go index 3ae79e4e3a..f23d6dd65e 100755 --- a/pkg/minikube/assets/addons.go +++ b/pkg/minikube/assets/addons.go @@ -819,8 +819,8 @@ func SelectAndPersistImages(addon *Addon, cc *config.ClusterConfig) (images, cus } // GenerateTemplateData generates template data for template assets -func GenerateTemplateData(addon *Addon, cfg config.KubernetesConfig, netInfo NetworkInfo, images, customRegistries map[string]string, enable bool) interface{} { - +func GenerateTemplateData(addon *Addon, cc *config.ClusterConfig, netInfo NetworkInfo, images, customRegistries map[string]string, enable bool) interface{} { + cfg := cc.KubernetesConfig a := runtime.GOARCH // Some legacy docker images still need the -arch suffix // for less common architectures blank suffix for amd64 @@ -902,6 +902,15 @@ func GenerateTemplateData(addon *Addon, cfg config.KubernetesConfig, netInfo Net opts.Registries[name] = "" // Avoid nil access when rendering } + // Without the line below, if you try to overwrite an image the default registry is still used in the templating + // Example - image name: MetricsScraper, default registry: docker.io, default image: kubernetesui/metrics-scraper + // Passed on addon enable: --images=MetricsScraper=k8s.gcr.io/echoserver:1.4 + // Without this line the resulting image would be docker.io/k8s.gcr.io/echoserver:1.4 + // Therefore, if the user specified a custom image remove the default registry + if _, ok := cc.CustomAddonImages[name]; ok { + opts.Registries[name] = "" + } + if enable { if override, ok := opts.CustomRegistries[name]; ok { out.Infof("Using image {{.registry}}{{.image}}", out.V{ From 13680ff9870885565181861d783708c33a1e81c0 Mon Sep 17 00:00:00 2001 From: anoop142 Date: Mon, 1 Aug 2022 23:00:25 +0530 Subject: [PATCH 336/545] fix linting --- cmd/minikube/cmd/service.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/minikube/cmd/service.go b/cmd/minikube/cmd/service.go index eebc2ee0c2..bbba3d5459 100644 --- a/cmd/minikube/cmd/service.go +++ b/cmd/minikube/cmd/service.go @@ -261,7 +261,7 @@ func mutateURLs(serviceName string, urls []string) ([]string, error) { func openURLs(urls [][]string) { for _, u := range urls { - if len(u) < 4{ + if len(u) < 4 { klog.Warning("No URL found") continue } From f4b5047e9674846691045481df9b48c975023a18 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 1 Aug 2022 18:06:38 +0000 Subject: [PATCH 337/545] Bump github.com/shirou/gopsutil/v3 from 3.22.6 to 3.22.7 Bumps [github.com/shirou/gopsutil/v3](https://github.com/shirou/gopsutil) from 3.22.6 to 3.22.7. - [Release notes](https://github.com/shirou/gopsutil/releases) - [Commits](https://github.com/shirou/gopsutil/compare/v3.22.6...v3.22.7) --- updated-dependencies: - dependency-name: github.com/shirou/gopsutil/v3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index 348934c5ce..692ee17406 100644 --- a/go.mod +++ b/go.mod @@ -61,7 +61,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 github.com/russross/blackfriday v1.6.0 // indirect github.com/samalba/dockerclient v0.0.0-20160414174713-91d7393ff859 // indirect - github.com/shirou/gopsutil/v3 v3.22.6 + github.com/shirou/gopsutil/v3 v3.22.7 github.com/spf13/cobra v1.5.0 github.com/spf13/pflag v1.0.5 github.com/spf13/viper v1.12.0 diff --git a/go.sum b/go.sum index 6698d51cf0..2dc6abe1b2 100644 --- a/go.sum +++ b/go.sum @@ -1262,8 +1262,8 @@ github.com/securego/gosec/v2 v2.9.1/go.mod h1:oDcDLcatOJxkCGaCaq8lua1jTnYf6Sou4w github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c/go.mod h1:/PevMnwAxekIXwN8qQyfc5gl2NlkB3CQlkizAbOkeBs= github.com/shirou/gopsutil/v3 v3.21.10/go.mod h1:t75NhzCZ/dYyPQjyQmrAYP6c8+LCdFANeBMdLPCNnew= -github.com/shirou/gopsutil/v3 v3.22.6 h1:FnHOFOh+cYAM0C30P+zysPISzlknLC5Z1G4EAElznfQ= -github.com/shirou/gopsutil/v3 v3.22.6/go.mod h1:EdIubSnZhbAvBS1yJ7Xi+AShB/hxwLHOMz4MCYz7yMs= +github.com/shirou/gopsutil/v3 v3.22.7 h1:flKnuCMfUUrO+oAvwAd6GKZgnPzr098VA/UJ14nhJd4= +github.com/shirou/gopsutil/v3 v3.22.7/go.mod h1:s648gW4IywYzUfE/KjXxUsqrqx/T2xO5VqOXxONeRfI= github.com/shurcooL/go v0.0.0-20180423040247-9e1955d9fb6e/go.mod h1:TDJrrUr11Vxrven61rcy3hJMUqaf/CLWYhHNPmT14Lk= github.com/shurcooL/go-goon v0.0.0-20170922171312-37c2f522c041/go.mod h1:N5mDOmsrJOB+vfqUK+7DmDyjhSLIIBnXo9lvZJj3MWQ= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= @@ -1340,8 +1340,8 @@ github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.7.5 h1:s5PTfem8p8EbKQOctVV53k6jCJt3UX4IEJzwh+C324Q= -github.com/stretchr/testify v1.7.5/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= +github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk= +github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= github.com/subosito/gotenv v1.3.0 h1:mjC+YW8QpAdXibNi+vNWgzmgBH4+5l5dCXv8cNysBLI= github.com/subosito/gotenv v1.3.0/go.mod h1:YzJjq/33h7nrwdY+iHMhEOEEbW0ovIz0tB6t6PwAXzs= From 79fc15c6987beeb02ba20a769863eaf4e1ceb496 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Mon, 1 Aug 2022 11:36:21 -0700 Subject: [PATCH 338/545] update to macos-12 --- .github/workflows/master.yml | 2 +- .github/workflows/pr.yml | 2 +- .github/workflows/time-to-k8s-public-chart.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 7f1e537c9b..1695db63bf 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -395,7 +395,7 @@ jobs: JOB_NAME: "functional_virtualbox_macos" GOPOGH_RESULT: "" SHELL: "/bin/bash" # To prevent https://github.com/kubernetes/minikube/issues/6643 - runs-on: macos-11 + runs-on: macos-12 steps: - name: Install kubectl shell: bash diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 58a3b57468..38afb2d132 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -395,7 +395,7 @@ jobs: JOB_NAME: "functional_virtualbox_macos" GOPOGH_RESULT: "" SHELL: "/bin/bash" # To prevent https://github.com/kubernetes/minikube/issues/6643 - runs-on: macos-11 + runs-on: macos-12 steps: - name: Install kubectl shell: bash diff --git a/.github/workflows/time-to-k8s-public-chart.yml b/.github/workflows/time-to-k8s-public-chart.yml index 2792e451cc..f75c4ebcf2 100644 --- a/.github/workflows/time-to-k8s-public-chart.yml +++ b/.github/workflows/time-to-k8s-public-chart.yml @@ -31,7 +31,7 @@ jobs: ./hack/benchmark/time-to-k8s/public-chart/public-chart.sh docker containerd time-to-k8s-public-chart-virtualbox: if: github.repository == 'kubernetes/minikube' - runs-on: macos-11 + runs-on: macos-12 env: AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} From 8885a7d10111f9d1e726ceefd810be4c217a0629 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Mon, 1 Aug 2022 12:59:50 -0700 Subject: [PATCH 339/545] bump time-to-k8s version to fix Go 1.18 build issue --- hack/benchmark/time-to-k8s/time-to-k8s-repo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/benchmark/time-to-k8s/time-to-k8s-repo b/hack/benchmark/time-to-k8s/time-to-k8s-repo index 6e6133456e..a1f382413b 160000 --- a/hack/benchmark/time-to-k8s/time-to-k8s-repo +++ b/hack/benchmark/time-to-k8s/time-to-k8s-repo @@ -1 +1 @@ -Subproject commit 6e6133456e56553c341fd1a8a465fd302d85123d +Subproject commit a1f382413bb7f572f198167f58fbb3abbf51d38b From 66ff960b61904906153c2bedf7a5e05b2d36e926 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Mon, 1 Aug 2022 14:16:28 -0700 Subject: [PATCH 340/545] limit number of audit entries --- cmd/minikube/cmd/config/config.go | 4 ++++ cmd/minikube/cmd/root.go | 1 + pkg/minikube/audit/audit.go | 12 ++++++++++++ pkg/minikube/config/config.go | 2 ++ 4 files changed, 19 insertions(+) diff --git a/cmd/minikube/cmd/config/config.go b/cmd/minikube/cmd/config/config.go index 4af7698da3..9fd3685354 100644 --- a/cmd/minikube/cmd/config/config.go +++ b/cmd/minikube/cmd/config/config.go @@ -168,6 +168,10 @@ var settings = []Setting{ name: config.Rootless, set: SetBool, }, + { + name: config.MaxAuditEntries, + set: SetInt, + }, } // ConfigCmd represents the config command diff --git a/cmd/minikube/cmd/root.go b/cmd/minikube/cmd/root.go index dea3f0ee57..e614866728 100644 --- a/cmd/minikube/cmd/root.go +++ b/cmd/minikube/cmd/root.go @@ -325,6 +325,7 @@ func setupViper() { viper.SetDefault(config.ReminderWaitPeriodInHours, 24) viper.SetDefault(config.WantNoneDriverWarning, true) viper.SetDefault(config.WantVirtualBoxDriverWarning, true) + viper.SetDefault(config.MaxAuditEntries, 1000) } func addToPath(dir string) { diff --git a/pkg/minikube/audit/audit.go b/pkg/minikube/audit/audit.go index 2f945f7cee..8292bb2274 100644 --- a/pkg/minikube/audit/audit.go +++ b/pkg/minikube/audit/audit.go @@ -98,6 +98,9 @@ func LogCommandEnd(id string) error { return err } var entriesNeedsToUpdate int + + startIndex := getStartIndex(len(rowSlice)) + rowSlice = rowSlice[startIndex:] for _, v := range rowSlice { if v.id == id { v.endTime = time.Now().Format(constants.TimeFormat) @@ -118,6 +121,15 @@ func LogCommandEnd(id string) error { return nil } +func getStartIndex(entryCount int) int { + maxEntries := viper.GetInt(config.MaxAuditEntries) + startIndex := entryCount - maxEntries + if maxEntries <= 0 || startIndex <= 0 { + return 0 + } + return startIndex +} + // shouldLog returns if the command should be logged. func shouldLog() bool { // in rare chance we get here without a command, don't log diff --git a/pkg/minikube/config/config.go b/pkg/minikube/config/config.go index d93352604c..1f93ce6def 100644 --- a/pkg/minikube/config/config.go +++ b/pkg/minikube/config/config.go @@ -54,6 +54,8 @@ const ( AddonListFlag = "addons" // EmbedCerts represents the config for embedding certificates in kubeconfig EmbedCerts = "EmbedCerts" + // MaxAuditEntries is the maximum number of audit entries to retain + MaxAuditEntries = "MaxAuditEntries" ) var ( From 16c8c96838ca145d17ecca8303180c41961a99dd Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Mon, 1 Aug 2022 15:14:51 -0700 Subject: [PATCH 341/545] added test for MaxAuditEntries --- pkg/minikube/audit/audit_test.go | 40 ++++++++++++++++++++++++++++++-- 1 file changed, 38 insertions(+), 2 deletions(-) diff --git a/pkg/minikube/audit/audit_test.go b/pkg/minikube/audit/audit_test.go index 262ceac821..3397850bf0 100644 --- a/pkg/minikube/audit/audit_test.go +++ b/pkg/minikube/audit/audit_test.go @@ -17,8 +17,11 @@ limitations under the License. package audit import ( + "io" "os" + "os/exec" "os/user" + "strings" "testing" "github.com/spf13/pflag" @@ -27,6 +30,33 @@ import ( ) func TestAudit(t *testing.T) { + var auditFilename string + + t.Run("setup", func(t *testing.T) { + f, err := os.CreateTemp("", "audit.json") + if err != nil { + t.Fatalf("failed creating temporary file: %v", err) + } + auditFilename = f.Name() + + s := `{"data":{"args":"-p mini1","command":"start","endTime":"Wed, 03 Feb 2021 15:33:05 MST","profile":"mini1","startTime":"Wed, 03 Feb 2021 15:30:33 MST","user":"user1"},"datacontenttype":"application/json","id":"9b7593cb-fbec-49e5-a3ce-bdc2d0bfb208","source":"https://minikube.sigs.k8s.io/","specversion":"1.0","type":"io.k8s.si gs.minikube.audit"} +{"data":{"args":"-p mini1","command":"start","endTime":"Wed, 03 Feb 2021 15:33:05 MST","profile":"mini1","startTime":"Wed, 03 Feb 2021 15:30:33 MST","user":"user1"},"datacontenttype":"application/json","id":"9b7593cb-fbec-49e5-a3ce-bdc2d0bfb208","source":"https://minikube.sigs.k8s.io/","specversion":"1.0","type":"io.k8s.si gs.minikube.audit"} +{"data":{"args":"--user user2","command":"logs","endTime":"Tue, 02 Feb 2021 16:46:20 MST","profile":"minikube","startTime":"Tue, 02 Feb 2021 16:46:00 MST","user":"user2"},"datacontenttype":"application/json","id":"fec03227-2484-48b6-880a-88fd010b5efd","source":"https://minikube.sigs.k8s.io/","specversion":"1.0","type":"io.k8s.sigs.minikube.audit"} +{"data":{"args":"-p mini1","command":"start","endTime":"Wed, 03 Feb 2021 15:33:05 MST","profile":"mini1","startTime":"Wed, 03 Feb 2021 15:30:33 MST","user":"user1"},"datacontenttype":"application/json","id":"9b7593cb-fbec-49e5-a3ce-bdc2d0bfb208","source":"https://minikube.sigs.k8s.io/","specversion":"1.0","type":"io.k8s.si gs.minikube.audit"} +{"data":{"args":"--user user2","command":"logs","endTime":"Tue, 02 Feb 2021 16:46:20 MST","profile":"minikube","startTime":"Tue, 02 Feb 2021 16:46:00 MST","user":"user2"},"datacontenttype":"application/json","id":"fec03227-2484-48b6-880a-88fd010b5efd","source":"https://minikube.sigs.k8s.io/","specversion":"1.0","type":"io.k8s.sigs.minikube.audit"} +` + + if _, err := f.WriteString(s); err != nil { + t.Fatalf("failed writing to file: %v", err) + } + if _, err := f.Seek(0, io.SeekStart); err != nil { + t.Fatalf("failed seeking to start of file: %v", err) + } + + currentLogFile = f + viper.Set(config.MaxAuditEntries, 3) + }) + t.Run("username", func(t *testing.T) { u, err := user.Current() if err != nil { @@ -168,7 +198,6 @@ func TestAudit(t *testing.T) { mockArgs(t, test.args) got := isDeletePurge() - if got != test.want { t.Errorf("test.args = %q; isDeletePurge() = %t; want %t", test.args, got, test.want) } @@ -211,11 +240,18 @@ func TestAudit(t *testing.T) { if err != nil { t.Fatal("start failed") } - err = LogCommandEnd(auditID) + if err := LogCommandEnd(auditID); err != nil { + t.Fatal(err) + } + b, err := exec.Command("wc", "-l", auditFilename).Output() if err != nil { t.Fatal(err) } + if !strings.Contains(string(b), "3") { + t.Errorf("MaxAuditEntries did not work, expected 3 lines in the audit log found %s", string(b)) + } + }) t.Run("LogCommandEndNonExistingID", func(t *testing.T) { From 14a041ad24dfde12f69fc485bad00ac951979734 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Mon, 1 Aug 2022 16:25:38 -0700 Subject: [PATCH 342/545] output kubeadm logs --- pkg/minikube/bootstrapper/kubeadm/kubeadm.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go index d981ac8e89..742e4959e9 100644 --- a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go +++ b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go @@ -313,12 +313,13 @@ func outputKubeadmInitSteps(logs io.Reader, wg *sync.WaitGroup) { scanner := bufio.NewScanner(logs) for scanner.Scan() { + line := scanner.Text() + klog.Info(line) if nextStepIndex >= len(steps) { - scanner.Text() continue } nextStep := steps[nextStepIndex] - if !strings.Contains(scanner.Text(), fmt.Sprintf("[%s]", nextStep.logTag)) { + if !strings.Contains(line, fmt.Sprintf("[%s]", nextStep.logTag)) { continue } register.Reg.SetStep(nextStep.registerStep) From 5af6baf7a964ff7341c743906ffb2e355d869f69 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Tue, 2 Aug 2022 17:18:45 +0000 Subject: [PATCH 343/545] Update auto-generated docs and translations --- site/content/en/docs/commands/config.md | 1 + 1 file changed, 1 insertion(+) diff --git a/site/content/en/docs/commands/config.md b/site/content/en/docs/commands/config.md index 91dc6e8ea3..ddf8767dd5 100644 --- a/site/content/en/docs/commands/config.md +++ b/site/content/en/docs/commands/config.md @@ -40,6 +40,7 @@ Configurable fields: * EmbedCerts * native-ssh * rootless + * MaxAuditEntries ```shell minikube config SUBCOMMAND [flags] From 5f7c2a38fdf93835f5bf146e5167ee845321334f Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Tue, 2 Aug 2022 17:43:47 +0000 Subject: [PATCH 344/545] Update kicbase to v0.0.33 --- pkg/drivers/kic/types.go | 6 +++--- site/content/en/docs/commands/start.md | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/drivers/kic/types.go b/pkg/drivers/kic/types.go index 546ce4e449..c73b2f1c2a 100644 --- a/pkg/drivers/kic/types.go +++ b/pkg/drivers/kic/types.go @@ -24,13 +24,13 @@ import ( const ( // Version is the current version of kic - Version = "v0.0.32-1659115536-14579" + Version = "v0.0.33" // SHA of the kic base image baseImageSHA = "73b259e144d926189cf169ae5b46bbec4e08e4e2f2bd87296054c3244f70feb8" // The name of the GCR kicbase repository - gcrRepo = "gcr.io/k8s-minikube/kicbase-builds" + gcrRepo = "gcr.io/k8s-minikube/kicbase" // The name of the Dockerhub kicbase repository - dockerhubRepo = "docker.io/kicbase/build" + dockerhubRepo = "docker.io/kicbase/stable" ) var ( diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index fd8cd61975..8aef7590a6 100644 --- a/site/content/en/docs/commands/start.md +++ b/site/content/en/docs/commands/start.md @@ -26,7 +26,7 @@ minikube start [flags] --apiserver-names strings A set of apiserver names which are used in the generated certificate for kubernetes. This can be used if you want to make the apiserver available from outside the machine --apiserver-port int The apiserver listening port (default 8443) --auto-update-drivers If set, automatically updates drivers to the latest version. Defaults to true. (default true) - --base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase-builds:v0.0.32-1659115536-14579@sha256:73b259e144d926189cf169ae5b46bbec4e08e4e2f2bd87296054c3244f70feb8") + --base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase:v0.0.33@sha256:73b259e144d926189cf169ae5b46bbec4e08e4e2f2bd87296054c3244f70feb8") --binary-mirror string Location to fetch kubectl, kubelet, & kubeadm binaries from. --cache-images If true, cache docker images for the current bootstrapper and load them into the machine. Always false with --driver=none. (default true) --cert-expiration duration Duration until minikube certificate expiration, defaults to three years (26280h). (default 26280h0m0s) From 85d5bffaded7b98c045f6b41c47926c4ddac5257 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Tue, 2 Aug 2022 17:44:51 +0000 Subject: [PATCH 345/545] Update ISO to v1.26.1 --- 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 15ec1617b9..59f6eadfdd 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.26.0-1657933211-14545 +ISO_VERSION ?= v1.26.1 # 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 dbca002244..404359a48a 100644 --- a/pkg/minikube/download/iso.go +++ b/pkg/minikube/download/iso.go @@ -41,7 +41,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/14545" + isoBucket := "minikube/iso" return []string{ fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s-%s.iso", isoBucket, v, runtime.GOARCH), fmt.Sprintf("https://github.com/kubernetes/minikube/releases/download/%s/minikube-%s-%s.iso", v, v, runtime.GOARCH), diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index fd8cd61975..e6a58310c2 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/14545/minikube-v1.26.0-1657933211-14545-amd64.iso,https://github.com/kubernetes/minikube/releases/download/v1.26.0-1657933211-14545/minikube-v1.26.0-1657933211-14545-amd64.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.26.0-1657933211-14545-amd64.iso,https://storage.googleapis.com/minikube-builds/iso/14545/minikube-v1.26.0-1657933211-14545.iso,https://github.com/kubernetes/minikube/releases/download/v1.26.0-1657933211-14545/minikube-v1.26.0-1657933211-14545.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.26.0-1657933211-14545.iso]) + --iso-url strings Locations to fetch the minikube ISO from. (default [https://storage.googleapis.com/minikube/iso/minikube-v1.26.1-amd64.iso,https://github.com/kubernetes/minikube/releases/download/v1.26.1/minikube-v1.26.1-amd64.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.26.1-amd64.iso,https://storage.googleapis.com/minikube/iso/minikube-v1.26.1.iso,https://github.com/kubernetes/minikube/releases/download/v1.26.1/minikube-v1.26.1.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.26.1.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.24.3, 'latest' for v1.24.3). Defaults to 'stable'. --kvm-gpu Enable experimental NVIDIA GPU support in minikube From 37aa78a8deab9567f5be15cd3150cbfaab7ee499 Mon Sep 17 00:00:00 2001 From: klaases Date: Tue, 2 Aug 2022 11:29:43 -0700 Subject: [PATCH 346/545] release 1.26.1 changelog and makefile --- CHANGELOG.md | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++++ Makefile | 2 +- 2 files changed, 68 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d0f93b4f12..d58563e3a6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,72 @@ # Release Notes +## Version 1.26.1 - 2022-08-02 + +Minor Improvements: +* Check for cri-dockerd & dockerd runtimes when using none-driver on Kubernetes 1.24+ [#14555](https://github.com/kubernetes/minikube/pull/14555) +* Add solution message for when `cri-docker` is missing [#14483](https://github.com/kubernetes/minikube/pull/14483) +* Limit number of audit entries [#14695](https://github.com/kubernetes/minikube/pull/14695) +* Optimize audit logging [#14596](https://github.com/kubernetes/minikube/pull/14596) +* Show the container runtime when running without kubernetes #13432 [#14200](https://github.com/kubernetes/minikube/pull/14200) +* Add warning when enabling thrid-party addons [#14499](https://github.com/kubernetes/minikube/pull/14499) + +Bug fixes: +* Fix url index out of range error in service [#14658](https://github.com/kubernetes/minikube/pull/14658) +* Fix incorrect user and profile in audit logging [#14562](https://github.com/kubernetes/minikube/pull/14562) +* Fix overwriting err for OCI "minikube start" [#14506](https://github.com/kubernetes/minikube/pull/14506) +* Fix panic when environment variables are empty [#14415](https://github.com/kubernetes/minikube/pull/14415) + +Version Upgrades: +* Bump Kubernetes version default: v1.24.3 and latest: v1.24.3 [#14606](https://github.com/kubernetes/minikube/pull/14606) +* ISO: Update Docker from 20.10.16 to 20.10.17 [#14534](https://github.com/kubernetes/minikube/pull/14534) +* ISO/Kicbase: Update cri-o from v1.22.3 to v1.24.1 [#14420](https://github.com/kubernetes/minikube/pull/14420) +* ISO: Update conmon from v2.0.24 to v2.1.2 [#14545](https://github.com/kubernetes/minikube/pull/14545) +* Update gcp-auth-webhook from v0.0.9 to v0.0.10 [#14670](https://github.com/kubernetes/minikube/pull/14670) +* ISO/Kicbase: Update base images [#14481](https://github.com/kubernetes/minikube/pull/14481) + +For a more detailed changelog, including changes occurring in pre-release versions, see [CHANGELOG.md](https://github.com/kubernetes/minikube/blob/master/CHANGELOG.md). + +Thank you to our contributors for this release! + +- Akihiro Suda +- Akira Yoshiyama +- Bradley S +- Christoph "criztovyl" Schulz +- Gimb0 +- HarshCasper +- Jeff MAURY +- Medya Ghazizadeh +- Niels de Vos +- Paul S. Schweigert +- Santhosh Nagaraj S +- Steven Powell +- Tobias Pfandzelter +- anoop142 +- inifares23lab +- klaases +- peizhouyu +- zhouguowei +- 吴梓铭 +- 李龙峰 + +Thank you to our PR reviewers for this release! + +- spowelljr (50 comments) +- medyagh (9 comments) +- atoato88 (3 comments) +- klaases (2 comments) +- afbjorklund (1 comments) + +Thank you to our triage members for this release! + +- afbjorklund (75 comments) +- RA489 (56 comments) +- klaases (32 comments) +- spowelljr (27 comments) +- medyagh (13 comments) + +Check out our [contributions leaderboard](https://minikube.sigs.k8s.io/docs/contrib/leaderboard/v1.26.0/) for this release! + ## Version 1.26.0 - 2022-06-22 Features: diff --git a/Makefile b/Makefile index 59f6eadfdd..924655be04 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ # Bump these on release - and please check ISO_VERSION for correctness. VERSION_MAJOR ?= 1 VERSION_MINOR ?= 26 -VERSION_BUILD ?= 0 +VERSION_BUILD ?= 1 RAW_VERSION=$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_BUILD) VERSION ?= v$(RAW_VERSION) From 626b8753f1b8a6e8c0ba412f67a697410b90bab2 Mon Sep 17 00:00:00 2001 From: klaases Date: Tue, 2 Aug 2022 11:37:30 -0700 Subject: [PATCH 347/545] update release_notes and pullsheet for new Go vers --- hack/release_notes.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hack/release_notes.sh b/hack/release_notes.sh index ade4ed16f5..ebaba83866 100755 --- a/hack/release_notes.sh +++ b/hack/release_notes.sh @@ -28,7 +28,7 @@ function cleanup_token() { } trap cleanup_token EXIT -if ! [[ -x "${DIR}/release-notes" ]] || ! [[ -x "${DIR}/pullsheet" ]]; then +if ! [[ -x release-notes ]] || ! [[ -x pullsheet ]]; then echo >&2 'Installing release-notes' go install github.com/corneliusweig/release-notes@latest go install github.com/google/pullsheet@latest @@ -38,7 +38,7 @@ git pull https://github.com/kubernetes/minikube.git master --tags recent=$(git describe --abbrev=0) recent_date=$(git log -1 --format=%as $recent) -"${DIR}/release-notes" kubernetes minikube --since $recent +release-notes kubernetes minikube --since $recent echo "" echo "For a more detailed changelog, including changes occurring in pre-release versions, see [CHANGELOG.md](https://github.com/kubernetes/minikube/blob/master/CHANGELOG.md)." @@ -52,12 +52,12 @@ echo "Thank you to our PR reviewers for this release!" echo "" AWK_FORMAT_ITEM='{printf "- %s (%d comments)\n", $2, $1}' AWK_REVIEW_COMMENTS='NR>1{arr[$4] += $6 + $7}END{for (a in arr) printf "%d %s\n", arr[a], a}' -"${DIR}/pullsheet" reviews --since "$recent_date" --repos kubernetes/minikube --token-path "$GH_TOKEN" --logtostderr=false --stderrthreshold=2 | awk -F ',' "$AWK_REVIEW_COMMENTS" | sort -k1nr -k2d | awk -F ' ' "$AWK_FORMAT_ITEM" +pullsheet reviews --since "$recent_date" --repos kubernetes/minikube --token-path "$GH_TOKEN" --logtostderr=false --stderrthreshold=2 | awk -F ',' "$AWK_REVIEW_COMMENTS" | sort -k1nr -k2d | awk -F ' ' "$AWK_FORMAT_ITEM" echo "" echo "Thank you to our triage members for this release!" echo "" AWK_ISSUE_COMMENTS='NR>1{arr[$4] += $7}END{for (a in arr) printf "%d %s\n", arr[a], a}' -"${DIR}/pullsheet" issue-comments --since "$recent_date" --repos kubernetes/minikube --token-path "$GH_TOKEN" --logtostderr=false --stderrthreshold=2 | awk -F ',' "$AWK_ISSUE_COMMENTS" | sort -k1nr -k2d | awk -F ' ' "$AWK_FORMAT_ITEM" | head -n 5 +pullsheet issue-comments --since "$recent_date" --repos kubernetes/minikube --token-path "$GH_TOKEN" --logtostderr=false --stderrthreshold=2 | awk -F ',' "$AWK_ISSUE_COMMENTS" | sort -k1nr -k2d | awk -F ' ' "$AWK_FORMAT_ITEM" | head -n 5 if [[ "$recent" != *"beta"* ]]; then echo "" From 0b1fb8230e6cbc9b4f500a1199c97afce2d2aa64 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Tue, 2 Aug 2022 12:37:28 -0700 Subject: [PATCH 348/545] fix linting errors --- pkg/drivers/qemu/qemu.go | 11 +++++------ pkg/minikube/registry/drvs/qemu2/qemu2.go | 3 +-- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/pkg/drivers/qemu/qemu.go b/pkg/drivers/qemu/qemu.go index 2919735d9c..72c5f0ce4c 100644 --- a/pkg/drivers/qemu/qemu.go +++ b/pkg/drivers/qemu/qemu.go @@ -21,7 +21,6 @@ import ( "bytes" "encoding/json" "fmt" - "io/ioutil" "math/rand" "net" "os" @@ -175,7 +174,7 @@ func (d *Driver) GetState() (state.State, error) { if _, err := os.Stat(d.pidfilePath()); err != nil { return state.Stopped, nil } - p, err := ioutil.ReadFile(d.pidfilePath()) + p, err := os.ReadFile(d.pidfilePath()) if err != nil { return state.Error, err } @@ -588,7 +587,7 @@ func (d *Driver) generateDiskImage(size int) error { if err := tw.WriteHeader(file); err != nil { return err } - pubKey, err := ioutil.ReadFile(d.publicSSHKeyPath()) + pubKey, err := os.ReadFile(d.publicSSHKeyPath()) if err != nil { return err } @@ -610,7 +609,7 @@ func (d *Driver) generateDiskImage(size int) error { return err } rawFile := fmt.Sprintf("%s.raw", d.diskPath()) - if err := ioutil.WriteFile(rawFile, buf.Bytes(), 0644); err != nil { + if err := os.WriteFile(rawFile, buf.Bytes(), 0644); err != nil { return nil } if stdout, stderr, err := cmdOutErr("qemu-img", "convert", "-f", "raw", "-O", "qcow2", rawFile, d.diskPath()); err != nil { @@ -631,7 +630,7 @@ func (d *Driver) generateDiskImage(size int) error { func (d *Driver) generateUserdataDisk(userdataFile string) (string, error) { // Start with virtio, add ISO & FAT format later // Start with local file, add wget/fetct URL? (or if URL, use datasource..) - userdata, err := ioutil.ReadFile(userdataFile) + userdata, err := os.ReadFile(userdataFile) if err != nil { return "", err } @@ -650,7 +649,7 @@ func (d *Driver) generateUserdataDisk(userdataFile string) (string, error) { } writeFile := filepath.Join(userDataDir, "user_data") - if err := ioutil.WriteFile(writeFile, userdata, 0644); err != nil { + if err := os.WriteFile(writeFile, userdata, 0644); err != nil { return "", err } diff --git a/pkg/minikube/registry/drvs/qemu2/qemu2.go b/pkg/minikube/registry/drvs/qemu2/qemu2.go index d2cfae3164..2cb1a6ce9c 100644 --- a/pkg/minikube/registry/drvs/qemu2/qemu2.go +++ b/pkg/minikube/registry/drvs/qemu2/qemu2.go @@ -18,7 +18,6 @@ package qemu2 import ( "fmt" - "io/ioutil" "os" "os/exec" "path" @@ -87,7 +86,7 @@ func qemuFirmwarePath(customPath string) (string, error) { return "", fmt.Errorf("unknown arch: %s", arch) } - v, err := ioutil.ReadDir(p) + v, err := os.ReadDir(p) if err != nil { return "", fmt.Errorf("lookup qemu: %v", err) } From fa11455a31044214586ec827e75f165221c3e809 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Tue, 2 Aug 2022 14:28:01 -0700 Subject: [PATCH 349/545] fix audit tests --- pkg/minikube/audit/audit.go | 3 +-- pkg/minikube/audit/audit_test.go | 38 ++++++++++++++----------------- pkg/minikube/audit/logFile.go | 27 ++++++++++++++++++---- pkg/minikube/audit/report_test.go | 4 ++-- 4 files changed, 43 insertions(+), 29 deletions(-) diff --git a/pkg/minikube/audit/audit.go b/pkg/minikube/audit/audit.go index 8292bb2274..6bbba3a85c 100644 --- a/pkg/minikube/audit/audit.go +++ b/pkg/minikube/audit/audit.go @@ -30,7 +30,6 @@ import ( "github.com/spf13/viper" "k8s.io/minikube/pkg/minikube/config" "k8s.io/minikube/pkg/minikube/constants" - "k8s.io/minikube/pkg/minikube/localpath" "k8s.io/minikube/pkg/version" ) @@ -91,7 +90,7 @@ func LogCommandEnd(id string) error { return fmt.Errorf("failed to convert logs to rows: %v", err) } // have to truncate the audit log while closed as Windows can't truncate an open file - if err := os.Truncate(localpath.AuditLog(), 0); err != nil { + if err := truncateAuditLog(); err != nil { return fmt.Errorf("failed to truncate audit log: %v", err) } if err := openAuditLog(); err != nil { diff --git a/pkg/minikube/audit/audit_test.go b/pkg/minikube/audit/audit_test.go index 3397850bf0..b5d1773e19 100644 --- a/pkg/minikube/audit/audit_test.go +++ b/pkg/minikube/audit/audit_test.go @@ -17,7 +17,6 @@ limitations under the License. package audit import ( - "io" "os" "os/exec" "os/user" @@ -30,33 +29,30 @@ import ( ) func TestAudit(t *testing.T) { - var auditFilename string + defer func() { auditOverrideFilename = "" }() t.Run("setup", func(t *testing.T) { f, err := os.CreateTemp("", "audit.json") if err != nil { t.Fatalf("failed creating temporary file: %v", err) } - auditFilename = f.Name() + defer f.Close() + auditOverrideFilename = f.Name() - s := `{"data":{"args":"-p mini1","command":"start","endTime":"Wed, 03 Feb 2021 15:33:05 MST","profile":"mini1","startTime":"Wed, 03 Feb 2021 15:30:33 MST","user":"user1"},"datacontenttype":"application/json","id":"9b7593cb-fbec-49e5-a3ce-bdc2d0bfb208","source":"https://minikube.sigs.k8s.io/","specversion":"1.0","type":"io.k8s.si gs.minikube.audit"} -{"data":{"args":"-p mini1","command":"start","endTime":"Wed, 03 Feb 2021 15:33:05 MST","profile":"mini1","startTime":"Wed, 03 Feb 2021 15:30:33 MST","user":"user1"},"datacontenttype":"application/json","id":"9b7593cb-fbec-49e5-a3ce-bdc2d0bfb208","source":"https://minikube.sigs.k8s.io/","specversion":"1.0","type":"io.k8s.si gs.minikube.audit"} + s := `{"data":{"args":"-p mini1","command":"start","endTime":"Wed, 03 Feb 2021 15:33:05 MST","profile":"mini1","startTime":"Wed, 03 Feb 2021 15:30:33 MST","user":"user1"},"datacontenttype":"application/json","id":"9b7593cb-fbec-49e5-a3ce-bdc2d0bfb208","source":"https://minikube.sigs.k8s.io/","specversion":"1.0","type":"io.k8s.sigs.minikube.audit"} +{"data":{"args":"-p mini1","command":"start","endTime":"Wed, 03 Feb 2021 15:33:05 MST","profile":"mini1","startTime":"Wed, 03 Feb 2021 15:30:33 MST","user":"user1"},"datacontenttype":"application/json","id":"9b7593cb-fbec-49e5-a3ce-bdc2d0bfb208","source":"https://minikube.sigs.k8s.io/","specversion":"1.0","type":"io.k8s.sigs.minikube.audit"} {"data":{"args":"--user user2","command":"logs","endTime":"Tue, 02 Feb 2021 16:46:20 MST","profile":"minikube","startTime":"Tue, 02 Feb 2021 16:46:00 MST","user":"user2"},"datacontenttype":"application/json","id":"fec03227-2484-48b6-880a-88fd010b5efd","source":"https://minikube.sigs.k8s.io/","specversion":"1.0","type":"io.k8s.sigs.minikube.audit"} -{"data":{"args":"-p mini1","command":"start","endTime":"Wed, 03 Feb 2021 15:33:05 MST","profile":"mini1","startTime":"Wed, 03 Feb 2021 15:30:33 MST","user":"user1"},"datacontenttype":"application/json","id":"9b7593cb-fbec-49e5-a3ce-bdc2d0bfb208","source":"https://minikube.sigs.k8s.io/","specversion":"1.0","type":"io.k8s.si gs.minikube.audit"} +{"data":{"args":"-p mini1","command":"start","endTime":"Wed, 03 Feb 2021 15:33:05 MST","profile":"mini1","startTime":"Wed, 03 Feb 2021 15:30:33 MST","user":"user1"},"datacontenttype":"application/json","id":"9b7593cb-fbec-49e5-a3ce-bdc2d0bfb208","source":"https://minikube.sigs.k8s.io/","specversion":"1.0","type":"io.k8s.sigs.minikube.audit"} {"data":{"args":"--user user2","command":"logs","endTime":"Tue, 02 Feb 2021 16:46:20 MST","profile":"minikube","startTime":"Tue, 02 Feb 2021 16:46:00 MST","user":"user2"},"datacontenttype":"application/json","id":"fec03227-2484-48b6-880a-88fd010b5efd","source":"https://minikube.sigs.k8s.io/","specversion":"1.0","type":"io.k8s.sigs.minikube.audit"} ` if _, err := f.WriteString(s); err != nil { t.Fatalf("failed writing to file: %v", err) } - if _, err := f.Seek(0, io.SeekStart); err != nil { - t.Fatalf("failed seeking to start of file: %v", err) - } - - currentLogFile = f - viper.Set(config.MaxAuditEntries, 3) }) + defer os.Remove(auditOverrideFilename) + t.Run("username", func(t *testing.T) { u, err := user.Current() if err != nil { @@ -217,18 +213,19 @@ func TestAudit(t *testing.T) { }() mockArgs(t, os.Args) auditID, err := LogCommandStart() - if auditID == "" { - t.Fatal("audit ID should not be empty") - } if err != nil { t.Fatal(err) } + if auditID == "" { + t.Fatal("audit ID should not be empty") + } }) t.Run("LogCommandEnd", func(t *testing.T) { oldArgs := os.Args defer func() { os.Args = oldArgs }() - os.Args = []string{"minikube"} + os.Args = []string{"minikube", "start"} + viper.Set(config.MaxAuditEntries, 3) oldCommandLine := pflag.CommandLine defer func() { @@ -238,13 +235,13 @@ func TestAudit(t *testing.T) { mockArgs(t, os.Args) auditID, err := LogCommandStart() if err != nil { - t.Fatal("start failed") + t.Fatalf("start failed: %v", err) } if err := LogCommandEnd(auditID); err != nil { t.Fatal(err) } - b, err := exec.Command("wc", "-l", auditFilename).Output() + b, err := exec.Command("wc", "-l", auditOverrideFilename).Output() if err != nil { t.Fatal(err) } @@ -257,7 +254,7 @@ func TestAudit(t *testing.T) { t.Run("LogCommandEndNonExistingID", func(t *testing.T) { oldArgs := os.Args defer func() { os.Args = oldArgs }() - os.Args = []string{"minikube"} + os.Args = []string{"minikube", "start"} oldCommandLine := pflag.CommandLine defer func() { @@ -265,8 +262,7 @@ func TestAudit(t *testing.T) { pflag.Parse() }() mockArgs(t, os.Args) - err := LogCommandEnd("non-existing-id") - if err == nil { + if err := LogCommandEnd("non-existing-id"); err == nil { t.Fatal("function LogCommandEnd should return an error when a non-existing id is passed in it as an argument") } }) diff --git a/pkg/minikube/audit/logFile.go b/pkg/minikube/audit/logFile.go index 6f2fd8e2e7..fb5de7de3c 100644 --- a/pkg/minikube/audit/logFile.go +++ b/pkg/minikube/audit/logFile.go @@ -25,8 +25,13 @@ import ( "k8s.io/minikube/pkg/minikube/out/register" ) -// currentLogFile the file that's used to store audit logs -var currentLogFile *os.File +var ( + // currentLogFile the file that's used to store audit logs + currentLogFile *os.File + + // auditOverrideFilename overrides the default audit log filename, used for testing purposes + auditOverrideFilename string +) // openAuditLog opens the audit log file or creates it if it doesn't exist. func openAuditLog() error { @@ -34,8 +39,7 @@ func openAuditLog() error { if currentLogFile != nil { return nil } - lp := localpath.AuditLog() - f, err := os.OpenFile(lp, os.O_APPEND|os.O_CREATE|os.O_RDWR, 0644) + f, err := os.OpenFile(auditPath(), os.O_APPEND|os.O_CREATE|os.O_RDWR, 0644) if err != nil { return fmt.Errorf("failed to open the audit log: %v", err) } @@ -67,3 +71,18 @@ func appendToLog(row *row) error { } return nil } + +// truncateAuditLog truncates the audit log file +func truncateAuditLog() error { + if err := os.Truncate(auditPath(), 0); err != nil { + return fmt.Errorf("failed to truncate audit log: %v", err) + } + return nil +} + +func auditPath() string { + if auditOverrideFilename != "" { + return auditOverrideFilename + } + return localpath.AuditLog() +} diff --git a/pkg/minikube/audit/report_test.go b/pkg/minikube/audit/report_test.go index 0f00725b49..308e6a61f9 100644 --- a/pkg/minikube/audit/report_test.go +++ b/pkg/minikube/audit/report_test.go @@ -29,8 +29,8 @@ func TestReport(t *testing.T) { } defer os.Remove(f.Name()) - s := `{"data":{"args":"-p mini1","command":"start","endTime":"Wed, 03 Feb 2021 15:33:05 MST","profile":"mini1","startTime":"Wed, 03 Feb 2021 15:30:33 MST","user":"user1"},"datacontenttype":"application/json","id":"9b7593cb-fbec-49e5-a3ce-bdc2d0bfb208","source":"https://minikube.sigs.k8s.io/","specversion":"1.0","type":"io.k8s.si gs.minikube.audit"} -{"data":{"args":"-p mini1","command":"start","endTime":"Wed, 03 Feb 2021 15:33:05 MST","profile":"mini1","startTime":"Wed, 03 Feb 2021 15:30:33 MST","user":"user1"},"datacontenttype":"application/json","id":"9b7593cb-fbec-49e5-a3ce-bdc2d0bfb208","source":"https://minikube.sigs.k8s.io/","specversion":"1.0","type":"io.k8s.si gs.minikube.audit"} + s := `{"data":{"args":"-p mini1","command":"start","endTime":"Wed, 03 Feb 2021 15:33:05 MST","profile":"mini1","startTime":"Wed, 03 Feb 2021 15:30:33 MST","user":"user1"},"datacontenttype":"application/json","id":"9b7593cb-fbec-49e5-a3ce-bdc2d0bfb208","source":"https://minikube.sigs.k8s.io/","specversion":"1.0","type":"io.k8s.sigs.minikube.audit"} +{"data":{"args":"-p mini1","command":"start","endTime":"Wed, 03 Feb 2021 15:33:05 MST","profile":"mini1","startTime":"Wed, 03 Feb 2021 15:30:33 MST","user":"user1"},"datacontenttype":"application/json","id":"9b7593cb-fbec-49e5-a3ce-bdc2d0bfb208","source":"https://minikube.sigs.k8s.io/","specversion":"1.0","type":"io.k8s.sigs.minikube.audit"} {"data":{"args":"--user user2","command":"logs","endTime":"Tue, 02 Feb 2021 16:46:20 MST","profile":"minikube","startTime":"Tue, 02 Feb 2021 16:46:00 MST","user":"user2"},"datacontenttype":"application/json","id":"fec03227-2484-48b6-880a-88fd010b5efd","source":"https://minikube.sigs.k8s.io/","specversion":"1.0","type":"io.k8s.sigs.minikube.audit"} ` From 6a53bcd2af2c03c5ce375c627d09afe068e53e96 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Tue, 2 Aug 2022 21:52:25 +0000 Subject: [PATCH 350/545] Update leaderboard --- .../en/docs/contrib/leaderboard/v1.26.1.html | 487 ++++++++++++++++++ 1 file changed, 487 insertions(+) create mode 100644 site/content/en/docs/contrib/leaderboard/v1.26.1.html diff --git a/site/content/en/docs/contrib/leaderboard/v1.26.1.html b/site/content/en/docs/contrib/leaderboard/v1.26.1.html new file mode 100644 index 0000000000..cf158af72d --- /dev/null +++ b/site/content/en/docs/contrib/leaderboard/v1.26.1.html @@ -0,0 +1,487 @@ +--- +title: "v1.26.1 - 2022-08-02" +linkTitle: "v1.26.1 - 2022-08-02" +weight: -107 +--- + + + kubernetes/minikube - Leaderboard + + + + + + + + +

kubernetes/minikube

+
2022-06-22 — 2022-08-02
+ + +

Reviewers

+ + +
+

Most Influential

+

# of Merged PRs reviewed

+
+ +
+ +
+

Most Helpful

+

# of words written in merged PRs

+
+ +
+ +
+

Most Demanding

+

# of Review Comments in merged PRs

+
+ +
+ + +

Pull Requests

+ + +
+

Most Active

+

# of Pull Requests Merged

+
+ +
+ +
+

Big Movers

+

Lines of code (delta)

+
+ +
+ +
+

Most difficult to review

+

Average PR size (added+changed)

+
+ +
+ + +

Issues

+ + +
+

Most Active

+

# of comments

+
+ +
+ +
+

Most Helpful

+

# of words (excludes authored)

+
+ +
+ +
+

Top Closers

+

# of issues closed (excludes authored)

+
+ +
+ + + + From 0b83375616a1dc080ed108734e32a957a0d123a6 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Tue, 2 Aug 2022 15:16:13 -0700 Subject: [PATCH 351/545] Update releases.json & releases-v2.json to include v1.26.1 --- deploy/minikube/releases-v2.json | 26 ++++++++++++++++++++++++++ deploy/minikube/releases.json | 8 ++++++++ 2 files changed, 34 insertions(+) diff --git a/deploy/minikube/releases-v2.json b/deploy/minikube/releases-v2.json index a26c0d93da..c1222b6d12 100644 --- a/deploy/minikube/releases-v2.json +++ b/deploy/minikube/releases-v2.json @@ -1,4 +1,30 @@ [ + { + "checksums": { + "amd64": { + "darwin": "57578517edec2fcf8425b47ef9535c56c1b7c0f383b4d676ebf3787076ac4ede", + "linux": "9acd25706661b932ee98063147e58080cb949b92fd0d97b3b96dc5f898dcad21", + "windows": "9c9934a396acdd164e2b2449def5d831aeb1577571b8ac9d922ffe466b0f270e" + }, + "arm": { + "linux": "6aa8bdb2b0eb7a1c306907cf5941d9d1e7d3cd623471b859c1da81cea2cd189d" + }, + "arm64": { + "darwin": "61b0543ee7a27b48992517df17ce7a56ad687762210f55112c7f2eb8a0e55655", + "linux": "419f65fb0dc1045a07943192f11f6fc91858ee576b4f9ddb0be5b3f637e36ab0" + }, + "ppc64le": { + "linux": "a87b01d9776b5e2f941d3bf9a8dbe9ccde12c154eff89494eb579346bbb4343b" + }, + "s390x": { + "linux": "b655a3ad176746260dc937974c179477487bac45c5adfa046612d50691530e99" + }, + "darwin": "57578517edec2fcf8425b47ef9535c56c1b7c0f383b4d676ebf3787076ac4ede", + "linux": "9acd25706661b932ee98063147e58080cb949b92fd0d97b3b96dc5f898dcad21", + "windows": "9c9934a396acdd164e2b2449def5d831aeb1577571b8ac9d922ffe466b0f270e" + }, + "name": "v1.26.1" + }, { "checksums": { "amd64": { diff --git a/deploy/minikube/releases.json b/deploy/minikube/releases.json index 994b9beb08..520902a5d0 100644 --- a/deploy/minikube/releases.json +++ b/deploy/minikube/releases.json @@ -1,4 +1,12 @@ [ + { + "checksums": { + "darwin": "57578517edec2fcf8425b47ef9535c56c1b7c0f383b4d676ebf3787076ac4ede", + "linux": "9acd25706661b932ee98063147e58080cb949b92fd0d97b3b96dc5f898dcad21", + "windows": "9c9934a396acdd164e2b2449def5d831aeb1577571b8ac9d922ffe466b0f270e" + }, + "name": "v1.26.1" + }, { "checksums": { "darwin": "cdfbbbdd01de8e8819d7d917f155c7a7cc6236af1ac97c4ae6f3ff9252b150b7", From ac79ca2299263a7451a3d8014a353a48c1436bd2 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Tue, 2 Aug 2022 22:47:25 +0000 Subject: [PATCH 352/545] add time-to-k8s benchmark for v1.26.1 --- .../en/docs/benchmarks/timeToK8s/v1.26.1.md | 27 ++++++++++++++++++ .../benchmarks/timeToK8s/v1.26.1-cpu.png | Bin 0 -> 28243 bytes .../benchmarks/timeToK8s/v1.26.1-time.png | Bin 0 -> 35425 bytes 3 files changed, 27 insertions(+) create mode 100644 site/content/en/docs/benchmarks/timeToK8s/v1.26.1.md create mode 100644 site/static/images/benchmarks/timeToK8s/v1.26.1-cpu.png create mode 100644 site/static/images/benchmarks/timeToK8s/v1.26.1-time.png diff --git a/site/content/en/docs/benchmarks/timeToK8s/v1.26.1.md b/site/content/en/docs/benchmarks/timeToK8s/v1.26.1.md new file mode 100644 index 0000000000..d36e95f5bb --- /dev/null +++ b/site/content/en/docs/benchmarks/timeToK8s/v1.26.1.md @@ -0,0 +1,27 @@ +--- +title: "v1.26.1 Benchmark" +linkTitle: "v1.26.1 Benchmark" +weight: -20220802 +--- + +![time-to-k8s](/images/benchmarks/timeToK8s/v1.26.1-time.png) + +| | minikube version: v1.26.1 | kind v0.14.0 go1.18.2 linux/amd64 | k3d version v5.4.4 | +|----------------------|---------------------------|-----------------------------------|--------------------| +| Command Exec | 29.525 | 20.986 | 14.700 | +| API Server Answering | 0.066 | 0.117 | 0.126 | +| Kubernetes SVC | 0.058 | 0.059 | 0.059 | +| DNS SVC | 0.057 | 0.059 | 0.058 | +| App Running | 14.905 | 23.783 | 16.163 | +| DNS Answering | 12.223 | 1.625 | 2.137 | +| Total | 56.833 | 46.629 | 33.243 | + + + +![cpu-to-k8s](/images/benchmarks/timeToK8s/v1.26.1-cpu.png) + +| | minikube version: v1.26.1 | kind v0.14.0 go1.18.2 linux/amd64 | k3d version v5.4.4 | +|--------------------|---------------------------|-----------------------------------|--------------------| +| CPU Utilization(%) | 38.185 | 47.531 | 51.124 | +| CPU Time(seconds) | 20.193 | 22.145 | 17.035 | + diff --git a/site/static/images/benchmarks/timeToK8s/v1.26.1-cpu.png b/site/static/images/benchmarks/timeToK8s/v1.26.1-cpu.png new file mode 100644 index 0000000000000000000000000000000000000000..eb876531843aeec58b37b7fcfffb2eb0a2aba3e7 GIT binary patch literal 28243 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 M<`!m`P3?XE4<2SmH2?qr literal 0 HcmV?d00001 From 37991c5f3c5a74de5e2a4f6c6378ba585764e1d3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 2 Aug 2022 22:53:57 +0000 Subject: [PATCH 353/545] Bump go.opentelemetry.io/otel/trace from 1.8.0 to 1.9.0 Bumps [go.opentelemetry.io/otel/trace](https://github.com/open-telemetry/opentelemetry-go) from 1.8.0 to 1.9.0. - [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.8.0...v1.9.0) --- updated-dependencies: - dependency-name: go.opentelemetry.io/otel/trace dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 692ee17406..0e016e8304 100644 --- a/go.mod +++ b/go.mod @@ -67,9 +67,9 @@ require ( github.com/spf13/viper v1.12.0 github.com/zchee/go-vmnet v0.0.0-20161021174912-97ebf9174097 go.opencensus.io v0.23.0 - go.opentelemetry.io/otel v1.8.0 + go.opentelemetry.io/otel v1.9.0 go.opentelemetry.io/otel/sdk v1.8.0 - go.opentelemetry.io/otel/trace v1.8.0 + go.opentelemetry.io/otel/trace v1.9.0 golang.org/x/build v0.0.0-20190927031335-2835ba2e683f golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4 golang.org/x/exp v0.0.0-20210220032938-85be41e4509f diff --git a/go.sum b/go.sum index 2dc6abe1b2..8b6260c9f8 100644 --- a/go.sum +++ b/go.sum @@ -1447,8 +1447,8 @@ go.opentelemetry.io/contrib v0.20.0/go.mod h1:G/EtFaa6qaN7+LxqfIAT3GiZa7Wv5DTBUz go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.20.0/go.mod h1:2AboqHi0CiIZU0qwhtUfCYD1GeUzvvIXWNkhDt7ZMG4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.32.0 h1:mac9BKRqwaX6zxHPDe3pvmWpwuuIM0vuXv2juCnQevE= go.opentelemetry.io/otel v0.20.0/go.mod h1:Y3ugLH2oa81t5QO+Lty+zXf8zC9L26ax4Nzoxm/dooo= -go.opentelemetry.io/otel v1.8.0 h1:zcvBFizPbpa1q7FehvFiHbQwGzmPILebO0tyqIR5Djg= -go.opentelemetry.io/otel v1.8.0/go.mod h1:2pkj+iMj0o03Y+cW6/m8Y4WkRdYN3AvCXCnzRMp9yvM= +go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= +go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= go.opentelemetry.io/otel/exporters/otlp v0.20.0/go.mod h1:YIieizyaN77rtLJra0buKiNBOm9XQfkPEKBeuhoMwAM= go.opentelemetry.io/otel/metric v0.20.0/go.mod h1:598I5tYlH1vzBjn+BTuhzTCSb/9debfNp6R3s7Pr1eU= go.opentelemetry.io/otel/metric v0.30.0 h1:Hs8eQZ8aQgs0U49diZoaS6Uaxw3+bBE3lcMUKBFIk3c= @@ -1459,8 +1459,8 @@ go.opentelemetry.io/otel/sdk v1.8.0/go.mod h1:uPSfc+yfDH2StDM/Rm35WE8gXSNdvCg023 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.8.0 h1:cSy0DF9eGI5WIfNwZ1q2iUyGj00tGzP24dE1lOlHrfY= -go.opentelemetry.io/otel/trace v1.8.0/go.mod h1:0Bt3PXY8w+3pheS3hQUt+wow8b1ojPaTBoTCh2zIFI4= +go.opentelemetry.io/otel/trace v1.9.0 h1:oZaCNJUjWcg60VXWee8lJKlqhPbXAPB51URuR47pQYc= +go.opentelemetry.io/otel/trace v1.9.0/go.mod h1:2737Q0MuG8q1uILYm2YYVkAyLtOofiTNGg6VODnOiPo= 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 d74245fed1470981dfc2983885a13a4aaf083967 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 2 Aug 2022 22:54:18 +0000 Subject: [PATCH 354/545] Bump google.golang.org/api from 0.88.0 to 0.91.0 Bumps [google.golang.org/api](https://github.com/googleapis/google-api-go-client) from 0.88.0 to 0.91.0. - [Release notes](https://github.com/googleapis/google-api-go-client/releases) - [Changelog](https://github.com/googleapis/google-api-go-client/blob/main/CHANGES.md) - [Commits](https://github.com/googleapis/google-api-go-client/compare/v0.88.0...v0.91.0) --- updated-dependencies: - dependency-name: google.golang.org/api dependency-type: direct:production update-type: version-update:semver-minor ... 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 692ee17406..ee0599d59c 100644 --- a/go.mod +++ b/go.mod @@ -80,7 +80,7 @@ require ( golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 golang.org/x/text v0.3.7 gonum.org/v1/plot v0.11.0 - google.golang.org/api v0.88.0 + google.golang.org/api v0.91.0 gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 // indirect gopkg.in/yaml.v2 v2.4.0 k8s.io/api v0.24.3 diff --git a/go.sum b/go.sum index 2dc6abe1b2..ddf0a62124 100644 --- a/go.sum +++ b/go.sum @@ -2005,8 +2005,8 @@ google.golang.org/api v0.75.0/go.mod h1:pU9QmyHLnzlpar1Mjt4IbapUCy8J+6HD6GeELN69 google.golang.org/api v0.78.0/go.mod h1:1Sg78yoMLOhlQTeF+ARBoytAcH1NNyyl390YMy6rKmw= google.golang.org/api v0.80.0/go.mod h1:xY3nI94gbvBrE0J6NHXhxOmW97HG7Khjkku6AFB3Hyg= google.golang.org/api v0.84.0/go.mod h1:NTsGnUFJMYROtiquksZHBWtHfeMC7iYthki7Eq3pa8o= -google.golang.org/api v0.88.0 h1:MPwxQRqpyskYhr2iNyfsQ8R06eeyhe7UEuR30p136ZQ= -google.golang.org/api v0.88.0/go.mod h1:+Sem1dnrKlrXMR/X0bPnMWyluQe4RsNoYfmNLhOIkzw= +google.golang.org/api v0.91.0 h1:731+JzuwaJoZXRQGmPoBiV+SrsAfUaIkdMCWTcQNPyA= +google.golang.org/api v0.91.0/go.mod h1:+Sem1dnrKlrXMR/X0bPnMWyluQe4RsNoYfmNLhOIkzw= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= From 19a6c56dd3351c6c0374bbf2d2d4ef720ca96002 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 2 Aug 2022 22:54:21 +0000 Subject: [PATCH 355/545] 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.8.3 to 1.8.4. - [Release notes](https://github.com/GoogleCloudPlatform/opentelemetry-operations-go/releases) - [Commits](https://github.com/GoogleCloudPlatform/opentelemetry-operations-go/compare/exporter/trace/v1.8.3...exporter/trace/v1.8.4) --- updated-dependencies: - dependency-name: github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 4 ++-- go.sum | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/go.mod b/go.mod index 692ee17406..86602ad8c7 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ require ( contrib.go.opencensus.io/exporter/stackdriver v0.13.12 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.8.3 + github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.8.4 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 @@ -112,7 +112,7 @@ require ( 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/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.32.3 // indirect + github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.32.4 // indirect github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd // indirect github.com/Microsoft/go-winio v0.5.2 // indirect github.com/PuerkitoBio/purell v1.1.1 // indirect diff --git a/go.sum b/go.sum index 2dc6abe1b2..e8a56b5c65 100644 --- a/go.sum +++ b/go.sum @@ -121,10 +121,10 @@ github.com/Delta456/box-cli-maker/v2 v2.2.2/go.mod h1:idItIMZeyx3bg73XwSgsLeZd+g github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24/go.mod h1:4UJr5HIiMZrwgkSPdsjy2uOQExX/WEILpIrO9UPGuXs= 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.8.3 h1:i84ZOPT35YCJROyuf97VP/VEdYhQce/8NTLOWq5tqJw= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.8.3/go.mod h1:3+qm+VCJbVmQ9uscVz+8h1rRkJEy9ZNFGgpT1XB9mPg= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.32.3 h1:FhsH8qgWFkkPlPXBZ68uuT/FH/R+DLTtVPxjLEBs1v4= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.32.3/go.mod h1:9a+Opaevo9fybhUvQkEG7fR6Zk7pYrW/s9NC4fODFIQ= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.8.4 h1:UlCxYSeY3a8FYR2Ni8SC8vxcb2MCTwBN8yDoy0AVGGU= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.8.4/go.mod h1:d4ODYSOkLoLTyUyic8etLjC7Kzy13ZO2R+kdVi9ImQg= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.32.4 h1:ZuSnzmTHyLCDJxeq5h785t8VcbRDX40+e5iVTSE4Y3Q= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.32.4/go.mod h1:0NODlmSHucFiEW4hSANp07vax2tfiCdf9Zv4KuMc/4w= 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/Masterminds/goutils v1.1.0/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU= @@ -478,7 +478,7 @@ github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w= github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= github.com/fatih/structtag v1.2.0/go.mod h1:mBJUNpUnHmRKrKlQQlmCrh5PuhftFbNv8Ys4/aAZl94= 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.3 h1:s/nj+GCswXYzN5v2DpNMuMQYe+0DDwt5WVCU6CWBdXk= 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= @@ -1445,13 +1445,13 @@ 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.32.0 h1:mac9BKRqwaX6zxHPDe3pvmWpwuuIM0vuXv2juCnQevE= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.33.0 h1:Z0lVKLXU+jxGf3ANoh+UWx9Ai5bjpQVnZXI1zEzvqS0= go.opentelemetry.io/otel v0.20.0/go.mod h1:Y3ugLH2oa81t5QO+Lty+zXf8zC9L26ax4Nzoxm/dooo= go.opentelemetry.io/otel v1.8.0 h1:zcvBFizPbpa1q7FehvFiHbQwGzmPILebO0tyqIR5Djg= go.opentelemetry.io/otel v1.8.0/go.mod h1:2pkj+iMj0o03Y+cW6/m8Y4WkRdYN3AvCXCnzRMp9yvM= go.opentelemetry.io/otel/exporters/otlp v0.20.0/go.mod h1:YIieizyaN77rtLJra0buKiNBOm9XQfkPEKBeuhoMwAM= go.opentelemetry.io/otel/metric v0.20.0/go.mod h1:598I5tYlH1vzBjn+BTuhzTCSb/9debfNp6R3s7Pr1eU= -go.opentelemetry.io/otel/metric v0.30.0 h1:Hs8eQZ8aQgs0U49diZoaS6Uaxw3+bBE3lcMUKBFIk3c= +go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs= 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.8.0 h1:xwu69/fNuwbSHWe/0PGS888RmjWY181OmcXDQKu7ZQk= From 68115df5803991e11880e3d91ce7369d45615872 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Tue, 2 Aug 2022 17:03:00 -0700 Subject: [PATCH 356/545] stop setting CustomAddonImages with default images --- pkg/minikube/assets/addons.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkg/minikube/assets/addons.go b/pkg/minikube/assets/addons.go index f23d6dd65e..e75795c418 100755 --- a/pkg/minikube/assets/addons.go +++ b/pkg/minikube/assets/addons.go @@ -785,8 +785,6 @@ func SelectAndPersistImages(addon *Addon, cc *config.ClusterConfig) (images, cus } // Use newly configured custom images. images = overrideDefaults(addonDefaultImages, newImages) - // Store custom addon images to be written. - cc.CustomAddonImages = mergeMaps(cc.CustomAddonImages, images) } // Use previously configured custom registries. From a910d73feaa1c7bf7a42dc0bf79c27a15a8f7035 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Tue, 2 Aug 2022 17:06:52 -0700 Subject: [PATCH 357/545] add QEMU to driver liset --- gui/advancedview.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gui/advancedview.cpp b/gui/advancedview.cpp index 38921decfe..e39d6d03c0 100644 --- a/gui/advancedview.cpp +++ b/gui/advancedview.cpp @@ -220,9 +220,9 @@ void AdvancedView::askCustom() QComboBox *driverComboBox = new QComboBox; driverComboBox->addItems({ "docker", "virtualbox", "vmware", "podman" }); #if __linux__ - driverComboBox->addItem("kvm2"); + driverComboBox->addItems({ "kvm2", "qemu" }); #elif __APPLE__ - driverComboBox->addItems({ "hyperkit", "parallels" }); + driverComboBox->addItems({ "hyperkit", "qemu", "parallels" }); #else driverComboBox->addItem("hyperv"); #endif From f213b25ef2c50313bf315c8dc12a86635fec6a91 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Tue, 2 Aug 2022 17:26:50 -0700 Subject: [PATCH 358/545] update Ubuntu --- deploy/kicbase/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/kicbase/Dockerfile b/deploy/kicbase/Dockerfile index d3fe55d701..e5e66fbe7d 100644 --- a/deploy/kicbase/Dockerfile +++ b/deploy/kicbase/Dockerfile @@ -36,7 +36,7 @@ RUN if [ "$PREBUILT_AUTO_PAUSE" != "true" ]; then cd ./cmd/auto-pause/ && go bui # start from ubuntu 20.04, this image is reasonably small as a starting point # for a kubernetes node image, it doesn't contain much we don't need -FROM ubuntu:focal-20220531 as kicbase +FROM ubuntu:focal-20220801 as kicbase ARG BUILDKIT_VERSION="v0.10.3" ARG FUSE_OVERLAYFS_VERSION="v1.7.1" From f7c2aa7b61a4a12a3d7f116d21901e1482144073 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 3 Aug 2022 00:48:05 +0000 Subject: [PATCH 359/545] Bump go.opentelemetry.io/otel/sdk from 1.8.0 to 1.9.0 Bumps [go.opentelemetry.io/otel/sdk](https://github.com/open-telemetry/opentelemetry-go) from 1.8.0 to 1.9.0. - [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.8.0...v1.9.0) --- updated-dependencies: - dependency-name: go.opentelemetry.io/otel/sdk dependency-type: direct:production update-type: version-update:semver-minor ... 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 9da550f42e..8edf03113f 100644 --- a/go.mod +++ b/go.mod @@ -68,7 +68,7 @@ require ( github.com/zchee/go-vmnet v0.0.0-20161021174912-97ebf9174097 go.opencensus.io v0.23.0 go.opentelemetry.io/otel v1.9.0 - go.opentelemetry.io/otel/sdk v1.8.0 + go.opentelemetry.io/otel/sdk v1.9.0 go.opentelemetry.io/otel/trace v1.9.0 golang.org/x/build v0.0.0-20190927031335-2835ba2e683f golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4 diff --git a/go.sum b/go.sum index aeade7725d..47f26cc351 100644 --- a/go.sum +++ b/go.sum @@ -1454,8 +1454,8 @@ go.opentelemetry.io/otel/metric v0.20.0/go.mod h1:598I5tYlH1vzBjn+BTuhzTCSb/9deb go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs= 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.8.0 h1:xwu69/fNuwbSHWe/0PGS888RmjWY181OmcXDQKu7ZQk= -go.opentelemetry.io/otel/sdk v1.8.0/go.mod h1:uPSfc+yfDH2StDM/Rm35WE8gXSNdvCg023J6HeGNO0c= +go.opentelemetry.io/otel/sdk v1.9.0 h1:LNXp1vrr83fNXTHgU8eO89mhzxb/bbWAsHG6fNf3qWo= +go.opentelemetry.io/otel/sdk v1.9.0/go.mod h1:AEZc8nt5bd2F7BC24J5R0mrjYnpEgYHyTcM/vrSple4= 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= From 0d2d7fbfb5e7a8351c2eae06052d361709b3f4e0 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Wed, 3 Aug 2022 00:53:10 +0000 Subject: [PATCH 360/545] Updating kicbase image to v0.0.33-1659486857-14721 --- pkg/drivers/kic/types.go | 8 ++++---- site/content/en/docs/commands/start.md | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/drivers/kic/types.go b/pkg/drivers/kic/types.go index c73b2f1c2a..934090974b 100644 --- a/pkg/drivers/kic/types.go +++ b/pkg/drivers/kic/types.go @@ -24,13 +24,13 @@ import ( const ( // Version is the current version of kic - Version = "v0.0.33" + Version = "v0.0.33-1659486857-14721" // SHA of the kic base image - baseImageSHA = "73b259e144d926189cf169ae5b46bbec4e08e4e2f2bd87296054c3244f70feb8" + baseImageSHA = "98c8007234ca882b63abc707dc184c585fcb5372828b49a4b639961324d291b3" // The name of the GCR kicbase repository - gcrRepo = "gcr.io/k8s-minikube/kicbase" + gcrRepo = "gcr.io/k8s-minikube/kicbase-builds" // The name of the Dockerhub kicbase repository - dockerhubRepo = "docker.io/kicbase/stable" + dockerhubRepo = "docker.io/kicbase/build" ) var ( diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index 99961a337c..9af1f124f3 100644 --- a/site/content/en/docs/commands/start.md +++ b/site/content/en/docs/commands/start.md @@ -26,7 +26,7 @@ minikube start [flags] --apiserver-names strings A set of apiserver names which are used in the generated certificate for kubernetes. This can be used if you want to make the apiserver available from outside the machine --apiserver-port int The apiserver listening port (default 8443) --auto-update-drivers If set, automatically updates drivers to the latest version. Defaults to true. (default true) - --base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase:v0.0.33@sha256:73b259e144d926189cf169ae5b46bbec4e08e4e2f2bd87296054c3244f70feb8") + --base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase-builds:v0.0.33-1659486857-14721@sha256:98c8007234ca882b63abc707dc184c585fcb5372828b49a4b639961324d291b3") --binary-mirror string Location to fetch kubectl, kubelet, & kubeadm binaries from. --cache-images If true, cache docker images for the current bootstrapper and load them into the machine. Always false with --driver=none. (default true) --cert-expiration duration Duration until minikube certificate expiration, defaults to three years (26280h). (default 26280h0m0s) From d130ed8e2be0f7322ce248a4d49e38eede8717c8 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Wed, 3 Aug 2022 10:12:42 -0700 Subject: [PATCH 361/545] only store custom images --- pkg/minikube/assets/addons.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkg/minikube/assets/addons.go b/pkg/minikube/assets/addons.go index e75795c418..10df1c7c80 100755 --- a/pkg/minikube/assets/addons.go +++ b/pkg/minikube/assets/addons.go @@ -785,6 +785,8 @@ func SelectAndPersistImages(addon *Addon, cc *config.ClusterConfig) (images, cus } // Use newly configured custom images. images = overrideDefaults(addonDefaultImages, newImages) + // Store custom addon images to be written. + cc.CustomAddonImages = mergeMaps(cc.CustomAddonImages, newImages) } // Use previously configured custom registries. From 5abe3b51e070d70797e779e5c495e579e70a773a Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Wed, 3 Aug 2022 12:45:46 -0700 Subject: [PATCH 362/545] change reload to restart & tooltip --- gui/advancedview.cpp | 7 ++++++- gui/basicview.cpp | 7 ++++++- gui/tray.cpp | 2 +- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/gui/advancedview.cpp b/gui/advancedview.cpp index e39d6d03c0..26d555a2a2 100644 --- a/gui/advancedview.cpp +++ b/gui/advancedview.cpp @@ -97,7 +97,7 @@ static QString getPauseLabel(bool isPaused) static QString getStartLabel(bool isRunning) { if (isRunning) { - return "Reload"; + return "Restart"; } return "Start"; } @@ -124,6 +124,11 @@ void AdvancedView::update(Cluster cluster) #endif pauseButton->setText(getPauseLabel(isPaused)); startButton->setText(getStartLabel(isRunning)); + QString startToolTip = ""; + if (isRunning) { + startToolTip = "Restart the Kubernetes API"; + } + startButton->setToolTip(startToolTip); } void AdvancedView::setSelectedClusterName(QString cluster) diff --git a/gui/basicview.cpp b/gui/basicview.cpp index 52ba216289..56432b6aae 100644 --- a/gui/basicview.cpp +++ b/gui/basicview.cpp @@ -56,7 +56,7 @@ static QString getPauseLabel(bool isPaused) static QString getStartLabel(bool isRunning) { if (isRunning) { - return "Reload"; + return "Restart"; } return "Start"; } @@ -82,6 +82,11 @@ void BasicView::update(Cluster cluster) #endif pauseButton->setText(getPauseLabel(isPaused)); startButton->setText(getStartLabel(isRunning)); + QString startToolTip = ""; + if (isRunning) { + startToolTip = "Restart the Kubernetes API"; + } + startButton->setToolTip(startToolTip); } void BasicView::disableButtons() diff --git a/gui/tray.cpp b/gui/tray.cpp index d8c3e3d914..6fb2bfbc9f 100644 --- a/gui/tray.cpp +++ b/gui/tray.cpp @@ -92,7 +92,7 @@ static QString getPauseLabel(bool isPaused) static QString getStartLabel(bool isRunning) { if (isRunning) { - return "Reload"; + return "Restart"; } return "Start"; } From a4b3404fa64edc429bcb6ab2f6e9108384d66bbd Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Wed, 3 Aug 2022 12:59:46 -0700 Subject: [PATCH 363/545] change tooll tip wording --- gui/advancedview.cpp | 2 +- gui/basicview.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gui/advancedview.cpp b/gui/advancedview.cpp index 26d555a2a2..cdc07596b2 100644 --- a/gui/advancedview.cpp +++ b/gui/advancedview.cpp @@ -126,7 +126,7 @@ void AdvancedView::update(Cluster cluster) startButton->setText(getStartLabel(isRunning)); QString startToolTip = ""; if (isRunning) { - startToolTip = "Restart the Kubernetes API"; + startToolTip = "Restart an already running minikube instance to pickup config changes."; } startButton->setToolTip(startToolTip); } diff --git a/gui/basicview.cpp b/gui/basicview.cpp index 56432b6aae..1ec400d765 100644 --- a/gui/basicview.cpp +++ b/gui/basicview.cpp @@ -84,7 +84,7 @@ void BasicView::update(Cluster cluster) startButton->setText(getStartLabel(isRunning)); QString startToolTip = ""; if (isRunning) { - startToolTip = "Restart the Kubernetes API"; + startToolTip = "Restart an already running minikube instance to pickup config changes."; } startButton->setToolTip(startToolTip); } From 1941855573f84f46df4c6f588a7ee54fa50f1065 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Wed, 3 Aug 2022 13:28:50 -0700 Subject: [PATCH 364/545] install cri-docker from pre-built binaries --- .github/workflows/master.yml | 21 ++++++++----------- .github/workflows/pr.yml | 21 ++++++++----------- hack/jenkins/linux_integration_tests_none.sh | 21 ++++++++----------- .../cri_dockerd/update_cri_dockerd_version.go | 6 +++--- 4 files changed, 30 insertions(+), 39 deletions(-) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 1695db63bf..265f892bb1 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -513,18 +513,15 @@ jobs: sudo apt-get update -qq sudo apt-get -qq -y install conntrack sudo apt-get -qq -y install socat - CRI_DOCKER_VERSION="0737013d3c48992724283d151e8a2a767a1839e9" - git clone -n https://github.com/Mirantis/cri-dockerd - cd cri-dockerd - git checkout "$CRI_DOCKER_VERSION" - env CGO_ENABLED=0 go build -ldflags '-X github.com/Mirantis/cri-dockerd/version.GitCommit=${CRI_DOCKER_VERSION:0:7}' -o cri-dockerd - cd .. - sudo cp cri-dockerd/cri-dockerd /usr/bin/cri-dockerd - sudo cp cri-dockerd/packaging/systemd/cri-docker.service /usr/lib/systemd/system/cri-docker.service - sudo cp cri-dockerd/packaging/systemd/cri-docker.socket /usr/lib/systemd/system/cri-docker.socket - VERSION="v1.17.0" - curl -L https://github.com/kubernetes-sigs/cri-tools/releases/download/$VERSION/crictl-${VERSION}-linux-amd64.tar.gz --output crictl-${VERSION}-linux-amd64.tar.gz - sudo tar zxvf crictl-$VERSION-linux-amd64.tar.gz -C /usr/local/bin + CRI_DOCKERD_VERSION="0737013d3c48992724283d151e8a2a767a1839e9" + CRI_DOCKERD_BASE_URL="https://storage.googleapis.com/kicbase-artifacts/cri-dockerd/${CRI_DOCKERD_VERSION}" + curl -L "${CRI_DOCKERD_BASE_URL}/amd64/cri-dockerd" -o /usr/bin/cri-dockerd + curl -L "${CRI_DOCKERD_BASE_URL}/cri-docker.socket" -o /usr/lib/systemd/system/cri-docker.socket + curl -L "${CRI_DOCKERD_BASE_URL}/cri-docker.service" -o /usr/lib/systemd/system/cri-docker.service + chmod +x /usr/bin/cri-dockerd + CRICTL_VERSION="v1.17.0" + curl -L https://github.com/kubernetes-sigs/cri-tools/releases/download/$CRICTL_VERSION/crictl-${CRICTL_VERSION}-linux-amd64.tar.gz --output crictl-${CRICTL_VERSION}-linux-amd64.tar.gz + sudo tar zxvf crictl-$CRICTL_VERSION-linux-amd64.tar.gz -C /usr/local/bin - name: Install gopogh shell: bash diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 38afb2d132..d2e6581545 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -514,18 +514,15 @@ jobs: sudo apt-get update -qq sudo apt-get -qq -y install conntrack sudo apt-get -qq -y install socat - CRI_DOCKER_VERSION="0737013d3c48992724283d151e8a2a767a1839e9" - git clone -n https://github.com/Mirantis/cri-dockerd - cd cri-dockerd - git checkout "$CRI_DOCKER_VERSION" - env CGO_ENABLED=0 go build -ldflags '-X github.com/Mirantis/cri-dockerd/version.GitCommit=${CRI_DOCKER_VERSION:0:7}' -o cri-dockerd - cd .. - sudo cp cri-dockerd/cri-dockerd /usr/bin/cri-dockerd - sudo cp cri-dockerd/packaging/systemd/cri-docker.service /usr/lib/systemd/system/cri-docker.service - sudo cp cri-dockerd/packaging/systemd/cri-docker.socket /usr/lib/systemd/system/cri-docker.socket - VERSION="v1.17.0" - curl -L https://github.com/kubernetes-sigs/cri-tools/releases/download/$VERSION/crictl-${VERSION}-linux-amd64.tar.gz --output crictl-${VERSION}-linux-amd64.tar.gz - sudo tar zxvf crictl-$VERSION-linux-amd64.tar.gz -C /usr/local/bin + CRI_DOCKERD_VERSION="0737013d3c48992724283d151e8a2a767a1839e9" + CRI_DOCKERD_BASE_URL="https://storage.googleapis.com/kicbase-artifacts/cri-dockerd/${CRI_DOCKERD_VERSION}" + curl -L "${CRI_DOCKERD_BASE_URL}/amd64/cri-dockerd" -o /usr/bin/cri-dockerd + curl -L "${CRI_DOCKERD_BASE_URL}/cri-docker.socket" -o /usr/lib/systemd/system/cri-docker.socket + curl -L "${CRI_DOCKERD_BASE_URL}/cri-docker.service" -o /usr/lib/systemd/system/cri-docker.service + chmod +x /usr/bin/cri-dockerd + CRICTL_VERSION="v1.17.0" + curl -L https://github.com/kubernetes-sigs/cri-tools/releases/download/$CRICTL_VERSION/crictl-${CRICTL_VERSION}-linux-amd64.tar.gz --output crictl-${CRICTL_VERSION}-linux-amd64.tar.gz + sudo tar zxvf crictl-$CRICTL_VERSION-linux-amd64.tar.gz -C /usr/local/bin - name: Install gopogh shell: bash diff --git a/hack/jenkins/linux_integration_tests_none.sh b/hack/jenkins/linux_integration_tests_none.sh index fbcaedc1bc..7f0afacdcb 100755 --- a/hack/jenkins/linux_integration_tests_none.sh +++ b/hack/jenkins/linux_integration_tests_none.sh @@ -72,23 +72,20 @@ fi # cri-dockerd is required for Kubernetes 1.24 and higher for none driver if ! cri-dockerd --version &>/dev/null; then echo "WARNING: cri-dockerd is not installed. will try to install." - CRI_DOCKER_VERSION="0737013d3c48992724283d151e8a2a767a1839e9" - git clone -n https://github.com/Mirantis/cri-dockerd - cd cri-dockerd - git checkout "$CRI_DOCKER_VERSION" - env CGO_ENABLED=0 go build -ldflags '-X github.com/Mirantis/cri-dockerd/version.GitCommit=${CRI_DOCKER_VERSION:0:7}' -o cri-dockerd - cd .. - sudo cp cri-dockerd/cri-dockerd /usr/bin/cri-dockerd - sudo cp cri-dockerd/packaging/systemd/cri-docker.service /usr/lib/systemd/system/cri-docker.service - sudo cp cri-dockerd/packaging/systemd/cri-docker.socket /usr/lib/systemd/system/cri-docker.socket + CRI_DOCKERD_VERSION="0737013d3c48992724283d151e8a2a767a1839e9" + CRI_DOCKERD_BASE_URL="https://storage.googleapis.com/kicbase-artifacts/cri-dockerd/${CRI_DOCKERD_VERSION}" + curl -L "${CRI_DOCKERD_BASE_URL}/amd64/cri-dockerd" -o /usr/bin/cri-dockerd + curl -L "${CRI_DOCKERD_BASE_URL}/cri-docker.socket" -o /usr/lib/systemd/system/cri-docker.socket + curl -L "${CRI_DOCKERD_BASE_URL}/cri-docker.service" -o /usr/lib/systemd/system/cri-docker.service + chmod +x /usr/bin/cri-dockerd fi # crictl is required for Kubernetes 1.24 and higher for none driver if ! crictl &>/dev/null; then echo "WARNING: crictl is not installed. will try to install." - VERSION="v1.17.0" - curl -L https://github.com/kubernetes-sigs/cri-tools/releases/download/$VERSION/crictl-${VERSION}-linux-amd64.tar.gz --output crictl-${VERSION}-linux-amd64.tar.gz - sudo tar zxvf crictl-$VERSION-linux-amd64.tar.gz -C /usr/local/bin + CRICTL_VERSION="v1.17.0" + curl -L https://github.com/kubernetes-sigs/cri-tools/releases/download/$CRICTL_VERSION/crictl-${CRICTL_VERSION}-linux-amd64.tar.gz --output crictl-${CRICTL_VERSION}-linux-amd64.tar.gz + sudo tar zxvf crictl-$CRICTL_VERSION-linux-amd64.tar.gz -C /usr/local/bin fi # We need this for reasons now diff --git a/hack/update/cri_dockerd/update_cri_dockerd_version.go b/hack/update/cri_dockerd/update_cri_dockerd_version.go index a8ea5fc9c4..a6f16c44bb 100644 --- a/hack/update/cri_dockerd/update_cri_dockerd_version.go +++ b/hack/update/cri_dockerd/update_cri_dockerd_version.go @@ -29,17 +29,17 @@ var ( schema = map[string]update.Item{ ".github/workflows/master.yml": { Replace: map[string]string{ - `CRI_DOCKER_VERSION=".*"`: `CRI_DOCKER_VERSION="{{.FullCommit}}"`, + `CRI_DOCKERD_VERSION=".*"`: `CRI_DOCKERD_VERSION="{{.FullCommit}}"`, }, }, ".github/workflows/pr.yml": { Replace: map[string]string{ - `CRI_DOCKER_VERSION=".*"`: `CRI_DOCKER_VERSION="{{.FullCommit}}"`, + `CRI_DOCKERD_VERSION=".*"`: `CRI_DOCKERD_VERSION="{{.FullCommit}}"`, }, }, "hack/jenkins/linux_integration_tests_none.sh": { Replace: map[string]string{ - `CRI_DOCKER_VERSION=".*"`: `CRI_DOCKER_VERSION="{{.FullCommit}}"`, + `CRI_DOCKERD_VERSION=".*"`: `CRI_DOCKERD_VERSION="{{.FullCommit}}"`, }, }, "deploy/iso/minikube-iso/arch/aarch64/package/cri-dockerd-aarch64/cri-dockerd.mk": { From be711f1d7f00fe7bd4b13196cae4b45ff41c1857 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Wed, 3 Aug 2022 14:11:57 -0700 Subject: [PATCH 365/545] check shas of new archs --- deploy/minikube/release_sanity_test.go | 83 +++++++++++++++++++------- pkg/minikube/notify/notify.go | 4 +- 2 files changed, 62 insertions(+), 25 deletions(-) diff --git a/deploy/minikube/release_sanity_test.go b/deploy/minikube/release_sanity_test.go index 4dd248dae0..761cfd40ee 100644 --- a/deploy/minikube/release_sanity_test.go +++ b/deploy/minikube/release_sanity_test.go @@ -21,7 +21,6 @@ import ( "encoding/hex" "fmt" "io" - "runtime" "testing" retryablehttp "github.com/hashicorp/go-retryablehttp" @@ -46,45 +45,83 @@ func getSHAFromURL(url string) (string, error) { } // TestReleasesJSON checks if all *GA* releases -// enlisted in https://storage.googleapis.com/minikube/releases.json -// are available to download and have correct hashsum +// enlisted in https://storage.googleapis.com/minikube/releases-v2.json +// are available to download and have correct hashsum func TestReleasesJSON(t *testing.T) { releases, err := notify.AllVersionsFromURL(notify.GithubMinikubeReleasesURL) if err != nil { t.Fatalf("Error getting releases.json: %v", err) } - checkReleases(t, releases) + checkReleasesV2(t, releases) } // TestBetaReleasesJSON checks if all *BETA* releases -// enlisted in https://storage.googleapis.com/minikube/releases-beta.json -// are available to download and have correct hashsum +// enlisted in https://storage.googleapis.com/minikube/releases-beta-v2.json +// are available to download and have correct hashsum func TestBetaReleasesJSON(t *testing.T) { releases, err := notify.AllVersionsFromURL(notify.GithubMinikubeBetaReleasesURL) if err != nil { t.Fatalf("Error getting releases-bets.json: %v", err) } - checkReleases(t, releases) + checkReleasesV2(t, releases) } -func checkReleases(t *testing.T, rs notify.Releases) { +func checkReleasesV1(t *testing.T, r notify.Release) { + checksums := map[string]string{ + "darwin": r.Checksums.Darwin, + "linux": r.Checksums.Linux, + "windows": r.Checksums.Windows, + } + for platform, sha := range checksums { + fmt.Printf("Checking SHA for %s.\n", platform) + actualSha, err := getSHAFromURL(util.GetBinaryDownloadURL(r.Name, platform, "amd64")) + if err != nil { + t.Errorf("Error calculating SHA for %s-%s. Error: %v", r.Name, platform, err) + continue + } + if actualSha != sha { + t.Errorf("ERROR: SHA does not match for version %s, platform %s. Expected %s, got %s.", r.Name, platform, sha, actualSha) + continue + } + } +} + +func getSHAMap(c notify.Checksums) map[string]map[string]string { + return map[string]map[string]string{ + "darwin": { + "amd64": c.AMD64.Darwin, + "arm64": c.ARM64.Darwin, + }, + "linux": { + "amd64": c.AMD64.Linux, + "arm": c.ARM.Linux, + "arm64": c.ARM64.Linux, + "ppc64le": c.PPC64LE.Linux, + "s390x": c.S390X.Linux, + }, + "windows": { + "amd64": c.AMD64.Windows, + }, + } +} + +func checkReleasesV2(t *testing.T, rs notify.Releases) { for _, r := range rs.Releases { fmt.Printf("Checking release: %s\n", r.Name) - checksums := map[string]string{ - "darwin": r.Checksums.Darwin, - "linux": r.Checksums.Linux, - "windows": r.Checksums.Windows, - } - for platform, sha := range checksums { - fmt.Printf("Checking SHA for %s.\n", platform) - actualSha, err := getSHAFromURL(util.GetBinaryDownloadURL(r.Name, platform, runtime.GOARCH)) - if err != nil { - t.Errorf("Error calculating SHA for %s-%s. Error: %v", r.Name, platform, err) - continue - } - if actualSha != sha { - t.Errorf("ERROR: SHA does not match for version %s, platform %s. Expected %s, got %s.", r.Name, platform, sha, actualSha) - continue + checkReleasesV1(t, r) + release := getSHAMap(r.Checksums) + for os, archs := range release { + for arch, sha := range archs { + fmt.Printf("Checking SHA for %s-%s.\n", os, arch) + actualSha, err := getSHAFromURL(util.GetBinaryDownloadURL(r.Name, os, arch)) + if err != nil { + t.Errorf("Error calculating SHA for %s-%s-%s. Error: %v", r.Name, os, arch, err) + continue + } + if actualSha != sha { + t.Errorf("ERROR: SHA does not match for version %s, os %s, arch %s. Expected %s, got %s.", r.Name, os, arch, sha, actualSha) + continue + } } } } diff --git a/pkg/minikube/notify/notify.go b/pkg/minikube/notify/notify.go index f3a8912591..7ba97dbe1f 100644 --- a/pkg/minikube/notify/notify.go +++ b/pkg/minikube/notify/notify.go @@ -136,7 +136,7 @@ type operatingSystems struct { Windows string `json:"windows,omitempty"` } -type checksums struct { +type Checksums struct { AMD64 *operatingSystems `json:"amd64,omitempty"` ARM *operatingSystems `json:"arm,omitempty"` ARM64 *operatingSystems `json:"arm64,omitempty"` @@ -146,7 +146,7 @@ type checksums struct { } type Release struct { - Checksums checksums `json:"checksums"` + Checksums Checksums `json:"checksums"` Name string `json:"name"` } From b6dc525d3d37b61776cbc1cbd7aeae457e9d3f1f Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Wed, 3 Aug 2022 14:51:17 -0700 Subject: [PATCH 366/545] sudo commands --- .github/workflows/master.yml | 8 ++++---- .github/workflows/pr.yml | 8 ++++---- hack/jenkins/linux_integration_tests_none.sh | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 265f892bb1..c69e3cc780 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -515,10 +515,10 @@ jobs: sudo apt-get -qq -y install socat CRI_DOCKERD_VERSION="0737013d3c48992724283d151e8a2a767a1839e9" CRI_DOCKERD_BASE_URL="https://storage.googleapis.com/kicbase-artifacts/cri-dockerd/${CRI_DOCKERD_VERSION}" - curl -L "${CRI_DOCKERD_BASE_URL}/amd64/cri-dockerd" -o /usr/bin/cri-dockerd - curl -L "${CRI_DOCKERD_BASE_URL}/cri-docker.socket" -o /usr/lib/systemd/system/cri-docker.socket - curl -L "${CRI_DOCKERD_BASE_URL}/cri-docker.service" -o /usr/lib/systemd/system/cri-docker.service - chmod +x /usr/bin/cri-dockerd + sudo curl -L "${CRI_DOCKERD_BASE_URL}/amd64/cri-dockerd" -o /usr/bin/cri-dockerd + sudo curl -L "${CRI_DOCKERD_BASE_URL}/cri-docker.socket" -o /usr/lib/systemd/system/cri-docker.socket + sudo curl -L "${CRI_DOCKERD_BASE_URL}/cri-docker.service" -o /usr/lib/systemd/system/cri-docker.service + sudo chmod +x /usr/bin/cri-dockerd CRICTL_VERSION="v1.17.0" curl -L https://github.com/kubernetes-sigs/cri-tools/releases/download/$CRICTL_VERSION/crictl-${CRICTL_VERSION}-linux-amd64.tar.gz --output crictl-${CRICTL_VERSION}-linux-amd64.tar.gz sudo tar zxvf crictl-$CRICTL_VERSION-linux-amd64.tar.gz -C /usr/local/bin diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index d2e6581545..860f144c75 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -516,10 +516,10 @@ jobs: sudo apt-get -qq -y install socat CRI_DOCKERD_VERSION="0737013d3c48992724283d151e8a2a767a1839e9" CRI_DOCKERD_BASE_URL="https://storage.googleapis.com/kicbase-artifacts/cri-dockerd/${CRI_DOCKERD_VERSION}" - curl -L "${CRI_DOCKERD_BASE_URL}/amd64/cri-dockerd" -o /usr/bin/cri-dockerd - curl -L "${CRI_DOCKERD_BASE_URL}/cri-docker.socket" -o /usr/lib/systemd/system/cri-docker.socket - curl -L "${CRI_DOCKERD_BASE_URL}/cri-docker.service" -o /usr/lib/systemd/system/cri-docker.service - chmod +x /usr/bin/cri-dockerd + sudo curl -L "${CRI_DOCKERD_BASE_URL}/amd64/cri-dockerd" -o /usr/bin/cri-dockerd + sudo curl -L "${CRI_DOCKERD_BASE_URL}/cri-docker.socket" -o /usr/lib/systemd/system/cri-docker.socket + sudo curl -L "${CRI_DOCKERD_BASE_URL}/cri-docker.service" -o /usr/lib/systemd/system/cri-docker.service + sudo chmod +x /usr/bin/cri-dockerd CRICTL_VERSION="v1.17.0" curl -L https://github.com/kubernetes-sigs/cri-tools/releases/download/$CRICTL_VERSION/crictl-${CRICTL_VERSION}-linux-amd64.tar.gz --output crictl-${CRICTL_VERSION}-linux-amd64.tar.gz sudo tar zxvf crictl-$CRICTL_VERSION-linux-amd64.tar.gz -C /usr/local/bin diff --git a/hack/jenkins/linux_integration_tests_none.sh b/hack/jenkins/linux_integration_tests_none.sh index 7f0afacdcb..5bcba0a125 100755 --- a/hack/jenkins/linux_integration_tests_none.sh +++ b/hack/jenkins/linux_integration_tests_none.sh @@ -74,9 +74,9 @@ if ! cri-dockerd --version &>/dev/null; then echo "WARNING: cri-dockerd is not installed. will try to install." CRI_DOCKERD_VERSION="0737013d3c48992724283d151e8a2a767a1839e9" CRI_DOCKERD_BASE_URL="https://storage.googleapis.com/kicbase-artifacts/cri-dockerd/${CRI_DOCKERD_VERSION}" - curl -L "${CRI_DOCKERD_BASE_URL}/amd64/cri-dockerd" -o /usr/bin/cri-dockerd - curl -L "${CRI_DOCKERD_BASE_URL}/cri-docker.socket" -o /usr/lib/systemd/system/cri-docker.socket - curl -L "${CRI_DOCKERD_BASE_URL}/cri-docker.service" -o /usr/lib/systemd/system/cri-docker.service + sudo curl -L "${CRI_DOCKERD_BASE_URL}/amd64/cri-dockerd" -o /usr/bin/cri-dockerd + sudo curl -L "${CRI_DOCKERD_BASE_URL}/cri-docker.socket" -o /usr/lib/systemd/system/cri-docker.socket + sudo curl -L "${CRI_DOCKERD_BASE_URL}/cri-docker.service" -o /usr/lib/systemd/system/cri-docker.service chmod +x /usr/bin/cri-dockerd fi From 3c52423038f7909f31b92676d1b4425728d5a0ef Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Wed, 3 Aug 2022 14:54:16 -0700 Subject: [PATCH 367/545] added one last missing sudo --- hack/jenkins/linux_integration_tests_none.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/jenkins/linux_integration_tests_none.sh b/hack/jenkins/linux_integration_tests_none.sh index 5bcba0a125..655446200b 100755 --- a/hack/jenkins/linux_integration_tests_none.sh +++ b/hack/jenkins/linux_integration_tests_none.sh @@ -77,7 +77,7 @@ if ! cri-dockerd --version &>/dev/null; then sudo curl -L "${CRI_DOCKERD_BASE_URL}/amd64/cri-dockerd" -o /usr/bin/cri-dockerd sudo curl -L "${CRI_DOCKERD_BASE_URL}/cri-docker.socket" -o /usr/lib/systemd/system/cri-docker.socket sudo curl -L "${CRI_DOCKERD_BASE_URL}/cri-docker.service" -o /usr/lib/systemd/system/cri-docker.service - chmod +x /usr/bin/cri-dockerd + sudo chmod +x /usr/bin/cri-dockerd fi # crictl is required for Kubernetes 1.24 and higher for none driver From 22af24426b1f8d8401b549ede649ea2fef92dd2d Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Wed, 3 Aug 2022 15:55:48 -0700 Subject: [PATCH 368/545] keep checksums private --- deploy/minikube/release_sanity_test.go | 5 +++-- pkg/minikube/notify/notify.go | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/deploy/minikube/release_sanity_test.go b/deploy/minikube/release_sanity_test.go index 761cfd40ee..0c5292a384 100644 --- a/deploy/minikube/release_sanity_test.go +++ b/deploy/minikube/release_sanity_test.go @@ -86,7 +86,8 @@ func checkReleasesV1(t *testing.T, r notify.Release) { } } -func getSHAMap(c notify.Checksums) map[string]map[string]string { +func getSHAMap(r notify.Release) map[string]map[string]string { + c := r.Checksums return map[string]map[string]string{ "darwin": { "amd64": c.AMD64.Darwin, @@ -109,7 +110,7 @@ func checkReleasesV2(t *testing.T, rs notify.Releases) { for _, r := range rs.Releases { fmt.Printf("Checking release: %s\n", r.Name) checkReleasesV1(t, r) - release := getSHAMap(r.Checksums) + release := getSHAMap(r) for os, archs := range release { for arch, sha := range archs { fmt.Printf("Checking SHA for %s-%s.\n", os, arch) diff --git a/pkg/minikube/notify/notify.go b/pkg/minikube/notify/notify.go index 7ba97dbe1f..f3a8912591 100644 --- a/pkg/minikube/notify/notify.go +++ b/pkg/minikube/notify/notify.go @@ -136,7 +136,7 @@ type operatingSystems struct { Windows string `json:"windows,omitempty"` } -type Checksums struct { +type checksums struct { AMD64 *operatingSystems `json:"amd64,omitempty"` ARM *operatingSystems `json:"arm,omitempty"` ARM64 *operatingSystems `json:"arm64,omitempty"` @@ -146,7 +146,7 @@ type Checksums struct { } type Release struct { - Checksums Checksums `json:"checksums"` + Checksums checksums `json:"checksums"` Name string `json:"name"` } From 256abda4e937141e48a1fd4d52b0c1a3713bad9d Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Wed, 3 Aug 2022 16:11:31 -0700 Subject: [PATCH 369/545] fix id for yearly leaderboard job --- .github/workflows/yearly-leaderboard.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/yearly-leaderboard.yml b/.github/workflows/yearly-leaderboard.yml index 5493890d31..1ffb2991c4 100644 --- a/.github/workflows/yearly-leaderboard.yml +++ b/.github/workflows/yearly-leaderboard.yml @@ -24,13 +24,13 @@ jobs: with: go-version: ${{env.GO_VERSION}} - name: Update Yearly Leaderboard - id: yearly-leaderboard + id: yearlyLeaderboard run: | make update-yearly-leaderboard env: GITHUB_TOKEN: ${{ secrets.MINIKUBE_BOT_PAT }} - name: Create PR - if: ${{ steps.leaderboard.outputs.changes != '' }} + if: ${{ steps.yearlyLeaderboard.outputs.changes != '' }} uses: peter-evans/create-pull-request@923ad837f191474af6b1721408744feb989a4c27 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} From 37d41801e3fec8c7a617085cf8cdf9e038e4ccb4 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Wed, 3 Aug 2022 16:47:52 -0700 Subject: [PATCH 370/545] set output for yearly-leaderboard job --- .github/workflows/yearly-leaderboard.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/yearly-leaderboard.yml b/.github/workflows/yearly-leaderboard.yml index 1ffb2991c4..0db48b76d5 100644 --- a/.github/workflows/yearly-leaderboard.yml +++ b/.github/workflows/yearly-leaderboard.yml @@ -27,6 +27,7 @@ jobs: id: yearlyLeaderboard run: | make update-yearly-leaderboard + echo "::set-output name=changes::$(git status --porcelain)" env: GITHUB_TOKEN: ${{ secrets.MINIKUBE_BOT_PAT }} - name: Create PR From 47ea78f953a725f2be265055092ffb1d22ffdeca Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Wed, 3 Aug 2022 23:57:48 +0000 Subject: [PATCH 371/545] Update yearly leaderboard --- .../en/docs/contrib/leaderboard/2022.html | 222 ++++++++++-------- 1 file changed, 120 insertions(+), 102 deletions(-) diff --git a/site/content/en/docs/contrib/leaderboard/2022.html b/site/content/en/docs/contrib/leaderboard/2022.html index 3392babc89..08b9ea21bf 100644 --- a/site/content/en/docs/contrib/leaderboard/2022.html +++ b/site/content/en/docs/contrib/leaderboard/2022.html @@ -87,7 +87,9 @@ weight: -99992022

kubernetes/minikube

-
2022-01-01 — 2022-02-13
+
2022-01-01 — 2022-07-31
+ +

Reviewers

@@ -101,16 +103,21 @@ weight: -99992022 function drawreviewCounts() { var data = new google.visualization.arrayToDataTable([ [{label:'',type:'string'},{label: '# of Merged PRs reviewed', type: 'number'}, { role: 'annotation' }], - ["medyagh", 15, "15"], - ["sharifelgamal", 7, "7"], - ["klaases", 4, "4"], - ["spowelljr", 4, "4"], - ["atoato88", 3, "3"], - ["afbjorklund", 3, "3"], - ["t-inu", 2, "2"], - ["alexbaeza", 1, "1"], - ["s-kawamura-w664", 1, "1"], + ["spowelljr", 41, "41"], + ["medyagh", 33, "33"], + ["sharifelgamal", 13, "13"], + ["afbjorklund", 11, "11"], + ["klaases", 10, "10"], + ["atoato88", 6, "6"], + ["t-inu", 5, "5"], + ["jesperpedersen", 3, "3"], + ["knrt10", 2, "2"], + ["kakkoyun", 2, "2"], + ["s-kawamura-w664", 2, "2"], ["inductor", 1, "1"], + ["csantanapr", 1, "1"], + ["AkihiroSuda", 1, "1"], + ["alexbaeza", 1, "1"], ]); @@ -143,16 +150,21 @@ weight: -99992022 function drawreviewWords() { var data = new google.visualization.arrayToDataTable([ [{label:'',type:'string'},{label: '# of words written in merged PRs', type: 'number'}, { role: 'annotation' }], - ["medyagh", 674, "674"], - ["spowelljr", 614, "614"], - ["t-inu", 434, "434"], - ["afbjorklund", 280, "280"], - ["sharifelgamal", 231, "231"], - ["atoato88", 218, "218"], - ["s-kawamura-w664", 142, "142"], - ["klaases", 53, "53"], - ["alexbaeza", 10, "10"], - ["inductor", 1, "1"], + ["spowelljr", 3103, "3103"], + ["medyagh", 1048, "1048"], + ["t-inu", 754, "754"], + ["afbjorklund", 684, "684"], + ["s-kawamura-w664", 534, "534"], + ["sharifelgamal", 394, "394"], + ["atoato88", 304, "304"], + ["klaases", 198, "198"], + ["knrt10", 125, "125"], + ["jesperpedersen", 65, "65"], + ["kakkoyun", 49, "49"], + ["shu-mutou", 24, "24"], + ["mprimeaux", 24, "24"], + ["AlexIoannides", 20, "20"], + ["nburlett", 15, "15"], ]); @@ -185,16 +197,21 @@ weight: -99992022 function drawreviewComments() { var data = new google.visualization.arrayToDataTable([ [{label:'',type:'string'},{label: '# of Review Comments in merged PRs', type: 'number'}, { role: 'annotation' }], - ["spowelljr", 15, "15"], - ["medyagh", 14, "14"], - ["atoato88", 9, "9"], - ["t-inu", 8, "8"], - ["afbjorklund", 3, "3"], - ["sharifelgamal", 3, "3"], - ["s-kawamura-w664", 2, "2"], + ["spowelljr", 91, "91"], + ["medyagh", 32, "32"], + ["atoato88", 12, "12"], + ["t-inu", 11, "11"], + ["afbjorklund", 11, "11"], + ["klaases", 7, "7"], + ["sharifelgamal", 7, "7"], + ["s-kawamura-w664", 4, "4"], + ["mprimeaux", 2, "2"], ["inductor", 1, "1"], - ["klaases", 1, "1"], - ["alexbaeza", 0, "0"], + ["knrt10", 1, "1"], + ["csantanapr", 1, "1"], + ["AkihiroSuda", 1, "1"], + ["shu-mutou", 0, "0"], + ["kakkoyun", 0, "0"], ]); @@ -231,21 +248,21 @@ weight: -99992022 function drawprCounts() { var data = new google.visualization.arrayToDataTable([ [{label:'',type:'string'},{label: '# of Pull Requests Merged', type: 'number'}, { role: 'annotation' }], - ["spowelljr", 27, "27"], - ["afbjorklund", 8, "8"], - ["sharifelgamal", 8, "8"], - ["presztak", 5, "5"], - ["yosshy", 3, "3"], - ["jeffmaury", 3, "3"], - ["chungjin", 2, "2"], + ["spowelljr", 138, "138"], + ["sharifelgamal", 37, "37"], + ["afbjorklund", 25, "25"], + ["jeffmaury", 14, "14"], + ["yosshy", 8, "8"], + ["klaases", 7, "7"], + ["presztak", 7, "7"], + ["prezha", 5, "5"], + ["kadern0", 4, "4"], + ["ckannon", 4, "4"], + ["zhan9san", 3, "3"], + ["chungjin", 3, "3"], + ["NikhilSharmaWe", 3, "3"], + ["AkihiroSuda", 2, "2"], ["jklippel", 2, "2"], - ["prezha", 2, "2"], - ["nishipy", 1, "1"], - ["ckannon", 1, "1"], - ["olivierbouchomsfreshheads", 1, "1"], - ["klaases", 1, "1"], - ["t-inu", 1, "1"], - ["medyagh", 1, "1"], ]); @@ -278,21 +295,21 @@ weight: -99992022 function drawprDeltas() { var data = new google.visualization.arrayToDataTable([ [{label:'',type:'string'},{label: 'Lines of code (delta)', type: 'number'}, { role: 'annotation' }], + ["spowelljr", 15480, "15480"], + ["sharifelgamal", 8526, "8526"], + ["afbjorklund", 1850, "1850"], ["gAmUssA", 1574, "1574"], - ["spowelljr", 1560, "1560"], - ["prezha", 1159, "1159"], - ["afbjorklund", 320, "320"], - ["presztak", 285, "285"], - ["ckannon", 220, "220"], - ["chungjin", 187, "187"], - ["sharifelgamal", 168, "168"], - ["balalnx16", 51, "51"], - ["NikhilSharmaWe", 35, "35"], - ["anoopcs9", 16, "16"], - ["nishipy", 16, "16"], - ["pedrothome1", 8, "8"], - ["toddmacintyre", 6, "6"], - ["olivierbouchomsfreshheads", 2, "2"], + ["prezha", 1324, "1324"], + ["ckannon", 642, "642"], + ["eiffel-fl", 560, "560"], + ["chungjin", 499, "499"], + ["presztak", 349, "349"], + ["zhan9san", 332, "332"], + ["naveensrinivasan", 264, "264"], + ["NikhilSharmaWe", 264, "264"], + ["yolossn", 247, "247"], + ["Rabattkarte", 189, "189"], + ["AkihiroSuda", 187, "187"], ]); @@ -326,20 +343,20 @@ weight: -99992022 var data = new google.visualization.arrayToDataTable([ [{label:'',type:'string'},{label: 'Average PR size (added+changed)', type: 'number'}, { role: 'annotation' }], ["gAmUssA", 1573, "1573"], - ["prezha", 296, "296"], - ["ckannon", 181, "181"], - ["chungjin", 71, "71"], - ["presztak", 48, "48"], - ["spowelljr", 43, "43"], - ["balalnx16", 38, "38"], - ["afbjorklund", 32, "32"], - ["NikhilSharmaWe", 19, "19"], - ["nishipy", 16, "16"], - ["anoopcs9", 13, "13"], - ["sharifelgamal", 10, "10"], - ["pedrothome1", 6, "6"], - ["toddmacintyre", 3, "3"], - ["olivierbouchomsfreshheads", 2, "2"], + ["eiffel-fl", 221, "221"], + ["sharifelgamal", 179, "179"], + ["eliaskoromilas", 168, "168"], + ["F1ko", 143, "143"], + ["prezha", 142, "142"], + ["chungjin", 140, "140"], + ["yolossn", 118, "118"], + ["ckannon", 115, "115"], + ["Rabattkarte", 108, "108"], + ["tyabu12", 107, "107"], + ["vharsh", 89, "89"], + ["naveensrinivasan", 85, "85"], + ["spowelljr", 84, "84"], + ["kianmeng", 80, "80"], ]); @@ -376,21 +393,21 @@ weight: -99992022 function drawcomments() { var data = new google.visualization.arrayToDataTable([ [{label:'',type:'string'},{label: '# of comments', type: 'number'}, { role: 'annotation' }], - ["RA489", 43, "43"], - ["afbjorklund", 33, "33"], - ["klaases", 23, "23"], - ["spowelljr", 17, "17"], - ["sharifelgamal", 14, "14"], - ["NikhilSharmaWe", 13, "13"], - ["medyagh", 8, "8"], - ["ckannon", 8, "8"], - ["shadowshot-x", 6, "6"], - ["r0ushann", 5, "5"], + ["afbjorklund", 151, "151"], + ["RA489", 119, "119"], + ["spowelljr", 108, "108"], + ["klaases", 89, "89"], + ["sharifelgamal", 57, "57"], + ["medyagh", 25, "25"], + ["zhan9san", 22, "22"], + ["vrapolinario", 8, "8"], + ["denisok", 8, "8"], + ["mprimeaux", 7, "7"], + ["blacksd", 6, "6"], + ["NikhilSharmaWe", 6, "6"], ["MdSahil-oss", 5, "5"], - ["jatinTyagi98", 4, "4"], - ["denniseffing", 3, "3"], - ["F1ko", 2, "2"], - ["warent", 2, "2"], + ["ckannon", 5, "5"], + ["chungjin", 5, "5"], ]); @@ -423,21 +440,21 @@ weight: -99992022 function drawcommentWords() { var data = new google.visualization.arrayToDataTable([ [{label:'',type:'string'},{label: '# of words (excludes authored)', type: 'number'}, { role: 'annotation' }], - ["cdbattags", 2088, "2088"], + ["afbjorklund", 6979, "6979"], + ["spowelljr", 5074, "5074"], + ["blacksd", 4095, "4095"], + ["klaases", 3590, "3590"], + ["cdbattags", 2055, "2055"], + ["sharifelgamal", 1759, "1759"], + ["zhan9san", 1679, "1679"], + ["denisok", 1626, "1626"], ["danieldonoghue", 1535, "1535"], - ["afbjorklund", 1214, "1214"], - ["NikhilSharmaWe", 946, "946"], + ["clarencesham", 1043, "1043"], + ["vrapolinario", 752, "752"], + ["medyagh", 624, "624"], + ["Yensan", 602, "602"], + ["nburlett", 561, "561"], ["aonoa", 556, "556"], - ["shadowshot-x", 538, "538"], - ["spowelljr", 521, "521"], - ["klaases", 515, "515"], - ["lord22shark", 474, "474"], - ["ckannon", 471, "471"], - ["dpalmeira", 395, "395"], - ["HarikrishnanBalagopal", 367, "367"], - ["sharifelgamal", 343, "343"], - ["r0ushann", 270, "270"], - ["kanwarysingh", 262, "262"], ]); @@ -470,10 +487,11 @@ weight: -99992022 function drawissueCloser() { var data = new google.visualization.arrayToDataTable([ [{label:'',type:'string'},{label: '# of issues closed (excludes authored)', type: 'number'}, { role: 'annotation' }], - ["spowelljr", 43, "43"], - ["sharifelgamal", 21, "21"], - ["klaases", 16, "16"], - ["medyagh", 10, "10"], + ["spowelljr", 159, "159"], + ["klaases", 135, "135"], + ["sharifelgamal", 44, "44"], + ["medyagh", 25, "25"], + ["afbjorklund", 4, "4"], ["prezha", 4, "4"], ]); From d826b85194837790f89fe17d313380f91aed410c Mon Sep 17 00:00:00 2001 From: Yuiko Mouri Date: Thu, 28 Jul 2022 10:58:40 +0900 Subject: [PATCH 372/545] Update Japanese translation --- translations/ja.json | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/translations/ja.json b/translations/ja.json index fe410ab790..097f0add2f 100644 --- a/translations/ja.json +++ b/translations/ja.json @@ -44,7 +44,7 @@ "Add image to cache for all running minikube clusters": "実行中のすべての minikube クラスターのキャッシュに、イメージを追加します", "Add machine IP to NO_PROXY environment variable": "マシンの IP アドレスを NO_PROXY 環境変数に追加します", "Add, remove, or list additional nodes": "追加のノードを追加、削除またはリストアップします", - "Adding a control-plane node is not yet supported, setting control-plane flag to false": "", + "Adding a control-plane node is not yet supported, setting control-plane flag to false": "コントロールプレーンノードの追加はサポートされていません。control-plane フラグを false に設定します", "Adding node {{.name}} to cluster {{.cluster}}": "{{.name}} ノードを {{.cluster}} クラスターに追加します", "Additional help topics": "追加のトピック", "Adds a node to the given cluster config, and starts it.": "ノードをクラスターの設定に追加して、起動します。", @@ -233,7 +233,7 @@ "Failed to check main repository and mirrors for images": "メインリポジトリーとミラーのイメージのチェックに失敗しました", "Failed to configure metallb IP {{.profile}}": "metallb IP {{.profile}} の設定に失敗しました", "Failed to configure network plugin": "ネットワークプラグインの設定に失敗しました", - "Failed to configure registry-aliases {{.profile}}": "", + "Failed to configure registry-aliases {{.profile}}": "registry-aliases {{.profile}} の設定に失敗しました", "Failed to create file": "ファイルの作成に失敗しました", "Failed to create runtime": "ランタイムの作成に失敗しました", "Failed to delete cluster {{.name}}, proceeding with retry anyway.": "{{.name}} クラスターを削除できませんでしたが、処理を続行します。", @@ -305,7 +305,7 @@ "Go template format string for the config view output. The format for Go templates can be found here: https://golang.org/pkg/text/template/\nFor the list of accessible variables for the template, see the struct values here: https://godoc.org/k8s.io/minikube/cmd/minikube/cmd/config#ConfigViewTemplate": "設定ビュー出力用の Go テンプレートフォーマット文字列。Go テンプレートのフォーマットはこちら: https://golang.org/pkg/text/template/\nテンプレートでアクセス可能な変数の一覧は、こちらの構造化変数を参照してください: https://godoc.org/k8s.io/minikube/cmd/minikube/cmd/config#ConfigViewTemplate", "Go template format string for the status output. The format for Go templates can be found here: https://golang.org/pkg/text/template/\nFor the list accessible variables for the template, see the struct values here: https://godoc.org/k8s.io/minikube/cmd/minikube/cmd#Status": "状態出力用の Go テンプレートフォーマット文字列。Go テンプレートのフォーマットはこちら: https://golang.org/pkg/text/template/\nテンプレートでアクセス可能な変数の一覧は、こちらの構造化変数を参照してください: https://godoc.org/k8s.io/minikube/cmd/minikube/cmd#Status", "Group ID: {{.groupID}}": "グループ ID: {{.groupID}}", - "Headlamp can display more detailed information when metrics-server is installed. To install it, run:\n\nminikube{{.profileArg}} addons enable metrics-server\t\n\n": "", + "Headlamp can display more detailed information when metrics-server is installed. To install it, run:\n\nminikube{{.profileArg}} addons enable metrics-server\t\n\n": "metrics-server がインストールされていると、Headlamp はより詳細な情報を表示できます。インストールするには、次のコマンドを実行します:\n\nminikube{{.profileArg}} addons enable metrics-server\t\n\n", "Hide the hypervisor signature from the guest in minikube (kvm2 driver only)": "minikube 中のゲストに対してハイパーバイザー署名を非表示にします (kvm2 ドライバーのみ)", "Hyperkit is broken. Upgrade to the latest hyperkit version and/or Docker for Desktop. Alternatively, you may choose an alternate --driver": "Hyperkit は故障しています。最新バージョンの Hyperkit と Docker for Desktop にアップグレードしてください。あるいは、別の --driver を選択することもできます。", "Hyperkit networking is broken. Try disabling Internet Sharing: System Preference \u003e Sharing \u003e Internet Sharing. \nAlternatively, you can try upgrading to the latest hyperkit version, or using an alternate driver.": "Hyperkit ネットワーキングは故障しています。インターネット共有の無効化を試してください: システム環境設定 \u003e 共有 \u003e インターネット共有。\nあるいは、最新の Hyperkit バージョンへのアップグレードか、別のドライバー使用を試すこともできます。", @@ -327,7 +327,7 @@ "If true, cache docker images for the current bootstrapper and load them into the machine. Always false with --driver=none.": "true の場合、現在のブートストラッパーの Docker イメージをキャッシュに保存して、マシンに読み込みます。--driver=none の場合は常に false です。", "If true, only download and cache files for later use - don't install or start anything.": "true の場合、後の使用のためのファイルのダウンロードとキャッシュ保存のみ行われます。インストールも起動も行いません", "If true, pods might get deleted and restarted on addon enable": "true の場合、有効なアドオンの Pod は削除され、再起動されます", - "If true, print web links to addons' documentation if using --output=list (default).": "", + "If true, print web links to addons' documentation if using --output=list (default).": "true の場合、--output=list (default) を利用することでアドオンのドキュメントへの web リンクを表示します", "If true, returns list of profiles faster by skipping validating the status of the cluster.": "true の場合、クラスター状態の検証を省略することにより高速にプロファイル一覧を返します。", "If true, the added node will be marked for work. Defaults to true.": "true の場合、追加されたノードはワーカー用としてマークされます。デフォルトは true です。", "If true, will perform potentially dangerous operations. Use with discretion.": "true の場合、潜在的に危険な操作を行うことになります。慎重に使用してください。", @@ -355,7 +355,7 @@ "Kubernetes {{.new}} is now available. If you would like to upgrade, specify: --kubernetes-version={{.prefix}}{{.new}}": "Kubernetes {{.new}} が利用可能です。アップグレードしたい場合、--kubernetes-version={{.prefix}}{{.new}} を指定してください", "Kubernetes {{.version}} is not supported by this release of minikube": "この minikube リリースは Kubernetes {{.version}} をサポートしていません", "Kubernetes: Stopping ...": "Kubernetes: 停止しています...", - "Kubernetes: {{.status}}": "", + "Kubernetes: {{.status}}": "Kubernetes: {{.status}}", "Launching proxy ...": "プロキシーを起動しています...", "List all available images from the local cache.": "ローカルキャッシュから利用可能な全イメージを一覧表示します。", "List existing minikube nodes.": "既存の minikube ノードを一覧表示します。", @@ -426,11 +426,11 @@ "Opens the addon w/ADDON_NAME within minikube (example: minikube addons open dashboard). For a list of available addons use: minikube addons list ": "minikube 中で ADDON_NAME アドオンを開きます (例: minikube addons open dashboard)。利用可能なアドオンの一覧表示: minikube addons list ", "Operations on nodes": "ノードの操作", "Options: {{.options}}": "オプション: {{.options}}", - "Output format. Accepted values: [json, yaml]": "", + "Output format. Accepted values: [json, yaml]": "出力フォーマット。許容値: [json, yaml]", "Outputs minikube shell completion for the given shell (bash, zsh or fish)\n\n\tThis depends on the bash-completion binary. Example installation instructions:\n\tOS X:\n\t\t$ brew install bash-completion\n\t\t$ source $(brew --prefix)/etc/bash_completion\n\t\t$ minikube completion bash \u003e ~/.minikube-completion # for bash users\n\t\t$ minikube completion zsh \u003e ~/.minikube-completion # for zsh users\n\t\t$ source ~/.minikube-completion\n\t\t$ minikube completion fish \u003e ~/.config/fish/completions/minikube.fish # for fish users\n\tUbuntu:\n\t\t$ apt-get install bash-completion\n\t\t$ source /etc/bash_completion\n\t\t$ source \u003c(minikube completion bash) # for bash users\n\t\t$ source \u003c(minikube completion zsh) # for zsh users\n\t\t$ minikube completion fish \u003e ~/.config/fish/completions/minikube.fish # for fish users\n\n\tAdditionally, you may want to output the completion to a file and source in your .bashrc\n\n\tNote for zsh users: [1] zsh completions are only supported in versions of zsh \u003e= 5.2\n\tNote for fish users: [2] please refer to this docs for more details https://fishshell.com/docs/current/#tab-completion\n": "指定されたシェル用の minikube シェル補完コマンドを出力 (bash、zsh、fish)\n\n\tbash-completion バイナリーに依存しています。インストールコマンドの例:\n\tOS X:\n\t\t$ brew install bash-completion\n\t\t$ source $(brew --prefix)/etc/bash_completion\n\t\t$ minikube completion bash \u003e ~/.minikube-completion # bash ユーザー用\n\t\t$ minikube completion zsh \u003e ~/.minikube-completion # zsh ユーザー用\n\t\t$ source ~/.minikube-completion\n\t\t$ minikube completion fish \u003e ~/.config/fish/completions/minikube.fish # fish ユーザー用\n\tUbuntu:\n\t\t$ apt-get install bash-completion\n\t\t$ source /etc/bash_completion\n\t\t$ source \u003c(minikube completion bash) # bash ユーザー用\n\t\t$ source \u003c(minikube completion zsh) # zsh ユーザー用\n\t\t$ minikube completion fish \u003e ~/.config/fish/completions/minikube.fish # fish ユーザー用\n\n\tさらに、補完コマンドをファイルに出力して .bashrc 内で source を実行するとよいでしょう\n\n\t注意 (zsh ユーザー): [1] zsh 補完コマンドは zsh バージョン \u003e= 5.2 でのみサポートしています\n\t注意 (fish ユーザー): [2] 詳細はこちらのドキュメントを参照してください https://fishshell.com/docs/current/#tab-completion\n", "Overwrite image even if same image:tag name exists": "同じ image:tag 名が存在していてもイメージを上書きします", "Path to the Dockerfile to use (optional)": "使用する Dockerfile へのパス (任意)", - "Path to the qemu firmware file. Defaults: For Linux, the default firmware location. For macOS, the brew installation location. For Windows, C:\\Program Files\\qemu\\share": "", + "Path to the qemu firmware file. Defaults: For Linux, the default firmware location. For macOS, the brew installation location. For Windows, C:\\Program Files\\qemu\\share": "qemu ファームウェアファイルへのパス。デフォルト: Linux の場合、デフォルトのファームウェアの場所。macOS の場合、brew のインストール場所。Windows の場合、C:\\Program Files\\qemu\\share", "Pause": "一時停止", "Paused {{.count}} containers": "{{.count}} 個のコンテナーを一時停止しました", "Paused {{.count}} containers in: {{.namespaces}}": "{{.namespaces}} に存在する {{.count}} 個のコンテナーを一時停止しました", @@ -474,8 +474,8 @@ "Profile name '{{.profilename}}' is not valid": "プロファイル名 '{{.profilename}}' は無効です", "Profile name should be unique": "プロファイル名は単一でなければなりません", "Provide VM UUID to restore MAC address (hyperkit driver only)": "MAC アドレスを復元するための VM UUID を指定します (hyperkit ドライバーのみ)", - "Provides instructions to point your terminal's docker-cli to the Docker Engine inside minikube. (Useful for building docker images directly inside minikube)": "", - "Provides instructions to point your terminal's docker-cli to the Docker Engine inside minikube. (Useful for building docker images directly inside minikube)\n\nFor example, you can do all docker operations such as docker build, docker run, and docker ps directly on the docker inside minikube.\n\nNote: You need the docker-cli to be installed on your machine.\ndocker-cli install instructions: https://minikube.sigs.k8s.io/docs/tutorials/docker_desktop_replacement/#steps": "", + "Provides instructions to point your terminal's docker-cli to the Docker Engine inside minikube. (Useful for building docker images directly inside minikube)": "端末の docker-cli を minikube 内の Docker エンジンに指定する手順を提供します。(minikube 内で直接 Docker イメージを構築するのに便利です)", + "Provides instructions to point your terminal's docker-cli to the Docker Engine inside minikube. (Useful for building docker images directly inside minikube)\n\nFor example, you can do all docker operations such as docker build, docker run, and docker ps directly on the docker inside minikube.\n\nNote: You need the docker-cli to be installed on your machine.\ndocker-cli install instructions: https://minikube.sigs.k8s.io/docs/tutorials/docker_desktop_replacement/#steps": "端末の docker-cli を minikube 内の Docker エンジンに指定する手順を提供します。(minikube 内で直接 Docker イメージを構築するのに便利です)\n\n例えば、docker build, docker run, docker ps などの全ての docker 操作を minikube 内の docker で直接実行できます。\n\n注意: docker-cli をマシンにインストールする必要があります。\ndocker-cli のインストール手順: https://minikube.sigs.k8s.io/docs/tutorials/docker_desktop_replacement/#steps", "Pull images": "イメージを取得します", "Pull the remote image (no caching)": "リモートイメージを取得します (キャッシュなし)", "Pulling base image ...": "ベースイメージを取得しています...", @@ -574,7 +574,7 @@ "Specifying extra disks is currently only supported for the following drivers: {{.supported_drivers}}. If you can contribute to add this feature, please create a PR.": "追加ディスク指定は現在 {{.supported_drivers}} ドライバーのみ対応しています。本機能の追加に貢献可能な場合、PR を作成してください。", "StartHost failed, but will try again: {{.error}}": "StartHost に失敗しましたが、再度試してみます: {{.error}}", "Starting control plane node {{.name}} in cluster {{.cluster}}": "{{.cluster}} クラスター中のコントロールプレーンの {{.name}} ノードを起動しています", - "Starting minikube without Kubernetes in cluster {{.cluster}}": "", + "Starting minikube without Kubernetes in cluster {{.cluster}}": "{{.cluster}} クラスター中の Kubernetes なしで minikube を起動しています", "Starting minikube without Kubernetes {{.name}} in cluster {{.cluster}}": "{{.cluster}} クラスター中の Kubernetes なしで minikube {{.name}} を起動しています", "Starting tunnel for service {{.service}}.": "{{.service}} サービス用のトンネルを起動しています。", "Starting worker node {{.name}} in cluster {{.cluster}}": "{{.cluster}} クラスター中の {{.name}} ワーカーノードを起動しています", @@ -695,7 +695,7 @@ "This will start the mount daemon and automatically mount files into minikube.": "これによりマウントデーモンが起動し、ファイルが minikube に自動的にマウントされます。", "This {{.type}} is having trouble accessing https://{{.repository}}": "この {{.type}} は https://{{.repository}} アクセスにおける問題があります", "Tip: To remove this root owned cluster, run: sudo {{.cmd}}": "ヒント: この root 所有クラスターの削除コマンド: sudo {{.cmd}}", - "To access Headlamp, use the following command:\nminikube service headlamp -n headlamp\n\n": "", + "To access Headlamp, use the following command:\nminikube service headlamp -n headlamp\n\n": "Headlamp にアクセスするには、次のコマンドを使用します:\nminikube service headlamp -n headlamp\n\n", "To connect to this cluster, use: --context={{.name}}": "このクラスターに接続するためには、--context={{.name}} を使用します", "To connect to this cluster, use: kubectl --context={{.profile_name}}": "このクラスターに接続するためには、kubectl --context={{.profile_name}} を使用します", "To disable beta notices, run: 'minikube config set WantBetaUpdateNotification false'": "ベータ通知を無効にするためには、'minikube config set WantBetaUpdateNotification false' を実行します", @@ -778,7 +778,7 @@ "User name must be 60 chars or less.": "ユーザー名は 60 文字以内でなければなりません。", "Userspace file server is shutdown": "ユーザースペースのファイルサーバーが停止しました", "Userspace file server: ": "ユーザースペースのファイルサーバー: ", - "Using Kubernetes v1.24+ with the Docker runtime requires cri-docker to be installed": "", + "Using Kubernetes v1.24+ with the Docker runtime requires cri-docker to be installed": "Docker ランタイムで Kubernetes v1.24+ を使用するには、cri-docker をインストールする必要があります", "Using image repository {{.name}}": "{{.name}} イメージリポジトリーを使用しています", "Using image {{.registry}}{{.image}}": "{{.registry}}{{.image}} イメージを使用しています", "Using image {{.registry}}{{.image}} (global image repository)": "{{.registry}}{{.image}} イメージ (グローバルイメージリポジトリー) を使用しています", @@ -837,7 +837,7 @@ "addon '{{.name}}' is currently not enabled.\nTo enable this addon run:\nminikube addons enable {{.name}}": "'{{.name}}' アドオンは現在無効になっています。\n有効にするためには、以下のコマンドを実行してください。 \nminikube addons enable {{.name}}", "addon '{{.name}}' is not a valid addon packaged with minikube.\nTo see the list of available addons run:\nminikube addons list": "'{{.name}}' は minikube にパッケージングされた有効なアドオンではありません。\n利用可能なアドオンの一覧を表示するためには、以下のコマンドを実行してください。 \nminikube addons list", "addons modifies minikube addons files using subcommands like \"minikube addons enable dashboard\"": "addons コマンドは「minikube addons enable dashboard」のようなサブコマンドを使用することで、minikube アドオンファイルを修正します", - "arm64 VM drivers do not currently support the crio container runtime. See https://github.com/kubernetes/minikube/issues/14146 for details.": "", + "arm64 VM drivers do not currently support the crio container runtime. See https://github.com/kubernetes/minikube/issues/14146 for details.": "arm64 VM ドライバーは現在、crio コンテナーランタイムをサポートしていません。 詳細については、https://github.com/kubernetes/minikube/issues/14146 を参照してください", "auto-pause addon is an alpha feature and still in early development. Please file issues to help us make it better.": "auto-pause アドオンはアルファ機能で、まだ開発の初期段階です。auto-pause アドオン改善の手助けのために、問題は報告してください。", "bash completion failed": "bash のコマンド補完に失敗しました", "bash completion.": "bash のコマンド補完です。", @@ -848,7 +848,7 @@ "config view failed": "設定表示が失敗しました", "containers paused status: {{.paused}}": "コンテナー停止状態: {{.paused}}", "dashboard service is not running: {{.error}}": "ダッシュボードサービスが実行していません: {{.error}}", - "delete ctx": "", + "delete ctx": "ctx を削除します", "deleting node": "ノードを削除しています", "disable failed": "無効化に失敗しました", "dry-run mode. Validates configuration, but does not mutate system state": "dry-run モード。設定は検証しますが、システムの状態は変更しません", @@ -856,7 +856,7 @@ "enable failed": "有効化に失敗しました", "error creating clientset": "clientset 作成中にエラー", "error creatings urls": "URL 作成でエラー", - "error getting defaults: {{.error}}": "", + "error getting defaults: {{.error}}": "デフォルト取得中にエラー: {{.error}}", "error getting primary control plane": "最初のコントロールプレーン取得中にエラー", "error getting ssh port": "SSH ポートを取得中にエラー", "error initializing tracing: {{.Error}}": "トレーシング初期化中にエラー: {{.Error}}", @@ -877,12 +877,12 @@ "if you want to create a profile you can by this command: minikube start -p {{.profile_name}}": "プロファイルを作成したい場合、次のコマンドで作成できます: minikube start -p {{.profile_name}}", "initialization failed, will try again: {{.error}}": "初期化に失敗しました。再試行します: {{.error}}", "invalid kubernetes version": "無効な Kubernetes バージョン", - "json encoding failure": "", + "json encoding failure": "json エンコード失敗", "keep the kube-context active after cluster is stopped. Defaults to false.": "クラスター停止後に kube-context をアクティブのままにします。デフォルトは false です。", "kubeadm detected a TCP port conflict with another process: probably another local Kubernetes installation. Run lsof -p\u003cport\u003e to find the process and kill it": "kubeadm が他のプロセス (おそらくローカルにインストールされた他の Kubernetes) との TCP ポート衝突を検出しました。 lsof -p\u003cport\u003e を実行してそのプロセスを特定し、停止してください", "kubectl and minikube configuration will be stored in {{.home_folder}}": "kubectl と minikube の構成は {{.home_folder}} に保存されます", "kubectl not found. If you need it, try: 'minikube kubectl -- get pods -A'": "kubectl が見つかりません。kubectl が必要な場合、'minikube kubectl -- get pods -A' を試してください", - "kubectl proxy": "", + "kubectl proxy": "kubectl プロキシー", "libmachine failed": "libmachine が失敗しました", "list displays all valid default settings for PROPERTY_NAME\nAcceptable fields: \n\n": "PROPERTY_NAME 用の有効なデフォルト設定を全て表示します。\n受け入れ可能なフィールド:\n\n", "list versions of all components included with minikube. (the cluster must be running)": "minikube に含まれる全コンポーネントのバージョン一覧を出力します (クラスターが実行中でなければなりません)。", From ed05169a38abb3f5e7e04aff87cb82ca492b7de3 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Thu, 4 Aug 2022 15:17:31 -0700 Subject: [PATCH 373/545] add logging for failed commands --- gui/commandrunner.cpp | 20 +++++++++++++++++++- gui/commandrunner.h | 5 ++++- gui/logger.cpp | 26 ++++++++++++++++++++++++++ gui/logger.h | 18 ++++++++++++++++++ gui/operator.cpp | 12 ++++-------- gui/systray.pro | 2 ++ gui/window.cpp | 3 ++- gui/window.h | 3 ++- 8 files changed, 77 insertions(+), 12 deletions(-) create mode 100644 gui/logger.cpp create mode 100644 gui/logger.h diff --git a/gui/commandrunner.cpp b/gui/commandrunner.cpp index 6989e89d6a..d7e7abf476 100644 --- a/gui/commandrunner.cpp +++ b/gui/commandrunner.cpp @@ -7,16 +7,34 @@ #include #include -CommandRunner::CommandRunner(QDialog *parent) +CommandRunner::CommandRunner(QDialog *parent, Logger *logger) { m_env = QProcessEnvironment::systemEnvironment(); m_parent = parent; + m_logger = logger; minikubePath(); #if __APPLE__ setMinikubePath(); #endif } +void CommandRunner::executeCommand(QString program, QStringList args) +{ + QProcess *process = new QProcess(this); + process->setProcessEnvironment(m_env); + process->start(program, args); + process->waitForFinished(-1); + if (process->exitCode() == 0) { + return; + } + QString out = process->readAllStandardOutput(); + QString err = process->readAllStandardError(); + QString log = QString("The following command failed:\n%1 %2\n\nStdout:\n%3\n\nStderr:\n%4\n\n") + .arg(program, args.join(" "), out, err); + m_logger->log(log); + delete process; +} + void CommandRunner::executeMinikubeCommand(QStringList args) { m_isRunning = true; diff --git a/gui/commandrunner.h b/gui/commandrunner.h index 2d836d9f32..dfcf20353c 100644 --- a/gui/commandrunner.h +++ b/gui/commandrunner.h @@ -2,6 +2,7 @@ #define COMMANDRUNNER_H #include "cluster.h" +#include "logger.h" #include #include @@ -16,8 +17,9 @@ class CommandRunner : public QObject Q_OBJECT public: - CommandRunner(QDialog *parent); + CommandRunner(QDialog *parent, Logger *logger); + void executeCommand(QString program, QStringList args); void startMinikube(QStringList args); void stopMinikube(QStringList args); void pauseMinikube(QStringList args); @@ -53,6 +55,7 @@ private: QString m_minikubePath; QString m_command; QDialog *m_parent; + Logger *m_logger; QStringList m_args; bool m_isRunning; }; diff --git a/gui/logger.cpp b/gui/logger.cpp new file mode 100644 index 0000000000..a18aa03755 --- /dev/null +++ b/gui/logger.cpp @@ -0,0 +1,26 @@ +#include "logger.h" + +#include +#include +#include +#include + +Logger::Logger() +{ + QDir dir = QDir(QDir::homePath() + "/.minikube-gui"); + if (!dir.exists()) { + dir.mkpath("."); + } + m_logPath = dir.filePath("logs.txt"); +} + +void Logger::log(QString message) +{ + QFile file(m_logPath); + if (!file.open(QIODevice::Append)) { + return; + } + QTextStream stream(&file); + stream << message << "\n"; + file.close(); +} diff --git a/gui/logger.h b/gui/logger.h new file mode 100644 index 0000000000..687ced4b1b --- /dev/null +++ b/gui/logger.h @@ -0,0 +1,18 @@ +#ifndef LOGGER_H +#define LOGGER_H + +#include + +class Logger : public QObject +{ + Q_OBJECT + +public: + explicit Logger(); + void log(QString message); + +private: + QString m_logPath; +}; + +#endif // LOGGER_H diff --git a/gui/operator.cpp b/gui/operator.cpp index dbc2e5eb30..d8e1402f95 100644 --- a/gui/operator.cpp +++ b/gui/operator.cpp @@ -335,8 +335,7 @@ void Operator::sshConsole() "-e", "do script \"" + command + "\"", "-e", "activate", "-e", "end tell" }; - QProcess *process = new QProcess(this); - process->start("/usr/bin/osascript", arguments); + m_commandRunner->executeCommand("/usr/bin/osascript", arguments); #else QString terminal = qEnvironmentVariable("TERMINAL"); if (terminal.isEmpty()) { @@ -346,8 +345,7 @@ void Operator::sshConsole() } } - QProcess *process = new QProcess(this); - process->start(QStandardPaths::findExecutable(terminal), { "-e", command }); + m_commandRunner->executeCommand(QStandardPaths::findExecutable(terminal), { "-e", command }); #endif } @@ -383,8 +381,7 @@ void Operator::dockerEnv() "-e", "do script \"" + command + "\"", "-e", "activate", "-e", "end tell" }; - QProcess *process = new QProcess(this); - process->start("/usr/bin/osascript", arguments); + m_commandRunner->executeCommand("/usr/bin/osascript", arguments); #else QString terminal = qEnvironmentVariable("TERMINAL"); if (terminal.isEmpty()) { @@ -394,8 +391,7 @@ void Operator::dockerEnv() } } - QProcess *process = new QProcess(this); - process->start(QStandardPaths::findExecutable(terminal), { "-e", command }); + m_commandRunner->executeCommand(QStandardPaths::findExecutable(terminal), { "-e", command }); #endif } diff --git a/gui/systray.pro b/gui/systray.pro index 9430a3673e..389b6eaa68 100644 --- a/gui/systray.pro +++ b/gui/systray.pro @@ -5,6 +5,7 @@ HEADERS = window.h \ commandrunner.h \ errormessage.h \ hyperkit.h \ + logger.h \ operator.h \ progresswindow.h \ tray.h \ @@ -16,6 +17,7 @@ SOURCES = main.cpp \ commandrunner.cpp \ errormessage.cpp \ hyperkit.cpp \ + logger.cpp \ operator.cpp \ progresswindow.cpp \ tray.cpp \ diff --git a/gui/window.cpp b/gui/window.cpp index 02c1e5aa83..ae134b0a03 100644 --- a/gui/window.cpp +++ b/gui/window.cpp @@ -99,7 +99,8 @@ Window::Window() checkForMinikube(); stackedWidget = new QStackedWidget; - commandRunner = new CommandRunner(this); + logger = new Logger(); + commandRunner = new CommandRunner(this, logger); basicView = new BasicView(); advancedView = new AdvancedView(*trayIconIcon); errorMessage = new ErrorMessage(this, *trayIconIcon); diff --git a/gui/window.h b/gui/window.h index 55a120ce77..79bc634936 100644 --- a/gui/window.h +++ b/gui/window.h @@ -83,7 +83,6 @@ class QTableView; class QProcess; QT_END_NAMESPACE -#include "cluster.h" #include "basicview.h" #include "advancedview.h" #include "progresswindow.h" @@ -92,6 +91,7 @@ QT_END_NAMESPACE #include "tray.h" #include "hyperkit.h" #include "updater.h" +#include "logger.h" class Window : public QDialog { @@ -125,6 +125,7 @@ private: HyperKit *hyperKit; Updater *updater; QVBoxLayout *layout; + Logger *logger; }; #endif // QT_NO_SYSTEMTRAYICON From 8c04375ca36f13318e0a1e62c51467bb1beca0d6 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Thu, 4 Aug 2022 15:26:21 -0700 Subject: [PATCH 374/545] rename systray to minikube --- gui/main.cpp | 4 ++-- gui/{systray.pro => minikube.pro} | 2 +- gui/{systray.qrc => minikube.qrc} | 0 gui/window.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) rename gui/{systray.pro => minikube.pro} (97%) rename gui/{systray.qrc => minikube.qrc} (100%) diff --git a/gui/main.cpp b/gui/main.cpp index 3aeff51e5d..da1744f604 100644 --- a/gui/main.cpp +++ b/gui/main.cpp @@ -60,14 +60,14 @@ int main(int argc, char *argv[]) { - Q_INIT_RESOURCE(systray); + Q_INIT_RESOURCE(minikube); QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); QApplication app(argc, argv); if (!QSystemTrayIcon::isSystemTrayAvailable()) { - QMessageBox::critical(0, QObject::tr("Systray"), + QMessageBox::critical(0, QObject::tr("minikube"), QObject::tr("I couldn't detect any system tray " "on this system.")); return 1; diff --git a/gui/systray.pro b/gui/minikube.pro similarity index 97% rename from gui/systray.pro rename to gui/minikube.pro index 389b6eaa68..8143572d05 100644 --- a/gui/systray.pro +++ b/gui/minikube.pro @@ -23,7 +23,7 @@ SOURCES = main.cpp \ tray.cpp \ updater.cpp \ window.cpp -RESOURCES = systray.qrc +RESOURCES = minikube.qrc ICON = images/minikube.icns QT += widgets network diff --git a/gui/systray.qrc b/gui/minikube.qrc similarity index 100% rename from gui/systray.qrc rename to gui/minikube.qrc diff --git a/gui/window.cpp b/gui/window.cpp index ae134b0a03..0daa5a25f8 100644 --- a/gui/window.cpp +++ b/gui/window.cpp @@ -136,7 +136,7 @@ void Window::closeEvent(QCloseEvent *event) } #endif if (tray->isVisible()) { - QMessageBox::information(this, tr("Systray"), + QMessageBox::information(this, tr("minikube"), tr("The program will keep running in the " "system tray. To terminate the program, " "choose Quit in the context menu " From fb7f6b7f3758a30812457d0b3facc6584ef1c6da Mon Sep 17 00:00:00 2001 From: Jeff MAURY Date: Fri, 5 Aug 2022 15:37:21 +0200 Subject: [PATCH 375/545] Fix french translation Signed-off-by: Jeff MAURY --- translations/fr.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/translations/fr.json b/translations/fr.json index 60ce412224..e100c6dfc1 100644 --- a/translations/fr.json +++ b/translations/fr.json @@ -692,8 +692,8 @@ "The node {{.name}} has ran out of memory.": "Le nœud {{.name}} est à court de mémoire.", "The node {{.name}} network is not available. Please verify network settings.": "Le réseau du nœud {{.name}} n'est pas disponible. Veuillez vérifier les paramètres réseau.", "The none driver is not compatible with multi-node clusters.": "Le pilote none n'est pas compatible avec les clusters multi-nœuds.", - "The none driver with Kubernetes v1.24+ and the docker container-runtime requires cri-dockerd.\n\t\t\n\t\tPlease install cri-dockerd using these instructions:\n\n\t\thttps://github.com/Mirantis/cri-dockerd#build-and-install": "", - "The none driver with Kubernetes v1.24+ and the docker container-runtime requires dockerd.\n\t\t\n\t\tPlease install dockerd using these instructions:\n\n\t\thttps://docs.docker.com/engine/install/": "", + "The none driver with Kubernetes v1.24+ and the docker container-runtime requires cri-dockerd.\n\t\t\n\t\tPlease install cri-dockerd using these instructions:\n\n\t\thttps://github.com/Mirantis/cri-dockerd#build-and-install": "Le pilote none avec Kubernetes v1.24+ et l'environnement d'exécution du conteneur docker nécessitent cri-dockerd.\n\t\t\n\t\tVeuillez installer cri-dockerd en suivant ces instructions :\n\n\t\thttps:/ /github.com/Mirantis/cri-dockerd#build-and-install", + "The none driver with Kubernetes v1.24+ and the docker container-runtime requires dockerd.\n\t\t\n\t\tPlease install dockerd using these instructions:\n\n\t\thttps://docs.docker.com/engine/install/": "Le pilote none avec Kubernetes v1.24+ et l'environnement d'exécution du conteneur docker nécessitent dockerd.\n\t\t\n\t\tVeuillez installer dockerd en suivant ces instructions :\n\n\t\thttps://docs.docker .com/engine/install/", "The number of bytes to use for 9p packet payload": "Le nombre d'octets à utiliser pour la charge utile du paquet 9p", "The number of nodes to spin up. Defaults to 1.": "Le nombre de nœuds à faire tourner. La valeur par défaut est 1.", "The output format. One of 'json', 'table'": "Le format de sortie. 'json' ou 'table'", @@ -998,9 +998,9 @@ "{{ .name }}: Suggestion: {{ .suggestion}}": "{{ .name }}: Suggestion: {{ .suggestion}}", "{{ .name }}: {{ .rejection }}": "{{ .name }} : {{ .rejection }}", "{{.Driver}} is currently using the {{.StorageDriver}} storage driver, consider switching to overlay2 for better performance": "{{.Driver}} utilise actuellement le pilote de stockage {{.StorageDriver}}, envisagez de passer à overlay2 pour de meilleures performances", - "{{.addon}} is a 3rd party addon and not maintained or verified by minikube maintainers, enable at your own risk.": "", - "{{.addon}} is an addon maintained by {{.maintainer}}. For any concerns contact minikube on GitHub.\nYou can view the list of minikube maintainers at: https://github.com/kubernetes/minikube/blob/master/OWNERS": "", - "{{.addon}} is maintained by {{.maintainer}} for any concerns contact {{.verifiedMaintainer}} on GitHub.": "", + "{{.addon}} is a 3rd party addon and not maintained or verified by minikube maintainers, enable at your own risk.": "{{.addon}} est un module complémentaire tiers et non maintenu ou vérifié par les mainteneurs de minikube, activez-le à vos risques et périls.", + "{{.addon}} is an addon maintained by {{.maintainer}}. For any concerns contact minikube on GitHub.\nYou can view the list of minikube maintainers at: https://github.com/kubernetes/minikube/blob/master/OWNERS": "{{.addon}} est un addon maintenu par {{.maintainer}}. Pour toute question, contactez minikube sur GitHub.\nVous pouvez consulter la liste des mainteneurs de minikube sur : https://github.com/kubernetes/minikube/blob/master/OWNERS", + "{{.addon}} is maintained by {{.maintainer}} for any concerns contact {{.verifiedMaintainer}} on GitHub.": "{{.addon}} est maintenu par {{.maintainer}} pour tout problème, contactez {{.verifiedMaintainer}} sur GitHub.", "{{.count}} node{{if gt .count 1}}s{{end}} stopped.": "{{.count}} nœud{{if gt .count 1}}s{{end}} arrêté{{if gt .count 1}}s{{end}}.", "{{.driver_name}} \"{{.cluster}}\" {{.machine_type}} is missing, will recreate.": "{{.driver_name}} \"{{.cluster}}\" {{.machine_type}} est manquant, il va être recréé.", "{{.driver_name}} couldn't proceed because {{.driver_name}} service is not healthy.": "{{.driver_name}} n'a pas pu continuer car le service {{.driver_name}} n'est pas fonctionnel.", From 328b753e50153d016b3aa678c53a650e73e4712e Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Fri, 5 Aug 2022 09:43:13 -0700 Subject: [PATCH 376/545] fix typo --- pkg/minikube/download/preload.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/minikube/download/preload.go b/pkg/minikube/download/preload.go index cca3bdaa8f..1a09ab0bdb 100644 --- a/pkg/minikube/download/preload.go +++ b/pkg/minikube/download/preload.go @@ -253,7 +253,7 @@ func saveChecksumFile(k8sVersion, containerRuntime string, checksum []byte) erro // verifyChecksum returns true if the checksum of the local binary matches // the checksum of the remote binary func verifyChecksum(k8sVersion, containerRuntime, path string) error { - klog.Infof("verifying checksumm of %s ...", path) + klog.Infof("verifying checksum of %s ...", path) // get md5 checksum of tarball path contents, err := os.ReadFile(path) if err != nil { From c467d61bf9ad9c28607233afa204d4b196d1b24d Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Fri, 5 Aug 2022 10:00:10 -0700 Subject: [PATCH 377/545] remove archless ISO URLs --- pkg/minikube/download/iso.go | 4 ---- site/content/en/docs/commands/start.md | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/pkg/minikube/download/iso.go b/pkg/minikube/download/iso.go index 404359a48a..5cf6482601 100644 --- a/pkg/minikube/download/iso.go +++ b/pkg/minikube/download/iso.go @@ -46,10 +46,6 @@ func DefaultISOURLs() []string { fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s-%s.iso", isoBucket, v, runtime.GOARCH), fmt.Sprintf("https://github.com/kubernetes/minikube/releases/download/%s/minikube-%s-%s.iso", v, v, runtime.GOARCH), fmt.Sprintf("https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-%s-%s.iso", v, runtime.GOARCH), - // fallback to older style ISO urls, without explicit arch reference - 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), - fmt.Sprintf("https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-%s.iso", v), } } diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index 9af1f124f3..341b4a7575 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/iso/minikube-v1.26.1-amd64.iso,https://github.com/kubernetes/minikube/releases/download/v1.26.1/minikube-v1.26.1-amd64.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.26.1-amd64.iso,https://storage.googleapis.com/minikube/iso/minikube-v1.26.1.iso,https://github.com/kubernetes/minikube/releases/download/v1.26.1/minikube-v1.26.1.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.26.1.iso]) + --iso-url strings Locations to fetch the minikube ISO from. (default [https://storage.googleapis.com/minikube/iso/minikube-v1.26.1-amd64.iso,https://github.com/kubernetes/minikube/releases/download/v1.26.1/minikube-v1.26.1-amd64.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.26.1-amd64.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.24.3, 'latest' for v1.24.3). Defaults to 'stable'. --kvm-gpu Enable experimental NVIDIA GPU support in minikube From 9b6aae796636e6b407ccfc9bda673f0f5eba303c Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Fri, 5 Aug 2022 12:43:22 -0700 Subject: [PATCH 378/545] gui: fix first dashboard start crashing app --- gui/operator.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/gui/operator.cpp b/gui/operator.cpp index d8e1402f95..a79128b259 100644 --- a/gui/operator.cpp +++ b/gui/operator.cpp @@ -21,6 +21,7 @@ Operator::Operator(AdvancedView *advancedView, BasicView *basicView, CommandRunn m_stackedWidget = stackedWidget; m_parent = parent; m_isBasicView = true; + dashboardProcess = NULL; connect(m_basicView, &BasicView::start, this, &Operator::startMinikube); connect(m_basicView, &BasicView::stop, this, &Operator::stopMinikube); From 8d2fff2b1b9cefca0afe2e95475f93abd6376c72 Mon Sep 17 00:00:00 2001 From: Jeff MAURY Date: Sat, 6 Aug 2022 10:54:11 +0200 Subject: [PATCH 379/545] Apply suggestions from code review Co-authored-by: Steven Powell <44844360+spowelljr@users.noreply.github.com> --- translations/fr.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/translations/fr.json b/translations/fr.json index e100c6dfc1..f8d5f1871c 100644 --- a/translations/fr.json +++ b/translations/fr.json @@ -692,8 +692,8 @@ "The node {{.name}} has ran out of memory.": "Le nœud {{.name}} est à court de mémoire.", "The node {{.name}} network is not available. Please verify network settings.": "Le réseau du nœud {{.name}} n'est pas disponible. Veuillez vérifier les paramètres réseau.", "The none driver is not compatible with multi-node clusters.": "Le pilote none n'est pas compatible avec les clusters multi-nœuds.", - "The none driver with Kubernetes v1.24+ and the docker container-runtime requires cri-dockerd.\n\t\t\n\t\tPlease install cri-dockerd using these instructions:\n\n\t\thttps://github.com/Mirantis/cri-dockerd#build-and-install": "Le pilote none avec Kubernetes v1.24+ et l'environnement d'exécution du conteneur docker nécessitent cri-dockerd.\n\t\t\n\t\tVeuillez installer cri-dockerd en suivant ces instructions :\n\n\t\thttps:/ /github.com/Mirantis/cri-dockerd#build-and-install", - "The none driver with Kubernetes v1.24+ and the docker container-runtime requires dockerd.\n\t\t\n\t\tPlease install dockerd using these instructions:\n\n\t\thttps://docs.docker.com/engine/install/": "Le pilote none avec Kubernetes v1.24+ et l'environnement d'exécution du conteneur docker nécessitent dockerd.\n\t\t\n\t\tVeuillez installer dockerd en suivant ces instructions :\n\n\t\thttps://docs.docker .com/engine/install/", + "The none driver with Kubernetes v1.24+ and the docker container-runtime requires cri-dockerd.\n\t\t\n\t\tPlease install cri-dockerd using these instructions:\n\n\t\thttps://github.com/Mirantis/cri-dockerd#build-and-install": "Le pilote none avec Kubernetes v1.24+ et l'environnement d'exécution du conteneur docker nécessitent cri-dockerd.\n\t\t\n\t\tVeuillez installer cri-dockerd en suivant ces instructions :\n\n\t\thttps://github.com/Mirantis/cri-dockerd#build-and-install", + "The none driver with Kubernetes v1.24+ and the docker container-runtime requires dockerd.\n\t\t\n\t\tPlease install dockerd using these instructions:\n\n\t\thttps://docs.docker.com/engine/install/": "Le pilote none avec Kubernetes v1.24+ et l'environnement d'exécution du conteneur docker nécessitent dockerd.\n\t\t\n\t\tVeuillez installer dockerd en suivant ces instructions :\n\n\t\thttps://docs.docker.com/engine/install/", "The number of bytes to use for 9p packet payload": "Le nombre d'octets à utiliser pour la charge utile du paquet 9p", "The number of nodes to spin up. Defaults to 1.": "Le nombre de nœuds à faire tourner. La valeur par défaut est 1.", "The output format. One of 'json', 'table'": "Le format de sortie. 'json' ou 'table'", From 434d51ace5690d3cd20ca1458b08af47bce51a26 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 8 Aug 2022 06:05:35 +0000 Subject: [PATCH 380/545] update image constants for kubeadm images --- pkg/minikube/constants/constants_kubeadm_images.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/minikube/constants/constants_kubeadm_images.go b/pkg/minikube/constants/constants_kubeadm_images.go index be36232481..8feede5c9e 100644 --- a/pkg/minikube/constants/constants_kubeadm_images.go +++ b/pkg/minikube/constants/constants_kubeadm_images.go @@ -21,7 +21,7 @@ var ( "v1.25": { "coredns/coredns": "v1.9.3", "etcd": "3.5.4-0", - "pause": "3.7", + "pause": "3.8", }, "v1.24": { "coredns/coredns": "v1.8.6", From 55334d52171a5d026a91ed1c622e3cae827e5afa Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 8 Aug 2022 08:03:54 +0000 Subject: [PATCH 381/545] bump default/newest kubernetes versions --- .../testdata/v1.25/containerd-api-port.yaml | 72 +++++++++++++++++ .../v1.25/containerd-pod-network-cidr.yaml | 72 +++++++++++++++++ .../bsutil/testdata/v1.25/containerd.yaml | 72 +++++++++++++++++ .../testdata/v1.25/crio-options-gates.yaml | 79 +++++++++++++++++++ .../bsutil/testdata/v1.25/crio.yaml | 72 +++++++++++++++++ .../bsutil/testdata/v1.25/default.yaml | 72 +++++++++++++++++ .../bsutil/testdata/v1.25/dns.yaml | 72 +++++++++++++++++ .../testdata/v1.25/image-repository.yaml | 73 +++++++++++++++++ .../bsutil/testdata/v1.25/options.yaml | 76 ++++++++++++++++++ pkg/minikube/constants/constants.go | 2 +- site/content/en/docs/commands/start.md | 2 +- 11 files changed, 662 insertions(+), 2 deletions(-) create mode 100644 pkg/minikube/bootstrapper/bsutil/testdata/v1.25/containerd-api-port.yaml create mode 100644 pkg/minikube/bootstrapper/bsutil/testdata/v1.25/containerd-pod-network-cidr.yaml create mode 100644 pkg/minikube/bootstrapper/bsutil/testdata/v1.25/containerd.yaml create mode 100644 pkg/minikube/bootstrapper/bsutil/testdata/v1.25/crio-options-gates.yaml create mode 100644 pkg/minikube/bootstrapper/bsutil/testdata/v1.25/crio.yaml create mode 100644 pkg/minikube/bootstrapper/bsutil/testdata/v1.25/default.yaml create mode 100644 pkg/minikube/bootstrapper/bsutil/testdata/v1.25/dns.yaml create mode 100644 pkg/minikube/bootstrapper/bsutil/testdata/v1.25/image-repository.yaml create mode 100644 pkg/minikube/bootstrapper/bsutil/testdata/v1.25/options.yaml diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/containerd-api-port.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/containerd-api-port.yaml new file mode 100644 index 0000000000..0358b09e13 --- /dev/null +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/containerd-api-port.yaml @@ -0,0 +1,72 @@ +apiVersion: kubeadm.k8s.io/v1beta3 +kind: InitConfiguration +localAPIEndpoint: + advertiseAddress: 1.1.1.1 + bindPort: 12345 +bootstrapTokens: + - groups: + - system:bootstrappers:kubeadm:default-node-token + ttl: 24h0m0s + usages: + - signing + - authentication +nodeRegistration: + criSocket: /run/containerd/containerd.sock + name: "mk" + kubeletExtraArgs: + node-ip: 1.1.1.1 + taints: [] +--- +apiVersion: kubeadm.k8s.io/v1beta3 +kind: ClusterConfiguration +apiServer: + certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] + extraArgs: + enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" +controllerManager: + extraArgs: + allocate-node-cidrs: "true" + leader-elect: "false" +scheduler: + extraArgs: + leader-elect: "false" +certificatesDir: /var/lib/minikube/certs +clusterName: mk +controlPlaneEndpoint: control-plane.minikube.internal:12345 +etcd: + local: + dataDir: /var/lib/minikube/etcd + extraArgs: + proxy-refresh-interval: "70000" +kubernetesVersion: v1.25.0-beta.0 +networking: + dnsDomain: cluster.local + podSubnet: "10.244.0.0/16" + serviceSubnet: 10.96.0.0/12 +--- +apiVersion: kubelet.config.k8s.io/v1beta1 +kind: KubeletConfiguration +authentication: + x509: + clientCAFile: /var/lib/minikube/certs/ca.crt +cgroupDriver: systemd +clusterDomain: "cluster.local" +# disable disk resource management by default +imageGCHighThresholdPercent: 100 +evictionHard: + nodefs.available: "0%" + nodefs.inodesFree: "0%" + imagefs.available: "0%" +failSwapOn: false +staticPodPath: /etc/kubernetes/manifests +--- +apiVersion: kubeproxy.config.k8s.io/v1alpha1 +kind: KubeProxyConfiguration +clusterCIDR: "10.244.0.0/16" +metricsBindAddress: 0.0.0.0:10249 +conntrack: + maxPerCore: 0 +# Skip setting "net.netfilter.nf_conntrack_tcp_timeout_established" + tcpEstablishedTimeout: 0s +# Skip setting "net.netfilter.nf_conntrack_tcp_timeout_close" + tcpCloseWaitTimeout: 0s diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/containerd-pod-network-cidr.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/containerd-pod-network-cidr.yaml new file mode 100644 index 0000000000..fd5a996dce --- /dev/null +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/containerd-pod-network-cidr.yaml @@ -0,0 +1,72 @@ +apiVersion: kubeadm.k8s.io/v1beta3 +kind: InitConfiguration +localAPIEndpoint: + advertiseAddress: 1.1.1.1 + bindPort: 8443 +bootstrapTokens: + - groups: + - system:bootstrappers:kubeadm:default-node-token + ttl: 24h0m0s + usages: + - signing + - authentication +nodeRegistration: + criSocket: /run/containerd/containerd.sock + name: "mk" + kubeletExtraArgs: + node-ip: 1.1.1.1 + taints: [] +--- +apiVersion: kubeadm.k8s.io/v1beta3 +kind: ClusterConfiguration +apiServer: + certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] + extraArgs: + enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" +controllerManager: + extraArgs: + allocate-node-cidrs: "true" + leader-elect: "false" +scheduler: + extraArgs: + leader-elect: "false" +certificatesDir: /var/lib/minikube/certs +clusterName: mk +controlPlaneEndpoint: control-plane.minikube.internal:8443 +etcd: + local: + dataDir: /var/lib/minikube/etcd + extraArgs: + proxy-refresh-interval: "70000" +kubernetesVersion: v1.25.0-beta.0 +networking: + dnsDomain: cluster.local + podSubnet: "192.168.32.0/20" + serviceSubnet: 10.96.0.0/12 +--- +apiVersion: kubelet.config.k8s.io/v1beta1 +kind: KubeletConfiguration +authentication: + x509: + clientCAFile: /var/lib/minikube/certs/ca.crt +cgroupDriver: systemd +clusterDomain: "cluster.local" +# disable disk resource management by default +imageGCHighThresholdPercent: 100 +evictionHard: + nodefs.available: "0%" + nodefs.inodesFree: "0%" + imagefs.available: "0%" +failSwapOn: false +staticPodPath: /etc/kubernetes/manifests +--- +apiVersion: kubeproxy.config.k8s.io/v1alpha1 +kind: KubeProxyConfiguration +clusterCIDR: "192.168.32.0/20" +metricsBindAddress: 0.0.0.0:10249 +conntrack: + maxPerCore: 0 +# Skip setting "net.netfilter.nf_conntrack_tcp_timeout_established" + tcpEstablishedTimeout: 0s +# Skip setting "net.netfilter.nf_conntrack_tcp_timeout_close" + tcpCloseWaitTimeout: 0s diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/containerd.yaml new file mode 100644 index 0000000000..f28fe54a27 --- /dev/null +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/containerd.yaml @@ -0,0 +1,72 @@ +apiVersion: kubeadm.k8s.io/v1beta3 +kind: InitConfiguration +localAPIEndpoint: + advertiseAddress: 1.1.1.1 + bindPort: 8443 +bootstrapTokens: + - groups: + - system:bootstrappers:kubeadm:default-node-token + ttl: 24h0m0s + usages: + - signing + - authentication +nodeRegistration: + criSocket: /run/containerd/containerd.sock + name: "mk" + kubeletExtraArgs: + node-ip: 1.1.1.1 + taints: [] +--- +apiVersion: kubeadm.k8s.io/v1beta3 +kind: ClusterConfiguration +apiServer: + certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] + extraArgs: + enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" +controllerManager: + extraArgs: + allocate-node-cidrs: "true" + leader-elect: "false" +scheduler: + extraArgs: + leader-elect: "false" +certificatesDir: /var/lib/minikube/certs +clusterName: mk +controlPlaneEndpoint: control-plane.minikube.internal:8443 +etcd: + local: + dataDir: /var/lib/minikube/etcd + extraArgs: + proxy-refresh-interval: "70000" +kubernetesVersion: v1.25.0-beta.0 +networking: + dnsDomain: cluster.local + podSubnet: "10.244.0.0/16" + serviceSubnet: 10.96.0.0/12 +--- +apiVersion: kubelet.config.k8s.io/v1beta1 +kind: KubeletConfiguration +authentication: + x509: + clientCAFile: /var/lib/minikube/certs/ca.crt +cgroupDriver: systemd +clusterDomain: "cluster.local" +# disable disk resource management by default +imageGCHighThresholdPercent: 100 +evictionHard: + nodefs.available: "0%" + nodefs.inodesFree: "0%" + imagefs.available: "0%" +failSwapOn: false +staticPodPath: /etc/kubernetes/manifests +--- +apiVersion: kubeproxy.config.k8s.io/v1alpha1 +kind: KubeProxyConfiguration +clusterCIDR: "10.244.0.0/16" +metricsBindAddress: 0.0.0.0:10249 +conntrack: + maxPerCore: 0 +# Skip setting "net.netfilter.nf_conntrack_tcp_timeout_established" + tcpEstablishedTimeout: 0s +# Skip setting "net.netfilter.nf_conntrack_tcp_timeout_close" + tcpCloseWaitTimeout: 0s diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/crio-options-gates.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/crio-options-gates.yaml new file mode 100644 index 0000000000..4d8155ecaf --- /dev/null +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/crio-options-gates.yaml @@ -0,0 +1,79 @@ +apiVersion: kubeadm.k8s.io/v1beta3 +kind: InitConfiguration +localAPIEndpoint: + advertiseAddress: 1.1.1.1 + bindPort: 8443 +bootstrapTokens: + - groups: + - system:bootstrappers:kubeadm:default-node-token + ttl: 24h0m0s + usages: + - signing + - authentication +nodeRegistration: + criSocket: /var/run/crio/crio.sock + name: "mk" + kubeletExtraArgs: + node-ip: 1.1.1.1 + taints: [] +--- +apiVersion: kubeadm.k8s.io/v1beta3 +kind: ClusterConfiguration +apiServer: + certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] + extraArgs: + enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" + fail-no-swap: "true" + feature-gates: "a=b" +controllerManager: + extraArgs: + allocate-node-cidrs: "true" + feature-gates: "a=b" + kube-api-burst: "32" + leader-elect: "false" +scheduler: + extraArgs: + feature-gates: "a=b" + leader-elect: "false" + scheduler-name: "mini-scheduler" +certificatesDir: /var/lib/minikube/certs +clusterName: mk +controlPlaneEndpoint: control-plane.minikube.internal:8443 +etcd: + local: + dataDir: /var/lib/minikube/etcd + extraArgs: + proxy-refresh-interval: "70000" +kubernetesVersion: v1.25.0-beta.0 +networking: + dnsDomain: cluster.local + podSubnet: "10.244.0.0/16" + serviceSubnet: 10.96.0.0/12 +--- +apiVersion: kubelet.config.k8s.io/v1beta1 +kind: KubeletConfiguration +authentication: + x509: + clientCAFile: /var/lib/minikube/certs/ca.crt +cgroupDriver: systemd +clusterDomain: "cluster.local" +# disable disk resource management by default +imageGCHighThresholdPercent: 100 +evictionHard: + nodefs.available: "0%" + nodefs.inodesFree: "0%" + imagefs.available: "0%" +failSwapOn: false +staticPodPath: /etc/kubernetes/manifests +--- +apiVersion: kubeproxy.config.k8s.io/v1alpha1 +kind: KubeProxyConfiguration +clusterCIDR: "10.244.0.0/16" +metricsBindAddress: 0.0.0.0:10249 +conntrack: + maxPerCore: 0 +# Skip setting "net.netfilter.nf_conntrack_tcp_timeout_established" + tcpEstablishedTimeout: 0s +# Skip setting "net.netfilter.nf_conntrack_tcp_timeout_close" + tcpCloseWaitTimeout: 0s +mode: "iptables" diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/crio.yaml new file mode 100644 index 0000000000..63dbb73587 --- /dev/null +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/crio.yaml @@ -0,0 +1,72 @@ +apiVersion: kubeadm.k8s.io/v1beta3 +kind: InitConfiguration +localAPIEndpoint: + advertiseAddress: 1.1.1.1 + bindPort: 8443 +bootstrapTokens: + - groups: + - system:bootstrappers:kubeadm:default-node-token + ttl: 24h0m0s + usages: + - signing + - authentication +nodeRegistration: + criSocket: /var/run/crio/crio.sock + name: "mk" + kubeletExtraArgs: + node-ip: 1.1.1.1 + taints: [] +--- +apiVersion: kubeadm.k8s.io/v1beta3 +kind: ClusterConfiguration +apiServer: + certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] + extraArgs: + enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" +controllerManager: + extraArgs: + allocate-node-cidrs: "true" + leader-elect: "false" +scheduler: + extraArgs: + leader-elect: "false" +certificatesDir: /var/lib/minikube/certs +clusterName: mk +controlPlaneEndpoint: control-plane.minikube.internal:8443 +etcd: + local: + dataDir: /var/lib/minikube/etcd + extraArgs: + proxy-refresh-interval: "70000" +kubernetesVersion: v1.25.0-beta.0 +networking: + dnsDomain: cluster.local + podSubnet: "10.244.0.0/16" + serviceSubnet: 10.96.0.0/12 +--- +apiVersion: kubelet.config.k8s.io/v1beta1 +kind: KubeletConfiguration +authentication: + x509: + clientCAFile: /var/lib/minikube/certs/ca.crt +cgroupDriver: systemd +clusterDomain: "cluster.local" +# disable disk resource management by default +imageGCHighThresholdPercent: 100 +evictionHard: + nodefs.available: "0%" + nodefs.inodesFree: "0%" + imagefs.available: "0%" +failSwapOn: false +staticPodPath: /etc/kubernetes/manifests +--- +apiVersion: kubeproxy.config.k8s.io/v1alpha1 +kind: KubeProxyConfiguration +clusterCIDR: "10.244.0.0/16" +metricsBindAddress: 0.0.0.0:10249 +conntrack: + maxPerCore: 0 +# Skip setting "net.netfilter.nf_conntrack_tcp_timeout_established" + tcpEstablishedTimeout: 0s +# Skip setting "net.netfilter.nf_conntrack_tcp_timeout_close" + tcpCloseWaitTimeout: 0s diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/default.yaml new file mode 100644 index 0000000000..54662e8d00 --- /dev/null +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/default.yaml @@ -0,0 +1,72 @@ +apiVersion: kubeadm.k8s.io/v1beta3 +kind: InitConfiguration +localAPIEndpoint: + advertiseAddress: 1.1.1.1 + bindPort: 8443 +bootstrapTokens: + - groups: + - system:bootstrappers:kubeadm:default-node-token + ttl: 24h0m0s + usages: + - signing + - authentication +nodeRegistration: + criSocket: /var/run/dockershim.sock + name: "mk" + kubeletExtraArgs: + node-ip: 1.1.1.1 + taints: [] +--- +apiVersion: kubeadm.k8s.io/v1beta3 +kind: ClusterConfiguration +apiServer: + certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] + extraArgs: + enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" +controllerManager: + extraArgs: + allocate-node-cidrs: "true" + leader-elect: "false" +scheduler: + extraArgs: + leader-elect: "false" +certificatesDir: /var/lib/minikube/certs +clusterName: mk +controlPlaneEndpoint: control-plane.minikube.internal:8443 +etcd: + local: + dataDir: /var/lib/minikube/etcd + extraArgs: + proxy-refresh-interval: "70000" +kubernetesVersion: v1.25.0-beta.0 +networking: + dnsDomain: cluster.local + podSubnet: "10.244.0.0/16" + serviceSubnet: 10.96.0.0/12 +--- +apiVersion: kubelet.config.k8s.io/v1beta1 +kind: KubeletConfiguration +authentication: + x509: + clientCAFile: /var/lib/minikube/certs/ca.crt +cgroupDriver: systemd +clusterDomain: "cluster.local" +# disable disk resource management by default +imageGCHighThresholdPercent: 100 +evictionHard: + nodefs.available: "0%" + nodefs.inodesFree: "0%" + imagefs.available: "0%" +failSwapOn: false +staticPodPath: /etc/kubernetes/manifests +--- +apiVersion: kubeproxy.config.k8s.io/v1alpha1 +kind: KubeProxyConfiguration +clusterCIDR: "10.244.0.0/16" +metricsBindAddress: 0.0.0.0:10249 +conntrack: + maxPerCore: 0 +# Skip setting "net.netfilter.nf_conntrack_tcp_timeout_established" + tcpEstablishedTimeout: 0s +# Skip setting "net.netfilter.nf_conntrack_tcp_timeout_close" + tcpCloseWaitTimeout: 0s diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/dns.yaml new file mode 100644 index 0000000000..5f8b92222f --- /dev/null +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/dns.yaml @@ -0,0 +1,72 @@ +apiVersion: kubeadm.k8s.io/v1beta3 +kind: InitConfiguration +localAPIEndpoint: + advertiseAddress: 1.1.1.1 + bindPort: 8443 +bootstrapTokens: + - groups: + - system:bootstrappers:kubeadm:default-node-token + ttl: 24h0m0s + usages: + - signing + - authentication +nodeRegistration: + criSocket: /var/run/dockershim.sock + name: "mk" + kubeletExtraArgs: + node-ip: 1.1.1.1 + taints: [] +--- +apiVersion: kubeadm.k8s.io/v1beta3 +kind: ClusterConfiguration +apiServer: + certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] + extraArgs: + enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" +controllerManager: + extraArgs: + allocate-node-cidrs: "true" + leader-elect: "false" +scheduler: + extraArgs: + leader-elect: "false" +certificatesDir: /var/lib/minikube/certs +clusterName: mk +controlPlaneEndpoint: control-plane.minikube.internal:8443 +etcd: + local: + dataDir: /var/lib/minikube/etcd + extraArgs: + proxy-refresh-interval: "70000" +kubernetesVersion: v1.25.0-beta.0 +networking: + dnsDomain: minikube.local + podSubnet: "10.244.0.0/16" + serviceSubnet: 10.96.0.0/12 +--- +apiVersion: kubelet.config.k8s.io/v1beta1 +kind: KubeletConfiguration +authentication: + x509: + clientCAFile: /var/lib/minikube/certs/ca.crt +cgroupDriver: systemd +clusterDomain: "minikube.local" +# disable disk resource management by default +imageGCHighThresholdPercent: 100 +evictionHard: + nodefs.available: "0%" + nodefs.inodesFree: "0%" + imagefs.available: "0%" +failSwapOn: false +staticPodPath: /etc/kubernetes/manifests +--- +apiVersion: kubeproxy.config.k8s.io/v1alpha1 +kind: KubeProxyConfiguration +clusterCIDR: "10.244.0.0/16" +metricsBindAddress: 0.0.0.0:10249 +conntrack: + maxPerCore: 0 +# Skip setting "net.netfilter.nf_conntrack_tcp_timeout_established" + tcpEstablishedTimeout: 0s +# Skip setting "net.netfilter.nf_conntrack_tcp_timeout_close" + tcpCloseWaitTimeout: 0s diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/image-repository.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/image-repository.yaml new file mode 100644 index 0000000000..669748eac7 --- /dev/null +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/image-repository.yaml @@ -0,0 +1,73 @@ +apiVersion: kubeadm.k8s.io/v1beta3 +kind: InitConfiguration +localAPIEndpoint: + advertiseAddress: 1.1.1.1 + bindPort: 8443 +bootstrapTokens: + - groups: + - system:bootstrappers:kubeadm:default-node-token + ttl: 24h0m0s + usages: + - signing + - authentication +nodeRegistration: + criSocket: /var/run/dockershim.sock + name: "mk" + kubeletExtraArgs: + node-ip: 1.1.1.1 + taints: [] +--- +apiVersion: kubeadm.k8s.io/v1beta3 +kind: ClusterConfiguration +imageRepository: test/repo +apiServer: + certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] + extraArgs: + enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" +controllerManager: + extraArgs: + allocate-node-cidrs: "true" + leader-elect: "false" +scheduler: + extraArgs: + leader-elect: "false" +certificatesDir: /var/lib/minikube/certs +clusterName: mk +controlPlaneEndpoint: control-plane.minikube.internal:8443 +etcd: + local: + dataDir: /var/lib/minikube/etcd + extraArgs: + proxy-refresh-interval: "70000" +kubernetesVersion: v1.25.0-beta.0 +networking: + dnsDomain: cluster.local + podSubnet: "10.244.0.0/16" + serviceSubnet: 10.96.0.0/12 +--- +apiVersion: kubelet.config.k8s.io/v1beta1 +kind: KubeletConfiguration +authentication: + x509: + clientCAFile: /var/lib/minikube/certs/ca.crt +cgroupDriver: systemd +clusterDomain: "cluster.local" +# disable disk resource management by default +imageGCHighThresholdPercent: 100 +evictionHard: + nodefs.available: "0%" + nodefs.inodesFree: "0%" + imagefs.available: "0%" +failSwapOn: false +staticPodPath: /etc/kubernetes/manifests +--- +apiVersion: kubeproxy.config.k8s.io/v1alpha1 +kind: KubeProxyConfiguration +clusterCIDR: "10.244.0.0/16" +metricsBindAddress: 0.0.0.0:10249 +conntrack: + maxPerCore: 0 +# Skip setting "net.netfilter.nf_conntrack_tcp_timeout_established" + tcpEstablishedTimeout: 0s +# Skip setting "net.netfilter.nf_conntrack_tcp_timeout_close" + tcpCloseWaitTimeout: 0s diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/options.yaml new file mode 100644 index 0000000000..6725ae85a5 --- /dev/null +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/options.yaml @@ -0,0 +1,76 @@ +apiVersion: kubeadm.k8s.io/v1beta3 +kind: InitConfiguration +localAPIEndpoint: + advertiseAddress: 1.1.1.1 + bindPort: 8443 +bootstrapTokens: + - groups: + - system:bootstrappers:kubeadm:default-node-token + ttl: 24h0m0s + usages: + - signing + - authentication +nodeRegistration: + criSocket: /var/run/dockershim.sock + name: "mk" + kubeletExtraArgs: + node-ip: 1.1.1.1 + taints: [] +--- +apiVersion: kubeadm.k8s.io/v1beta3 +kind: ClusterConfiguration +apiServer: + certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] + extraArgs: + enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" + fail-no-swap: "true" +controllerManager: + extraArgs: + allocate-node-cidrs: "true" + kube-api-burst: "32" + leader-elect: "false" +scheduler: + extraArgs: + leader-elect: "false" + scheduler-name: "mini-scheduler" +certificatesDir: /var/lib/minikube/certs +clusterName: mk +controlPlaneEndpoint: control-plane.minikube.internal:8443 +etcd: + local: + dataDir: /var/lib/minikube/etcd + extraArgs: + proxy-refresh-interval: "70000" +kubernetesVersion: v1.25.0-beta.0 +networking: + dnsDomain: cluster.local + podSubnet: "10.244.0.0/16" + serviceSubnet: 10.96.0.0/12 +--- +apiVersion: kubelet.config.k8s.io/v1beta1 +kind: KubeletConfiguration +authentication: + x509: + clientCAFile: /var/lib/minikube/certs/ca.crt +cgroupDriver: systemd +clusterDomain: "cluster.local" +# disable disk resource management by default +imageGCHighThresholdPercent: 100 +evictionHard: + nodefs.available: "0%" + nodefs.inodesFree: "0%" + imagefs.available: "0%" +failSwapOn: false +staticPodPath: /etc/kubernetes/manifests +--- +apiVersion: kubeproxy.config.k8s.io/v1alpha1 +kind: KubeProxyConfiguration +clusterCIDR: "10.244.0.0/16" +metricsBindAddress: 0.0.0.0:10249 +conntrack: + maxPerCore: 0 +# Skip setting "net.netfilter.nf_conntrack_tcp_timeout_established" + tcpEstablishedTimeout: 0s +# Skip setting "net.netfilter.nf_conntrack_tcp_timeout_close" + tcpCloseWaitTimeout: 0s +mode: "iptables" diff --git a/pkg/minikube/constants/constants.go b/pkg/minikube/constants/constants.go index 3233e23015..b5fb320acc 100644 --- a/pkg/minikube/constants/constants.go +++ b/pkg/minikube/constants/constants.go @@ -35,7 +35,7 @@ const ( DefaultKubernetesVersion = "v1.24.3" // NewestKubernetesVersion is the newest Kubernetes version to test against // NOTE: You may need to update coreDNS & etcd versions in pkg/minikube/bootstrapper/images/images.go - NewestKubernetesVersion = "v1.24.3" + NewestKubernetesVersion = "v1.25.0-beta.0" // OldestKubernetesVersion is the oldest Kubernetes version to test against OldestKubernetesVersion = "v1.16.0" // NoKubernetesVersion is the version used when users does NOT want to install kubernetes diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index 341b4a7575..749e2e4931 100644 --- a/site/content/en/docs/commands/start.md +++ b/site/content/en/docs/commands/start.md @@ -71,7 +71,7 @@ minikube start [flags] --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/iso/minikube-v1.26.1-amd64.iso,https://github.com/kubernetes/minikube/releases/download/v1.26.1/minikube-v1.26.1-amd64.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.26.1-amd64.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.24.3, 'latest' for v1.24.3). Defaults to 'stable'. + --kubernetes-version string The Kubernetes version that the minikube VM will use (ex: v1.2.3, 'stable' for v1.24.3, 'latest' for v1.25.0-beta.0). Defaults to 'stable'. --kvm-gpu Enable experimental NVIDIA GPU support in minikube --kvm-hidden Hide the hypervisor signature from the guest in minikube (kvm2 driver only) --kvm-network string The KVM default network name. (kvm2 driver only) (default "default") From 73abb160b576fd3e10c8ac381be242bb16c78215 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 8 Aug 2022 10:02:18 +0000 Subject: [PATCH 382/545] bump golint versions --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 924655be04..a1d1e11718 100644 --- a/Makefile +++ b/Makefile @@ -76,7 +76,7 @@ MINIKUBE_RELEASES_URL=https://github.com/kubernetes/minikube/releases/download KERNEL_VERSION ?= 5.10.57 # latest from https://github.com/golangci/golangci-lint/releases # update this only by running `make update-golint-version` -GOLINT_VERSION ?= v1.47.2 +GOLINT_VERSION ?= v1.48.0 # Limit number of default jobs, to avoid the CI builds running out of memory GOLINT_JOBS ?= 4 # see https://github.com/golangci/golangci-lint#memory-usage-of-golangci-lint From 744187868db57d098ebc1263497059fa565a45d5 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Mon, 8 Aug 2022 09:29:19 -0700 Subject: [PATCH 383/545] fix linting --- cmd/performance/pr-bot/bot.go | 6 +++--- deploy/minikube/release_sanity_test.go | 6 ++++-- .../test-flake-chart/compute_flake_rate.go | 15 ++++++++------- .../golint_version/update_golint_version.go | 1 - pkg/drivers/kic/oci/types.go | 19 +++++++++++-------- pkg/gvisor/enable.go | 13 +++++++------ .../bootstrapper/bsutil/kubeadm_test.go | 3 ++- .../bootstrapper/bsutil/kverify/kverify.go | 2 +- pkg/minikube/cni/calico.go | 1 + pkg/minikube/image/image.go | 9 +++++---- pkg/minikube/machine/info.go | 4 ++-- pkg/minikube/tunnel/route_windows_test.go | 2 +- pkg/network/network.go | 10 ++++++---- test/integration/json_output_test.go | 2 +- test/integration/start_stop_delete_test.go | 11 +++++++---- translations/translations.go | 1 + 16 files changed, 60 insertions(+), 45 deletions(-) diff --git a/cmd/performance/pr-bot/bot.go b/cmd/performance/pr-bot/bot.go index 340c4ef8f4..106c446f4b 100644 --- a/cmd/performance/pr-bot/bot.go +++ b/cmd/performance/pr-bot/bot.go @@ -37,9 +37,9 @@ func main() { } // analyzePerformance is responsible for: -// 1. collecting PRs to run performance analysis on -// 2. running mkcmp against those PRs -// 3. commenting results on those PRs +// 1. collecting PRs to run performance analysis on +// 2. running mkcmp against those PRs +// 3. commenting results on those PRs func analyzePerformance(ctx context.Context) error { client := monitor.NewClient(ctx, monitor.GithubOwner, monitor.GithubRepo) prs, err := client.ListOpenPRsWithLabel(monitor.OkToTestLabel) diff --git a/deploy/minikube/release_sanity_test.go b/deploy/minikube/release_sanity_test.go index 4dd248dae0..d1663c8ccc 100644 --- a/deploy/minikube/release_sanity_test.go +++ b/deploy/minikube/release_sanity_test.go @@ -46,7 +46,8 @@ func getSHAFromURL(url string) (string, error) { } // TestReleasesJSON checks if all *GA* releases -// enlisted in https://storage.googleapis.com/minikube/releases.json +// +// enlisted in https://storage.googleapis.com/minikube/releases.json // are available to download and have correct hashsum func TestReleasesJSON(t *testing.T) { releases, err := notify.AllVersionsFromURL(notify.GithubMinikubeReleasesURL) @@ -57,7 +58,8 @@ func TestReleasesJSON(t *testing.T) { } // TestBetaReleasesJSON checks if all *BETA* releases -// enlisted in https://storage.googleapis.com/minikube/releases-beta.json +// +// enlisted in https://storage.googleapis.com/minikube/releases-beta.json // are available to download and have correct hashsum func TestBetaReleasesJSON(t *testing.T) { releases, err := notify.AllVersionsFromURL(notify.GithubMinikubeBetaReleasesURL) diff --git a/hack/jenkins/test-flake-chart/compute_flake_rate.go b/hack/jenkins/test-flake-chart/compute_flake_rate.go index 03142cef2b..ca60f3df74 100644 --- a/hack/jenkins/test-flake-chart/compute_flake_rate.go +++ b/hack/jenkins/test-flake-chart/compute_flake_rate.go @@ -58,13 +58,14 @@ func main() { } // One entry of a test run. -// Example: TestEntry { -// name: "TestFunctional/parallel/LogsCmd", -// environment: "Docker_Linux", -// date: time.Now, -// status: "Passed", -// duration: 0.1, -// } +// +// Example: TestEntry { +// name: "TestFunctional/parallel/LogsCmd", +// environment: "Docker_Linux", +// date: time.Now, +// status: "Passed", +// duration: 0.1, +// } type testEntry struct { name string environment string diff --git a/hack/update/golint_version/update_golint_version.go b/hack/update/golint_version/update_golint_version.go index 5c8d38a043..b748e9edb9 100644 --- a/hack/update/golint_version/update_golint_version.go +++ b/hack/update/golint_version/update_golint_version.go @@ -62,7 +62,6 @@ func main() { update.Apply(schema, data) } -// // golintVersions returns stable version in semver format. func golintVersion(ctx context.Context, owner, repo string) (stable string, err error) { // get Kubernetes versions from GitHub Releases diff --git a/pkg/drivers/kic/oci/types.go b/pkg/drivers/kic/oci/types.go index 6b97fe36c9..0b0efb471d 100644 --- a/pkg/drivers/kic/oci/types.go +++ b/pkg/drivers/kic/oci/types.go @@ -84,11 +84,13 @@ https://github.com/kubernetes/kubernetes/blob/063e7ff358fdc8b0916e6f39beedc0d025 // names on disk as opposed to the int32 values, and the serlialzed field names // have been made closer to core/v1 VolumeMount field names // In yaml this looks like: -// containerPath: /foo -// hostPath: /bar -// readOnly: true -// selinuxRelabel: false -// propagation: None +// +// containerPath: /foo +// hostPath: /bar +// readOnly: true +// selinuxRelabel: false +// propagation: None +// // Propagation may be one of: None, HostToContainer, Bidirectional type Mount struct { // Path of the mount within the container. @@ -158,9 +160,10 @@ func ParseMountString(spec string) (m Mount, err error) { // PortMapping specifies a host port mapped into a container port. // In yaml this looks like: -// containerPort: 80 -// hostPort: 8000 -// listenAddress: 127.0.0.1 +// +// containerPort: 80 +// hostPort: 8000 +// listenAddress: 127.0.0.1 type PortMapping struct { // Port within the container. ContainerPort int32 `protobuf:"varint,1,opt,name=container_port,json=containerPort,proto3" json:"containerPort,omitempty"` diff --git a/pkg/gvisor/enable.go b/pkg/gvisor/enable.go index 51200c5d1a..ec74c749f5 100644 --- a/pkg/gvisor/enable.go +++ b/pkg/gvisor/enable.go @@ -43,10 +43,10 @@ const ( ) // Enable follows these steps for enabling gvisor in minikube: -// 1. creates necessary directories for storing binaries and runsc logs -// 2. downloads runsc and gvisor-containerd-shim -// 3. copies necessary containerd config files -// 4. restarts containerd +// 1. creates necessary directories for storing binaries and runsc logs +// 2. downloads runsc and gvisor-containerd-shim +// 3. copies necessary containerd config files +// 4. restarts containerd func Enable() error { if err := makeGvisorDirs(); err != nil { return errors.Wrap(err, "creating directories on node") @@ -149,8 +149,9 @@ func downloadFileToDest(url, dest string) error { } // Must write the following files: -// 1. gvisor-containerd-shim.toml -// 2. gvisor containerd config.toml +// 1. gvisor-containerd-shim.toml +// 2. gvisor containerd config.toml +// // and save the default version of config.toml func copyConfigFiles() error { log.Printf("Storing default config.toml at %s", storedContainerdConfigTomlPath) diff --git a/pkg/minikube/bootstrapper/bsutil/kubeadm_test.go b/pkg/minikube/bootstrapper/bsutil/kubeadm_test.go index ea67f7331f..baa9cebe81 100644 --- a/pkg/minikube/bootstrapper/bsutil/kubeadm_test.go +++ b/pkg/minikube/bootstrapper/bsutil/kubeadm_test.go @@ -122,7 +122,8 @@ func recentReleases(n int) ([]string, error) { return versions, nil } -/** +/* +* This test case has only 1 thing to test and that is the networking/dnsDomain value */ diff --git a/pkg/minikube/bootstrapper/bsutil/kverify/kverify.go b/pkg/minikube/bootstrapper/bsutil/kverify/kverify.go index f938a550d2..08fc7872ad 100644 --- a/pkg/minikube/bootstrapper/bsutil/kverify/kverify.go +++ b/pkg/minikube/bootstrapper/bsutil/kverify/kverify.go @@ -41,7 +41,7 @@ const ( ExtraKey = "extra" ) -// vars related to the --wait flag +// vars related to the --wait flag var ( // DefaultComponents is map of the the default components to wait for DefaultComponents = map[string]bool{APIServerWaitKey: true, SystemPodsWaitKey: true} diff --git a/pkg/minikube/cni/calico.go b/pkg/minikube/cni/calico.go index 9d5ec46287..cd8827311b 100644 --- a/pkg/minikube/cni/calico.go +++ b/pkg/minikube/cni/calico.go @@ -29,6 +29,7 @@ import ( ) // https://docs.projectcalico.org/manifests/calico.yaml +// //go:embed calico.yaml var calicoYaml string diff --git a/pkg/minikube/image/image.go b/pkg/minikube/image/image.go index b66b240acb..6214b53386 100644 --- a/pkg/minikube/image/image.go +++ b/pkg/minikube/image/image.go @@ -302,10 +302,11 @@ func cleanImageCacheDir() error { // normalizeTagName automatically tag latest to image // Example: -// nginx -> nginx:latest -// localhost:5000/nginx -> localhost:5000/nginx:latest -// localhost:5000/nginx:latest -> localhost:5000/nginx:latest -// docker.io/dotnet/core/sdk -> docker.io/dotnet/core/sdk:latest +// +// nginx -> nginx:latest +// localhost:5000/nginx -> localhost:5000/nginx:latest +// localhost:5000/nginx:latest -> localhost:5000/nginx:latest +// docker.io/dotnet/core/sdk -> docker.io/dotnet/core/sdk:latest func normalizeTagName(image string) string { base := image tag := "latest" diff --git a/pkg/minikube/machine/info.go b/pkg/minikube/machine/info.go index e1a897d0c6..1e28b79984 100644 --- a/pkg/minikube/machine/info.go +++ b/pkg/minikube/machine/info.go @@ -142,7 +142,7 @@ var ( cachedSystemMemoryErr *error ) -// cachedSysMemLimit will return a cached limit for the system's virtual memory. +// cachedSysMemLimit will return a cached limit for the system's virtual memory. func cachedSysMemLimit() (*mem.VirtualMemoryStat, error) { if cachedSystemMemoryLimit == nil { v, err := mem.VirtualMemory() @@ -178,7 +178,7 @@ var ( cachedCPUErr *error ) -// cachedCPUInfo will return a cached cpu info +// cachedCPUInfo will return a cached cpu info func cachedCPUInfo() ([]cpu.InfoStat, error) { if cachedCPU == nil { // one InfoStat per thread diff --git a/pkg/minikube/tunnel/route_windows_test.go b/pkg/minikube/tunnel/route_windows_test.go index 43e8ab6504..88843e4cb7 100644 --- a/pkg/minikube/tunnel/route_windows_test.go +++ b/pkg/minikube/tunnel/route_windows_test.go @@ -139,7 +139,7 @@ Persistent Routes: expectedRt := routingTable{ routingTableLine{ route: unsafeParseRoute("127.0.0.1", "10.96.0.0/12"), - line: " 10.96.0.0 255.240.0.0 127.0.0.1 127.0.0.1 281", + line: " 10.96.0.0 255.240.0.0 127.0.0.1 127.0.0.1 281", }, routingTableLine{ route: unsafeParseRoute("192.168.1.2", "10.211.55.0/24"), diff --git a/pkg/network/network.go b/pkg/network/network.go index 11ab78bf93..cc5ba15f50 100644 --- a/pkg/network/network.go +++ b/pkg/network/network.go @@ -80,8 +80,9 @@ type Interface struct { // lookupInInterfaces iterates over all local network interfaces // and tries to match "ip" with associated networks // returns (network parameters, ip network, nil) if found -// (nil, nil, nil) it nof -// (nil, nil, error) if any error happened +// +// (nil, nil, nil) it nof +// (nil, nil, error) if any error happened func lookupInInterfaces(ip net.IP) (*Parameters, *net.IPNet, error) { // check local network interfaces ifaces, err := net.Interfaces() @@ -255,8 +256,9 @@ func FreeSubnet(startSubnet string, step, tries int) (*Parameters, error) { } // reserveSubnet returns if subnet was successfully reserved for given period: -// - false, if it already has unexpired reservation -// - true, if new reservation was created or expired one renewed +// - false, if it already has unexpired reservation +// - true, if new reservation was created or expired one renewed +// // uses sync.Map to manage reservations thread-safe func reserveSubnet(subnet string, period time.Duration) bool { // put 'zero' reservation{} Map value for subnet Map key diff --git a/test/integration/json_output_test.go b/test/integration/json_output_test.go index 72eda4bb5c..0f4e53debb 100644 --- a/test/integration/json_output_test.go +++ b/test/integration/json_output_test.go @@ -102,7 +102,7 @@ func TestJSONOutput(t *testing.T) { } } -// validateDistinctCurrentSteps makes sure each step has a distinct step number +// validateDistinctCurrentSteps makes sure each step has a distinct step number func validateDistinctCurrentSteps(ctx context.Context, t *testing.T, ces []*cloudEvent) { steps := map[string]string{} for _, ce := range ces { diff --git a/test/integration/start_stop_delete_test.go b/test/integration/start_stop_delete_test.go index 3f249f06d8..54bd85e0ad 100644 --- a/test/integration/start_stop_delete_test.go +++ b/test/integration/start_stop_delete_test.go @@ -445,11 +445,14 @@ func testPause(ctx context.Context, t *testing.T, profile string) { // Remove container-specific prefixes for naming consistency // for example in `docker` runtime we get this: -// $ docker@minikube:~$ sudo crictl images -o json | grep dash -// "kubernetesui/dashboard:vX.X.X" +// +// $ docker@minikube:~$ sudo crictl images -o json | grep dash +// "kubernetesui/dashboard:vX.X.X" +// // but for 'containerd' we get full name -// $ docker@minikube:~$ sudo crictl images -o json | grep dash -// "docker.io/kubernetesui/dashboard:vX.X.X" +// +// $ docker@minikube:~$ sudo crictl images -o json | grep dash +// "docker.io/kubernetesui/dashboard:vX.X.X" func trimImageName(name string) string { name = strings.TrimPrefix(name, "docker.io/") name = strings.TrimPrefix(name, "localhost/") diff --git a/translations/translations.go b/translations/translations.go index 2407a74dc2..d2283705db 100644 --- a/translations/translations.go +++ b/translations/translations.go @@ -19,5 +19,6 @@ package translations import "embed" // Translations contains all translation JSON files. +// //go:embed *.json var Translations embed.FS From 19c432900e122bde3557ae89dfccca486fb21dbf Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 8 Aug 2022 17:05:03 +0000 Subject: [PATCH 384/545] Update auto-generated docs and translations --- site/content/en/docs/contrib/tests.en.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/content/en/docs/contrib/tests.en.md b/site/content/en/docs/contrib/tests.en.md index 4e807d0bb5..5b375c64d5 100644 --- a/site/content/en/docs/contrib/tests.en.md +++ b/site/content/en/docs/contrib/tests.en.md @@ -428,7 +428,7 @@ tests ingress-dns addon activation makes sure json output works properly for the start, pause, unpause, and stop commands #### validateDistinctCurrentSteps - validateDistinctCurrentSteps makes sure each step has a distinct step number +makes sure each step has a distinct step number #### validateIncreasingCurrentSteps verifies that for a successful minikube start, 'current step' should be increasing From 2482b4e4de30c668024d342ab50053db11921048 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Mon, 8 Aug 2022 10:20:13 -0700 Subject: [PATCH 385/545] fix unit tests on macOS arm64 --- cmd/minikube/cmd/config/get_test.go | 6 +++--- cmd/minikube/cmd/config/set_test.go | 6 +++--- pkg/minikube/driver/driver_test.go | 8 ++++---- pkg/util/utils_test.go | 3 +-- 4 files changed, 11 insertions(+), 12 deletions(-) diff --git a/cmd/minikube/cmd/config/get_test.go b/cmd/minikube/cmd/config/get_test.go index 34d5b0ffac..56a199e21c 100644 --- a/cmd/minikube/cmd/config/get_test.go +++ b/cmd/minikube/cmd/config/get_test.go @@ -31,7 +31,7 @@ func TestGetNotFound(t *testing.T) { func TestGetOK(t *testing.T) { createTestConfig(t) name := "driver" - err := Set(name, "virtualbox") + err := Set(name, "ssh") if err != nil { t.Fatalf("Set returned error for property %s, %+v", name, err) } @@ -39,7 +39,7 @@ func TestGetOK(t *testing.T) { if err != nil { t.Fatalf("Get returned error for property %s, %+v", name, err) } - if val != "virtualbox" { - t.Fatalf("Get returned %s, expected virtualbox", val) + if val != "ssh" { + t.Fatalf("Get returned %s, expected ssh", val) } } diff --git a/cmd/minikube/cmd/config/set_test.go b/cmd/minikube/cmd/config/set_test.go index d789595b4a..8dfb6f1e76 100644 --- a/cmd/minikube/cmd/config/set_test.go +++ b/cmd/minikube/cmd/config/set_test.go @@ -45,7 +45,7 @@ func TestSetNotAllowed(t *testing.T) { func TestSetOK(t *testing.T) { createTestConfig(t) - err := Set("driver", "virtualbox") + err := Set("driver", "ssh") defer func() { err = Unset("driver") if err != nil { @@ -59,8 +59,8 @@ func TestSetOK(t *testing.T) { if err != nil { t.Fatalf("Get returned error for valid property: %+v", err) } - if val != "virtualbox" { - t.Fatalf("Get returned %s, expected \"virtualbox\"", val) + if val != "ssh" { + t.Fatalf("Get returned %s, expected \"ssh\"", val) } } diff --git a/pkg/minikube/driver/driver_test.go b/pkg/minikube/driver/driver_test.go index 0b7806610e..7c0d097365 100644 --- a/pkg/minikube/driver/driver_test.go +++ b/pkg/minikube/driver/driver_test.go @@ -30,19 +30,19 @@ func TestSupportedDrivers(t *testing.T) { got := SupportedDrivers() found := false for _, s := range SupportedDrivers() { - if s == VirtualBox { + if s == SSH { found = true } } if found == false { - t.Errorf("%s not in supported drivers: %v", VirtualBox, got) + t.Errorf("%s not in supported drivers: %v", SSH, got) } } func TestSupported(t *testing.T) { - if !Supported(VirtualBox) { - t.Errorf("Supported(%s) is false", VirtualBox) + if !Supported(SSH) { + t.Errorf("Supported(%s) is false", SSH) } if Supported("yabba?") { t.Errorf("Supported(yabba?) is true") diff --git a/pkg/util/utils_test.go b/pkg/util/utils_test.go index 5b7a17f27d..ea1c63f950 100644 --- a/pkg/util/utils_test.go +++ b/pkg/util/utils_test.go @@ -19,7 +19,6 @@ package util import ( "os" "os/user" - "runtime" "syscall" "testing" @@ -38,7 +37,7 @@ func TestGetBinaryDownloadURL(t *testing.T) { } for _, tt := range testData { - url := GetBinaryDownloadURL(tt.version, tt.platform, runtime.GOARCH) + url := GetBinaryDownloadURL(tt.version, tt.platform, "amd64") if url != tt.expectedURL { t.Fatalf("Expected '%s' but got '%s'", tt.expectedURL, url) } From 5bce362ae96dd5274633431000a4b9d4a55cd984 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 8 Aug 2022 09:02:10 +0000 Subject: [PATCH 386/545] 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/sync-minikube.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-gopogh-version.yml | 2 +- .github/workflows/update-gotestsum-version.yml | 2 +- .github/workflows/update-k8s-versions.yml | 2 +- .github/workflows/update-kubadm-constants.yml | 2 +- .github/workflows/yearly-leaderboard.yml | 2 +- Makefile | 2 +- go.mod | 2 +- hack/jenkins/common.ps1 | 2 +- hack/jenkins/installers/check_install_golang.sh | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3626036419..db34ca52e8 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.3' + GO_VERSION: '1.19' permissions: contents: read diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 409ebb4d0d..a1e7955594 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.3' + GO_VERSION: '1.19' permissions: contents: read diff --git a/.github/workflows/functional_verified.yml b/.github/workflows/functional_verified.yml index 8f5aeedd7e..d18d5bd55a 100644 --- a/.github/workflows/functional_verified.yml +++ b/.github/workflows/functional_verified.yml @@ -22,7 +22,7 @@ on: - deleted env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.18.3' + GO_VERSION: '1.19' permissions: contents: read diff --git a/.github/workflows/leaderboard.yml b/.github/workflows/leaderboard.yml index 4687012c91..071faebdbe 100644 --- a/.github/workflows/leaderboard.yml +++ b/.github/workflows/leaderboard.yml @@ -6,7 +6,7 @@ on: - 'v*-beta.*' env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.18.3' + GO_VERSION: '1.19' permissions: contents: read diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 1695db63bf..9101f9ef61 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.3' + GO_VERSION: '1.19' permissions: contents: read diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 38afb2d132..9c15e5502e 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.3' + GO_VERSION: '1.19' permissions: contents: read diff --git a/.github/workflows/sync-minikube.yml b/.github/workflows/sync-minikube.yml index ee20277a9d..5373c4679e 100644 --- a/.github/workflows/sync-minikube.yml +++ b/.github/workflows/sync-minikube.yml @@ -6,7 +6,7 @@ on: - cron: "0 2,14 * * *" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.18.3' + GO_VERSION: '1.19' permissions: contents: read diff --git a/.github/workflows/time-to-k8s-public-chart.yml b/.github/workflows/time-to-k8s-public-chart.yml index f75c4ebcf2..a30d69f9ad 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.3' + GO_VERSION: '1.19' permissions: contents: read diff --git a/.github/workflows/time-to-k8s.yml b/.github/workflows/time-to-k8s.yml index 034dd99f52..e0dc929c9b 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.3' + GO_VERSION: '1.19' permissions: contents: read diff --git a/.github/workflows/translations.yml b/.github/workflows/translations.yml index 1ebdaf72d4..5c1687bea6 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.3' + GO_VERSION: '1.19' permissions: contents: read diff --git a/.github/workflows/update-golang-version.yml b/.github/workflows/update-golang-version.yml index 744e6607c0..ffc4e452c1 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.3' + GO_VERSION: '1.19' permissions: contents: read diff --git a/.github/workflows/update-golint-version.yml b/.github/workflows/update-golint-version.yml index acd3ae7848..ca5a498d12 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.3' + GO_VERSION: '1.19' permissions: contents: read diff --git a/.github/workflows/update-gopogh-version.yml b/.github/workflows/update-gopogh-version.yml index 372d765d87..8719546dd2 100644 --- a/.github/workflows/update-gopogh-version.yml +++ b/.github/workflows/update-gopogh-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 9 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.18.3' + GO_VERSION: '1.19' permissions: contents: read diff --git a/.github/workflows/update-gotestsum-version.yml b/.github/workflows/update-gotestsum-version.yml index d881a89350..d3778f51b1 100644 --- a/.github/workflows/update-gotestsum-version.yml +++ b/.github/workflows/update-gotestsum-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.18.3' + GO_VERSION: '1.19' permissions: contents: read diff --git a/.github/workflows/update-k8s-versions.yml b/.github/workflows/update-k8s-versions.yml index f6fb9345d7..c052fb22bf 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.3' + GO_VERSION: '1.19' permissions: contents: read diff --git a/.github/workflows/update-kubadm-constants.yml b/.github/workflows/update-kubadm-constants.yml index 9a888d582e..1f65c1dc8f 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.3' + GO_VERSION: '1.19' permissions: contents: read diff --git a/.github/workflows/yearly-leaderboard.yml b/.github/workflows/yearly-leaderboard.yml index 0db48b76d5..9c14b112fb 100644 --- a/.github/workflows/yearly-leaderboard.yml +++ b/.github/workflows/yearly-leaderboard.yml @@ -6,7 +6,7 @@ on: - cron: "0 0 2 * *" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.18.3' + GO_VERSION: '1.19' permissions: contents: read diff --git a/Makefile b/Makefile index a1d1e11718..9ef9bb50b8 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.3 +GO_VERSION ?= 1.19 # update this only by running `make update-golang-version` GO_K8S_VERSION_PREFIX ?= v1.25.0 diff --git a/go.mod b/go.mod index 8edf03113f..1d0d57ed03 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module k8s.io/minikube -go 1.18 +go 1.19 require ( cloud.google.com/go/storage v1.24.0 diff --git a/hack/jenkins/common.ps1 b/hack/jenkins/common.ps1 index 9443394feb..6fe2a3c268 100644 --- a/hack/jenkins/common.ps1 +++ b/hack/jenkins/common.ps1 @@ -30,7 +30,7 @@ function Write-GithubStatus { $env:SHORT_COMMIT=$env:COMMIT.substring(0, 7) $gcs_bucket="minikube-builds/logs/$env:MINIKUBE_LOCATION/$env:ROOT_JOB_ID" $env:MINIKUBE_SUPPRESS_DOCKER_PERFORMANCE="true" -$GoVersion = "1.18.3" +$GoVersion = "1.19" # Docker's kubectl breaks things, and comes earlier in the path than the regular kubectl. So download the expected kubectl and replace Docker's version. $KubeVersion = (Invoke-WebRequest -Uri 'https://storage.googleapis.com/kubernetes-release/release/stable.txt' -UseBasicParsing).Content diff --git a/hack/jenkins/installers/check_install_golang.sh b/hack/jenkins/installers/check_install_golang.sh index fc18399a49..1ed3769ed2 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.3 +VERSION_TO_INSTALL=1.19 INSTALL_PATH=${1} function current_arch() { From 7ac17524c781ca69d5c9af5a3127daddca2896ab Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Mon, 8 Aug 2022 12:18:27 -0700 Subject: [PATCH 387/545] fix arm64 preload upload --- hack/preload-images/upload.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/preload-images/upload.go b/hack/preload-images/upload.go index be9339b5ab..ed4386343b 100644 --- a/hack/preload-images/upload.go +++ b/hack/preload-images/upload.go @@ -67,7 +67,7 @@ func getVersionsFromFilename(filename string) (string, string) { preloadVersion := parts[3] k8sVersion := parts[4] // this check is for "-rc" and "-beta" versions that would otherwise be stripped off - if len(parts) == 9 { + if len(parts) >= 9 && parts[5] != "cri" { k8sVersion += fmt.Sprintf("-%s", parts[5]) } return preloadVersion, k8sVersion From 28f5405f83b7c3be87f52d1084b94eed6ce41945 Mon Sep 17 00:00:00 2001 From: klaases Date: Mon, 8 Aug 2022 14:08:24 -0700 Subject: [PATCH 388/545] Mark roadmap items as complete --- site/content/en/docs/contrib/roadmap.en.md | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/site/content/en/docs/contrib/roadmap.en.md b/site/content/en/docs/contrib/roadmap.en.md index df3fd377d9..6b8fab97aa 100644 --- a/site/content/en/docs/contrib/roadmap.en.md +++ b/site/content/en/docs/contrib/roadmap.en.md @@ -14,25 +14,25 @@ Please send a PR to suggest any improvements to it. ## (#1) GUI -- [ ] Be able to start, stop, pause, and delete clusters via a GUI -- [ ] Application available for all supported platforms: Linux, macOS, Windows +- [x] Be able to start, stop, pause, and delete clusters via a GUI (prototype state) +- [x] Application available for all supported platforms: Linux, macOS, Windows ## (#2) Documentation -- [ ] Consolidate Kubernetes documentation that references minikube -- [ ] Delete outdated documentation -- [ ] Add documentation for new features +- [x] Consolidate Kubernetes documentation that references minikube +- [x] Delete outdated documentation +- [x] Add documentation for new features ## (#3) ARM64 Support -- [ ] Add Linux VM support -- [ ] Add Mac M1 VM support +- [x] Add Linux VM support +- [x] Add Mac M1 VM support (experimental, will improve by end of 2022) ## (#4) Docker -- [ ] Remove the Docker Desktop requirement on Mac and Windows -- [ ] Continue supporting Docker as a container runtime (with CRI) +- [x] Remove the Docker Desktop requirement on Mac and Windows +- [x] Continue supporting Docker as a container runtime (with CRI) ## (#5) libmachine Refactor -- [ ] Add new driver (with QEMU) to replace HyperKit, primarily for Mac arm64 -- [ ] Fix the provisioner, remove legacy Swarm, and add support for other runtimes +- [x] Add new driver (with QEMU) to replace HyperKit, primarily for Mac arm64 +- [x] Fix the provisioner, remove legacy Swarm, and add support for other runtimes From 97212e18ac49283ca9279853d947a4c2539a5965 Mon Sep 17 00:00:00 2001 From: klaases Date: Mon, 8 Aug 2022 14:15:39 -0700 Subject: [PATCH 389/545] status udpates --- site/content/en/docs/contrib/roadmap.en.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/site/content/en/docs/contrib/roadmap.en.md b/site/content/en/docs/contrib/roadmap.en.md index 6b8fab97aa..f362984867 100644 --- a/site/content/en/docs/contrib/roadmap.en.md +++ b/site/content/en/docs/contrib/roadmap.en.md @@ -19,9 +19,9 @@ Please send a PR to suggest any improvements to it. ## (#2) Documentation -- [x] Consolidate Kubernetes documentation that references minikube -- [x] Delete outdated documentation -- [x] Add documentation for new features +- [ ] Consolidate Kubernetes documentation that references minikube +- [ ] Delete outdated documentation +- [ ] Add documentation for new features ## (#3) ARM64 Support @@ -29,10 +29,10 @@ Please send a PR to suggest any improvements to it. - [x] Add Mac M1 VM support (experimental, will improve by end of 2022) ## (#4) Docker -- [x] Remove the Docker Desktop requirement on Mac and Windows +- [ ] Remove the Docker Desktop requirement on Mac and Windows - [x] Continue supporting Docker as a container runtime (with CRI) ## (#5) libmachine Refactor -- [x] Add new driver (with QEMU) to replace HyperKit, primarily for Mac arm64 -- [x] Fix the provisioner, remove legacy Swarm, and add support for other runtimes +- [x] Add new driver (with QEMU) to replace HyperKit, primarily for Mac arm64 (experimental, will improve by end of 2022) +- [ ] Fix the provisioner, remove legacy Swarm, and add support for other runtimes From cd0b3f977aedd41708a90eb4861d0042d0f9a72a Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Mon, 8 Aug 2022 15:50:35 -0700 Subject: [PATCH 390/545] remove duplicated k8s versions from preload generation --- hack/preload-images/preload_images.go | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/hack/preload-images/preload_images.go b/hack/preload-images/preload_images.go index e119237ab1..4e676f7c39 100644 --- a/hack/preload-images/preload_images.go +++ b/hack/preload-images/preload_images.go @@ -129,11 +129,26 @@ func collectK8sVers() ([]string, error) { } k8sVersions = recent } - return append([]string{ + versions := append([]string{ constants.DefaultKubernetesVersion, constants.NewestKubernetesVersion, constants.OldestKubernetesVersion, - }, k8sVersions...), nil + }, k8sVersions...) + return removeDuplicates(versions), nil +} + +func removeDuplicates(versions []string) []string { + prevVersions := make(map[string]bool) + for i := 0; i < len(versions); i++ { + v := versions[i] + if ok := prevVersions[v]; !ok { + prevVersions[v] = true + continue + } + versions = append(versions[:i], versions[i+1:]...) + i-- + } + return versions } func makePreload(cfg preloadCfg) error { From d64b6e4143df4e97a768b8b43cab5596265ea6b0 Mon Sep 17 00:00:00 2001 From: klaases Date: Mon, 8 Aug 2022 15:53:51 -0700 Subject: [PATCH 391/545] Document qemu start and default commands --- site/content/en/docs/drivers/qemu.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/site/content/en/docs/drivers/qemu.md b/site/content/en/docs/drivers/qemu.md index 23167b1e5b..a685869bd6 100644 --- a/site/content/en/docs/drivers/qemu.md +++ b/site/content/en/docs/drivers/qemu.md @@ -13,6 +13,20 @@ The `qemu` driver users QEMU (system) for VM creation. +## Usage + +To start minikube with the qemu driver: + +```shell +minikube start --driver=qemu +``` + +To make qemu the default driver: + +```shell +minikube config set driver qemu +``` + ## Issues * [Full list of open 'qemu' driver issues](https://github.com/kubernetes/minikube/labels/co%2Fqemu-driver) From 99cd54a12332e3c644dce6dd9a56dbca53de30fc Mon Sep 17 00:00:00 2001 From: klaases Date: Mon, 8 Aug 2022 16:54:06 -0700 Subject: [PATCH 392/545] add documentation for flag: 'qemu-firmware-path' --- site/content/en/docs/drivers/qemu.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/site/content/en/docs/drivers/qemu.md b/site/content/en/docs/drivers/qemu.md index 23167b1e5b..8e3dedb4c3 100644 --- a/site/content/en/docs/drivers/qemu.md +++ b/site/content/en/docs/drivers/qemu.md @@ -13,6 +13,13 @@ The `qemu` driver users QEMU (system) for VM creation. +## Special features + +minikube start supports some qemu specific flags: + +* **`--qemu-firmware-path`**: The path to the firmware image to be used. + * Note: if this flag does not take effect, try removing the file `~/.minikube` which may have a reference to this setting. + ## Issues * [Full list of open 'qemu' driver issues](https://github.com/kubernetes/minikube/labels/co%2Fqemu-driver) From 6f7c585ad72771d4dbcc6d19a51b60222a81ea3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anders=20F=20Bj=C3=B6rklund?= Date: Tue, 9 Aug 2022 22:10:47 +0200 Subject: [PATCH 393/545] The DefaultKubernetesRepo changed for 1.25.0 Moving the old images for the old releases would mean having to redo old preloads and old caches, as well... --- pkg/minikube/bootstrapper/images/images.go | 14 +++++------ .../bootstrapper/images/kubeadm_test.go | 20 ++++++++++++++++ pkg/minikube/bootstrapper/images/repo.go | 23 +++++++++++++++---- pkg/minikube/bootstrapper/images/repo_test.go | 23 +++++++++++++++---- pkg/minikube/node/start.go | 11 +++++---- 5 files changed, 71 insertions(+), 20 deletions(-) diff --git a/pkg/minikube/bootstrapper/images/images.go b/pkg/minikube/bootstrapper/images/images.go index 81f6210064..eb37ad053b 100644 --- a/pkg/minikube/bootstrapper/images/images.go +++ b/pkg/minikube/bootstrapper/images/images.go @@ -51,10 +51,10 @@ func Pause(v semver.Version, mirror string) string { if pVersion, ok := constants.KubeadmImages[majorMinorVersion][imageName]; ok { pv = pVersion } else { - pv = findLatestTagFromRepository(fmt.Sprintf(tagURLTemplate, kubernetesRepo(mirror), imageName), pv) + pv = findLatestTagFromRepository(fmt.Sprintf(tagURLTemplate, kubernetesRepo(mirror, v), imageName), pv) } - return fmt.Sprintf("%s:%s", path.Join(kubernetesRepo(mirror), imageName), pv) + return fmt.Sprintf("%s:%s", path.Join(kubernetesRepo(mirror, v), imageName), pv) } // essentials returns images needed too bootstrap a Kubernetes @@ -74,7 +74,7 @@ func essentials(mirror string, v semver.Version) []string { // componentImage returns a Kubernetes component image to pull func componentImage(name string, v semver.Version, mirror string) string { - return fmt.Sprintf("%s:v%s", path.Join(kubernetesRepo(mirror), name), v) + return fmt.Sprintf("%s:v%s", path.Join(kubernetesRepo(mirror, v), name), v) } // fixes 13136 by getting the latest image version from the k8s.gcr.io repository instead of hardcoded @@ -127,14 +127,14 @@ func coreDNS(v semver.Version, mirror string) string { if cVersion, ok := constants.KubeadmImages[majorMinorVersion][imageName]; ok { cv = cVersion } else { - cv = findLatestTagFromRepository(fmt.Sprintf(tagURLTemplate, kubernetesRepo(mirror), imageName), cv) + cv = findLatestTagFromRepository(fmt.Sprintf(tagURLTemplate, kubernetesRepo(mirror, v), imageName), cv) } if mirror == constants.AliyunMirror { imageName = "coredns" } - return fmt.Sprintf("%s:%s", path.Join(kubernetesRepo(mirror), imageName), cv) + return fmt.Sprintf("%s:%s", path.Join(kubernetesRepo(mirror, v), imageName), cv) } // etcd returns the image used for etcd @@ -148,10 +148,10 @@ func etcd(v semver.Version, mirror string) string { if eVersion, ok := constants.KubeadmImages[majorMinorVersion][imageName]; ok { ev = eVersion } else { - ev = findLatestTagFromRepository(fmt.Sprintf(tagURLTemplate, kubernetesRepo(mirror), imageName), ev) + ev = findLatestTagFromRepository(fmt.Sprintf(tagURLTemplate, kubernetesRepo(mirror, v), imageName), ev) } - return fmt.Sprintf("%s:%s", path.Join(kubernetesRepo(mirror), imageName), ev) + return fmt.Sprintf("%s:%s", path.Join(kubernetesRepo(mirror, v), imageName), ev) } // auxiliary returns images that are helpful for running minikube diff --git a/pkg/minikube/bootstrapper/images/kubeadm_test.go b/pkg/minikube/bootstrapper/images/kubeadm_test.go index 150a3a9bff..eba62f2561 100644 --- a/pkg/minikube/bootstrapper/images/kubeadm_test.go +++ b/pkg/minikube/bootstrapper/images/kubeadm_test.go @@ -34,6 +34,26 @@ func TestKubeadmImages(t *testing.T) { {"invalid", "", true, nil}, {"v0.0.1", "", true, nil}, // too old {"v2.0.0", "", true, nil}, // too new + {"v1.25.0", "", false, []string{ + "registry.k8s.io/kube-apiserver:v1.25.0", + "registry.k8s.io/kube-controller-manager:v1.25.0", + "registry.k8s.io/kube-scheduler:v1.25.0", + "registry.k8s.io/kube-proxy:v1.25.0", + "registry.k8s.io/coredns/coredns:v1.9.3", + "registry.k8s.io/etcd:3.5.4-0", + "registry.k8s.io/pause:3.8", + "gcr.io/k8s-minikube/storage-provisioner:" + version.GetStorageProvisionerVersion(), + }}, + {"v1.24.0", "", false, []string{ + "k8s.gcr.io/kube-apiserver:v1.24.0", + "k8s.gcr.io/kube-controller-manager:v1.24.0", + "k8s.gcr.io/kube-scheduler:v1.24.0", + "k8s.gcr.io/kube-proxy:v1.24.0", + "k8s.gcr.io/coredns/coredns:v1.8.6", + "k8s.gcr.io/etcd:3.5.3-0", + "k8s.gcr.io/pause:3.7", + "gcr.io/k8s-minikube/storage-provisioner:" + version.GetStorageProvisionerVersion(), + }}, {"v1.17.0", "", false, []string{ "k8s.gcr.io/kube-proxy:v1.17.0", "k8s.gcr.io/kube-scheduler:v1.17.0", diff --git a/pkg/minikube/bootstrapper/images/repo.go b/pkg/minikube/bootstrapper/images/repo.go index dbd25d4548..956d9d13f8 100644 --- a/pkg/minikube/bootstrapper/images/repo.go +++ b/pkg/minikube/bootstrapper/images/repo.go @@ -16,13 +16,28 @@ limitations under the License. package images -// DefaultKubernetesRepo is the default Kubernetes repository -const DefaultKubernetesRepo = "k8s.gcr.io" +import ( + "github.com/blang/semver/v4" +) + +// OldDefaultKubernetesRepo is the old default Kubernetes repository +const OldDefaultKubernetesRepo = "k8s.gcr.io" + +// NewDefaultKubernetesRepo is the new default Kubernetes repository +const NewDefaultKubernetesRepo = "registry.k8s.io" // kubernetesRepo returns the official Kubernetes repository, or an alternate -func kubernetesRepo(mirror string) string { +func kubernetesRepo(mirror string, v semver.Version) string { if mirror != "" { return mirror } - return DefaultKubernetesRepo + return DefaultKubernetesRepo(v) +} + +func DefaultKubernetesRepo(kv semver.Version) string { + // these (-1.24) should probably be moved too + if kv.LT(semver.MustParse("1.25.0-alpha.1")) { + return OldDefaultKubernetesRepo + } + return NewDefaultKubernetesRepo } diff --git a/pkg/minikube/bootstrapper/images/repo_test.go b/pkg/minikube/bootstrapper/images/repo_test.go index 5621003dda..9167befd7a 100644 --- a/pkg/minikube/bootstrapper/images/repo_test.go +++ b/pkg/minikube/bootstrapper/images/repo_test.go @@ -19,25 +19,40 @@ package images import ( "testing" + "github.com/blang/semver/v4" "github.com/google/go-cmp/cmp" ) func Test_kubernetesRepo(t *testing.T) { + kv := semver.MustParse("1.23.0") tests := []struct { - mirror string - want string + mirror string + version semver.Version + want string }{ { "", - DefaultKubernetesRepo, + kv, + DefaultKubernetesRepo(kv), }, { "mirror.k8s.io", + kv, "mirror.k8s.io", }, + { + "", + semver.MustParse("1.24.0"), + OldDefaultKubernetesRepo, + }, + { + "", + semver.MustParse("1.25.0"), + NewDefaultKubernetesRepo, + }, } for _, tc := range tests { - got := kubernetesRepo(tc.mirror) + got := kubernetesRepo(tc.mirror, tc.version) if !cmp.Equal(got, tc.want) { t.Errorf("mirror miss match, want: %s, got: %s", tc.want, got) } diff --git a/pkg/minikube/node/start.go b/pkg/minikube/node/start.go index 076405202a..2217f52f25 100644 --- a/pkg/minikube/node/start.go +++ b/pkg/minikube/node/start.go @@ -556,7 +556,7 @@ func startMachine(cfg *config.ClusterConfig, node *config.Node, delOnFail bool) return runner, preExists, m, host, errors.Wrap(err, "Failed to get command runner") } - ip, err := validateNetwork(host, runner, cfg.KubernetesConfig.ImageRepository) + ip, err := validateNetwork(host, runner, cfg.KubernetesConfig.ImageRepository, cfg.KubernetesConfig.KubernetesVersion) if err != nil { return runner, preExists, m, host, errors.Wrap(err, "Failed to validate network") } @@ -639,7 +639,7 @@ func startHostInternal(api libmachine.API, cc *config.ClusterConfig, n *config.N } // validateNetwork tries to catch network problems as soon as possible -func validateNetwork(h *host.Host, r command.Runner, imageRepository string) (string, error) { +func validateNetwork(h *host.Host, r command.Runner, imageRepository string, kubernetesVersion string) (string, error) { ip, err := h.Driver.GetIP() if err != nil { return ip, err @@ -671,7 +671,7 @@ func validateNetwork(h *host.Host, r command.Runner, imageRepository string) (st } // Non-blocking - go tryRegistry(r, h.Driver.DriverName(), imageRepository) + go tryRegistry(r, h.Driver.DriverName(), imageRepository, kubernetesVersion) return ip, nil } @@ -716,7 +716,7 @@ func trySSH(h *host.Host, ip string) error { } // tryRegistry tries to connect to the image repository -func tryRegistry(r command.Runner, driverName string, imageRepository string) { +func tryRegistry(r command.Runner, driverName string, imageRepository string, kubernetesVersion string) { // 2 second timeout. For best results, call tryRegistry in a non-blocking manner. opts := []string{"-sS", "-m", "2"} @@ -726,7 +726,8 @@ func tryRegistry(r command.Runner, driverName string, imageRepository string) { } if imageRepository == "" { - imageRepository = images.DefaultKubernetesRepo + v, _ := util.ParseKubernetesVersion(kubernetesVersion) + imageRepository = images.DefaultKubernetesRepo(v) } opts = append(opts, fmt.Sprintf("https://%s/", imageRepository)) From 5569f037386c49b316fa6edfcd58ea3541213532 Mon Sep 17 00:00:00 2001 From: klaases Date: Tue, 9 Aug 2022 14:01:09 -0700 Subject: [PATCH 394/545] remove default driver documentation --- site/content/en/docs/drivers/qemu.md | 6 ------ 1 file changed, 6 deletions(-) diff --git a/site/content/en/docs/drivers/qemu.md b/site/content/en/docs/drivers/qemu.md index a685869bd6..f8824fa4ef 100644 --- a/site/content/en/docs/drivers/qemu.md +++ b/site/content/en/docs/drivers/qemu.md @@ -21,12 +21,6 @@ To start minikube with the qemu driver: minikube start --driver=qemu ``` -To make qemu the default driver: - -```shell -minikube config set driver qemu -``` - ## Issues * [Full list of open 'qemu' driver issues](https://github.com/kubernetes/minikube/labels/co%2Fqemu-driver) From 0972837f485bf5e05dc1ae759b8f9ebbc1f4623f Mon Sep 17 00:00:00 2001 From: klaases Date: Tue, 9 Aug 2022 14:12:55 -0700 Subject: [PATCH 395/545] Add Macports installation documentation --- site/content/en/docs/drivers/qemu.md | 1 + 1 file changed, 1 insertion(+) diff --git a/site/content/en/docs/drivers/qemu.md b/site/content/en/docs/drivers/qemu.md index 8e3dedb4c3..12ea109fa2 100644 --- a/site/content/en/docs/drivers/qemu.md +++ b/site/content/en/docs/drivers/qemu.md @@ -19,6 +19,7 @@ minikube start supports some qemu specific flags: * **`--qemu-firmware-path`**: The path to the firmware image to be used. * Note: if this flag does not take effect, try removing the file `~/.minikube` which may have a reference to this setting. + * Macports: if you are installing [minikube](https://ports.macports.org/port/minikube/) and [qemu](https://ports.macports.org/port/qemu/) via Macports on an Mac with M1, use the following flag: `--qemu-firmware-path=/opt/local/share/qemu/edk2-aarch64-code.fd` ## Issues From 8ed0cb71245350be798a4e87041698c5ac7ac74e Mon Sep 17 00:00:00 2001 From: klaases Date: Tue, 9 Aug 2022 14:14:28 -0700 Subject: [PATCH 396/545] fix grammar nit --- site/content/en/docs/drivers/qemu.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/content/en/docs/drivers/qemu.md b/site/content/en/docs/drivers/qemu.md index 12ea109fa2..1e58dbfa22 100644 --- a/site/content/en/docs/drivers/qemu.md +++ b/site/content/en/docs/drivers/qemu.md @@ -19,7 +19,7 @@ minikube start supports some qemu specific flags: * **`--qemu-firmware-path`**: The path to the firmware image to be used. * Note: if this flag does not take effect, try removing the file `~/.minikube` which may have a reference to this setting. - * Macports: if you are installing [minikube](https://ports.macports.org/port/minikube/) and [qemu](https://ports.macports.org/port/qemu/) via Macports on an Mac with M1, use the following flag: `--qemu-firmware-path=/opt/local/share/qemu/edk2-aarch64-code.fd` + * Macports: if you are installing [minikube](https://ports.macports.org/port/minikube/) and [qemu](https://ports.macports.org/port/qemu/) via Macports on a Mac with M1, use the following flag: `--qemu-firmware-path=/opt/local/share/qemu/edk2-aarch64-code.fd` ## Issues From d0fc619adff4f59f6617b59e9f10703401141764 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Tue, 9 Aug 2022 14:27:35 -0700 Subject: [PATCH 397/545] move RemoveDuplicateStrings to util --- hack/preload-images/preload_images.go | 17 ++--------- pkg/minikube/machine/start.go | 11 ++----- pkg/minikube/proxy/proxy.go | 12 ++------ pkg/util/utils.go | 14 +++++++++ pkg/util/utils_test.go | 43 +++++++++++++++++++++++++++ 5 files changed, 63 insertions(+), 34 deletions(-) diff --git a/hack/preload-images/preload_images.go b/hack/preload-images/preload_images.go index 4e676f7c39..6a27e4c0b2 100644 --- a/hack/preload-images/preload_images.go +++ b/hack/preload-images/preload_images.go @@ -32,6 +32,7 @@ import ( "github.com/spf13/viper" "k8s.io/minikube/pkg/minikube/constants" "k8s.io/minikube/pkg/minikube/download" + "k8s.io/minikube/pkg/util" ) const ( @@ -134,21 +135,7 @@ func collectK8sVers() ([]string, error) { constants.NewestKubernetesVersion, constants.OldestKubernetesVersion, }, k8sVersions...) - return removeDuplicates(versions), nil -} - -func removeDuplicates(versions []string) []string { - prevVersions := make(map[string]bool) - for i := 0; i < len(versions); i++ { - v := versions[i] - if ok := prevVersions[v]; !ok { - prevVersions[v] = true - continue - } - versions = append(versions[:i], versions[i+1:]...) - i-- - } - return versions + return util.RemoveDuplicateStrings(versions), nil } func makePreload(cfg preloadCfg) error { diff --git a/pkg/minikube/machine/start.go b/pkg/minikube/machine/start.go index 37f2cc4320..80210f8426 100644 --- a/pkg/minikube/machine/start.go +++ b/pkg/minikube/machine/start.go @@ -51,6 +51,7 @@ import ( "k8s.io/minikube/pkg/minikube/registry" "k8s.io/minikube/pkg/minikube/style" "k8s.io/minikube/pkg/minikube/vmpath" + "k8s.io/minikube/pkg/util" "k8s.io/minikube/pkg/util/lock" ) @@ -108,15 +109,7 @@ func engineOptions(cfg config.ClusterConfig) *engine.Options { // get docker env from user specifiec config dockerEnv = append(dockerEnv, cfg.DockerEnv...) - // remove duplicates - seen := map[string]bool{} - uniqueEnvs := []string{} - for e := range dockerEnv { - if !seen[dockerEnv[e]] { - seen[dockerEnv[e]] = true - uniqueEnvs = append(uniqueEnvs, dockerEnv[e]) - } - } + uniqueEnvs := util.RemoveDuplicateStrings(dockerEnv) o := engine.Options{ Env: uniqueEnvs, diff --git a/pkg/minikube/proxy/proxy.go b/pkg/minikube/proxy/proxy.go index bab3355669..6cdfb96d79 100644 --- a/pkg/minikube/proxy/proxy.go +++ b/pkg/minikube/proxy/proxy.go @@ -29,6 +29,7 @@ import ( "k8s.io/klog/v2" "k8s.io/minikube/pkg/minikube/config" "k8s.io/minikube/pkg/minikube/out" + "k8s.io/minikube/pkg/util" ) // EnvVars are variables we plumb through to the underlying container runtime @@ -184,16 +185,7 @@ func SetDockerEnv() []string { } } - // remove duplicates - seen := map[string]bool{} - uniqueEnvs := []string{} - for e := range config.DockerEnv { - if !seen[config.DockerEnv[e]] { - seen[config.DockerEnv[e]] = true - uniqueEnvs = append(uniqueEnvs, config.DockerEnv[e]) - } - } - config.DockerEnv = uniqueEnvs + config.DockerEnv = util.RemoveDuplicateStrings(config.DockerEnv) return config.DockerEnv } diff --git a/pkg/util/utils.go b/pkg/util/utils.go index 8ce9df808d..a30b9e08e5 100644 --- a/pkg/util/utils.go +++ b/pkg/util/utils.go @@ -109,3 +109,17 @@ func MaybeChownDirRecursiveToMinikubeUser(dir string) error { func ParseKubernetesVersion(version string) (semver.Version, error) { return semver.Make(version[1:]) } + +// RemoveDuplicateStrings takes a string slice and returns a slice without duplicates +func RemoveDuplicateStrings(initial []string) []string { + var result []string + m := make(map[string]bool, len(initial)) + for _, v := range initial { + if _, ok := m[v]; ok { + continue + } + m[v] = true + result = append(result, v) + } + return result +} diff --git a/pkg/util/utils_test.go b/pkg/util/utils_test.go index 5b7a17f27d..a5b1a8fa93 100644 --- a/pkg/util/utils_test.go +++ b/pkg/util/utils_test.go @@ -24,6 +24,7 @@ import ( "testing" "github.com/blang/semver/v4" + "github.com/google/go-cmp/cmp" ) func TestGetBinaryDownloadURL(t *testing.T) { @@ -172,3 +173,45 @@ func TestMaybeChownDirRecursiveToMinikubeUser(t *testing.T) { }) } } + +func TestRemoveDuplicateStrings(t *testing.T) { + testCases := []struct { + desc string + slice []string + want []string + }{ + { + desc: "NoDuplicates", + slice: []string{"alpha", "bravo", "charlie"}, + want: []string{"alpha", "bravo", "charlie"}, + }, + { + desc: "AdjacentDuplicates", + slice: []string{"alpha", "bravo", "bravo", "charlie"}, + want: []string{"alpha", "bravo", "charlie"}, + }, + { + desc: "NonAdjacentDuplicates", + slice: []string{"alpha", "bravo", "alpha", "charlie"}, + want: []string{"alpha", "bravo", "charlie"}, + }, + { + desc: "MultipleDuplicates", + slice: []string{"alpha", "bravo", "alpha", "alpha", "charlie", "charlie", "alpha", "bravo"}, + want: []string{"alpha", "bravo", "charlie"}, + }, + { + desc: "UnsortedDuplicates", + slice: []string{"charlie", "bravo", "alpha", "bravo"}, + want: []string{"charlie", "bravo", "alpha"}, + }, + } + for _, tc := range testCases { + t.Run(tc.desc, func(t *testing.T) { + got := RemoveDuplicateStrings(tc.slice) + if diff := cmp.Diff(got, tc.want); diff != "" { + t.Errorf("RemoveDuplicateStrings(%v) = %v, want: %v", tc.slice, got, tc.want) + } + }) + } +} From dabe7747606ea454c60c82d302dfcee7a1b9286f Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Tue, 9 Aug 2022 14:55:24 -0700 Subject: [PATCH 398/545] fix typos --- pkg/minikube/machine/client.go | 2 +- pkg/minikube/translate/translate_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/minikube/machine/client.go b/pkg/minikube/machine/client.go index e3a5f7d0ca..a111a12a78 100644 --- a/pkg/minikube/machine/client.go +++ b/pkg/minikube/machine/client.go @@ -187,7 +187,7 @@ func (api *LocalClient) Create(h *host.Host) error { { "bootstrapping certificates", func() error { - // Lock is needed to avoid race conditiion in parallel Docker-Env test because issue #10107. + // Lock is needed to avoid race condition in parallel Docker-Env test because issue #10107. // CA cert and client cert should be generated atomically, otherwise might cause bad certificate error. lockErr := api.flock.LockWithTimeout(time.Second * 5) if lockErr != nil { diff --git a/pkg/minikube/translate/translate_test.go b/pkg/minikube/translate/translate_test.go index f24eb215d4..75ae4c2de8 100644 --- a/pkg/minikube/translate/translate_test.go +++ b/pkg/minikube/translate/translate_test.go @@ -134,7 +134,7 @@ func TestTranslationFilesValid(t *testing.T) { func distinctVariables(line string) []string { re := regexp.MustCompile(`{{\..+?}}`) - // get all the variables from the string (possiible duplicates) + // get all the variables from the string (possible duplicates) variables := re.FindAllString(line, -1) distinctMap := make(map[string]bool) From 9659186df70bef7ee81cbb0feda48d84f2c09c82 Mon Sep 17 00:00:00 2001 From: klaases Date: Tue, 9 Aug 2022 16:59:07 -0700 Subject: [PATCH 399/545] improve qemu driver code for readability --- pkg/drivers/qemu/qemu.go | 101 +++++++++++++++++++-------------------- 1 file changed, 49 insertions(+), 52 deletions(-) diff --git a/pkg/drivers/qemu/qemu.go b/pkg/drivers/qemu/qemu.go index 72c5f0ce4c..6e261c3d08 100644 --- a/pkg/drivers/qemu/qemu.go +++ b/pkg/drivers/qemu/qemu.go @@ -100,7 +100,6 @@ func (d *Driver) GetSSHPort() (int, error) { if d.SSHPort == 0 { d.SSHPort = 22 } - return d.SSHPort, nil } @@ -108,7 +107,6 @@ func (d *Driver) GetSSHUsername() string { if d.SSHUser == "" { d.SSHUser = "docker" } - return d.SSHUser } @@ -117,13 +115,12 @@ func (d *Driver) DriverName() string { } func (d *Driver) GetURL() (string, error) { - log.Debugf("GetURL called") if _, err := os.Stat(d.pidfilePath()); err != nil { return "", nil } ip, err := d.GetIP() if err != nil { - log.Warnf("Failed to get IP: %s", err) + log.Warnf("Failed to get IP: %v", err) return "", err } if ip == "" { @@ -170,7 +167,6 @@ func checkPid(pid int) error { } func (d *Driver) GetState() (state.State, error) { - if _, err := os.Stat(d.pidfilePath()); err != nil { return state.Stopped, nil } @@ -191,6 +187,7 @@ func (d *Driver) GetState() (state.State, error) { if err != nil { return state.Error, err } + // RunState is one of: // 'debug', 'inmigrate', 'internal-error', 'io-error', 'paused', // 'postmigrate', 'prelaunch', 'finish-migrate', 'restore-vm', @@ -241,24 +238,24 @@ func (d *Driver) Create() error { return err } - log.Infof("Creating SSH key...") + log.Info("Creating SSH key...") if err := ssh.GenerateSSHKey(d.sshKeyPath()); err != nil { return err } - log.Infof("Creating Disk image...") + log.Info("Creating Disk image...") if err := d.generateDiskImage(d.DiskSize); err != nil { return err } if d.UserDataFile != "" { - log.Infof("Creating Userdata Disk...") + log.Info("Creating Userdata Disk...") if d.CloudConfigRoot, err = d.generateUserdataDisk(d.UserDataFile); err != nil { return err } } - log.Infof("Starting QEMU VM...") + log.Info("Starting QEMU VM...") return d.Start() } @@ -270,34 +267,34 @@ func parsePortRange(rawPortRange string) (int, int, error) { portRange := strings.Split(rawPortRange, "-") if len(portRange) < 2 { - return 0, 0, errors.New("Invalid port range, must be at least of length 2") + return 0, 0, errors.New("invalid port range, requires at least 2 ports") } minPort, err := strconv.Atoi(portRange[0]) if err != nil { - return 0, 0, errors.Wrap(err, "Invalid port range") + return 0, 0, errors.Wrap(err, "invalid min port range") } + maxPort, err := strconv.Atoi(portRange[1]) if err != nil { - return 0, 0, errors.Wrap(err, "Invalid port range") + return 0, 0, errors.Wrap(err, "invalid max port range") } if maxPort < minPort { - return 0, 0, errors.New("Invalid port range") + return 0, 0, errors.New("invalid port range, max less than min") } if maxPort-minPort < 2 { - return 0, 0, errors.New("Port range must be minimum 2 ports") + return 0, 0, errors.New("invalid port range, requires at least 2 ports") } - return minPort, maxPort, nil } -func getRandomPortNumberInRange(min int, max int) int { +func getRandomPortNumberInRange(min, max int) int { return rand.Intn(max-min) + min } -func getAvailableTCPPortFromRange(minPort int, maxPort int) (int, error) { +func getAvailableTCPPortFromRange(minPort, maxPort int) (int, error) { port := 0 for i := 0; i <= 10; i++ { var ln net.Listener @@ -327,13 +324,12 @@ func getAvailableTCPPortFromRange(minPort int, maxPort int) (int, error) { port = p return port, nil } - time.Sleep(1 * time.Second) + time.Sleep(time.Second) } return 0, fmt.Errorf("unable to allocate tcp port") } func (d *Driver) Start() error { - // fmt.Printf("Init qemu %s\n", i.VM) machineDir := filepath.Join(d.StorePath, "machines", d.GetMachineName()) var startCmd []string @@ -344,6 +340,7 @@ func (d *Driver) Start() error { "-M", machineType, ) } + if d.CPUType != "" { startCmd = append(startCmd, "-cpu", d.CPUType, @@ -380,9 +377,13 @@ func (d *Driver) Start() error { // hardware acceleration is important, it increases performance by 10x if runtime.GOOS == "darwin" { - startCmd = append(startCmd, "-accel", "hvf") + // On macOS, enable the Hypervisor framework accelerator. + startCmd = append(startCmd, + "-accel", "hvf") } else if _, err := os.Stat("/dev/kvm"); err == nil && runtime.GOOS == "linux" { - startCmd = append(startCmd, "-accel", "kvm") + // On Linux, enable the Kernel Virtual Machine accelerator. + startCmd = append(startCmd, + "-accel", "kvm") } startCmd = append(startCmd, @@ -402,33 +403,39 @@ func (d *Driver) Start() error { "-pidfile", d.pidfilePath(), ) - if d.Network == "user" { + switch d.Network { + case "user": startCmd = append(startCmd, "-nic", fmt.Sprintf("user,model=virtio,hostfwd=tcp::%d-:22,hostfwd=tcp::%d-:2376,hostname=%s", d.SSHPort, d.EnginePort, d.GetMachineName()), ) - } else if d.Network == "tap" { + case "tap": startCmd = append(startCmd, "-nic", fmt.Sprintf("tap,model=virtio,ifname=%s,script=no,downscript=no", d.NetworkInterface), ) - } else if d.Network == "vde" { + case "vde": startCmd = append(startCmd, "-nic", fmt.Sprintf("vde,model=virtio,sock=%s", d.NetworkSocket), ) - } else if d.Network == "bridge" { + case "bridge": startCmd = append(startCmd, "-nic", fmt.Sprintf("bridge,model=virtio,br=%s", d.NetworkBridge), ) - } else { - log.Errorf("Unknown network: %s", d.Network) + default: + err := fmt.Errorf("unknown network: %s", d.Network) + log.Error(err) + return err } - startCmd = append(startCmd, "-daemonize") + startCmd = append(startCmd, + "-daemonize") if d.CloudConfigRoot != "" { startCmd = append(startCmd, "-fsdev", fmt.Sprintf("local,security_model=passthrough,readonly,id=fsdev0,path=%s", d.CloudConfigRoot)) - startCmd = append(startCmd, "-device", "virtio-9p-pci,id=fs0,fsdev=fsdev0,mount_tag=config-2") + startCmd = append(startCmd, + "-device", + "virtio-9p-pci,id=fs0,fsdev=fsdev0,mount_tag=config-2") } if d.VirtioDrives { @@ -436,7 +443,8 @@ func (d *Driver) Start() error { "-drive", fmt.Sprintf("file=%s,index=0,media=disk,if=virtio", d.diskPath())) } else { // last argument is always the name of the disk image - startCmd = append(startCmd, d.diskPath()) + startCmd = append(startCmd, + d.diskPath()) } if stdout, stderr, err := cmdOutErr(d.Program, startCmd...); err != nil { @@ -457,27 +465,25 @@ func cmdOutErr(cmdStr string, args ...string) (string, string, error) { cmd.Stdout = &stdout cmd.Stderr = &stderr err := cmd.Run() + stdoutStr := stdout.String() stderrStr := stderr.String() - log.Debugf("STDOUT: %v", stdout.String()) + log.Debugf("STDOUT: %v", stdoutStr) log.Debugf("STDERR: %v", stderrStr) if err != nil { if ee, ok := err.(*exec.Error); ok && ee == exec.ErrNotFound { - err = fmt.Errorf("mystery error: %s", ee) + err = fmt.Errorf("mystery error: %v", ee) } } else { - // also catch error messages in stderr, even if the return code - // looks OK + // also catch error messages in stderr, even if the return code looks OK if strings.Contains(stderrStr, "error:") { - err = fmt.Errorf("%v %v failed: %v", cmdStr, strings.Join(args, " "), stderrStr) + err = fmt.Errorf("%s %v failed: %s", cmdStr, strings.Join(args, " "), stderrStr) } } - return stdout.String(), stderrStr, err + return stdoutStr, stderrStr, err } func (d *Driver) Stop() error { - // _, err := d.RunQMPCommand("stop") - _, err := d.RunQMPCommand("system_powerdown") - if err != nil { + if _, err := d.RunQMPCommand("system_powerdown"); err != nil { return err } return nil @@ -494,8 +500,7 @@ func (d *Driver) Remove() error { } } if s != state.Stopped { - _, err = d.RunQMPCommand("quit") - if err != nil { + if _, err = d.RunQMPCommand("quit"); err != nil { return errors.Wrap(err, "quit") } } @@ -517,9 +522,7 @@ func (d *Driver) Restart() error { } func (d *Driver) Kill() error { - // _, err := d.RunQMPCommand("quit") - _, err := d.RunQMPCommand("system_powerdown") - if err != nil { + if _, err := d.RunQMPCommand("system_powerdown"); err != nil { return err } return nil @@ -623,7 +626,6 @@ func (d *Driver) generateDiskImage(size int) error { return err } log.Debugf("DONE writing to %s and %s", rawFile, d.diskPath()) - return nil } @@ -652,13 +654,10 @@ func (d *Driver) generateUserdataDisk(userdataFile string) (string, error) { if err := os.WriteFile(writeFile, userdata, 0644); err != nil { return "", err } - return ccRoot, nil - } func (d *Driver) RunQMPCommand(command string) (map[string]interface{}, error) { - // connect to monitor conn, err := net.Dial("unix", d.monitorPath()) if err != nil { @@ -701,8 +700,7 @@ func (d *Driver) RunQMPCommand(command string) (map[string]interface{}, error) { if err != nil { return nil, err } - _, err = conn.Write(jsonCommand) - if err != nil { + if _, err = conn.Write(jsonCommand); err != nil { return nil, err } nr, err = conn.Read(buf[:]) @@ -727,8 +725,7 @@ func (d *Driver) RunQMPCommand(command string) (map[string]interface{}, error) { if err != nil { return nil, err } - _, err = conn.Write(jsonCommand) - if err != nil { + if _, err = conn.Write(jsonCommand); err != nil { return nil, err } nr, err = conn.Read(buf[:]) From ce5a5b5c8157acfc82a149ed45128ebc0639dcd0 Mon Sep 17 00:00:00 2001 From: klaases Date: Wed, 10 Aug 2022 16:25:39 -0700 Subject: [PATCH 400/545] scope inline err, set %s, hold error return --- pkg/drivers/qemu/qemu.go | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkg/drivers/qemu/qemu.go b/pkg/drivers/qemu/qemu.go index 6e261c3d08..5b96d09473 100644 --- a/pkg/drivers/qemu/qemu.go +++ b/pkg/drivers/qemu/qemu.go @@ -421,9 +421,7 @@ func (d *Driver) Start() error { "-nic", fmt.Sprintf("bridge,model=virtio,br=%s", d.NetworkBridge), ) default: - err := fmt.Errorf("unknown network: %s", d.Network) - log.Error(err) - return err + log.Errorf("unknown network: %s", d.Network) } startCmd = append(startCmd, @@ -476,7 +474,7 @@ func cmdOutErr(cmdStr string, args ...string) (string, string, error) { } else { // also catch error messages in stderr, even if the return code looks OK if strings.Contains(stderrStr, "error:") { - err = fmt.Errorf("%s %v failed: %s", cmdStr, strings.Join(args, " "), stderrStr) + err = fmt.Errorf("%s %s failed: %s", cmdStr, strings.Join(args, " "), stderrStr) } } return stdoutStr, stderrStr, err @@ -500,7 +498,7 @@ func (d *Driver) Remove() error { } } if s != state.Stopped { - if _, err = d.RunQMPCommand("quit"); err != nil { + if _, err := d.RunQMPCommand("quit"); err != nil { return errors.Wrap(err, "quit") } } @@ -700,7 +698,7 @@ func (d *Driver) RunQMPCommand(command string) (map[string]interface{}, error) { if err != nil { return nil, err } - if _, err = conn.Write(jsonCommand); err != nil { + if _, err := conn.Write(jsonCommand); err != nil { return nil, err } nr, err = conn.Read(buf[:]) @@ -725,7 +723,7 @@ func (d *Driver) RunQMPCommand(command string) (map[string]interface{}, error) { if err != nil { return nil, err } - if _, err = conn.Write(jsonCommand); err != nil { + if _, err := conn.Write(jsonCommand); err != nil { return nil, err } nr, err = conn.Read(buf[:]) @@ -753,7 +751,7 @@ func WaitForTCPWithDelay(addr string, duration time.Duration) error { continue } defer conn.Close() - if _, err = conn.Read(make([]byte, 1)); err != nil { + if _, err := conn.Read(make([]byte, 1)); err != nil { time.Sleep(duration) continue } From 071193d21d2a3329cfeadc3923ea2f4904768dfb Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Wed, 10 Aug 2022 16:35:38 -0700 Subject: [PATCH 401/545] add concise first line to comment block --- pkg/minikube/assets/addons.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/minikube/assets/addons.go b/pkg/minikube/assets/addons.go index 10df1c7c80..1ffd0a511c 100755 --- a/pkg/minikube/assets/addons.go +++ b/pkg/minikube/assets/addons.go @@ -902,11 +902,11 @@ func GenerateTemplateData(addon *Addon, cc *config.ClusterConfig, netInfo Networ opts.Registries[name] = "" // Avoid nil access when rendering } + // tl;dr If the user specified a custom image remove the default registry // Without the line below, if you try to overwrite an image the default registry is still used in the templating // Example - image name: MetricsScraper, default registry: docker.io, default image: kubernetesui/metrics-scraper // Passed on addon enable: --images=MetricsScraper=k8s.gcr.io/echoserver:1.4 // Without this line the resulting image would be docker.io/k8s.gcr.io/echoserver:1.4 - // Therefore, if the user specified a custom image remove the default registry if _, ok := cc.CustomAddonImages[name]; ok { opts.Registries[name] = "" } From 01c94dd36e18b1d0c5afffa316d347467da84f7c Mon Sep 17 00:00:00 2001 From: shixiuguo <15733293515@163.com> Date: Fri, 12 Aug 2022 16:33:31 +0800 Subject: [PATCH 402/545] Update the fields of some zh-CN.json files --- translations/zh-CN.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/translations/zh-CN.json b/translations/zh-CN.json index 1ed42c693b..7379b2f472 100644 --- a/translations/zh-CN.json +++ b/translations/zh-CN.json @@ -1,13 +1,13 @@ { "\n\n": "", "\"The '{{.minikube_addon}}' addon is disabled": "'{{.minikube_addon}}' 插件已被禁用", - "\"minikube cache\" will be deprecated in upcoming versions, please switch to \"minikube image load\"": "", + "\"minikube cache\" will be deprecated in upcoming versions, please switch to \"minikube image load\"": "\"minikube cache\" 将在即将发布的版本中弃用，请切换至 \"minikube image load\"", "\"{{.context}}\" context has been updated to point to {{.hostname}}:{{.port}}": "", "\"{{.machineName}}\" does not exist, nothing to stop": "\"{{.machineName}}\" 不存在，没有什么可供停止的", "\"{{.minikube_addon}}\" was successfully disabled": "已成功禁用 \"{{.minikube_addon}}\"", "\"{{.name}}\" cluster does not exist. Proceeding ahead with cleanup.": "\"{{.name}}\" 集群不存在，将继续清理", "\"{{.name}}\" profile does not exist": "“{{.name}}”配置文件不存在", - "\"{{.name}}\" profile does not exist, trying anyways.": "", + "\"{{.name}}\" profile does not exist, trying anyways.": "“{{.name}}”配置文件不存在时，仍然会尝试", "\"{{.profile_name}}\" VM does not exist, nothing to stop": "\"{{.profile_name}}\" 虚拟机不存在，没有什么可供停止的", "\"{{.profile_name}}\" host does not exist, unable to show an IP": "\"{{.profile_name}}\" 主机不存在，无法显示其IP", "\"{{.profile_name}}\" stopped.": "\"{{.profile_name}}\" 已停止", @@ -15,7 +15,7 @@ "'none' driver does not support 'minikube mount' command": "'none' 驱动不支持 'minikube mount' 命令", "'none' driver does not support 'minikube podman-env' command": "'none' 驱动不支持 'minikube podman-env' 命令", "'none' driver does not support 'minikube ssh' command": "'none' 驱动不支持 'minikube ssh' 命令", - "'none' driver does not support 'minikube ssh-host' command": "", + "'none' driver does not support 'minikube ssh-host' command": "'none' 驱动不支持 'minikube ssh-host' 命令", "'{{.driver}}' driver reported an issue: {{.error}}": "'{{.driver}}' 驱动程序报告了一个问题： {{.error}}", "- \"minikube ssh\" to SSH into minikube's node.\n- \"minikube docker-env\" to point your docker-cli to the docker inside minikube.\n- \"minikube image\" to build images without docker.": "", "- \"minikube ssh\" to SSH into minikube's node.\n- \"minikube image\" to build images without docker.": "", From ecba6cf7e9f27b9691d44e5808092c95929db5fc Mon Sep 17 00:00:00 2001 From: Marcel Lauhoff Date: Fri, 12 Aug 2022 15:27:26 +0200 Subject: [PATCH 403/545] Add fscrypt kernel options Enables filesystem encryption support in the minikube kernel. Allows users to use file level encryption on ext4. Signed-off-by: Marcel Lauhoff --- .../board/minikube/aarch64/linux_aarch64_defconfig | 3 +++ .../minikube-iso/board/minikube/x86_64/linux_x86_64_defconfig | 3 +++ 2 files changed, 6 insertions(+) diff --git a/deploy/iso/minikube-iso/board/minikube/aarch64/linux_aarch64_defconfig b/deploy/iso/minikube-iso/board/minikube/aarch64/linux_aarch64_defconfig index 080c8ff114..0878f94b9b 100644 --- a/deploy/iso/minikube-iso/board/minikube/aarch64/linux_aarch64_defconfig +++ b/deploy/iso/minikube-iso/board/minikube/aarch64/linux_aarch64_defconfig @@ -1180,6 +1180,9 @@ CONFIG_INTERCONNECT_QCOM_MSM8916=m CONFIG_INTERCONNECT_QCOM_SDM845=m CONFIG_INTERCONNECT_QCOM_SM8150=m CONFIG_INTERCONNECT_QCOM_SM8250=m +CONFIG_FS_ENCRYPTION=y +CONFIG_FS_ENCRYPTION_ALGS=m +CONFIG_FS_ENCRYPTION_INLINE_CRYPT=y CONFIG_EXT2_FS=y CONFIG_EXT3_FS=y CONFIG_EXT4_FS_POSIX_ACL=y diff --git a/deploy/iso/minikube-iso/board/minikube/x86_64/linux_x86_64_defconfig b/deploy/iso/minikube-iso/board/minikube/x86_64/linux_x86_64_defconfig index 01c27835db..239ed81798 100644 --- a/deploy/iso/minikube-iso/board/minikube/x86_64/linux_x86_64_defconfig +++ b/deploy/iso/minikube-iso/board/minikube/x86_64/linux_x86_64_defconfig @@ -472,6 +472,9 @@ CONFIG_EEEPC_LAPTOP=y CONFIG_AMD_IOMMU=y CONFIG_INTEL_IOMMU=y # CONFIG_INTEL_IOMMU_DEFAULT_ON is not set +CONFIG_FS_ENCRYPTION=y +CONFIG_FS_ENCRYPTION_ALGS=m +CONFIG_FS_ENCRYPTION_INLINE_CRYPT=y CONFIG_EXT4_FS=y CONFIG_EXT4_FS_POSIX_ACL=y CONFIG_EXT4_FS_SECURITY=y From ce1287ba458b6c48d702a9bcda3aff1866c73a1f Mon Sep 17 00:00:00 2001 From: klaases Date: Fri, 12 Aug 2022 15:47:35 -0700 Subject: [PATCH 404/545] fix broken qemu doc url --- pkg/minikube/registry/drvs/qemu2/qemu2.go | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkg/minikube/registry/drvs/qemu2/qemu2.go b/pkg/minikube/registry/drvs/qemu2/qemu2.go index 2cb1a6ce9c..a9cdbcb6bc 100644 --- a/pkg/minikube/registry/drvs/qemu2/qemu2.go +++ b/pkg/minikube/registry/drvs/qemu2/qemu2.go @@ -37,9 +37,7 @@ import ( "k8s.io/minikube/pkg/minikube/registry" ) -const ( - docURL = "https://minikube.sigs.k8s.io/docs/reference/drivers/qemu2/" -) +const docURL = "https://minikube.sigs.k8s.io/docs/reference/drivers/qemu/" func init() { if err := registry.Register(registry.DriverDef{ @@ -191,8 +189,7 @@ func status() registry.State { return registry.State{Error: err, Doc: docURL} } - _, err = exec.LookPath(qemuSystem) - if err != nil { + if _, err := exec.LookPath(qemuSystem); err != nil { return registry.State{Error: err, Fix: "Install qemu-system", Doc: docURL} } From 2e4c616b89184b4fe9f2fd788201f9f1bbf3c842 Mon Sep 17 00:00:00 2001 From: klaases Date: Fri, 12 Aug 2022 16:01:30 -0700 Subject: [PATCH 405/545] add qemu2 redirect --- site/content/en/docs/drivers/qemu2.md | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 site/content/en/docs/drivers/qemu2.md diff --git a/site/content/en/docs/drivers/qemu2.md b/site/content/en/docs/drivers/qemu2.md new file mode 100644 index 0000000000..d7ad819a29 --- /dev/null +++ b/site/content/en/docs/drivers/qemu2.md @@ -0,0 +1,7 @@ +--- +title: "qemu2" +--- +redirecting to /qemu + From 150b506a014834a582c0c3eb89339e5fee8c04d9 Mon Sep 17 00:00:00 2001 From: klaases Date: Fri, 12 Aug 2022 16:08:00 -0700 Subject: [PATCH 406/545] update url --- site/content/en/docs/drivers/qemu2.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/site/content/en/docs/drivers/qemu2.md b/site/content/en/docs/drivers/qemu2.md index d7ad819a29..c111755bb0 100644 --- a/site/content/en/docs/drivers/qemu2.md +++ b/site/content/en/docs/drivers/qemu2.md @@ -1,7 +1,7 @@ --- title: "qemu2" --- -redirecting to /qemu +redirecting to /docs/reference/drivers/qemu From db08552f10366702429ad7d7a37a942affb7ee8b Mon Sep 17 00:00:00 2001 From: klaases Date: Fri, 12 Aug 2022 16:11:28 -0700 Subject: [PATCH 407/545] drop reference --- site/content/en/docs/drivers/qemu2.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/site/content/en/docs/drivers/qemu2.md b/site/content/en/docs/drivers/qemu2.md index c111755bb0..58914771a9 100644 --- a/site/content/en/docs/drivers/qemu2.md +++ b/site/content/en/docs/drivers/qemu2.md @@ -1,7 +1,7 @@ --- title: "qemu2" --- -redirecting to /docs/reference/drivers/qemu +redirecting to /docs/drivers/qemu From 396ad002198b7c0215bd414fb45cb3e1a065bdd8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Aug 2022 18:06:15 +0000 Subject: [PATCH 408/545] Bump github.com/cloudevents/sdk-go/v2 from 2.10.1 to 2.11.0 Bumps [github.com/cloudevents/sdk-go/v2](https://github.com/cloudevents/sdk-go) from 2.10.1 to 2.11.0. - [Release notes](https://github.com/cloudevents/sdk-go/releases) - [Commits](https://github.com/cloudevents/sdk-go/compare/v2.10.1...v2.11.0) --- updated-dependencies: - dependency-name: github.com/cloudevents/sdk-go/v2 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 1d0d57ed03..5303fe4f48 100644 --- a/go.mod +++ b/go.mod @@ -16,7 +16,7 @@ require ( github.com/c4milo/gotoolkit v0.0.0-20190525173301-67483a18c17a // indirect github.com/cenkalti/backoff/v4 v4.1.3 github.com/cheggaaa/pb/v3 v3.1.0 - github.com/cloudevents/sdk-go/v2 v2.10.1 + github.com/cloudevents/sdk-go/v2 v2.11.0 github.com/docker/docker v20.10.17+incompatible github.com/docker/go-units v0.4.0 github.com/docker/machine v0.16.2 diff --git a/go.sum b/go.sum index 47f26cc351..9cbffed3e8 100644 --- a/go.sum +++ b/go.sum @@ -269,8 +269,8 @@ github.com/cilium/ebpf v0.2.0/go.mod h1:To2CFviqOWL/M0gIMsvSMlqe7em/l1ALkX1PyjrX github.com/cilium/ebpf v0.4.0/go.mod h1:4tRaxcgiL706VnOzHOdBlY8IEAIdxINsQBcU4xJJXRs= github.com/cilium/ebpf v0.7.0/go.mod h1:/oI2+1shJiTGAMgl6/RgJr36Eo1jzrRcAWbcXO2usCA= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudevents/sdk-go/v2 v2.10.1 h1:qNFovJ18fWOd8Q9ydWJPk1oiFudXyv1GxJIP7MwPjuM= -github.com/cloudevents/sdk-go/v2 v2.10.1/go.mod h1:GpCBmUj7DIRiDhVvsK5d6WCbgTWs8DxAWTRtAwQmIXs= +github.com/cloudevents/sdk-go/v2 v2.11.0 h1:pCb7Cdkb8XpUoil+miuw6PEzuCG9cc8Erj8y1/q3odo= +github.com/cloudevents/sdk-go/v2 v2.11.0/go.mod h1:xDmKfzNjM8gBvjaF8ijFjM1VYOVUEeUfapHMUX1T5To= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= @@ -1838,7 +1838,6 @@ golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxb golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 h1:vVKdlvoWBphwdxWKrFZEuM0kGgGLxUOYcY4U/2Vjg44= golang.org/x/time v0.0.0-20220210224613-90d013bbcef8/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= From dbdb4d6b44bea116d12d25f9521f939406aedd86 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Aug 2022 18:07:09 +0000 Subject: [PATCH 409/545] Bump cloud.google.com/go/storage from 1.24.0 to 1.25.0 Bumps [cloud.google.com/go/storage](https://github.com/googleapis/google-cloud-go) from 1.24.0 to 1.25.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/pubsub/v1.24.0...spanner/v1.25.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 | 6 +++--- go.sum | 10 ++++++---- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/go.mod b/go.mod index 1d0d57ed03..d99a8eab61 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module k8s.io/minikube go 1.19 require ( - cloud.google.com/go/storage v1.24.0 + cloud.google.com/go/storage v1.25.0 contrib.go.opencensus.io/exporter/stackdriver v0.13.12 github.com/Delta456/box-cli-maker/v2 v2.2.2 github.com/GoogleCloudPlatform/docker-credential-gcr v0.0.0-20210713212222-faed5e8b8ca2 @@ -216,8 +216,8 @@ require ( golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f // indirect google.golang.org/appengine v1.6.7 // indirect - google.golang.org/genproto v0.0.0-20220624142145-8cd45d7dbd1f // indirect - google.golang.org/grpc v1.47.0 // indirect + google.golang.org/genproto v0.0.0-20220720214146-176da50484ac // indirect + google.golang.org/grpc v1.48.0 // indirect google.golang.org/protobuf v1.28.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/ini.v1 v1.66.4 // indirect diff --git a/go.sum b/go.sum index 47f26cc351..8b86703c09 100644 --- a/go.sum +++ b/go.sum @@ -71,8 +71,8 @@ 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.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo= cloud.google.com/go/storage v1.22.1/go.mod h1:S8N1cAStu7BOeFfE8KAQzmyyLkK8p/vmRq6kuBTW58Y= -cloud.google.com/go/storage v1.24.0 h1:a4N0gIkx83uoVFGz8B2eAV3OhN90QoWF5OZWLKl39ig= -cloud.google.com/go/storage v1.24.0/go.mod h1:3xrJEFMXBsQLgxwThyjuD3aYlroL0TMRec1ypGUQ0KE= +cloud.google.com/go/storage v1.25.0 h1:D2Dn0PslpK7Z3B2AvuUHyIC762bDbGJdlmQlCBR71os= +cloud.google.com/go/storage v1.25.0/go.mod h1:Qys4JU+jeup3QnuKKAosWuxrD95C4MSqxfVDnSirDsI= 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= @@ -2113,8 +2113,9 @@ google.golang.org/genproto v0.0.0-20220523171625-347a074981d8/go.mod h1:RAyBrSAP google.golang.org/genproto v0.0.0-20220608133413-ed9918b62aac/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA= google.golang.org/genproto v0.0.0-20220616135557-88e70c0c3a90/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA= google.golang.org/genproto v0.0.0-20220617124728-180714bec0ad/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA= -google.golang.org/genproto v0.0.0-20220624142145-8cd45d7dbd1f h1:hJ/Y5SqPXbarffmAsApliUlcvMU+wScNGfyop4bZm8o= google.golang.org/genproto v0.0.0-20220624142145-8cd45d7dbd1f/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA= +google.golang.org/genproto v0.0.0-20220720214146-176da50484ac h1:EOa+Yrhx1C0O+4pHeXeWrCwdI0tWI6IfUU56Vebs9wQ= +google.golang.org/genproto v0.0.0-20220720214146-176da50484ac/go.mod h1:GkXuJDJ6aQ7lnJcRF+SJVgFdQhypqgl3LB1C9vabdRE= google.golang.org/grpc v0.0.0-20160317175043-d3ddb4469d5a/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.8.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= @@ -2151,8 +2152,9 @@ google.golang.org/grpc v1.44.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ5 google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ= google.golang.org/grpc v1.46.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= google.golang.org/grpc v1.46.2/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= -google.golang.org/grpc v1.47.0 h1:9n77onPX5F3qfFCqjy9dhn8PbNQsIKeVU04J9G7umt8= google.golang.org/grpc v1.47.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= +google.golang.org/grpc v1.48.0 h1:rQOsyJ/8+ufEDJd/Gdsz7HG220Mh9HAhFHRGnIjda0w= +google.golang.org/grpc v1.48.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= From 84cadc64b6a38b8e04890b008b0e2f62ab413b87 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Aug 2022 18:07:20 +0000 Subject: [PATCH 410/545] Bump github.com/mattn/go-isatty from 0.0.14 to 0.0.16 Bumps [github.com/mattn/go-isatty](https://github.com/mattn/go-isatty) from 0.0.14 to 0.0.16. - [Release notes](https://github.com/mattn/go-isatty/releases) - [Commits](https://github.com/mattn/go-isatty/compare/v0.0.14...v0.0.16) --- updated-dependencies: - dependency-name: github.com/mattn/go-isatty dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 4 ++-- go.sum | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 1d0d57ed03..7bd9d4fcac 100644 --- a/go.mod +++ b/go.mod @@ -46,7 +46,7 @@ require ( github.com/klauspost/cpuid v1.2.0 github.com/machine-drivers/docker-machine-driver-vmware v0.1.5 github.com/mattbaird/jsonpatch v0.0.0-20200820163806-098863c1fc24 - github.com/mattn/go-isatty v0.0.14 + github.com/mattn/go-isatty v0.0.16 github.com/mitchellh/go-ps v1.0.0 github.com/moby/hyperkit v0.0.0-20210108224842-2f061e447e14 github.com/moby/sys/mount v0.2.0 // indirect @@ -76,7 +76,7 @@ require ( golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 golang.org/x/oauth2 v0.0.0-20220718184931-c8730f7fcb92 golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f - golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 + golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 golang.org/x/text v0.3.7 gonum.org/v1/plot v0.11.0 diff --git a/go.sum b/go.sum index 47f26cc351..8eef0bd9eb 100644 --- a/go.sum +++ b/go.sum @@ -971,8 +971,9 @@ github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hd github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84= github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE= github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= -github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y= github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= +github.com/mattn/go-isatty v0.0.16 h1:bq3VjFmv/sOjHtdEhmkEV4x1AJtvUvOJ2PFAZ5+peKQ= +github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/mattn/go-runewidth v0.0.6/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= @@ -1816,8 +1817,9 @@ golang.org/x/sys v0.0.0-20220517195934-5e4e11fc645e/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220610221304-9f5ed59c137d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220624220833-87e55d714810/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 h1:0A+M6Uqn+Eje4kHMK80dtF3JCXC4ykBgQG4Fe06QRhQ= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab h1:2QkjZIsXupsJbJIdSjjUOgWK3aEtzyuh2mPt3l/CkeU= +golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/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-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY= From f6a6673a2959e92b922c0550f0dfcdc3d5ce4d25 Mon Sep 17 00:00:00 2001 From: Santhosh Nagaraj S Date: Tue, 16 Aug 2022 17:22:20 +0530 Subject: [PATCH 411/545] Update Headlamp image Signed-off-by: Santhosh Nagaraj S --- pkg/minikube/assets/addons.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/minikube/assets/addons.go b/pkg/minikube/assets/addons.go index 1efdaa17e2..bc8b6a25c5 100755 --- a/pkg/minikube/assets/addons.go +++ b/pkg/minikube/assets/addons.go @@ -738,7 +738,7 @@ var Addons = map[string]*Addon{ MustBinAsset(addons.HeadlampAssets, "headlamp/headlamp-clusterrolebinding.yaml", vmpath.GuestAddonsDir, "headlamp-clusterrolebinding.yaml", "6040"), }, false, "headlamp", "3rd party (kinvolk.io)", "", "https://minikube.sigs.k8s.io/docs/handbook/addons/headlamp/", map[string]string{ - "Headlamp": "kinvolk/headlamp:v0.9.0@sha256:465aaee6518f3fdd032965eccd6a8f49e924d144b1c86115bad613872672ec02", + "Headlamp": "kinvolk/headlamp:v0.11.1@sha256:2547c6f5d5186a2c01822648989d49d9853fecda14bca96a0bf4a0547ea1d613", }, map[string]string{ "Headlamp": "ghcr.io", From be93f46a7f6ac1aa56de04507279458480ae1429 Mon Sep 17 00:00:00 2001 From: shixiuguo <15733293515@163.com> Date: Wed, 17 Aug 2022 16:17:52 +0800 Subject: [PATCH 412/545] update zh-CN.json update zh-CN.json --- translations/zh-CN.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/translations/zh-CN.json b/translations/zh-CN.json index 7379b2f472..0ae5ed6e1d 100644 --- a/translations/zh-CN.json +++ b/translations/zh-CN.json @@ -26,9 +26,9 @@ "- Ensure your {{.driver_name}} daemon has access to enough CPU/memory resources.": "- 确保你的 {{.driver_name}} 守护程序有权访问足够的 CPU 和内存资源。", "- Prune unused {{.driver_name}} images, volumes, networks and abandoned containers.\n\n\t\t\t\t{{.driver_name}} system prune --volumes": "", "- Restart your {{.driver_name}} service": "- 重启你的 {{.driver_name}} 服务", - "--container-runtime must be set to \"containerd\" or \"cri-o\" for rootless": "", - "--kvm-numa-count range is 1-8": "", - "--network flag is only valid with the docker/podman and KVM drivers, it will be ignored": "", + "--container-runtime must be set to \"containerd\" or \"cri-o\" for rootless": "--container-runtime 必须被设置为 \"containerd\" 或者 \"cri-o\" 以实现非 root 运行", + "--kvm-numa-count range is 1-8": "--kvm-numa-count 取值范围为 1-8", + "--network flag is only valid with the docker/podman and KVM drivers, it will be ignored": "--network 标识仅对 docker/podman 和 KVM 驱动程序有效，它将被忽略", "1) Recreate the cluster with Kubernetes {{.new}}, by running:\n\t \n\t\t minikube delete{{.profile}}\n\t\t minikube start{{.profile}} --kubernetes-version={{.prefix}}{{.new}}\n\t \n\t\t2) Create a second cluster with Kubernetes {{.new}}, by running:\n\t \n\t\t minikube start -p {{.suggestedName}} --kubernetes-version={{.prefix}}{{.new}}\n\t \n\t\t3) Use the existing cluster at version Kubernetes {{.old}}, by running:\n\t \n\t\t minikube start{{.profile}} --kubernetes-version={{.prefix}}{{.old}}\n\t\t": "", "1. Click on \"Docker for Desktop\" menu icon\n\t\t\t2. Click \"Preferences\"\n\t\t\t3. Click \"Resources\"\n\t\t\t4. Increase \"CPUs\" slider bar to 2 or higher\n\t\t\t5. Click \"Apply \u0026 Restart\"": "", "1. Click on \"Docker for Desktop\" menu icon\n\t\t\t2. Click \"Preferences\"\n\t\t\t3. Click \"Resources\"\n\t\t\t4. Increase \"Memory\" slider bar to {{.recommend}} or higher\n\t\t\t5. Click \"Apply \u0026 Restart\"": "", @@ -50,8 +50,8 @@ "A set of key=value pairs that describe feature gates for alpha/experimental features.": "一组用于描述 alpha 版功能/实验性功能的功能限制的键值对。", "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 SSH identity key to SSH authentication agent": "将SSH身份密钥添加到SSH身份验证代理", + "Add an image into minikube as a local cache, or delete, reload the cached images": "将 image 作为本地缓存添加到 minikube 中，或删除、重新加载缓中的 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": "", From ec00c33b89c80b71c4760673a887e1ab17b2da5e Mon Sep 17 00:00:00 2001 From: shaunmayo <95208809+shaunmayo@users.noreply.github.com> Date: Sun, 21 Aug 2022 14:16:52 +1200 Subject: [PATCH 413/545] Update podman_usage.inc --- site/content/en/docs/drivers/includes/podman_usage.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/content/en/docs/drivers/includes/podman_usage.inc b/site/content/en/docs/drivers/includes/podman_usage.inc index 7acb1a5d3a..edd3bef485 100644 --- a/site/content/en/docs/drivers/includes/podman_usage.inc +++ b/site/content/en/docs/drivers/includes/podman_usage.inc @@ -4,7 +4,7 @@ This is an experimental driver. Please use it only for experimental reasons unti ## Usage -It's recommended to run minikube with the podman driver and [CRI-O container runtime](https://cri-o.io/) (expect when using Rootless Podman): +It's recommended to run minikube with the podman driver and [CRI-O container runtime](https://cri-o.io/) (except when using Rootless Podman): ```shell minikube start --driver=podman --container-runtime=cri-o From 254b0eecb56206ea9fae8ad2046eb2e0da67fd32 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 22 Aug 2022 08:03:26 +0000 Subject: [PATCH 414/545] bump default/newest kubernetes versions --- .../bsutil/testdata/v1.25/containerd-api-port.yaml | 2 +- .../bsutil/testdata/v1.25/containerd-pod-network-cidr.yaml | 2 +- .../bootstrapper/bsutil/testdata/v1.25/containerd.yaml | 2 +- .../bsutil/testdata/v1.25/crio-options-gates.yaml | 2 +- pkg/minikube/bootstrapper/bsutil/testdata/v1.25/crio.yaml | 2 +- pkg/minikube/bootstrapper/bsutil/testdata/v1.25/default.yaml | 2 +- pkg/minikube/bootstrapper/bsutil/testdata/v1.25/dns.yaml | 2 +- .../bootstrapper/bsutil/testdata/v1.25/image-repository.yaml | 2 +- pkg/minikube/bootstrapper/bsutil/testdata/v1.25/options.yaml | 2 +- pkg/minikube/constants/constants.go | 4 ++-- site/content/en/docs/commands/start.md | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/containerd-api-port.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/containerd-api-port.yaml index 0358b09e13..0fe8ef26e9 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/containerd-api-port.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/containerd-api-port.yaml @@ -38,7 +38,7 @@ etcd: dataDir: /var/lib/minikube/etcd extraArgs: proxy-refresh-interval: "70000" -kubernetesVersion: v1.25.0-beta.0 +kubernetesVersion: v1.25.0-rc.1 networking: dnsDomain: cluster.local podSubnet: "10.244.0.0/16" diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/containerd-pod-network-cidr.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/containerd-pod-network-cidr.yaml index fd5a996dce..db5bd07849 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/containerd-pod-network-cidr.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/containerd-pod-network-cidr.yaml @@ -38,7 +38,7 @@ etcd: dataDir: /var/lib/minikube/etcd extraArgs: proxy-refresh-interval: "70000" -kubernetesVersion: v1.25.0-beta.0 +kubernetesVersion: v1.25.0-rc.1 networking: dnsDomain: cluster.local podSubnet: "192.168.32.0/20" diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/containerd.yaml index f28fe54a27..9a75ef979e 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/containerd.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/containerd.yaml @@ -38,7 +38,7 @@ etcd: dataDir: /var/lib/minikube/etcd extraArgs: proxy-refresh-interval: "70000" -kubernetesVersion: v1.25.0-beta.0 +kubernetesVersion: v1.25.0-rc.1 networking: dnsDomain: cluster.local podSubnet: "10.244.0.0/16" diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/crio-options-gates.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/crio-options-gates.yaml index 4d8155ecaf..d971544ccb 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/crio-options-gates.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/crio-options-gates.yaml @@ -44,7 +44,7 @@ etcd: dataDir: /var/lib/minikube/etcd extraArgs: proxy-refresh-interval: "70000" -kubernetesVersion: v1.25.0-beta.0 +kubernetesVersion: v1.25.0-rc.1 networking: dnsDomain: cluster.local podSubnet: "10.244.0.0/16" diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/crio.yaml index 63dbb73587..0a0fc885e0 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/crio.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/crio.yaml @@ -38,7 +38,7 @@ etcd: dataDir: /var/lib/minikube/etcd extraArgs: proxy-refresh-interval: "70000" -kubernetesVersion: v1.25.0-beta.0 +kubernetesVersion: v1.25.0-rc.1 networking: dnsDomain: cluster.local podSubnet: "10.244.0.0/16" diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/default.yaml index 54662e8d00..759c29a1ec 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/default.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/default.yaml @@ -38,7 +38,7 @@ etcd: dataDir: /var/lib/minikube/etcd extraArgs: proxy-refresh-interval: "70000" -kubernetesVersion: v1.25.0-beta.0 +kubernetesVersion: v1.25.0-rc.1 networking: dnsDomain: cluster.local podSubnet: "10.244.0.0/16" diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/dns.yaml index 5f8b92222f..2a3f6269f4 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/dns.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/dns.yaml @@ -38,7 +38,7 @@ etcd: dataDir: /var/lib/minikube/etcd extraArgs: proxy-refresh-interval: "70000" -kubernetesVersion: v1.25.0-beta.0 +kubernetesVersion: v1.25.0-rc.1 networking: dnsDomain: minikube.local podSubnet: "10.244.0.0/16" diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/image-repository.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/image-repository.yaml index 669748eac7..b088cf346b 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/image-repository.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/image-repository.yaml @@ -39,7 +39,7 @@ etcd: dataDir: /var/lib/minikube/etcd extraArgs: proxy-refresh-interval: "70000" -kubernetesVersion: v1.25.0-beta.0 +kubernetesVersion: v1.25.0-rc.1 networking: dnsDomain: cluster.local podSubnet: "10.244.0.0/16" diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/options.yaml index 6725ae85a5..c816ae1b9e 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/options.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/options.yaml @@ -41,7 +41,7 @@ etcd: dataDir: /var/lib/minikube/etcd extraArgs: proxy-refresh-interval: "70000" -kubernetesVersion: v1.25.0-beta.0 +kubernetesVersion: v1.25.0-rc.1 networking: dnsDomain: cluster.local podSubnet: "10.244.0.0/16" diff --git a/pkg/minikube/constants/constants.go b/pkg/minikube/constants/constants.go index b5fb320acc..ba875da2d4 100644 --- a/pkg/minikube/constants/constants.go +++ b/pkg/minikube/constants/constants.go @@ -32,10 +32,10 @@ var ( const ( // DefaultKubernetesVersion is the default Kubernetes version - DefaultKubernetesVersion = "v1.24.3" + DefaultKubernetesVersion = "v1.24.4" // NewestKubernetesVersion is the newest Kubernetes version to test against // NOTE: You may need to update coreDNS & etcd versions in pkg/minikube/bootstrapper/images/images.go - NewestKubernetesVersion = "v1.25.0-beta.0" + NewestKubernetesVersion = "v1.25.0-rc.1" // OldestKubernetesVersion is the oldest Kubernetes version to test against OldestKubernetesVersion = "v1.16.0" // NoKubernetesVersion is the version used when users does NOT want to install kubernetes diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index 749e2e4931..a0f51df890 100644 --- a/site/content/en/docs/commands/start.md +++ b/site/content/en/docs/commands/start.md @@ -71,7 +71,7 @@ minikube start [flags] --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/iso/minikube-v1.26.1-amd64.iso,https://github.com/kubernetes/minikube/releases/download/v1.26.1/minikube-v1.26.1-amd64.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.26.1-amd64.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.24.3, 'latest' for v1.25.0-beta.0). Defaults to 'stable'. + --kubernetes-version string The Kubernetes version that the minikube VM will use (ex: v1.2.3, 'stable' for v1.24.4, 'latest' for v1.25.0-rc.1). Defaults to 'stable'. --kvm-gpu Enable experimental NVIDIA GPU support in minikube --kvm-hidden Hide the hypervisor signature from the guest in minikube (kvm2 driver only) --kvm-network string The KVM default network name. (kvm2 driver only) (default "default") From d4b584ff4fc9af82865e87ad2f94b32fdb9d48b4 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 22 Aug 2022 10:06:19 +0000 Subject: [PATCH 415/545] bump gotestsum versions --- hack/jenkins/common.ps1 | 2 +- hack/jenkins/installers/check_install_gotestsum.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hack/jenkins/common.ps1 b/hack/jenkins/common.ps1 index 6fe2a3c268..ddee2cc18d 100644 --- a/hack/jenkins/common.ps1 +++ b/hack/jenkins/common.ps1 @@ -68,7 +68,7 @@ if ($CurrentGo -NotLike "*$GoVersion*") { # Download gopogh and gotestsum (New-Object Net.WebClient).DownloadFile("https://github.com/medyagh/gopogh/releases/download/v0.13.0/gopogh.exe", "C:\Go\bin\gopogh.exe") -(New-Object Net.WebClient).DownloadFile("https://github.com/gotestyourself/gotestsum/releases/download/v1.8.1/gotestsum_1.8.1_windows_amd64.tar.gz", "$env:TEMP\gotestsum.tar.gz") +(New-Object Net.WebClient).DownloadFile("https://github.com/gotestyourself/gotestsum/releases/download/v1.8.2/gotestsum_1.8.2_windows_amd64.tar.gz", "$env:TEMP\gotestsum.tar.gz") tar --directory "C:\Go\bin\" -xzvf "$env:TEMP\gotestsum.tar.gz" "gotestsum.exe" # Grab all the scripts we'll need for integration tests diff --git a/hack/jenkins/installers/check_install_gotestsum.sh b/hack/jenkins/installers/check_install_gotestsum.sh index 2d58d7e6b5..98065f3bf7 100755 --- a/hack/jenkins/installers/check_install_gotestsum.sh +++ b/hack/jenkins/installers/check_install_gotestsum.sh @@ -18,7 +18,7 @@ set -eux -o pipefail function install_gotestsum() { rm -f $(which gotestsum) - GOBIN="$GOROOT/bin" go install gotest.tools/gotestsum@v1.8.1 + GOBIN="$GOROOT/bin" go install gotest.tools/gotestsum@v1.8.2 } which gotestsum || install_gotestsum From b675df746396d4daed80e759b837efbb901ff78c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Aug 2022 18:05:53 +0000 Subject: [PATCH 416/545] 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.8.4 to 1.8.6. - [Release notes](https://github.com/GoogleCloudPlatform/opentelemetry-operations-go/releases) - [Commits](https://github.com/GoogleCloudPlatform/opentelemetry-operations-go/compare/exporter/trace/v1.8.4...exporter/trace/v1.8.6) --- updated-dependencies: - dependency-name: github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 4 ++-- go.sum | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/go.mod b/go.mod index 1d0d57ed03..32fc720cb4 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ require ( contrib.go.opencensus.io/exporter/stackdriver v0.13.12 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.8.4 + github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.8.6 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 @@ -112,7 +112,7 @@ require ( 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/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.32.4 // indirect + github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.32.6 // indirect github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd // indirect github.com/Microsoft/go-winio v0.5.2 // indirect github.com/PuerkitoBio/purell v1.1.1 // indirect diff --git a/go.sum b/go.sum index 47f26cc351..5c861c7855 100644 --- a/go.sum +++ b/go.sum @@ -121,10 +121,10 @@ github.com/Delta456/box-cli-maker/v2 v2.2.2/go.mod h1:idItIMZeyx3bg73XwSgsLeZd+g github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24/go.mod h1:4UJr5HIiMZrwgkSPdsjy2uOQExX/WEILpIrO9UPGuXs= 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.8.4 h1:UlCxYSeY3a8FYR2Ni8SC8vxcb2MCTwBN8yDoy0AVGGU= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.8.4/go.mod h1:d4ODYSOkLoLTyUyic8etLjC7Kzy13ZO2R+kdVi9ImQg= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.32.4 h1:ZuSnzmTHyLCDJxeq5h785t8VcbRDX40+e5iVTSE4Y3Q= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.32.4/go.mod h1:0NODlmSHucFiEW4hSANp07vax2tfiCdf9Zv4KuMc/4w= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.8.6 h1:TOxk7n3PE2OkdNMgrXDtDr3ju4pIvwhY515tCoH0CpE= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.8.6/go.mod h1:NE8dAwJ1VU4WFdJYTlO0tdobQFdy70z8wNDU1L3VAr4= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.32.6 h1:QHbRbU/HI7SuNVqP0rDHK5jAMcwzuAex2akl3p+7YTo= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.32.6/go.mod h1:/G0zPXsUx5gZUd6ryJakuDo4VR7EJScegf1ZNK8xIGs= 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/Masterminds/goutils v1.1.0/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU= @@ -1445,7 +1445,7 @@ 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.33.0 h1:Z0lVKLXU+jxGf3ANoh+UWx9Ai5bjpQVnZXI1zEzvqS0= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0 h1:9NkMW03wwEzPtP/KciZ4Ozu/Uz5ZA7kfqXJIObnrjGU= go.opentelemetry.io/otel v0.20.0/go.mod h1:Y3ugLH2oa81t5QO+Lty+zXf8zC9L26ax4Nzoxm/dooo= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= From 19e5957e9d6e172e964693702db0a38065b84f73 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Aug 2022 18:22:41 +0000 Subject: [PATCH 417/545] Update actions/download-artifact requirement to fb598a63ae348fa914e94cd0ff38f362e927b741 Updates the requirements on [actions/download-artifact](https://github.com/actions/download-artifact) to permit the latest version. - [Release notes](https://github.com/actions/download-artifact/releases) - [Commits](https://github.com/actions/download-artifact/commits/fb598a63ae348fa914e94cd0ff38f362e927b741) --- updated-dependencies: - dependency-name: actions/download-artifact dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- .github/workflows/functional_verified.yml | 4 ++-- .github/workflows/master.yml | 12 ++++++------ .github/workflows/pr.yml | 12 ++++++------ 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/functional_verified.yml b/.github/workflows/functional_verified.yml index d18d5bd55a..0cab306c54 100644 --- a/.github/workflows/functional_verified.yml +++ b/.github/workflows/functional_verified.yml @@ -119,7 +119,7 @@ jobs: go-version: ${{env.GO_VERSION}} - name: Download Binaries - uses: actions/download-artifact@fdafc3f9f2e2a522dc1d230e6a03de57a1e71c95 + uses: actions/download-artifact@fb598a63ae348fa914e94cd0ff38f362e927b741 with: name: minikube_binaries @@ -202,7 +202,7 @@ jobs: runs-on: ubuntu-20.04 steps: - name: download all extra reports - uses: actions/download-artifact@9fde3de0b74bd6bc202952485c264b551a4f9405 + uses: actions/download-artifact@fb598a63ae348fa914e94cd0ff38f362e927b741 - name: upload all extra reports shell: bash {0} continue-on-error: true diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 3769796d77..0c4736f7dc 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -126,7 +126,7 @@ jobs: curl -LO https://github.com/medyagh/gopogh/releases/download/v0.13.0/gopogh-linux-amd64 sudo install gopogh-linux-amd64 /usr/local/bin/gopogh - name: Download Binaries - uses: actions/download-artifact@fdafc3f9f2e2a522dc1d230e6a03de57a1e71c95 + uses: actions/download-artifact@fb598a63ae348fa914e94cd0ff38f362e927b741 with: name: minikube_binaries - name: Run Integration Test @@ -225,7 +225,7 @@ jobs: curl -LO https://github.com/medyagh/gopogh/releases/download/v0.13.0/gopogh-linux-amd64 sudo install gopogh-linux-amd64 /usr/local/bin/gopogh - name: Download Binaries - uses: actions/download-artifact@fdafc3f9f2e2a522dc1d230e6a03de57a1e71c95 + uses: actions/download-artifact@fb598a63ae348fa914e94cd0ff38f362e927b741 with: name: minikube_binaries - name: Run Integration Test @@ -327,7 +327,7 @@ jobs: curl -LO https://github.com/medyagh/gopogh/releases/download/v0.13.0/gopogh-linux-amd64 sudo install gopogh-linux-amd64 /usr/local/bin/gopogh - name: Download Binaries - uses: actions/download-artifact@fdafc3f9f2e2a522dc1d230e6a03de57a1e71c95 + uses: actions/download-artifact@fb598a63ae348fa914e94cd0ff38f362e927b741 with: name: minikube_binaries - name: Run Integration Test @@ -428,7 +428,7 @@ jobs: sudo /usr/libexec/ApplicationFirewall/socketfilterfw --setglobalstate off sudo /usr/libexec/ApplicationFirewall/socketfilterfw -k - name: Download Binaries - uses: actions/download-artifact@fdafc3f9f2e2a522dc1d230e6a03de57a1e71c95 + uses: actions/download-artifact@fb598a63ae348fa914e94cd0ff38f362e927b741 with: name: minikube_binaries - name: Run Integration Test @@ -529,7 +529,7 @@ jobs: curl -LO https://github.com/medyagh/gopogh/releases/download/v0.13.0/gopogh-linux-amd64 sudo install gopogh-linux-amd64 /usr/local/bin/gopogh - name: Download Binaries - uses: actions/download-artifact@fdafc3f9f2e2a522dc1d230e6a03de57a1e71c95 + uses: actions/download-artifact@fb598a63ae348fa914e94cd0ff38f362e927b741 with: name: minikube_binaries - name: Run Integration Test @@ -602,7 +602,7 @@ jobs: runs-on: ubuntu-20.04 steps: - name: download all reports - uses: actions/download-artifact@9fde3de0b74bd6bc202952485c264b551a4f9405 + uses: actions/download-artifact@fb598a63ae348fa914e94cd0ff38f362e927b741 - name: upload all reports shell: bash {0} continue-on-error: true diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 29c6e35532..33e195ce5b 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -123,7 +123,7 @@ jobs: curl -LO https://github.com/medyagh/gopogh/releases/download/v0.13.0/gopogh-linux-amd64 sudo install gopogh-linux-amd64 /usr/local/bin/gopogh - name: Download Binaries - uses: actions/download-artifact@fdafc3f9f2e2a522dc1d230e6a03de57a1e71c95 + uses: actions/download-artifact@fb598a63ae348fa914e94cd0ff38f362e927b741 with: name: minikube_binaries - name: Run Integration Test @@ -223,7 +223,7 @@ jobs: curl -LO https://github.com/medyagh/gopogh/releases/download/v0.13.0/gopogh-linux-amd64 sudo install gopogh-linux-amd64 /usr/local/bin/gopogh - name: Download Binaries - uses: actions/download-artifact@fdafc3f9f2e2a522dc1d230e6a03de57a1e71c95 + uses: actions/download-artifact@fb598a63ae348fa914e94cd0ff38f362e927b741 with: name: minikube_binaries - name: Run Integration Test @@ -326,7 +326,7 @@ jobs: curl -LO https://github.com/medyagh/gopogh/releases/download/v0.13.0/gopogh-linux-amd64 sudo install gopogh-linux-amd64 /usr/local/bin/gopogh - name: Download Binaries - uses: actions/download-artifact@fdafc3f9f2e2a522dc1d230e6a03de57a1e71c95 + uses: actions/download-artifact@fb598a63ae348fa914e94cd0ff38f362e927b741 with: name: minikube_binaries - name: Run Integration Test @@ -428,7 +428,7 @@ jobs: sudo /usr/libexec/ApplicationFirewall/socketfilterfw --setglobalstate off sudo /usr/libexec/ApplicationFirewall/socketfilterfw -k - name: Download Binaries - uses: actions/download-artifact@fdafc3f9f2e2a522dc1d230e6a03de57a1e71c95 + uses: actions/download-artifact@fb598a63ae348fa914e94cd0ff38f362e927b741 with: name: minikube_binaries - name: Run Integration Test @@ -530,7 +530,7 @@ jobs: curl -LO https://github.com/medyagh/gopogh/releases/download/v0.13.0/gopogh-linux-amd64 sudo install gopogh-linux-amd64 /usr/local/bin/gopogh - name: Download Binaries - uses: actions/download-artifact@fdafc3f9f2e2a522dc1d230e6a03de57a1e71c95 + uses: actions/download-artifact@fb598a63ae348fa914e94cd0ff38f362e927b741 with: name: minikube_binaries - name: Run Integration Test @@ -604,7 +604,7 @@ jobs: runs-on: ubuntu-20.04 steps: - name: download all reports - uses: actions/download-artifact@9fde3de0b74bd6bc202952485c264b551a4f9405 + uses: actions/download-artifact@fb598a63ae348fa914e94cd0ff38f362e927b741 - name: upload all reports shell: bash {0} continue-on-error: true From 61d4a6255d3f4bfdf36fcc9ec72aa55af03b2413 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Aug 2022 18:22:45 +0000 Subject: [PATCH 418/545] Bump actions/checkout Bumps [actions/checkout](https://github.com/actions/checkout) from 629c2de402a417ea7690ca6ce3f33229e27606a5 to 3.0.2. This release includes the previously tagged commit. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/629c2de402a417ea7690ca6ce3f33229e27606a5...2541b1294d2704b0964813337f33b291d3f8596b) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- .github/workflows/build.yml | 6 +++--- .github/workflows/docs.yml | 2 +- .github/workflows/functional_verified.yml | 2 +- .github/workflows/leaderboard.yml | 2 +- .github/workflows/master.yml | 6 +++--- .github/workflows/pr.yml | 6 +++--- .github/workflows/sync-minikube.yml | 2 +- .github/workflows/time-to-k8s-public-chart.yml | 4 ++-- .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-gopogh-version.yml | 2 +- .github/workflows/update-gotestsum-version.yml | 2 +- .github/workflows/update-k8s-versions.yml | 2 +- .github/workflows/update-kubadm-constants.yml | 2 +- .github/workflows/yearly-leaderboard.yml | 2 +- 17 files changed, 24 insertions(+), 24 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index db34ca52e8..0ec21da2aa 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,7 +20,7 @@ jobs: build_minikube: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5 + - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a with: go-version: ${{env.GO_VERSION}} @@ -46,7 +46,7 @@ jobs: lint: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5 + - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a with: go-version: ${{env.GO_VERSION}} @@ -64,7 +64,7 @@ jobs: unit_test: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5 + - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index a1e7955594..3906aa85d9 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -15,7 +15,7 @@ jobs: if: github.repository == 'kubernetes/minikube' runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5 + - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/functional_verified.yml b/.github/workflows/functional_verified.yml index d18d5bd55a..b1736811de 100644 --- a/.github/workflows/functional_verified.yml +++ b/.github/workflows/functional_verified.yml @@ -34,7 +34,7 @@ jobs: if: contains(github.event.pull_request.labels.*.name, 'ok-to-test') runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5 + - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/leaderboard.yml b/.github/workflows/leaderboard.yml index 071faebdbe..0d5071e73a 100644 --- a/.github/workflows/leaderboard.yml +++ b/.github/workflows/leaderboard.yml @@ -14,7 +14,7 @@ jobs: update-leaderboard: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5 + - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 3769796d77..3f6102b987 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -24,7 +24,7 @@ jobs: build_minikube: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5 + - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a with: go-version: ${{env.GO_VERSION}} @@ -50,7 +50,7 @@ jobs: lint: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5 + - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a with: go-version: ${{env.GO_VERSION}} @@ -68,7 +68,7 @@ jobs: unit_test: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5 + - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 29c6e35532..14f23a51fc 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -22,7 +22,7 @@ jobs: build_minikube: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5 + - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a with: go-version: ${{env.GO_VERSION}} @@ -48,7 +48,7 @@ jobs: lint: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5 + - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a with: go-version: ${{env.GO_VERSION}} @@ -66,7 +66,7 @@ jobs: unit_test: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5 + - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/sync-minikube.yml b/.github/workflows/sync-minikube.yml index 5373c4679e..9ad724d097 100644 --- a/.github/workflows/sync-minikube.yml +++ b/.github/workflows/sync-minikube.yml @@ -17,7 +17,7 @@ jobs: run: working-directory: ./image-syncer steps: - - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5 + - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b with: repository: denverdino/image-syncer path: ./image-syncer diff --git a/.github/workflows/time-to-k8s-public-chart.yml b/.github/workflows/time-to-k8s-public-chart.yml index a30d69f9ad..823721c6d5 100644 --- a/.github/workflows/time-to-k8s-public-chart.yml +++ b/.github/workflows/time-to-k8s-public-chart.yml @@ -19,7 +19,7 @@ jobs: AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} AWS_DEFAULT_REGION: 'us-west-1' steps: - - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5 + - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a with: go-version: ${{env.GO_VERSION}} @@ -37,7 +37,7 @@ jobs: AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} AWS_DEFAULT_REGION: 'us-west-1' steps: - - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5 + - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b - name: Install kubectl shell: bash run: | diff --git a/.github/workflows/time-to-k8s.yml b/.github/workflows/time-to-k8s.yml index e0dc929c9b..14fce74779 100644 --- a/.github/workflows/time-to-k8s.yml +++ b/.github/workflows/time-to-k8s.yml @@ -13,7 +13,7 @@ jobs: benchmark: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5 + - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b - name: Checkout submodules run: git submodule update --init - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a diff --git a/.github/workflows/translations.yml b/.github/workflows/translations.yml index 5c1687bea6..9de833b6d6 100644 --- a/.github/workflows/translations.yml +++ b/.github/workflows/translations.yml @@ -14,7 +14,7 @@ jobs: unit_test: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5 + - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-golang-version.yml b/.github/workflows/update-golang-version.yml index ffc4e452c1..1f8da0900b 100644 --- a/.github/workflows/update-golang-version.yml +++ b/.github/workflows/update-golang-version.yml @@ -14,7 +14,7 @@ jobs: bump-golang-version: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5 + - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-golint-version.yml b/.github/workflows/update-golint-version.yml index ca5a498d12..4c0d572afa 100644 --- a/.github/workflows/update-golint-version.yml +++ b/.github/workflows/update-golint-version.yml @@ -14,7 +14,7 @@ jobs: bump-golint-version: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5 + - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-gopogh-version.yml b/.github/workflows/update-gopogh-version.yml index 8719546dd2..d33879180b 100644 --- a/.github/workflows/update-gopogh-version.yml +++ b/.github/workflows/update-gopogh-version.yml @@ -14,7 +14,7 @@ jobs: bump-gopogh-version: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5 + - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-gotestsum-version.yml b/.github/workflows/update-gotestsum-version.yml index d3778f51b1..53438168f1 100644 --- a/.github/workflows/update-gotestsum-version.yml +++ b/.github/workflows/update-gotestsum-version.yml @@ -14,7 +14,7 @@ jobs: bump-gotestsum-version: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5 + - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-k8s-versions.yml b/.github/workflows/update-k8s-versions.yml index c052fb22bf..e4d955aa05 100644 --- a/.github/workflows/update-k8s-versions.yml +++ b/.github/workflows/update-k8s-versions.yml @@ -14,7 +14,7 @@ jobs: bump-k8s-versions: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5 + - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/update-kubadm-constants.yml b/.github/workflows/update-kubadm-constants.yml index 1f65c1dc8f..2930bdbaf8 100644 --- a/.github/workflows/update-kubadm-constants.yml +++ b/.github/workflows/update-kubadm-constants.yml @@ -14,7 +14,7 @@ jobs: bump-k8s-versions: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5 + - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/yearly-leaderboard.yml b/.github/workflows/yearly-leaderboard.yml index 9c14b112fb..5ca2d15d76 100644 --- a/.github/workflows/yearly-leaderboard.yml +++ b/.github/workflows/yearly-leaderboard.yml @@ -19,7 +19,7 @@ jobs: AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} AWS_DEFAULT_REGION: 'us-west-1' steps: - - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5 + - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a with: go-version: ${{env.GO_VERSION}} From 0b2daa311a28fdf2970c23d6c705e60e4e06760d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Aug 2022 18:22:47 +0000 Subject: [PATCH 419/545] Bump peter-evans/create-pull-request from 4.0.4 to 4.1.1 Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from 4.0.4 to 4.1.1. - [Release notes](https://github.com/peter-evans/create-pull-request/releases) - [Commits](https://github.com/peter-evans/create-pull-request/compare/923ad837f191474af6b1721408744feb989a4c27...18f90432bedd2afd6a825469ffd38aa24712a91d) --- updated-dependencies: - dependency-name: peter-evans/create-pull-request dependency-type: direct:production update-type: version-update:semver-minor ... 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-gopogh-version.yml | 2 +- .github/workflows/update-gotestsum-version.yml | 2 +- .github/workflows/update-k8s-versions.yml | 2 +- .github/workflows/update-kubadm-constants.yml | 2 +- .github/workflows/yearly-leaderboard.yml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index a1e7955594..cda57b115f 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@923ad837f191474af6b1721408744feb989a4c27 + uses: peter-evans/create-pull-request@18f90432bedd2afd6a825469ffd38aa24712a91d 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 071faebdbe..563e05df11 100644 --- a/.github/workflows/leaderboard.yml +++ b/.github/workflows/leaderboard.yml @@ -30,7 +30,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.MINIKUBE_BOT_PAT }} - name: Create PR if: ${{ steps.leaderboard.outputs.changes != '' }} - uses: peter-evans/create-pull-request@923ad837f191474af6b1721408744feb989a4c27 + uses: peter-evans/create-pull-request@18f90432bedd2afd6a825469ffd38aa24712a91d 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 e0dc929c9b..c7ea11afa6 100644 --- a/.github/workflows/time-to-k8s.yml +++ b/.github/workflows/time-to-k8s.yml @@ -25,7 +25,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@923ad837f191474af6b1721408744feb989a4c27 + uses: peter-evans/create-pull-request@18f90432bedd2afd6a825469ffd38aa24712a91d 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 ffc4e452c1..55445d634b 100644 --- a/.github/workflows/update-golang-version.yml +++ b/.github/workflows/update-golang-version.yml @@ -25,7 +25,7 @@ jobs: echo "::set-output name=changes::$(git status --porcelain)" - name: Create PR if: ${{ steps.bumpGolang.outputs.changes != '' }} - uses: peter-evans/create-pull-request@923ad837f191474af6b1721408744feb989a4c27 + uses: peter-evans/create-pull-request@18f90432bedd2afd6a825469ffd38aa24712a91d 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 ca5a498d12..2424eb370a 100644 --- a/.github/workflows/update-golint-version.yml +++ b/.github/workflows/update-golint-version.yml @@ -25,7 +25,7 @@ jobs: echo "::set-output name=changes::$(git status --porcelain)" - name: Create PR if: ${{ steps.bumpGolint.outputs.changes != '' }} - uses: peter-evans/create-pull-request@923ad837f191474af6b1721408744feb989a4c27 + uses: peter-evans/create-pull-request@18f90432bedd2afd6a825469ffd38aa24712a91d with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: bump golint versions diff --git a/.github/workflows/update-gopogh-version.yml b/.github/workflows/update-gopogh-version.yml index 8719546dd2..de1a5a71a6 100644 --- a/.github/workflows/update-gopogh-version.yml +++ b/.github/workflows/update-gopogh-version.yml @@ -25,7 +25,7 @@ jobs: echo "::set-output name=changes::$(git status --porcelain)" - name: Create PR if: ${{ steps.bumpGopogh.outputs.changes != '' }} - uses: peter-evans/create-pull-request@923ad837f191474af6b1721408744feb989a4c27 + uses: peter-evans/create-pull-request@18f90432bedd2afd6a825469ffd38aa24712a91d with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: bump gopogh versions diff --git a/.github/workflows/update-gotestsum-version.yml b/.github/workflows/update-gotestsum-version.yml index d3778f51b1..36fec513fe 100644 --- a/.github/workflows/update-gotestsum-version.yml +++ b/.github/workflows/update-gotestsum-version.yml @@ -25,7 +25,7 @@ jobs: echo "::set-output name=changes::$(git status --porcelain)" - name: Create PR if: ${{ steps.bumpGotestsum.outputs.changes != '' }} - uses: peter-evans/create-pull-request@923ad837f191474af6b1721408744feb989a4c27 + uses: peter-evans/create-pull-request@18f90432bedd2afd6a825469ffd38aa24712a91d with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: bump gotestsum versions diff --git a/.github/workflows/update-k8s-versions.yml b/.github/workflows/update-k8s-versions.yml index c052fb22bf..458cfec31c 100644 --- a/.github/workflows/update-k8s-versions.yml +++ b/.github/workflows/update-k8s-versions.yml @@ -30,7 +30,7 @@ jobs: echo "::set-output name=changes::$c" - name: Create PR if: ${{ steps.bumpk8s.outputs.changes != '' }} - uses: peter-evans/create-pull-request@923ad837f191474af6b1721408744feb989a4c27 + uses: peter-evans/create-pull-request@18f90432bedd2afd6a825469ffd38aa24712a91d 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 1f65c1dc8f..ff03482696 100644 --- a/.github/workflows/update-kubadm-constants.yml +++ b/.github/workflows/update-kubadm-constants.yml @@ -28,7 +28,7 @@ jobs: echo "::set-output name=changes::$c" - name: Create PR if: ${{ steps.bumpKubAdmConsts.outputs.changes != '' }} - uses: peter-evans/create-pull-request@923ad837f191474af6b1721408744feb989a4c27 + uses: peter-evans/create-pull-request@18f90432bedd2afd6a825469ffd38aa24712a91d with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: update image constants for kubeadm images diff --git a/.github/workflows/yearly-leaderboard.yml b/.github/workflows/yearly-leaderboard.yml index 9c14b112fb..bc1f3a16c1 100644 --- a/.github/workflows/yearly-leaderboard.yml +++ b/.github/workflows/yearly-leaderboard.yml @@ -32,7 +32,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.MINIKUBE_BOT_PAT }} - name: Create PR if: ${{ steps.yearlyLeaderboard.outputs.changes != '' }} - uses: peter-evans/create-pull-request@923ad837f191474af6b1721408744feb989a4c27 + uses: peter-evans/create-pull-request@18f90432bedd2afd6a825469ffd38aa24712a91d with: token: ${{ secrets.MINIKUBE_BOT_PAT }} commit-message: Update yearly leaderboard From e97523224ab4d26dcfe5ab5d083ee596e2b5fff7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Aug 2022 20:36:40 +0000 Subject: [PATCH 420/545] Bump k8s.io/component-base from 0.24.3 to 0.24.4 Bumps [k8s.io/component-base](https://github.com/kubernetes/component-base) from 0.24.3 to 0.24.4. - [Release notes](https://github.com/kubernetes/component-base/releases) - [Commits](https://github.com/kubernetes/component-base/compare/v0.24.3...v0.24.4) --- updated-dependencies: - dependency-name: k8s.io/component-base dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 8 ++++---- go.sum | 12 ++++++++---- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/go.mod b/go.mod index 32fc720cb4..bc842bdbe3 100644 --- a/go.mod +++ b/go.mod @@ -83,11 +83,11 @@ require ( google.golang.org/api v0.91.0 gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 // indirect gopkg.in/yaml.v2 v2.4.0 - k8s.io/api v0.24.3 - k8s.io/apimachinery v0.24.3 - k8s.io/client-go v0.24.3 + k8s.io/api v0.24.4 + k8s.io/apimachinery v0.24.4 + k8s.io/client-go v0.24.4 k8s.io/cluster-bootstrap v0.0.0 - k8s.io/component-base v0.24.3 + k8s.io/component-base v0.24.4 k8s.io/klog/v2 v2.70.1 k8s.io/kubectl v0.24.3 k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 diff --git a/go.sum b/go.sum index 5c861c7855..4a5b24a128 100644 --- a/go.sum +++ b/go.sum @@ -2237,15 +2237,17 @@ k8s.io/api v0.20.1/go.mod h1:KqwcCVogGxQY3nBlRpwt+wpAMF/KjaCc7RpywacvqUo= k8s.io/api v0.20.4/go.mod h1:++lNL1AJMkDymriNniQsWRkMDzRaX2Y/POTUi8yvqYQ= k8s.io/api v0.20.6/go.mod h1:X9e8Qag6JV/bL5G6bU8sdVRltWKmdHsFUGS3eVndqE8= k8s.io/api v0.22.4/go.mod h1:Rgs+9gIGYC5laXQSZZ9JqT5NevNgoGiOdVWi1BAB3qk= -k8s.io/api v0.24.3 h1:tt55QEmKd6L2k5DP6G/ZzdMQKvG5ro4H4teClqm0sTY= k8s.io/api v0.24.3/go.mod h1:elGR/XSZrS7z7cSZPzVWaycpJuGIw57j9b95/1PdJNI= +k8s.io/api v0.24.4 h1:I5Y645gJ8zWKawyr78lVfDQkZrAViSbeRXsPZWTxmXk= +k8s.io/api v0.24.4/go.mod h1:42pVfA0NRxrtJhZQOvRSyZcJihzAdU59WBtTjYcB0/M= k8s.io/apimachinery v0.19.1/go.mod h1:DnPGDnARWFvYa3pMHgSxtbZb7gpzzAZ1pTfaUNDVlmA= k8s.io/apimachinery v0.20.1/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU= k8s.io/apimachinery v0.20.4/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU= k8s.io/apimachinery v0.20.6/go.mod h1:ejZXtW1Ra6V1O5H8xPBGz+T3+4gfkTCeExAHKU57MAc= k8s.io/apimachinery v0.22.4/go.mod h1:yU6oA6Gnax9RrxGzVvPFFJ+mpnW6PBSqp0sx0I0HHW0= -k8s.io/apimachinery v0.24.3 h1:hrFiNSA2cBZqllakVYyH/VyEh4B581bQRmqATJSeQTg= k8s.io/apimachinery v0.24.3/go.mod h1:82Bi4sCzVBdpYjyI4jY6aHX+YCUchUIrZrXKedjd2UM= +k8s.io/apimachinery v0.24.4 h1:S0Ur3J/PbivTcL43EdSdPhqCqKla2NIuneNwZcTDeGQ= +k8s.io/apimachinery v0.24.4/go.mod h1:82Bi4sCzVBdpYjyI4jY6aHX+YCUchUIrZrXKedjd2UM= k8s.io/apiserver v0.20.1/go.mod h1:ro5QHeQkgMS7ZGpvf4tSMx6bBOgPfE+f52KwvXfScaU= k8s.io/apiserver v0.20.4/go.mod h1:Mc80thBKOyy7tbvFtB4kJv1kbdD0eIH8k8vianJcbFM= k8s.io/apiserver v0.20.6/go.mod h1:QIJXNt6i6JB+0YQRNcS0hdRHJlMhflFmsBDeSgT1r8Q= @@ -2254,16 +2256,18 @@ k8s.io/client-go v0.19.1/go.mod h1:AZOIVSI9UUtQPeJD3zJFp15CEhSjRgAuQP5PWRJrCIQ= k8s.io/client-go v0.20.1/go.mod h1:/zcHdt1TeWSd5HoUe6elJmHSQ6uLLgp4bIJHVEuy+/Y= k8s.io/client-go v0.20.4/go.mod h1:LiMv25ND1gLUdBeYxBIwKpkSC5IsozMMmOOeSJboP+k= k8s.io/client-go v0.20.6/go.mod h1:nNQMnOvEUEsOzRRFIIkdmYOjAZrC8bgq0ExboWSU1I0= -k8s.io/client-go v0.24.3 h1:Nl1840+6p4JqkFWEW2LnMKU667BUxw03REfLAVhuKQY= k8s.io/client-go v0.24.3/go.mod h1:AAovolf5Z9bY1wIg2FZ8LPQlEdKHjLI7ZD4rw920BJw= +k8s.io/client-go v0.24.4 h1:hIAIJZIPyaw46AkxwyR0FRfM/pRxpUNTd3ysYu9vyRg= +k8s.io/client-go v0.24.4/go.mod h1:+AxlPWw/H6f+EJhRSjIeALaJT4tbeB/8g9BNvXGPd0Y= k8s.io/cluster-bootstrap v0.22.4 h1:2ZhV/1K4GiCrnmDHHbBnN3bERWn+Nxrtxmxp6uYYThI= k8s.io/cluster-bootstrap v0.22.4/go.mod h1:fTQZ6u9G6fg2LHhB8nEgZLnXIhCDSRYuLUUS5pgW8RY= k8s.io/code-generator v0.24.3/go.mod h1:dpVhs00hTuTdTY6jvVxvTFCk6gSMrtfRydbhZwHI15w= k8s.io/component-base v0.20.1/go.mod h1:guxkoJnNoh8LNrbtiQOlyp2Y2XFCZQmrcg2n/DeYNLk= k8s.io/component-base v0.20.4/go.mod h1:t4p9EdiagbVCJKrQ1RsA5/V4rFQNDfRlevJajlGwgjI= k8s.io/component-base v0.20.6/go.mod h1:6f1MPBAeI+mvuts3sIdtpjljHWBQ2cIy38oBIWMYnrM= -k8s.io/component-base v0.24.3 h1:u99WjuHYCRJjS1xeLOx72DdRaghuDnuMgueiGMFy1ec= k8s.io/component-base v0.24.3/go.mod h1:bqom2IWN9Lj+vwAkPNOv2TflsP1PeVDIwIN0lRthxYY= +k8s.io/component-base v0.24.4 h1:WEGRp06GBYVwxp5JdiRaJ1zkdOhrqucxRv/8IrABLG0= +k8s.io/component-base v0.24.4/go.mod h1:sWxkgcMfbYHadw0OJ0N+vIscd14/nqSIM2veCdg843o= k8s.io/component-helpers v0.24.3/go.mod h1:/1WNW8TfBOijQ1ED2uCHb4wtXYWDVNMqUll8h36iNVo= k8s.io/cri-api v0.17.3/go.mod h1:X1sbHmuXhwaHs9xxYffLqJogVsnI+f6cPRcgPel7ywM= k8s.io/cri-api v0.20.1/go.mod h1:2JRbKt+BFLTjtrILYVqQK5jqhI+XNdF6UiGMgczeBCI= From 6280f3931b629dbf37c344819c0abe7fbf201111 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Mon, 22 Aug 2022 14:05:40 -0700 Subject: [PATCH 421/545] fix compatibility between v1 & v3 --- .github/workflows/functional_verified.yml | 1 + .github/workflows/master.yml | 5 +++++ .github/workflows/pr.yml | 5 +++++ 3 files changed, 11 insertions(+) diff --git a/.github/workflows/functional_verified.yml b/.github/workflows/functional_verified.yml index 0cab306c54..4e12445951 100644 --- a/.github/workflows/functional_verified.yml +++ b/.github/workflows/functional_verified.yml @@ -122,6 +122,7 @@ jobs: uses: actions/download-artifact@fb598a63ae348fa914e94cd0ff38f362e927b741 with: name: minikube_binaries + path: minikube_binaries - name: Pre-cleanup continue-on-error: true diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 0c4736f7dc..31787e2c3e 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -129,6 +129,7 @@ jobs: uses: actions/download-artifact@fb598a63ae348fa914e94cd0ff38f362e927b741 with: name: minikube_binaries + path: minikube_binaries - name: Run Integration Test continue-on-error: false # bash {0} to allow test to continue to next step. in case of @@ -228,6 +229,7 @@ jobs: uses: actions/download-artifact@fb598a63ae348fa914e94cd0ff38f362e927b741 with: name: minikube_binaries + path: minikube_binaries - name: Run Integration Test continue-on-error: false # bash {0} to allow test to continue to next step. in case of @@ -330,6 +332,7 @@ jobs: uses: actions/download-artifact@fb598a63ae348fa914e94cd0ff38f362e927b741 with: name: minikube_binaries + path: minikube_binaries - name: Run Integration Test continue-on-error: false # bash {0} to allow test to continue to next step. in case of @@ -431,6 +434,7 @@ jobs: uses: actions/download-artifact@fb598a63ae348fa914e94cd0ff38f362e927b741 with: name: minikube_binaries + path: minikube_binaries - name: Run Integration Test continue-on-error: false # bash {0} to allow test to continue to next step. in case of @@ -532,6 +536,7 @@ jobs: uses: actions/download-artifact@fb598a63ae348fa914e94cd0ff38f362e927b741 with: name: minikube_binaries + path: minikube_binaries - name: Run Integration Test continue-on-error: true # bash {0} to allow test to continue to next step. in case of diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 33e195ce5b..797ef949a3 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -126,6 +126,7 @@ jobs: uses: actions/download-artifact@fb598a63ae348fa914e94cd0ff38f362e927b741 with: name: minikube_binaries + path: minikube_binaries - name: Run Integration Test continue-on-error: false # bash {0} to allow test to continue to next step. in case of @@ -226,6 +227,7 @@ jobs: uses: actions/download-artifact@fb598a63ae348fa914e94cd0ff38f362e927b741 with: name: minikube_binaries + path: minikube_binaries - name: Run Integration Test continue-on-error: false # bash {0} to allow test to continue to next step. in case of @@ -329,6 +331,7 @@ jobs: uses: actions/download-artifact@fb598a63ae348fa914e94cd0ff38f362e927b741 with: name: minikube_binaries + path: minikube_binaries - name: Run Integration Test continue-on-error: false # bash {0} to allow test to continue to next step. in case of @@ -431,6 +434,7 @@ jobs: uses: actions/download-artifact@fb598a63ae348fa914e94cd0ff38f362e927b741 with: name: minikube_binaries + path: minikube_binaries - name: Run Integration Test continue-on-error: false # bash {0} to allow test to continue to next step. in case of @@ -533,6 +537,7 @@ jobs: uses: actions/download-artifact@fb598a63ae348fa914e94cd0ff38f362e927b741 with: name: minikube_binaries + path: minikube_binaries - name: Run Integration Test continue-on-error: true # bash {0} to allow test to continue to next step. in case of From 6a2a4e661e04cfcf2b9e058174cadf861c7a1c4d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Aug 2022 21:14:55 +0000 Subject: [PATCH 422/545] Bump google.golang.org/api from 0.91.0 to 0.93.0 Bumps [google.golang.org/api](https://github.com/googleapis/google-api-go-client) from 0.91.0 to 0.93.0. - [Release notes](https://github.com/googleapis/google-api-go-client/releases) - [Changelog](https://github.com/googleapis/google-api-go-client/blob/main/CHANGES.md) - [Commits](https://github.com/googleapis/google-api-go-client/compare/v0.91.0...v0.93.0) --- updated-dependencies: - dependency-name: google.golang.org/api dependency-type: direct:production update-type: version-update:semver-minor ... 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 bc842bdbe3..cb426e27f2 100644 --- a/go.mod +++ b/go.mod @@ -80,7 +80,7 @@ require ( golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 golang.org/x/text v0.3.7 gonum.org/v1/plot v0.11.0 - google.golang.org/api v0.91.0 + google.golang.org/api v0.93.0 gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 // indirect gopkg.in/yaml.v2 v2.4.0 k8s.io/api v0.24.4 diff --git a/go.sum b/go.sum index 4a5b24a128..a03dd9d665 100644 --- a/go.sum +++ b/go.sum @@ -2005,8 +2005,8 @@ google.golang.org/api v0.75.0/go.mod h1:pU9QmyHLnzlpar1Mjt4IbapUCy8J+6HD6GeELN69 google.golang.org/api v0.78.0/go.mod h1:1Sg78yoMLOhlQTeF+ARBoytAcH1NNyyl390YMy6rKmw= google.golang.org/api v0.80.0/go.mod h1:xY3nI94gbvBrE0J6NHXhxOmW97HG7Khjkku6AFB3Hyg= google.golang.org/api v0.84.0/go.mod h1:NTsGnUFJMYROtiquksZHBWtHfeMC7iYthki7Eq3pa8o= -google.golang.org/api v0.91.0 h1:731+JzuwaJoZXRQGmPoBiV+SrsAfUaIkdMCWTcQNPyA= -google.golang.org/api v0.91.0/go.mod h1:+Sem1dnrKlrXMR/X0bPnMWyluQe4RsNoYfmNLhOIkzw= +google.golang.org/api v0.93.0 h1:T2xt9gi0gHdxdnRkVQhT8mIvPaXKNsDNWz+L696M66M= +google.golang.org/api v0.93.0/go.mod h1:+Sem1dnrKlrXMR/X0bPnMWyluQe4RsNoYfmNLhOIkzw= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= From a2c2c8bcf4827d299315cfe98a1da2170f2f902e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Aug 2022 21:17:13 +0000 Subject: [PATCH 423/545] Bump k8s.io/kubectl from 0.24.3 to 0.24.4 Bumps [k8s.io/kubectl](https://github.com/kubernetes/kubectl) from 0.24.3 to 0.24.4. - [Release notes](https://github.com/kubernetes/kubectl/releases) - [Commits](https://github.com/kubernetes/kubectl/compare/v0.24.3...v0.24.4) --- updated-dependencies: - dependency-name: k8s.io/kubectl dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 16 ++++++---------- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/go.mod b/go.mod index bc842bdbe3..728af177be 100644 --- a/go.mod +++ b/go.mod @@ -89,7 +89,7 @@ require ( k8s.io/cluster-bootstrap v0.0.0 k8s.io/component-base v0.24.4 k8s.io/klog/v2 v2.70.1 - k8s.io/kubectl v0.24.3 + k8s.io/kubectl v0.24.4 k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 libvirt.org/go/libvirt v1.8005.0 sigs.k8s.io/sig-storage-lib-external-provisioner/v6 v6.3.0 diff --git a/go.sum b/go.sum index 4a5b24a128..1b73bcdffa 100644 --- a/go.sum +++ b/go.sum @@ -2237,7 +2237,6 @@ k8s.io/api v0.20.1/go.mod h1:KqwcCVogGxQY3nBlRpwt+wpAMF/KjaCc7RpywacvqUo= k8s.io/api v0.20.4/go.mod h1:++lNL1AJMkDymriNniQsWRkMDzRaX2Y/POTUi8yvqYQ= k8s.io/api v0.20.6/go.mod h1:X9e8Qag6JV/bL5G6bU8sdVRltWKmdHsFUGS3eVndqE8= k8s.io/api v0.22.4/go.mod h1:Rgs+9gIGYC5laXQSZZ9JqT5NevNgoGiOdVWi1BAB3qk= -k8s.io/api v0.24.3/go.mod h1:elGR/XSZrS7z7cSZPzVWaycpJuGIw57j9b95/1PdJNI= k8s.io/api v0.24.4 h1:I5Y645gJ8zWKawyr78lVfDQkZrAViSbeRXsPZWTxmXk= k8s.io/api v0.24.4/go.mod h1:42pVfA0NRxrtJhZQOvRSyZcJihzAdU59WBtTjYcB0/M= k8s.io/apimachinery v0.19.1/go.mod h1:DnPGDnARWFvYa3pMHgSxtbZb7gpzzAZ1pTfaUNDVlmA= @@ -2245,30 +2244,27 @@ k8s.io/apimachinery v0.20.1/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRp k8s.io/apimachinery v0.20.4/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU= k8s.io/apimachinery v0.20.6/go.mod h1:ejZXtW1Ra6V1O5H8xPBGz+T3+4gfkTCeExAHKU57MAc= k8s.io/apimachinery v0.22.4/go.mod h1:yU6oA6Gnax9RrxGzVvPFFJ+mpnW6PBSqp0sx0I0HHW0= -k8s.io/apimachinery v0.24.3/go.mod h1:82Bi4sCzVBdpYjyI4jY6aHX+YCUchUIrZrXKedjd2UM= k8s.io/apimachinery v0.24.4 h1:S0Ur3J/PbivTcL43EdSdPhqCqKla2NIuneNwZcTDeGQ= k8s.io/apimachinery v0.24.4/go.mod h1:82Bi4sCzVBdpYjyI4jY6aHX+YCUchUIrZrXKedjd2UM= k8s.io/apiserver v0.20.1/go.mod h1:ro5QHeQkgMS7ZGpvf4tSMx6bBOgPfE+f52KwvXfScaU= k8s.io/apiserver v0.20.4/go.mod h1:Mc80thBKOyy7tbvFtB4kJv1kbdD0eIH8k8vianJcbFM= k8s.io/apiserver v0.20.6/go.mod h1:QIJXNt6i6JB+0YQRNcS0hdRHJlMhflFmsBDeSgT1r8Q= -k8s.io/cli-runtime v0.24.3/go.mod h1:In84wauoMOqa7JDvDSXGbf8lTNlr70fOGpYlYfJtSqA= +k8s.io/cli-runtime v0.24.4/go.mod h1:RF+cSLYXkPV3WyvPrX2qeRLEUJY38INWx6jLKVLFCxM= k8s.io/client-go v0.19.1/go.mod h1:AZOIVSI9UUtQPeJD3zJFp15CEhSjRgAuQP5PWRJrCIQ= k8s.io/client-go v0.20.1/go.mod h1:/zcHdt1TeWSd5HoUe6elJmHSQ6uLLgp4bIJHVEuy+/Y= k8s.io/client-go v0.20.4/go.mod h1:LiMv25ND1gLUdBeYxBIwKpkSC5IsozMMmOOeSJboP+k= k8s.io/client-go v0.20.6/go.mod h1:nNQMnOvEUEsOzRRFIIkdmYOjAZrC8bgq0ExboWSU1I0= -k8s.io/client-go v0.24.3/go.mod h1:AAovolf5Z9bY1wIg2FZ8LPQlEdKHjLI7ZD4rw920BJw= k8s.io/client-go v0.24.4 h1:hIAIJZIPyaw46AkxwyR0FRfM/pRxpUNTd3ysYu9vyRg= k8s.io/client-go v0.24.4/go.mod h1:+AxlPWw/H6f+EJhRSjIeALaJT4tbeB/8g9BNvXGPd0Y= k8s.io/cluster-bootstrap v0.22.4 h1:2ZhV/1K4GiCrnmDHHbBnN3bERWn+Nxrtxmxp6uYYThI= k8s.io/cluster-bootstrap v0.22.4/go.mod h1:fTQZ6u9G6fg2LHhB8nEgZLnXIhCDSRYuLUUS5pgW8RY= -k8s.io/code-generator v0.24.3/go.mod h1:dpVhs00hTuTdTY6jvVxvTFCk6gSMrtfRydbhZwHI15w= +k8s.io/code-generator v0.24.4/go.mod h1:dpVhs00hTuTdTY6jvVxvTFCk6gSMrtfRydbhZwHI15w= k8s.io/component-base v0.20.1/go.mod h1:guxkoJnNoh8LNrbtiQOlyp2Y2XFCZQmrcg2n/DeYNLk= k8s.io/component-base v0.20.4/go.mod h1:t4p9EdiagbVCJKrQ1RsA5/V4rFQNDfRlevJajlGwgjI= k8s.io/component-base v0.20.6/go.mod h1:6f1MPBAeI+mvuts3sIdtpjljHWBQ2cIy38oBIWMYnrM= -k8s.io/component-base v0.24.3/go.mod h1:bqom2IWN9Lj+vwAkPNOv2TflsP1PeVDIwIN0lRthxYY= k8s.io/component-base v0.24.4 h1:WEGRp06GBYVwxp5JdiRaJ1zkdOhrqucxRv/8IrABLG0= k8s.io/component-base v0.24.4/go.mod h1:sWxkgcMfbYHadw0OJ0N+vIscd14/nqSIM2veCdg843o= -k8s.io/component-helpers v0.24.3/go.mod h1:/1WNW8TfBOijQ1ED2uCHb4wtXYWDVNMqUll8h36iNVo= +k8s.io/component-helpers v0.24.4/go.mod h1:xAHlOKU8rAjLgXWJEsueWLR1LDMThbaPf2YvgKpSyQ8= k8s.io/cri-api v0.17.3/go.mod h1:X1sbHmuXhwaHs9xxYffLqJogVsnI+f6cPRcgPel7ywM= k8s.io/cri-api v0.20.1/go.mod h1:2JRbKt+BFLTjtrILYVqQK5jqhI+XNdF6UiGMgczeBCI= k8s.io/cri-api v0.20.4/go.mod h1:2JRbKt+BFLTjtrILYVqQK5jqhI+XNdF6UiGMgczeBCI= @@ -2290,10 +2286,10 @@ k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e/go.mod h1:vHXdDvt9+2spS2R k8s.io/kube-openapi v0.0.0-20211109043538-20434351676c/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw= k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 h1:Gii5eqf+GmIEwGNKQYQClCayuJCe2/4fZUvF7VG99sU= k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42/go.mod h1:Z/45zLw8lUo4wdiUkI+v/ImEGAvu3WatcZl3lPMR4Rk= -k8s.io/kubectl v0.24.3 h1:PqY8ho/S/KuE2/hCC3Iee7X+lOtARYo0LQsNzvV/edE= -k8s.io/kubectl v0.24.3/go.mod h1:PYLcvw96sC1NLbxZEDbdlOEd6/C76VIWjGmWV5QjSk0= +k8s.io/kubectl v0.24.4 h1:fPEBkAV3/cu3BQVIUCXNngCCY62AlZ+2rkRVHcmJPn0= +k8s.io/kubectl v0.24.4/go.mod h1:AVyJzxUwA5UMGTDyKGL6nd6RRW36FbmAdtIDMhrZtW0= k8s.io/kubernetes v1.13.0/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk= -k8s.io/metrics v0.24.3/go.mod h1:p1M0lhMySWfhISkSd3HEj8xIgrVnJTK3PPhFq2rA3To= +k8s.io/metrics v0.24.4/go.mod h1:7D8Xm3DGZoJaiCS8+QA2EzdMuDlq0Y8SiOPUB/1BaGU= k8s.io/utils v0.0.0-20200729134348-d5654de09c73/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20210802155522-efc7438f0176/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= From e8d2998b15c5a73b302c954bd0a9351926598d52 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Tue, 23 Aug 2022 14:49:12 -0700 Subject: [PATCH 424/545] Update gcp-auth-webhook from v0.0.10 to v0.0.11 --- pkg/minikube/assets/addons.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/minikube/assets/addons.go b/pkg/minikube/assets/addons.go index bc8b6a25c5..83e89ad714 100755 --- a/pkg/minikube/assets/addons.go +++ b/pkg/minikube/assets/addons.go @@ -578,7 +578,7 @@ var Addons = map[string]*Addon{ "0640"), }, false, "gcp-auth", "Google", "", "https://minikube.sigs.k8s.io/docs/handbook/addons/gcp-auth/", map[string]string{ "KubeWebhookCertgen": "ingress-nginx/kube-webhook-certgen:v1.0@sha256:f3b6b39a6062328c095337b4cadcefd1612348fdd5190b1dcbcb9b9e90bd8068", - "GCPAuthWebhook": "k8s-minikube/gcp-auth-webhook:v0.0.10@sha256:1ce1510da2a4af923e678d487ec0a78f4a8f2a65206a3aa8de659a196ae98d0f", + "GCPAuthWebhook": "k8s-minikube/gcp-auth-webhook:v0.0.11@sha256:82efb346863dc47701586bebadd4cef998d4c6692d802ec3de68d451c87fb613", }, map[string]string{ "GCPAuthWebhook": "gcr.io", "KubeWebhookCertgen": "k8s.gcr.io", From 552ef2c0007660f17959405e92f3ad0c2ac0bc09 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Thu, 25 Aug 2022 03:08:11 +0000 Subject: [PATCH 425/545] Updating ISO to v1.26.1-1661377864-14783 --- 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 9ef9bb50b8..fa866e9fd4 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.26.1 +ISO_VERSION ?= v1.26.1-1661377864-14783 # 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 5cf6482601..189eeb1c5a 100644 --- a/pkg/minikube/download/iso.go +++ b/pkg/minikube/download/iso.go @@ -41,7 +41,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/iso" + isoBucket := "minikube-builds/iso/14783" return []string{ fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s-%s.iso", isoBucket, v, runtime.GOARCH), fmt.Sprintf("https://github.com/kubernetes/minikube/releases/download/%s/minikube-%s-%s.iso", v, v, runtime.GOARCH), diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index 749e2e4931..66d5a77024 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/iso/minikube-v1.26.1-amd64.iso,https://github.com/kubernetes/minikube/releases/download/v1.26.1/minikube-v1.26.1-amd64.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.26.1-amd64.iso]) + --iso-url strings Locations to fetch the minikube ISO from. (default [https://storage.googleapis.com/minikube-builds/iso/14783/minikube-v1.26.1-1661377864-14783-amd64.iso,https://github.com/kubernetes/minikube/releases/download/v1.26.1-1661377864-14783/minikube-v1.26.1-1661377864-14783-amd64.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.26.1-1661377864-14783-amd64.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.24.3, 'latest' for v1.25.0-beta.0). Defaults to 'stable'. --kvm-gpu Enable experimental NVIDIA GPU support in minikube From c5dc43f96382211429a2058f341345cafea94163 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 29 Aug 2022 10:02:15 +0000 Subject: [PATCH 426/545] bump golint versions --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index fa866e9fd4..89902f80e6 100644 --- a/Makefile +++ b/Makefile @@ -76,7 +76,7 @@ MINIKUBE_RELEASES_URL=https://github.com/kubernetes/minikube/releases/download KERNEL_VERSION ?= 5.10.57 # latest from https://github.com/golangci/golangci-lint/releases # update this only by running `make update-golint-version` -GOLINT_VERSION ?= v1.48.0 +GOLINT_VERSION ?= v1.49.0 # Limit number of default jobs, to avoid the CI builds running out of memory GOLINT_JOBS ?= 4 # see https://github.com/golangci/golangci-lint#memory-usage-of-golangci-lint From 78738b2cc6ae6d786c8955431faa42be563dda92 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Aug 2022 18:04:47 +0000 Subject: [PATCH 427/545] Bump google.golang.org/api from 0.93.0 to 0.94.0 Bumps [google.golang.org/api](https://github.com/googleapis/google-api-go-client) from 0.93.0 to 0.94.0. - [Release notes](https://github.com/googleapis/google-api-go-client/releases) - [Changelog](https://github.com/googleapis/google-api-go-client/blob/main/CHANGES.md) - [Commits](https://github.com/googleapis/google-api-go-client/compare/v0.93.0...v0.94.0) --- updated-dependencies: - dependency-name: google.golang.org/api dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 4 ++-- go.sum | 9 ++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/go.mod b/go.mod index 04ffce36d8..6a53b54c41 100644 --- a/go.mod +++ b/go.mod @@ -74,13 +74,13 @@ require ( golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4 golang.org/x/exp v0.0.0-20210220032938-85be41e4509f golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 - golang.org/x/oauth2 v0.0.0-20220718184931-c8730f7fcb92 + golang.org/x/oauth2 v0.0.0-20220822191816-0ebed06d0094 golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 golang.org/x/text v0.3.7 gonum.org/v1/plot v0.11.0 - google.golang.org/api v0.93.0 + google.golang.org/api v0.94.0 gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 // indirect gopkg.in/yaml.v2 v2.4.0 k8s.io/api v0.24.4 diff --git a/go.sum b/go.sum index ee2d6d8d29..9dddf0e082 100644 --- a/go.sum +++ b/go.sum @@ -1667,9 +1667,8 @@ golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j golang.org/x/oauth2 v0.0.0-20220309155454-6242fa91716a/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= golang.org/x/oauth2 v0.0.0-20220608161450-d0670ef3b1eb/go.mod h1:jaDAt6Dkxork7LmZnYtzbRWj0W47D86a3TGe0YHBvmE= -golang.org/x/oauth2 v0.0.0-20220622183110-fd043fe589d2/go.mod h1:jaDAt6Dkxork7LmZnYtzbRWj0W47D86a3TGe0YHBvmE= -golang.org/x/oauth2 v0.0.0-20220718184931-c8730f7fcb92 h1:oVlhw3Oe+1reYsE2Nqu19PDJfLzwdU3QUUrG86rLK68= -golang.org/x/oauth2 v0.0.0-20220718184931-c8730f7fcb92/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg= +golang.org/x/oauth2 v0.0.0-20220822191816-0ebed06d0094 h1:2o1E+E8TpNLklK9nHiPiK1uzIYrIHt+cQx3ynCwq9V8= +golang.org/x/oauth2 v0.0.0-20220822191816-0ebed06d0094/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg= 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= @@ -2006,8 +2005,8 @@ google.golang.org/api v0.75.0/go.mod h1:pU9QmyHLnzlpar1Mjt4IbapUCy8J+6HD6GeELN69 google.golang.org/api v0.78.0/go.mod h1:1Sg78yoMLOhlQTeF+ARBoytAcH1NNyyl390YMy6rKmw= google.golang.org/api v0.80.0/go.mod h1:xY3nI94gbvBrE0J6NHXhxOmW97HG7Khjkku6AFB3Hyg= google.golang.org/api v0.84.0/go.mod h1:NTsGnUFJMYROtiquksZHBWtHfeMC7iYthki7Eq3pa8o= -google.golang.org/api v0.93.0 h1:T2xt9gi0gHdxdnRkVQhT8mIvPaXKNsDNWz+L696M66M= -google.golang.org/api v0.93.0/go.mod h1:+Sem1dnrKlrXMR/X0bPnMWyluQe4RsNoYfmNLhOIkzw= +google.golang.org/api v0.94.0 h1:KtKM9ru3nzQioV1HLlUf1cR7vMYJIpgls5VhAYQXIwA= +google.golang.org/api v0.94.0/go.mod h1:eADj+UBuxkh5zlrSntJghuNeg8HwQ1w5lTKkuqaETEI= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= From bd98a186706a00738658766c1e1945c2860908e8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Aug 2022 18:18:00 +0000 Subject: [PATCH 428/545] Bump actions/setup-go from 3.2.1 to 3.3.0 Bumps [actions/setup-go](https://github.com/actions/setup-go) from 3.2.1 to 3.3.0. - [Release notes](https://github.com/actions/setup-go/releases) - [Commits](https://github.com/actions/setup-go/compare/84cbf8094393cdc5fe1fe1671ff2647332956b1a...268d8c0ca0432bb2cf416faae41297df9d262d7f) --- updated-dependencies: - dependency-name: actions/setup-go dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/build.yml | 6 +++--- .github/workflows/docs.yml | 2 +- .github/workflows/functional_verified.yml | 4 ++-- .github/workflows/leaderboard.yml | 2 +- .github/workflows/master.yml | 16 ++++++++-------- .github/workflows/pr.yml | 16 ++++++++-------- .github/workflows/sync-minikube.yml | 2 +- .github/workflows/time-to-k8s-public-chart.yml | 4 ++-- .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-gopogh-version.yml | 2 +- .github/workflows/update-gotestsum-version.yml | 2 +- .github/workflows/update-k8s-versions.yml | 2 +- .github/workflows/update-kubadm-constants.yml | 2 +- .github/workflows/yearly-leaderboard.yml | 2 +- 17 files changed, 35 insertions(+), 35 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0ec21da2aa..a576403549 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,7 +21,7 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b - - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a + - uses: actions/setup-go@268d8c0ca0432bb2cf416faae41297df9d262d7f with: go-version: ${{env.GO_VERSION}} - name: Download Dependencies @@ -47,7 +47,7 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b - - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a + - uses: actions/setup-go@268d8c0ca0432bb2cf416faae41297df9d262d7f with: go-version: ${{env.GO_VERSION}} - name: Install libvirt @@ -65,7 +65,7 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b - - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a + - uses: actions/setup-go@268d8c0ca0432bb2cf416faae41297df9d262d7f with: go-version: ${{env.GO_VERSION}} - name: Install libvirt diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index ed2c9f7f82..ca710e76c2 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -16,7 +16,7 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b - - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a + - uses: actions/setup-go@268d8c0ca0432bb2cf416faae41297df9d262d7f with: go-version: ${{env.GO_VERSION}} - name: Generate Docs diff --git a/.github/workflows/functional_verified.yml b/.github/workflows/functional_verified.yml index fea6708b7f..563a3e9fbe 100644 --- a/.github/workflows/functional_verified.yml +++ b/.github/workflows/functional_verified.yml @@ -35,7 +35,7 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b - - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a + - uses: actions/setup-go@268d8c0ca0432bb2cf416faae41297df9d262d7f with: go-version: ${{env.GO_VERSION}} - name: Download Dependencies @@ -114,7 +114,7 @@ jobs: echo "--------------------------" hostname || true echo "--------------------------" - - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a + - uses: actions/setup-go@268d8c0ca0432bb2cf416faae41297df9d262d7f with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/leaderboard.yml b/.github/workflows/leaderboard.yml index 4cf2c8adfa..8cc0c22507 100644 --- a/.github/workflows/leaderboard.yml +++ b/.github/workflows/leaderboard.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b - - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a + - uses: actions/setup-go@268d8c0ca0432bb2cf416faae41297df9d262d7f with: go-version: ${{env.GO_VERSION}} - name: Update Leaderboard diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 4a74ae913e..3ef7217627 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -25,7 +25,7 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b - - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a + - uses: actions/setup-go@268d8c0ca0432bb2cf416faae41297df9d262d7f with: go-version: ${{env.GO_VERSION}} - name: Download Dependencies @@ -51,7 +51,7 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b - - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a + - uses: actions/setup-go@268d8c0ca0432bb2cf416faae41297df9d262d7f with: go-version: ${{env.GO_VERSION}} - name: Install libvirt @@ -69,7 +69,7 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b - - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a + - uses: actions/setup-go@268d8c0ca0432bb2cf416faae41297df9d262d7f with: go-version: ${{env.GO_VERSION}} - name: Install libvirt @@ -116,7 +116,7 @@ jobs: echo "--------------------------" docker ps || true echo "--------------------------" - - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a + - uses: actions/setup-go@268d8c0ca0432bb2cf416faae41297df9d262d7f with: go-version: ${{env.GO_VERSION}} - name: Install gopogh @@ -216,7 +216,7 @@ jobs: echo "--------------------------" docker ps || true echo "--------------------------" - - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a + - uses: actions/setup-go@268d8c0ca0432bb2cf416faae41297df9d262d7f with: go-version: ${{env.GO_VERSION}} - name: Install gopogh @@ -320,7 +320,7 @@ jobs: echo "--------------------------" podman ps || true echo "--------------------------" - - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a + - uses: actions/setup-go@268d8c0ca0432bb2cf416faae41297df9d262d7f with: go-version: ${{env.GO_VERSION}} - name: Install gopogh @@ -406,7 +406,7 @@ jobs: curl -LO "https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/darwin/amd64/kubectl" sudo install kubectl /usr/local/bin/kubectl kubectl version --client=true - - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a + - uses: actions/setup-go@268d8c0ca0432bb2cf416faae41297df9d262d7f with: go-version: ${{env.GO_VERSION}} - name: Install gopogh @@ -505,7 +505,7 @@ jobs: curl -LO "https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl" sudo install kubectl /usr/local/bin/kubectl kubectl version --client=true - - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a + - uses: actions/setup-go@268d8c0ca0432bb2cf416faae41297df9d262d7f with: go-version: ${{env.GO_VERSION}} # conntrack is required for kubernetes 1.18 and higher diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index e0031004bc..b45fa2cebe 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -23,7 +23,7 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b - - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a + - uses: actions/setup-go@268d8c0ca0432bb2cf416faae41297df9d262d7f with: go-version: ${{env.GO_VERSION}} - name: Download Dependencies @@ -49,7 +49,7 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b - - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a + - uses: actions/setup-go@268d8c0ca0432bb2cf416faae41297df9d262d7f with: go-version: ${{env.GO_VERSION}} - name: Install libvirt @@ -67,7 +67,7 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b - - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a + - uses: actions/setup-go@268d8c0ca0432bb2cf416faae41297df9d262d7f with: go-version: ${{env.GO_VERSION}} - name: Install libvirt @@ -114,7 +114,7 @@ jobs: echo "--------------------------" docker ps || true echo "--------------------------" - - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a + - uses: actions/setup-go@268d8c0ca0432bb2cf416faae41297df9d262d7f with: go-version: ${{env.GO_VERSION}} - name: Install gopogh @@ -214,7 +214,7 @@ jobs: echo "--------------------------" docker ps || true echo "--------------------------" - - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a + - uses: actions/setup-go@268d8c0ca0432bb2cf416faae41297df9d262d7f with: go-version: ${{env.GO_VERSION}} - name: Install gopogh @@ -319,7 +319,7 @@ jobs: echo "--------------------------" podman ps || true echo "--------------------------" - - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a + - uses: actions/setup-go@268d8c0ca0432bb2cf416faae41297df9d262d7f with: go-version: ${{env.GO_VERSION}} - name: Install gopogh @@ -406,7 +406,7 @@ jobs: curl -LO "https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/darwin/amd64/kubectl" sudo install kubectl /usr/local/bin/kubectl kubectl version --client=true - - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a + - uses: actions/setup-go@268d8c0ca0432bb2cf416faae41297df9d262d7f with: go-version: ${{env.GO_VERSION}} - name: Install gopogh @@ -506,7 +506,7 @@ jobs: curl -LO "https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl" sudo install kubectl /usr/local/bin/kubectl kubectl version --client=true - - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a + - uses: actions/setup-go@268d8c0ca0432bb2cf416faae41297df9d262d7f with: go-version: ${{env.GO_VERSION}} # conntrack is required for kubernetes 1.18 and higher diff --git a/.github/workflows/sync-minikube.yml b/.github/workflows/sync-minikube.yml index 9ad724d097..3a52365e90 100644 --- a/.github/workflows/sync-minikube.yml +++ b/.github/workflows/sync-minikube.yml @@ -23,7 +23,7 @@ jobs: path: ./image-syncer - name: Set up Go - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a + uses: actions/setup-go@268d8c0ca0432bb2cf416faae41297df9d262d7f with: go-version: ${{env.GO_VERSION}} diff --git a/.github/workflows/time-to-k8s-public-chart.yml b/.github/workflows/time-to-k8s-public-chart.yml index 823721c6d5..fa880690df 100644 --- a/.github/workflows/time-to-k8s-public-chart.yml +++ b/.github/workflows/time-to-k8s-public-chart.yml @@ -20,7 +20,7 @@ jobs: AWS_DEFAULT_REGION: 'us-west-1' steps: - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b - - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a + - uses: actions/setup-go@268d8c0ca0432bb2cf416faae41297df9d262d7f with: go-version: ${{env.GO_VERSION}} - name: Benchmark time-to-k8s for Docker driver with Docker runtime @@ -44,7 +44,7 @@ jobs: curl -LO "https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/darwin/amd64/kubectl" sudo install kubectl /usr/local/bin/kubectl kubectl version --client=true - - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a + - uses: actions/setup-go@268d8c0ca0432bb2cf416faae41297df9d262d7f with: go-version: ${{env.GO_VERSION}} - name: Disable firewall diff --git a/.github/workflows/time-to-k8s.yml b/.github/workflows/time-to-k8s.yml index a2033bd034..91e4fb4138 100644 --- a/.github/workflows/time-to-k8s.yml +++ b/.github/workflows/time-to-k8s.yml @@ -16,7 +16,7 @@ jobs: - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b - name: Checkout submodules run: git submodule update --init - - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a + - uses: actions/setup-go@268d8c0ca0432bb2cf416faae41297df9d262d7f with: go-version: ${{env.GO_VERSION}} - name: time-to-k8s Benchmark diff --git a/.github/workflows/translations.yml b/.github/workflows/translations.yml index 9de833b6d6..1e07ec238f 100644 --- a/.github/workflows/translations.yml +++ b/.github/workflows/translations.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b - - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a + - uses: actions/setup-go@268d8c0ca0432bb2cf416faae41297df9d262d7f with: go-version: ${{env.GO_VERSION}} - name: Install libvirt diff --git a/.github/workflows/update-golang-version.yml b/.github/workflows/update-golang-version.yml index cf16764f35..b47a854323 100644 --- a/.github/workflows/update-golang-version.yml +++ b/.github/workflows/update-golang-version.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b - - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a + - uses: actions/setup-go@268d8c0ca0432bb2cf416faae41297df9d262d7f with: go-version: ${{env.GO_VERSION}} - name: Bump Golang Versions diff --git a/.github/workflows/update-golint-version.yml b/.github/workflows/update-golint-version.yml index 01560f025c..6ae3e609eb 100644 --- a/.github/workflows/update-golint-version.yml +++ b/.github/workflows/update-golint-version.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b - - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a + - uses: actions/setup-go@268d8c0ca0432bb2cf416faae41297df9d262d7f with: go-version: ${{env.GO_VERSION}} - name: Bump Golint Versions diff --git a/.github/workflows/update-gopogh-version.yml b/.github/workflows/update-gopogh-version.yml index 46a55fedc0..d4095b151f 100644 --- a/.github/workflows/update-gopogh-version.yml +++ b/.github/workflows/update-gopogh-version.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b - - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a + - uses: actions/setup-go@268d8c0ca0432bb2cf416faae41297df9d262d7f with: go-version: ${{env.GO_VERSION}} - name: Bump gopogh Versions diff --git a/.github/workflows/update-gotestsum-version.yml b/.github/workflows/update-gotestsum-version.yml index b7b89b5d25..83a79557fd 100644 --- a/.github/workflows/update-gotestsum-version.yml +++ b/.github/workflows/update-gotestsum-version.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b - - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a + - uses: actions/setup-go@268d8c0ca0432bb2cf416faae41297df9d262d7f with: go-version: ${{env.GO_VERSION}} - name: Bump Gotestsum Versions diff --git a/.github/workflows/update-k8s-versions.yml b/.github/workflows/update-k8s-versions.yml index aaa390cdc1..00f85b68da 100644 --- a/.github/workflows/update-k8s-versions.yml +++ b/.github/workflows/update-k8s-versions.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b - - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a + - uses: actions/setup-go@268d8c0ca0432bb2cf416faae41297df9d262d7f with: go-version: ${{env.GO_VERSION}} - name: Bump Kubernetes Versions diff --git a/.github/workflows/update-kubadm-constants.yml b/.github/workflows/update-kubadm-constants.yml index 6dee88fa06..fc7751a8d2 100644 --- a/.github/workflows/update-kubadm-constants.yml +++ b/.github/workflows/update-kubadm-constants.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b - - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a + - uses: actions/setup-go@268d8c0ca0432bb2cf416faae41297df9d262d7f with: go-version: ${{env.GO_VERSION}} - name: Bump Kubeadm Constants for Kubernetes Images diff --git a/.github/workflows/yearly-leaderboard.yml b/.github/workflows/yearly-leaderboard.yml index 3a6fcd9221..187344bda3 100644 --- a/.github/workflows/yearly-leaderboard.yml +++ b/.github/workflows/yearly-leaderboard.yml @@ -20,7 +20,7 @@ jobs: AWS_DEFAULT_REGION: 'us-west-1' steps: - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b - - uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a + - uses: actions/setup-go@268d8c0ca0432bb2cf416faae41297df9d262d7f with: go-version: ${{env.GO_VERSION}} - name: Update Yearly Leaderboard From 20470cfc8be26e3f6528acebf74a8dc66fa2b824 Mon Sep 17 00:00:00 2001 From: Andrew Hamilton Date: Thu, 30 Jun 2022 14:34:52 -0700 Subject: [PATCH 429/545] Fixes containerd configuration issue with insecure registry - Updates containerd configuration to use the new format for specifying container registry mirrors. - Updates the start code to produce files in the correct location for registry mirrors specified with --insecure-registry --- .../containerd-bin-aarch64/config.toml | 5 +- .../config.toml.default | 4 +- .../containerd-bin-aarch64/containerd-bin.mk | 3 + .../containerd_docker_io_hosts.toml | 1 + .../x86_64/package/containerd-bin/config.toml | 5 +- .../containerd-bin/config.toml.default | 4 +- .../package/containerd-bin/containerd-bin.mk | 3 + .../containerd_docker_io_hosts.toml | 1 + deploy/kicbase/Dockerfile | 1 + deploy/kicbase/containerd.toml | 5 +- .../kicbase/containerd_docker_io_hosts.toml | 1 + pkg/minikube/cruntime/containerd.go | 64 ++++++++++--------- 12 files changed, 53 insertions(+), 44 deletions(-) create mode 100644 deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd_docker_io_hosts.toml create mode 100644 deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/containerd_docker_io_hosts.toml create mode 100644 deploy/kicbase/containerd_docker_io_hosts.toml diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/config.toml b/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/config.toml index b060e08f19..d5de73eae4 100644 --- a/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/config.toml +++ b/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/config.toml @@ -57,9 +57,8 @@ oom_score = 0 conf_dir = "/etc/cni/net.mk" conf_template = "" [plugins."io.containerd.grpc.v1.cri".registry] - [plugins."io.containerd.grpc.v1.cri".registry.mirrors] - [plugins."io.containerd.grpc.v1.cri".registry.mirrors."docker.io"] - endpoint = ["https://registry-1.docker.io"] + config_path = "/etc/containerd/certs.d" + [plugins."io.containerd.service.v1.diff-service"] default = ["walking"] [plugins."io.containerd.gc.v1.scheduler"] diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/config.toml.default b/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/config.toml.default index c54c96c320..54a396a435 100644 --- a/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/config.toml.default +++ b/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/config.toml.default @@ -100,9 +100,7 @@ oom_score = 0 max_conf_num = 1 conf_template = "" [plugins."io.containerd.grpc.v1.cri".registry] - [plugins."io.containerd.grpc.v1.cri".registry.mirrors] - [plugins."io.containerd.grpc.v1.cri".registry.mirrors."docker.io"] - endpoint = ["https://registry-1.docker.io"] + config_path = "/etc/containerd/certs.d" [plugins."io.containerd.grpc.v1.cri".image_decryption] key_model = "" [plugins."io.containerd.grpc.v1.cri".x509_key_pair_streaming] diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd-bin.mk b/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd-bin.mk index c92faee4ed..dbf7acd486 100644 --- a/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd-bin.mk +++ b/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd-bin.mk @@ -53,6 +53,9 @@ define CONTAINERD_BIN_AARCH64_INSTALL_TARGET_CMDS $(INSTALL) -Dm644 \ $(CONTAINERD_BIN_AARCH64_PKGDIR)/config.toml \ $(TARGET_DIR)/etc/containerd/config.toml + $(INSTALL) -Dm644 \ + $(CONTAINERD_BIN_AARCH64_PKGDIR)/containerd_docker_io_hosts.toml \ + $(TARGET_DIR)/etc/containerd/docker.io/hosts.toml endef define CONTAINERD_BIN_AARCH64_INSTALL_INIT_SYSTEMD diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd_docker_io_hosts.toml b/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd_docker_io_hosts.toml new file mode 100644 index 0000000000..00df747eba --- /dev/null +++ b/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd_docker_io_hosts.toml @@ -0,0 +1 @@ +server = "https://registry-1.docker.io" \ No newline at end of file diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/config.toml b/deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/config.toml index b060e08f19..e63ad23c34 100644 --- a/deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/config.toml +++ b/deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/config.toml @@ -57,9 +57,8 @@ oom_score = 0 conf_dir = "/etc/cni/net.mk" conf_template = "" [plugins."io.containerd.grpc.v1.cri".registry] - [plugins."io.containerd.grpc.v1.cri".registry.mirrors] - [plugins."io.containerd.grpc.v1.cri".registry.mirrors."docker.io"] - endpoint = ["https://registry-1.docker.io"] + config_path = "/etc/containerd/certs.d" + [plugins."io.containerd.service.v1.diff-service"] default = ["walking"] [plugins."io.containerd.gc.v1.scheduler"] diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/config.toml.default b/deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/config.toml.default index c54c96c320..54a396a435 100644 --- a/deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/config.toml.default +++ b/deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/config.toml.default @@ -100,9 +100,7 @@ oom_score = 0 max_conf_num = 1 conf_template = "" [plugins."io.containerd.grpc.v1.cri".registry] - [plugins."io.containerd.grpc.v1.cri".registry.mirrors] - [plugins."io.containerd.grpc.v1.cri".registry.mirrors."docker.io"] - endpoint = ["https://registry-1.docker.io"] + config_path = "/etc/containerd/certs.d" [plugins."io.containerd.grpc.v1.cri".image_decryption] key_model = "" [plugins."io.containerd.grpc.v1.cri".x509_key_pair_streaming] diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/containerd-bin.mk b/deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/containerd-bin.mk index f07d8d0009..3845fe6eb8 100644 --- a/deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/containerd-bin.mk +++ b/deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/containerd-bin.mk @@ -54,6 +54,9 @@ define CONTAINERD_BIN_INSTALL_TARGET_CMDS $(INSTALL) -Dm644 \ $(CONTAINERD_BIN_PKGDIR)/config.toml \ $(TARGET_DIR)/etc/containerd/config.toml + $(INSTALL) -Dm644 \ + $(CONTAINERD_BIN_PKGDIR)/containerd_docker_io_hosts.toml \ + $(TARGET_DIR)/etc/containerd/certs.d/docker.io/hosts.toml endef define CONTAINERD_BIN_INSTALL_INIT_SYSTEMD diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/containerd_docker_io_hosts.toml b/deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/containerd_docker_io_hosts.toml new file mode 100644 index 0000000000..00df747eba --- /dev/null +++ b/deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/containerd_docker_io_hosts.toml @@ -0,0 +1 @@ +server = "https://registry-1.docker.io" \ No newline at end of file diff --git a/deploy/kicbase/Dockerfile b/deploy/kicbase/Dockerfile index e5e66fbe7d..265e3ef0b4 100644 --- a/deploy/kicbase/Dockerfile +++ b/deploy/kicbase/Dockerfile @@ -50,6 +50,7 @@ COPY deploy/kicbase/10-network-security.conf /etc/sysctl.d/10-network-security.c COPY deploy/kicbase/11-tcp-mtu-probing.conf /etc/sysctl.d/11-tcp-mtu-probing.conf COPY deploy/kicbase/02-crio.conf /etc/crio/crio.conf.d/02-crio.conf COPY deploy/kicbase/containerd.toml /etc/containerd/config.toml +COPY deploy/kicbase/containerd_docker_io_hosts.toml /etc/containerd/certs.d/docker.io/hosts.toml COPY deploy/kicbase/clean-install /usr/local/bin/clean-install COPY deploy/kicbase/entrypoint /usr/local/bin/entrypoint COPY --from=auto-pause /src/cmd/auto-pause/auto-pause-${TARGETARCH} /bin/auto-pause diff --git a/deploy/kicbase/containerd.toml b/deploy/kicbase/containerd.toml index 6270ba5879..98b902d7a1 100644 --- a/deploy/kicbase/containerd.toml +++ b/deploy/kicbase/containerd.toml @@ -57,9 +57,8 @@ oom_score = 0 conf_dir = "/etc/cni/net.mk" conf_template = "" [plugins."io.containerd.grpc.v1.cri".registry] - [plugins."io.containerd.grpc.v1.cri".registry.mirrors] - [plugins."io.containerd.grpc.v1.cri".registry.mirrors."docker.io"] - endpoint = ["https://registry-1.docker.io"] + config_path = "/etc/containerd/certs.d" + [plugins."io.containerd.service.v1.diff-service"] default = ["walking"] [plugins."io.containerd.gc.v1.scheduler"] diff --git a/deploy/kicbase/containerd_docker_io_hosts.toml b/deploy/kicbase/containerd_docker_io_hosts.toml new file mode 100644 index 0000000000..00df747eba --- /dev/null +++ b/deploy/kicbase/containerd_docker_io_hosts.toml @@ -0,0 +1 @@ +server = "https://registry-1.docker.io" \ No newline at end of file diff --git a/pkg/minikube/cruntime/containerd.go b/pkg/minikube/cruntime/containerd.go index f5e4be75af..b9167b6147 100644 --- a/pkg/minikube/cruntime/containerd.go +++ b/pkg/minikube/cruntime/containerd.go @@ -21,12 +21,12 @@ import ( "encoding/base64" "encoding/json" "fmt" + "html/template" "net/url" "os" "os/exec" "path" "strings" - "text/template" "time" "github.com/blang/semver/v4" @@ -45,13 +45,12 @@ import ( const ( containerdNamespaceRoot = "/run/containerd/runc/k8s.io" // ContainerdConfFile is the path to the containerd configuration - containerdConfigFile = "/etc/containerd/config.toml" - containerdImportedConfigFile = "/etc/containerd/containerd.conf.d/02-containerd.conf" - containerdConfigTemplate = `version = 2 -{{ range .InsecureRegistry -}} -[plugins."io.containerd.grpc.v1.cri".registry.mirrors."{{. -}}"] - endpoint = ["http://{{. -}}"] -{{ end -}} + containerdConfigFile = "/etc/containerd/config.toml" + containerdMirrorsRoot = "/etc/containerd/certs.d" + containerdInsecureRegistryTemplate = `server = "{{.InsecureRegistry -}}" + +[host."{{.InsecureRegistry -}}"] + skip_verify = true ` ) @@ -142,28 +141,35 @@ func generateContainerdConfig(cr CommandRunner, imageRepository string, kv semve if _, err := cr.RunCmd(exec.Command("/bin/bash", "-c", fmt.Sprintf("sudo sed -e 's|^.*conf_dir = .*$|conf_dir = \"%s\"|' -i %s", cni.ConfDir, containerdConfigFile))); err != nil { return errors.Wrap(err, "update conf_dir") } - imports := `imports = ["/etc/containerd/containerd.conf.d/02-containerd.conf"]` - if _, err := cr.RunCmd(exec.Command("/bin/bash", "-c", fmt.Sprintf("sudo sed -e 's|^# imports|%s|' -i %s", imports, containerdConfigFile))); err != nil { - return errors.Wrap(err, "update conf_dir") - } - cPath := containerdImportedConfigFile - t, err := template.New("02-containerd.conf").Parse(containerdConfigTemplate) - if err != nil { - return err - } - opts := struct { - InsecureRegistry []string - }{ - InsecureRegistry: insecureRegistry, - } - var b bytes.Buffer - if err := t.Execute(&b, opts); err != nil { - return err - } - c := exec.Command("/bin/bash", "-c", fmt.Sprintf("sudo mkdir -p %s && printf %%s \"%s\" | base64 -d | sudo tee %s", path.Dir(cPath), base64.StdEncoding.EncodeToString(b.Bytes()), cPath)) - if _, err := cr.RunCmd(c); err != nil { - return errors.Wrap(err, "generate containerd cfg") + for _, registry := range insecureRegistry { + addr := registry + if strings.HasPrefix(strings.ToLower(registry), "http://") || strings.HasPrefix(strings.ToLower(registry), "https://") { + i := strings.Index(addr, "//") + addr = addr[i+2:] + } else { + registry = "http://" + registry + } + + t, err := template.New("hosts.toml").Parse(containerdInsecureRegistryTemplate) + if err != nil { + return errors.Wrap(err, "unable to parse insecure registry template") + } + opts := struct { + InsecureRegistry string + }{ + InsecureRegistry: registry, + } + var b bytes.Buffer + if err := t.Execute(&b, opts); err != nil { + return errors.Wrap(err, "unable to create insecure registry template") + } + regRootPath := path.Join(containerdMirrorsRoot, addr) + + c := exec.Command("/bin/bash", "-c", fmt.Sprintf("sudo mkdir -p %s && printf %%s \"%s\" | base64 -d | sudo tee %s", regRootPath, base64.StdEncoding.EncodeToString(b.Bytes()), path.Join(regRootPath, "hosts.toml"))) + if _, err := cr.RunCmd(c); err != nil { + return errors.Wrap(err, "unable to generate insecure registry cfg") + } } return nil } From c929340ea939a0403d2c3ba65c436e4c8d9e59d5 Mon Sep 17 00:00:00 2001 From: Andrew Hamilton Date: Mon, 29 Aug 2022 10:29:33 -0700 Subject: [PATCH 430/545] Update target dir for aarch64 Adds missing certs.d directory in the installation directory path. Co-authored-by: Steven Powell <44844360+spowelljr@users.noreply.github.com> --- .../aarch64/package/containerd-bin-aarch64/containerd-bin.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd-bin.mk b/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd-bin.mk index dbf7acd486..1dd8ac38a8 100644 --- a/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd-bin.mk +++ b/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd-bin.mk @@ -55,7 +55,7 @@ define CONTAINERD_BIN_AARCH64_INSTALL_TARGET_CMDS $(TARGET_DIR)/etc/containerd/config.toml $(INSTALL) -Dm644 \ $(CONTAINERD_BIN_AARCH64_PKGDIR)/containerd_docker_io_hosts.toml \ - $(TARGET_DIR)/etc/containerd/docker.io/hosts.toml + $(TARGET_DIR)/etc/containerd/certs.d/docker.io/hosts.toml endef define CONTAINERD_BIN_AARCH64_INSTALL_INIT_SYSTEMD From 1599f52e3fa68557bb7f1719d13076e299b48e9d Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 29 Aug 2022 18:16:10 +0000 Subject: [PATCH 431/545] Updating kicbase image to v0.0.33-1661795577-14482 --- pkg/drivers/kic/types.go | 4 ++-- site/content/en/docs/commands/start.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/drivers/kic/types.go b/pkg/drivers/kic/types.go index 934090974b..69e39df4aa 100644 --- a/pkg/drivers/kic/types.go +++ b/pkg/drivers/kic/types.go @@ -24,9 +24,9 @@ import ( const ( // Version is the current version of kic - Version = "v0.0.33-1659486857-14721" + Version = "v0.0.33-1661795577-14482" // SHA of the kic base image - baseImageSHA = "98c8007234ca882b63abc707dc184c585fcb5372828b49a4b639961324d291b3" + baseImageSHA = "e92c29880a4b3b095ed3b61b1f4a696b57c5cd5212bc8256f9599a777020645d" // The name of the GCR kicbase repository gcrRepo = "gcr.io/k8s-minikube/kicbase-builds" // The name of the Dockerhub kicbase repository diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index 9a0029cc27..a0f38219bc 100644 --- a/site/content/en/docs/commands/start.md +++ b/site/content/en/docs/commands/start.md @@ -26,7 +26,7 @@ minikube start [flags] --apiserver-names strings A set of apiserver names which are used in the generated certificate for kubernetes. This can be used if you want to make the apiserver available from outside the machine --apiserver-port int The apiserver listening port (default 8443) --auto-update-drivers If set, automatically updates drivers to the latest version. Defaults to true. (default true) - --base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase-builds:v0.0.33-1659486857-14721@sha256:98c8007234ca882b63abc707dc184c585fcb5372828b49a4b639961324d291b3") + --base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase-builds:v0.0.33-1661795577-14482@sha256:e92c29880a4b3b095ed3b61b1f4a696b57c5cd5212bc8256f9599a777020645d") --binary-mirror string Location to fetch kubectl, kubelet, & kubeadm binaries from. --cache-images If true, cache docker images for the current bootstrapper and load them into the machine. Always false with --driver=none. (default true) --cert-expiration duration Duration until minikube certificate expiration, defaults to three years (26280h). (default 26280h0m0s) From c26af98e814d2bdea3ebd394fa9808cfbb35f553 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 29 Aug 2022 22:51:31 +0000 Subject: [PATCH 432/545] Updating ISO to v1.26.1-1661795462-14482 --- 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 89902f80e6..225b80b217 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.26.1-1661377864-14783 +ISO_VERSION ?= v1.26.1-1661795462-14482 # 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 189eeb1c5a..fdab34c110 100644 --- a/pkg/minikube/download/iso.go +++ b/pkg/minikube/download/iso.go @@ -41,7 +41,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/14783" + isoBucket := "minikube-builds/iso/14482" return []string{ fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s-%s.iso", isoBucket, v, runtime.GOARCH), fmt.Sprintf("https://github.com/kubernetes/minikube/releases/download/%s/minikube-%s-%s.iso", v, v, runtime.GOARCH), diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index a0f38219bc..c4946e0260 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/14783/minikube-v1.26.1-1661377864-14783-amd64.iso,https://github.com/kubernetes/minikube/releases/download/v1.26.1-1661377864-14783/minikube-v1.26.1-1661377864-14783-amd64.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.26.1-1661377864-14783-amd64.iso]) + --iso-url strings Locations to fetch the minikube ISO from. (default [https://storage.googleapis.com/minikube-builds/iso/14482/minikube-v1.26.1-1661795462-14482-amd64.iso,https://github.com/kubernetes/minikube/releases/download/v1.26.1-1661795462-14482/minikube-v1.26.1-1661795462-14482-amd64.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.26.1-1661795462-14482-amd64.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.24.4, 'latest' for v1.25.0-rc.1). Defaults to 'stable'. --kvm-gpu Enable experimental NVIDIA GPU support in minikube From 8617c501b2ba6a8f59a9e8b87f397d9e430fc732 Mon Sep 17 00:00:00 2001 From: Abirdcfly Date: Tue, 30 Aug 2022 14:14:38 +0800 Subject: [PATCH 433/545] chore: remove duplicate word in comments Signed-off-by: Abirdcfly --- Makefile | 2 +- pkg/minikube/bootstrapper/bsutil/kverify/kverify.go | 2 +- pkg/minikube/constants/constants.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 89902f80e6..43126ce968 100644 --- a/Makefile +++ b/Makefile @@ -409,7 +409,7 @@ out/unittest.json: $(SOURCE_FILES) $(GOTEST_FILES) -coverprofile=out/coverage.out -json > out/unittest.json out/coverage.out: out/unittest.json -# Generate go test report (from gotest) as a a HTML page +# Generate go test report (from gotest) as a HTML page out/unittest.html: out/unittest.json $(if $(quiet),@echo " REPORT $@") $(Q)go-test-report < $< -o $@ diff --git a/pkg/minikube/bootstrapper/bsutil/kverify/kverify.go b/pkg/minikube/bootstrapper/bsutil/kverify/kverify.go index 08fc7872ad..b4d068646a 100644 --- a/pkg/minikube/bootstrapper/bsutil/kverify/kverify.go +++ b/pkg/minikube/bootstrapper/bsutil/kverify/kverify.go @@ -43,7 +43,7 @@ const ( // vars related to the --wait flag var ( - // DefaultComponents is map of the the default components to wait for + // DefaultComponents is map of the default components to wait for DefaultComponents = map[string]bool{APIServerWaitKey: true, SystemPodsWaitKey: true} // NoWaitComponents is map of components to wait for if specified 'none' or 'false' NoComponents = map[string]bool{APIServerWaitKey: false, SystemPodsWaitKey: false, DefaultSAWaitKey: false, AppsRunningKey: false, NodeReadyKey: false, KubeletKey: false, ExtraKey: false} diff --git a/pkg/minikube/constants/constants.go b/pkg/minikube/constants/constants.go index ba875da2d4..4b948b3709 100644 --- a/pkg/minikube/constants/constants.go +++ b/pkg/minikube/constants/constants.go @@ -69,7 +69,7 @@ const ( ClusterDNSDomain = "cluster.local" // DefaultServiceCIDR is The CIDR to be used for service cluster IPs DefaultServiceCIDR = "10.96.0.0/12" - // HostAlias is a DNS alias to the the container/VM host IP + // HostAlias is a DNS alias to the container/VM host IP HostAlias = "host.minikube.internal" // ControlPlaneAlias is a DNS alias pointing to the apiserver frontend ControlPlaneAlias = "control-plane.minikube.internal" From e2490642ba40c70dfba976cc77fd4678be4f8488 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Tue, 30 Aug 2022 10:53:01 -0700 Subject: [PATCH 434/545] update registry image --- pkg/minikube/assets/addons.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/minikube/assets/addons.go b/pkg/minikube/assets/addons.go index 83e89ad714..0905078a6b 100755 --- a/pkg/minikube/assets/addons.go +++ b/pkg/minikube/assets/addons.go @@ -363,7 +363,7 @@ var Addons = map[string]*Addon{ "registry-proxy.yaml", "0640"), }, false, "registry", "Google", "", "", map[string]string{ - "Registry": "registry:2.7.1@sha256:d5459fcb27aecc752520df4b492b08358a1912fcdfa454f7d2101d4b09991daa", + "Registry": "registry:2.8.1@sha256:83bb78d7b28f1ac99c68133af32c93e9a1c149bcd3cb6e683a3ee56e312f1c96", "KubeRegistryProxy": "google_containers/kube-registry-proxy:0.4@sha256:1040f25a5273de0d72c54865a8efd47e3292de9fb8e5353e3fa76736b854f2da", }, map[string]string{ "KubeRegistryProxy": "gcr.io", From 6f5d999296aa9c8f37b01d96bc81d14354cf1e42 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Tue, 30 Aug 2022 11:16:41 -0700 Subject: [PATCH 435/545] add arch to call --- pkg/minikube/notify/notify.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/minikube/notify/notify.go b/pkg/minikube/notify/notify.go index f3a8912591..d5a8b09ca1 100644 --- a/pkg/minikube/notify/notify.go +++ b/pkg/minikube/notify/notify.go @@ -165,8 +165,8 @@ func getJSON(url string, target *Releases) error { if err != nil { return errors.Wrap(err, "error creating new http request") } - ua := fmt.Sprintf("Minikube/%s Minikube-OS/%s", - version.GetVersion(), runtime.GOOS) + ua := fmt.Sprintf("Minikube/%s Minikube-OS/%s Minikube-Arch/%s", + version.GetVersion(), runtime.GOOS, runtime.GOARCH) req.Header.Set("User-Agent", ua) From 531cd5ddf7f1d0a5a08a27e452ca3ae3547fe142 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 30 Aug 2022 21:26:14 +0000 Subject: [PATCH 436/545] Bump github.com/opencontainers/runc from 1.1.3 to 1.1.4 Bumps [github.com/opencontainers/runc](https://github.com/opencontainers/runc) from 1.1.3 to 1.1.4. - [Release notes](https://github.com/opencontainers/runc/releases) - [Changelog](https://github.com/opencontainers/runc/blob/v1.1.4/CHANGELOG.md) - [Commits](https://github.com/opencontainers/runc/compare/v1.1.3...v1.1.4) --- updated-dependencies: - dependency-name: github.com/opencontainers/runc dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 6 +++--- go.sum | 13 ++++++------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/go.mod b/go.mod index 04ffce36d8..507fc86a45 100644 --- a/go.mod +++ b/go.mod @@ -74,13 +74,13 @@ require ( golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4 golang.org/x/exp v0.0.0-20210220032938-85be41e4509f golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 - golang.org/x/oauth2 v0.0.0-20220718184931-c8730f7fcb92 + golang.org/x/oauth2 v0.0.0-20220822191816-0ebed06d0094 golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 golang.org/x/text v0.3.7 gonum.org/v1/plot v0.11.0 - google.golang.org/api v0.93.0 + google.golang.org/api v0.94.0 gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 // indirect gopkg.in/yaml.v2 v2.4.0 k8s.io/api v0.24.4 @@ -100,7 +100,7 @@ require ( github.com/blang/semver v3.5.1+incompatible github.com/docker/go-connections v0.4.0 github.com/google/go-github/v43 v43.0.0 - github.com/opencontainers/runc v1.1.3 + github.com/opencontainers/runc v1.1.4 github.com/santhosh-tekuri/jsonschema/v5 v5.0.0 ) diff --git a/go.sum b/go.sum index ee2d6d8d29..43119e0974 100644 --- a/go.sum +++ b/go.sum @@ -1113,8 +1113,8 @@ github.com/opencontainers/runc v0.1.1/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59P github.com/opencontainers/runc v1.0.0-rc8.0.20190926000215-3e425f80a8c9/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= github.com/opencontainers/runc v1.0.0-rc9/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= github.com/opencontainers/runc v1.0.0-rc93/go.mod h1:3NOsor4w32B2tC0Zbl8Knk4Wg84SM2ImC1fxBuqJ/H0= -github.com/opencontainers/runc v1.1.3 h1:vIXrkId+0/J2Ymu2m7VjGvbSlAId9XNRPhn2p4b+d8w= -github.com/opencontainers/runc v1.1.3/go.mod h1:1J5XiS+vdZ3wCyZybsuxXZWGrgSr8fFJHLXuG2PsnNg= +github.com/opencontainers/runc v1.1.4 h1:nRCz/8sKg6K6jgYAFLDlXzPeITBZJyX28DBVhWD+5dg= +github.com/opencontainers/runc v1.1.4/go.mod h1:1J5XiS+vdZ3wCyZybsuxXZWGrgSr8fFJHLXuG2PsnNg= github.com/opencontainers/runtime-spec v0.1.2-0.20190507144316-5b71a03e2700/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= github.com/opencontainers/runtime-spec v1.0.1/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= github.com/opencontainers/runtime-spec v1.0.2-0.20190207185410-29686dbc5559/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= @@ -1667,9 +1667,8 @@ golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j golang.org/x/oauth2 v0.0.0-20220309155454-6242fa91716a/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= golang.org/x/oauth2 v0.0.0-20220608161450-d0670ef3b1eb/go.mod h1:jaDAt6Dkxork7LmZnYtzbRWj0W47D86a3TGe0YHBvmE= -golang.org/x/oauth2 v0.0.0-20220622183110-fd043fe589d2/go.mod h1:jaDAt6Dkxork7LmZnYtzbRWj0W47D86a3TGe0YHBvmE= -golang.org/x/oauth2 v0.0.0-20220718184931-c8730f7fcb92 h1:oVlhw3Oe+1reYsE2Nqu19PDJfLzwdU3QUUrG86rLK68= -golang.org/x/oauth2 v0.0.0-20220718184931-c8730f7fcb92/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg= +golang.org/x/oauth2 v0.0.0-20220822191816-0ebed06d0094 h1:2o1E+E8TpNLklK9nHiPiK1uzIYrIHt+cQx3ynCwq9V8= +golang.org/x/oauth2 v0.0.0-20220822191816-0ebed06d0094/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg= 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= @@ -2006,8 +2005,8 @@ google.golang.org/api v0.75.0/go.mod h1:pU9QmyHLnzlpar1Mjt4IbapUCy8J+6HD6GeELN69 google.golang.org/api v0.78.0/go.mod h1:1Sg78yoMLOhlQTeF+ARBoytAcH1NNyyl390YMy6rKmw= google.golang.org/api v0.80.0/go.mod h1:xY3nI94gbvBrE0J6NHXhxOmW97HG7Khjkku6AFB3Hyg= google.golang.org/api v0.84.0/go.mod h1:NTsGnUFJMYROtiquksZHBWtHfeMC7iYthki7Eq3pa8o= -google.golang.org/api v0.93.0 h1:T2xt9gi0gHdxdnRkVQhT8mIvPaXKNsDNWz+L696M66M= -google.golang.org/api v0.93.0/go.mod h1:+Sem1dnrKlrXMR/X0bPnMWyluQe4RsNoYfmNLhOIkzw= +google.golang.org/api v0.94.0 h1:KtKM9ru3nzQioV1HLlUf1cR7vMYJIpgls5VhAYQXIwA= +google.golang.org/api v0.94.0/go.mod h1:eADj+UBuxkh5zlrSntJghuNeg8HwQ1w5lTKkuqaETEI= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= From 8a87b6449b27e3d2023a4e7bb002ee0e0bc1b75d Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Tue, 30 Aug 2022 15:52:00 -0700 Subject: [PATCH 437/545] update prow image --- Makefile | 2 +- deploy/prow/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 43126ce968..60a225d356 100644 --- a/Makefile +++ b/Makefile @@ -111,7 +111,7 @@ GVISOR_TAG ?= latest AUTOPAUSE_HOOK_TAG ?= v0.0.2 # prow-test tag to push changes to -PROW_TEST_TAG ?= v0.0.2 +PROW_TEST_TAG ?= v0.0.3 # storage provisioner tag to push changes to # NOTE: you will need to bump the PreloadVersion if you change this diff --git a/deploy/prow/Dockerfile b/deploy/prow/Dockerfile index 90311fffff..78a3a16621 100644 --- a/deploy/prow/Dockerfile +++ b/deploy/prow/Dockerfile @@ -52,7 +52,7 @@ RUN echo "Installing Packages ..." \ procps \ python \ python-dev \ - python-pip \ + python3-pip \ rsync \ software-properties-common \ unzip \ From e82feb54e4f8827059b6c951479c861184b62a08 Mon Sep 17 00:00:00 2001 From: Alex <93376818+sashashura@users.noreply.github.com> Date: Wed, 31 Aug 2022 10:15:37 +0100 Subject: [PATCH 438/545] Update twitter-bot.yml Signed-off-by: sashashura <93376818+sashashura@users.noreply.github.com> --- .github/workflows/twitter-bot.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/twitter-bot.yml b/.github/workflows/twitter-bot.yml index 6b9e854491..a496b79792 100644 --- a/.github/workflows/twitter-bot.yml +++ b/.github/workflows/twitter-bot.yml @@ -3,6 +3,7 @@ on: workflow_dispatch: release: types: [published] +permissions: {} # none jobs: twitter-release: runs-on: ubuntu-20.04 From d88fbb1f99beadbd4bb0a122895764e9a4441cae Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Wed, 31 Aug 2022 14:16:51 -0700 Subject: [PATCH 439/545] fix VerifyKubernetesImages test for k8s 1.25+ --- test/integration/start_stop_delete_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integration/start_stop_delete_test.go b/test/integration/start_stop_delete_test.go index 54bd85e0ad..7df44ab1ee 100644 --- a/test/integration/start_stop_delete_test.go +++ b/test/integration/start_stop_delete_test.go @@ -464,7 +464,7 @@ func defaultImage(name string) bool { if strings.Contains(name, ":latest") { return false } - if strings.Contains(name, "k8s.gcr.io") || strings.Contains(name, "kubernetesui") || strings.Contains(name, "storage-provisioner") { + if strings.Contains(name, "k8s.gcr.io") || strings.Contains(name, "registry.k8s.io") || strings.Contains(name, "kubernetesui") || strings.Contains(name, "storage-provisioner") { return true } return false From f7f69be622de3aad08ca01acb5e3d7772a0ce1f2 Mon Sep 17 00:00:00 2001 From: klaases Date: Wed, 31 Aug 2022 14:20:11 -0700 Subject: [PATCH 440/545] suggest purge instead --- site/content/en/docs/drivers/qemu.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/content/en/docs/drivers/qemu.md b/site/content/en/docs/drivers/qemu.md index 1e58dbfa22..095b30d0f6 100644 --- a/site/content/en/docs/drivers/qemu.md +++ b/site/content/en/docs/drivers/qemu.md @@ -18,7 +18,7 @@ The `qemu` driver users QEMU (system) for VM creation. minikube start supports some qemu specific flags: * **`--qemu-firmware-path`**: The path to the firmware image to be used. - * Note: if this flag does not take effect, try removing the file `~/.minikube` which may have a reference to this setting. + * Note: while the flag should override the config, if the flag does not take effect try running `minikube delete --all --purge`. * Macports: if you are installing [minikube](https://ports.macports.org/port/minikube/) and [qemu](https://ports.macports.org/port/qemu/) via Macports on a Mac with M1, use the following flag: `--qemu-firmware-path=/opt/local/share/qemu/edk2-aarch64-code.fd` ## Issues From c3cecc85ba667cf76d2d8e0f9951b6106b6907c9 Mon Sep 17 00:00:00 2001 From: klaases Date: Wed, 31 Aug 2022 15:46:34 -0700 Subject: [PATCH 441/545] Docker Desktop unsupported --- site/content/en/docs/drivers/docker.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/site/content/en/docs/drivers/docker.md b/site/content/en/docs/drivers/docker.md index 65f3f60664..7df9f32893 100644 --- a/site/content/en/docs/drivers/docker.md +++ b/site/content/en/docs/drivers/docker.md @@ -61,6 +61,8 @@ The `--container-runtime` flag must be set to "containerd" or "cri-o". "containe ## Known Issues +- Docker Desktop on Linux is not yet supported by minikube, see [#14202](https://github.com/kubernetes/minikube/issues/14202) + - The following Docker runtime security options are currently *unsupported and will not work* with the Docker driver (see [#9607](https://github.com/kubernetes/minikube/issues/9607)): - [userns-remap](https://docs.docker.com/engine/security/userns-remap/) From 2c72c9e99cb61785faddbd68aebd286428b9d041 Mon Sep 17 00:00:00 2001 From: klaases Date: Wed, 31 Aug 2022 15:54:01 -0700 Subject: [PATCH 442/545] improve grammar --- site/content/en/docs/drivers/docker.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/content/en/docs/drivers/docker.md b/site/content/en/docs/drivers/docker.md index 7df9f32893..fc28727af4 100644 --- a/site/content/en/docs/drivers/docker.md +++ b/site/content/en/docs/drivers/docker.md @@ -61,7 +61,7 @@ The `--container-runtime` flag must be set to "containerd" or "cri-o". "containe ## Known Issues -- Docker Desktop on Linux is not yet supported by minikube, see [#14202](https://github.com/kubernetes/minikube/issues/14202) +- On Linux, Docker Desktop is not yet supported by minikube, see [#14202](https://github.com/kubernetes/minikube/issues/14202). - The following Docker runtime security options are currently *unsupported and will not work* with the Docker driver (see [#9607](https://github.com/kubernetes/minikube/issues/9607)): - [userns-remap](https://docs.docker.com/engine/security/userns-remap/) From 896c8f3b1297bbcce36f20b032be321e41e42ef9 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Fri, 2 Sep 2022 00:04:46 +0000 Subject: [PATCH 443/545] Update yearly leaderboard --- .../en/docs/contrib/leaderboard/2022.html | 98 +++++++++---------- 1 file changed, 49 insertions(+), 49 deletions(-) diff --git a/site/content/en/docs/contrib/leaderboard/2022.html b/site/content/en/docs/contrib/leaderboard/2022.html index 08b9ea21bf..924b9f71a5 100644 --- a/site/content/en/docs/contrib/leaderboard/2022.html +++ b/site/content/en/docs/contrib/leaderboard/2022.html @@ -87,7 +87,7 @@ weight: -99992022

kubernetes/minikube

-
2022-01-01 — 2022-07-31
+
2022-01-01 — 2022-08-31

Reviewers

@@ -103,21 +103,21 @@ weight: -99992022 function drawreviewCounts() { var data = new google.visualization.arrayToDataTable([ [{label:'',type:'string'},{label: '# of Merged PRs reviewed', type: 'number'}, { role: 'annotation' }], - ["spowelljr", 41, "41"], - ["medyagh", 33, "33"], + ["spowelljr", 45, "45"], + ["medyagh", 34, "34"], + ["klaases", 14, "14"], ["sharifelgamal", 13, "13"], ["afbjorklund", 11, "11"], - ["klaases", 10, "10"], ["atoato88", 6, "6"], - ["t-inu", 5, "5"], + ["t-inu", 6, "6"], ["jesperpedersen", 3, "3"], - ["knrt10", 2, "2"], ["kakkoyun", 2, "2"], + ["knrt10", 2, "2"], ["s-kawamura-w664", 2, "2"], - ["inductor", 1, "1"], - ["csantanapr", 1, "1"], + ["mprimeaux", 1, "1"], ["AkihiroSuda", 1, "1"], - ["alexbaeza", 1, "1"], + ["shu-mutou", 1, "1"], + ["inductor", 1, "1"], ]); @@ -150,14 +150,14 @@ weight: -99992022 function drawreviewWords() { var data = new google.visualization.arrayToDataTable([ [{label:'',type:'string'},{label: '# of words written in merged PRs', type: 'number'}, { role: 'annotation' }], - ["spowelljr", 3103, "3103"], - ["medyagh", 1048, "1048"], - ["t-inu", 754, "754"], + ["spowelljr", 3264, "3264"], + ["medyagh", 1058, "1058"], + ["t-inu", 827, "827"], ["afbjorklund", 684, "684"], ["s-kawamura-w664", 534, "534"], + ["klaases", 452, "452"], ["sharifelgamal", 394, "394"], ["atoato88", 304, "304"], - ["klaases", 198, "198"], ["knrt10", 125, "125"], ["jesperpedersen", 65, "65"], ["kakkoyun", 49, "49"], @@ -197,21 +197,21 @@ weight: -99992022 function drawreviewComments() { var data = new google.visualization.arrayToDataTable([ [{label:'',type:'string'},{label: '# of Review Comments in merged PRs', type: 'number'}, { role: 'annotation' }], - ["spowelljr", 91, "91"], - ["medyagh", 32, "32"], + ["spowelljr", 93, "93"], + ["medyagh", 33, "33"], ["atoato88", 12, "12"], - ["t-inu", 11, "11"], + ["t-inu", 12, "12"], + ["klaases", 11, "11"], ["afbjorklund", 11, "11"], - ["klaases", 7, "7"], ["sharifelgamal", 7, "7"], ["s-kawamura-w664", 4, "4"], ["mprimeaux", 2, "2"], ["inductor", 1, "1"], ["knrt10", 1, "1"], - ["csantanapr", 1, "1"], ["AkihiroSuda", 1, "1"], - ["shu-mutou", 0, "0"], - ["kakkoyun", 0, "0"], + ["csantanapr", 1, "1"], + ["nixpanic", 0, "0"], + ["alexbaeza", 0, "0"], ]); @@ -248,21 +248,21 @@ weight: -99992022 function drawprCounts() { var data = new google.visualization.arrayToDataTable([ [{label:'',type:'string'},{label: '# of Pull Requests Merged', type: 'number'}, { role: 'annotation' }], - ["spowelljr", 138, "138"], + ["spowelljr", 164, "164"], ["sharifelgamal", 37, "37"], ["afbjorklund", 25, "25"], - ["jeffmaury", 14, "14"], + ["jeffmaury", 15, "15"], + ["klaases", 12, "12"], ["yosshy", 8, "8"], - ["klaases", 7, "7"], ["presztak", 7, "7"], ["prezha", 5, "5"], - ["kadern0", 4, "4"], ["ckannon", 4, "4"], + ["kadern0", 4, "4"], + ["yolossn", 3, "3"], + ["NikhilSharmaWe", 3, "3"], ["zhan9san", 3, "3"], ["chungjin", 3, "3"], - ["NikhilSharmaWe", 3, "3"], - ["AkihiroSuda", 2, "2"], - ["jklippel", 2, "2"], + ["t-inu", 2, "2"], ]); @@ -295,7 +295,7 @@ weight: -99992022 function drawprDeltas() { var data = new google.visualization.arrayToDataTable([ [{label:'',type:'string'},{label: 'Lines of code (delta)', type: 'number'}, { role: 'annotation' }], - ["spowelljr", 15480, "15480"], + ["spowelljr", 16279, "16279"], ["sharifelgamal", 8526, "8526"], ["afbjorklund", 1850, "1850"], ["gAmUssA", 1574, "1574"], @@ -305,11 +305,11 @@ weight: -99992022 ["chungjin", 499, "499"], ["presztak", 349, "349"], ["zhan9san", 332, "332"], - ["naveensrinivasan", 264, "264"], + ["klaases", 279, "279"], ["NikhilSharmaWe", 264, "264"], - ["yolossn", 247, "247"], + ["naveensrinivasan", 264, "264"], + ["yolossn", 249, "249"], ["Rabattkarte", 189, "189"], - ["AkihiroSuda", 187, "187"], ]); @@ -349,14 +349,14 @@ weight: -99992022 ["F1ko", 143, "143"], ["prezha", 142, "142"], ["chungjin", 140, "140"], - ["yolossn", 118, "118"], ["ckannon", 115, "115"], ["Rabattkarte", 108, "108"], ["tyabu12", 107, "107"], ["vharsh", 89, "89"], ["naveensrinivasan", 85, "85"], - ["spowelljr", 84, "84"], ["kianmeng", 80, "80"], + ["yolossn", 79, "79"], + ["cdtomkins", 76, "76"], ]); @@ -393,21 +393,21 @@ weight: -99992022 function drawcomments() { var data = new google.visualization.arrayToDataTable([ [{label:'',type:'string'},{label: '# of comments', type: 'number'}, { role: 'annotation' }], - ["afbjorklund", 151, "151"], - ["RA489", 119, "119"], - ["spowelljr", 108, "108"], - ["klaases", 89, "89"], + ["afbjorklund", 222, "222"], + ["RA489", 150, "150"], + ["spowelljr", 120, "120"], + ["klaases", 112, "112"], ["sharifelgamal", 57, "57"], ["medyagh", 25, "25"], ["zhan9san", 22, "22"], - ["vrapolinario", 8, "8"], + ["eiffel-fl", 10, "10"], + ["mprimeaux", 10, "10"], + ["vroetman", 9, "9"], + ["fireinrain", 9, "9"], ["denisok", 8, "8"], - ["mprimeaux", 7, "7"], + ["vrapolinario", 8, "8"], ["blacksd", 6, "6"], ["NikhilSharmaWe", 6, "6"], - ["MdSahil-oss", 5, "5"], - ["ckannon", 5, "5"], - ["chungjin", 5, "5"], ]); @@ -440,21 +440,21 @@ weight: -99992022 function drawcommentWords() { var data = new google.visualization.arrayToDataTable([ [{label:'',type:'string'},{label: '# of words (excludes authored)', type: 'number'}, { role: 'annotation' }], - ["afbjorklund", 6979, "6979"], - ["spowelljr", 5074, "5074"], + ["afbjorklund", 10622, "10622"], + ["spowelljr", 5591, "5591"], + ["klaases", 4294, "4294"], ["blacksd", 4095, "4095"], - ["klaases", 3590, "3590"], ["cdbattags", 2055, "2055"], ["sharifelgamal", 1759, "1759"], ["zhan9san", 1679, "1679"], ["denisok", 1626, "1626"], ["danieldonoghue", 1535, "1535"], ["clarencesham", 1043, "1043"], + ["eiffel-fl", 769, "769"], ["vrapolinario", 752, "752"], + ["AntonMorokin", 632, "632"], ["medyagh", 624, "624"], ["Yensan", 602, "602"], - ["nburlett", 561, "561"], - ["aonoa", 556, "556"], ]); @@ -487,8 +487,8 @@ weight: -99992022 function drawissueCloser() { var data = new google.visualization.arrayToDataTable([ [{label:'',type:'string'},{label: '# of issues closed (excludes authored)', type: 'number'}, { role: 'annotation' }], - ["spowelljr", 159, "159"], - ["klaases", 135, "135"], + ["spowelljr", 168, "168"], + ["klaases", 157, "157"], ["sharifelgamal", 44, "44"], ["medyagh", 25, "25"], ["afbjorklund", 4, "4"], From 22c14c197adb69044bbf8ab1e1f56d7973f155b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C4=81nis=20Bebr=C4=ABtis?= Date: Fri, 2 Sep 2022 14:49:34 +0300 Subject: [PATCH 444/545] Removing podsecuritypolicy due to 1.25 policy/v1beta1 deprecation --- deploy/addons/metallb/metallb.yaml.tmpl | 29 ------------------------- 1 file changed, 29 deletions(-) diff --git a/deploy/addons/metallb/metallb.yaml.tmpl b/deploy/addons/metallb/metallb.yaml.tmpl index 7d033b69e7..0989071512 100644 --- a/deploy/addons/metallb/metallb.yaml.tmpl +++ b/deploy/addons/metallb/metallb.yaml.tmpl @@ -5,35 +5,6 @@ metadata: app: metallb name: metallb-system --- -apiVersion: policy/v1beta1 -kind: PodSecurityPolicy -metadata: - labels: - app: metallb - name: speaker - namespace: metallb-system -spec: - allowPrivilegeEscalation: false - allowedCapabilities: - - NET_ADMIN - - NET_RAW - - SYS_ADMIN - fsGroup: - rule: RunAsAny - hostNetwork: true - hostPorts: - - max: 7472 - min: 7472 - privileged: true - runAsUser: - rule: RunAsAny - seLinux: - rule: RunAsAny - supplementalGroups: - rule: RunAsAny - volumes: - - '*' ---- apiVersion: v1 kind: ServiceAccount metadata: From 3f46fea576d169ec147a15886f27a3032918abfe Mon Sep 17 00:00:00 2001 From: Janis Bebritis Date: Fri, 2 Sep 2022 15:59:51 +0300 Subject: [PATCH 445/545] Conditional podsecuritypolicy include for pre 1.25 versions --- deploy/addons/metallb/metallb.yaml.tmpl | 31 +++++++++++++++++++++++++ pkg/minikube/assets/addons.go | 13 +++++++++++ 2 files changed, 44 insertions(+) diff --git a/deploy/addons/metallb/metallb.yaml.tmpl b/deploy/addons/metallb/metallb.yaml.tmpl index 0989071512..b301921196 100644 --- a/deploy/addons/metallb/metallb.yaml.tmpl +++ b/deploy/addons/metallb/metallb.yaml.tmpl @@ -5,6 +5,37 @@ metadata: app: metallb name: metallb-system --- +{{- if and (eq .KubernetesVersion.Major 1 ) (lt .KubernetesVersion.Minor 25) }} +apiVersion: policy/v1beta1 +kind: PodSecurityPolicy +metadata: + labels: + app: metallb + name: speaker + namespace: metallb-system +spec: + allowPrivilegeEscalation: false + allowedCapabilities: + - NET_ADMIN + - NET_RAW + - SYS_ADMIN + fsGroup: + rule: RunAsAny + hostNetwork: true + hostPorts: + - max: 7472 + min: 7472 + privileged: true + runAsUser: + rule: RunAsAny + seLinux: + rule: RunAsAny + supplementalGroups: + rule: RunAsAny + volumes: + - '*' +--- +{{- end }} apiVersion: v1 kind: ServiceAccount metadata: diff --git a/pkg/minikube/assets/addons.go b/pkg/minikube/assets/addons.go index 0905078a6b..44cdc03412 100755 --- a/pkg/minikube/assets/addons.go +++ b/pkg/minikube/assets/addons.go @@ -859,6 +859,7 @@ func GenerateTemplateData(addon *Addon, cc *config.ClusterConfig, netInfo Networ } opts := struct { + KubernetesVersion map[string]uint64 PreOneTwentyKubernetes bool Arch string ExoticArch string @@ -874,6 +875,7 @@ func GenerateTemplateData(addon *Addon, cc *config.ClusterConfig, netInfo Networ CustomRegistries map[string]string NetworkInfo map[string]string }{ + KubernetesVersion: make(map[string]uint64), PreOneTwentyKubernetes: false, Arch: a, ExoticArch: ea, @@ -909,6 +911,17 @@ func GenerateTemplateData(addon *Addon, cc *config.ClusterConfig, netInfo Networ opts.PreOneTwentyKubernetes = true } + // Store kubernetes version in opts + kv, err := util.ParseKubernetesVersion(cfg.KubernetesVersion) + if err != nil { + return errors.Wrap(err, "parsing Kubernetes version") + } + opts.KubernetesVersion = map[string]uint64{ + "Major": kv.Major, + "Minor": kv.Minor, + "Patch": kv.Patch, + } + // Network info for generating template opts.NetworkInfo["ControlPlaneNodeIP"] = netInfo.ControlPlaneNodeIP opts.NetworkInfo["ControlPlaneNodePort"] = fmt.Sprint(netInfo.ControlPlaneNodePort) From 2e2903cf60b39962d845d8d72f2e39b343f42dd7 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Fri, 2 Sep 2022 09:36:38 -0700 Subject: [PATCH 446/545] update kicbase base image --- deploy/kicbase/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/kicbase/Dockerfile b/deploy/kicbase/Dockerfile index 265e3ef0b4..dcea0069d7 100644 --- a/deploy/kicbase/Dockerfile +++ b/deploy/kicbase/Dockerfile @@ -36,7 +36,7 @@ RUN if [ "$PREBUILT_AUTO_PAUSE" != "true" ]; then cd ./cmd/auto-pause/ && go bui # start from ubuntu 20.04, this image is reasonably small as a starting point # for a kubernetes node image, it doesn't contain much we don't need -FROM ubuntu:focal-20220801 as kicbase +FROM ubuntu:focal-20220826 as kicbase ARG BUILDKIT_VERSION="v0.10.3" ARG FUSE_OVERLAYFS_VERSION="v1.7.1" From 6af725e56e8d850824285ffeba8260c5893bad92 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Fri, 2 Sep 2022 17:02:36 +0000 Subject: [PATCH 447/545] Updating kicbase image to v0.0.33-1662137001-14904 --- pkg/drivers/kic/types.go | 4 ++-- site/content/en/docs/commands/start.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/drivers/kic/types.go b/pkg/drivers/kic/types.go index 69e39df4aa..e0bc3e91a8 100644 --- a/pkg/drivers/kic/types.go +++ b/pkg/drivers/kic/types.go @@ -24,9 +24,9 @@ import ( const ( // Version is the current version of kic - Version = "v0.0.33-1661795577-14482" + Version = "v0.0.33-1662137001-14904" // SHA of the kic base image - baseImageSHA = "e92c29880a4b3b095ed3b61b1f4a696b57c5cd5212bc8256f9599a777020645d" + baseImageSHA = "f2a1e577e43fd6769f35cdb938f6d21c3dacfd763062d119cade738fa244720c" // The name of the GCR kicbase repository gcrRepo = "gcr.io/k8s-minikube/kicbase-builds" // The name of the Dockerhub kicbase repository diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index c4946e0260..9f9db9659f 100644 --- a/site/content/en/docs/commands/start.md +++ b/site/content/en/docs/commands/start.md @@ -26,7 +26,7 @@ minikube start [flags] --apiserver-names strings A set of apiserver names which are used in the generated certificate for kubernetes. This can be used if you want to make the apiserver available from outside the machine --apiserver-port int The apiserver listening port (default 8443) --auto-update-drivers If set, automatically updates drivers to the latest version. Defaults to true. (default true) - --base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase-builds:v0.0.33-1661795577-14482@sha256:e92c29880a4b3b095ed3b61b1f4a696b57c5cd5212bc8256f9599a777020645d") + --base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase-builds:v0.0.33-1662137001-14904@sha256:f2a1e577e43fd6769f35cdb938f6d21c3dacfd763062d119cade738fa244720c") --binary-mirror string Location to fetch kubectl, kubelet, & kubeadm binaries from. --cache-images If true, cache docker images for the current bootstrapper and load them into the machine. Always false with --driver=none. (default true) --cert-expiration duration Duration until minikube certificate expiration, defaults to three years (26280h). (default 26280h0m0s) From b4a75e98554f28ede08b99716d3f66652e333079 Mon Sep 17 00:00:00 2001 From: Alex <93376818+sashashura@users.noreply.github.com> Date: Fri, 2 Sep 2022 18:09:33 +0100 Subject: [PATCH 448/545] Update twitter-bot.yml --- .github/workflows/twitter-bot.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/twitter-bot.yml b/.github/workflows/twitter-bot.yml index a496b79792..3880d01c09 100644 --- a/.github/workflows/twitter-bot.yml +++ b/.github/workflows/twitter-bot.yml @@ -3,7 +3,8 @@ on: workflow_dispatch: release: types: [published] -permissions: {} # none +permissions: + contents: read jobs: twitter-release: runs-on: ubuntu-20.04 From 8c6a561b9e00e4a1b3b838e21dc4681a300f685d Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Tue, 6 Sep 2022 15:04:04 -0700 Subject: [PATCH 449/545] add more update check params --- pkg/minikube/notify/notify.go | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/pkg/minikube/notify/notify.go b/pkg/minikube/notify/notify.go index d5a8b09ca1..00858de862 100644 --- a/pkg/minikube/notify/notify.go +++ b/pkg/minikube/notify/notify.go @@ -30,6 +30,7 @@ import ( "github.com/spf13/viper" "k8s.io/klog/v2" "k8s.io/minikube/pkg/minikube/config" + "k8s.io/minikube/pkg/minikube/detect" "k8s.io/minikube/pkg/minikube/localpath" "k8s.io/minikube/pkg/minikube/out" "k8s.io/minikube/pkg/minikube/style" @@ -165,8 +166,8 @@ func getJSON(url string, target *Releases) error { if err != nil { return errors.Wrap(err, "error creating new http request") } - ua := fmt.Sprintf("Minikube/%s Minikube-OS/%s Minikube-Arch/%s", - version.GetVersion(), runtime.GOOS, runtime.GOARCH) + ua := fmt.Sprintf("Minikube/%s Minikube-OS/%s Minikube-Arch/%s Minikube-Plaform/%s Minikube-Cloud/%s", + version.GetVersion(), runtime.GOOS, runtime.GOARCH, platform(), cloud()) req.Header.Set("User-Agent", ua) @@ -179,6 +180,26 @@ func getJSON(url string, target *Releases) error { return json.NewDecoder(resp.Body).Decode(target) } +func platform() string { + if detect.GithubActionRunner() { + return "GitHub Action" + } + if detect.IsCloudShell() { + return "Cloud Shell" + } + if detect.IsMicrosoftWSL() { + return "WSL" + } + return "none" +} + +func cloud() string { + if detect.IsOnGCE() { + return "GCE" + } + return "none" +} + var latestVersionFromURL = func(url string) (semver.Version, error) { r, err := AllVersionsFromURL(url) if err != nil { From f95c89bffc0ace44ce07a0408373031be1af61a8 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Wed, 7 Sep 2022 10:02:17 -0700 Subject: [PATCH 450/545] update k8s imports to v0.25.0 --- go.mod | 24 ++++++------ go.sum | 115 ++++++++++++++------------------------------------------- 2 files changed, 39 insertions(+), 100 deletions(-) diff --git a/go.mod b/go.mod index 507fc86a45..bf43df160e 100644 --- a/go.mod +++ b/go.mod @@ -83,14 +83,14 @@ require ( google.golang.org/api v0.94.0 gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 // indirect gopkg.in/yaml.v2 v2.4.0 - k8s.io/api v0.24.4 - k8s.io/apimachinery v0.24.4 - k8s.io/client-go v0.24.4 + k8s.io/api v0.25.0 + k8s.io/apimachinery v0.25.0 + k8s.io/client-go v0.25.0 k8s.io/cluster-bootstrap v0.0.0 - k8s.io/component-base v0.24.4 + k8s.io/component-base v0.25.0 k8s.io/klog/v2 v2.70.1 - k8s.io/kubectl v0.24.4 - k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 + k8s.io/kubectl v0.25.0 + k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed libvirt.org/go/libvirt v1.8005.0 sigs.k8s.io/sig-storage-lib-external-provisioner/v6 v6.3.0 ) @@ -113,7 +113,7 @@ require ( git.sr.ht/~sbinet/gg v0.3.1 // indirect github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.32.6 // indirect - github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd // indirect + github.com/MakeNowJust/heredoc v1.0.0 // indirect github.com/Microsoft/go-winio v0.5.2 // indirect github.com/PuerkitoBio/purell v1.1.1 // indirect github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect @@ -134,7 +134,7 @@ require ( github.com/docker/cli v20.10.17+incompatible // indirect github.com/docker/distribution v2.8.1+incompatible // indirect github.com/docker/docker-credential-helpers v0.6.4 // indirect - github.com/emicklei/go-restful v2.9.5+incompatible // indirect + github.com/emicklei/go-restful/v3 v3.8.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.4 // indirect @@ -212,7 +212,7 @@ require ( go.uber.org/multierr v1.8.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-20220708220712-1185a9018129 // indirect + golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f // indirect google.golang.org/appengine v1.6.7 // indirect @@ -222,9 +222,9 @@ require ( gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/ini.v1 v1.66.4 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 // indirect - sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect - sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect + k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect + sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect + sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect sigs.k8s.io/yaml v1.2.0 // indirect ) diff --git a/go.sum b/go.sum index 43119e0974..cdaac0dd38 100644 --- a/go.sum +++ b/go.sum @@ -94,12 +94,10 @@ github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSW github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI= github.com/Azure/go-autorest/autorest v0.9.6/go.mod h1:/FALq9T/kS7b5J5qsQ+RSTUdAmGFqi0vUdVNNx8q630= github.com/Azure/go-autorest/autorest v0.11.1/go.mod h1:JFgpikqFJ/MleTTxwepExTKnFUKKszPS8UavbQYUMuw= -github.com/Azure/go-autorest/autorest v0.11.18/go.mod h1:dSiJPy22c3u0OtOKDNttNgqpNFY/GeWa7GH/Pz56QRA= github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod h1:8Z9fGy2MpX0PvDjB1pEgQTmVqjGhiHBW7RJJEciWzS0= github.com/Azure/go-autorest/autorest/adal v0.8.2/go.mod h1:ZjhuQClTqx435SRJ2iMlOxPYt3d2C/T/7TiQCVZSn3Q= github.com/Azure/go-autorest/autorest/adal v0.9.0/go.mod h1:/c022QCutn2P7uY+/oQWWNcK9YU+MH96NgK+jErpbcg= github.com/Azure/go-autorest/autorest/adal v0.9.5/go.mod h1:B7KF7jKIeC9Mct5spmyCB/A8CG/sEz1vwIRGv/bbw7A= -github.com/Azure/go-autorest/autorest/adal v0.9.13/go.mod h1:W/MM4U6nLxnIskrw4UwWzlHfGjwUS50aOsc/I3yuU8M= github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod h1:plvfp3oPSKwf2DNjlBjWF/7vwR+cUD/ELuzDCXwHUVA= github.com/Azure/go-autorest/autorest/date v0.2.0/go.mod h1:vcORJHLJEh643/Ioh9+vPmf1Ij9AEBM5FuBIXLmIy0g= github.com/Azure/go-autorest/autorest/date v0.3.0/go.mod h1:BI0uouVdmngYNUzGWeSYnokU+TrmwEsOqdt8Y6sso74= @@ -110,7 +108,6 @@ github.com/Azure/go-autorest/autorest/mocks v0.4.0/go.mod h1:LTp+uSrOhSkaKrUy935 github.com/Azure/go-autorest/autorest/mocks v0.4.1/go.mod h1:LTp+uSrOhSkaKrUy935gNZuuIPPVsHlr9DSOxSayd+k= github.com/Azure/go-autorest/logger v0.1.0/go.mod h1:oExouG+K6PryycPJfVSxi/koC6LSNgds39diKLz7Vrc= github.com/Azure/go-autorest/logger v0.2.0/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8= -github.com/Azure/go-autorest/logger v0.2.1/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8= github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk= github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= @@ -125,8 +122,8 @@ github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.8.6 github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.8.6/go.mod h1:NE8dAwJ1VU4WFdJYTlO0tdobQFdy70z8wNDU1L3VAr4= github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.32.6 h1:QHbRbU/HI7SuNVqP0rDHK5jAMcwzuAex2akl3p+7YTo= github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.32.6/go.mod h1:/G0zPXsUx5gZUd6ryJakuDo4VR7EJScegf1ZNK8xIGs= -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/MakeNowJust/heredoc v1.0.0 h1:cXCdzVdstXyiTqTvfqk9SDHpKNjxuom+DOlyEeQ4pzQ= +github.com/MakeNowJust/heredoc v1.0.0/go.mod h1:mG5amYoWBHf8vpLOuehzbGGw0EHxpZZ6lCpQ4fNJ8LE= github.com/Masterminds/goutils v1.1.0/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU= github.com/Masterminds/semver v1.4.2/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y= github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y= @@ -197,7 +194,6 @@ github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmV github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio= -github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= github.com/ashanbrown/forbidigo v1.2.0/go.mod h1:vVW7PEdqEFqapJe95xHkTfB1+XvZXBFg8t0sG2FIxmI= github.com/ashanbrown/makezero v0.0.0-20210520155254-b6261585ddde/go.mod h1:oG9Dnez7/ESBqc4EdrdNlryeo7d0KcW1ftXHm7nU/UU= @@ -209,7 +205,6 @@ github.com/aws/aws-sdk-go v1.36.30/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2z github.com/aws/aws-sdk-go v1.37.0/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= github.com/aws/aws-sdk-go v1.38.49 h1:E31vxjCe6a5I+mJLmUGaZobiWmg9KdWaud9IfceYeYQ= github.com/aws/aws-sdk-go v1.38.49/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= -github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM= github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8= github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= @@ -252,7 +247,6 @@ github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghf github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE= github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5/go.mod h1:/iP1qXHoty45bqomnu2LM+VVyAEdWN+vtSHGlQgyxbw= github.com/charithe/durationcheck v0.0.9/go.mod h1:SSbRIBVfMjCi/kEB6K65XEA83D6prSM8ap1UCpNKtgg= github.com/chavacava/garif v0.0.0-20210405164556-e8a0a408d6af/go.mod h1:Qjyv4H3//PWVzTeCezG2b9IRn6myJxJSr4TD/xo6ojU= github.com/checkpoint-restore/go-criu/v4 v4.1.0/go.mod h1:xUQBLp4RLc5zJtWY++yjOoMoB5lihDt7fai+75m+rGw= @@ -391,7 +385,6 @@ github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfc github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= -github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/cpuguy83/go-md2man/v2 v2.0.2 h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHHBfMQ6w= github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= @@ -411,7 +404,6 @@ github.com/davecgh/go-spew v0.0.0-20161028175848-04cdfd42973b/go.mod h1:J7Y8YcW2 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/daviddengcn/go-colortext v0.0.0-20160507010035-511bcaf42ccd/go.mod h1:dv4zxwHi5C/8AeI+4gX4dCWOIvNi7I6JCSX0HvlKPgE= github.com/denis-tingajkin/go-header v0.4.2/go.mod h1:eLRHAVXzE5atsKAnNRDB90WHCFFnBUn4RN0nRcs1LJA= github.com/denverdino/aliyungo v0.0.0-20190125010748-a747050bb1ba/go.mod h1:dV8lFg6daOBZbT6/BDGIz6Y3WFGn8juu6G+CQ6LHtl0= github.com/dgrijalva/jwt-go v0.0.0-20170104182250-a601269ab70c/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= @@ -450,8 +442,9 @@ github.com/elazarl/goproxy v0.0.0-20210110162100-a92cc753f88e/go.mod h1:Ro8st/El github.com/elazarl/goproxy/ext v0.0.0-20190711103511-473e67f1d7d2 h1:dWB6v3RcOy03t/bUadywsbyrQwCqZeNIEX6M1OtSZOM= github.com/elazarl/goproxy/ext v0.0.0-20190711103511-473e67f1d7d2/go.mod h1:gNh8nYJoAm43RfaxurUnxr+N1PwuFV3ZMl/efxlIlY8= github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= -github.com/emicklei/go-restful v2.9.5+incompatible h1:spTtZBk5DYEvbxMVutUuTyh1Ao2r4iyvLdACqsl/Ljk= github.com/emicklei/go-restful v2.9.5+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= +github.com/emicklei/go-restful/v3 v3.8.0 h1:eCZ8ulSerjdAiaNpF7GxXIE7ZCMo1moN1qX+S609eVw= +github.com/emicklei/go-restful/v3 v3.8.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= @@ -469,20 +462,16 @@ github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLi github.com/evanphx/json-patch v4.11.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/evanphx/json-patch v4.12.0+incompatible h1:4onqiflcdA9EOZ4RxV643DvftH5pOlLGNtQ5lPWQu84= github.com/evanphx/json-patch v4.12.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= -github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d/go.mod h1:ZZMPRZwes7CROmyNKgQzC3XPs6L/G2EJLHddWejkmf4= -github.com/fatih/camelcase v1.0.0/go.mod h1:yN2Sb0lFhZJUdVvtELVWefmrXpuZESvPmqwoZc+/fpc= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= github.com/fatih/color v1.10.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM= github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w= github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= github.com/fatih/structtag v1.2.0/go.mod h1:mBJUNpUnHmRKrKlQQlmCrh5PuhftFbNv8Ys4/aAZl94= -github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/felixge/httpsnoop v1.0.3 h1:s/nj+GCswXYzN5v2DpNMuMQYe+0DDwt5WVCU6CWBdXk= 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= -github.com/form3tech-oss/jwt-go v3.2.3+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k= github.com/frankban/quicktest v1.14.3 h1:FJKSZTDHjyhriyC81FLQ0LY93eSai0ZyR/ZIkd3ZUKE= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= @@ -492,15 +481,12 @@ github.com/fsnotify/fsnotify v1.5.4 h1:jRbGcIw6P2Meqdwuo0H1p6JVLbL5DHKAKlYndzMwV github.com/fsnotify/fsnotify v1.5.4/go.mod h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmVXmkdnm1bU= github.com/fullsailor/pkcs7 v0.0.0-20190404230743-d7302db945fa/go.mod h1:KnogPXtdwXqoenmZCw6S+25EAm2MkxbG0deNDu4cbSA= github.com/fullstorydev/grpcurl v1.6.0/go.mod h1:ZQ+ayqbKMJNhzLmbpCiurTVlaK2M/3nqZCxaQ2Ze/sM= -github.com/fvbommel/sortorder v1.0.1/go.mod h1:uk88iVf1ovNn1iLfgUVU2F9o5eO30ui720w+kxuqRs0= github.com/fzipp/gocyclo v0.3.1/go.mod h1:DJHO6AUmbdqj2ET4Z9iArSuwWgYDRryYt2wASxc7x3E= github.com/garyburd/redigo v0.0.0-20150301180006-535138d7bcd7/go.mod h1:NR3MbYisc3/PwhQ00EMzDiPmrwpPxAn5GI05/YaO1SY= -github.com/getkin/kin-openapi v0.76.0/go.mod h1:660oXbgy5JFMKreazJaQTw7o+X00qeSyhcnluiMv+Xg= github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/gliderlabs/ssh v0.1.1/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0= github.com/go-critic/go-critic v0.6.1/go.mod h1:SdNCfU0yF3UBjtaZGw6586/WocupMOJuiqgom5DsQxM= -github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q= github.com/go-fonts/dejavu v0.1.0 h1:JSajPXURYqpr+Cu8U9bt8K+XcACIHWqWrvWCKyeFmVQ= github.com/go-fonts/dejavu v0.1.0/go.mod h1:4Wt4I4OU2Nq9asgDCteaAaWZOV24E+0/Pwo0gppep4g= github.com/go-fonts/latin-modern v0.2.0 h1:5/Tv1Ek/QCr20C6ZOz15vw3g7GELYL98KWr8Hgo+3vk= @@ -529,7 +515,6 @@ 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.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= github.com/go-ole/go-ole v1.2.5/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY= github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= @@ -640,10 +625,8 @@ github.com/golangci/maligned v0.0.0-20180506175553-b1d89398deca/go.mod h1:tvlJhZ github.com/golangci/misspell v0.3.5/go.mod h1:dEbvlSfYbMQDtrpRMQU675gSDLDNa8sCPPChZ7PhiVA= github.com/golangci/revgrep v0.0.0-20210930125155-c22e5001d4f2/go.mod h1:LK+zW4MpyytAWQRz0M4xnzEk50lSvqDQKfx304apFkY= github.com/golangci/unconvert v0.0.0-20180507085042-28b1c447d1f4/go.mod h1:Izgrg8RkN3rCIMLGE9CyYmU9pY2Jer6DgANEnZ/L/cQ= -github.com/golangplus/testing v0.0.0-20180327235837-af21d9c3145e/go.mod h1:0AA//k/eakGydO4jKRoRL2j92ZKSzTgj9tclaCrvXHk= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= -github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA= github.com/google/certificate-transparency-go v1.0.21/go.mod h1:QeJfpSbVSfYc7RgB3gJFj9cbuQMMchQxrWXz8Ruopmg= github.com/google/certificate-transparency-go v1.1.1/go.mod h1:FDKqPvSXawb2ecErVRrD+nfy23RCzyl7eqVCEmlT1Zs= github.com/google/gnostic v0.5.7-v3refs h1:FhTMOKj2VhjpouxvWJAV1TL304uMlb9zcDqkl6cEI54= @@ -697,7 +680,6 @@ github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLe github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= -github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ= github.com/google/slowjam v1.0.0 h1:dA9flW4oGTJcSy8FpEvdq8JKwPFVgqYwMmjhqlb2L+s= github.com/google/slowjam v1.0.0/go.mod h1:mNktULbvWfYVMKKmpt94Rp3jMtmhQZLS0iR+W84S0mM= github.com/google/trillian v1.3.11/go.mod h1:0tPraVHrSDkA3BO6vKX67zgLXs6SsOAbHEivX+9mPgw= @@ -847,7 +829,6 @@ github.com/johanneswuerbach/nfsexports v0.0.0-20200318065542-c48c3734757f h1:tL0 github.com/johanneswuerbach/nfsexports v0.0.0-20200318065542-c48c3734757f/go.mod h1:+c1/kUpg2zlkoWqTOvzDs36Wpbm3Gd1nlmtXAEB0WGU= github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= github.com/jonboulle/clockwork v0.2.0/go.mod h1:Pkfl5aHPm1nk2H9h0bjmnJD/BcgbGXUBGnn1kMkgxc8= -github.com/jonboulle/clockwork v0.2.2/go.mod h1:Pkfl5aHPm1nk2H9h0bjmnJD/BcgbGXUBGnn1kMkgxc8= github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= github.com/josharian/txtarfs v0.0.0-20210218200122-0702f000015a/go.mod h1:izVPOvVRsHiKkeGCT6tYBNWyDVuzj9wAaBb5R9qamfw= @@ -930,8 +911,6 @@ github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.8.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/lib/pq v1.9.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/lib/pq v1.10.3/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= -github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de/go.mod h1:zAbeS9B/r2mtpb6U+EI2rYA5OAXxsYw6wTamcNW+zcE= -github.com/lithammer/dedent v1.1.0/go.mod h1:jrXYCQtgg0nJiN+StA2KgR7w6CiQNv9Fd/Z9BP0jIOc= github.com/logrusorgru/aurora v0.0.0-20181002194514-a7b3b318ed4e/go.mod h1:7rIyQOR62GCctdiQpZ/zOJlFyk6y+94wXzv6RNZgaR4= github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 h1:6E+4a0GO5zZEnZ81pIr0yLvtUWk2if982qA3F3QD6H4= github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I= @@ -977,7 +956,6 @@ github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/ github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/mattn/go-runewidth v0.0.6/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= -github.com/mattn/go-runewidth v0.0.7/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= github.com/mattn/go-runewidth v0.0.12/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk= github.com/mattn/go-runewidth v0.0.13 h1:lTGmDsbAYt5DmK6OnoV7EuIF1wEIFAcxld6ypU4OSgU= @@ -1047,7 +1025,6 @@ github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3Rllmb github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8= -github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00/go.mod h1:Pm3mSP3c5uWn86xMLZ5Sa7JB9GsEZySvHYXCTK4E9q4= github.com/moricho/tparallel v0.2.1/go.mod h1:fXEIZxG2vdfl0ZF8b42f5a78EhjjD5mX8qUplsoSU4k= github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A= github.com/mozilla/scribe v0.0.0-20180711195314-fb71baf557c1/go.mod h1:FIczTrinKo8VaLxe6PWTPEXRXDIHz2QAwiaBaP5/4a8= @@ -1069,13 +1046,11 @@ github.com/nishanths/exhaustive v0.2.3/go.mod h1:bhIX678Nx8inLM9PbpvK1yv6oGtoP8B github.com/nishanths/predeclared v0.0.0-20190419143655-18a43bb90ffc/go.mod h1:62PewwiQTlm/7Rj+cxVYqZvDIUc+JjZq6GHAC1fsObQ= github.com/nishanths/predeclared v0.2.1/go.mod h1:HvkGJcA3naj4lOwnFXFDkFxVtSqQMB9sbB1usJ+xjQE= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= -github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= github.com/olekukonko/tablewriter v0.0.1/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= github.com/olekukonko/tablewriter v0.0.2/go.mod h1:rSAaSIOAGT9odnlyGlUfAJaoc5w2fSBUmeGDbRWPxyQ= -github.com/olekukonko/tablewriter v0.0.4/go.mod h1:zq6QwlOf5SlnkVbMSr5EoBv3636FWnp+qbPhuoO21uA= github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec= github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY= github.com/onsi/ginkgo v0.0.0-20151202141238-7f8ab55aaf3b/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= @@ -1089,6 +1064,7 @@ github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108 github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= github.com/onsi/ginkgo v1.16.4 h1:29JGrr5oVBm5ulCWet69zQkzWipVXIol6ygQUe/EzNc= github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0= +github.com/onsi/ginkgo/v2 v2.1.4 h1:GNapqRSid3zijZ9H77KrgVG4/8KqiyRsxcSxe+7ApXY= github.com/onsi/gomega v0.0.0-20151007035656-2152b45fa28a/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= @@ -1096,8 +1072,8 @@ github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7J github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.10.3/go.mod h1:V9xEwhxec5O8UDM77eCW8vLymOMltsqPVYWrpDsH8xc= -github.com/onsi/gomega v1.16.0 h1:6gjqkI8iiRHMvdccRJM8rVKjCWk6ZIm6FTm3ddIe4/c= github.com/onsi/gomega v1.16.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= +github.com/onsi/gomega v1.19.0 h1:4ieX6qQjPP/BfC3mpsAtIGGlxTWPeA3Inl/7DtXw1tw= github.com/opencontainers/go-digest v0.0.0-20170106003457-a6d0ee40d420/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= github.com/opencontainers/go-digest v0.0.0-20180430190053-c9281466c8b2/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= @@ -1305,7 +1281,6 @@ github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3 github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= github.com/spf13/cobra v1.0.0/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE= github.com/spf13/cobra v1.2.1/go.mod h1:ExllRjgxM/piMAM+3tAZvg8fsklGAf3tPfi+i8t68Nk= -github.com/spf13/cobra v1.4.0/go.mod h1:Wo4iy3BUC+X2Fybo0PDqwJIv3dNRiZLHQymsfxlB84g= github.com/spf13/cobra v1.5.0 h1:X+jTBEBqF0bHN+9cSMgmfuvv2VHJ9ezmFNf9Y/XstYU= github.com/spf13/cobra v1.5.0/go.mod h1:dWXEIy2H428czQCjInthrTRUg7yKbok+2Qi/yBIJoUM= github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= @@ -1402,7 +1377,6 @@ github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1: github.com/xeipuuv/gojsonschema v0.0.0-20180618132009-1d523034197f/go.mod h1:5yf86TLmAcydyeJq5YvxkGPE2fm/u4myDekKRoLuqhs= github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= -github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca/go.mod h1:ce1O1j6UtZfjr22oyGxGLbauSBp2YVXpARAosm7dHBg= github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 h1:QldyIu/L63oPpyvQmHgvgickp1Yw510KJOqX7H24mg8= github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778/go.mod h1:2MuV+tbUrU1zIOPMxZ5EncGwgmMJsa+9ucAQZXxsObs= github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= @@ -1416,7 +1390,6 @@ github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.0/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= -github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yusufpapurcu/wmi v1.2.2 h1:KBNDSne4vP5mbSWnJbO+51IMOXJB67QiYCSBrubbPRg= github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= github.com/yvasiyarov/go-metrics v0.0.0-20140926110328-57bccd1ccd43/go.mod h1:aX5oPXxHm3bOH+xeAttToC8pqch2ScQN/JoXYupl6xs= @@ -1444,26 +1417,15 @@ go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= 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.34.0 h1:9NkMW03wwEzPtP/KciZ4Ozu/Uz5ZA7kfqXJIObnrjGU= -go.opentelemetry.io/otel v0.20.0/go.mod h1:Y3ugLH2oa81t5QO+Lty+zXf8zC9L26ax4Nzoxm/dooo= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= -go.opentelemetry.io/otel/exporters/otlp v0.20.0/go.mod h1:YIieizyaN77rtLJra0buKiNBOm9XQfkPEKBeuhoMwAM= -go.opentelemetry.io/otel/metric v0.20.0/go.mod h1:598I5tYlH1vzBjn+BTuhzTCSb/9debfNp6R3s7Pr1eU= go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs= -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.9.0 h1:LNXp1vrr83fNXTHgU8eO89mhzxb/bbWAsHG6fNf3qWo= go.opentelemetry.io/otel/sdk v1.9.0/go.mod h1:AEZc8nt5bd2F7BC24J5R0mrjYnpEgYHyTcM/vrSple4= -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.9.0 h1:oZaCNJUjWcg60VXWee8lJKlqhPbXAPB51URuR47pQYc= go.opentelemetry.io/otel/trace v1.9.0/go.mod h1:2737Q0MuG8q1uILYm2YYVkAyLtOofiTNGg6VODnOiPo= 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= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= @@ -1515,7 +1477,6 @@ golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod h1:P+XmwS30IXTQdn5 golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/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-20220214200702-86341886e292/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= 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= @@ -1571,7 +1532,6 @@ golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.5.0/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= -golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 h1:6zppjxzCulZykYSLyVDYbneBfbaBIQPYMevg0bEwv2s= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -1633,8 +1593,6 @@ golang.org/x/net v0.0.0-20210510120150-4163338589ed/go.mod h1:9nx3DQGgdP8bBQD5qx golang.org/x/net v0.0.0-20210520170846-37e1c6afe023/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/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/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= @@ -1642,8 +1600,8 @@ golang.org/x/net v0.0.0-20220412020605-290c469a71a5/go.mod h1:CfG3xpIq0wQ8r1q4Su golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220607020251-c690dde0001d/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -golang.org/x/net v0.0.0-20220708220712-1185a9018129 h1:vucSRfWwTsoXro7P+3Cjlr6flUMtzCwzlvkxEQtHHB0= -golang.org/x/net v0.0.0-20220708220712-1185a9018129/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/net v0.0.0-20220722155237-a158d28d115b h1:PxfKdU9lEEDYjdIzOtC4qFWgkU2rGHdKlKowJSMN9h0= +golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= 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= @@ -1717,7 +1675,6 @@ golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191002063906-3421d5a6bb1c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191022100944-742c48ecaeb7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -1797,7 +1754,6 @@ golang.org/x/sys v0.0.0-20210917161153-d61c044b1678/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211013075003-97ac67df715c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211023085530-d6a326fbbf70/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211116061358-0a5406a5449c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -1903,7 +1859,6 @@ golang.org/x/tools v0.0.0-20200414032229-332987a829c3/go.mod h1:EkVYQZoAsY45+roY golang.org/x/tools v0.0.0-20200422022333-3d57cf2e726e/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200426102838-f3a5411a4c3b/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200505023115-26f46d2f7ef8/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= 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= @@ -1948,8 +1903,7 @@ golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.6/go.mod h1:LGqMHiF4EqQNHR1JncWGqT5BVaXmza+X+BDGol+dOxo= golang.org/x/tools v0.1.7/go.mod h1:LGqMHiF4EqQNHR1JncWGqT5BVaXmza+X+BDGol+dOxo= -golang.org/x/tools v0.1.10-0.20220218145154-897bd77cd717/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E= -golang.org/x/tools v0.1.11 h1:loJ25fNOEhSXfHrpoGj91eCUThwdNX6u24rO1xnNteY= +golang.org/x/tools v0.1.12 h1:VveCTK38A2rkS8ZqFY25HIDFscX5X9OoEhJd3quQmXU= 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= @@ -2094,7 +2048,6 @@ 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-20220107163113-42d7afdf6368/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20220126215142-9970aeb2e350/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20220207164111-0872dc986b00/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20220218161850-94dd64e39d7c/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= @@ -2200,7 +2153,6 @@ gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= gopkg.in/square/go-jose.v2 v2.2.2/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= gopkg.in/square/go-jose.v2 v2.3.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= gopkg.in/square/go-jose.v2 v2.5.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= -gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= @@ -2239,64 +2191,55 @@ k8s.io/api v0.20.1/go.mod h1:KqwcCVogGxQY3nBlRpwt+wpAMF/KjaCc7RpywacvqUo= k8s.io/api v0.20.4/go.mod h1:++lNL1AJMkDymriNniQsWRkMDzRaX2Y/POTUi8yvqYQ= k8s.io/api v0.20.6/go.mod h1:X9e8Qag6JV/bL5G6bU8sdVRltWKmdHsFUGS3eVndqE8= k8s.io/api v0.22.4/go.mod h1:Rgs+9gIGYC5laXQSZZ9JqT5NevNgoGiOdVWi1BAB3qk= -k8s.io/api v0.24.4 h1:I5Y645gJ8zWKawyr78lVfDQkZrAViSbeRXsPZWTxmXk= -k8s.io/api v0.24.4/go.mod h1:42pVfA0NRxrtJhZQOvRSyZcJihzAdU59WBtTjYcB0/M= +k8s.io/api v0.25.0 h1:H+Q4ma2U/ww0iGB78ijZx6DRByPz6/733jIuFpX70e0= +k8s.io/api v0.25.0/go.mod h1:ttceV1GyV1i1rnmvzT3BST08N6nGt+dudGrquzVQWPk= k8s.io/apimachinery v0.19.1/go.mod h1:DnPGDnARWFvYa3pMHgSxtbZb7gpzzAZ1pTfaUNDVlmA= k8s.io/apimachinery v0.20.1/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU= k8s.io/apimachinery v0.20.4/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU= k8s.io/apimachinery v0.20.6/go.mod h1:ejZXtW1Ra6V1O5H8xPBGz+T3+4gfkTCeExAHKU57MAc= k8s.io/apimachinery v0.22.4/go.mod h1:yU6oA6Gnax9RrxGzVvPFFJ+mpnW6PBSqp0sx0I0HHW0= -k8s.io/apimachinery v0.24.4 h1:S0Ur3J/PbivTcL43EdSdPhqCqKla2NIuneNwZcTDeGQ= -k8s.io/apimachinery v0.24.4/go.mod h1:82Bi4sCzVBdpYjyI4jY6aHX+YCUchUIrZrXKedjd2UM= +k8s.io/apimachinery v0.25.0 h1:MlP0r6+3XbkUG2itd6vp3oxbtdQLQI94fD5gCS+gnoU= +k8s.io/apimachinery v0.25.0/go.mod h1:qMx9eAk0sZQGsXGu86fab8tZdffHbwUfsvzqKn4mfB0= k8s.io/apiserver v0.20.1/go.mod h1:ro5QHeQkgMS7ZGpvf4tSMx6bBOgPfE+f52KwvXfScaU= k8s.io/apiserver v0.20.4/go.mod h1:Mc80thBKOyy7tbvFtB4kJv1kbdD0eIH8k8vianJcbFM= k8s.io/apiserver v0.20.6/go.mod h1:QIJXNt6i6JB+0YQRNcS0hdRHJlMhflFmsBDeSgT1r8Q= -k8s.io/cli-runtime v0.24.4/go.mod h1:RF+cSLYXkPV3WyvPrX2qeRLEUJY38INWx6jLKVLFCxM= k8s.io/client-go v0.19.1/go.mod h1:AZOIVSI9UUtQPeJD3zJFp15CEhSjRgAuQP5PWRJrCIQ= k8s.io/client-go v0.20.1/go.mod h1:/zcHdt1TeWSd5HoUe6elJmHSQ6uLLgp4bIJHVEuy+/Y= k8s.io/client-go v0.20.4/go.mod h1:LiMv25ND1gLUdBeYxBIwKpkSC5IsozMMmOOeSJboP+k= k8s.io/client-go v0.20.6/go.mod h1:nNQMnOvEUEsOzRRFIIkdmYOjAZrC8bgq0ExboWSU1I0= -k8s.io/client-go v0.24.4 h1:hIAIJZIPyaw46AkxwyR0FRfM/pRxpUNTd3ysYu9vyRg= -k8s.io/client-go v0.24.4/go.mod h1:+AxlPWw/H6f+EJhRSjIeALaJT4tbeB/8g9BNvXGPd0Y= +k8s.io/client-go v0.25.0 h1:CVWIaCETLMBNiTUta3d5nzRbXvY5Hy9Dpl+VvREpu5E= +k8s.io/client-go v0.25.0/go.mod h1:lxykvypVfKilxhTklov0wz1FoaUZ8X4EwbhS6rpRfN8= k8s.io/cluster-bootstrap v0.22.4 h1:2ZhV/1K4GiCrnmDHHbBnN3bERWn+Nxrtxmxp6uYYThI= k8s.io/cluster-bootstrap v0.22.4/go.mod h1:fTQZ6u9G6fg2LHhB8nEgZLnXIhCDSRYuLUUS5pgW8RY= -k8s.io/code-generator v0.24.4/go.mod h1:dpVhs00hTuTdTY6jvVxvTFCk6gSMrtfRydbhZwHI15w= k8s.io/component-base v0.20.1/go.mod h1:guxkoJnNoh8LNrbtiQOlyp2Y2XFCZQmrcg2n/DeYNLk= k8s.io/component-base v0.20.4/go.mod h1:t4p9EdiagbVCJKrQ1RsA5/V4rFQNDfRlevJajlGwgjI= k8s.io/component-base v0.20.6/go.mod h1:6f1MPBAeI+mvuts3sIdtpjljHWBQ2cIy38oBIWMYnrM= -k8s.io/component-base v0.24.4 h1:WEGRp06GBYVwxp5JdiRaJ1zkdOhrqucxRv/8IrABLG0= -k8s.io/component-base v0.24.4/go.mod h1:sWxkgcMfbYHadw0OJ0N+vIscd14/nqSIM2veCdg843o= -k8s.io/component-helpers v0.24.4/go.mod h1:xAHlOKU8rAjLgXWJEsueWLR1LDMThbaPf2YvgKpSyQ8= +k8s.io/component-base v0.25.0 h1:haVKlLkPCFZhkcqB6WCvpVxftrg6+FK5x1ZuaIDaQ5Y= +k8s.io/component-base v0.25.0/go.mod h1:F2Sumv9CnbBlqrpdf7rKZTmmd2meJq0HizeyY/yAFxk= k8s.io/cri-api v0.17.3/go.mod h1:X1sbHmuXhwaHs9xxYffLqJogVsnI+f6cPRcgPel7ywM= k8s.io/cri-api v0.20.1/go.mod h1:2JRbKt+BFLTjtrILYVqQK5jqhI+XNdF6UiGMgczeBCI= k8s.io/cri-api v0.20.4/go.mod h1:2JRbKt+BFLTjtrILYVqQK5jqhI+XNdF6UiGMgczeBCI= k8s.io/cri-api v0.20.6/go.mod h1:ew44AjNXwyn1s0U4xCKGodU7J1HzBeZ1MpGrpa5r8Yc= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= -k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= -k8s.io/gengo v0.0.0-20211129171323-c02415ce4185/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= k8s.io/klog/v2 v2.3.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= k8s.io/klog/v2 v2.4.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= k8s.io/klog/v2 v2.9.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec= -k8s.io/klog/v2 v2.60.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/klog/v2 v2.70.1 h1:7aaoSdahviPmR+XkS7FyxlkkXs6tHISSG03RxleQAVQ= k8s.io/klog/v2 v2.70.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6/go.mod h1:UuqjUnNftUyPE5H64/qeyjQoUZhGpeFDVdxjTeEVN2o= k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd/go.mod h1:WOJ3KddDSol4tAGcJo0Tvi+dK12EcqSLqcWsryKMpfM= -k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw= k8s.io/kube-openapi v0.0.0-20211109043538-20434351676c/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw= -k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 h1:Gii5eqf+GmIEwGNKQYQClCayuJCe2/4fZUvF7VG99sU= -k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42/go.mod h1:Z/45zLw8lUo4wdiUkI+v/ImEGAvu3WatcZl3lPMR4Rk= -k8s.io/kubectl v0.24.4 h1:fPEBkAV3/cu3BQVIUCXNngCCY62AlZ+2rkRVHcmJPn0= -k8s.io/kubectl v0.24.4/go.mod h1:AVyJzxUwA5UMGTDyKGL6nd6RRW36FbmAdtIDMhrZtW0= +k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 h1:MQ8BAZPZlWk3S9K4a9NCkIFQtZShWqoha7snGixVgEA= +k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1/go.mod h1:C/N6wCaBHeBHkHUesQOQy2/MZqGgMAFPqGsGQLdbZBU= +k8s.io/kubectl v0.25.0 h1:/Wn1cFqo8ik3iee1EvpxYre3bkWsGLXzLQI6uCCAkQc= +k8s.io/kubectl v0.25.0/go.mod h1:n16ULWsOl2jmQpzt2o7Dud1t4o0+Y186ICb4O+GwKAU= k8s.io/kubernetes v1.13.0/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk= -k8s.io/metrics v0.24.4/go.mod h1:7D8Xm3DGZoJaiCS8+QA2EzdMuDlq0Y8SiOPUB/1BaGU= k8s.io/utils v0.0.0-20200729134348-d5654de09c73/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= -k8s.io/utils v0.0.0-20210802155522-efc7438f0176/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= -k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 h1:HNSDgDCrr/6Ly3WEGKZftiE7IY19Vz2GdbOCyI4qqhc= -k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= +k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed h1:jAne/RjBTyawwAy0utX5eqigAwz/lQhTmy+Hr/Cpue4= +k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= libvirt.org/go/libvirt v1.8005.0 h1:ULUpl7QQv4ETJLY7lTAtLdSQOe7xIgZ5Ml303UR6j14= libvirt.org/go/libvirt v1.8005.0/go.mod h1:1WiFE8EjZfq+FCVog+rvr1yatKbKZ9FaFMZgEqxEJqQ= mvdan.cc/gofumpt v0.1.1/go.mod h1:yXG1r1WqZVKWbVRtBWKWX9+CxGYfA51nSomhM0woR48= @@ -2309,20 +2252,16 @@ rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.14/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.15/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg= -sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 h1:kDi4JBNAsJWfz1aEXhO8Jg87JJaPNLh5tIzYHgStQ9Y= -sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2/go.mod h1:B+TnT182UBxE84DiCz4CVE26eOSDAeYCpfDnC2kdKMY= -sigs.k8s.io/kustomize/api v0.11.4/go.mod h1:k+8RsqYbgpkIrJ4p9jcdPqe8DprLxFUUO0yNOq8C+xI= -sigs.k8s.io/kustomize/cmd/config v0.10.6/go.mod h1:/S4A4nUANUa4bZJ/Edt7ZQTyKOY9WCER0uBS1SW2Rco= -sigs.k8s.io/kustomize/kustomize/v4 v4.5.4/go.mod h1:Zo/Xc5FKD6sHl0lilbrieeGeZHVYCA4BzxeAaLI05Bg= -sigs.k8s.io/kustomize/kyaml v0.13.6/go.mod h1:yHP031rn1QX1lr/Xd934Ri/xdVNG8BE2ECa78Ht/kEg= +sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 h1:iXTIw73aPyC+oRdyqqvVJuloN1p0AC/kzH07hu3NE+k= +sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= sigs.k8s.io/sig-storage-lib-external-provisioner/v6 v6.3.0 h1:IKsKAnscMyIOqyl8s8V7guTcx0QBEa6OT57EPgAgpmM= sigs.k8s.io/sig-storage-lib-external-provisioner/v6 v6.3.0/go.mod h1:DhZ52sQMJHW21+JXyA2LRUPRIxKnrNrwh+QFV+2tVA4= sigs.k8s.io/structured-merge-diff/v4 v4.0.1/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= sigs.k8s.io/structured-merge-diff/v4 v4.0.3/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= sigs.k8s.io/structured-merge-diff/v4 v4.1.2/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4= -sigs.k8s.io/structured-merge-diff/v4 v4.2.1 h1:bKCqE9GvQ5tiVHn5rfn1r+yao3aLQEaLzkkmAkf+A6Y= -sigs.k8s.io/structured-merge-diff/v4 v4.2.1/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4= +sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE= +sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E= sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q= sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= From 4094d23faabf294d6335234f7bda7f0a9ade4805 Mon Sep 17 00:00:00 2001 From: Renato Costa Date: Fri, 26 Aug 2022 11:43:43 -0400 Subject: [PATCH 451/545] Fix wrong use of loop variable in parallel test This fixes an occurrence of a loop variable being incorrectly captured in a parallel test (`TestVersionIsBetween`). With the previous code, only the last test case is actually exercised. To work around this problem, we create a local coapy of the range variable before the parallel test, as suggested in the documentation for the `testing` package: https://pkg.go.dev/testing#hdr-Subtests_and_Sub_benchmarks Some assertions had to be changed as they were incorrect. Issue was found using the `loopvarcapture` linter. --- pkg/minikube/bootstrapper/bsutil/versions_test.go | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkg/minikube/bootstrapper/bsutil/versions_test.go b/pkg/minikube/bootstrapper/bsutil/versions_test.go index 87ef7256d1..9edad545b0 100644 --- a/pkg/minikube/bootstrapper/bsutil/versions_test.go +++ b/pkg/minikube/bootstrapper/bsutil/versions_test.go @@ -49,7 +49,7 @@ func TestVersionIsBetween(t *testing.T) { ver: semver.MustParse("2.8.0"), gte: semver.MustParse("1.7.0"), lte: semver.MustParse("1.9.0"), - expected: true, + expected: false, }, { description: "equal to max version", @@ -66,22 +66,23 @@ func TestVersionIsBetween(t *testing.T) { expected: true, }, { - description: "alpha between", + description: "alpha before", ver: semver.MustParse("1.8.0-alpha.0"), gte: semver.MustParse("1.8.0"), lte: semver.MustParse("1.9.0"), - expected: true, + expected: false, }, { description: "beta greater than alpha", ver: semver.MustParse("1.8.0-beta.1"), - gte: semver.MustParse("1.8.0"), - lte: semver.MustParse("1.8.0-alpha.0"), - expected: false, + gte: semver.MustParse("1.8.0-alpha.0"), + lte: semver.MustParse("1.8.0"), + expected: true, }, } for _, test := range tests { + test := test // capture range variable t.Run(test.description, func(t *testing.T) { t.Parallel() between := versionIsBetween(test.ver, test.gte, test.lte) From 9e8c6c48dc532ecba09eae9fe4b0d23ccef55105 Mon Sep 17 00:00:00 2001 From: klaases Date: Wed, 4 May 2022 17:23:25 -0700 Subject: [PATCH 452/545] Fix coding errors in addons.go file --- pkg/minikube/assets/addons.go | 34 ++++++++++++++-------------------- 1 file changed, 14 insertions(+), 20 deletions(-) diff --git a/pkg/minikube/assets/addons.go b/pkg/minikube/assets/addons.go index 0905078a6b..2cb67e2a8a 100755 --- a/pkg/minikube/assets/addons.go +++ b/pkg/minikube/assets/addons.go @@ -762,32 +762,28 @@ func parseMapString(str string) map[string]string { return mapResult } -// mergeMaps creates a map with the union of `sourceMap` and `overrideMap` where collisions take the value of `overrideMap`. -func mergeMaps(sourceMap, overrideMap map[string]string) map[string]string { - result := make(map[string]string) - for name, value := range sourceMap { - result[name] = value +// mergeMaps returns a map with the union of `source` and `override` where collisions take the value of `override`. +func mergeMaps(source, override map[string]string) map[string]string { + for k, v := range override { + source[k] = v } - for name, value := range overrideMap { - result[name] = value - } - return result + return source } -// filterKeySpace creates a map of the values in `targetMap` where the keys are also in `keySpace`. -func filterKeySpace(keySpace map[string]string, targetMap map[string]string) map[string]string { +// filterKeySpace creates a map of the values in `target` where the keys are also in `keySpace`. +func filterKeySpace(keySpace map[string]string, target map[string]string) map[string]string { result := make(map[string]string) for name := range keySpace { - if value, ok := targetMap[name]; ok { + if value, ok := target[name]; ok { result[name] = value } } return result } -// overrideDefaults creates a copy of `defaultMap` where `overrideMap` replaces any of its values that `overrideMap` contains. -func overrideDefaults(defaultMap, overrideMap map[string]string) map[string]string { - return mergeMaps(defaultMap, filterKeySpace(defaultMap, overrideMap)) +// overrideDefaults creates a copy of `def` where `overrideMap` replaces any of its values that `overrideMap` contains. +func overrideDefaults(def, override map[string]string) map[string]string { + return mergeMaps(def, filterKeySpace(def, override)) } // SelectAndPersistImages selects which images to use based on addon default images, previously persisted images, and newly requested images - which are then persisted for future enables. @@ -837,14 +833,12 @@ func SelectAndPersistImages(addon *Addon, cc *config.ClusterConfig) (images, cus cc.CustomAddonRegistries = mergeMaps(cc.CustomAddonRegistries, customRegistries) } - err = nil // If images or registries were specified, save the config afterward. if viper.IsSet(config.AddonImages) || viper.IsSet(config.AddonRegistries) { // Since these values are only set when a user enables an addon, it is safe to refer to the profile name. - err = config.Write(viper.GetString(config.ProfileName), cc) - // Whether err is nil or not we still return here. + return images, customRegistries, config.Write(viper.GetString(config.ProfileName), cc) } - return images, customRegistries, err + return images, customRegistries, nil } // GenerateTemplateData generates template data for template assets @@ -852,7 +846,7 @@ func GenerateTemplateData(addon *Addon, cc *config.ClusterConfig, netInfo Networ cfg := cc.KubernetesConfig a := runtime.GOARCH // Some legacy docker images still need the -arch suffix - // for less common architectures blank suffix for amd64 + // for less common architectures blank suffix for amd64 ea := "" if runtime.GOARCH != "amd64" { ea = "-" + runtime.GOARCH From 6b46f59ea5f22853aeca475688ceafd398ea9c9f Mon Sep 17 00:00:00 2001 From: klaases Date: Wed, 4 May 2022 17:29:53 -0700 Subject: [PATCH 453/545] Restore return comment --- pkg/minikube/assets/addons.go | 1 + 1 file changed, 1 insertion(+) diff --git a/pkg/minikube/assets/addons.go b/pkg/minikube/assets/addons.go index 2cb67e2a8a..6c66f6fa38 100755 --- a/pkg/minikube/assets/addons.go +++ b/pkg/minikube/assets/addons.go @@ -836,6 +836,7 @@ func SelectAndPersistImages(addon *Addon, cc *config.ClusterConfig) (images, cus // If images or registries were specified, save the config afterward. if viper.IsSet(config.AddonImages) || viper.IsSet(config.AddonRegistries) { // Since these values are only set when a user enables an addon, it is safe to refer to the profile name. + // Whether err is nil or not we still return here. return images, customRegistries, config.Write(viper.GetString(config.ProfileName), cc) } return images, customRegistries, nil From 30bad7c920d56e9630cd759f7ae323b0f704c01a Mon Sep 17 00:00:00 2001 From: klaases <93291761+klaases@users.noreply.github.com> Date: Wed, 7 Sep 2022 14:39:33 -0700 Subject: [PATCH 454/545] Update pkg/minikube/assets/addons.go Co-authored-by: Steven Powell <44844360+spowelljr@users.noreply.github.com> --- pkg/minikube/assets/addons.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/minikube/assets/addons.go b/pkg/minikube/assets/addons.go index 6c66f6fa38..a1c3b45b78 100755 --- a/pkg/minikube/assets/addons.go +++ b/pkg/minikube/assets/addons.go @@ -781,7 +781,7 @@ func filterKeySpace(keySpace map[string]string, target map[string]string) map[st return result } -// overrideDefaults creates a copy of `def` where `overrideMap` replaces any of its values that `overrideMap` contains. +// overrideDefaults creates a copy of `def` where `override` replaces any of its values that `override` contains. func overrideDefaults(def, override map[string]string) map[string]string { return mergeMaps(def, filterKeySpace(def, override)) } From b808caa44b4c4030c24c29ef3988a5525914fd97 Mon Sep 17 00:00:00 2001 From: klaases Date: Wed, 7 Sep 2022 14:48:05 -0700 Subject: [PATCH 455/545] do not name return error variable --- pkg/minikube/assets/addons.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/minikube/assets/addons.go b/pkg/minikube/assets/addons.go index a1c3b45b78..2a4070265d 100755 --- a/pkg/minikube/assets/addons.go +++ b/pkg/minikube/assets/addons.go @@ -787,7 +787,7 @@ func overrideDefaults(def, override map[string]string) map[string]string { } // SelectAndPersistImages selects which images to use based on addon default images, previously persisted images, and newly requested images - which are then persisted for future enables. -func SelectAndPersistImages(addon *Addon, cc *config.ClusterConfig) (images, customRegistries map[string]string, err error) { +func SelectAndPersistImages(addon *Addon, cc *config.ClusterConfig) (images, customRegistries map[string]string, _ error) { addonDefaultImages := addon.Images if addonDefaultImages == nil { addonDefaultImages = make(map[string]string) From 536e17360e56000d804deb3abbfac48b53d0794e Mon Sep 17 00:00:00 2001 From: klaases Date: Wed, 7 Sep 2022 15:00:14 -0700 Subject: [PATCH 456/545] fix defaultSSHUser and string formats --- pkg/drivers/qemu/qemu.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/drivers/qemu/qemu.go b/pkg/drivers/qemu/qemu.go index 5b96d09473..c8d6363725 100644 --- a/pkg/drivers/qemu/qemu.go +++ b/pkg/drivers/qemu/qemu.go @@ -105,7 +105,7 @@ func (d *Driver) GetSSHPort() (int, error) { func (d *Driver) GetSSHUsername() string { if d.SSHUser == "" { - d.SSHUser = "docker" + d.SSHUser = defaultSSHUser } return d.SSHUser } @@ -457,7 +457,7 @@ func (d *Driver) Start() error { func cmdOutErr(cmdStr string, args ...string) (string, string, error) { cmd := exec.Command(cmdStr, args...) - log.Debugf("executing: %v %v", cmdStr, strings.Join(args, " ")) + log.Debugf("executing: %s %s", cmdStr, strings.Join(args, " ")) var stdout bytes.Buffer var stderr bytes.Buffer cmd.Stdout = &stdout @@ -465,8 +465,8 @@ func cmdOutErr(cmdStr string, args ...string) (string, string, error) { err := cmd.Run() stdoutStr := stdout.String() stderrStr := stderr.String() - log.Debugf("STDOUT: %v", stdoutStr) - log.Debugf("STDERR: %v", stderrStr) + log.Debugf("STDOUT: %s", stdoutStr) + log.Debugf("STDERR: %s", stderrStr) if err != nil { if ee, ok := err.(*exec.Error); ok && ee == exec.ErrNotFound { err = fmt.Errorf("mystery error: %v", ee) From 2a8f5be5f27e574ef00082ebf3bd01c871b82722 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 8 Sep 2022 16:44:22 +0000 Subject: [PATCH 457/545] 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.8.6 to 1.8.7. - [Release notes](https://github.com/GoogleCloudPlatform/opentelemetry-operations-go/releases) - [Commits](https://github.com/GoogleCloudPlatform/opentelemetry-operations-go/compare/exporter/trace/v1.8.6...exporter/trace/v1.8.7) --- updated-dependencies: - dependency-name: github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 10 +++++----- go.sum | 21 +++++++++++---------- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/go.mod b/go.mod index bf43df160e..11172ee335 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ require ( contrib.go.opencensus.io/exporter/stackdriver v0.13.12 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.8.6 + github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.8.7 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 @@ -112,7 +112,7 @@ require ( 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/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.32.6 // indirect + github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.32.7 // indirect github.com/MakeNowJust/heredoc v1.0.0 // indirect github.com/Microsoft/go-winio v0.5.2 // indirect github.com/PuerkitoBio/purell v1.1.1 // indirect @@ -216,9 +216,9 @@ require ( golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f // indirect google.golang.org/appengine v1.6.7 // indirect - google.golang.org/genproto v0.0.0-20220720214146-176da50484ac // indirect - google.golang.org/grpc v1.48.0 // indirect - google.golang.org/protobuf v1.28.0 // indirect + google.golang.org/genproto v0.0.0-20220829175752-36a9c930ecbf // indirect + google.golang.org/grpc v1.49.0 // indirect + google.golang.org/protobuf v1.28.1 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/ini.v1 v1.66.4 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/go.sum b/go.sum index cdaac0dd38..b5726bf6fa 100644 --- a/go.sum +++ b/go.sum @@ -118,10 +118,11 @@ github.com/Delta456/box-cli-maker/v2 v2.2.2/go.mod h1:idItIMZeyx3bg73XwSgsLeZd+g github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24/go.mod h1:4UJr5HIiMZrwgkSPdsjy2uOQExX/WEILpIrO9UPGuXs= 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.8.6 h1:TOxk7n3PE2OkdNMgrXDtDr3ju4pIvwhY515tCoH0CpE= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.8.6/go.mod h1:NE8dAwJ1VU4WFdJYTlO0tdobQFdy70z8wNDU1L3VAr4= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.32.6 h1:QHbRbU/HI7SuNVqP0rDHK5jAMcwzuAex2akl3p+7YTo= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.32.6/go.mod h1:/G0zPXsUx5gZUd6ryJakuDo4VR7EJScegf1ZNK8xIGs= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.8.7 h1:aAZBUYgk3pn6g1q2Z3o0NT5VeI925OhCLOoPaodrAKM= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.8.7/go.mod h1:/6yXXCCD7/V+E4LmwOhjdxh555rM6ASCKnXlxsj04c0= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.32.7 h1:sOOMI+OpBU4E7CuWv2qd2vM/fKtzKdirPLvkdf4vkvA= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.32.7 h1:nonF0R35EO4YBL7cX0U0cX0VmKEcANti6xpZwZRg/iI= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.32.7/go.mod h1:/G0zPXsUx5gZUd6ryJakuDo4VR7EJScegf1ZNK8xIGs= github.com/MakeNowJust/heredoc v1.0.0 h1:cXCdzVdstXyiTqTvfqk9SDHpKNjxuom+DOlyEeQ4pzQ= github.com/MakeNowJust/heredoc v1.0.0/go.mod h1:mG5amYoWBHf8vpLOuehzbGGw0EHxpZZ6lCpQ4fNJ8LE= github.com/Masterminds/goutils v1.1.0/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU= @@ -706,7 +707,6 @@ github.com/googleapis/gnostic v0.5.1/go.mod h1:6U4PtQXGIEt/Z3h5MAT7FNofLnw9vXk2c github.com/googleapis/gnostic v0.5.5/go.mod h1:7+EbHbldMins07ALC74bsA81Ovc97DwqyJO1AENw9kA= 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= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8= @@ -2067,8 +2067,8 @@ google.golang.org/genproto v0.0.0-20220608133413-ed9918b62aac/go.mod h1:KEWEmljW google.golang.org/genproto v0.0.0-20220616135557-88e70c0c3a90/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA= google.golang.org/genproto v0.0.0-20220617124728-180714bec0ad/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA= google.golang.org/genproto v0.0.0-20220624142145-8cd45d7dbd1f/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA= -google.golang.org/genproto v0.0.0-20220720214146-176da50484ac h1:EOa+Yrhx1C0O+4pHeXeWrCwdI0tWI6IfUU56Vebs9wQ= -google.golang.org/genproto v0.0.0-20220720214146-176da50484ac/go.mod h1:GkXuJDJ6aQ7lnJcRF+SJVgFdQhypqgl3LB1C9vabdRE= +google.golang.org/genproto v0.0.0-20220829175752-36a9c930ecbf h1:Q5xNKbTSFwkuaaGaR7CMcXEM5sy19KYdUU8iF8/iRC0= +google.golang.org/genproto v0.0.0-20220829175752-36a9c930ecbf/go.mod h1:dbqgFATTzChvnt+ujMdZwITVAJHFtfyN1qUhDqEiIlk= google.golang.org/grpc v0.0.0-20160317175043-d3ddb4469d5a/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.8.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= @@ -2106,8 +2106,8 @@ google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11 google.golang.org/grpc v1.46.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= google.golang.org/grpc v1.46.2/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= google.golang.org/grpc v1.47.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= -google.golang.org/grpc v1.48.0 h1:rQOsyJ/8+ufEDJd/Gdsz7HG220Mh9HAhFHRGnIjda0w= -google.golang.org/grpc v1.48.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= +google.golang.org/grpc v1.49.0 h1:WTLtQzmQori5FUH25Pq4WT22oCsv8USpQ+F6rqtsmxw= +google.golang.org/grpc v1.49.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= @@ -2122,8 +2122,9 @@ google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlba 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/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= +google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w= +google.golang.org/protobuf v1.28.1/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 903d60f5766bc1be8cceeb9df2f2d27743d4a614 Mon Sep 17 00:00:00 2001 From: klaases Date: Thu, 8 Sep 2022 15:23:24 -0700 Subject: [PATCH 458/545] do not change source parameter --- pkg/minikube/assets/addons.go | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkg/minikube/assets/addons.go b/pkg/minikube/assets/addons.go index 2a4070265d..4621785232 100755 --- a/pkg/minikube/assets/addons.go +++ b/pkg/minikube/assets/addons.go @@ -764,10 +764,14 @@ func parseMapString(str string) map[string]string { // mergeMaps returns a map with the union of `source` and `override` where collisions take the value of `override`. func mergeMaps(source, override map[string]string) map[string]string { - for k, v := range override { - source[k] = v + result := make(map[string]string) + for k, v := range source { + result[k] = v } - return source + for k, v := range override { + result[k] = v + } + return result } // filterKeySpace creates a map of the values in `target` where the keys are also in `keySpace`. From 44778427a6f70b7122c5e36c75280d1617cdf593 Mon Sep 17 00:00:00 2001 From: klaases Date: Thu, 8 Sep 2022 15:31:50 -0700 Subject: [PATCH 459/545] remove repeated params --- pkg/minikube/assets/addons.go | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkg/minikube/assets/addons.go b/pkg/minikube/assets/addons.go index 4621785232..75569176ee 100755 --- a/pkg/minikube/assets/addons.go +++ b/pkg/minikube/assets/addons.go @@ -54,8 +54,8 @@ type NetworkInfo struct { } // NewAddon creates a new Addon -func NewAddon(assets []*BinAsset, enabled bool, addonName string, maintainer string, verifiedMaintainer string, docs string, images map[string]string, registries map[string]string) *Addon { - a := &Addon{ +func NewAddon(assets []*BinAsset, enabled bool, addonName, maintainer, verifiedMaintainer, docs string, images, registries map[string]string) *Addon { + return &Addon{ Assets: assets, enabled: enabled, addonName: addonName, @@ -65,10 +65,9 @@ func NewAddon(assets []*BinAsset, enabled bool, addonName string, maintainer str Images: images, Registries: registries, } - return a } -// Name get the addon name +// Name gets the addon name func (a *Addon) Name() string { return a.addonName } @@ -775,7 +774,7 @@ func mergeMaps(source, override map[string]string) map[string]string { } // filterKeySpace creates a map of the values in `target` where the keys are also in `keySpace`. -func filterKeySpace(keySpace map[string]string, target map[string]string) map[string]string { +func filterKeySpace(keySpace, target map[string]string) map[string]string { result := make(map[string]string) for name := range keySpace { if value, ok := target[name]; ok { From 8bfc23632c4dc25286a54b7d7a38803099154c84 Mon Sep 17 00:00:00 2001 From: klaases Date: Thu, 8 Sep 2022 16:59:30 -0700 Subject: [PATCH 460/545] prefer MacPorts --- site/content/en/docs/drivers/qemu.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/content/en/docs/drivers/qemu.md b/site/content/en/docs/drivers/qemu.md index 1af6ae93be..31caff0738 100644 --- a/site/content/en/docs/drivers/qemu.md +++ b/site/content/en/docs/drivers/qemu.md @@ -27,7 +27,7 @@ minikube start supports some qemu specific flags: * **`--qemu-firmware-path`**: The path to the firmware image to be used. * Note: while the flag should override the config, if the flag does not take effect try running `minikube delete --all --purge`. - * Macports: if you are installing [minikube](https://ports.macports.org/port/minikube/) and [qemu](https://ports.macports.org/port/qemu/) via Macports on a Mac with M1, use the following flag: `--qemu-firmware-path=/opt/local/share/qemu/edk2-aarch64-code.fd` + * MacPorts: if you are installing [minikube](https://ports.macports.org/port/minikube/) and [qemu](https://ports.macports.org/port/qemu/) via MacPorts on a Mac with M1, use the following flag: `--qemu-firmware-path=/opt/local/share/qemu/edk2-aarch64-code.fd` ## Issues From c2aa63848f4187fe1bb62da03decc14a623f9710 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Fri, 9 Sep 2022 12:35:28 -0700 Subject: [PATCH 461/545] removed unused config value --- pkg/minikube/bootstrapper/bsutil/kubeadm.go | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkg/minikube/bootstrapper/bsutil/kubeadm.go b/pkg/minikube/bootstrapper/bsutil/kubeadm.go index 84e72670b2..8ba0735dd5 100644 --- a/pkg/minikube/bootstrapper/bsutil/kubeadm.go +++ b/pkg/minikube/bootstrapper/bsutil/kubeadm.go @@ -102,7 +102,6 @@ func GenerateKubeadmYAML(cc config.ClusterConfig, n config.Node, r cruntime.Mana ImageRepository string ComponentOptions []componentOptions FeatureArgs map[string]bool - NoTaintMaster bool NodeIP string CgroupDriver string ClientCAFile string @@ -125,7 +124,6 @@ func GenerateKubeadmYAML(cc config.ClusterConfig, n config.Node, r cruntime.Mana ImageRepository: k8s.ImageRepository, ComponentOptions: componentOpts, FeatureArgs: kubeadmFeatureArgs, - NoTaintMaster: false, // That does not work with k8s 1.12+ DNSDomain: k8s.DNSDomain, NodeIP: n.IP, CgroupDriver: cgroupDriver, @@ -139,8 +137,6 @@ func GenerateKubeadmYAML(cc config.ClusterConfig, n config.Node, r cruntime.Mana opts.ServiceCIDR = k8s.ServiceCIDR } - opts.NoTaintMaster = true - b := bytes.Buffer{} configTmpl := ktmpl.V1Alpha3 // v1beta1 works in v1.13, but isn't required until v1.14. if version.GTE(semver.MustParse("1.14.0-alpha.0")) { @@ -156,6 +152,7 @@ func GenerateKubeadmYAML(cc config.ClusterConfig, n config.Node, r cruntime.Mana configTmpl = ktmpl.V1Beta3 } klog.Infof("kubeadm options: %+v", opts) + b := bytes.Buffer{} if err := configTmpl.Execute(&b, opts); err != nil { return nil, err } From c82d7f34592d157d6d5d3ae6573684a4d1ce8498 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Fri, 9 Sep 2022 13:22:40 -0700 Subject: [PATCH 462/545] ISO: Update Docker from 20.10.17 to 20.10.18 --- .../package/containerd-bin-aarch64/containerd-bin.hash | 1 + .../aarch64/package/containerd-bin-aarch64/containerd-bin.mk | 4 ++-- .../arch/aarch64/package/docker-bin-aarch64/docker-bin.hash | 3 ++- .../arch/aarch64/package/docker-bin-aarch64/docker-bin.mk | 2 +- .../arch/x86_64/package/containerd-bin/containerd-bin.hash | 1 + .../arch/x86_64/package/containerd-bin/containerd-bin.mk | 4 ++-- .../arch/x86_64/package/docker-bin/docker-bin.hash | 1 + .../minikube-iso/arch/x86_64/package/docker-bin/docker-bin.mk | 2 +- deploy/iso/minikube-iso/package/runc-master/runc-master.hash | 1 + deploy/iso/minikube-iso/package/runc-master/runc-master.mk | 4 ++-- 10 files changed, 14 insertions(+), 9 deletions(-) diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd-bin.hash b/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd-bin.hash index 2e62fe3485..bff66331fa 100644 --- a/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd-bin.hash +++ b/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd-bin.hash @@ -16,3 +16,4 @@ sha256 7507913ba169c103ab67bc51bec31cd977d4348d7bc842da32b7eab5f930a14b v1.5.10. sha256 02b79d5e2b07b5e64cd28f1fe84395ee11eef95fc49fd923a9ab93022b148be6 v1.5.11.tar.gz sha256 f422e21e35705d1e741c1f3280813e43f811eaff4dcc5cdafac8b8952b15f468 v1.6.4.tar.gz sha265 27afb673c20d53aa5c31aec07b38eb7e4dc911e7e1f0c76fac9513bbf070bd24 v1.6.6.tar.gz +sha256 f5f938513c28377f64f85e84f2750d39f26b01262f3a062b7e8ce35b560ca407 v1.6.8.tar.gz diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd-bin.mk b/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd-bin.mk index 1dd8ac38a8..7dd4a3f8fe 100644 --- a/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd-bin.mk +++ b/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd-bin.mk @@ -3,8 +3,8 @@ # containerd # ################################################################################ -CONTAINERD_BIN_AARCH64_VERSION = v1.6.6 -CONTAINERD_BIN_AARCH64_COMMIT = 10c12954828e7c7c9b6e0ea9b0c02b01407d3ae1 +CONTAINERD_BIN_AARCH64_VERSION = v1.6.8 +CONTAINERD_BIN_AARCH64_COMMIT = 9cd3357b7fd7218e4aec3eae239db1f68a5a6ec6 CONTAINERD_BIN_AARCH64_SITE = https://github.com/containerd/containerd/archive CONTAINERD_BIN_AARCH64_SOURCE = $(CONTAINERD_BIN_AARCH64_VERSION).tar.gz CONTAINERD_BIN_AARCH64_DEPENDENCIES = host-go libgpgme diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/docker-bin.hash b/deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/docker-bin.hash index d80c91ae08..e4dbd8e25a 100644 --- a/deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/docker-bin.hash +++ b/deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/docker-bin.hash @@ -1,4 +1,5 @@ sha256 ea971edc1179088bfd25edd04a0c12848143d15cb8202ebb93a6a08973464fd0 docker-20.10.14.tgz sha256 46102273fab8d6b8a7cf248a928ebaa4bee43114001c593b0d07092a34a439e1 docker-20.10.15.tgz sha256 2f35d8d422b63a59279084c159c9092b63b6d974a7fcd868167aee4cc5f79f3b docker-20.10.16.tgz -sha256 969210917b5548621a2b541caf00f86cc6963c6cf0fb13265b9731c3b98974d9 docker-20.10.17.tgz +sha256 249244024b507a6599084522cc73e73993349d13264505b387593f2b2ed603e6 docker-20.10.17.tgz +sha256 aa2b2da571fb9160df87fd5a831f203fb97655e35fb9c4e8d46e72078ae16acf docker-20.10.18.tgz diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/docker-bin.mk b/deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/docker-bin.mk index e100d80120..5ad531e0ff 100644 --- a/deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/docker-bin.mk +++ b/deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/docker-bin.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_BIN_AARCH64_VERSION = 20.10.17 +DOCKER_BIN_AARCH64_VERSION = 20.10.18 DOCKER_BIN_AARCH64_SITE = https://download.docker.com/linux/static/stable/aarch64 DOCKER_BIN_AARCH64_SOURCE = docker-$(DOCKER_BIN_AARCH64_VERSION).tgz diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/containerd-bin.hash b/deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/containerd-bin.hash index afe1cb7af2..f86c77be1e 100644 --- a/deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/containerd-bin.hash +++ b/deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/containerd-bin.hash @@ -16,3 +16,4 @@ sha256 7507913ba169c103ab67bc51bec31cd977d4348d7bc842da32b7eab5f930a14b v1.5.10. sha256 02b79d5e2b07b5e64cd28f1fe84395ee11eef95fc49fd923a9ab93022b148be6 v1.5.11.tar.gz sha256 f422e21e35705d1e741c1f3280813e43f811eaff4dcc5cdafac8b8952b15f468 v1.6.4.tar.gz sha256 27afb673c20d53aa5c31aec07b38eb7e4dc911e7e1f0c76fac9513bbf070bd24 v1.6.6.tar.gz +sha256 f5f938513c28377f64f85e84f2750d39f26b01262f3a062b7e8ce35b560ca407 v1.6.8.tar.gz diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/containerd-bin.mk b/deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/containerd-bin.mk index 3845fe6eb8..2512323417 100644 --- a/deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/containerd-bin.mk +++ b/deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/containerd-bin.mk @@ -3,8 +3,8 @@ # containerd # ################################################################################ -CONTAINERD_BIN_VERSION = v1.6.6 -CONTAINERD_BIN_COMMIT = 10c12954828e7c7c9b6e0ea9b0c02b01407d3ae1 +CONTAINERD_BIN_VERSION = v1.6.8 +CONTAINERD_BIN_COMMIT = 9cd3357b7fd7218e4aec3eae239db1f68a5a6ec6 CONTAINERD_BIN_SITE = https://github.com/containerd/containerd/archive CONTAINERD_BIN_SOURCE = $(CONTAINERD_BIN_VERSION).tar.gz CONTAINERD_BIN_DEPENDENCIES = host-go libgpgme diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/docker-bin/docker-bin.hash b/deploy/iso/minikube-iso/arch/x86_64/package/docker-bin/docker-bin.hash index c493eb2d3e..414f714725 100644 --- a/deploy/iso/minikube-iso/arch/x86_64/package/docker-bin/docker-bin.hash +++ b/deploy/iso/minikube-iso/arch/x86_64/package/docker-bin/docker-bin.hash @@ -38,3 +38,4 @@ sha256 7ca4aeeed86619909ae584ce3405da3766d495f98904ffbd9d859add26b83af5 docker- sha256 9ccfc39305ae1d8882d18c9c431544fca82913d6df717409ac2244ac58c4f070 docker-20.10.15.tgz sha256 b43ac6c4d2f0b64e445c6564860e4fccd6331f4a61815a60642c7748b53c59ff docker-20.10.16.tgz sha256 969210917b5548621a2b541caf00f86cc6963c6cf0fb13265b9731c3b98974d9 docker-20.10.17.tgz +sha256 0629b063fa3aa5660f3fb96f67edb0e20e92d5050b82403f95faf1c142177401 docker-20.10.18.tgz diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/docker-bin/docker-bin.mk b/deploy/iso/minikube-iso/arch/x86_64/package/docker-bin/docker-bin.mk index 070e5bc971..d02b0bd041 100644 --- a/deploy/iso/minikube-iso/arch/x86_64/package/docker-bin/docker-bin.mk +++ b/deploy/iso/minikube-iso/arch/x86_64/package/docker-bin/docker-bin.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_BIN_VERSION = 20.10.17 +DOCKER_BIN_VERSION = 20.10.18 DOCKER_BIN_SITE = https://download.docker.com/linux/static/stable/x86_64 DOCKER_BIN_SOURCE = docker-$(DOCKER_BIN_VERSION).tgz diff --git a/deploy/iso/minikube-iso/package/runc-master/runc-master.hash b/deploy/iso/minikube-iso/package/runc-master/runc-master.hash index 822cce4098..473a7e5acb 100644 --- a/deploy/iso/minikube-iso/package/runc-master/runc-master.hash +++ b/deploy/iso/minikube-iso/package/runc-master/runc-master.hash @@ -15,3 +15,4 @@ sha256 1f47e3ff66cdcca1f890b15e74e884c4ff81d16d1044cc9900a1eb10cfb3d8e7 52b36a2d sha256 91525356b71fbf8e05deddc955d3f40e0d4aedcb15d26bdd2850a9986852ae5b f46b6ba2c9314cfc8caae24a32ec5fe9ef1059fe.tar.gz sha256 49fbb25fda9fc416ec79a23e5382d504a8972a88247fe074f63ab71b6f38a0a0 52de29d7e0f8c0899bd7efb8810dd07f0073fa87.tar.gz sha256 9bb3be747237647cd232a47796d855e44fe295493f9661a4013835393ea65d46 a916309fff0f838eb94e928713dbc3c0d0ac7aa4.tar.gz +sha256 ab2b685fcece3a97ddcb8402879d1e05580a5b94f9d0aa3bae339db1e5dae686 5fd4c4d144137e991c4acebb2146ab1483a97925.tar.gz diff --git a/deploy/iso/minikube-iso/package/runc-master/runc-master.mk b/deploy/iso/minikube-iso/package/runc-master/runc-master.mk index 76e71abc63..101ef68e38 100644 --- a/deploy/iso/minikube-iso/package/runc-master/runc-master.mk +++ b/deploy/iso/minikube-iso/package/runc-master/runc-master.mk @@ -4,8 +4,8 @@ # ################################################################################ -# As of 2022-05-11, v1.1.2 -RUNC_MASTER_VERSION = a916309fff0f838eb94e928713dbc3c0d0ac7aa4 +# As of 2022-08-25, v1.1.4 +RUNC_MASTER_VERSION = 5fd4c4d144137e991c4acebb2146ab1483a97925 RUNC_MASTER_SITE = https://github.com/opencontainers/runc/archive RUNC_MASTER_SOURCE = $(RUNC_MASTER_VERSION).tar.gz RUNC_MASTER_LICENSE = Apache-2.0 From 0994a96f389fe3f41d5b046102a4997231e35330 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Fri, 9 Sep 2022 13:52:52 -0700 Subject: [PATCH 463/545] update ISO Go version --- Makefile | 2 +- deploy/iso/minikube-iso/go.hash | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 4a2eb15451..12b2b14aff 100644 --- a/Makefile +++ b/Makefile @@ -44,7 +44,7 @@ KVM_GO_VERSION ?= $(GO_VERSION:.0=) INSTALL_SIZE ?= $(shell du out/minikube-windows-amd64.exe | cut -f1) BUILDROOT_BRANCH ?= 2021.02.12 # the go version on the line below is for the ISO and does not need to be updated often -GOLANG_OPTIONS = GO_VERSION=1.18.3 GO_HASH_FILE=$(PWD)/deploy/iso/minikube-iso/go.hash +GOLANG_OPTIONS = GO_VERSION=1.19.1 GO_HASH_FILE=$(PWD)/deploy/iso/minikube-iso/go.hash BUILDROOT_OPTIONS = BR2_EXTERNAL=../../deploy/iso/minikube-iso $(GOLANG_OPTIONS) REGISTRY ?= gcr.io/k8s-minikube diff --git a/deploy/iso/minikube-iso/go.hash b/deploy/iso/minikube-iso/go.hash index 8690f1e4d8..fc323b3ea8 100644 --- a/deploy/iso/minikube-iso/go.hash +++ b/deploy/iso/minikube-iso/go.hash @@ -1,4 +1,5 @@ # From https://golang.org/dl/ sha256 3a70e5055509f347c0fb831ca07a2bf3b531068f349b14a3c652e9b5b67beb5d go1.17.src.tar.gz sha256 0012386ddcbb5f3350e407c679923811dbd283fcdc421724931614a842ecbc2d go1.18.3.src.tar.gz +sha256 27871baa490f3401414ad793fba49086f6c855b1c584385ed7771e1204c7e179 go1.19.1.src.tar.gz sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE From 2d61bf6204c6c5d1dd59eae4f0ef0d81fa76d176 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Fri, 9 Sep 2022 14:17:38 -0700 Subject: [PATCH 464/545] update auto-pause Go version and python --- deploy/addons/auto-pause/Dockerfile | 2 +- hack/jenkins/build_iso.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/deploy/addons/auto-pause/Dockerfile b/deploy/addons/auto-pause/Dockerfile index 118a70420c..c7267fc05b 100644 --- a/deploy/addons/auto-pause/Dockerfile +++ b/deploy/addons/auto-pause/Dockerfile @@ -1,2 +1,2 @@ -FROM golang:1.18 +FROM golang:1.19 ADD auto-pause-hook /auto-pause-hook diff --git a/hack/jenkins/build_iso.sh b/hack/jenkins/build_iso.sh index f9f93b2bc8..2d7446062d 100755 --- a/hack/jenkins/build_iso.sh +++ b/hack/jenkins/build_iso.sh @@ -29,7 +29,7 @@ set -x -o pipefail # Make sure all required packages are installed sudo apt-get update -sudo apt-get -y install build-essential unzip rsync bc python2 p7zip-full +sudo apt-get -y install build-essential unzip rsync bc python3 p7zip-full if [[ -z $ISO_VERSION ]]; then release=false From e9698c94a84c08d57b2b19f928e8f9d7736b5fed Mon Sep 17 00:00:00 2001 From: klaases Date: Fri, 9 Sep 2022 15:00:43 -0700 Subject: [PATCH 465/545] trim `minikube delete` suggestion --- site/content/en/docs/drivers/qemu.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/content/en/docs/drivers/qemu.md b/site/content/en/docs/drivers/qemu.md index 31caff0738..ab804e70a7 100644 --- a/site/content/en/docs/drivers/qemu.md +++ b/site/content/en/docs/drivers/qemu.md @@ -26,7 +26,7 @@ minikube start --driver=qemu minikube start supports some qemu specific flags: * **`--qemu-firmware-path`**: The path to the firmware image to be used. - * Note: while the flag should override the config, if the flag does not take effect try running `minikube delete --all --purge`. + * Note: while the flag should override the config, if the flag does not take effect try running `minikube delete`. * MacPorts: if you are installing [minikube](https://ports.macports.org/port/minikube/) and [qemu](https://ports.macports.org/port/qemu/) via MacPorts on a Mac with M1, use the following flag: `--qemu-firmware-path=/opt/local/share/qemu/edk2-aarch64-code.fd` ## Issues From b35cc80c15f5e490686d3387a826aa0d8f4430c3 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Sat, 10 Sep 2022 03:20:37 +0000 Subject: [PATCH 466/545] Updating ISO to v1.26.1-1662760260-14935 --- 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 12b2b14aff..6a02bc7317 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.26.1-1661795462-14482 +ISO_VERSION ?= v1.26.1-1662760260-14935 # 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 fdab34c110..98c1362f6a 100644 --- a/pkg/minikube/download/iso.go +++ b/pkg/minikube/download/iso.go @@ -41,7 +41,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/14482" + isoBucket := "minikube-builds/iso/14935" return []string{ fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s-%s.iso", isoBucket, v, runtime.GOARCH), fmt.Sprintf("https://github.com/kubernetes/minikube/releases/download/%s/minikube-%s-%s.iso", v, v, runtime.GOARCH), diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index 9f9db9659f..ca035d1523 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/14482/minikube-v1.26.1-1661795462-14482-amd64.iso,https://github.com/kubernetes/minikube/releases/download/v1.26.1-1661795462-14482/minikube-v1.26.1-1661795462-14482-amd64.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.26.1-1661795462-14482-amd64.iso]) + --iso-url strings Locations to fetch the minikube ISO from. (default [https://storage.googleapis.com/minikube-builds/iso/14935/minikube-v1.26.1-1662760260-14935-amd64.iso,https://github.com/kubernetes/minikube/releases/download/v1.26.1-1662760260-14935/minikube-v1.26.1-1662760260-14935-amd64.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.26.1-1662760260-14935-amd64.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.24.4, 'latest' for v1.25.0-rc.1). Defaults to 'stable'. --kvm-gpu Enable experimental NVIDIA GPU support in minikube From 7c22114001ddbb6dcbfcecc7fd202c42f007d96c Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 12 Sep 2022 09:05:15 +0000 Subject: [PATCH 467/545] 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/sync-minikube.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-gopogh-version.yml | 2 +- .github/workflows/update-gotestsum-version.yml | 2 +- .github/workflows/update-k8s-versions.yml | 2 +- .github/workflows/update-kubadm-constants.yml | 2 +- .github/workflows/yearly-leaderboard.yml | 2 +- Makefile | 2 +- hack/jenkins/common.ps1 | 2 +- hack/jenkins/installers/check_install_golang.sh | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a576403549..be4f9f8902 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.19' + GO_VERSION: '1.19.1' permissions: contents: read diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index ca710e76c2..a92c843887 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.19' + GO_VERSION: '1.19.1' permissions: contents: read diff --git a/.github/workflows/functional_verified.yml b/.github/workflows/functional_verified.yml index 563a3e9fbe..49c251bb76 100644 --- a/.github/workflows/functional_verified.yml +++ b/.github/workflows/functional_verified.yml @@ -22,7 +22,7 @@ on: - deleted env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.19' + GO_VERSION: '1.19.1' permissions: contents: read diff --git a/.github/workflows/leaderboard.yml b/.github/workflows/leaderboard.yml index 8cc0c22507..fdd2198ccf 100644 --- a/.github/workflows/leaderboard.yml +++ b/.github/workflows/leaderboard.yml @@ -6,7 +6,7 @@ on: - 'v*-beta.*' env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.19' + GO_VERSION: '1.19.1' permissions: contents: read diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 3ef7217627..2282d9c189 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.19' + GO_VERSION: '1.19.1' permissions: contents: read diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index b45fa2cebe..40644bcb61 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.19' + GO_VERSION: '1.19.1' permissions: contents: read diff --git a/.github/workflows/sync-minikube.yml b/.github/workflows/sync-minikube.yml index 3a52365e90..eaa763c8f4 100644 --- a/.github/workflows/sync-minikube.yml +++ b/.github/workflows/sync-minikube.yml @@ -6,7 +6,7 @@ on: - cron: "0 2,14 * * *" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.19' + GO_VERSION: '1.19.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 fa880690df..a6e3897f85 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.19' + GO_VERSION: '1.19.1' permissions: contents: read diff --git a/.github/workflows/time-to-k8s.yml b/.github/workflows/time-to-k8s.yml index 91e4fb4138..7f6800270e 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.19' + GO_VERSION: '1.19.1' permissions: contents: read diff --git a/.github/workflows/translations.yml b/.github/workflows/translations.yml index 1e07ec238f..802f9dff52 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.19' + GO_VERSION: '1.19.1' permissions: contents: read diff --git a/.github/workflows/update-golang-version.yml b/.github/workflows/update-golang-version.yml index b47a854323..4d94863fe1 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.19' + GO_VERSION: '1.19.1' permissions: contents: read diff --git a/.github/workflows/update-golint-version.yml b/.github/workflows/update-golint-version.yml index 6ae3e609eb..e7eacd3a94 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.19' + GO_VERSION: '1.19.1' permissions: contents: read diff --git a/.github/workflows/update-gopogh-version.yml b/.github/workflows/update-gopogh-version.yml index d4095b151f..02f39c89ee 100644 --- a/.github/workflows/update-gopogh-version.yml +++ b/.github/workflows/update-gopogh-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 9 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.19' + GO_VERSION: '1.19.1' permissions: contents: read diff --git a/.github/workflows/update-gotestsum-version.yml b/.github/workflows/update-gotestsum-version.yml index 83a79557fd..3690f927d0 100644 --- a/.github/workflows/update-gotestsum-version.yml +++ b/.github/workflows/update-gotestsum-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.19' + GO_VERSION: '1.19.1' permissions: contents: read diff --git a/.github/workflows/update-k8s-versions.yml b/.github/workflows/update-k8s-versions.yml index 00f85b68da..99803255b4 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.19' + GO_VERSION: '1.19.1' permissions: contents: read diff --git a/.github/workflows/update-kubadm-constants.yml b/.github/workflows/update-kubadm-constants.yml index fc7751a8d2..e6e2c70540 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.19' + GO_VERSION: '1.19.1' permissions: contents: read diff --git a/.github/workflows/yearly-leaderboard.yml b/.github/workflows/yearly-leaderboard.yml index 187344bda3..a5330331df 100644 --- a/.github/workflows/yearly-leaderboard.yml +++ b/.github/workflows/yearly-leaderboard.yml @@ -6,7 +6,7 @@ on: - cron: "0 0 2 * *" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.19' + GO_VERSION: '1.19.1' permissions: contents: read diff --git a/Makefile b/Makefile index 4a2eb15451..c3b47f9671 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.19 +GO_VERSION ?= 1.19.1 # update this only by running `make update-golang-version` GO_K8S_VERSION_PREFIX ?= v1.25.0 diff --git a/hack/jenkins/common.ps1 b/hack/jenkins/common.ps1 index ddee2cc18d..1840806e04 100644 --- a/hack/jenkins/common.ps1 +++ b/hack/jenkins/common.ps1 @@ -30,7 +30,7 @@ function Write-GithubStatus { $env:SHORT_COMMIT=$env:COMMIT.substring(0, 7) $gcs_bucket="minikube-builds/logs/$env:MINIKUBE_LOCATION/$env:ROOT_JOB_ID" $env:MINIKUBE_SUPPRESS_DOCKER_PERFORMANCE="true" -$GoVersion = "1.19" +$GoVersion = "1.19.1" # Docker's kubectl breaks things, and comes earlier in the path than the regular kubectl. So download the expected kubectl and replace Docker's version. $KubeVersion = (Invoke-WebRequest -Uri 'https://storage.googleapis.com/kubernetes-release/release/stable.txt' -UseBasicParsing).Content diff --git a/hack/jenkins/installers/check_install_golang.sh b/hack/jenkins/installers/check_install_golang.sh index 1ed3769ed2..f021c8d626 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.19 +VERSION_TO_INSTALL=1.19.1 INSTALL_PATH=${1} function current_arch() { From 04083b985ead19b1abd6242c3f9dac509e2c41ec Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 8 Sep 2022 16:42:53 +0000 Subject: [PATCH 468/545] Bump google.golang.org/api from 0.94.0 to 0.95.0 Bumps [google.golang.org/api](https://github.com/googleapis/google-api-go-client) from 0.94.0 to 0.95.0. - [Release notes](https://github.com/googleapis/google-api-go-client/releases) - [Changelog](https://github.com/googleapis/google-api-go-client/blob/main/CHANGES.md) - [Commits](https://github.com/googleapis/google-api-go-client/compare/v0.94.0...v0.95.0) --- updated-dependencies: - dependency-name: google.golang.org/api dependency-type: direct:production update-type: version-update:semver-minor ... 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 bf43df160e..1db50702a0 100644 --- a/go.mod +++ b/go.mod @@ -80,7 +80,7 @@ require ( golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 golang.org/x/text v0.3.7 gonum.org/v1/plot v0.11.0 - google.golang.org/api v0.94.0 + google.golang.org/api v0.95.0 gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 // indirect gopkg.in/yaml.v2 v2.4.0 k8s.io/api v0.25.0 diff --git a/go.sum b/go.sum index cdaac0dd38..17d9dd6283 100644 --- a/go.sum +++ b/go.sum @@ -1959,8 +1959,8 @@ google.golang.org/api v0.75.0/go.mod h1:pU9QmyHLnzlpar1Mjt4IbapUCy8J+6HD6GeELN69 google.golang.org/api v0.78.0/go.mod h1:1Sg78yoMLOhlQTeF+ARBoytAcH1NNyyl390YMy6rKmw= google.golang.org/api v0.80.0/go.mod h1:xY3nI94gbvBrE0J6NHXhxOmW97HG7Khjkku6AFB3Hyg= google.golang.org/api v0.84.0/go.mod h1:NTsGnUFJMYROtiquksZHBWtHfeMC7iYthki7Eq3pa8o= -google.golang.org/api v0.94.0 h1:KtKM9ru3nzQioV1HLlUf1cR7vMYJIpgls5VhAYQXIwA= -google.golang.org/api v0.94.0/go.mod h1:eADj+UBuxkh5zlrSntJghuNeg8HwQ1w5lTKkuqaETEI= +google.golang.org/api v0.95.0 h1:d1c24AAS01DYqXreBeuVV7ewY/U8Mnhh47pwtsgVtYg= +google.golang.org/api v0.95.0/go.mod h1:eADj+UBuxkh5zlrSntJghuNeg8HwQ1w5lTKkuqaETEI= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= From ac7bc7c1e55577a4d5daa94ae8b76bedd5c4d17c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 8 Sep 2022 16:42:58 +0000 Subject: [PATCH 469/545] Bump github.com/shirou/gopsutil/v3 from 3.22.7 to 3.22.8 Bumps [github.com/shirou/gopsutil/v3](https://github.com/shirou/gopsutil) from 3.22.7 to 3.22.8. - [Release notes](https://github.com/shirou/gopsutil/releases) - [Commits](https://github.com/shirou/gopsutil/compare/v3.22.7...v3.22.8) --- updated-dependencies: - dependency-name: github.com/shirou/gopsutil/v3 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 bf43df160e..1832863485 100644 --- a/go.mod +++ b/go.mod @@ -61,7 +61,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 github.com/russross/blackfriday v1.6.0 // indirect github.com/samalba/dockerclient v0.0.0-20160414174713-91d7393ff859 // indirect - github.com/shirou/gopsutil/v3 v3.22.7 + github.com/shirou/gopsutil/v3 v3.22.8 github.com/spf13/cobra v1.5.0 github.com/spf13/pflag v1.0.5 github.com/spf13/viper v1.12.0 diff --git a/go.sum b/go.sum index cdaac0dd38..6268595b3d 100644 --- a/go.sum +++ b/go.sum @@ -1239,8 +1239,8 @@ github.com/securego/gosec/v2 v2.9.1/go.mod h1:oDcDLcatOJxkCGaCaq8lua1jTnYf6Sou4w github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c/go.mod h1:/PevMnwAxekIXwN8qQyfc5gl2NlkB3CQlkizAbOkeBs= github.com/shirou/gopsutil/v3 v3.21.10/go.mod h1:t75NhzCZ/dYyPQjyQmrAYP6c8+LCdFANeBMdLPCNnew= -github.com/shirou/gopsutil/v3 v3.22.7 h1:flKnuCMfUUrO+oAvwAd6GKZgnPzr098VA/UJ14nhJd4= -github.com/shirou/gopsutil/v3 v3.22.7/go.mod h1:s648gW4IywYzUfE/KjXxUsqrqx/T2xO5VqOXxONeRfI= +github.com/shirou/gopsutil/v3 v3.22.8 h1:a4s3hXogo5mE2PfdfJIonDbstO/P+9JszdfhAHSzD9Y= +github.com/shirou/gopsutil/v3 v3.22.8/go.mod h1:s648gW4IywYzUfE/KjXxUsqrqx/T2xO5VqOXxONeRfI= github.com/shurcooL/go v0.0.0-20180423040247-9e1955d9fb6e/go.mod h1:TDJrrUr11Vxrven61rcy3hJMUqaf/CLWYhHNPmT14Lk= github.com/shurcooL/go-goon v0.0.0-20170922171312-37c2f522c041/go.mod h1:N5mDOmsrJOB+vfqUK+7DmDyjhSLIIBnXo9lvZJj3MWQ= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= From d36fd1c6adeb50275b4c880508c03ef6439f37b2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 8 Sep 2022 16:43:04 +0000 Subject: [PATCH 470/545] Bump github.com/spf13/viper from 1.12.0 to 1.13.0 Bumps [github.com/spf13/viper](https://github.com/spf13/viper) from 1.12.0 to 1.13.0. - [Release notes](https://github.com/spf13/viper/releases) - [Commits](https://github.com/spf13/viper/compare/v1.12.0...v1.13.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 | 8 ++++---- go.sum | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/go.mod b/go.mod index bf43df160e..e81681f6d0 100644 --- a/go.mod +++ b/go.mod @@ -64,7 +64,7 @@ require ( github.com/shirou/gopsutil/v3 v3.22.7 github.com/spf13/cobra v1.5.0 github.com/spf13/pflag v1.0.5 - github.com/spf13/viper v1.12.0 + github.com/spf13/viper v1.13.0 github.com/zchee/go-vmnet v0.0.0-20161021174912-97ebf9174097 go.opencensus.io v0.23.0 go.opentelemetry.io/otel v1.9.0 @@ -188,7 +188,7 @@ require ( github.com/opencontainers/image-spec v1.0.3-0.20220114050600-8b9d41f48198 // indirect github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417 // indirect github.com/pelletier/go-toml v1.9.5 // indirect - github.com/pelletier/go-toml/v2 v2.0.1 // indirect + github.com/pelletier/go-toml/v2 v2.0.5 // indirect github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect github.com/prometheus/client_golang v1.12.1 // indirect github.com/prometheus/client_model v0.2.0 // indirect @@ -201,7 +201,7 @@ require ( github.com/spf13/afero v1.8.2 // indirect github.com/spf13/cast v1.5.0 // indirect github.com/spf13/jwalterweatherman v1.1.0 // indirect - github.com/subosito/gotenv v1.3.0 // indirect + github.com/subosito/gotenv v1.4.1 // indirect github.com/tklauser/go-sysconf v0.3.10 // indirect github.com/tklauser/numcpus v0.4.0 // indirect github.com/ulikunitz/xz v0.5.8 // indirect @@ -220,7 +220,7 @@ require ( google.golang.org/grpc v1.48.0 // indirect google.golang.org/protobuf v1.28.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect - gopkg.in/ini.v1 v1.66.4 // indirect + gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect diff --git a/go.sum b/go.sum index cdaac0dd38..f6df63a240 100644 --- a/go.sum +++ b/go.sum @@ -1122,8 +1122,8 @@ github.com/pelletier/go-toml v1.9.3/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCko github.com/pelletier/go-toml v1.9.4/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8= github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= -github.com/pelletier/go-toml/v2 v2.0.1 h1:8e3L2cCQzLFi2CR4g7vGFuFxX7Jl1kKX8gW+iV0GUKU= -github.com/pelletier/go-toml/v2 v2.0.1/go.mod h1:r9LEWfGN8R5k0VXJ+0BkIe7MYkRdwZOjgMj2KwnJFUo= +github.com/pelletier/go-toml/v2 v2.0.5 h1:ipoSadvV8oGUjnUbMub59IDPPwfxF694nG/jwbMiyQg= +github.com/pelletier/go-toml/v2 v2.0.5/go.mod h1:OMHamSCAODeSsVrwwvcJOaoN0LIUIaFVNZzmWyNfXas= github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= github.com/phayes/checkstyle v0.0.0-20170904204023-bfd46e6a821d/go.mod h1:3OzsM7FXDQlpCiw2j81fOmAwQLnZnLGXVKUzeKQXIAw= github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2 h1:JhzVVoYvbOACxoUmOs6V/G4D5nPVUW73rKvXxP4XUJc= @@ -1296,8 +1296,8 @@ github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DM 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.9.0/go.mod h1:+i6ajR7OX2XaiBkrcZJFK21htRk7eDeLg7+O6bhUPP4= -github.com/spf13/viper v1.12.0 h1:CZ7eSOd3kZoaYDLbXnmzgQI5RlciuXBMA+18HwHRfZQ= -github.com/spf13/viper v1.12.0/go.mod h1:b6COn30jlNxbm/V2IqWiNWkJ+vZNiMNksliPCiuKtSI= +github.com/spf13/viper v1.13.0 h1:BWSJ/M+f+3nmdz9bxB+bWX28kkALN2ok11D0rSo8EJU= +github.com/spf13/viper v1.13.0/go.mod h1:Icm2xNL3/8uyh/wFuB1jI7TiTNKp8632Nwegu+zgdYw= github.com/ssgreg/nlreturn/v2 v2.2.1/go.mod h1:E/iiPB78hV7Szg2YfRgyIrk1AD6JVMTRkkxBiELzh2I= 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= @@ -1319,8 +1319,8 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= -github.com/subosito/gotenv v1.3.0 h1:mjC+YW8QpAdXibNi+vNWgzmgBH4+5l5dCXv8cNysBLI= -github.com/subosito/gotenv v1.3.0/go.mod h1:YzJjq/33h7nrwdY+iHMhEOEEbW0ovIz0tB6t6PwAXzs= +github.com/subosito/gotenv v1.4.1 h1:jyEFiXpy21Wm81FBN71l9VoMMV8H8jG+qIK3GCpY6Qs= +github.com/subosito/gotenv v1.4.1/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0= github.com/sylvia7788/contextcheck v1.0.4/go.mod h1:vuPKJMQ7MQ91ZTqfdyreNKwZjyUg6KO+IebVyQDedZQ= github.com/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= @@ -2144,8 +2144,8 @@ 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.63.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/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA= +gopkg.in/ini.v1 v1.67.0/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 641eccae533ce687a02c61222b5364c877d9e008 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Sep 2022 17:29:11 +0000 Subject: [PATCH 471/545] Bump cloud.google.com/go/storage from 1.25.0 to 1.26.0 Bumps [cloud.google.com/go/storage](https://github.com/googleapis/google-cloud-go) from 1.25.0 to 1.26.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/pubsub/v1.25.0...spanner/v1.26.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 | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index ea789e4a14..523186f7d6 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module k8s.io/minikube go 1.19 require ( - cloud.google.com/go/storage v1.25.0 + cloud.google.com/go/storage v1.26.0 contrib.go.opencensus.io/exporter/stackdriver v0.13.12 github.com/Delta456/box-cli-maker/v2 v2.2.2 github.com/GoogleCloudPlatform/docker-credential-gcr v0.0.0-20210713212222-faed5e8b8ca2 diff --git a/go.sum b/go.sum index 41024d1a57..e64be82d3f 100644 --- a/go.sum +++ b/go.sum @@ -71,8 +71,8 @@ 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.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo= cloud.google.com/go/storage v1.22.1/go.mod h1:S8N1cAStu7BOeFfE8KAQzmyyLkK8p/vmRq6kuBTW58Y= -cloud.google.com/go/storage v1.25.0 h1:D2Dn0PslpK7Z3B2AvuUHyIC762bDbGJdlmQlCBR71os= -cloud.google.com/go/storage v1.25.0/go.mod h1:Qys4JU+jeup3QnuKKAosWuxrD95C4MSqxfVDnSirDsI= +cloud.google.com/go/storage v1.26.0 h1:lYAGjknyDJirSzfwUlkv4Nsnj7od7foxQNH/fqZqles= +cloud.google.com/go/storage v1.26.0/go.mod h1:mk/N7YwIKEWyTvXAWQCIeiCTdLoRH6Pd5xmSnolQLTI= 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= From 89f52dedb6bd78a2c7b8a9f2915f6d2fa3126545 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Sep 2022 17:30:40 +0000 Subject: [PATCH 472/545] Bump k8s.io/klog/v2 from 2.70.1 to 2.80.1 Bumps [k8s.io/klog/v2](https://github.com/kubernetes/klog) from 2.70.1 to 2.80.1. - [Release notes](https://github.com/kubernetes/klog/releases) - [Changelog](https://github.com/kubernetes/klog/blob/main/RELEASE.md) - [Commits](https://github.com/kubernetes/klog/compare/v2.70.1...v2.80.1) --- updated-dependencies: - dependency-name: k8s.io/klog/v2 dependency-type: direct:production update-type: version-update:semver-minor ... 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 ea789e4a14..fee62582d9 100644 --- a/go.mod +++ b/go.mod @@ -88,7 +88,7 @@ require ( k8s.io/client-go v0.25.0 k8s.io/cluster-bootstrap v0.0.0 k8s.io/component-base v0.25.0 - k8s.io/klog/v2 v2.70.1 + k8s.io/klog/v2 v2.80.1 k8s.io/kubectl v0.25.0 k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed libvirt.org/go/libvirt v1.8005.0 diff --git a/go.sum b/go.sum index 41024d1a57..1062f415c1 100644 --- a/go.sum +++ b/go.sum @@ -2227,8 +2227,8 @@ k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= k8s.io/klog/v2 v2.3.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= k8s.io/klog/v2 v2.4.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= k8s.io/klog/v2 v2.9.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec= -k8s.io/klog/v2 v2.70.1 h1:7aaoSdahviPmR+XkS7FyxlkkXs6tHISSG03RxleQAVQ= -k8s.io/klog/v2 v2.70.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= +k8s.io/klog/v2 v2.80.1 h1:atnLQ121W371wYYFawwYx1aEY2eUfs4l3J72wtgAwV4= +k8s.io/klog/v2 v2.80.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6/go.mod h1:UuqjUnNftUyPE5H64/qeyjQoUZhGpeFDVdxjTeEVN2o= k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd/go.mod h1:WOJ3KddDSol4tAGcJo0Tvi+dK12EcqSLqcWsryKMpfM= k8s.io/kube-openapi v0.0.0-20211109043538-20434351676c/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw= From bbbe2960f57f7c7a8e29b0afb3f4081179691a34 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Sep 2022 17:31:23 +0000 Subject: [PATCH 473/545] Bump github.com/docker/docker Bumps [github.com/docker/docker](https://github.com/docker/docker) from 20.10.17+incompatible to 20.10.18+incompatible. - [Release notes](https://github.com/docker/docker/releases) - [Changelog](https://github.com/moby/moby/blob/master/CHANGELOG.md) - [Commits](https://github.com/docker/docker/compare/v20.10.17...v20.10.18) --- updated-dependencies: - dependency-name: github.com/docker/docker 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 ea789e4a14..0c5a3f7687 100644 --- a/go.mod +++ b/go.mod @@ -17,7 +17,7 @@ require ( github.com/cenkalti/backoff/v4 v4.1.3 github.com/cheggaaa/pb/v3 v3.1.0 github.com/cloudevents/sdk-go/v2 v2.11.0 - github.com/docker/docker v20.10.17+incompatible + github.com/docker/docker v20.10.18+incompatible github.com/docker/go-units v0.4.0 github.com/docker/machine v0.16.2 github.com/elazarl/goproxy v0.0.0-20210110162100-a92cc753f88e diff --git a/go.sum b/go.sum index 41024d1a57..f420ca5add 100644 --- a/go.sum +++ b/go.sum @@ -420,8 +420,8 @@ github.com/docker/distribution v2.8.1+incompatible h1:Q50tZOPR6T/hjNsyc9g8/syEs6 github.com/docker/distribution v2.8.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= github.com/docker/docker v17.12.0-ce-rc1.0.20181225093023-5ddb1d410a8b+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker v17.12.0-ce-rc1.0.20190115220918-5ec31380a5d3+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= -github.com/docker/docker v20.10.17+incompatible h1:JYCuMrWaVNophQTOrMMoSwudOVEfcegoZZrleKc1xwE= -github.com/docker/docker v20.10.17+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v20.10.18+incompatible h1:SN84VYXTBNGn92T/QwIRPlum9zfemfitN7pbsp26WSc= +github.com/docker/docker v20.10.18+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker-credential-helpers v0.6.4 h1:axCks+yV+2MR3/kZhAmy07yC56WZ2Pwu/fKWtKuZB0o= github.com/docker/docker-credential-helpers v0.6.4/go.mod h1:ofX3UI0Gz1TteYBjtgs07O36Pyasyp66D2uKT7H8W1c= github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ= From 81a29165472a74726ef510e8e5a7145e0233c56d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Sep 2022 18:11:35 +0000 Subject: [PATCH 474/545] Bump github.com/google/go-cmp from 0.5.8 to 0.5.9 Bumps [github.com/google/go-cmp](https://github.com/google/go-cmp) from 0.5.8 to 0.5.9. - [Release notes](https://github.com/google/go-cmp/releases) - [Commits](https://github.com/google/go-cmp/compare/v0.5.8...v0.5.9) --- updated-dependencies: - dependency-name: github.com/google/go-cmp dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 4 ++-- go.sum | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index ea789e4a14..aba5b04633 100644 --- a/go.mod +++ b/go.mod @@ -22,7 +22,7 @@ require ( github.com/docker/machine v0.16.2 github.com/elazarl/goproxy v0.0.0-20210110162100-a92cc753f88e github.com/golang-collections/collections v0.0.0-20130729185459-604e922904d3 - github.com/google/go-cmp v0.5.8 + github.com/google/go-cmp v0.5.9 github.com/google/go-containerregistry v0.11.0 github.com/google/slowjam v1.0.0 github.com/google/uuid v1.3.0 @@ -61,7 +61,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 github.com/russross/blackfriday v1.6.0 // indirect github.com/samalba/dockerclient v0.0.0-20160414174713-91d7393ff859 // indirect - github.com/shirou/gopsutil/v3 v3.22.7 + github.com/shirou/gopsutil/v3 v3.22.8 github.com/spf13/cobra v1.5.0 github.com/spf13/pflag v1.0.5 github.com/spf13/viper v1.13.0 diff --git a/go.sum b/go.sum index 41024d1a57..8d97962643 100644 --- a/go.sum +++ b/go.sum @@ -645,8 +645,9 @@ github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= +github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-containerregistry v0.11.0 h1:Xt8x1adcREjFcmDoDK8OdOsjxu90PHkGuwNP8GiHMLM= github.com/google/go-containerregistry v0.11.0/go.mod h1:BBaYtsHPHA42uEgAvd/NejvAfPSlz281sJWqupjSxfk= github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ= @@ -1239,8 +1240,8 @@ github.com/securego/gosec/v2 v2.9.1/go.mod h1:oDcDLcatOJxkCGaCaq8lua1jTnYf6Sou4w github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c/go.mod h1:/PevMnwAxekIXwN8qQyfc5gl2NlkB3CQlkizAbOkeBs= github.com/shirou/gopsutil/v3 v3.21.10/go.mod h1:t75NhzCZ/dYyPQjyQmrAYP6c8+LCdFANeBMdLPCNnew= -github.com/shirou/gopsutil/v3 v3.22.7 h1:flKnuCMfUUrO+oAvwAd6GKZgnPzr098VA/UJ14nhJd4= -github.com/shirou/gopsutil/v3 v3.22.7/go.mod h1:s648gW4IywYzUfE/KjXxUsqrqx/T2xO5VqOXxONeRfI= +github.com/shirou/gopsutil/v3 v3.22.8 h1:a4s3hXogo5mE2PfdfJIonDbstO/P+9JszdfhAHSzD9Y= +github.com/shirou/gopsutil/v3 v3.22.8/go.mod h1:s648gW4IywYzUfE/KjXxUsqrqx/T2xO5VqOXxONeRfI= github.com/shurcooL/go v0.0.0-20180423040247-9e1955d9fb6e/go.mod h1:TDJrrUr11Vxrven61rcy3hJMUqaf/CLWYhHNPmT14Lk= github.com/shurcooL/go-goon v0.0.0-20170922171312-37c2f522c041/go.mod h1:N5mDOmsrJOB+vfqUK+7DmDyjhSLIIBnXo9lvZJj3MWQ= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= From d0328e7672ece5dfbebce5ee4fc5200ada51546c Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Mon, 12 Sep 2022 11:19:51 -0700 Subject: [PATCH 475/545] update minikube GUI path --- site/content/en/docs/tutorials/setup_minikube_gui.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/content/en/docs/tutorials/setup_minikube_gui.md b/site/content/en/docs/tutorials/setup_minikube_gui.md index b487dd5950..7412f0d72b 100644 --- a/site/content/en/docs/tutorials/setup_minikube_gui.md +++ b/site/content/en/docs/tutorials/setup_minikube_gui.md @@ -32,7 +32,7 @@ unzip minikube-gui-mac.zip 3. Open the application ```shell -open dist/systray.app +open dist/minikube.app ``` 4. If you see the following, click cancel. From 19065355730ce7a74848478f7507caf841a577f6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Sep 2022 18:29:50 +0000 Subject: [PATCH 476/545] Bump gonum.org/v1/plot from 0.11.0 to 0.12.0 Bumps gonum.org/v1/plot from 0.11.0 to 0.12.0. --- updated-dependencies: - dependency-name: gonum.org/v1/plot dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 8 ++++---- go.sum | 24 +++++++++--------------- 2 files changed, 13 insertions(+), 19 deletions(-) diff --git a/go.mod b/go.mod index c58e0febda..bb8e5e2d9f 100644 --- a/go.mod +++ b/go.mod @@ -17,7 +17,7 @@ require ( github.com/cenkalti/backoff/v4 v4.1.3 github.com/cheggaaa/pb/v3 v3.1.0 github.com/cloudevents/sdk-go/v2 v2.11.0 - github.com/docker/docker v20.10.17+incompatible + github.com/docker/docker v20.10.18+incompatible github.com/docker/go-units v0.4.0 github.com/docker/machine v0.16.2 github.com/elazarl/goproxy v0.0.0-20210110162100-a92cc753f88e @@ -72,14 +72,14 @@ require ( go.opentelemetry.io/otel/trace v1.9.0 golang.org/x/build v0.0.0-20190927031335-2835ba2e683f golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4 - golang.org/x/exp v0.0.0-20210220032938-85be41e4509f + golang.org/x/exp v0.0.0-20220827204233-334a2380cb91 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 golang.org/x/oauth2 v0.0.0-20220822191816-0ebed06d0094 golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 golang.org/x/text v0.3.7 - gonum.org/v1/plot v0.11.0 + gonum.org/v1/plot v0.12.0 google.golang.org/api v0.95.0 gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 // indirect gopkg.in/yaml.v2 v2.4.0 @@ -211,7 +211,7 @@ require ( go.uber.org/atomic v1.7.0 // indirect go.uber.org/multierr v1.8.0 // indirect go.uber.org/zap v1.19.0 // indirect - golang.org/x/image v0.0.0-20220302094943-723b81ca9867 // indirect + golang.org/x/image v0.0.0-20220902085622-e7cb96979f69 // indirect golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f // indirect diff --git a/go.sum b/go.sum index c583b91a8d..78421d9950 100644 --- a/go.sum +++ b/go.sum @@ -80,7 +80,6 @@ contrib.go.opencensus.io/exporter/stackdriver v0.13.4/go.mod h1:aXENhDJ1Y4lIg4EU contrib.go.opencensus.io/exporter/stackdriver v0.13.12 h1:bjBKzIf7/TAkxd7L2utGaLM78bmUWlCval5K9UeElbY= contrib.go.opencensus.io/exporter/stackdriver v0.13.12/go.mod h1:mmxnWlrvrFdpiOHOhxBaVi1rkc0WOqhgfknj4Yg0SeQ= 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= git.sr.ht/~sbinet/gg v0.3.1/go.mod h1:KGYtlADtqsqANL9ueOFkWymvzUvLMQllU5Ixo+8v3pc= github.com/Antonboom/errname v0.1.5/go.mod h1:DugbBstvPFQbv/5uLcRRzfrNqKE9tVdVCqWCLp6Cifo= @@ -420,8 +419,8 @@ github.com/docker/distribution v2.8.1+incompatible h1:Q50tZOPR6T/hjNsyc9g8/syEs6 github.com/docker/distribution v2.8.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= github.com/docker/docker v17.12.0-ce-rc1.0.20181225093023-5ddb1d410a8b+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker v17.12.0-ce-rc1.0.20190115220918-5ec31380a5d3+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= -github.com/docker/docker v20.10.17+incompatible h1:JYCuMrWaVNophQTOrMMoSwudOVEfcegoZZrleKc1xwE= -github.com/docker/docker v20.10.17+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v20.10.18+incompatible h1:SN84VYXTBNGn92T/QwIRPlum9zfemfitN7pbsp26WSc= +github.com/docker/docker v20.10.18+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker-credential-helpers v0.6.4 h1:axCks+yV+2MR3/kZhAmy07yC56WZ2Pwu/fKWtKuZB0o= github.com/docker/docker-credential-helpers v0.6.4/go.mod h1:ofX3UI0Gz1TteYBjtgs07O36Pyasyp66D2uKT7H8W1c= github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ= @@ -1482,7 +1481,6 @@ golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4/go.mod h1:IxCIyHEi3zRg3s0 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= -golang.org/x/exp v0.0.0-20190731235908-ec7cb31e5a56/go.mod h1:JhuoJpWY28nO4Vef9tZUw9qufEGTyX1+7lmHxV5q5G4= golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek= golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY= golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= @@ -1491,8 +1489,8 @@ golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u0 golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= golang.org/x/exp v0.0.0-20200331195152-e8c3332aa8e5/go.mod h1:4M0jN8W1tt0AVLNr8HDosyJCDCDuyL9N9+3m7wDWgKw= -golang.org/x/exp v0.0.0-20210220032938-85be41e4509f h1:GrkO5AtFUU9U/1f5ctbIBXtBGeSJbWwIYfIsTcFMaX4= -golang.org/x/exp v0.0.0-20210220032938-85be41e4509f/go.mod h1:I6l2HNBLBZEcrOoCpyKLdY2lHoRZ8lI4x60KMCQDft4= +golang.org/x/exp v0.0.0-20220827204233-334a2380cb91 h1:tnebWN09GYg9OLPss1KXj8txwZc6X6uMr6VFdcGNbHw= +golang.org/x/exp v0.0.0-20220827204233-334a2380cb91/go.mod h1:cyybsKvd6eL0RnXn6p/Grxp8F5bW7iYuBgsNCOHpMYE= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/image v0.0.0-20190910094157-69e4b8554b2a/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= @@ -1502,8 +1500,8 @@ golang.org/x/image v0.0.0-20201208152932-35266b937fa6/go.mod h1:FeLwcggjj3mMvU+o golang.org/x/image v0.0.0-20210607152325-775e3b0c77b9/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM= golang.org/x/image v0.0.0-20210628002857-a66eb6448b8d/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM= golang.org/x/image v0.0.0-20211028202545-6944b10bf410/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM= -golang.org/x/image v0.0.0-20220302094943-723b81ca9867 h1:TcHcE0vrmgzNH1v3ppjcMGbhG5+9fMuvOmUYwNEF4q4= -golang.org/x/image v0.0.0-20220302094943-723b81ca9867/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM= +golang.org/x/image v0.0.0-20220902085622-e7cb96979f69 h1:Lj6HJGCSn5AjxRAH2+r35Mir4icalbqku+CLUtjnvXY= +golang.org/x/image v0.0.0-20220902085622-e7cb96979f69/go.mod h1:doUCurBvlfPMKfmIpRIywoHmhN3VyhnoFDbvIEWF4hY= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= @@ -1519,15 +1517,12 @@ golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 h1:VLliZ0d+/avPrXXH+OakdXhp golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= -golang.org/x/mobile v0.0.0-20201217150744-e6ae53a27f4f/go.mod h1:skQtrUTUwhdJvXM/2KKJzY8pDgNr9I/FOMqDVRPBUS4= golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= -golang.org/x/mod v0.1.1-0.20191209134235-331c550502dd/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.3.1-0.20200828183125-ce943fd02449/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= @@ -1840,7 +1835,6 @@ golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtn golang.org/x/tools v0.0.0-20191216052735-49a3e744a425/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200117012304-6edc0a871e69/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200117220505-0cba7a3a9ee9/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= @@ -1912,9 +1906,9 @@ golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f h1:uF6paiQQebLeSXkrTqHqz0MXhXXS1KgF41eUdBNvxK0= golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= -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= +gonum.org/v1/gonum v0.12.0 h1:xKuo6hzt+gMav00meVPUlXwSdoEJP46BR+wdxQEFK2o= +gonum.org/v1/plot v0.12.0 h1:y1ZNmfz/xHuHvtgFe8USZVyykQo5ERXPnspQNVK15Og= +gonum.org/v1/plot v0.12.0/go.mod h1:PgiMf9+3A3PnZdJIciIXmyN1FwdAA6rXELSN761oQkw= google.golang.org/api v0.0.0-20160322025152-9bf6e6e569ff/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= From a15d4abf2b3912d71730075665080f0f8ce7703f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 8 Sep 2022 16:42:43 +0000 Subject: [PATCH 477/545] Bump github.com/docker/go-units from 0.4.0 to 0.5.0 Bumps [github.com/docker/go-units](https://github.com/docker/go-units) from 0.4.0 to 0.5.0. - [Release notes](https://github.com/docker/go-units/releases) - [Commits](https://github.com/docker/go-units/compare/v0.4.0...v0.5.0) --- updated-dependencies: - dependency-name: github.com/docker/go-units dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index 815059715c..451a4be0eb 100644 --- a/go.mod +++ b/go.mod @@ -18,7 +18,7 @@ require ( github.com/cheggaaa/pb/v3 v3.1.0 github.com/cloudevents/sdk-go/v2 v2.11.0 github.com/docker/docker v20.10.18+incompatible - github.com/docker/go-units v0.4.0 + github.com/docker/go-units v0.5.0 github.com/docker/machine v0.16.2 github.com/elazarl/goproxy v0.0.0-20210110162100-a92cc753f88e github.com/golang-collections/collections v0.0.0-20130729185459-604e922904d3 diff --git a/go.sum b/go.sum index 4ba1c6220c..14a0b4b646 100644 --- a/go.sum +++ b/go.sum @@ -430,8 +430,9 @@ github.com/docker/go-events v0.0.0-20170721190031-9461782956ad/go.mod h1:Uw6Uezg github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c/go.mod h1:Uw6UezgYA44ePAFQYUehOuCzmy5zmg/+nl2ZfMWGkpA= github.com/docker/go-metrics v0.0.0-20180209012529-399ea8c73916/go.mod h1:/u0gXw0Gay3ceNrsHubL3BtdOL2fHf93USgMTe0W5dI= github.com/docker/go-metrics v0.0.1/go.mod h1:cG1hvH2utMXtqgqqYE9plW6lDxS3/5ayHzueweSI3Vw= -github.com/docker/go-units v0.4.0 h1:3uh0PgVws3nIA0Q+MwDC8yjEPf9zjRfZZWXZYDct3Tw= github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= +github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4= +github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= github.com/docker/libtrust v0.0.0-20150114040149-fa567046d9b1/go.mod h1:cyGadeNEkKy96OOhEzfZl+yxihPEzKnqJwvfuSUqbZE= github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM= github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE= From 6002db244e8b82ff6e7da5e905645d7063845cc2 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Mon, 12 Sep 2022 10:21:59 -0700 Subject: [PATCH 478/545] fix error message --- cmd/minikube/cmd/config/set_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/minikube/cmd/config/set_test.go b/cmd/minikube/cmd/config/set_test.go index 8dfb6f1e76..ca2cdc0d6b 100644 --- a/cmd/minikube/cmd/config/set_test.go +++ b/cmd/minikube/cmd/config/set_test.go @@ -38,7 +38,7 @@ func TestSetNotAllowed(t *testing.T) { t.Fatalf("Set did not return error for unallowed value: %+v", err) } err = Set("memory", "10a") - if err == nil || err.Error() != "run validations for \"memory\" with value of \"10a\": [invalid memory size: invalid size: '10a']" { + if err == nil || err.Error() != "run validations for \"memory\" with value of \"10a\": [invalid memory size: invalid suffix: 'a']" { t.Fatalf("Set did not return error for unallowed value: %+v", err) } } From 90cd942048d4bc611bb00d9603fa4b58da46def0 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Mon, 12 Sep 2022 14:32:29 -0700 Subject: [PATCH 479/545] CI: fix Golang install on M1 Macs --- hack/jenkins/installers/check_install_golang.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/jenkins/installers/check_install_golang.sh b/hack/jenkins/installers/check_install_golang.sh index f021c8d626..3151306ddd 100755 --- a/hack/jenkins/installers/check_install_golang.sh +++ b/hack/jenkins/installers/check_install_golang.sh @@ -30,7 +30,7 @@ function current_arch() { "x86_64" | "i386") echo "amd64" ;; - "aarch64") + "aarch64" | "arm64") echo "arm64" ;; *) From 14d9e30e893c52e78ae19325bf06014ff1b371c8 Mon Sep 17 00:00:00 2001 From: Yuiko Mouri Date: Mon, 5 Sep 2022 17:52:54 +0900 Subject: [PATCH 480/545] Update Japanese translation --- translations/ja.json | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/translations/ja.json b/translations/ja.json index d2e76eec03..9df146cd08 100644 --- a/translations/ja.json +++ b/translations/ja.json @@ -461,7 +461,7 @@ "PowerShell is running in constrained mode, which is incompatible with Hyper-V scripting.": "PowerShell は制約付きモードで実行されています (Hyper-V スクリプティングと互換性がありません)。", "Powering off \"{{.profile_name}}\" via SSH ...": "SSH 経由で「{{.profile_name}}」の電源をオフにしています...", "Preparing Kubernetes {{.k8sVersion}} on {{.runtime}} {{.runtimeVersion}} ...": "{{.runtime}} {{.runtimeVersion}} で Kubernetes {{.k8sVersion}} を準備しています...", - "Preparing {{.runtime}} {{.runtimeVersion}} ...": "", + "Preparing {{.runtime}} {{.runtimeVersion}} ...": "{{.runtime}} {{.runtimeVersion}} を準備しています...", "Print current and latest version number": "使用中および最新の minikube バージョン番号を表示します", "Print just the version number.": "バージョン番号だけ表示します。", "Print the version of minikube": "minikube バージョンを表示します", @@ -664,9 +664,9 @@ "The node {{.name}} has ran out of disk space.": "{{.name}} ノードはディスクスペースを使い果たしました。", "The node {{.name}} has ran out of memory.": "{{.name}} ノードはメモリーを使い果たしました。", "The node {{.name}} network is not available. Please verify network settings.": "{{.name}} ノードはネットワークが使用不能です。ネットワーク設定を検証してください。", - "The none driver is not compatible with multi-node clusters.": "ノードドライバーはマルチノードクラスターと互換性がありません。", - "The none driver with Kubernetes v1.24+ and the docker container-runtime requires cri-dockerd.\n\t\t\n\t\tPlease install cri-dockerd using these instructions:\n\n\t\thttps://github.com/Mirantis/cri-dockerd#build-and-install": "", - "The none driver with Kubernetes v1.24+ and the docker container-runtime requires dockerd.\n\t\t\n\t\tPlease install dockerd using these instructions:\n\n\t\thttps://docs.docker.com/engine/install/": "", + "The none driver is not compatible with multi-node clusters.": "none ドライバーはマルチノードクラスターと互換性がありません。", + "The none driver with Kubernetes v1.24+ and the docker container-runtime requires cri-dockerd.\n\t\t\n\t\tPlease install cri-dockerd using these instructions:\n\n\t\thttps://github.com/Mirantis/cri-dockerd#build-and-install": "Kubernetes v1.24+ の none ドライバーと docker container-runtime は cri-dockerd を要求します。\n\t\t\n\t\tこれらの手順を参照して cri-dockerd をインストールしてください:\n\n\t\thttps://github.com/Mirantis/cri-dockerd#build-and-install", + "The none driver with Kubernetes v1.24+ and the docker container-runtime requires dockerd.\n\t\t\n\t\tPlease install dockerd using these instructions:\n\n\t\thttps://docs.docker.com/engine/install/": "Kubernetes v1.24+ の none ドライバーと docker container-runtime は dockerd を要求します。\n\t\t\n\t\tこれらの手順を参照して dockerd をインストールしてください:\n\n\t\thttps://docs.docker.com/engine/install/", "The number of nodes to spin up. Defaults to 1.": "起動するノード数。デフォルトは 1。", "The output format. One of 'json', 'table'": "出力形式。'json', 'table' のいずれか", "The path on the file system where the docs in markdown need to be saved": "markdown で書かれたドキュメントの保存先のファイルシステムパス", @@ -688,10 +688,10 @@ "Things to try without Kubernetes ...": "Kubernetes なしで試すべきこと ...", "This addon does not have an endpoint defined for the 'addons open' command.\nYou can add one by annotating a service with the label {{.labelName}}:{{.addonName}}": "このアドオンは 'addons open' コマンド用に定義されたエンドポイントがありません。\nサービスに {{.labelName}}:{{.addonName}} ラベルを付与することでエンドポイントを追加できます", "This can also be done automatically by setting the env var CHANGE_MINIKUBE_NONE_USER=true": "これは環境変数 CHANGE_MINIKUBE_NONE_USER=true を設定して自動的に行うこともできます", - "This cluster was created before minikube v1.26.0 and doesn't have cri-docker installed. Please run 'minikube delete' and then start minikube again": "", + "This cluster was created before minikube v1.26.0 and doesn't have cri-docker installed. Please run 'minikube delete' and then start minikube again": "このクラスターは minikube v1.26.0 より前に作成され、cri-docker がインストールされていません。'minikube delete' を実行してから、再度 minikube を起動してください", "This control plane is not running! (state={{.state}})": "このコントロールプレーンは動作していません！(state={{.state}})", "This driver does not yet work on your architecture. Maybe try --driver=none": "このドライバーはあなたのアーキテクチャではまだ機能しません。もしかしたら、--driver=none を試してみてください", - "This flag is currently unsupported.": "", + "This flag is currently unsupported.": "このフラグは現在サポートされていません。", "This is a known issue with BTRFS storage driver, there is a workaround, please checkout the issue on GitHub": "これは BTRFS ストレージドライバーの既知の問題です (回避策があります)。GitHub の issue を確認してください", "This is unusual - you may want to investigate using \"{{.command}}\"": "これは異常です - 「{{.command}}」を使って調査できます", "This will keep the existing kubectl context and will create a minikube context.": "これにより既存の kubectl コンテキストが保持され、minikube コンテキストが作成されます。", @@ -900,10 +900,10 @@ "minikube profile was successfully set to {{.profile_name}}": "無事 minikube のプロファイルが {{.profile_name}} に設定されました", "minikube provisions and manages local Kubernetes clusters optimized for development workflows.": "minikube は、開発ワークフロー用に最適化されたローカル Kubernetes クラスターを構築・管理します。", "minikube quickly sets up a local Kubernetes cluster": "minikube はローカル Kubernetes クラスターを迅速にセットアップします", - "minikube service is not currently implemented with the qemu2 driver. See https://github.com/kubernetes/minikube/issues/14146 for details.": "", + "minikube service is not currently implemented with the qemu2 driver. See https://github.com/kubernetes/minikube/issues/14146 for details.": "minikube サービスは現在、qemu2 ドライバーでは実装されていません。詳細については、https://github.com/kubernetes/minikube/issues/14146 を参照してください。", "minikube skips various validations when --force is supplied; this may lead to unexpected behavior": "minikube は --force が付与された場合、様々な検証をスキップします (これは予期せぬ挙動を引き起こすかも知れません)", "minikube status --output OUTPUT. json, text": "minikube status --output OUTPUT. json, text", - "minikube tunnel is not currently implemented with the qemu2 driver. See https://github.com/kubernetes/minikube/issues/14146 for details.": "", + "minikube tunnel is not currently implemented with the qemu2 driver. See https://github.com/kubernetes/minikube/issues/14146 for details.": "minikube トンネルは現在、qemu2 ドライバーでは実装されていません。 詳細については、https://github.com/kubernetes/minikube/issues/14146 を参照してください。", "minikube {{.version}} is available! Download it: {{.url}}": "minikube {{.version}} が利用可能です！次の URL からダウンロードしてください: {{.url}}", "mkcmp is used to compare performance of two minikube binaries": "mkcmp で 2 つの minikube のバイナリーのパフォーマンスを比較できます", "mount argument \"{{.value}}\" must be in form: \u003csource directory\u003e:\u003ctarget directory\u003e": "マウント引数「{{.value}}」は次の形式でなければなりません: \u003cソースディレクトリー\u003e:\u003cターゲットディレクトリー\u003e", @@ -925,7 +925,7 @@ "retrieving node": "ノードを取得しています", "scheduled stop is not supported on the none driver, skipping scheduling": "none ドライバーでは予定停止がサポートされていません (予約をスキップします)", "service {{.namespace_name}}/{{.service_name}} has no node port": "サービス {{.namespace_name}}/{{.service_name}} は NodePort がありません", - "set tunnel bind address, empty or '*' indicates the tunnel should be available for all interfaces": "", + "set tunnel bind address, empty or '*' indicates the tunnel should be available for all interfaces": "トンネル バインド アドレスを設定します。空または '*' は、トンネルがすべてのインターフェイスで使用可能であることを示します", "stat failed": "stat に失敗しました", "status json failure": "status json に失敗しました", "status text failure": "status text に失敗しました", @@ -946,14 +946,14 @@ "usage: minikube addons images ADDON_NAME": "使用法: minikube addons images ADDON_NAME", "usage: minikube addons list": "使用法: minikube addons list", "usage: minikube addons open ADDON_NAME": "使用法: minikube addons open ADDON_NAME", - "usage: minikube config list PROPERTY_NAME": "", + "usage: minikube config list PROPERTY_NAME": "使用法: minikube config list PROPERTY_NAME", "usage: minikube config unset PROPERTY_NAME": "使用法: minikube config unset PROPERTY_NAME", "usage: minikube delete": "使用法: minikube delete", "usage: minikube profile [MINIKUBE_PROFILE_NAME]": "使用法: minikube profile [MINIKUBE_PROFILE_NAME]", "using metrics-server addon, heapster is deprecated": "metrics-server アドオンを使用します (heapster は廃止予定です)", "version json failure": "JSON 形式のバージョン表示に失敗しました", "version yaml failure": "YAML 形式のバージョン表示に失敗しました", - "yaml encoding failure": "", + "yaml encoding failure": "YAML エンコードに失敗しました", "zsh completion failed": "zsh のコマンド補完に失敗しました", "zsh completion.": "zsh のコマンド補完です。", "{{ .name }}: Suggestion: {{ .suggestion}}": "{{ .name }}: 提案: {{ .suggestion}}", From 27abc8a98b59bc6a4566622260ed8e9dafbe07b0 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Tue, 13 Sep 2022 13:29:51 -0700 Subject: [PATCH 481/545] fix QEMU delete errors --- pkg/drivers/qemu/qemu.go | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/pkg/drivers/qemu/qemu.go b/pkg/drivers/qemu/qemu.go index c8d6363725..310c6c0069 100644 --- a/pkg/drivers/qemu/qemu.go +++ b/pkg/drivers/qemu/qemu.go @@ -659,7 +659,7 @@ func (d *Driver) RunQMPCommand(command string) (map[string]interface{}, error) { // connect to monitor conn, err := net.Dial("unix", d.monitorPath()) if err != nil { - return nil, err + return nil, errors.Wrap(err, "connect") } defer conn.Close() @@ -667,7 +667,7 @@ func (d *Driver) RunQMPCommand(command string) (map[string]interface{}, error) { var buf [1024]byte nr, err := conn.Read(buf[:]) if err != nil { - return nil, err + return nil, errors.Wrap(err, "read initial response") } type qmpInitialResponse struct { QMP struct { @@ -684,9 +684,8 @@ func (d *Driver) RunQMPCommand(command string) (map[string]interface{}, error) { } var initialResponse qmpInitialResponse - err = json.Unmarshal(buf[:nr], &initialResponse) - if err != nil { - return nil, err + if err := json.Unmarshal(buf[:nr], &initialResponse); err != nil { + return nil, errors.Wrap(err, "unmarshal initial response") } // run 'qmp_capabilities' to switch to command mode @@ -696,22 +695,21 @@ func (d *Driver) RunQMPCommand(command string) (map[string]interface{}, error) { } jsonCommand, err := json.Marshal(qmpCommand{Command: "qmp_capabilities"}) if err != nil { - return nil, err + return nil, errors.Wrap(err, "marshal qmp_capabilities") } if _, err := conn.Write(jsonCommand); err != nil { - return nil, err + return nil, errors.Wrap(err, "write qmp_capabilities") } nr, err = conn.Read(buf[:]) if err != nil { - return nil, err + return nil, errors.Wrap(err, "read qmp_capabilities response") } type qmpResponse struct { Return map[string]interface{} `json:"return"` } var response qmpResponse - err = json.Unmarshal(buf[:nr], &response) - if err != nil { - return nil, err + if err := json.Unmarshal(buf[:nr], &response); err != nil { + return nil, errors.Wrap(err, "unmarshal qmp_capabilities reponse") } // expecting empty response if len(response.Return) != 0 { @@ -721,18 +719,21 @@ func (d *Driver) RunQMPCommand(command string) (map[string]interface{}, error) { // { "execute": command } jsonCommand, err = json.Marshal(qmpCommand{Command: command}) if err != nil { - return nil, err + return nil, errors.Wrap(err, "marshal command") } if _, err := conn.Write(jsonCommand); err != nil { - return nil, err + return nil, errors.Wrap(err, "write command") } nr, err = conn.Read(buf[:]) if err != nil { - return nil, err + return nil, errors.Wrap(err, "read command response") } - err = json.Unmarshal(buf[:nr], &response) - if err != nil { - return nil, err + + // Sometimes QEMU returns two JSON objects with the first object being the command response + // and the second object being an event log (unimportant) + firstRespObj := strings.Split(string(buf[:nr]), "\n")[0] + if err := json.Unmarshal([]byte(firstRespObj), &response); err != nil { + return nil, errors.Wrap(err, "unmarshal command response") } if strings.HasPrefix(command, "query-") { return response.Return, nil From 3d8bf996f8869786687b4aa5c8aeb7080b39e7e0 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Tue, 13 Sep 2022 13:53:24 -0700 Subject: [PATCH 482/545] fix typo --- pkg/drivers/qemu/qemu.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/drivers/qemu/qemu.go b/pkg/drivers/qemu/qemu.go index 310c6c0069..6a776c74a8 100644 --- a/pkg/drivers/qemu/qemu.go +++ b/pkg/drivers/qemu/qemu.go @@ -709,7 +709,7 @@ func (d *Driver) RunQMPCommand(command string) (map[string]interface{}, error) { } var response qmpResponse if err := json.Unmarshal(buf[:nr], &response); err != nil { - return nil, errors.Wrap(err, "unmarshal qmp_capabilities reponse") + return nil, errors.Wrap(err, "unmarshal qmp_capabilities response") } // expecting empty response if len(response.Return) != 0 { From 31dd75b826eb57a4e4cbcb6966d7b0d5273dbdfc Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Tue, 13 Sep 2022 14:23:23 -0700 Subject: [PATCH 483/545] shorten response to resp --- pkg/drivers/qemu/qemu.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkg/drivers/qemu/qemu.go b/pkg/drivers/qemu/qemu.go index 6a776c74a8..ab08bf0a87 100644 --- a/pkg/drivers/qemu/qemu.go +++ b/pkg/drivers/qemu/qemu.go @@ -667,7 +667,7 @@ func (d *Driver) RunQMPCommand(command string) (map[string]interface{}, error) { var buf [1024]byte nr, err := conn.Read(buf[:]) if err != nil { - return nil, errors.Wrap(err, "read initial response") + return nil, errors.Wrap(err, "read initial resp") } type qmpInitialResponse struct { QMP struct { @@ -685,7 +685,7 @@ func (d *Driver) RunQMPCommand(command string) (map[string]interface{}, error) { var initialResponse qmpInitialResponse if err := json.Unmarshal(buf[:nr], &initialResponse); err != nil { - return nil, errors.Wrap(err, "unmarshal initial response") + return nil, errors.Wrap(err, "unmarshal initial resp") } // run 'qmp_capabilities' to switch to command mode @@ -702,14 +702,14 @@ func (d *Driver) RunQMPCommand(command string) (map[string]interface{}, error) { } nr, err = conn.Read(buf[:]) if err != nil { - return nil, errors.Wrap(err, "read qmp_capabilities response") + return nil, errors.Wrap(err, "read qmp_capabilities resp") } type qmpResponse struct { Return map[string]interface{} `json:"return"` } var response qmpResponse if err := json.Unmarshal(buf[:nr], &response); err != nil { - return nil, errors.Wrap(err, "unmarshal qmp_capabilities response") + return nil, errors.Wrap(err, "unmarshal qmp_capabilities resp") } // expecting empty response if len(response.Return) != 0 { @@ -726,14 +726,14 @@ func (d *Driver) RunQMPCommand(command string) (map[string]interface{}, error) { } nr, err = conn.Read(buf[:]) if err != nil { - return nil, errors.Wrap(err, "read command response") + return nil, errors.Wrap(err, "read command resp") } // Sometimes QEMU returns two JSON objects with the first object being the command response // and the second object being an event log (unimportant) firstRespObj := strings.Split(string(buf[:nr]), "\n")[0] if err := json.Unmarshal([]byte(firstRespObj), &response); err != nil { - return nil, errors.Wrap(err, "unmarshal command response") + return nil, errors.Wrap(err, "unmarshal command resp") } if strings.HasPrefix(command, "query-") { return response.Return, nil From 9dadf326e0245fa1c242a8b1c84a684b594ae851 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Wed, 14 Sep 2022 10:32:51 -0700 Subject: [PATCH 484/545] update naming to LegacyPodSecurityPolicy --- deploy/addons/metallb/metallb.yaml.tmpl | 6 +- pkg/minikube/assets/addons.go | 82 +++++++++++-------------- 2 files changed, 39 insertions(+), 49 deletions(-) diff --git a/deploy/addons/metallb/metallb.yaml.tmpl b/deploy/addons/metallb/metallb.yaml.tmpl index b301921196..f73f09f2a5 100644 --- a/deploy/addons/metallb/metallb.yaml.tmpl +++ b/deploy/addons/metallb/metallb.yaml.tmpl @@ -4,8 +4,7 @@ metadata: labels: app: metallb name: metallb-system ---- -{{- if and (eq .KubernetesVersion.Major 1 ) (lt .KubernetesVersion.Minor 25) }} +---{{ if .LegacyPodSecurityPolicy }} apiVersion: policy/v1beta1 kind: PodSecurityPolicy metadata: @@ -34,8 +33,7 @@ spec: rule: RunAsAny volumes: - '*' ---- -{{- end }} +---{{ end }} apiVersion: v1 kind: ServiceAccount metadata: diff --git a/pkg/minikube/assets/addons.go b/pkg/minikube/assets/addons.go index 44cdc03412..fabdcbf411 100755 --- a/pkg/minikube/assets/addons.go +++ b/pkg/minikube/assets/addons.go @@ -858,38 +858,45 @@ func GenerateTemplateData(addon *Addon, cc *config.ClusterConfig, netInfo Networ ea = "-" + runtime.GOARCH } + v, err := util.ParseKubernetesVersion(cfg.KubernetesVersion) + if err != nil { + return errors.Wrap(err, "parsing Kubernetes version") + } + opts := struct { - KubernetesVersion map[string]uint64 - PreOneTwentyKubernetes bool - Arch string - ExoticArch string - ImageRepository string - LoadBalancerStartIP string - LoadBalancerEndIP string - CustomIngressCert string - IngressAPIVersion string - ContainerRuntime string - RegistryAliases string - Images map[string]string - Registries map[string]string - CustomRegistries map[string]string - NetworkInfo map[string]string + KubernetesVersion map[string]uint64 + PreOneTwentyKubernetes bool + Arch string + ExoticArch string + ImageRepository string + LoadBalancerStartIP string + LoadBalancerEndIP string + CustomIngressCert string + IngressAPIVersion string + ContainerRuntime string + RegistryAliases string + Images map[string]string + Registries map[string]string + CustomRegistries map[string]string + NetworkInfo map[string]string + LegacyPodSecurityPolicy bool }{ - KubernetesVersion: make(map[string]uint64), - PreOneTwentyKubernetes: false, - Arch: a, - ExoticArch: ea, - ImageRepository: cfg.ImageRepository, - LoadBalancerStartIP: cfg.LoadBalancerStartIP, - LoadBalancerEndIP: cfg.LoadBalancerEndIP, - CustomIngressCert: cfg.CustomIngressCert, - RegistryAliases: cfg.RegistryAliases, - IngressAPIVersion: "v1", // api version for ingress (eg, "v1beta1"; defaults to "v1" for k8s 1.19+) - ContainerRuntime: cfg.ContainerRuntime, - Images: images, - Registries: addon.Registries, - CustomRegistries: customRegistries, - NetworkInfo: make(map[string]string), + KubernetesVersion: make(map[string]uint64), + PreOneTwentyKubernetes: false, + Arch: a, + ExoticArch: ea, + ImageRepository: cfg.ImageRepository, + LoadBalancerStartIP: cfg.LoadBalancerStartIP, + LoadBalancerEndIP: cfg.LoadBalancerEndIP, + CustomIngressCert: cfg.CustomIngressCert, + RegistryAliases: cfg.RegistryAliases, + IngressAPIVersion: "v1", // api version for ingress (eg, "v1beta1"; defaults to "v1" for k8s 1.19+) + ContainerRuntime: cfg.ContainerRuntime, + Images: images, + Registries: addon.Registries, + CustomRegistries: customRegistries, + NetworkInfo: make(map[string]string), + LegacyPodSecurityPolicy: v.LT(semver.Version{Major: 1, Minor: 25}), } if opts.ImageRepository != "" && !strings.HasSuffix(opts.ImageRepository, "/") { opts.ImageRepository += "/" @@ -900,10 +907,6 @@ func GenerateTemplateData(addon *Addon, cc *config.ClusterConfig, netInfo Networ // maintain backwards compatibility with k8s < v1.19 // by using v1beta1 instead of v1 api version for ingress - v, err := util.ParseKubernetesVersion(cfg.KubernetesVersion) - if err != nil { - return errors.Wrap(err, "parsing Kubernetes version") - } if semver.MustParseRange("<1.19.0")(v) { opts.IngressAPIVersion = "v1beta1" } @@ -911,17 +914,6 @@ func GenerateTemplateData(addon *Addon, cc *config.ClusterConfig, netInfo Networ opts.PreOneTwentyKubernetes = true } - // Store kubernetes version in opts - kv, err := util.ParseKubernetesVersion(cfg.KubernetesVersion) - if err != nil { - return errors.Wrap(err, "parsing Kubernetes version") - } - opts.KubernetesVersion = map[string]uint64{ - "Major": kv.Major, - "Minor": kv.Minor, - "Patch": kv.Patch, - } - // Network info for generating template opts.NetworkInfo["ControlPlaneNodeIP"] = netInfo.ControlPlaneNodeIP opts.NetworkInfo["ControlPlaneNodePort"] = fmt.Sprint(netInfo.ControlPlaneNodePort) From 210f4432d7a795094704f62cdc905204f1d70a49 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 29 Aug 2022 08:03:21 +0000 Subject: [PATCH 485/545] bump default/newest kubernetes versions --- .../bsutil/testdata/v1.25/containerd-api-port.yaml | 2 +- .../bsutil/testdata/v1.25/containerd-pod-network-cidr.yaml | 2 +- .../bootstrapper/bsutil/testdata/v1.25/containerd.yaml | 2 +- .../bsutil/testdata/v1.25/crio-options-gates.yaml | 2 +- pkg/minikube/bootstrapper/bsutil/testdata/v1.25/crio.yaml | 2 +- pkg/minikube/bootstrapper/bsutil/testdata/v1.25/default.yaml | 2 +- pkg/minikube/bootstrapper/bsutil/testdata/v1.25/dns.yaml | 2 +- .../bootstrapper/bsutil/testdata/v1.25/image-repository.yaml | 2 +- pkg/minikube/bootstrapper/bsutil/testdata/v1.25/options.yaml | 2 +- pkg/minikube/constants/constants.go | 4 ++-- site/content/en/docs/commands/start.md | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/containerd-api-port.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/containerd-api-port.yaml index 0fe8ef26e9..9ddf0b42f0 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/containerd-api-port.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/containerd-api-port.yaml @@ -38,7 +38,7 @@ etcd: dataDir: /var/lib/minikube/etcd extraArgs: proxy-refresh-interval: "70000" -kubernetesVersion: v1.25.0-rc.1 +kubernetesVersion: v1.25.0 networking: dnsDomain: cluster.local podSubnet: "10.244.0.0/16" diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/containerd-pod-network-cidr.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/containerd-pod-network-cidr.yaml index db5bd07849..a9031f86dc 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/containerd-pod-network-cidr.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/containerd-pod-network-cidr.yaml @@ -38,7 +38,7 @@ etcd: dataDir: /var/lib/minikube/etcd extraArgs: proxy-refresh-interval: "70000" -kubernetesVersion: v1.25.0-rc.1 +kubernetesVersion: v1.25.0 networking: dnsDomain: cluster.local podSubnet: "192.168.32.0/20" diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/containerd.yaml index 9a75ef979e..ef16c41c45 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/containerd.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/containerd.yaml @@ -38,7 +38,7 @@ etcd: dataDir: /var/lib/minikube/etcd extraArgs: proxy-refresh-interval: "70000" -kubernetesVersion: v1.25.0-rc.1 +kubernetesVersion: v1.25.0 networking: dnsDomain: cluster.local podSubnet: "10.244.0.0/16" diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/crio-options-gates.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/crio-options-gates.yaml index d971544ccb..4312265af1 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/crio-options-gates.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/crio-options-gates.yaml @@ -44,7 +44,7 @@ etcd: dataDir: /var/lib/minikube/etcd extraArgs: proxy-refresh-interval: "70000" -kubernetesVersion: v1.25.0-rc.1 +kubernetesVersion: v1.25.0 networking: dnsDomain: cluster.local podSubnet: "10.244.0.0/16" diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/crio.yaml index 0a0fc885e0..413e4b589f 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/crio.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/crio.yaml @@ -38,7 +38,7 @@ etcd: dataDir: /var/lib/minikube/etcd extraArgs: proxy-refresh-interval: "70000" -kubernetesVersion: v1.25.0-rc.1 +kubernetesVersion: v1.25.0 networking: dnsDomain: cluster.local podSubnet: "10.244.0.0/16" diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/default.yaml index 759c29a1ec..ccbbc1605a 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/default.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/default.yaml @@ -38,7 +38,7 @@ etcd: dataDir: /var/lib/minikube/etcd extraArgs: proxy-refresh-interval: "70000" -kubernetesVersion: v1.25.0-rc.1 +kubernetesVersion: v1.25.0 networking: dnsDomain: cluster.local podSubnet: "10.244.0.0/16" diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/dns.yaml index 2a3f6269f4..f0c320c522 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/dns.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/dns.yaml @@ -38,7 +38,7 @@ etcd: dataDir: /var/lib/minikube/etcd extraArgs: proxy-refresh-interval: "70000" -kubernetesVersion: v1.25.0-rc.1 +kubernetesVersion: v1.25.0 networking: dnsDomain: minikube.local podSubnet: "10.244.0.0/16" diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/image-repository.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/image-repository.yaml index b088cf346b..e901cd00b8 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/image-repository.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/image-repository.yaml @@ -39,7 +39,7 @@ etcd: dataDir: /var/lib/minikube/etcd extraArgs: proxy-refresh-interval: "70000" -kubernetesVersion: v1.25.0-rc.1 +kubernetesVersion: v1.25.0 networking: dnsDomain: cluster.local podSubnet: "10.244.0.0/16" diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/options.yaml index c816ae1b9e..94bc88f7bf 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/options.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/options.yaml @@ -41,7 +41,7 @@ etcd: dataDir: /var/lib/minikube/etcd extraArgs: proxy-refresh-interval: "70000" -kubernetesVersion: v1.25.0-rc.1 +kubernetesVersion: v1.25.0 networking: dnsDomain: cluster.local podSubnet: "10.244.0.0/16" diff --git a/pkg/minikube/constants/constants.go b/pkg/minikube/constants/constants.go index 4b948b3709..abe2060814 100644 --- a/pkg/minikube/constants/constants.go +++ b/pkg/minikube/constants/constants.go @@ -32,10 +32,10 @@ var ( const ( // DefaultKubernetesVersion is the default Kubernetes version - DefaultKubernetesVersion = "v1.24.4" + DefaultKubernetesVersion = "v1.25.0" // NewestKubernetesVersion is the newest Kubernetes version to test against // NOTE: You may need to update coreDNS & etcd versions in pkg/minikube/bootstrapper/images/images.go - NewestKubernetesVersion = "v1.25.0-rc.1" + NewestKubernetesVersion = "v1.25.0" // OldestKubernetesVersion is the oldest Kubernetes version to test against OldestKubernetesVersion = "v1.16.0" // NoKubernetesVersion is the version used when users does NOT want to install kubernetes diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index ca035d1523..a92d5b7a8e 100644 --- a/site/content/en/docs/commands/start.md +++ b/site/content/en/docs/commands/start.md @@ -71,7 +71,7 @@ minikube start [flags] --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/14935/minikube-v1.26.1-1662760260-14935-amd64.iso,https://github.com/kubernetes/minikube/releases/download/v1.26.1-1662760260-14935/minikube-v1.26.1-1662760260-14935-amd64.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.26.1-1662760260-14935-amd64.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.24.4, 'latest' for v1.25.0-rc.1). Defaults to 'stable'. + --kubernetes-version string The Kubernetes version that the minikube VM will use (ex: v1.2.3, 'stable' for v1.25.0, 'latest' for v1.25.0). Defaults to 'stable'. --kvm-gpu Enable experimental NVIDIA GPU support in minikube --kvm-hidden Hide the hypervisor signature from the guest in minikube (kvm2 driver only) --kvm-network string The KVM default network name. (kvm2 driver only) (default "default") From 712247e4c29869d0b212db2ce04db55e7d61b368 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Mon, 29 Aug 2022 16:35:07 -0700 Subject: [PATCH 486/545] resolve PodDisruptionBudget & PodSecurityPolicy deprecations --- pkg/minikube/cni/calico.go | 26 +++++++++++++++-------- pkg/minikube/cni/calico.yaml | 2 +- pkg/minikube/cni/flannel.go | 40 +++++++++++++++++++++++++++++++----- 3 files changed, 54 insertions(+), 14 deletions(-) diff --git a/pkg/minikube/cni/calico.go b/pkg/minikube/cni/calico.go index cd8827311b..617f53b6a3 100644 --- a/pkg/minikube/cni/calico.go +++ b/pkg/minikube/cni/calico.go @@ -18,10 +18,13 @@ package cni import ( "bytes" + "fmt" + // goembed needs this _ "embed" "text/template" + "github.com/blang/semver" "github.com/pkg/errors" "k8s.io/minikube/pkg/minikube/assets" "k8s.io/minikube/pkg/minikube/bootstrapper/images" @@ -42,10 +45,11 @@ type Calico struct { } type calicoTmplStruct struct { - DeploymentImageName string - DaemonSetImageName string - FelixDriverImageName string - BinaryImageName string + DeploymentImageName string + DaemonSetImageName string + FelixDriverImageName string + BinaryImageName string + LegacyPodDisruptionBudget bool } // String returns a string representation of this CNI @@ -55,11 +59,17 @@ func (c Calico) String() string { // manifest returns a Kubernetes manifest for a CNI func (c Calico) manifest() (assets.CopyableFile, error) { + k8sVersion, err := semver.Parse(c.cc.KubernetesConfig.KubernetesVersion) + if err != nil { + return nil, fmt.Errorf("failed to parse Kubernetes version: %v", err) + } + input := &calicoTmplStruct{ - DeploymentImageName: images.CalicoDeployment(c.cc.KubernetesConfig.ImageRepository), - DaemonSetImageName: images.CalicoDaemonSet(c.cc.KubernetesConfig.ImageRepository), - FelixDriverImageName: images.CalicoFelixDriver(c.cc.KubernetesConfig.ImageRepository), - BinaryImageName: images.CalicoBin(c.cc.KubernetesConfig.ImageRepository), + DeploymentImageName: images.CalicoDeployment(c.cc.KubernetesConfig.ImageRepository), + DaemonSetImageName: images.CalicoDaemonSet(c.cc.KubernetesConfig.ImageRepository), + FelixDriverImageName: images.CalicoFelixDriver(c.cc.KubernetesConfig.ImageRepository), + BinaryImageName: images.CalicoBin(c.cc.KubernetesConfig.ImageRepository), + LegacyPodDisruptionBudget: k8sVersion.LT(semver.Version{Major: 1, Minor: 21}), } b := bytes.Buffer{} diff --git a/pkg/minikube/cni/calico.yaml b/pkg/minikube/cni/calico.yaml index 20fc47beab..4ce41c0e64 100644 --- a/pkg/minikube/cni/calico.yaml +++ b/pkg/minikube/cni/calico.yaml @@ -4066,7 +4066,7 @@ metadata: # This manifest creates a Pod Disruption Budget for Controller to allow K8s Cluster Autoscaler to evict -apiVersion: policy/v1beta1 +apiVersion: policy/v1{{ if .LegacyPodDisruptionBudget }}beta1{{end}} kind: PodDisruptionBudget metadata: name: calico-kube-controllers diff --git a/pkg/minikube/cni/flannel.go b/pkg/minikube/cni/flannel.go index eefb86a9bf..33bcf5379b 100644 --- a/pkg/minikube/cni/flannel.go +++ b/pkg/minikube/cni/flannel.go @@ -17,9 +17,13 @@ limitations under the License. package cni import ( + "bytes" + "fmt" "os/exec" "path/filepath" + "text/template" + "github.com/blang/semver" "github.com/pkg/errors" "k8s.io/klog/v2" "k8s.io/minikube/pkg/minikube/config" @@ -27,7 +31,7 @@ import ( ) // From https://raw.githubusercontent.com/coreos/flannel/master/Documentation/kube-flannel.yml -var flannelTmpl = `--- +var flannelYaml = `---{{ if .LegacyPodSecurityPolicy }} apiVersion: policy/v1beta1 kind: PodSecurityPolicy metadata: @@ -73,17 +77,23 @@ spec: # SELinux seLinux: # SELinux is unused in CaaSP - rule: 'RunAsAny' + rule: 'RunAsAny'{{ else }} +kind: Namespace +apiVersion: v1 +metadata: + name: kube-system + labels: + pod-security.kubernetes.io/enforce: privileged{{ end }} --- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: name: flannel -rules: +rules:{{ if .LegacyPodSecurityPolicy }} - apiGroups: ['extensions'] resources: ['podsecuritypolicies'] verbs: ['use'] - resourceNames: ['psp.flannel.unprivileged'] + resourceNames: ['psp.flannel.unprivileged']{{ end }} - apiGroups: - "" resources: @@ -631,6 +641,12 @@ spec: name: kube-flannel-cfg ` +var flannelTmpl = template.Must(template.New("flannel").Parse(flannelYaml)) + +type flannelTmplStruct struct { + LegacyPodSecurityPolicy bool +} + // Flannel is the Flannel CNI manager type Flannel struct { cc config.ClusterConfig @@ -664,7 +680,21 @@ func (c Flannel) Apply(r Runner) error { } } - return applyManifest(c.cc, r, manifestAsset([]byte(flannelTmpl))) + k8sVersion, err := semver.Parse(c.cc.KubernetesConfig.KubernetesVersion) + if err != nil { + return fmt.Errorf("failed to parse Kubernetes version: %v", err) + } + + input := &flannelTmplStruct{ + LegacyPodSecurityPolicy: k8sVersion.LT(semver.Version{Major: 1, Minor: 22}), + } + + b := bytes.Buffer{} + if err := flannelTmpl.Execute(&b, input); err != nil { + return err + } + + return applyManifest(c.cc, r, manifestAsset(b.Bytes())) } // CIDR returns the default CIDR used by this CNI From 89d3ddd6df839f27a63c9f82b0e18858151a72a0 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Mon, 29 Aug 2022 16:43:42 -0700 Subject: [PATCH 487/545] remove deprecated PodSecurityPolicy from test yaml --- test/integration/testdata/kube-flannel.yaml | 54 ++------------------- 1 file changed, 5 insertions(+), 49 deletions(-) diff --git a/test/integration/testdata/kube-flannel.yaml b/test/integration/testdata/kube-flannel.yaml index e5b98de1ff..833fd58183 100644 --- a/test/integration/testdata/kube-flannel.yaml +++ b/test/integration/testdata/kube-flannel.yaml @@ -1,60 +1,16 @@ --- -apiVersion: policy/v1beta1 -kind: PodSecurityPolicy +kind: Namespace +apiVersion: v1 metadata: - name: psp.flannel.unprivileged - annotations: - seccomp.security.alpha.kubernetes.io/allowedProfileNames: docker/default - seccomp.security.alpha.kubernetes.io/defaultProfileName: docker/default - apparmor.security.beta.kubernetes.io/allowedProfileNames: runtime/default - apparmor.security.beta.kubernetes.io/defaultProfileName: runtime/default -spec: - privileged: false - volumes: - - configMap - - secret - - emptyDir - - hostPath - allowedHostPaths: - - pathPrefix: "/etc/cni/net.d" - - pathPrefix: "/etc/kube-flannel" - - pathPrefix: "/run/flannel" - readOnlyRootFilesystem: false - # Users and groups - runAsUser: - rule: RunAsAny - supplementalGroups: - rule: RunAsAny - fsGroup: - rule: RunAsAny - # Privilege Escalation - allowPrivilegeEscalation: false - defaultAllowPrivilegeEscalation: false - # Capabilities - allowedCapabilities: ['NET_ADMIN', 'NET_RAW'] - defaultAddCapabilities: [] - requiredDropCapabilities: [] - # Host namespaces - hostPID: false - hostIPC: false - hostNetwork: true - hostPorts: - - min: 0 - max: 65535 - # SELinux - seLinux: - # SELinux is unused in CaaSP - rule: 'RunAsAny' + name: kube-system + labels: + pod-security.kubernetes.io/enforce: privileged --- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: name: flannel rules: -- apiGroups: ['extensions'] - resources: ['podsecuritypolicies'] - verbs: ['use'] - resourceNames: ['psp.flannel.unprivileged'] - apiGroups: - "" resources: From 9941ab1f21acf94155b4259690f5dd8fce2f82fa Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Mon, 29 Aug 2022 16:46:19 -0700 Subject: [PATCH 488/545] use ParseTolerant --- pkg/minikube/cni/calico.go | 2 +- pkg/minikube/cni/flannel.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/minikube/cni/calico.go b/pkg/minikube/cni/calico.go index 617f53b6a3..ebc8ccb658 100644 --- a/pkg/minikube/cni/calico.go +++ b/pkg/minikube/cni/calico.go @@ -59,7 +59,7 @@ func (c Calico) String() string { // manifest returns a Kubernetes manifest for a CNI func (c Calico) manifest() (assets.CopyableFile, error) { - k8sVersion, err := semver.Parse(c.cc.KubernetesConfig.KubernetesVersion) + k8sVersion, err := semver.ParseTolerant(c.cc.KubernetesConfig.KubernetesVersion) if err != nil { return nil, fmt.Errorf("failed to parse Kubernetes version: %v", err) } diff --git a/pkg/minikube/cni/flannel.go b/pkg/minikube/cni/flannel.go index 33bcf5379b..dc842efed1 100644 --- a/pkg/minikube/cni/flannel.go +++ b/pkg/minikube/cni/flannel.go @@ -680,7 +680,7 @@ func (c Flannel) Apply(r Runner) error { } } - k8sVersion, err := semver.Parse(c.cc.KubernetesConfig.KubernetesVersion) + k8sVersion, err := semver.ParseTolerant(c.cc.KubernetesConfig.KubernetesVersion) if err != nil { return fmt.Errorf("failed to parse Kubernetes version: %v", err) } From eda5a9a2c4c99ce4ed681c434d57e530da4d43a8 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Wed, 31 Aug 2022 15:01:18 -0700 Subject: [PATCH 489/545] change expected image --- test/integration/functional_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integration/functional_test.go b/test/integration/functional_test.go index cbe2d7614c..826b606a55 100644 --- a/test/integration/functional_test.go +++ b/test/integration/functional_test.go @@ -276,7 +276,7 @@ func runImageList(ctx context.Context, t *testing.T, profile, testName, format, func expectedImageFormat(format string) []string { return []string{ fmt.Sprintf(format, "k8s.gcr.io/pause"), - fmt.Sprintf(format, "k8s.gcr.io/kube-apiserver"), + fmt.Sprintf(format, "registry.k8s.io/kube-apiserver"), } } From 70952916c8eae3dc9c1b6569e7a0b9d2d9ba3b3c Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Fri, 9 Sep 2022 18:41:44 +0000 Subject: [PATCH 490/545] fix resolv.conf issue --- .../bootstrapper/bsutil/ktmpl/v1beta3.go | 3 +- pkg/minikube/bootstrapper/bsutil/kubeadm.go | 78 +++++++++++-------- pkg/minikube/bootstrapper/kubeadm/kubeadm.go | 18 +++++ pkg/minikube/cni/calico.go | 5 +- pkg/minikube/cni/flannel.go | 5 +- pkg/minikube/reason/k8s.go | 6 ++ 6 files changed, 77 insertions(+), 38 deletions(-) diff --git a/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta3.go b/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta3.go index 4030609417..f6df7e499b 100644 --- a/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta3.go +++ b/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta3.go @@ -86,7 +86,8 @@ evictionHard: nodefs.inodesFree: "0%" imagefs.available: "0%" failSwapOn: false -staticPodPath: {{.StaticPodPath}} +staticPodPath: {{.StaticPodPath}}{{if .ResolvConfSearchRegression}} +resolvConf: /etc/kubelet-resolv.conf{{end}} --- apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration diff --git a/pkg/minikube/bootstrapper/bsutil/kubeadm.go b/pkg/minikube/bootstrapper/bsutil/kubeadm.go index 8ba0735dd5..cbe857d082 100644 --- a/pkg/minikube/bootstrapper/bsutil/kubeadm.go +++ b/pkg/minikube/bootstrapper/bsutil/kubeadm.go @@ -87,27 +87,28 @@ func GenerateKubeadmYAML(cc config.ClusterConfig, n config.Node, r cruntime.Mana klog.Infof("Using pod CIDR: %s", podCIDR) opts := struct { - CertDir string - ServiceCIDR string - PodSubnet string - AdvertiseAddress string - APIServerPort int - KubernetesVersion string - EtcdDataDir string - EtcdExtraArgs map[string]string - ClusterName string - NodeName string - DNSDomain string - CRISocket string - ImageRepository string - ComponentOptions []componentOptions - FeatureArgs map[string]bool - NodeIP string - CgroupDriver string - ClientCAFile string - StaticPodPath string - ControlPlaneAddress string - KubeProxyOptions map[string]string + CertDir string + ServiceCIDR string + PodSubnet string + AdvertiseAddress string + APIServerPort int + KubernetesVersion string + EtcdDataDir string + EtcdExtraArgs map[string]string + ClusterName string + NodeName string + DNSDomain string + CRISocket string + ImageRepository string + ComponentOptions []componentOptions + FeatureArgs map[string]bool + NodeIP string + CgroupDriver string + ClientCAFile string + StaticPodPath string + ControlPlaneAddress string + KubeProxyOptions map[string]string + ResolvConfSearchRegression bool }{ CertDir: vmpath.GuestKubernetesCertsDir, ServiceCIDR: constants.DefaultServiceCIDR, @@ -119,18 +120,19 @@ func GenerateKubeadmYAML(cc config.ClusterConfig, n config.Node, r cruntime.Mana EtcdExtraArgs: etcdExtraArgs(k8s.ExtraOptions), ClusterName: cc.Name, // kubeadm uses NodeName as the --hostname-override parameter, so this needs to be the name of the machine - NodeName: KubeNodeName(cc, n), - CRISocket: r.SocketPath(), - ImageRepository: k8s.ImageRepository, - ComponentOptions: componentOpts, - FeatureArgs: kubeadmFeatureArgs, - DNSDomain: k8s.DNSDomain, - NodeIP: n.IP, - CgroupDriver: cgroupDriver, - ClientCAFile: path.Join(vmpath.GuestKubernetesCertsDir, "ca.crt"), - StaticPodPath: vmpath.GuestManifestsDir, - ControlPlaneAddress: constants.ControlPlaneAlias, - KubeProxyOptions: createKubeProxyOptions(k8s.ExtraOptions), + NodeName: KubeNodeName(cc, n), + CRISocket: r.SocketPath(), + ImageRepository: k8s.ImageRepository, + ComponentOptions: componentOpts, + FeatureArgs: kubeadmFeatureArgs, + DNSDomain: k8s.DNSDomain, + NodeIP: n.IP, + CgroupDriver: cgroupDriver, + ClientCAFile: path.Join(vmpath.GuestKubernetesCertsDir, "ca.crt"), + StaticPodPath: vmpath.GuestManifestsDir, + ControlPlaneAddress: constants.ControlPlaneAlias, + KubeProxyOptions: createKubeProxyOptions(k8s.ExtraOptions), + ResolvConfSearchRegression: HasResolvConfSearchRegression(k8s.KubernetesVersion), } if k8s.ServiceCIDR != "" { @@ -203,3 +205,13 @@ func etcdExtraArgs(extraOpts config.ExtraOptionSlice) map[string]string { } return args } + +// HasResolvConfSearchRegression returns if the k8s version includes https://github.com/kubernetes/kubernetes/pull/109441 +func HasResolvConfSearchRegression(k8sVersion string) bool { + versionSemver, err := util.ParseKubernetesVersion(k8sVersion) + if err != nil { + klog.Warningf("was unable to parse Kubernetes version %q: %v", k8sVersion, err) + return false + } + return versionSemver.EQ(semver.Version{Major: 1, Minor: 25}) +} diff --git a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go index 742e4959e9..1635c08e20 100644 --- a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go +++ b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go @@ -988,6 +988,10 @@ func (k *Bootstrapper) UpdateNode(cfg config.ClusterConfig, n config.Node, r cru return errors.Wrap(err, "copy") } + if err := k.copyResolvConf(cfg); err != nil { + return errors.Wrap(err, "resolv.conf") + } + cp, err := config.PrimaryControlPlane(&cfg) if err != nil { return errors.Wrap(err, "control plane") @@ -1000,6 +1004,20 @@ func (k *Bootstrapper) UpdateNode(cfg config.ClusterConfig, n config.Node, r cru return nil } +func (k *Bootstrapper) copyResolvConf(cfg config.ClusterConfig) error { + if !bsutil.HasResolvConfSearchRegression(cfg.KubernetesConfig.KubernetesVersion) { + return nil + } + if _, err := k.c.RunCmd(exec.Command("sudo", "cp", "/etc/resolv.conf", "/etc/kubelet-resolv.conf")); err != nil { + return errors.Wrap(err, "copy") + } + if _, err := k.c.RunCmd(exec.Command("sudo", "sed", "-i", "-e", "s/^search .$//", "/etc/kubelet-resolv.conf")); err != nil { + return errors.Wrap(err, "sed") + } + + return nil +} + // kubectlPath returns the path to the kubelet func kubectlPath(cfg config.ClusterConfig) string { return path.Join(vmpath.GuestPersistentDir, "binaries", cfg.KubernetesConfig.KubernetesVersion, "kubectl") diff --git a/pkg/minikube/cni/calico.go b/pkg/minikube/cni/calico.go index ebc8ccb658..60133254ab 100644 --- a/pkg/minikube/cni/calico.go +++ b/pkg/minikube/cni/calico.go @@ -24,11 +24,12 @@ import ( _ "embed" "text/template" - "github.com/blang/semver" + "github.com/blang/semver/v4" "github.com/pkg/errors" "k8s.io/minikube/pkg/minikube/assets" "k8s.io/minikube/pkg/minikube/bootstrapper/images" "k8s.io/minikube/pkg/minikube/config" + "k8s.io/minikube/pkg/util" ) // https://docs.projectcalico.org/manifests/calico.yaml @@ -59,7 +60,7 @@ func (c Calico) String() string { // manifest returns a Kubernetes manifest for a CNI func (c Calico) manifest() (assets.CopyableFile, error) { - k8sVersion, err := semver.ParseTolerant(c.cc.KubernetesConfig.KubernetesVersion) + k8sVersion, err := util.ParseKubernetesVersion(c.cc.KubernetesConfig.KubernetesVersion) if err != nil { return nil, fmt.Errorf("failed to parse Kubernetes version: %v", err) } diff --git a/pkg/minikube/cni/flannel.go b/pkg/minikube/cni/flannel.go index dc842efed1..191ebfedf8 100644 --- a/pkg/minikube/cni/flannel.go +++ b/pkg/minikube/cni/flannel.go @@ -23,11 +23,12 @@ import ( "path/filepath" "text/template" - "github.com/blang/semver" + "github.com/blang/semver/v4" "github.com/pkg/errors" "k8s.io/klog/v2" "k8s.io/minikube/pkg/minikube/config" "k8s.io/minikube/pkg/minikube/driver" + "k8s.io/minikube/pkg/util" ) // From https://raw.githubusercontent.com/coreos/flannel/master/Documentation/kube-flannel.yml @@ -680,7 +681,7 @@ func (c Flannel) Apply(r Runner) error { } } - k8sVersion, err := semver.ParseTolerant(c.cc.KubernetesConfig.KubernetesVersion) + k8sVersion, err := util.ParseKubernetesVersion(c.cc.KubernetesConfig.KubernetesVersion) if err != nil { return fmt.Errorf("failed to parse Kubernetes version: %v", err) } diff --git a/pkg/minikube/reason/k8s.go b/pkg/minikube/reason/k8s.go index 840403656f..20c09a76f1 100644 --- a/pkg/minikube/reason/k8s.go +++ b/pkg/minikube/reason/k8s.go @@ -47,6 +47,12 @@ var k8sIssues = []K8sIssue{ Description: "Kubernetes {{.version}} has a known performance issue on cluster startup. It might take 2 to 3 minutes for a cluster to start.", URL: "https://github.com/kubernetes/kubeadm/issues/2395", }, + { + // https://github.com/kubernetes/kubernetes/pull/109441 will be fixed in v1.25.1 + VersionsAffected: []string{"1.25.0"}, + Description: "Kubernetes {{.version}} has a known issue with resolv.conf. minikube is using a workaround that should work for most use cases.", + URL: "https://github.com/kubernetes/kubernetes/issues/112135", + }, } // ProblematicK8sVersion checks for the supplied Kubernetes version and checks if there's a known issue with it. From 76e7e29fc87ba72493cb87eac9de149189eec68c Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Fri, 9 Sep 2022 12:30:04 -0700 Subject: [PATCH 491/545] fix expected kubelet config --- .../templates/v1beta3/containerd-api-port.yaml | 1 + .../templates/v1beta3/containerd-pod-network-cidr.yaml | 1 + hack/update/kubernetes_version/templates/v1beta3/containerd.yaml | 1 + .../kubernetes_version/templates/v1beta3/crio-options-gates.yaml | 1 + hack/update/kubernetes_version/templates/v1beta3/crio.yaml | 1 + hack/update/kubernetes_version/templates/v1beta3/default.yaml | 1 + hack/update/kubernetes_version/templates/v1beta3/dns.yaml | 1 + .../kubernetes_version/templates/v1beta3/image-repository.yaml | 1 + hack/update/kubernetes_version/templates/v1beta3/options.yaml | 1 + .../bootstrapper/bsutil/testdata/v1.25/containerd-api-port.yaml | 1 + .../bsutil/testdata/v1.25/containerd-pod-network-cidr.yaml | 1 + pkg/minikube/bootstrapper/bsutil/testdata/v1.25/containerd.yaml | 1 + .../bootstrapper/bsutil/testdata/v1.25/crio-options-gates.yaml | 1 + pkg/minikube/bootstrapper/bsutil/testdata/v1.25/crio.yaml | 1 + pkg/minikube/bootstrapper/bsutil/testdata/v1.25/default.yaml | 1 + pkg/minikube/bootstrapper/bsutil/testdata/v1.25/dns.yaml | 1 + .../bootstrapper/bsutil/testdata/v1.25/image-repository.yaml | 1 + pkg/minikube/bootstrapper/bsutil/testdata/v1.25/options.yaml | 1 + 18 files changed, 18 insertions(+) diff --git a/hack/update/kubernetes_version/templates/v1beta3/containerd-api-port.yaml b/hack/update/kubernetes_version/templates/v1beta3/containerd-api-port.yaml index 8ba73ba262..4ff3880c6f 100644 --- a/hack/update/kubernetes_version/templates/v1beta3/containerd-api-port.yaml +++ b/hack/update/kubernetes_version/templates/v1beta3/containerd-api-port.yaml @@ -59,6 +59,7 @@ evictionHard: imagefs.available: "0%" failSwapOn: false staticPodPath: /etc/kubernetes/manifests +resolvConf: /etc/kubelet-resolv.conf --- apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration diff --git a/hack/update/kubernetes_version/templates/v1beta3/containerd-pod-network-cidr.yaml b/hack/update/kubernetes_version/templates/v1beta3/containerd-pod-network-cidr.yaml index 329588b9a1..5bb354e0ac 100644 --- a/hack/update/kubernetes_version/templates/v1beta3/containerd-pod-network-cidr.yaml +++ b/hack/update/kubernetes_version/templates/v1beta3/containerd-pod-network-cidr.yaml @@ -59,6 +59,7 @@ evictionHard: imagefs.available: "0%" failSwapOn: false staticPodPath: /etc/kubernetes/manifests +resolvConf: /etc/kubelet-resolv.conf --- apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration diff --git a/hack/update/kubernetes_version/templates/v1beta3/containerd.yaml b/hack/update/kubernetes_version/templates/v1beta3/containerd.yaml index b9598d7fe8..a41e1dede3 100644 --- a/hack/update/kubernetes_version/templates/v1beta3/containerd.yaml +++ b/hack/update/kubernetes_version/templates/v1beta3/containerd.yaml @@ -59,6 +59,7 @@ evictionHard: imagefs.available: "0%" failSwapOn: false staticPodPath: /etc/kubernetes/manifests +resolvConf: /etc/kubelet-resolv.conf --- apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration diff --git a/hack/update/kubernetes_version/templates/v1beta3/crio-options-gates.yaml b/hack/update/kubernetes_version/templates/v1beta3/crio-options-gates.yaml index 6b220ff965..3404871156 100644 --- a/hack/update/kubernetes_version/templates/v1beta3/crio-options-gates.yaml +++ b/hack/update/kubernetes_version/templates/v1beta3/crio-options-gates.yaml @@ -65,6 +65,7 @@ evictionHard: imagefs.available: "0%" failSwapOn: false staticPodPath: /etc/kubernetes/manifests +resolvConf: /etc/kubelet-resolv.conf --- apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration diff --git a/hack/update/kubernetes_version/templates/v1beta3/crio.yaml b/hack/update/kubernetes_version/templates/v1beta3/crio.yaml index f986859773..f7acdef6d3 100644 --- a/hack/update/kubernetes_version/templates/v1beta3/crio.yaml +++ b/hack/update/kubernetes_version/templates/v1beta3/crio.yaml @@ -59,6 +59,7 @@ evictionHard: imagefs.available: "0%" failSwapOn: false staticPodPath: /etc/kubernetes/manifests +resolvConf: /etc/kubelet-resolv.conf --- apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration diff --git a/hack/update/kubernetes_version/templates/v1beta3/default.yaml b/hack/update/kubernetes_version/templates/v1beta3/default.yaml index 05a6d75980..6787ce679e 100644 --- a/hack/update/kubernetes_version/templates/v1beta3/default.yaml +++ b/hack/update/kubernetes_version/templates/v1beta3/default.yaml @@ -59,6 +59,7 @@ evictionHard: imagefs.available: "0%" failSwapOn: false staticPodPath: /etc/kubernetes/manifests +resolvConf: /etc/kubelet-resolv.conf --- apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration diff --git a/hack/update/kubernetes_version/templates/v1beta3/dns.yaml b/hack/update/kubernetes_version/templates/v1beta3/dns.yaml index 4343f08828..324b0acffa 100644 --- a/hack/update/kubernetes_version/templates/v1beta3/dns.yaml +++ b/hack/update/kubernetes_version/templates/v1beta3/dns.yaml @@ -59,6 +59,7 @@ evictionHard: imagefs.available: "0%" failSwapOn: false staticPodPath: /etc/kubernetes/manifests +resolvConf: /etc/kubelet-resolv.conf --- apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration diff --git a/hack/update/kubernetes_version/templates/v1beta3/image-repository.yaml b/hack/update/kubernetes_version/templates/v1beta3/image-repository.yaml index 25b3e44885..d1d75e93e4 100644 --- a/hack/update/kubernetes_version/templates/v1beta3/image-repository.yaml +++ b/hack/update/kubernetes_version/templates/v1beta3/image-repository.yaml @@ -60,6 +60,7 @@ evictionHard: imagefs.available: "0%" failSwapOn: false staticPodPath: /etc/kubernetes/manifests +resolvConf: /etc/kubelet-resolv.conf --- apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration diff --git a/hack/update/kubernetes_version/templates/v1beta3/options.yaml b/hack/update/kubernetes_version/templates/v1beta3/options.yaml index b44de0a03c..219a12c45b 100644 --- a/hack/update/kubernetes_version/templates/v1beta3/options.yaml +++ b/hack/update/kubernetes_version/templates/v1beta3/options.yaml @@ -62,6 +62,7 @@ evictionHard: imagefs.available: "0%" failSwapOn: false staticPodPath: /etc/kubernetes/manifests +resolvConf: /etc/kubelet-resolv.conf --- apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/containerd-api-port.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/containerd-api-port.yaml index 9ddf0b42f0..9dd0cf7182 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/containerd-api-port.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/containerd-api-port.yaml @@ -59,6 +59,7 @@ evictionHard: imagefs.available: "0%" failSwapOn: false staticPodPath: /etc/kubernetes/manifests +resolvConf: /etc/kubelet-resolv.conf --- apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/containerd-pod-network-cidr.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/containerd-pod-network-cidr.yaml index a9031f86dc..0852428188 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/containerd-pod-network-cidr.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/containerd-pod-network-cidr.yaml @@ -59,6 +59,7 @@ evictionHard: imagefs.available: "0%" failSwapOn: false staticPodPath: /etc/kubernetes/manifests +resolvConf: /etc/kubelet-resolv.conf --- apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/containerd.yaml index ef16c41c45..7b29b31b96 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/containerd.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/containerd.yaml @@ -59,6 +59,7 @@ evictionHard: imagefs.available: "0%" failSwapOn: false staticPodPath: /etc/kubernetes/manifests +resolvConf: /etc/kubelet-resolv.conf --- apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/crio-options-gates.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/crio-options-gates.yaml index 4312265af1..f30daf411f 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/crio-options-gates.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/crio-options-gates.yaml @@ -65,6 +65,7 @@ evictionHard: imagefs.available: "0%" failSwapOn: false staticPodPath: /etc/kubernetes/manifests +resolvConf: /etc/kubelet-resolv.conf --- apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/crio.yaml index 413e4b589f..f1446b644a 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/crio.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/crio.yaml @@ -59,6 +59,7 @@ evictionHard: imagefs.available: "0%" failSwapOn: false staticPodPath: /etc/kubernetes/manifests +resolvConf: /etc/kubelet-resolv.conf --- apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/default.yaml index ccbbc1605a..c03e0657c0 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/default.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/default.yaml @@ -59,6 +59,7 @@ evictionHard: imagefs.available: "0%" failSwapOn: false staticPodPath: /etc/kubernetes/manifests +resolvConf: /etc/kubelet-resolv.conf --- apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/dns.yaml index f0c320c522..d8c7e3ac99 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/dns.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/dns.yaml @@ -59,6 +59,7 @@ evictionHard: imagefs.available: "0%" failSwapOn: false staticPodPath: /etc/kubernetes/manifests +resolvConf: /etc/kubelet-resolv.conf --- apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/image-repository.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/image-repository.yaml index e901cd00b8..327ecc65d7 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/image-repository.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/image-repository.yaml @@ -60,6 +60,7 @@ evictionHard: imagefs.available: "0%" failSwapOn: false staticPodPath: /etc/kubernetes/manifests +resolvConf: /etc/kubelet-resolv.conf --- apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/options.yaml index 94bc88f7bf..e215c9f955 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/options.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/options.yaml @@ -62,6 +62,7 @@ evictionHard: imagefs.available: "0%" failSwapOn: false staticPodPath: /etc/kubernetes/manifests +resolvConf: /etc/kubelet-resolv.conf --- apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration From 9df393a9f517472ad96acf449dcb6362a1ba7e32 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Fri, 9 Sep 2022 15:48:06 -0700 Subject: [PATCH 492/545] fix TestErrorSpam failing on warning --- test/integration/error_spam_test.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/integration/error_spam_test.go b/test/integration/error_spam_test.go index d6ca29f60d..5c35e83a2f 100644 --- a/test/integration/error_spam_test.go +++ b/test/integration/error_spam_test.go @@ -49,6 +49,8 @@ var stderrAllow = []string{ `Your cgroup does not allow setting memory.`, // progress bar output ` > .*`, + // Warning of issues with specific Kubernetes versions + `Kubernetes .* has a known `, } // stderrAllowRe combines rootCauses into a single regex From 79d681dc19a8a9ef7c896f2d3772b774c2ab8e78 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Fri, 9 Sep 2022 15:55:56 -0700 Subject: [PATCH 493/545] add comment for copyResolvConf func --- pkg/minikube/bootstrapper/kubeadm/kubeadm.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go index 1635c08e20..61f02224f8 100644 --- a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go +++ b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go @@ -1004,6 +1004,9 @@ func (k *Bootstrapper) UpdateNode(cfg config.ClusterConfig, n config.Node, r cru return nil } +// copyResolvConf is a workaround for a regression introduced with https://github.com/kubernetes/kubernetes/pull/109441 +// The regression is resolved by making a copy of /etc/resolv.conf, removing the line "search ." from the copy, and setting kubelet to use the copy +// Only Kubernetes v1.25.0 is affected by this regression func (k *Bootstrapper) copyResolvConf(cfg config.ClusterConfig) error { if !bsutil.HasResolvConfSearchRegression(cfg.KubernetesConfig.KubernetesVersion) { return nil From bde2b52371caafada28f6457cec159b7fef469d2 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Mon, 12 Sep 2022 09:58:25 -0700 Subject: [PATCH 494/545] add another line to TestErrorSpam --- test/integration/error_spam_test.go | 1 + 1 file changed, 1 insertion(+) diff --git a/test/integration/error_spam_test.go b/test/integration/error_spam_test.go index 5c35e83a2f..8934e7dbd2 100644 --- a/test/integration/error_spam_test.go +++ b/test/integration/error_spam_test.go @@ -51,6 +51,7 @@ var stderrAllow = []string{ ` > .*`, // Warning of issues with specific Kubernetes versions `Kubernetes .* has a known `, + `For more information, see`, } // stderrAllowRe combines rootCauses into a single regex From 3ff1325f8a64daab5f4086d7831a33af549e4c0d Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Wed, 14 Sep 2022 11:26:53 -0700 Subject: [PATCH 495/545] resolve RuntimeClass deprecations --- deploy/addons/gvisor/gvisor-runtimeclass.yaml.tmpl | 2 +- pkg/minikube/assets/addons.go | 2 ++ pkg/minikube/cni/calico.go | 2 +- pkg/minikube/cni/calico.yaml | 2 +- pkg/minikube/cni/flannel.go | 12 ++++++------ 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/deploy/addons/gvisor/gvisor-runtimeclass.yaml.tmpl b/deploy/addons/gvisor/gvisor-runtimeclass.yaml.tmpl index f37fa4a9ba..10b92357a4 100644 --- a/deploy/addons/gvisor/gvisor-runtimeclass.yaml.tmpl +++ b/deploy/addons/gvisor/gvisor-runtimeclass.yaml.tmpl @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -apiVersion: node.k8s.io/v1beta1 +apiVersion: node.k8s.io/v1{{.LegacyRuntimeClass}}beta1{{end}} kind: RuntimeClass metadata: name: gvisor diff --git a/pkg/minikube/assets/addons.go b/pkg/minikube/assets/addons.go index 36c7747bc2..13f9af1dea 100755 --- a/pkg/minikube/assets/addons.go +++ b/pkg/minikube/assets/addons.go @@ -878,6 +878,7 @@ func GenerateTemplateData(addon *Addon, cc *config.ClusterConfig, netInfo Networ CustomRegistries map[string]string NetworkInfo map[string]string LegacyPodSecurityPolicy bool + LegacyRuntimeClass bool }{ KubernetesVersion: make(map[string]uint64), PreOneTwentyKubernetes: false, @@ -895,6 +896,7 @@ func GenerateTemplateData(addon *Addon, cc *config.ClusterConfig, netInfo Networ CustomRegistries: customRegistries, NetworkInfo: make(map[string]string), LegacyPodSecurityPolicy: v.LT(semver.Version{Major: 1, Minor: 25}), + LegacyRuntimeClass: v.LT(semver.Version{Major: 1, Minor: 25}), } if opts.ImageRepository != "" && !strings.HasSuffix(opts.ImageRepository, "/") { opts.ImageRepository += "/" diff --git a/pkg/minikube/cni/calico.go b/pkg/minikube/cni/calico.go index 60133254ab..9db610400b 100644 --- a/pkg/minikube/cni/calico.go +++ b/pkg/minikube/cni/calico.go @@ -70,7 +70,7 @@ func (c Calico) manifest() (assets.CopyableFile, error) { DaemonSetImageName: images.CalicoDaemonSet(c.cc.KubernetesConfig.ImageRepository), FelixDriverImageName: images.CalicoFelixDriver(c.cc.KubernetesConfig.ImageRepository), BinaryImageName: images.CalicoBin(c.cc.KubernetesConfig.ImageRepository), - LegacyPodDisruptionBudget: k8sVersion.LT(semver.Version{Major: 1, Minor: 21}), + LegacyPodDisruptionBudget: k8sVersion.LT(semver.Version{Major: 1, Minor: 25}), } b := bytes.Buffer{} diff --git a/pkg/minikube/cni/calico.yaml b/pkg/minikube/cni/calico.yaml index 4ce41c0e64..c357997113 100644 --- a/pkg/minikube/cni/calico.yaml +++ b/pkg/minikube/cni/calico.yaml @@ -4066,7 +4066,7 @@ metadata: # This manifest creates a Pod Disruption Budget for Controller to allow K8s Cluster Autoscaler to evict -apiVersion: policy/v1{{ if .LegacyPodDisruptionBudget }}beta1{{end}} +apiVersion: policy/v1{{if .LegacyPodDisruptionBudget}}beta1{{end}} kind: PodDisruptionBudget metadata: name: calico-kube-controllers diff --git a/pkg/minikube/cni/flannel.go b/pkg/minikube/cni/flannel.go index 191ebfedf8..b368b1fa8a 100644 --- a/pkg/minikube/cni/flannel.go +++ b/pkg/minikube/cni/flannel.go @@ -32,7 +32,7 @@ import ( ) // From https://raw.githubusercontent.com/coreos/flannel/master/Documentation/kube-flannel.yml -var flannelYaml = `---{{ if .LegacyPodSecurityPolicy }} +var flannelYaml = `---{{if .LegacyPodSecurityPolicy}} apiVersion: policy/v1beta1 kind: PodSecurityPolicy metadata: @@ -78,23 +78,23 @@ spec: # SELinux seLinux: # SELinux is unused in CaaSP - rule: 'RunAsAny'{{ else }} + rule: 'RunAsAny'{{else}} kind: Namespace apiVersion: v1 metadata: name: kube-system labels: - pod-security.kubernetes.io/enforce: privileged{{ end }} + pod-security.kubernetes.io/enforce: privileged{{end}} --- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: name: flannel -rules:{{ if .LegacyPodSecurityPolicy }} +rules:{{if .LegacyPodSecurityPolicy}} - apiGroups: ['extensions'] resources: ['podsecuritypolicies'] verbs: ['use'] - resourceNames: ['psp.flannel.unprivileged']{{ end }} + resourceNames: ['psp.flannel.unprivileged']{{end}} - apiGroups: - "" resources: @@ -687,7 +687,7 @@ func (c Flannel) Apply(r Runner) error { } input := &flannelTmplStruct{ - LegacyPodSecurityPolicy: k8sVersion.LT(semver.Version{Major: 1, Minor: 22}), + LegacyPodSecurityPolicy: k8sVersion.LT(semver.Version{Major: 1, Minor: 25}), } b := bytes.Buffer{} From ffebffb3780b4d143a602375961c3a7e46929f09 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Wed, 14 Sep 2022 11:33:27 -0700 Subject: [PATCH 496/545] add missing if --- deploy/addons/gvisor/gvisor-runtimeclass.yaml.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/addons/gvisor/gvisor-runtimeclass.yaml.tmpl b/deploy/addons/gvisor/gvisor-runtimeclass.yaml.tmpl index 10b92357a4..6229c2a2d2 100644 --- a/deploy/addons/gvisor/gvisor-runtimeclass.yaml.tmpl +++ b/deploy/addons/gvisor/gvisor-runtimeclass.yaml.tmpl @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -apiVersion: node.k8s.io/v1{{.LegacyRuntimeClass}}beta1{{end}} +apiVersion: node.k8s.io/v1{{if .LegacyRuntimeClass}}beta1{{end}} kind: RuntimeClass metadata: name: gvisor From ebdba54111ad2efc80ef76d2a9c5ac5a1a28222d Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Wed, 14 Sep 2022 22:16:47 +0000 Subject: [PATCH 497/545] Update kicbase to v0.0.34 --- pkg/drivers/kic/types.go | 6 +++--- site/content/en/docs/commands/start.md | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/drivers/kic/types.go b/pkg/drivers/kic/types.go index e0bc3e91a8..47dfb6d64e 100644 --- a/pkg/drivers/kic/types.go +++ b/pkg/drivers/kic/types.go @@ -24,13 +24,13 @@ import ( const ( // Version is the current version of kic - Version = "v0.0.33-1662137001-14904" + Version = "v0.0.34" // SHA of the kic base image baseImageSHA = "f2a1e577e43fd6769f35cdb938f6d21c3dacfd763062d119cade738fa244720c" // The name of the GCR kicbase repository - gcrRepo = "gcr.io/k8s-minikube/kicbase-builds" + gcrRepo = "gcr.io/k8s-minikube/kicbase" // The name of the Dockerhub kicbase repository - dockerhubRepo = "docker.io/kicbase/build" + dockerhubRepo = "docker.io/kicbase/stable" ) var ( diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index a92d5b7a8e..0df4649878 100644 --- a/site/content/en/docs/commands/start.md +++ b/site/content/en/docs/commands/start.md @@ -26,7 +26,7 @@ minikube start [flags] --apiserver-names strings A set of apiserver names which are used in the generated certificate for kubernetes. This can be used if you want to make the apiserver available from outside the machine --apiserver-port int The apiserver listening port (default 8443) --auto-update-drivers If set, automatically updates drivers to the latest version. Defaults to true. (default true) - --base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase-builds:v0.0.33-1662137001-14904@sha256:f2a1e577e43fd6769f35cdb938f6d21c3dacfd763062d119cade738fa244720c") + --base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase:v0.0.34@sha256:f2a1e577e43fd6769f35cdb938f6d21c3dacfd763062d119cade738fa244720c") --binary-mirror string Location to fetch kubectl, kubelet, & kubeadm binaries from. --cache-images If true, cache docker images for the current bootstrapper and load them into the machine. Always false with --driver=none. (default true) --cert-expiration duration Duration until minikube certificate expiration, defaults to three years (26280h). (default 26280h0m0s) From a9457b312e69406155c59ed91d893e2e4909b19e Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Wed, 14 Sep 2022 22:17:59 +0000 Subject: [PATCH 498/545] Update ISO to v1.27.0 --- 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 da286b348d..15d885f6da 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.26.1-1662760260-14935 +ISO_VERSION ?= v1.27.0 # 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 98c1362f6a..5cf6482601 100644 --- a/pkg/minikube/download/iso.go +++ b/pkg/minikube/download/iso.go @@ -41,7 +41,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/14935" + isoBucket := "minikube/iso" return []string{ fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s-%s.iso", isoBucket, v, runtime.GOARCH), fmt.Sprintf("https://github.com/kubernetes/minikube/releases/download/%s/minikube-%s-%s.iso", v, v, runtime.GOARCH), diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index a92d5b7a8e..ba41e5dd6a 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/14935/minikube-v1.26.1-1662760260-14935-amd64.iso,https://github.com/kubernetes/minikube/releases/download/v1.26.1-1662760260-14935/minikube-v1.26.1-1662760260-14935-amd64.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.26.1-1662760260-14935-amd64.iso]) + --iso-url strings Locations to fetch the minikube ISO from. (default [https://storage.googleapis.com/minikube/iso/minikube-v1.27.0-amd64.iso,https://github.com/kubernetes/minikube/releases/download/v1.27.0/minikube-v1.27.0-amd64.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.27.0-amd64.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.25.0, 'latest' for v1.25.0). Defaults to 'stable'. --kvm-gpu Enable experimental NVIDIA GPU support in minikube From 70812c5cb673732ff73d0fdbd6e79c9e7d76bf32 Mon Sep 17 00:00:00 2001 From: klaases Date: Wed, 14 Sep 2022 15:59:33 -0700 Subject: [PATCH 499/545] release notes --- CHANGELOG.md | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d58563e3a6..b2a0b7a153 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,70 @@ # Release Notes +## Version 1.27.0 - 2022-09-15 + +Kubernetes v1.25: +* Bump default Kubernetes version to v1.25.0 and resolve `/etc/resolv.conf` regression [#14848](https://github.com/kubernetes/minikube/pull/14848) +* Skip metallb PodSecurityPolicy object for kubernetes 1.25+ [#14903](https://github.com/kubernetes/minikube/pull/14903) +* The DefaultKubernetesRepo changed for 1.25.0 [#14768](https://github.com/kubernetes/minikube/pull/14768) + +Minor Improvements: +* Add fscrypt kernel options [#14783](https://github.com/kubernetes/minikube/pull/14783) +* Output kubeadm logs [#14697](https://github.com/kubernetes/minikube/pull/14697) + +Bug fixes: +* Fix QEMU delete errors [#14950](https://github.com/kubernetes/minikube/pull/14950) +* Fix containerd configuration issue with insecure registries [#14482](https://github.com/kubernetes/minikube/pull/14482) +* Fix registry when custom images provided [#14690](https://github.com/kubernetes/minikube/pull/14690) + +Version Upgrades: +* ISO: Update Docker from 20.10.17 to 20.10.18 [#14935](https://github.com/kubernetes/minikube/pull/14935) +* Update kicbase base image to Ubuntu:focal-20220826 [#14904](https://github.com/kubernetes/minikube/pull/14904) +* Update registry addon image from 2.7.1 to 2.8.1 [#14886](https://github.com/kubernetes/minikube/pull/14886) +* Update gcp-auth-webhook addon from v0.0.10 to v0.0.11 [#14847](https://github.com/kubernetes/minikube/pull/14847) +* Update Headlamp addon image from v0.9.0 to v0.11.1 [#14802](https://github.com/kubernetes/minikube/pull/14802) + +For a more detailed changelog, including changes occurring in pre-release versions, see [CHANGELOG.md](https://github.com/kubernetes/minikube/blob/master/CHANGELOG.md). + +Thank you to our contributors for this release! + +- Abirdcfly +- Alex +- Anders F Björklund +- Andrew Hamilton +- Jeff MAURY +- Jānis Bebrītis +- Marcel Lauhoff +- Medya Ghazizadeh +- Renato Costa +- Santhosh Nagaraj S +- Siddhant Khisty +- Steven Powell +- Yuiko Mouri +- klaases +- mtardy +- shaunmayo +- shixiuguo + +Thank you to our PR reviewers for this release! + +- spowelljr (23 comments) +- medyagh (6 comments) +- klaases (5 comments) +- vbezhenar (2 comments) +- nixpanic (1 comments) +- reylejano (1 comments) +- t-inu (1 comments) + +Thank you to our triage members for this release! + +- afbjorklund (76 comments) +- klaases (58 comments) +- RA489 (38 comments) +- spowelljr (16 comments) +- eiffel-fl (10 comments) + +Check out our [contributions leaderboard](https://minikube.sigs.k8s.io/docs/contrib/leaderboard/v1.27.0/) for this release! + ## Version 1.26.1 - 2022-08-02 Minor Improvements: From fc15016ff94946ef815586b854cb6d592ad8a7aa Mon Sep 17 00:00:00 2001 From: klaases Date: Wed, 14 Sep 2022 16:00:32 -0700 Subject: [PATCH 500/545] update version --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 15d885f6da..11e9ac1eab 100644 --- a/Makefile +++ b/Makefile @@ -14,8 +14,8 @@ # Bump these on release - and please check ISO_VERSION for correctness. VERSION_MAJOR ?= 1 -VERSION_MINOR ?= 26 -VERSION_BUILD ?= 1 +VERSION_MINOR ?= 27 +VERSION_BUILD ?= 0 RAW_VERSION=$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_BUILD) VERSION ?= v$(RAW_VERSION) From 04a907ae888d6a599832558e1358668d40d60411 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Thu, 15 Sep 2022 21:19:09 +0000 Subject: [PATCH 501/545] Update leaderboard --- .../en/docs/contrib/leaderboard/v1.27.0.html | 492 ++++++++++++++++++ 1 file changed, 492 insertions(+) create mode 100644 site/content/en/docs/contrib/leaderboard/v1.27.0.html diff --git a/site/content/en/docs/contrib/leaderboard/v1.27.0.html b/site/content/en/docs/contrib/leaderboard/v1.27.0.html new file mode 100644 index 0000000000..86a7dd3d1f --- /dev/null +++ b/site/content/en/docs/contrib/leaderboard/v1.27.0.html @@ -0,0 +1,492 @@ +--- +title: "v1.27.0 - 2022-09-15" +linkTitle: "v1.27.0 - 2022-09-15" +weight: -108 +--- + + + kubernetes/minikube - Leaderboard + + + + + + + + +

kubernetes/minikube

+
2022-08-02 — 2022-09-15
+ + +

Reviewers

+ + +
+

Most Influential

+

# of Merged PRs reviewed

+
+ +
+ +
+

Most Helpful

+

# of words written in merged PRs

+
+ +
+ +
+

Most Demanding

+

# of Review Comments in merged PRs

+
+ +
+ + +

Pull Requests

+ + +
+

Most Active

+

# of Pull Requests Merged

+
+ +
+ +
+

Big Movers

+

Lines of code (delta)

+
+ +
+ +
+

Most difficult to review

+

Average PR size (added+changed)

+
+ +
+ + +

Issues

+ + +
+

Most Active

+

# of comments

+
+ +
+ +
+

Most Helpful

+

# of words (excludes authored)

+
+ +
+ +
+

Top Closers

+

# of issues closed (excludes authored)

+
+ +
+ + + + From 68b397a154f96b979cf5bd6650ff67e64a4f3941 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Thu, 15 Sep 2022 14:28:00 -0700 Subject: [PATCH 502/545] Update releases.json & releases-v2.json to include v1.27.0 --- deploy/minikube/releases-v2.json | 26 ++++++++++++++++++++++++++ deploy/minikube/releases.json | 8 ++++++++ 2 files changed, 34 insertions(+) diff --git a/deploy/minikube/releases-v2.json b/deploy/minikube/releases-v2.json index c1222b6d12..3658bbb5f6 100644 --- a/deploy/minikube/releases-v2.json +++ b/deploy/minikube/releases-v2.json @@ -1,4 +1,30 @@ [ + { + "checksums": { + "amd64": { + "darwin": "fca0cbabad64868cf00d37349b953b16c06bafa13569595ef7721bd9178b4a5c", + "linux": "b6ab1207474255b9ea755ced4394b4b618a1cfa7b8394ddd1d307288130fb495", + "windows": "ebecc7633b3a91b652a81fb17faa4d1bb35fecff94e6309533e95933c9224ef7" + }, + "arm": { + "linux": "4ab5323f1f365589d944818dc73700f1ceb9d930932de47e0dc0012a22c51f38" + }, + "arm64": { + "darwin": "6b0a3d392c57ba97659a3d8a6a063e6d6e212fbd1b32bd2c5044ab4a611d5314", + "linux": "5d698c417d41d42e577e33eeb3666d33232c1f45585665cd6d4f6dacb8aeb0d2" + }, + "ppc64le": { + "linux": "2387199325ba90dd944ea0685a2672f16b66ed188674e15970f2286f1f3a7505" + }, + "s390x": { + "linux": "39da0ad9e879c715402af432d90580f0e17eec6f76e59c6bd0622fd815c53428" + }, + "darwin": "fca0cbabad64868cf00d37349b953b16c06bafa13569595ef7721bd9178b4a5c", + "linux": "b6ab1207474255b9ea755ced4394b4b618a1cfa7b8394ddd1d307288130fb495", + "windows": "ebecc7633b3a91b652a81fb17faa4d1bb35fecff94e6309533e95933c9224ef7" + }, + "name": "v1.27.0" + }, { "checksums": { "amd64": { diff --git a/deploy/minikube/releases.json b/deploy/minikube/releases.json index 520902a5d0..ad4526dec9 100644 --- a/deploy/minikube/releases.json +++ b/deploy/minikube/releases.json @@ -1,4 +1,12 @@ [ + { + "checksums": { + "darwin": "fca0cbabad64868cf00d37349b953b16c06bafa13569595ef7721bd9178b4a5c", + "linux": "b6ab1207474255b9ea755ced4394b4b618a1cfa7b8394ddd1d307288130fb495", + "windows": "ebecc7633b3a91b652a81fb17faa4d1bb35fecff94e6309533e95933c9224ef7" + }, + "name": "v1.27.0" + }, { "checksums": { "darwin": "57578517edec2fcf8425b47ef9535c56c1b7c0f383b4d676ebf3787076ac4ede", From 3438f519588384b1500b44fca6bf2f2f0d8b7a1e Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Thu, 15 Sep 2022 21:56:34 +0000 Subject: [PATCH 503/545] add time-to-k8s benchmark for v1.27.0 --- .../en/docs/benchmarks/timeToK8s/v1.27.0.md | 27 ++++++++++++++++++ .../benchmarks/timeToK8s/v1.27.0-cpu.png | Bin 0 -> 28114 bytes .../benchmarks/timeToK8s/v1.27.0-time.png | Bin 0 -> 35540 bytes 3 files changed, 27 insertions(+) create mode 100644 site/content/en/docs/benchmarks/timeToK8s/v1.27.0.md create mode 100644 site/static/images/benchmarks/timeToK8s/v1.27.0-cpu.png create mode 100644 site/static/images/benchmarks/timeToK8s/v1.27.0-time.png diff --git a/site/content/en/docs/benchmarks/timeToK8s/v1.27.0.md b/site/content/en/docs/benchmarks/timeToK8s/v1.27.0.md new file mode 100644 index 0000000000..f95d29515a --- /dev/null +++ b/site/content/en/docs/benchmarks/timeToK8s/v1.27.0.md @@ -0,0 +1,27 @@ +--- +title: "v1.27.0 Benchmark" +linkTitle: "v1.27.0 Benchmark" +weight: -20220915 +--- + +![time-to-k8s](/images/benchmarks/timeToK8s/v1.27.0-time.png) + +| | minikube version: v1.27.0 | kind v0.15.0 go1.19 linux/amd64 | k3d version v5.4.6 | +|----------------------|---------------------------|---------------------------------|--------------------| +| Command Exec | 28.504 | 20.215 | 15.026 | +| API Server Answering | 0.077 | 0.078 | 0.097 | +| Kubernetes SVC | 0.065 | 0.060 | 0.060 | +| DNS SVC | 0.061 | 0.060 | 0.060 | +| App Running | 14.903 | 23.039 | 11.824 | +| DNS Answering | 8.702 | 0.637 | 2.770 | +| Total | 52.312 | 44.089 | 29.837 | + + + +![cpu-to-k8s](/images/benchmarks/timeToK8s/v1.27.0-cpu.png) + +| | minikube version: v1.27.0 | kind v0.15.0 go1.19 linux/amd64 | k3d version v5.4.6 | +|--------------------|---------------------------|---------------------------------|--------------------| +| CPU Utilization(%) | 38.822 | 46.720 | 44.883 | +| CPU Time(seconds) | 19.224 | 20.570 | 13.381 | + diff --git a/site/static/images/benchmarks/timeToK8s/v1.27.0-cpu.png b/site/static/images/benchmarks/timeToK8s/v1.27.0-cpu.png new file mode 100644 index 0000000000000000000000000000000000000000..5eb61c067bc6033355a9c2912d819b91459082ae GIT binary patch literal 28114 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 HmZSdz?wrmB literal 0 HcmV?d00001 diff --git a/site/static/images/benchmarks/timeToK8s/v1.27.0-time.png b/site/static/images/benchmarks/timeToK8s/v1.27.0-time.png new file mode 100644 index 0000000000000000000000000000000000000000..e93201d82c8015f9312c6f264e5f35f861a38f3b GIT binary patch literal 35540 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 literal 0 HcmV?d00001 From f0cd6829d0a017a728ca77c85cd3d11ad3a03f83 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Thu, 15 Sep 2022 23:19:01 +0000 Subject: [PATCH 504/545] bump default/newest kubernetes versions --- pkg/minikube/constants/constants.go | 4 ++-- site/content/en/docs/commands/start.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/minikube/constants/constants.go b/pkg/minikube/constants/constants.go index abe2060814..053bd4df08 100644 --- a/pkg/minikube/constants/constants.go +++ b/pkg/minikube/constants/constants.go @@ -32,10 +32,10 @@ var ( const ( // DefaultKubernetesVersion is the default Kubernetes version - DefaultKubernetesVersion = "v1.25.0" + DefaultKubernetesVersion = "v1.25.1" // NewestKubernetesVersion is the newest Kubernetes version to test against // NOTE: You may need to update coreDNS & etcd versions in pkg/minikube/bootstrapper/images/images.go - NewestKubernetesVersion = "v1.25.0" + NewestKubernetesVersion = "v1.25.1" // OldestKubernetesVersion is the oldest Kubernetes version to test against OldestKubernetesVersion = "v1.16.0" // NoKubernetesVersion is the version used when users does NOT want to install kubernetes diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index 5ecc279126..f103e55b21 100644 --- a/site/content/en/docs/commands/start.md +++ b/site/content/en/docs/commands/start.md @@ -71,7 +71,7 @@ minikube start [flags] --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/iso/minikube-v1.27.0-amd64.iso,https://github.com/kubernetes/minikube/releases/download/v1.27.0/minikube-v1.27.0-amd64.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.27.0-amd64.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.25.0, 'latest' for v1.25.0). Defaults to 'stable'. + --kubernetes-version string The Kubernetes version that the minikube VM will use (ex: v1.2.3, 'stable' for v1.25.1, 'latest' for v1.25.1). Defaults to 'stable'. --kvm-gpu Enable experimental NVIDIA GPU support in minikube --kvm-hidden Hide the hypervisor signature from the guest in minikube (kvm2 driver only) --kvm-network string The KVM default network name. (kvm2 driver only) (default "default") From 578b550ba278cef9b0791f1da5a7aac2550d73a2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 19 Sep 2022 18:05:07 +0000 Subject: [PATCH 505/545] Bump k8s.io/component-base from 0.25.0 to 0.25.1 Bumps [k8s.io/component-base](https://github.com/kubernetes/component-base) from 0.25.0 to 0.25.1. - [Release notes](https://github.com/kubernetes/component-base/releases) - [Commits](https://github.com/kubernetes/component-base/compare/v0.25.0...v0.25.1) --- updated-dependencies: - dependency-name: k8s.io/component-base dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 8 ++++---- go.sum | 20 ++++++++++---------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/go.mod b/go.mod index d6c7839352..ce72a901e4 100644 --- a/go.mod +++ b/go.mod @@ -83,11 +83,11 @@ require ( google.golang.org/api v0.95.0 gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 // indirect gopkg.in/yaml.v2 v2.4.0 - k8s.io/api v0.25.0 - k8s.io/apimachinery v0.25.0 - k8s.io/client-go v0.25.0 + k8s.io/api v0.25.1 + k8s.io/apimachinery v0.25.1 + k8s.io/client-go v0.25.1 k8s.io/cluster-bootstrap v0.0.0 - k8s.io/component-base v0.25.0 + k8s.io/component-base v0.25.1 k8s.io/klog/v2 v2.80.1 k8s.io/kubectl v0.25.0 k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed diff --git a/go.sum b/go.sum index 89b62fbea3..026499a6a7 100644 --- a/go.sum +++ b/go.sum @@ -1065,7 +1065,7 @@ github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108 github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= github.com/onsi/ginkgo v1.16.4 h1:29JGrr5oVBm5ulCWet69zQkzWipVXIol6ygQUe/EzNc= github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0= -github.com/onsi/ginkgo/v2 v2.1.4 h1:GNapqRSid3zijZ9H77KrgVG4/8KqiyRsxcSxe+7ApXY= +github.com/onsi/ginkgo/v2 v2.1.6 h1:Fx2POJZfKRQcM1pH49qSZiYeu319wji004qX+GDovrU= github.com/onsi/gomega v0.0.0-20151007035656-2152b45fa28a/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= @@ -1074,7 +1074,7 @@ github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoT github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.10.3/go.mod h1:V9xEwhxec5O8UDM77eCW8vLymOMltsqPVYWrpDsH8xc= github.com/onsi/gomega v1.16.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= -github.com/onsi/gomega v1.19.0 h1:4ieX6qQjPP/BfC3mpsAtIGGlxTWPeA3Inl/7DtXw1tw= +github.com/onsi/gomega v1.20.1 h1:PA/3qinGoukvymdIDV8pii6tiZgC8kbmJO6Z5+b002Q= github.com/opencontainers/go-digest v0.0.0-20170106003457-a6d0ee40d420/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= github.com/opencontainers/go-digest v0.0.0-20180430190053-c9281466c8b2/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= @@ -2188,15 +2188,15 @@ k8s.io/api v0.20.1/go.mod h1:KqwcCVogGxQY3nBlRpwt+wpAMF/KjaCc7RpywacvqUo= k8s.io/api v0.20.4/go.mod h1:++lNL1AJMkDymriNniQsWRkMDzRaX2Y/POTUi8yvqYQ= k8s.io/api v0.20.6/go.mod h1:X9e8Qag6JV/bL5G6bU8sdVRltWKmdHsFUGS3eVndqE8= k8s.io/api v0.22.4/go.mod h1:Rgs+9gIGYC5laXQSZZ9JqT5NevNgoGiOdVWi1BAB3qk= -k8s.io/api v0.25.0 h1:H+Q4ma2U/ww0iGB78ijZx6DRByPz6/733jIuFpX70e0= -k8s.io/api v0.25.0/go.mod h1:ttceV1GyV1i1rnmvzT3BST08N6nGt+dudGrquzVQWPk= +k8s.io/api v0.25.1 h1:yL7du50yc93k17nH/Xe9jujAYrcDkI/i5DL1jPz4E3M= +k8s.io/api v0.25.1/go.mod h1:hh4itDvrWSJsmeUc28rIFNri8MatNAAxJjKcQmhX6TU= k8s.io/apimachinery v0.19.1/go.mod h1:DnPGDnARWFvYa3pMHgSxtbZb7gpzzAZ1pTfaUNDVlmA= k8s.io/apimachinery v0.20.1/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU= k8s.io/apimachinery v0.20.4/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU= k8s.io/apimachinery v0.20.6/go.mod h1:ejZXtW1Ra6V1O5H8xPBGz+T3+4gfkTCeExAHKU57MAc= k8s.io/apimachinery v0.22.4/go.mod h1:yU6oA6Gnax9RrxGzVvPFFJ+mpnW6PBSqp0sx0I0HHW0= -k8s.io/apimachinery v0.25.0 h1:MlP0r6+3XbkUG2itd6vp3oxbtdQLQI94fD5gCS+gnoU= -k8s.io/apimachinery v0.25.0/go.mod h1:qMx9eAk0sZQGsXGu86fab8tZdffHbwUfsvzqKn4mfB0= +k8s.io/apimachinery v0.25.1 h1:t0XrnmCEHVgJlR2arwO8Awp9ylluDic706WePaYCBTI= +k8s.io/apimachinery v0.25.1/go.mod h1:hqqA1X0bsgsxI6dXsJ4HnNTBOmJNxyPp8dw3u2fSHwA= k8s.io/apiserver v0.20.1/go.mod h1:ro5QHeQkgMS7ZGpvf4tSMx6bBOgPfE+f52KwvXfScaU= k8s.io/apiserver v0.20.4/go.mod h1:Mc80thBKOyy7tbvFtB4kJv1kbdD0eIH8k8vianJcbFM= k8s.io/apiserver v0.20.6/go.mod h1:QIJXNt6i6JB+0YQRNcS0hdRHJlMhflFmsBDeSgT1r8Q= @@ -2204,15 +2204,15 @@ k8s.io/client-go v0.19.1/go.mod h1:AZOIVSI9UUtQPeJD3zJFp15CEhSjRgAuQP5PWRJrCIQ= k8s.io/client-go v0.20.1/go.mod h1:/zcHdt1TeWSd5HoUe6elJmHSQ6uLLgp4bIJHVEuy+/Y= k8s.io/client-go v0.20.4/go.mod h1:LiMv25ND1gLUdBeYxBIwKpkSC5IsozMMmOOeSJboP+k= k8s.io/client-go v0.20.6/go.mod h1:nNQMnOvEUEsOzRRFIIkdmYOjAZrC8bgq0ExboWSU1I0= -k8s.io/client-go v0.25.0 h1:CVWIaCETLMBNiTUta3d5nzRbXvY5Hy9Dpl+VvREpu5E= -k8s.io/client-go v0.25.0/go.mod h1:lxykvypVfKilxhTklov0wz1FoaUZ8X4EwbhS6rpRfN8= +k8s.io/client-go v0.25.1 h1:uFj4AJKtE1/ckcSKz8IhgAuZTdRXZDKev8g387ndD58= +k8s.io/client-go v0.25.1/go.mod h1:rdFWTLV/uj2C74zGbQzOsmXPUtMAjSf7ajil4iJUNKo= k8s.io/cluster-bootstrap v0.22.4 h1:2ZhV/1K4GiCrnmDHHbBnN3bERWn+Nxrtxmxp6uYYThI= k8s.io/cluster-bootstrap v0.22.4/go.mod h1:fTQZ6u9G6fg2LHhB8nEgZLnXIhCDSRYuLUUS5pgW8RY= k8s.io/component-base v0.20.1/go.mod h1:guxkoJnNoh8LNrbtiQOlyp2Y2XFCZQmrcg2n/DeYNLk= k8s.io/component-base v0.20.4/go.mod h1:t4p9EdiagbVCJKrQ1RsA5/V4rFQNDfRlevJajlGwgjI= k8s.io/component-base v0.20.6/go.mod h1:6f1MPBAeI+mvuts3sIdtpjljHWBQ2cIy38oBIWMYnrM= -k8s.io/component-base v0.25.0 h1:haVKlLkPCFZhkcqB6WCvpVxftrg6+FK5x1ZuaIDaQ5Y= -k8s.io/component-base v0.25.0/go.mod h1:F2Sumv9CnbBlqrpdf7rKZTmmd2meJq0HizeyY/yAFxk= +k8s.io/component-base v0.25.1 h1:Wmj33QwddVwsJFJWmXlf24Nu8do2bGHLabXHrKz7Org= +k8s.io/component-base v0.25.1/go.mod h1:j78+TFdsKM8RXHfM88oeAdZu2v9qMZdQZOfg0LGW+q4= k8s.io/cri-api v0.17.3/go.mod h1:X1sbHmuXhwaHs9xxYffLqJogVsnI+f6cPRcgPel7ywM= k8s.io/cri-api v0.20.1/go.mod h1:2JRbKt+BFLTjtrILYVqQK5jqhI+XNdF6UiGMgczeBCI= k8s.io/cri-api v0.20.4/go.mod h1:2JRbKt+BFLTjtrILYVqQK5jqhI+XNdF6UiGMgczeBCI= From 25a0dcd272ae0d833e880b6fc1c3037fb7e3fd0b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 19 Sep 2022 18:05:47 +0000 Subject: [PATCH 506/545] 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.8.7 to 1.8.8. - [Release notes](https://github.com/GoogleCloudPlatform/opentelemetry-operations-go/releases) - [Commits](https://github.com/GoogleCloudPlatform/opentelemetry-operations-go/compare/exporter/trace/v1.8.7...exporter/trace/v1.8.8) --- updated-dependencies: - dependency-name: github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 4 ++-- go.sum | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/go.mod b/go.mod index d6c7839352..b0987ffaea 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ require ( contrib.go.opencensus.io/exporter/stackdriver v0.13.12 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.8.7 + github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.8.8 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 @@ -112,7 +112,7 @@ require ( 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/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.32.7 // indirect + github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.32.8 // indirect github.com/MakeNowJust/heredoc v1.0.0 // indirect github.com/Microsoft/go-winio v0.5.2 // indirect github.com/PuerkitoBio/purell v1.1.1 // indirect diff --git a/go.sum b/go.sum index 89b62fbea3..54858a1d0a 100644 --- a/go.sum +++ b/go.sum @@ -117,11 +117,11 @@ github.com/Delta456/box-cli-maker/v2 v2.2.2/go.mod h1:idItIMZeyx3bg73XwSgsLeZd+g github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24/go.mod h1:4UJr5HIiMZrwgkSPdsjy2uOQExX/WEILpIrO9UPGuXs= 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.8.7 h1:aAZBUYgk3pn6g1q2Z3o0NT5VeI925OhCLOoPaodrAKM= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.8.7/go.mod h1:/6yXXCCD7/V+E4LmwOhjdxh555rM6ASCKnXlxsj04c0= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.32.7 h1:sOOMI+OpBU4E7CuWv2qd2vM/fKtzKdirPLvkdf4vkvA= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.32.7 h1:nonF0R35EO4YBL7cX0U0cX0VmKEcANti6xpZwZRg/iI= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.32.7/go.mod h1:/G0zPXsUx5gZUd6ryJakuDo4VR7EJScegf1ZNK8xIGs= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.8.8 h1:gJotWbuzSbr350EljD1zTNy3l4NiigjDVeVBWf7ERgk= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.8.8/go.mod h1:Cy0FEJrgXiz3UbLX/ZRlHPQxq605mGwz14ac+peTwQo= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.32.8 h1:ehU1r1DPZfv3Qfi0r7C24UAi0sozSwiSHtqwD1sdL8k= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.32.8 h1:FJ3zlcMfrS9iv06vzg1V73RlfrHZPsyfdkKrqGYAT4E= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.32.8/go.mod h1:/G0zPXsUx5gZUd6ryJakuDo4VR7EJScegf1ZNK8xIGs= github.com/MakeNowJust/heredoc v1.0.0 h1:cXCdzVdstXyiTqTvfqk9SDHpKNjxuom+DOlyEeQ4pzQ= github.com/MakeNowJust/heredoc v1.0.0/go.mod h1:mG5amYoWBHf8vpLOuehzbGGw0EHxpZZ6lCpQ4fNJ8LE= github.com/Masterminds/goutils v1.1.0/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU= From ce1a4919a8d0224faf1e67fe8ee9ccfb9d9502c9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 19 Sep 2022 18:05:53 +0000 Subject: [PATCH 507/545] Bump go.opentelemetry.io/otel from 1.9.0 to 1.10.0 Bumps [go.opentelemetry.io/otel](https://github.com/open-telemetry/opentelemetry-go) from 1.9.0 to 1.10.0. - [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.9.0...v1.10.0) --- updated-dependencies: - dependency-name: go.opentelemetry.io/otel dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index d6c7839352..b77f13c7bc 100644 --- a/go.mod +++ b/go.mod @@ -67,9 +67,9 @@ require ( github.com/spf13/viper v1.13.0 github.com/zchee/go-vmnet v0.0.0-20161021174912-97ebf9174097 go.opencensus.io v0.23.0 - go.opentelemetry.io/otel v1.9.0 + go.opentelemetry.io/otel v1.10.0 go.opentelemetry.io/otel/sdk v1.9.0 - go.opentelemetry.io/otel/trace v1.9.0 + go.opentelemetry.io/otel/trace v1.10.0 golang.org/x/build v0.0.0-20190927031335-2835ba2e683f golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4 golang.org/x/exp v0.0.0-20220827204233-334a2380cb91 diff --git a/go.sum b/go.sum index 89b62fbea3..2f2d6dcafc 100644 --- a/go.sum +++ b/go.sum @@ -1419,13 +1419,13 @@ go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opentelemetry.io/contrib v0.20.0 h1:ubFQUn0VCZ0gPwIoJfBJVpeBlyRMxu8Mm/huKWYd9p0= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0 h1:9NkMW03wwEzPtP/KciZ4Ozu/Uz5ZA7kfqXJIObnrjGU= -go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= -go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= +go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= +go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ= go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs= go.opentelemetry.io/otel/sdk v1.9.0 h1:LNXp1vrr83fNXTHgU8eO89mhzxb/bbWAsHG6fNf3qWo= go.opentelemetry.io/otel/sdk v1.9.0/go.mod h1:AEZc8nt5bd2F7BC24J5R0mrjYnpEgYHyTcM/vrSple4= -go.opentelemetry.io/otel/trace v1.9.0 h1:oZaCNJUjWcg60VXWee8lJKlqhPbXAPB51URuR47pQYc= -go.opentelemetry.io/otel/trace v1.9.0/go.mod h1:2737Q0MuG8q1uILYm2YYVkAyLtOofiTNGg6VODnOiPo= +go.opentelemetry.io/otel/trace v1.10.0 h1:npQMbR8o7mum8uF95yFbOEJffhs1sbCOfDh8zAJiH5E= +go.opentelemetry.io/otel/trace v1.10.0/go.mod h1:Sij3YYczqAdz+EhmGhE6TpTxUO5/F/AzrK+kxfGqySM= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= From 13990bf672385e6c4412149de7005514094bcfca Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 19 Sep 2022 20:19:51 +0000 Subject: [PATCH 508/545] Bump github.com/santhosh-tekuri/jsonschema/v5 from 5.0.0 to 5.0.1 Bumps [github.com/santhosh-tekuri/jsonschema/v5](https://github.com/santhosh-tekuri/jsonschema) from 5.0.0 to 5.0.1. - [Release notes](https://github.com/santhosh-tekuri/jsonschema/releases) - [Commits](https://github.com/santhosh-tekuri/jsonschema/compare/v5.0.0...v5.0.1) --- updated-dependencies: - dependency-name: github.com/santhosh-tekuri/jsonschema/v5 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 6 +++--- go.sum | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/go.mod b/go.mod index d6c7839352..351cd6bb27 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ require ( contrib.go.opencensus.io/exporter/stackdriver v0.13.12 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.8.7 + github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.8.8 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 @@ -101,7 +101,7 @@ require ( github.com/docker/go-connections v0.4.0 github.com/google/go-github/v43 v43.0.0 github.com/opencontainers/runc v1.1.4 - github.com/santhosh-tekuri/jsonschema/v5 v5.0.0 + github.com/santhosh-tekuri/jsonschema/v5 v5.0.1 ) require ( @@ -112,7 +112,7 @@ require ( 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/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.32.7 // indirect + github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.32.8 // indirect github.com/MakeNowJust/heredoc v1.0.0 // indirect github.com/Microsoft/go-winio v0.5.2 // indirect github.com/PuerkitoBio/purell v1.1.1 // indirect diff --git a/go.sum b/go.sum index 89b62fbea3..1fef792732 100644 --- a/go.sum +++ b/go.sum @@ -117,11 +117,11 @@ github.com/Delta456/box-cli-maker/v2 v2.2.2/go.mod h1:idItIMZeyx3bg73XwSgsLeZd+g github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24/go.mod h1:4UJr5HIiMZrwgkSPdsjy2uOQExX/WEILpIrO9UPGuXs= 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.8.7 h1:aAZBUYgk3pn6g1q2Z3o0NT5VeI925OhCLOoPaodrAKM= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.8.7/go.mod h1:/6yXXCCD7/V+E4LmwOhjdxh555rM6ASCKnXlxsj04c0= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.32.7 h1:sOOMI+OpBU4E7CuWv2qd2vM/fKtzKdirPLvkdf4vkvA= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.32.7 h1:nonF0R35EO4YBL7cX0U0cX0VmKEcANti6xpZwZRg/iI= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.32.7/go.mod h1:/G0zPXsUx5gZUd6ryJakuDo4VR7EJScegf1ZNK8xIGs= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.8.8 h1:gJotWbuzSbr350EljD1zTNy3l4NiigjDVeVBWf7ERgk= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.8.8/go.mod h1:Cy0FEJrgXiz3UbLX/ZRlHPQxq605mGwz14ac+peTwQo= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.32.8 h1:ehU1r1DPZfv3Qfi0r7C24UAi0sozSwiSHtqwD1sdL8k= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.32.8 h1:FJ3zlcMfrS9iv06vzg1V73RlfrHZPsyfdkKrqGYAT4E= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.32.8/go.mod h1:/G0zPXsUx5gZUd6ryJakuDo4VR7EJScegf1ZNK8xIGs= github.com/MakeNowJust/heredoc v1.0.0 h1:cXCdzVdstXyiTqTvfqk9SDHpKNjxuom+DOlyEeQ4pzQ= github.com/MakeNowJust/heredoc v1.0.0/go.mod h1:mG5amYoWBHf8vpLOuehzbGGw0EHxpZZ6lCpQ4fNJ8LE= github.com/Masterminds/goutils v1.1.0/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU= @@ -1228,8 +1228,8 @@ github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb github.com/safchain/ethtool v0.0.0-20190326074333-42ed695e3de8/go.mod h1:Z0q5wiBQGYcxhMZ6gUqHn6pYNLypFAvaL3UvgZLR0U4= github.com/sagikazarmark/crypt v0.1.0/go.mod h1:B/mN0msZuINBtQ1zZLEQcegFJJf9vnYIR88KRMEuODE= github.com/sanposhiho/wastedassign/v2 v2.0.6/go.mod h1:KyZ0MWTwxxBmfwn33zh3k1dmsbF2ud9pAAGfoLfjhtI= -github.com/santhosh-tekuri/jsonschema/v5 v5.0.0 h1:TToq11gyfNlrMFZiYujSekIsPd9AmsA2Bj/iv+s4JHE= -github.com/santhosh-tekuri/jsonschema/v5 v5.0.0/go.mod h1:FKdcjfQW6rpZSnxxUvEA5H/cDPdvJ/SZJQLWWXWGrZ0= +github.com/santhosh-tekuri/jsonschema/v5 v5.0.1 h1:HNLA3HtUIROrQwG1cuu5EYuqk3UEoJ61Dr/9xkd6sok= +github.com/santhosh-tekuri/jsonschema/v5 v5.0.1/go.mod h1:FKdcjfQW6rpZSnxxUvEA5H/cDPdvJ/SZJQLWWXWGrZ0= github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= github.com/sayboras/dockerclient v1.0.0 h1:awHcxOzTP07Gl1SJAhkTCTagyJwgA6f/Az/Z4xMP2yg= github.com/sayboras/dockerclient v1.0.0/go.mod h1:mUmEoqt0b+uQg57s006FsvL4mybi+N5wINLDBGtaPTY= From e55c8a2f64ec035f4a56ece538b9a780a38cb7f6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 19 Sep 2022 20:19:59 +0000 Subject: [PATCH 509/545] Bump k8s.io/client-go from 0.25.0 to 0.25.1 Bumps [k8s.io/client-go](https://github.com/kubernetes/client-go) from 0.25.0 to 0.25.1. - [Release notes](https://github.com/kubernetes/client-go/releases) - [Changelog](https://github.com/kubernetes/client-go/blob/master/CHANGELOG.md) - [Commits](https://github.com/kubernetes/client-go/compare/v0.25.0...v0.25.1) --- updated-dependencies: - dependency-name: k8s.io/client-go dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 10 +++++----- go.sum | 26 +++++++++++++------------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/go.mod b/go.mod index d6c7839352..567f0e332b 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ require ( contrib.go.opencensus.io/exporter/stackdriver v0.13.12 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.8.7 + github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.8.8 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 @@ -83,9 +83,9 @@ require ( google.golang.org/api v0.95.0 gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 // indirect gopkg.in/yaml.v2 v2.4.0 - k8s.io/api v0.25.0 - k8s.io/apimachinery v0.25.0 - k8s.io/client-go v0.25.0 + k8s.io/api v0.25.1 + k8s.io/apimachinery v0.25.1 + k8s.io/client-go v0.25.1 k8s.io/cluster-bootstrap v0.0.0 k8s.io/component-base v0.25.0 k8s.io/klog/v2 v2.80.1 @@ -112,7 +112,7 @@ require ( 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/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.32.7 // indirect + github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.32.8 // indirect github.com/MakeNowJust/heredoc v1.0.0 // indirect github.com/Microsoft/go-winio v0.5.2 // indirect github.com/PuerkitoBio/purell v1.1.1 // indirect diff --git a/go.sum b/go.sum index 89b62fbea3..584a1e741d 100644 --- a/go.sum +++ b/go.sum @@ -117,11 +117,11 @@ github.com/Delta456/box-cli-maker/v2 v2.2.2/go.mod h1:idItIMZeyx3bg73XwSgsLeZd+g github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24/go.mod h1:4UJr5HIiMZrwgkSPdsjy2uOQExX/WEILpIrO9UPGuXs= 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.8.7 h1:aAZBUYgk3pn6g1q2Z3o0NT5VeI925OhCLOoPaodrAKM= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.8.7/go.mod h1:/6yXXCCD7/V+E4LmwOhjdxh555rM6ASCKnXlxsj04c0= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.32.7 h1:sOOMI+OpBU4E7CuWv2qd2vM/fKtzKdirPLvkdf4vkvA= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.32.7 h1:nonF0R35EO4YBL7cX0U0cX0VmKEcANti6xpZwZRg/iI= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.32.7/go.mod h1:/G0zPXsUx5gZUd6ryJakuDo4VR7EJScegf1ZNK8xIGs= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.8.8 h1:gJotWbuzSbr350EljD1zTNy3l4NiigjDVeVBWf7ERgk= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.8.8/go.mod h1:Cy0FEJrgXiz3UbLX/ZRlHPQxq605mGwz14ac+peTwQo= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.32.8 h1:ehU1r1DPZfv3Qfi0r7C24UAi0sozSwiSHtqwD1sdL8k= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.32.8 h1:FJ3zlcMfrS9iv06vzg1V73RlfrHZPsyfdkKrqGYAT4E= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.32.8/go.mod h1:/G0zPXsUx5gZUd6ryJakuDo4VR7EJScegf1ZNK8xIGs= github.com/MakeNowJust/heredoc v1.0.0 h1:cXCdzVdstXyiTqTvfqk9SDHpKNjxuom+DOlyEeQ4pzQ= github.com/MakeNowJust/heredoc v1.0.0/go.mod h1:mG5amYoWBHf8vpLOuehzbGGw0EHxpZZ6lCpQ4fNJ8LE= github.com/Masterminds/goutils v1.1.0/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU= @@ -1065,7 +1065,7 @@ github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108 github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= github.com/onsi/ginkgo v1.16.4 h1:29JGrr5oVBm5ulCWet69zQkzWipVXIol6ygQUe/EzNc= github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0= -github.com/onsi/ginkgo/v2 v2.1.4 h1:GNapqRSid3zijZ9H77KrgVG4/8KqiyRsxcSxe+7ApXY= +github.com/onsi/ginkgo/v2 v2.1.6 h1:Fx2POJZfKRQcM1pH49qSZiYeu319wji004qX+GDovrU= github.com/onsi/gomega v0.0.0-20151007035656-2152b45fa28a/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= @@ -1074,7 +1074,7 @@ github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoT github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.10.3/go.mod h1:V9xEwhxec5O8UDM77eCW8vLymOMltsqPVYWrpDsH8xc= github.com/onsi/gomega v1.16.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= -github.com/onsi/gomega v1.19.0 h1:4ieX6qQjPP/BfC3mpsAtIGGlxTWPeA3Inl/7DtXw1tw= +github.com/onsi/gomega v1.20.1 h1:PA/3qinGoukvymdIDV8pii6tiZgC8kbmJO6Z5+b002Q= github.com/opencontainers/go-digest v0.0.0-20170106003457-a6d0ee40d420/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= github.com/opencontainers/go-digest v0.0.0-20180430190053-c9281466c8b2/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= @@ -2188,15 +2188,15 @@ k8s.io/api v0.20.1/go.mod h1:KqwcCVogGxQY3nBlRpwt+wpAMF/KjaCc7RpywacvqUo= k8s.io/api v0.20.4/go.mod h1:++lNL1AJMkDymriNniQsWRkMDzRaX2Y/POTUi8yvqYQ= k8s.io/api v0.20.6/go.mod h1:X9e8Qag6JV/bL5G6bU8sdVRltWKmdHsFUGS3eVndqE8= k8s.io/api v0.22.4/go.mod h1:Rgs+9gIGYC5laXQSZZ9JqT5NevNgoGiOdVWi1BAB3qk= -k8s.io/api v0.25.0 h1:H+Q4ma2U/ww0iGB78ijZx6DRByPz6/733jIuFpX70e0= -k8s.io/api v0.25.0/go.mod h1:ttceV1GyV1i1rnmvzT3BST08N6nGt+dudGrquzVQWPk= +k8s.io/api v0.25.1 h1:yL7du50yc93k17nH/Xe9jujAYrcDkI/i5DL1jPz4E3M= +k8s.io/api v0.25.1/go.mod h1:hh4itDvrWSJsmeUc28rIFNri8MatNAAxJjKcQmhX6TU= k8s.io/apimachinery v0.19.1/go.mod h1:DnPGDnARWFvYa3pMHgSxtbZb7gpzzAZ1pTfaUNDVlmA= k8s.io/apimachinery v0.20.1/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU= k8s.io/apimachinery v0.20.4/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU= k8s.io/apimachinery v0.20.6/go.mod h1:ejZXtW1Ra6V1O5H8xPBGz+T3+4gfkTCeExAHKU57MAc= k8s.io/apimachinery v0.22.4/go.mod h1:yU6oA6Gnax9RrxGzVvPFFJ+mpnW6PBSqp0sx0I0HHW0= -k8s.io/apimachinery v0.25.0 h1:MlP0r6+3XbkUG2itd6vp3oxbtdQLQI94fD5gCS+gnoU= -k8s.io/apimachinery v0.25.0/go.mod h1:qMx9eAk0sZQGsXGu86fab8tZdffHbwUfsvzqKn4mfB0= +k8s.io/apimachinery v0.25.1 h1:t0XrnmCEHVgJlR2arwO8Awp9ylluDic706WePaYCBTI= +k8s.io/apimachinery v0.25.1/go.mod h1:hqqA1X0bsgsxI6dXsJ4HnNTBOmJNxyPp8dw3u2fSHwA= k8s.io/apiserver v0.20.1/go.mod h1:ro5QHeQkgMS7ZGpvf4tSMx6bBOgPfE+f52KwvXfScaU= k8s.io/apiserver v0.20.4/go.mod h1:Mc80thBKOyy7tbvFtB4kJv1kbdD0eIH8k8vianJcbFM= k8s.io/apiserver v0.20.6/go.mod h1:QIJXNt6i6JB+0YQRNcS0hdRHJlMhflFmsBDeSgT1r8Q= @@ -2204,8 +2204,8 @@ k8s.io/client-go v0.19.1/go.mod h1:AZOIVSI9UUtQPeJD3zJFp15CEhSjRgAuQP5PWRJrCIQ= k8s.io/client-go v0.20.1/go.mod h1:/zcHdt1TeWSd5HoUe6elJmHSQ6uLLgp4bIJHVEuy+/Y= k8s.io/client-go v0.20.4/go.mod h1:LiMv25ND1gLUdBeYxBIwKpkSC5IsozMMmOOeSJboP+k= k8s.io/client-go v0.20.6/go.mod h1:nNQMnOvEUEsOzRRFIIkdmYOjAZrC8bgq0ExboWSU1I0= -k8s.io/client-go v0.25.0 h1:CVWIaCETLMBNiTUta3d5nzRbXvY5Hy9Dpl+VvREpu5E= -k8s.io/client-go v0.25.0/go.mod h1:lxykvypVfKilxhTklov0wz1FoaUZ8X4EwbhS6rpRfN8= +k8s.io/client-go v0.25.1 h1:uFj4AJKtE1/ckcSKz8IhgAuZTdRXZDKev8g387ndD58= +k8s.io/client-go v0.25.1/go.mod h1:rdFWTLV/uj2C74zGbQzOsmXPUtMAjSf7ajil4iJUNKo= k8s.io/cluster-bootstrap v0.22.4 h1:2ZhV/1K4GiCrnmDHHbBnN3bERWn+Nxrtxmxp6uYYThI= k8s.io/cluster-bootstrap v0.22.4/go.mod h1:fTQZ6u9G6fg2LHhB8nEgZLnXIhCDSRYuLUUS5pgW8RY= k8s.io/component-base v0.20.1/go.mod h1:guxkoJnNoh8LNrbtiQOlyp2Y2XFCZQmrcg2n/DeYNLk= From 82132ebb93f9208ac594f41532d7c7bf96c3a5e3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 19 Sep 2022 20:20:49 +0000 Subject: [PATCH 510/545] Bump go.opentelemetry.io/otel/sdk from 1.9.0 to 1.10.0 Bumps [go.opentelemetry.io/otel/sdk](https://github.com/open-telemetry/opentelemetry-go) from 1.9.0 to 1.10.0. - [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.9.0...v1.10.0) --- updated-dependencies: - dependency-name: go.opentelemetry.io/otel/sdk dependency-type: direct:production update-type: version-update:semver-minor ... 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 9ceb160d9c..427bf29370 100644 --- a/go.mod +++ b/go.mod @@ -68,7 +68,7 @@ require ( github.com/zchee/go-vmnet v0.0.0-20161021174912-97ebf9174097 go.opencensus.io v0.23.0 go.opentelemetry.io/otel v1.10.0 - go.opentelemetry.io/otel/sdk v1.9.0 + go.opentelemetry.io/otel/sdk v1.10.0 go.opentelemetry.io/otel/trace v1.10.0 golang.org/x/build v0.0.0-20190927031335-2835ba2e683f golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4 diff --git a/go.sum b/go.sum index de52a80e3a..b1e7854448 100644 --- a/go.sum +++ b/go.sum @@ -1422,8 +1422,8 @@ go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0 h1:9NkMW03 go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ= go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs= -go.opentelemetry.io/otel/sdk v1.9.0 h1:LNXp1vrr83fNXTHgU8eO89mhzxb/bbWAsHG6fNf3qWo= -go.opentelemetry.io/otel/sdk v1.9.0/go.mod h1:AEZc8nt5bd2F7BC24J5R0mrjYnpEgYHyTcM/vrSple4= +go.opentelemetry.io/otel/sdk v1.10.0 h1:jZ6K7sVn04kk/3DNUdJ4mqRlGDiXAVuIG+MMENpTNdY= +go.opentelemetry.io/otel/sdk v1.10.0/go.mod h1:vO06iKzD5baltJz1zarxMCNHFpUlUiOy4s65ECtn6kE= go.opentelemetry.io/otel/trace v1.10.0 h1:npQMbR8o7mum8uF95yFbOEJffhs1sbCOfDh8zAJiH5E= go.opentelemetry.io/otel/trace v1.10.0/go.mod h1:Sij3YYczqAdz+EhmGhE6TpTxUO5/F/AzrK+kxfGqySM= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= From 68a51d8a83c4e52c00620e5a6ddff091cce10073 Mon Sep 17 00:00:00 2001 From: klaases Date: Tue, 30 Aug 2022 14:55:36 -0700 Subject: [PATCH 511/545] use socket_vmnet --- pkg/drivers/qemu/qemu.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkg/drivers/qemu/qemu.go b/pkg/drivers/qemu/qemu.go index ab08bf0a87..47f49a6aad 100644 --- a/pkg/drivers/qemu/qemu.go +++ b/pkg/drivers/qemu/qemu.go @@ -445,7 +445,9 @@ func (d *Driver) Start() error { d.diskPath()) } - if stdout, stderr, err := cmdOutErr(d.Program, startCmd...); err != nil { + socketCmd := append([]string{"/var/run/socket_vmnet", d.Program}, startCmd...) + fmt.Printf("socketCmd: %v\n", socketCmd) + if stdout, stderr, err := cmdOutErr("/opt/socket_vmnet/bin/socket_vmnet_client", socketCmd...); err != nil { fmt.Printf("OUTPUT: %s\n", stdout) fmt.Printf("ERROR: %s\n", stderr) return err From ef31fc272c2e42168fce2b2d0bf207d711275116 Mon Sep 17 00:00:00 2001 From: klaases Date: Tue, 30 Aug 2022 14:57:42 -0700 Subject: [PATCH 512/545] disable bail on qemu service --- cmd/minikube/cmd/service.go | 5 ----- 1 file changed, 5 deletions(-) diff --git a/cmd/minikube/cmd/service.go b/cmd/minikube/cmd/service.go index bbba3d5459..b37b98c370 100644 --- a/cmd/minikube/cmd/service.go +++ b/cmd/minikube/cmd/service.go @@ -86,11 +86,6 @@ var serviceCmd = &cobra.Command{ cname := ClusterFlagValue() co := mustload.Healthy(cname) - // Bail cleanly for qemu2 until implemented - if driver.IsQEMU(co.Config.Driver) { - exit.Message(reason.Unimplemented, "minikube service is not currently implemented with the qemu2 driver. See https://github.com/kubernetes/minikube/issues/14146 for details.") - } - var services service.URLs services, err := service.GetServiceURLs(co.API, co.Config.Name, namespace, serviceURLTemplate) if err != nil { From b3c8149eae341c0397b68742c4b0134c67039aa4 Mon Sep 17 00:00:00 2001 From: klaases Date: Tue, 30 Aug 2022 15:00:59 -0700 Subject: [PATCH 513/545] add polyverse for testing --- polyverse-arm64.yaml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 polyverse-arm64.yaml diff --git a/polyverse-arm64.yaml b/polyverse-arm64.yaml new file mode 100644 index 0000000000..ba4d180149 --- /dev/null +++ b/polyverse-arm64.yaml @@ -0,0 +1,20 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: polyverse +spec: + selector: + matchLabels: + run: load-balancer-example + replicas: 2 + template: + metadata: + labels: + run: load-balancer-example + spec: + containers: + - name: polyverse + image: polyverse/node-echo-server + ports: + - containerPort: 8080 + protocol: TCP \ No newline at end of file From 0c1b8ea6ca74d3687286ed0172e7418340efdb6e Mon Sep 17 00:00:00 2001 From: klaases Date: Tue, 13 Sep 2022 15:03:49 -0700 Subject: [PATCH 514/545] if socket network with, start with socket_vmnet --- pkg/drivers/qemu/qemu.go | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkg/drivers/qemu/qemu.go b/pkg/drivers/qemu/qemu.go index 47f49a6aad..1e89de8e0c 100644 --- a/pkg/drivers/qemu/qemu.go +++ b/pkg/drivers/qemu/qemu.go @@ -445,13 +445,19 @@ func (d *Driver) Start() error { d.diskPath()) } - socketCmd := append([]string{"/var/run/socket_vmnet", d.Program}, startCmd...) - fmt.Printf("socketCmd: %v\n", socketCmd) - if stdout, stderr, err := cmdOutErr("/opt/socket_vmnet/bin/socket_vmnet_client", socketCmd...); err != nil { + // If socket network, start with socket_vmnet. + startProgram := d.Program + if d.Network == "socket" { + startProgram = "/opt/socket_vmnet/bin/socket_vmnet_client" // get flag. + startCmd = append([]string{"/var/run/socket_vmnet", d.Program}, startCmd...) // get flag. + } + + if stdout, stderr, err := cmdOutErr(startProgram, startCmd...); err != nil { fmt.Printf("OUTPUT: %s\n", stdout) fmt.Printf("ERROR: %s\n", stderr) return err } + log.Infof("Waiting for VM to start (ssh -p %d docker@localhost)...", d.SSHPort) return WaitForTCPWithDelay(fmt.Sprintf("localhost:%d", d.SSHPort), time.Second) From 080df944fcfec13bdbe6a299db7472ddcf3889c7 Mon Sep 17 00:00:00 2001 From: klaases Date: Tue, 13 Sep 2022 15:41:34 -0700 Subject: [PATCH 515/545] add socket vmnet cluster config types --- pkg/minikube/config/types.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkg/minikube/config/types.go b/pkg/minikube/config/types.go index 0faaabec37..10e6ef8a8a 100644 --- a/pkg/minikube/config/types.go +++ b/pkg/minikube/config/types.go @@ -102,6 +102,8 @@ type ClusterConfig struct { DisableOptimizations bool DisableMetrics bool CustomQemuFirmwarePath string + SocketVMnetClientPath string + SocketVMnetPath string } // KubernetesConfig contains the parameters used to configure the VM Kubernetes. From 18fda4be13e781201510a042d6fde128d005ca01 Mon Sep 17 00:00:00 2001 From: klaases Date: Tue, 13 Sep 2022 15:42:23 -0700 Subject: [PATCH 516/545] add socket vmnet and client path flags --- cmd/minikube/cmd/start_flags.go | 10 ++++++++++ pkg/drivers/qemu/qemu.go | 6 ++++-- site/content/en/docs/commands/start.md | 2 ++ 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/cmd/minikube/cmd/start_flags.go b/cmd/minikube/cmd/start_flags.go index e186bc45ab..fc17fefe1b 100644 --- a/cmd/minikube/cmd/start_flags.go +++ b/cmd/minikube/cmd/start_flags.go @@ -137,6 +137,8 @@ const ( disableOptimizations = "disable-optimizations" disableMetrics = "disable-metrics" qemuFirmwarePath = "qemu-firmware-path" + socketVMnetClientPath = "socket-vmnet-client-path" + socketVMnetPath = "socket-vmnet-path" ) var ( @@ -274,6 +276,10 @@ func initNetworkingFlags() { startCmd.Flags().String(sshSSHUser, defaultSSHUser, "SSH user (ssh driver only)") startCmd.Flags().String(sshSSHKey, "", "SSH key (ssh driver only)") startCmd.Flags().Int(sshSSHPort, defaultSSHPort, "SSH port (ssh driver only)") + + // socket vmnet + startCmd.Flags().String(socketVMnetClientPath, "/opt/socket_vmnet/bin/socket_vmnet_client", "Path to the socket vmnet client binary") + startCmd.Flags().String(socketVMnetPath, "/var/run/socket_vmnet", "Path to socket vmnet binary") } // ClusterFlagValue returns the current cluster name based on flags @@ -528,6 +534,8 @@ func generateNewConfigFromFlags(cmd *cobra.Command, k8sVersion string, rtime str DisableOptimizations: viper.GetBool(disableOptimizations), DisableMetrics: viper.GetBool(disableMetrics), CustomQemuFirmwarePath: viper.GetString(qemuFirmwarePath), + SocketVMnetClientPath: viper.GetString(socketVMnetClientPath), + SocketVMnetPath: viper.GetString(socketVMnetPath), KubernetesConfig: config.KubernetesConfig{ KubernetesVersion: k8sVersion, ClusterName: ClusterFlagValue(), @@ -747,6 +755,8 @@ func updateExistingConfigFromFlags(cmd *cobra.Command, existing *config.ClusterC updateStringFromFlag(cmd, &cc.BinaryMirror, binaryMirror) updateBoolFromFlag(cmd, &cc.DisableOptimizations, disableOptimizations) updateStringFromFlag(cmd, &cc.CustomQemuFirmwarePath, qemuFirmwarePath) + updateStringFromFlag(cmd, &cc.SocketVMnetClientPath, socketVMnetClientPath) + updateStringFromFlag(cmd, &cc.SocketVMnetPath, cc.SocketVMnetPath) if cmd.Flags().Changed(kubernetesVersion) { cc.KubernetesConfig.KubernetesVersion = getKubernetesVersion(existing) diff --git a/pkg/drivers/qemu/qemu.go b/pkg/drivers/qemu/qemu.go index 1e89de8e0c..07cc176123 100644 --- a/pkg/drivers/qemu/qemu.go +++ b/pkg/drivers/qemu/qemu.go @@ -38,6 +38,7 @@ import ( "github.com/docker/machine/libmachine/ssh" "github.com/docker/machine/libmachine/state" "github.com/pkg/errors" + "github.com/spf13/viper" pkgdrivers "k8s.io/minikube/pkg/drivers" ) @@ -448,8 +449,9 @@ func (d *Driver) Start() error { // If socket network, start with socket_vmnet. startProgram := d.Program if d.Network == "socket" { - startProgram = "/opt/socket_vmnet/bin/socket_vmnet_client" // get flag. - startCmd = append([]string{"/var/run/socket_vmnet", d.Program}, startCmd...) // get flag. + startProgram = viper.GetString("socket-vmnet-client-path") + socketVMnetPath := viper.GetString("socket-vmnet-path") + startCmd = append([]string{socketVMnetPath, d.Program}, startCmd...) } if stdout, stderr, err := cmdOutErr(startProgram, startCmd...); err != nil { diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index f103e55b21..c3e325a0b0 100644 --- a/site/content/en/docs/commands/start.md +++ b/site/content/en/docs/commands/start.md @@ -105,6 +105,8 @@ minikube start [flags] --qemu-firmware-path string Path to the qemu firmware file. Defaults: For Linux, the default firmware location. For macOS, the brew installation location. For Windows, C:\Program Files\qemu\share --registry-mirror strings Registry mirrors to pass to the Docker daemon --service-cluster-ip-range string The CIDR to be used for service cluster IPs. (default "10.96.0.0/12") + --socket-vmnet-client-path string Path to the socket vmnet client binary. (default "/opt/socket_vmnet/bin/socket_vmnet_client") + --socket-vmnet-path string Path to socket vmnet binary. (default "/var/run/socket_vmnet") --ssh-ip-address string IP address (ssh driver only) --ssh-key string SSH key (ssh driver only) --ssh-port int SSH port (ssh driver only) (default 22) From 5b7e19e1727e945ddb6e7d3dbaceaac88855dee8 Mon Sep 17 00:00:00 2001 From: klaases Date: Tue, 13 Sep 2022 15:44:24 -0700 Subject: [PATCH 517/545] fix socketVMnetPath --- cmd/minikube/cmd/start_flags.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/minikube/cmd/start_flags.go b/cmd/minikube/cmd/start_flags.go index fc17fefe1b..e35db13f79 100644 --- a/cmd/minikube/cmd/start_flags.go +++ b/cmd/minikube/cmd/start_flags.go @@ -756,7 +756,7 @@ func updateExistingConfigFromFlags(cmd *cobra.Command, existing *config.ClusterC updateBoolFromFlag(cmd, &cc.DisableOptimizations, disableOptimizations) updateStringFromFlag(cmd, &cc.CustomQemuFirmwarePath, qemuFirmwarePath) updateStringFromFlag(cmd, &cc.SocketVMnetClientPath, socketVMnetClientPath) - updateStringFromFlag(cmd, &cc.SocketVMnetPath, cc.SocketVMnetPath) + updateStringFromFlag(cmd, &cc.SocketVMnetPath, socketVMnetPath) if cmd.Flags().Changed(kubernetesVersion) { cc.KubernetesConfig.KubernetesVersion = getKubernetesVersion(existing) From 42f792739d981e73db8aaa603ec53f620f1e0ef4 Mon Sep 17 00:00:00 2001 From: klaases Date: Tue, 13 Sep 2022 15:47:20 -0700 Subject: [PATCH 518/545] remove polyverse --- polyverse-arm64.yaml | 20 -------------------- 1 file changed, 20 deletions(-) delete mode 100644 polyverse-arm64.yaml diff --git a/polyverse-arm64.yaml b/polyverse-arm64.yaml deleted file mode 100644 index ba4d180149..0000000000 --- a/polyverse-arm64.yaml +++ /dev/null @@ -1,20 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: polyverse -spec: - selector: - matchLabels: - run: load-balancer-example - replicas: 2 - template: - metadata: - labels: - run: load-balancer-example - spec: - containers: - - name: polyverse - image: polyverse/node-echo-server - ports: - - containerPort: 8080 - protocol: TCP \ No newline at end of file From 87175c739526245aea971fcac50f88cf1cd6de37 Mon Sep 17 00:00:00 2001 From: klaases Date: Tue, 13 Sep 2022 16:38:59 -0700 Subject: [PATCH 519/545] revert changes --- cmd/minikube/cmd/service.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/cmd/minikube/cmd/service.go b/cmd/minikube/cmd/service.go index b37b98c370..bbba3d5459 100644 --- a/cmd/minikube/cmd/service.go +++ b/cmd/minikube/cmd/service.go @@ -86,6 +86,11 @@ var serviceCmd = &cobra.Command{ cname := ClusterFlagValue() co := mustload.Healthy(cname) + // Bail cleanly for qemu2 until implemented + if driver.IsQEMU(co.Config.Driver) { + exit.Message(reason.Unimplemented, "minikube service is not currently implemented with the qemu2 driver. See https://github.com/kubernetes/minikube/issues/14146 for details.") + } + var services service.URLs services, err := service.GetServiceURLs(co.API, co.Config.Name, namespace, serviceURLTemplate) if err != nil { From 787685e073c81d2e2d085399828af60f9313075f Mon Sep 17 00:00:00 2001 From: klaases Date: Tue, 13 Sep 2022 16:51:40 -0700 Subject: [PATCH 520/545] allow network flag with qemu --- cmd/minikube/cmd/start_flags.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/minikube/cmd/start_flags.go b/cmd/minikube/cmd/start_flags.go index e35db13f79..a0feb3fc99 100644 --- a/cmd/minikube/cmd/start_flags.go +++ b/cmd/minikube/cmd/start_flags.go @@ -467,8 +467,8 @@ func generateNewConfigFromFlags(cmd *cobra.Command, k8sVersion string, rtime str out.WarningT("With --network-plugin=cni, you will need to provide your own CNI. See --cni flag as a user-friendly alternative") } - if !(driver.IsKIC(drvName) || driver.IsKVM(drvName)) && viper.GetString(network) != "" { - out.WarningT("--network flag is only valid with the docker/podman and KVM drivers, it will be ignored") + if !(driver.IsKIC(drvName) || driver.IsKVM(drvName) || driver.IsQEMU(drvName)) && viper.GetString(network) != "" { + out.WarningT("--network flag is only valid with the docker/podman, KVM and Qemu drivers, it will be ignored") } checkNumaCount(k8sVersion) From 19f0b183577817b3759200baf9dfb71b138d66d7 Mon Sep 17 00:00:00 2001 From: klaases Date: Tue, 13 Sep 2022 17:06:29 -0700 Subject: [PATCH 521/545] issue warning for qemu with socket_vmnet flagset --- cmd/minikube/cmd/start_flags.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cmd/minikube/cmd/start_flags.go b/cmd/minikube/cmd/start_flags.go index a0feb3fc99..f73f32bb61 100644 --- a/cmd/minikube/cmd/start_flags.go +++ b/cmd/minikube/cmd/start_flags.go @@ -471,6 +471,10 @@ func generateNewConfigFromFlags(cmd *cobra.Command, k8sVersion string, rtime str out.WarningT("--network flag is only valid with the docker/podman, KVM and Qemu drivers, it will be ignored") } + if driver.IsQEMU(drvName) && viper.GetString(network) == "socket" { + out.WarningT("--driver=qemu with --network=socket for 'socket_vmnet' is experimental") + } + checkNumaCount(k8sVersion) checkExtraDiskOptions(cmd, drvName) From 83c265bdaed7814b19243137364a4b478ffe5cb2 Mon Sep 17 00:00:00 2001 From: klaases Date: Tue, 13 Sep 2022 17:37:36 -0700 Subject: [PATCH 522/545] remove hard-coded network user --- pkg/minikube/registry/drvs/qemu2/qemu2.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/minikube/registry/drvs/qemu2/qemu2.go b/pkg/minikube/registry/drvs/qemu2/qemu2.go index a9cdbcb6bc..2676abc37a 100644 --- a/pkg/minikube/registry/drvs/qemu2/qemu2.go +++ b/pkg/minikube/registry/drvs/qemu2/qemu2.go @@ -177,7 +177,7 @@ func configure(cc config.ClusterConfig, n config.Node) (interface{}, error) { CPUType: qemuCPU, Firmware: qemuFirmware, VirtioDrives: false, - Network: "user", + Network: "", CacheMode: "default", IOMode: "threads", }, nil From 847b7731c623364d396ed41e19e5851f4929c3d0 Mon Sep 17 00:00:00 2001 From: klaases Date: Tue, 13 Sep 2022 18:03:58 -0700 Subject: [PATCH 523/545] improve warning wording --- cmd/minikube/cmd/start_flags.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/minikube/cmd/start_flags.go b/cmd/minikube/cmd/start_flags.go index f73f32bb61..eee53fad44 100644 --- a/cmd/minikube/cmd/start_flags.go +++ b/cmd/minikube/cmd/start_flags.go @@ -472,7 +472,7 @@ func generateNewConfigFromFlags(cmd *cobra.Command, k8sVersion string, rtime str } if driver.IsQEMU(drvName) && viper.GetString(network) == "socket" { - out.WarningT("--driver=qemu with --network=socket for 'socket_vmnet' is experimental") + out.WarningT("Using qemu with --network=socket for 'socket_vmnet' is experimental") } checkNumaCount(k8sVersion) From 602528ca39af30c31532cbe2eb240f72c2b0cf8f Mon Sep 17 00:00:00 2001 From: klaases Date: Tue, 13 Sep 2022 18:07:59 -0700 Subject: [PATCH 524/545] resolve unknown network --- pkg/drivers/qemu/qemu.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkg/drivers/qemu/qemu.go b/pkg/drivers/qemu/qemu.go index 07cc176123..8d3daea429 100644 --- a/pkg/drivers/qemu/qemu.go +++ b/pkg/drivers/qemu/qemu.go @@ -409,6 +409,10 @@ func (d *Driver) Start() error { startCmd = append(startCmd, "-nic", fmt.Sprintf("user,model=virtio,hostfwd=tcp::%d-:22,hostfwd=tcp::%d-:2376,hostname=%s", d.SSHPort, d.EnginePort, d.GetMachineName()), ) + case "socket": + startCmd = append(startCmd, + "-nic", fmt.Sprintf("socket,model=virtio,sock=%s", d.NetworkSocket), + ) case "tap": startCmd = append(startCmd, "-nic", fmt.Sprintf("tap,model=virtio,ifname=%s,script=no,downscript=no", d.NetworkInterface), From e37eb568c8c50b3d43ec15215067e87a5ecc1c75 Mon Sep 17 00:00:00 2001 From: klaases Date: Tue, 20 Sep 2022 14:29:39 -0700 Subject: [PATCH 525/545] if network flag unset, default to "user" network --- pkg/minikube/registry/drvs/qemu2/qemu2.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkg/minikube/registry/drvs/qemu2/qemu2.go b/pkg/minikube/registry/drvs/qemu2/qemu2.go index 2676abc37a..f213d840b5 100644 --- a/pkg/minikube/registry/drvs/qemu2/qemu2.go +++ b/pkg/minikube/registry/drvs/qemu2/qemu2.go @@ -158,6 +158,12 @@ func configure(cc config.ClusterConfig, n config.Node) (interface{}, error) { if err != nil { return nil, err } + qemuNetwork := cc.Network + if qemuNetwork == "" { + qemuNetwork = "user" + // TODO: on next minor release, default to "socket". On next point release, default to "user". + } + return qemu.Driver{ BaseDriver: &drivers.BaseDriver{ MachineName: name, @@ -177,7 +183,7 @@ func configure(cc config.ClusterConfig, n config.Node) (interface{}, error) { CPUType: qemuCPU, Firmware: qemuFirmware, VirtioDrives: false, - Network: "", + Network: qemuNetwork, CacheMode: "default", IOMode: "threads", }, nil From e064ba16cfb73c91fec3eb0e37edba03384a03e4 Mon Sep 17 00:00:00 2001 From: klaases Date: Tue, 20 Sep 2022 14:30:30 -0700 Subject: [PATCH 526/545] return error on qemu socket_vmnet network flags not yet implemented --- pkg/drivers/qemu/qemu.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkg/drivers/qemu/qemu.go b/pkg/drivers/qemu/qemu.go index 8d3daea429..9eee011a59 100644 --- a/pkg/drivers/qemu/qemu.go +++ b/pkg/drivers/qemu/qemu.go @@ -410,9 +410,8 @@ func (d *Driver) Start() error { "-nic", fmt.Sprintf("user,model=virtio,hostfwd=tcp::%d-:22,hostfwd=tcp::%d-:2376,hostname=%s", d.SSHPort, d.EnginePort, d.GetMachineName()), ) case "socket": - startCmd = append(startCmd, - "-nic", fmt.Sprintf("socket,model=virtio,sock=%s", d.NetworkSocket), - ) + // TODO: finalize actual socket_vmnet network flags. + return errors.New("qemu socket_vmnet network flags are not yet implemented") case "tap": startCmd = append(startCmd, "-nic", fmt.Sprintf("tap,model=virtio,ifname=%s,script=no,downscript=no", d.NetworkInterface), From 207ee7ec0a7debf8e541ad49f21f670c8fb83567 Mon Sep 17 00:00:00 2001 From: klaases Date: Tue, 20 Sep 2022 14:45:23 -0700 Subject: [PATCH 527/545] trim todo --- pkg/minikube/registry/drvs/qemu2/qemu2.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/minikube/registry/drvs/qemu2/qemu2.go b/pkg/minikube/registry/drvs/qemu2/qemu2.go index f213d840b5..40305eb1d0 100644 --- a/pkg/minikube/registry/drvs/qemu2/qemu2.go +++ b/pkg/minikube/registry/drvs/qemu2/qemu2.go @@ -161,7 +161,7 @@ func configure(cc config.ClusterConfig, n config.Node) (interface{}, error) { qemuNetwork := cc.Network if qemuNetwork == "" { qemuNetwork = "user" - // TODO: on next minor release, default to "socket". On next point release, default to "user". + // TODO: on next minor release, default to "socket". } return qemu.Driver{ From d03b4a2bfb4cf3809cab700c934981d138da44f6 Mon Sep 17 00:00:00 2001 From: klaases Date: Tue, 20 Sep 2022 14:56:52 -0700 Subject: [PATCH 528/545] clean exit pending socket_vmnet flags --- pkg/drivers/qemu/qemu.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkg/drivers/qemu/qemu.go b/pkg/drivers/qemu/qemu.go index 9eee011a59..089a597b15 100644 --- a/pkg/drivers/qemu/qemu.go +++ b/pkg/drivers/qemu/qemu.go @@ -41,6 +41,8 @@ import ( "github.com/spf13/viper" pkgdrivers "k8s.io/minikube/pkg/drivers" + "k8s.io/minikube/pkg/minikube/exit" + "k8s.io/minikube/pkg/minikube/reason" ) const ( @@ -410,8 +412,8 @@ func (d *Driver) Start() error { "-nic", fmt.Sprintf("user,model=virtio,hostfwd=tcp::%d-:22,hostfwd=tcp::%d-:2376,hostname=%s", d.SSHPort, d.EnginePort, d.GetMachineName()), ) case "socket": - // TODO: finalize actual socket_vmnet network flags. - return errors.New("qemu socket_vmnet network flags are not yet implemented") + // TODO: implement final socket_vmnet network flags. + exit.Message(reason.Unimplemented, "socket_vmnet network flags are not yet implemented with the qemu2 driver.\n See https://github.com/kubernetes/minikube/pull/14890 for details.") case "tap": startCmd = append(startCmd, "-nic", fmt.Sprintf("tap,model=virtio,ifname=%s,script=no,downscript=no", d.NetworkInterface), From ddd31262bd7482f87333b75ae5b24a54445fa1c4 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Wed, 21 Sep 2022 16:35:34 +0000 Subject: [PATCH 529/545] Update auto-generated docs and translations --- site/content/en/docs/commands/start.md | 4 ++-- translations/de.json | 5 +++++ translations/es.json | 5 +++++ translations/fr.json | 5 +++++ translations/ja.json | 5 +++++ translations/ko.json | 6 +++++- translations/pl.json | 6 +++++- translations/ru.json | 6 +++++- translations/strings.txt | 6 +++++- translations/zh-CN.json | 5 +++++ 10 files changed, 47 insertions(+), 6 deletions(-) diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index c3e325a0b0..eb91177a5f 100644 --- a/site/content/en/docs/commands/start.md +++ b/site/content/en/docs/commands/start.md @@ -105,8 +105,8 @@ minikube start [flags] --qemu-firmware-path string Path to the qemu firmware file. Defaults: For Linux, the default firmware location. For macOS, the brew installation location. For Windows, C:\Program Files\qemu\share --registry-mirror strings Registry mirrors to pass to the Docker daemon --service-cluster-ip-range string The CIDR to be used for service cluster IPs. (default "10.96.0.0/12") - --socket-vmnet-client-path string Path to the socket vmnet client binary. (default "/opt/socket_vmnet/bin/socket_vmnet_client") - --socket-vmnet-path string Path to socket vmnet binary. (default "/var/run/socket_vmnet") + --socket-vmnet-client-path string Path to the socket vmnet client binary (default "/opt/socket_vmnet/bin/socket_vmnet_client") + --socket-vmnet-path string Path to socket vmnet binary (default "/var/run/socket_vmnet") --ssh-ip-address string IP address (ssh driver only) --ssh-key string SSH key (ssh driver only) --ssh-port int SSH port (ssh driver only) (default 22) diff --git a/translations/de.json b/translations/de.json index 6243d5c08e..b4407a1cfb 100644 --- a/translations/de.json +++ b/translations/de.json @@ -22,6 +22,7 @@ "--container-runtime must be set to \"containerd\" or \"cri-o\" for rootless": "--container-runtime muss für rootless auf \"containerd\" oder \"cri-o\" gesetzt sein", "--kvm-numa-count range is 1-8": "Der Wertebereich für --kvm-numa-count ist 1-8", "--network flag is only valid with the docker/podman and KVM drivers, it will be ignored": "Der Parameter --network kann nur mit dem docker/podman und den KVM Treibern verwendet werden, er wird ignoriert werden", + "--network flag is only valid with the docker/podman, KVM and Qemu drivers, it will be ignored": "", "1) Recreate the cluster with Kubernetes {{.new}}, by running:\n\t \n\t\t minikube delete{{.profile}}\n\t\t minikube start{{.profile}} --kubernetes-version={{.prefix}}{{.new}}\n\t \n\t\t2) Create a second cluster with Kubernetes {{.new}}, by running:\n\t \n\t\t minikube start -p {{.suggestedName}} --kubernetes-version={{.prefix}}{{.new}}\n\t \n\t\t3) Use the existing cluster at version Kubernetes {{.old}}, by running:\n\t \n\t\t minikube start{{.profile}} --kubernetes-version={{.prefix}}{{.old}}\n\t\t": "1) Erstellen Sie den Cluster mit Kubernetes {{.new}} neu, indem Sie folgende Befehle ausführen:\n\t \n\t\t minikube delete{{.profile}}\n\t\t minikube start{{.profile}} --kubernetes-version={{.prefix}}{{.new}}\n\t \n\t\t2) Erstellen Sie einen zweiten Cluster mit Kubernetes {{.new}}, indem Sie folgende Befehle ausführen:\n\t \n\t\t minikube start -p {{.suggestedName}} --kubernetes-version={{.prefix}}{{.new}}\n\t \n\t\t3) Verwenden Sie den existierenden Cluster mit Version {{.old}} von Kubernetes, indem Sie folgende Befehle ausführen:\n\t \n\t\t minikube start{{.profile}} --kubernetes-version={{.prefix}}{{.old}}\n\t\t", "1. Click on \"Docker for Desktop\" menu icon\n\t\t\t2. Click \"Preferences\"\n\t\t\t3. Click \"Resources\"\n\t\t\t4. Increase \"CPUs\" slider bar to 2 or higher\n\t\t\t5. Click \"Apply \u0026 Restart\"": "1. Klicken Sie auf das \"Docker für Desktop\" Menu Icon\n\t\t\t2. Klicken Sie auf \"Einstellungen\"\n\t\t\t3. Klicken Sie auf \"Resourcen\"\n\t\t\t4. Erhöhen Sie den Wert von \"CPUs\" auf 2 oder mehr\n\t\t\t5. Klicken Sie auf \"Anwenden \u0026 Neustarten\"", "1. Click on \"Docker for Desktop\" menu icon\n\t\t\t2. Click \"Preferences\"\n\t\t\t3. Click \"Resources\"\n\t\t\t4. Increase \"Memory\" slider bar to {{.recommend}} or higher\n\t\t\t5. Click \"Apply \u0026 Restart\"": "1. Klicken Sie auf das \"Docker für Desktop\" Menu Icon\n\t\t\t2. Klicken Sie auf \"Einstellungen\"\n\t\t\t3. Klicken Sie auf \"Resourcen\"\n\t\t\t4. Erhöhen Sie den Wert von \"Speicher\" auf {{.recommend}} oder mehr\n\t\t\t5. Klicken Sie auf \"Anwenden \u0026 Neustarten\"", @@ -458,8 +459,10 @@ "Output format. Accepted values: [json]": "Ausgabe Format. Akzeptierte Werte: [json]", "Outputs minikube shell completion for the given shell (bash, zsh or fish)\n\n\tThis depends on the bash-completion binary. Example installation instructions:\n\tOS X:\n\t\t$ brew install bash-completion\n\t\t$ source $(brew --prefix)/etc/bash_completion\n\t\t$ minikube completion bash \u003e ~/.minikube-completion # for bash users\n\t\t$ minikube completion zsh \u003e ~/.minikube-completion # for zsh users\n\t\t$ source ~/.minikube-completion\n\t\t$ minikube completion fish \u003e ~/.config/fish/completions/minikube.fish # for fish users\n\tUbuntu:\n\t\t$ apt-get install bash-completion\n\t\t$ source /etc/bash_completion\n\t\t$ source \u003c(minikube completion bash) # for bash users\n\t\t$ source \u003c(minikube completion zsh) # for zsh users\n\t\t$ minikube completion fish \u003e ~/.config/fish/completions/minikube.fish # for fish users\n\n\tAdditionally, you may want to output the completion to a file and source in your .bashrc\n\n\tNote for zsh users: [1] zsh completions are only supported in versions of zsh \u003e= 5.2\n\tNote for fish users: [2] please refer to this docs for more details https://fishshell.com/docs/current/#tab-completion\n": "", "Overwrite image even if same image:tag name exists": "Überschreibe das Image, auch wenn ein Image mit dem gleichen Image:Tag-Namen existiert", + "Path to socket vmnet binary": "", "Path to the Dockerfile to use (optional)": "Pfad des zu verwendenden Dockerfiles (optional)", "Path to the qemu firmware file. Defaults: For Linux, the default firmware location. For macOS, the brew installation location. For Windows, C:\\Program Files\\qemu\\share": "", + "Path to the socket vmnet client binary": "", "Pause": "", "Paused {{.count}} containers": "{{.count}} Container pausiert", "Paused {{.count}} containers in: {{.namespaces}}": "{{.count}} Container pausiert in: {{.namespaces}}", @@ -845,6 +848,7 @@ "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 qemu with --network=socket for 'socket_vmnet' is experimental": "", "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": "", @@ -996,6 +1000,7 @@ "scheduled stop is not supported on the none driver, skipping scheduling": "Das geplante Stoppen wird von none Treiber nicht unterstützt, überspringe Planung", "service {{.namespace_name}}/{{.service_name}} has no node port": "Service {{.namespace_name}}/{{.service_name}} hat keinen Node Port", "set tunnel bind address, empty or '*' indicates the tunnel should be available for all interfaces": "", + "socket_vmnet network flags are not yet implemented with the qemu2 driver.\n See https://github.com/kubernetes/minikube/pull/14890 for details.": "", "stat failed": "state Fehler", "status json failure": "Status json Fehler", "status text failure": "Status text Fehler", diff --git a/translations/es.json b/translations/es.json index 6b8932c24f..901baa3b3d 100644 --- a/translations/es.json +++ b/translations/es.json @@ -23,6 +23,7 @@ "--container-runtime must be set to \"containerd\" or \"cri-o\" for rootless": "--container-runtime debe ser configurado a \"containerd\" o \"crio-o\" para no usar usuario root", "--kvm-numa-count range is 1-8": "--kvm-numa-count el rango es 1-8", "--network flag is only valid with the docker/podman and KVM drivers, it will be ignored": "el flag --network es válido solamente con docker/podman y KVM, será ignorado", + "--network flag is only valid with the docker/podman, KVM and Qemu drivers, it will be ignored": "", "1) Recreate the cluster with Kubernetes {{.new}}, by running:\n\t \n\t\t minikube delete{{.profile}}\n\t\t minikube start{{.profile}} --kubernetes-version={{.prefix}}{{.new}}\n\t \n\t\t2) Create a second cluster with Kubernetes {{.new}}, by running:\n\t \n\t\t minikube start -p {{.suggestedName}} --kubernetes-version={{.prefix}}{{.new}}\n\t \n\t\t3) Use the existing cluster at version Kubernetes {{.old}}, by running:\n\t \n\t\t minikube start{{.profile}} --kubernetes-version={{.prefix}}{{.old}}\n\t\t": "", "1. Click on \"Docker for Desktop\" menu icon\n\t\t\t2. Click \"Preferences\"\n\t\t\t3. Click \"Resources\"\n\t\t\t4. Increase \"CPUs\" slider bar to 2 or higher\n\t\t\t5. Click \"Apply \u0026 Restart\"": "", "1. Click on \"Docker for Desktop\" menu icon\n\t\t\t2. Click \"Preferences\"\n\t\t\t3. Click \"Resources\"\n\t\t\t4. Increase \"Memory\" slider bar to {{.recommend}} or higher\n\t\t\t5. Click \"Apply \u0026 Restart\"": "", @@ -465,8 +466,10 @@ "Output format. Accepted values: [json, yaml]": "", "Outputs minikube shell completion for the given shell (bash, zsh or fish)\n\n\tThis depends on the bash-completion binary. Example installation instructions:\n\tOS X:\n\t\t$ brew install bash-completion\n\t\t$ source $(brew --prefix)/etc/bash_completion\n\t\t$ minikube completion bash \u003e ~/.minikube-completion # for bash users\n\t\t$ minikube completion zsh \u003e ~/.minikube-completion # for zsh users\n\t\t$ source ~/.minikube-completion\n\t\t$ minikube completion fish \u003e ~/.config/fish/completions/minikube.fish # for fish users\n\tUbuntu:\n\t\t$ apt-get install bash-completion\n\t\t$ source /etc/bash_completion\n\t\t$ source \u003c(minikube completion bash) # for bash users\n\t\t$ source \u003c(minikube completion zsh) # for zsh users\n\t\t$ minikube completion fish \u003e ~/.config/fish/completions/minikube.fish # for fish users\n\n\tAdditionally, you may want to output the completion to a file and source in your .bashrc\n\n\tNote for zsh users: [1] zsh completions are only supported in versions of zsh \u003e= 5.2\n\tNote for fish users: [2] please refer to this docs for more details https://fishshell.com/docs/current/#tab-completion\n": "", "Overwrite image even if same image:tag name exists": "", + "Path to socket vmnet binary": "", "Path to the Dockerfile to use (optional)": "", "Path to the qemu firmware file. Defaults: For Linux, the default firmware location. For macOS, the brew installation location. For Windows, C:\\Program Files\\qemu\\share": "", + "Path to the socket vmnet client binary": "", "Pause": "", "Paused {{.count}} containers": "", "Paused {{.count}} containers in: {{.namespaces}}": "", @@ -846,6 +849,7 @@ "Using image repository {{.name}}": "Utilizando el repositorio de imágenes {{.name}}", "Using image {{.registry}}{{.image}}": "", "Using image {{.registry}}{{.image}} (global image repository)": "", + "Using qemu with --network=socket for 'socket_vmnet' is experimental": "", "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": "", @@ -990,6 +994,7 @@ "scheduled stop is not supported on the none driver, skipping scheduling": "", "service {{.namespace_name}}/{{.service_name}} has no node port": "", "set tunnel bind address, empty or '*' indicates the tunnel should be available for all interfaces": "", + "socket_vmnet network flags are not yet implemented with the qemu2 driver.\n See https://github.com/kubernetes/minikube/pull/14890 for details.": "", "stat failed": "", "status json failure": "", "status text failure": "", diff --git a/translations/fr.json b/translations/fr.json index f8d5f1871c..cf41a28217 100644 --- a/translations/fr.json +++ b/translations/fr.json @@ -23,6 +23,7 @@ "--container-runtime must be set to \"containerd\" or \"cri-o\" for rootless": "--container-runtime doit être défini sur \"containerd\" ou \"cri-o\" pour utilisateur normal", "--kvm-numa-count range is 1-8": "la tranche de --kvm-numa-count est 1 à 8", "--network flag is only valid with the docker/podman and KVM drivers, it will be ignored": "le drapeau --network est valide uniquement avec les pilotes docker/podman et KVM, il va être ignoré", + "--network flag is only valid with the docker/podman, KVM and Qemu drivers, it will be ignored": "", "1) Recreate the cluster with Kubernetes {{.new}}, by running:\n\t \n\t\t minikube delete {{.profile}}\n\t\t minikube start {{.profile}} --kubernetes-version={{.prefix}}{{.new}}\n\t \n\t\t2) Create a second cluster with Kubernetes {{.new}}, by running:\n\t \n\t\t minikube start -p {{.suggestedName}} --kubernetes-version={{.prefix}}{{.new}}\n\t \n\t\t3) Use the existing cluster at version Kubernetes {{.old}}, by running:\n\t \n\t\t minikube start {{.profile}} --kubernetes-version={{.prefix}}{{.old}}\n\t\t": "1) Recréez le cluster avec Kubernetes {{.new}}, en exécutant :\n\t \n\t\t minikube delete {{.profile}}\n\t\t minikube start {{.profile}} - -kubernetes-version={{.prefix}}{{.new}}\n\t \n\t\t2) Créez un deuxième cluster avec Kubernetes {{.new}}, en exécutant :\n\t \n \t\t minikube start -p {{.suggestedName}} --kubernetes-version={{.prefix}}{{.new}}\n\t \n\t\t3) Utiliser le cluster existant à la version Kubernetes {{.old}}, en exécutant :\n\t \n\t\t minikube start {{.profile}} --kubernetes-version={{.prefix}}{{.old}}\n\t \t", "1) Recreate the cluster with Kubernetes {{.new}}, by running:\n\t \n\t\t minikube delete{{.profile}}\n\t\t minikube start{{.profile}} --kubernetes-version={{.prefix}}{{.new}}\n\t \n\t\t2) Create a second cluster with Kubernetes {{.new}}, by running:\n\t \n\t\t minikube start -p {{.suggestedName}} --kubernetes-version={{.prefix}}{{.new}}\n\t \n\t\t3) Use the existing cluster at version Kubernetes {{.old}}, by running:\n\t \n\t\t minikube start{{.profile}} --kubernetes-version={{.prefix}}{{.old}}\n\t\t": "1) Recréez le cluster avec Kubernetes {{.new}}, en exécutant :\n\t \n\t\t minikube delete {{.profile}}\n\t\t minikube start{{.profile}} --kubernetes-version={{.prefix}}{{.new}}\n\t \n\t\t2) Créez un deuxième cluster avec Kubernetes {{.new}}, en exécutant :\n\t \n \t\t minikube start -p {{.suggestedName}} --kubernetes-version={{.prefix}}{{.new}}\n\t \n\t\t3) Utiliser le cluster existant à la version Kubernetes {{.old}}, en exécutant :\n\t \n\t\t minikube start{{.profile}} --kubernetes-version={{.prefix}}{{.old}}\n\t \t", "1. Click on \"Docker for Desktop\" menu icon\n\t\t\t2. Click \"Preferences\"\n\t\t\t3. Click \"Resources\"\n\t\t\t4. Increase \"CPUs\" slider bar to 2 or higher\n\t\t\t5. Click \"Apply \u0026 Restart\"": "1. Cliquez sur l'icône de menu \"Docker for Desktop\"\n\t\t\t2. Cliquez sur \"Preferences\"\n\t\t\t3. Cliquez sur \"Ressources\"\n\t\t\t4. Augmentez la barre de défilement \"CPU\" à 2 ou plus\n\t\t\t5. Cliquez sur \"Apply \u0026 Restart\"", @@ -445,8 +446,10 @@ "Output format. Accepted values: [json]": "Format de sortie. Valeurs acceptées : [json]", "Outputs minikube shell completion for the given shell (bash, zsh or fish)\n\n\tThis depends on the bash-completion binary. Example installation instructions:\n\tOS X:\n\t\t$ brew install bash-completion\n\t\t$ source $(brew --prefix)/etc/bash_completion\n\t\t$ minikube completion bash \u003e ~/.minikube-completion # for bash users\n\t\t$ minikube completion zsh \u003e ~/.minikube-completion # for zsh users\n\t\t$ source ~/.minikube-completion\n\t\t$ minikube completion fish \u003e ~/.config/fish/completions/minikube.fish # for fish users\n\tUbuntu:\n\t\t$ apt-get install bash-completion\n\t\t$ source /etc/bash_completion\n\t\t$ source \u003c(minikube completion bash) # for bash users\n\t\t$ source \u003c(minikube completion zsh) # for zsh users\n\t\t$ minikube completion fish \u003e ~/.config/fish/completions/minikube.fish # for fish users\n\n\tAdditionally, you may want to output the completion to a file and source in your .bashrc\n\n\tNote for zsh users: [1] zsh completions are only supported in versions of zsh \u003e= 5.2\n\tNote for fish users: [2] please refer to this docs for more details https://fishshell.com/docs/current/#tab-completion\n": "Affiche la complétion du shell minikube pour le shell donné (bash, zsh ou fish)\n\n\tCela dépend du binaire bash-completion. Exemple d'instructions d'installation :\n\tOS X :\n\t\t$ brew install bash-completion\n\t\t$ source $(brew --prefix)/etc/bash_completion\n\t\t$ minikube completion bash \u003e ~/.minikube-completion # pour les utilisateurs bash\n\t\t$ minikube completion zsh \u003e ~/.minikube-completion # pour les utilisateurs zsh\n\t\t$ source ~/.minikube-completion\n\t\t$ minikube completion fish \u003e ~/.config/fish/completions/minikube.fish # pour les utilisateurs de fish\n\tUbuntu:\n\t\t$ apt-get install bash-completion\n\t \t$ source /etc/bash_completion\n\t\t$ source \u003c(minikube completion bash) # pour les utilisateurs bash\n\t\t$ source \u003c(minikube completion zsh) # pour les utilisateurs zsh\n\t \t$ minikube completion fish \u003e ~/.config/fish/completions/minikube.fish # pour les utilisateurs de fish\n\n\tDe plus, vous voudrez peut-être sortir la complétion dans un fichier et une source dans votre .bashrc\n n\tRemarque pour les utilisateurs de zsh : [1] les complétions zsh ne sont prises en charge que dans les versions de zsh \u003e= 5.2\n\tRemarque pour les utilisateurs de fish : [2] veuillez vous référer à cette documentation pour plus de détails https://fishshell.com/docs/current/#tab-completion\n", "Overwrite image even if same image:tag name exists": "Écraser l'image même si la même image:balise existe", + "Path to socket vmnet binary": "", "Path to the Dockerfile to use (optional)": "Chemin d'accès au Dockerfile à utiliser (facultatif)", "Path to the qemu firmware file. Defaults: For Linux, the default firmware location. For macOS, the brew installation location. For Windows, C:\\Program Files\\qemu\\share": "Chemin d'accès au fichier du micrologiciel qemu. Valeurs par défaut : pour Linux, l'emplacement du micrologiciel par défaut. Pour macOS, l'emplacement d'installation de brew. Pour Windows, C:\\Program Files\\qemu\\share", + "Path to the socket vmnet client binary": "", "Pause": "Pause", "Paused {{.count}} containers": "{{.count}} conteneurs suspendus", "Paused {{.count}} containers in: {{.namespaces}}": "{{.count}} conteneurs suspendus dans : {{.namespaces}}", @@ -817,6 +820,7 @@ "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 qemu with --network=socket for 'socket_vmnet' is experimental": "", "Using rootless Docker driver was required, but the current Docker does not seem rootless. Try 'docker context use rootless' .": "L'utilisation du pilote Docker sans root était nécessaire, mais le Docker actuel ne semble pas sans root. Essayez 'docker context use rootless' .", "Using rootless driver was required, but the current driver does not seem rootless": "L'utilisation d'un pilote sans root était nécessaire, mais le pilote actuel ne semble pas sans root", "Using rootless {{.driver_name}} driver": "Utilisation du pilote {{.driver_name}} sans root", @@ -965,6 +969,7 @@ "scheduled stop is not supported on the none driver, skipping scheduling": "l'arrêt programmé n'est pas pris en charge sur le pilote none, programmation non prise en compte", "service {{.namespace_name}}/{{.service_name}} has no node port": "le service {{.namespace_name}}/{{.service_name}} n'a pas de port de nœud", "set tunnel bind address, empty or '*' indicates the tunnel should be available for all interfaces": "définit l'adresse de liaison du tunnel, vide ou '*' indique que le tunnel doit être disponible pour toutes les interfaces", + "socket_vmnet network flags are not yet implemented with the qemu2 driver.\n See https://github.com/kubernetes/minikube/pull/14890 for details.": "", "stat failed": "stat en échec", "status json failure": "état du JSON en échec", "status text failure": "état du texte en échec", diff --git a/translations/ja.json b/translations/ja.json index d2e76eec03..f9e204983e 100644 --- a/translations/ja.json +++ b/translations/ja.json @@ -22,6 +22,7 @@ "--container-runtime must be set to \"containerd\" or \"cri-o\" for rootless": "rootless のために、--container-runtime に「containerd」または「cri-o」を設定しなければなりません。", "--kvm-numa-count range is 1-8": "--kvm-numa-count の範囲は 1～8 です", "--network flag is only valid with the docker/podman and KVM drivers, it will be ignored": "--network フラグは、docker/podman および KVM ドライバーでのみ有効であるため、無視されます", + "--network flag is only valid with the docker/podman, KVM and Qemu drivers, it will be ignored": "", "1) Recreate the cluster with Kubernetes {{.new}}, by running:\n\t \n\t\t minikube delete{{.profile}}\n\t\t minikube start{{.profile}} --kubernetes-version={{.prefix}}{{.new}}\n\t \n\t\t2) Create a second cluster with Kubernetes {{.new}}, by running:\n\t \n\t\t minikube start -p {{.suggestedName}} --kubernetes-version={{.prefix}}{{.new}}\n\t \n\t\t3) Use the existing cluster at version Kubernetes {{.old}}, by running:\n\t \n\t\t minikube start{{.profile}} --kubernetes-version={{.prefix}}{{.old}}\n\t\t": "1) 次のコマンドで Kubernetes {{.new}} によるクラスターを再構築します:\n\t \n\t\t minikube delete{{.profile}}\n\t\t minikube start{{.profile}} --kubernetes-version={{.prefix}}{{.new}}\n\t \n\t\t2) 次のコマンドで Kubernetes {{.new}} による第 2 のクラスターを作成します:\n\t \n\t\t minikube start -p {{.suggestedName}} --kubernetes-version={{.prefix}}{{.new}}\n\t \n\t\t3) 次のコマンドで Kubernetes {{.old}} による既存クラスターを使用します:\n\t \n\t\t minikube start{{.profile}} --kubernetes-version={{.prefix}}{{.old}}\n\t\t", "1. Click on \"Docker for Desktop\" menu icon\n\t\t\t2. Click \"Preferences\"\n\t\t\t3. Click \"Resources\"\n\t\t\t4. Increase \"CPUs\" slider bar to 2 or higher\n\t\t\t5. Click \"Apply \u0026 Restart\"": "1. 「Docker for Desktop」メニューアイコンをクリックします\n\t\t\t2. 「Preferences」をクリックします\n\t\t\t3. 「Resources」をクリックします\n\t\t\t4. 「CPUs」スライドバーを 2 以上に増やします\n\t\t\t5. 「Apply \u0026 Restart」をクリックします", "1. Click on \"Docker for Desktop\" menu icon\n\t\t\t2. Click \"Preferences\"\n\t\t\t3. Click \"Resources\"\n\t\t\t4. Increase \"Memory\" slider bar to {{.recommend}} or higher\n\t\t\t5. Click \"Apply \u0026 Restart\"": "1. 「Docker for Desktop」メニューアイコンをクリックします\n\t\t\t2. 「Preferences」をクリックします\n\t\t\t3. 「Resources」をクリックします\n\t\t\t4. 「Memory」スライドバーを {{.recommend}} 以上に増やします\n\t\t\t5. 「Apply \u0026 Restart」をクリックします", @@ -430,8 +431,10 @@ "Output format. Accepted values: [json, yaml]": "出力フォーマット。許容値: [json, yaml]", "Outputs minikube shell completion for the given shell (bash, zsh or fish)\n\n\tThis depends on the bash-completion binary. Example installation instructions:\n\tOS X:\n\t\t$ brew install bash-completion\n\t\t$ source $(brew --prefix)/etc/bash_completion\n\t\t$ minikube completion bash \u003e ~/.minikube-completion # for bash users\n\t\t$ minikube completion zsh \u003e ~/.minikube-completion # for zsh users\n\t\t$ source ~/.minikube-completion\n\t\t$ minikube completion fish \u003e ~/.config/fish/completions/minikube.fish # for fish users\n\tUbuntu:\n\t\t$ apt-get install bash-completion\n\t\t$ source /etc/bash_completion\n\t\t$ source \u003c(minikube completion bash) # for bash users\n\t\t$ source \u003c(minikube completion zsh) # for zsh users\n\t\t$ minikube completion fish \u003e ~/.config/fish/completions/minikube.fish # for fish users\n\n\tAdditionally, you may want to output the completion to a file and source in your .bashrc\n\n\tNote for zsh users: [1] zsh completions are only supported in versions of zsh \u003e= 5.2\n\tNote for fish users: [2] please refer to this docs for more details https://fishshell.com/docs/current/#tab-completion\n": "指定されたシェル用の minikube シェル補完コマンドを出力 (bash、zsh、fish)\n\n\tbash-completion バイナリーに依存しています。インストールコマンドの例:\n\tOS X:\n\t\t$ brew install bash-completion\n\t\t$ source $(brew --prefix)/etc/bash_completion\n\t\t$ minikube completion bash \u003e ~/.minikube-completion # bash ユーザー用\n\t\t$ minikube completion zsh \u003e ~/.minikube-completion # zsh ユーザー用\n\t\t$ source ~/.minikube-completion\n\t\t$ minikube completion fish \u003e ~/.config/fish/completions/minikube.fish # fish ユーザー用\n\tUbuntu:\n\t\t$ apt-get install bash-completion\n\t\t$ source /etc/bash_completion\n\t\t$ source \u003c(minikube completion bash) # bash ユーザー用\n\t\t$ source \u003c(minikube completion zsh) # zsh ユーザー用\n\t\t$ minikube completion fish \u003e ~/.config/fish/completions/minikube.fish # fish ユーザー用\n\n\tさらに、補完コマンドをファイルに出力して .bashrc 内で source を実行するとよいでしょう\n\n\t注意 (zsh ユーザー): [1] zsh 補完コマンドは zsh バージョン \u003e= 5.2 でのみサポートしています\n\t注意 (fish ユーザー): [2] 詳細はこちらのドキュメントを参照してください https://fishshell.com/docs/current/#tab-completion\n", "Overwrite image even if same image:tag name exists": "同じ image:tag 名が存在していてもイメージを上書きします", + "Path to socket vmnet binary": "", "Path to the Dockerfile to use (optional)": "使用する Dockerfile へのパス (任意)", "Path to the qemu firmware file. Defaults: For Linux, the default firmware location. For macOS, the brew installation location. For Windows, C:\\Program Files\\qemu\\share": "qemu ファームウェアファイルへのパス。デフォルト: Linux の場合、デフォルトのファームウェアの場所。macOS の場合、brew のインストール場所。Windows の場合、C:\\Program Files\\qemu\\share", + "Path to the socket vmnet client binary": "", "Pause": "一時停止", "Paused {{.count}} containers": "{{.count}} 個のコンテナーを一時停止しました", "Paused {{.count}} containers in: {{.namespaces}}": "{{.namespaces}} に存在する {{.count}} 個のコンテナーを一時停止しました", @@ -785,6 +788,7 @@ "Using image repository {{.name}}": "{{.name}} イメージリポジトリーを使用しています", "Using image {{.registry}}{{.image}}": "{{.registry}}{{.image}} イメージを使用しています", "Using image {{.registry}}{{.image}} (global image repository)": "{{.registry}}{{.image}} イメージ (グローバルイメージリポジトリー) を使用しています", + "Using qemu with --network=socket for 'socket_vmnet' is experimental": "", "Using rootless Docker driver was required, but the current Docker does not seem rootless. Try 'docker context use rootless' .": "rootless Docker ドライバー使用が必要でしたが、現在の Docker は rootless が必要ないようです。'docker context use rootless' を試してみてください。", "Using rootless driver was required, but the current driver does not seem rootless": "rootless ドライバー使用が必要でしたが、現在のドライバーは rootless が必要ないようです", "Using rootless {{.driver_name}} driver": "rootless {{.driver_name}} ドライバー使用", @@ -926,6 +930,7 @@ "scheduled stop is not supported on the none driver, skipping scheduling": "none ドライバーでは予定停止がサポートされていません (予約をスキップします)", "service {{.namespace_name}}/{{.service_name}} has no node port": "サービス {{.namespace_name}}/{{.service_name}} は NodePort がありません", "set tunnel bind address, empty or '*' indicates the tunnel should be available for all interfaces": "", + "socket_vmnet network flags are not yet implemented with the qemu2 driver.\n See https://github.com/kubernetes/minikube/pull/14890 for details.": "", "stat failed": "stat に失敗しました", "status json failure": "status json に失敗しました", "status text failure": "status text に失敗しました", diff --git a/translations/ko.json b/translations/ko.json index 4d2522c5db..ddb396e721 100644 --- a/translations/ko.json +++ b/translations/ko.json @@ -27,7 +27,7 @@ "- Restart your {{.driver_name}} service": "{{.driver_name}} 서비스를 다시 시작하세요", "--container-runtime must be set to \"containerd\" or \"cri-o\" for rootless": "", "--kvm-numa-count range is 1-8": "--kvm-numa-count 범위는 1부터 8입니다", - "--network flag is only valid with the docker/podman and KVM drivers, it will be ignored": "", + "--network flag is only valid with the docker/podman, KVM and Qemu drivers, it will be ignored": "", "1) Recreate the cluster with Kubernetes {{.new}}, by running:\n\t \n\t\t minikube delete{{.profile}}\n\t\t minikube start{{.profile}} --kubernetes-version={{.prefix}}{{.new}}\n\t \n\t\t2) Create a second cluster with Kubernetes {{.new}}, by running:\n\t \n\t\t minikube start -p {{.suggestedName}} --kubernetes-version={{.prefix}}{{.new}}\n\t \n\t\t3) Use the existing cluster at version Kubernetes {{.old}}, by running:\n\t \n\t\t minikube start{{.profile}} --kubernetes-version={{.prefix}}{{.old}}\n\t\t": "", "1. Click on \"Docker for Desktop\" menu icon\n\t\t\t2. Click \"Preferences\"\n\t\t\t3. Click \"Resources\"\n\t\t\t4. Increase \"CPUs\" slider bar to 2 or higher\n\t\t\t5. Click \"Apply \u0026 Restart\"": "", "1. Click on \"Docker for Desktop\" menu icon\n\t\t\t2. Click \"Preferences\"\n\t\t\t3. Click \"Resources\"\n\t\t\t4. Increase \"Memory\" slider bar to {{.recommend}} or higher\n\t\t\t5. Click \"Apply \u0026 Restart\"": "", @@ -479,8 +479,10 @@ "Output format. Accepted values: [json, yaml]": "", "Outputs minikube shell completion for the given shell (bash, zsh or fish)\n\n\tThis depends on the bash-completion binary. Example installation instructions:\n\tOS X:\n\t\t$ brew install bash-completion\n\t\t$ source $(brew --prefix)/etc/bash_completion\n\t\t$ minikube completion bash \u003e ~/.minikube-completion # for bash users\n\t\t$ minikube completion zsh \u003e ~/.minikube-completion # for zsh users\n\t\t$ source ~/.minikube-completion\n\t\t$ minikube completion fish \u003e ~/.config/fish/completions/minikube.fish # for fish users\n\tUbuntu:\n\t\t$ apt-get install bash-completion\n\t\t$ source /etc/bash_completion\n\t\t$ source \u003c(minikube completion bash) # for bash users\n\t\t$ source \u003c(minikube completion zsh) # for zsh users\n\t\t$ minikube completion fish \u003e ~/.config/fish/completions/minikube.fish # for fish users\n\n\tAdditionally, you may want to output the completion to a file and source in your .bashrc\n\n\tNote for zsh users: [1] zsh completions are only supported in versions of zsh \u003e= 5.2\n\tNote for fish users: [2] please refer to this docs for more details https://fishshell.com/docs/current/#tab-completion\n": "", "Overwrite image even if same image:tag name exists": "", + "Path to socket vmnet binary": "", "Path to the Dockerfile to use (optional)": "", "Path to the qemu firmware file. Defaults: For Linux, the default firmware location. For macOS, the brew installation location. For Windows, C:\\Program Files\\qemu\\share": "", + "Path to the socket vmnet client binary": "", "Pause": "", "Paused {{.count}} containers": "", "Paused {{.count}} containers in: {{.namespaces}}": "", @@ -846,6 +848,7 @@ "Using image repository {{.name}}": "", "Using image {{.registry}}{{.image}}": "", "Using image {{.registry}}{{.image}} (global image repository)": "", + "Using qemu with --network=socket for 'socket_vmnet' is experimental": "", "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": "", @@ -999,6 +1002,7 @@ "scheduled stop is not supported on the none driver, skipping scheduling": "", "service {{.namespace_name}}/{{.service_name}} has no node port": "", "set tunnel bind address, empty or '*' indicates the tunnel should be available for all interfaces": "", + "socket_vmnet network flags are not yet implemented with the qemu2 driver.\n See https://github.com/kubernetes/minikube/pull/14890 for details.": "", "stat failed": "", "status json failure": "", "status text failure": "", diff --git a/translations/pl.json b/translations/pl.json index d55d1174d1..863aa6c5e9 100644 --- a/translations/pl.json +++ b/translations/pl.json @@ -26,7 +26,7 @@ "- Restart your {{.driver_name}} service": "", "--container-runtime must be set to \"containerd\" or \"cri-o\" for rootless": "", "--kvm-numa-count range is 1-8": "", - "--network flag is only valid with the docker/podman and KVM drivers, it will be ignored": "", + "--network flag is only valid with the docker/podman, KVM and Qemu drivers, it will be ignored": "", "1) Recreate the cluster with Kubernetes {{.new}}, by running:\n\t \n\t\t minikube delete{{.profile}}\n\t\t minikube start{{.profile}} --kubernetes-version={{.prefix}}{{.new}}\n\t \n\t\t2) Create a second cluster with Kubernetes {{.new}}, by running:\n\t \n\t\t minikube start -p {{.suggestedName}} --kubernetes-version={{.prefix}}{{.new}}\n\t \n\t\t3) Use the existing cluster at version Kubernetes {{.old}}, by running:\n\t \n\t\t minikube start{{.profile}} --kubernetes-version={{.prefix}}{{.old}}\n\t\t": "", "1. Click on \"Docker for Desktop\" menu icon\n\t\t\t2. Click \"Preferences\"\n\t\t\t3. Click \"Resources\"\n\t\t\t4. Increase \"CPUs\" slider bar to 2 or higher\n\t\t\t5. Click \"Apply \u0026 Restart\"": "", "1. Click on \"Docker for Desktop\" menu icon\n\t\t\t2. Click \"Preferences\"\n\t\t\t3. Click \"Resources\"\n\t\t\t4. Increase \"Memory\" slider bar to {{.recommend}} or higher\n\t\t\t5. Click \"Apply \u0026 Restart\"": "", @@ -473,8 +473,10 @@ "Outputs minikube shell completion for the given shell (bash or zsh)": "Zwraca autouzupełnianie poleceń minikube dla danej powłoki (bash, zsh)", "Outputs minikube shell completion for the given shell (bash, zsh or fish)\n\n\tThis depends on the bash-completion binary. Example installation instructions:\n\tOS X:\n\t\t$ brew install bash-completion\n\t\t$ source $(brew --prefix)/etc/bash_completion\n\t\t$ minikube completion bash \u003e ~/.minikube-completion # for bash users\n\t\t$ minikube completion zsh \u003e ~/.minikube-completion # for zsh users\n\t\t$ source ~/.minikube-completion\n\t\t$ minikube completion fish \u003e ~/.config/fish/completions/minikube.fish # for fish users\n\tUbuntu:\n\t\t$ apt-get install bash-completion\n\t\t$ source /etc/bash_completion\n\t\t$ source \u003c(minikube completion bash) # for bash users\n\t\t$ source \u003c(minikube completion zsh) # for zsh users\n\t\t$ minikube completion fish \u003e ~/.config/fish/completions/minikube.fish # for fish users\n\n\tAdditionally, you may want to output the completion to a file and source in your .bashrc\n\n\tNote for zsh users: [1] zsh completions are only supported in versions of zsh \u003e= 5.2\n\tNote for fish users: [2] please refer to this docs for more details https://fishshell.com/docs/current/#tab-completion\n": "", "Overwrite image even if same image:tag name exists": "Nadpisuje obraz nawet jeśli istnieje obraz o tej samej nazwie i tagu.", + "Path to socket vmnet binary": "", "Path to the Dockerfile to use (optional)": "Ścieżka pliku Dockerfile, którego należy użyć (opcjonalne)", "Path to the qemu firmware file. Defaults: For Linux, the default firmware location. For macOS, the brew installation location. For Windows, C:\\Program Files\\qemu\\share": "", + "Path to the socket vmnet client binary": "", "Pause": "Stop", "Paused {{.count}} containers": "Zatrzymane kontenery: {{.count}}", "Paused {{.count}} containers in: {{.namespaces}}": "Zatrzymane kontenery: {{.count}} w przestrzeniach nazw: {{.namespaces}}", @@ -856,6 +858,7 @@ "Using image repository {{.name}}": "", "Using image {{.registry}}{{.image}}": "", "Using image {{.registry}}{{.image}} (global image repository)": "", + "Using qemu with --network=socket for 'socket_vmnet' is experimental": "", "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": "", @@ -1004,6 +1007,7 @@ "scheduled stop is not supported on the none driver, skipping scheduling": "", "service {{.namespace_name}}/{{.service_name}} has no node port": "", "set tunnel bind address, empty or '*' indicates the tunnel should be available for all interfaces": "", + "socket_vmnet network flags are not yet implemented with the qemu2 driver.\n See https://github.com/kubernetes/minikube/pull/14890 for details.": "", "stat failed": "wykonanie komendy stat nie powiodło się", "status json failure": "", "status text failure": "", diff --git a/translations/ru.json b/translations/ru.json index a9a85c5eec..a3bdd47897 100644 --- a/translations/ru.json +++ b/translations/ru.json @@ -21,7 +21,7 @@ "- Restart your {{.driver_name}} service": "", "--container-runtime must be set to \"containerd\" or \"cri-o\" for rootless": "", "--kvm-numa-count range is 1-8": "", - "--network flag is only valid with the docker/podman and KVM drivers, it will be ignored": "", + "--network flag is only valid with the docker/podman, KVM and Qemu drivers, it will be ignored": "", "1) Recreate the cluster with Kubernetes {{.new}}, by running:\n\t \n\t\t minikube delete{{.profile}}\n\t\t minikube start{{.profile}} --kubernetes-version={{.prefix}}{{.new}}\n\t \n\t\t2) Create a second cluster with Kubernetes {{.new}}, by running:\n\t \n\t\t minikube start -p {{.suggestedName}} --kubernetes-version={{.prefix}}{{.new}}\n\t \n\t\t3) Use the existing cluster at version Kubernetes {{.old}}, by running:\n\t \n\t\t minikube start{{.profile}} --kubernetes-version={{.prefix}}{{.old}}\n\t\t": "1) Пересоздайте кластер с Kubernetes {{.new}}, выполнив:\n\t \n\t\t minikube delete{{.profile}}\n\t\t minikube start{{.profile}} --kubernetes-version={{.prefix}}{{.new}}\n\t \n\t\t2) Создайье второй кластер с Kubernetes {{.new}}, выполнив:\n\t \n\t\t minikube start -p {{.suggestedName}} --kubernetes-version={{.prefix}}{{.new}}\n\t \n\t\t3) Используйте существующий кластер с версией Kubernetes {{.old}}, выполнив:\n\t \n\t\t minikube start{{.profile}} --kubernetes-version={{.prefix}}{{.old}}\n\t\t", "1. Click on \"Docker for Desktop\" menu icon\n\t\t\t2. Click \"Preferences\"\n\t\t\t3. Click \"Resources\"\n\t\t\t4. Increase \"CPUs\" slider bar to 2 or higher\n\t\t\t5. Click \"Apply \u0026 Restart\"": "1. Кликните на иконку \"Docker for Desktop\"\n\t\t\t2. Выберите \"Preferences\"\n\t\t\t3. Нажмите \"Resources\"\n\t\t\t4. Увеличьте кол-во \"CPUs\" до 2 или выше\n\t\t\t5. Нажмите \"Apply \u0026 Перезапуск\"", "1. Click on \"Docker for Desktop\" menu icon\n\t\t\t2. Click \"Preferences\"\n\t\t\t3. Click \"Resources\"\n\t\t\t4. Increase \"Memory\" slider bar to {{.recommend}} or higher\n\t\t\t5. Click \"Apply \u0026 Restart\"": "1. Кликните на иконку \"Docker for Desktop\"\n\t\t\t2. Выберите \"Preferences\"\n\t\t\t3. Нажмите \"Resources\"\n\t\t\t4. Увеличьте кол-во \"emory\" до {{.recommend}} или выше\n\t\t\t5. Нажмите \"Apply \u0026 Перезапуск\"", @@ -429,8 +429,10 @@ "Output format. Accepted values: [json, yaml]": "", "Outputs minikube shell completion for the given shell (bash, zsh or fish)\n\n\tThis depends on the bash-completion binary. Example installation instructions:\n\tOS X:\n\t\t$ brew install bash-completion\n\t\t$ source $(brew --prefix)/etc/bash_completion\n\t\t$ minikube completion bash \u003e ~/.minikube-completion # for bash users\n\t\t$ minikube completion zsh \u003e ~/.minikube-completion # for zsh users\n\t\t$ source ~/.minikube-completion\n\t\t$ minikube completion fish \u003e ~/.config/fish/completions/minikube.fish # for fish users\n\tUbuntu:\n\t\t$ apt-get install bash-completion\n\t\t$ source /etc/bash_completion\n\t\t$ source \u003c(minikube completion bash) # for bash users\n\t\t$ source \u003c(minikube completion zsh) # for zsh users\n\t\t$ minikube completion fish \u003e ~/.config/fish/completions/minikube.fish # for fish users\n\n\tAdditionally, you may want to output the completion to a file and source in your .bashrc\n\n\tNote for zsh users: [1] zsh completions are only supported in versions of zsh \u003e= 5.2\n\tNote for fish users: [2] please refer to this docs for more details https://fishshell.com/docs/current/#tab-completion\n": "", "Overwrite image even if same image:tag name exists": "", + "Path to socket vmnet binary": "", "Path to the Dockerfile to use (optional)": "", "Path to the qemu firmware file. Defaults: For Linux, the default firmware location. For macOS, the brew installation location. For Windows, C:\\Program Files\\qemu\\share": "", + "Path to the socket vmnet client binary": "", "Pause": "", "Paused {{.count}} containers": "", "Paused {{.count}} containers in: {{.namespaces}}": "", @@ -782,6 +784,7 @@ "Using image repository {{.name}}": "", "Using image {{.registry}}{{.image}}": "Используется образ {{.registry}}{{.image}}", "Using image {{.registry}}{{.image}} (global image repository)": "", + "Using qemu with --network=socket for 'socket_vmnet' is experimental": "", "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": "", @@ -923,6 +926,7 @@ "scheduled stop is not supported on the none driver, skipping scheduling": "", "service {{.namespace_name}}/{{.service_name}} has no node port": "", "set tunnel bind address, empty or '*' indicates the tunnel should be available for all interfaces": "", + "socket_vmnet network flags are not yet implemented with the qemu2 driver.\n See https://github.com/kubernetes/minikube/pull/14890 for details.": "", "stat failed": "", "status json failure": "", "status text failure": "", diff --git a/translations/strings.txt b/translations/strings.txt index 9d7bd85439..4cd5fa0ced 100644 --- a/translations/strings.txt +++ b/translations/strings.txt @@ -21,7 +21,7 @@ "- Restart your {{.driver_name}} service": "", "--container-runtime must be set to \"containerd\" or \"cri-o\" for rootless": "", "--kvm-numa-count range is 1-8": "", - "--network flag is only valid with the docker/podman and KVM drivers, it will be ignored": "", + "--network flag is only valid with the docker/podman, KVM and Qemu drivers, it will be ignored": "", "1) Recreate the cluster with Kubernetes {{.new}}, by running:\n\t \n\t\t minikube delete{{.profile}}\n\t\t minikube start{{.profile}} --kubernetes-version={{.prefix}}{{.new}}\n\t \n\t\t2) Create a second cluster with Kubernetes {{.new}}, by running:\n\t \n\t\t minikube start -p {{.suggestedName}} --kubernetes-version={{.prefix}}{{.new}}\n\t \n\t\t3) Use the existing cluster at version Kubernetes {{.old}}, by running:\n\t \n\t\t minikube start{{.profile}} --kubernetes-version={{.prefix}}{{.old}}\n\t\t": "", "1. Click on \"Docker for Desktop\" menu icon\n\t\t\t2. Click \"Preferences\"\n\t\t\t3. Click \"Resources\"\n\t\t\t4. Increase \"CPUs\" slider bar to 2 or higher\n\t\t\t5. Click \"Apply \u0026 Restart\"": "", "1. Click on \"Docker for Desktop\" menu icon\n\t\t\t2. Click \"Preferences\"\n\t\t\t3. Click \"Resources\"\n\t\t\t4. Increase \"Memory\" slider bar to {{.recommend}} or higher\n\t\t\t5. Click \"Apply \u0026 Restart\"": "", @@ -429,8 +429,10 @@ "Output format. Accepted values: [json, yaml]": "", "Outputs minikube shell completion for the given shell (bash, zsh or fish)\n\n\tThis depends on the bash-completion binary. Example installation instructions:\n\tOS X:\n\t\t$ brew install bash-completion\n\t\t$ source $(brew --prefix)/etc/bash_completion\n\t\t$ minikube completion bash \u003e ~/.minikube-completion # for bash users\n\t\t$ minikube completion zsh \u003e ~/.minikube-completion # for zsh users\n\t\t$ source ~/.minikube-completion\n\t\t$ minikube completion fish \u003e ~/.config/fish/completions/minikube.fish # for fish users\n\tUbuntu:\n\t\t$ apt-get install bash-completion\n\t\t$ source /etc/bash_completion\n\t\t$ source \u003c(minikube completion bash) # for bash users\n\t\t$ source \u003c(minikube completion zsh) # for zsh users\n\t\t$ minikube completion fish \u003e ~/.config/fish/completions/minikube.fish # for fish users\n\n\tAdditionally, you may want to output the completion to a file and source in your .bashrc\n\n\tNote for zsh users: [1] zsh completions are only supported in versions of zsh \u003e= 5.2\n\tNote for fish users: [2] please refer to this docs for more details https://fishshell.com/docs/current/#tab-completion\n": "", "Overwrite image even if same image:tag name exists": "", + "Path to socket vmnet binary": "", "Path to the Dockerfile to use (optional)": "", "Path to the qemu firmware file. Defaults: For Linux, the default firmware location. For macOS, the brew installation location. For Windows, C:\\Program Files\\qemu\\share": "", + "Path to the socket vmnet client binary": "", "Pause": "", "Paused {{.count}} containers": "", "Paused {{.count}} containers in: {{.namespaces}}": "", @@ -782,6 +784,7 @@ "Using image repository {{.name}}": "", "Using image {{.registry}}{{.image}}": "", "Using image {{.registry}}{{.image}} (global image repository)": "", + "Using qemu with --network=socket for 'socket_vmnet' is experimental": "", "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": "", @@ -923,6 +926,7 @@ "scheduled stop is not supported on the none driver, skipping scheduling": "", "service {{.namespace_name}}/{{.service_name}} has no node port": "", "set tunnel bind address, empty or '*' indicates the tunnel should be available for all interfaces": "", + "socket_vmnet network flags are not yet implemented with the qemu2 driver.\n See https://github.com/kubernetes/minikube/pull/14890 for details.": "", "stat failed": "", "status json failure": "", "status text failure": "", diff --git a/translations/zh-CN.json b/translations/zh-CN.json index 0ae5ed6e1d..c3a30d3039 100644 --- a/translations/zh-CN.json +++ b/translations/zh-CN.json @@ -29,6 +29,7 @@ "--container-runtime must be set to \"containerd\" or \"cri-o\" for rootless": "--container-runtime 必须被设置为 \"containerd\" 或者 \"cri-o\" 以实现非 root 运行", "--kvm-numa-count range is 1-8": "--kvm-numa-count 取值范围为 1-8", "--network flag is only valid with the docker/podman and KVM drivers, it will be ignored": "--network 标识仅对 docker/podman 和 KVM 驱动程序有效，它将被忽略", + "--network flag is only valid with the docker/podman, KVM and Qemu drivers, it will be ignored": "", "1) Recreate the cluster with Kubernetes {{.new}}, by running:\n\t \n\t\t minikube delete{{.profile}}\n\t\t minikube start{{.profile}} --kubernetes-version={{.prefix}}{{.new}}\n\t \n\t\t2) Create a second cluster with Kubernetes {{.new}}, by running:\n\t \n\t\t minikube start -p {{.suggestedName}} --kubernetes-version={{.prefix}}{{.new}}\n\t \n\t\t3) Use the existing cluster at version Kubernetes {{.old}}, by running:\n\t \n\t\t minikube start{{.profile}} --kubernetes-version={{.prefix}}{{.old}}\n\t\t": "", "1. Click on \"Docker for Desktop\" menu icon\n\t\t\t2. Click \"Preferences\"\n\t\t\t3. Click \"Resources\"\n\t\t\t4. Increase \"CPUs\" slider bar to 2 or higher\n\t\t\t5. Click \"Apply \u0026 Restart\"": "", "1. Click on \"Docker for Desktop\" menu icon\n\t\t\t2. Click \"Preferences\"\n\t\t\t3. Click \"Resources\"\n\t\t\t4. Increase \"Memory\" slider bar to {{.recommend}} or higher\n\t\t\t5. Click \"Apply \u0026 Restart\"": "", @@ -545,8 +546,10 @@ "Output format. Accepted values: [json, yaml]": "", "Outputs minikube shell completion for the given shell (bash, zsh or fish)\n\n\tThis depends on the bash-completion binary. Example installation instructions:\n\tOS X:\n\t\t$ brew install bash-completion\n\t\t$ source $(brew --prefix)/etc/bash_completion\n\t\t$ minikube completion bash \u003e ~/.minikube-completion # for bash users\n\t\t$ minikube completion zsh \u003e ~/.minikube-completion # for zsh users\n\t\t$ source ~/.minikube-completion\n\t\t$ minikube completion fish \u003e ~/.config/fish/completions/minikube.fish # for fish users\n\tUbuntu:\n\t\t$ apt-get install bash-completion\n\t\t$ source /etc/bash_completion\n\t\t$ source \u003c(minikube completion bash) # for bash users\n\t\t$ source \u003c(minikube completion zsh) # for zsh users\n\t\t$ minikube completion fish \u003e ~/.config/fish/completions/minikube.fish # for fish users\n\n\tAdditionally, you may want to output the completion to a file and source in your .bashrc\n\n\tNote for zsh users: [1] zsh completions are only supported in versions of zsh \u003e= 5.2\n\tNote for fish users: [2] please refer to this docs for more details https://fishshell.com/docs/current/#tab-completion\n": "", "Overwrite image even if same image:tag name exists": "", + "Path to socket vmnet binary": "", "Path to the Dockerfile to use (optional)": "", "Path to the qemu firmware file. Defaults: For Linux, the default firmware location. For macOS, the brew installation location. For Windows, C:\\Program Files\\qemu\\share": "", + "Path to the socket vmnet client binary": "", "Pause": "暂停", "Paused kubelet and {{.count}} containers": "已暂停 kubelet 和 {{.count}} 个容器", "Paused kubelet and {{.count}} containers in: {{.namespaces}}": "已暂停 {{.namespaces}} 中的 kubelet 和 {{.count}} 个容器", @@ -956,6 +959,7 @@ "Using image repository {{.name}}": "正在使用镜像存储库 {{.name}}", "Using image {{.registry}}{{.image}}": "", "Using image {{.registry}}{{.image}} (global image repository)": "", + "Using qemu with --network=socket for 'socket_vmnet' is experimental": "", "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": "", @@ -1114,6 +1118,7 @@ "scheduled stop is not supported on the none driver, skipping scheduling": "", "service {{.namespace_name}}/{{.service_name}} has no node port": "", "set tunnel bind address, empty or '*' indicates the tunnel should be available for all interfaces": "", + "socket_vmnet network flags are not yet implemented with the qemu2 driver.\n See https://github.com/kubernetes/minikube/pull/14890 for details.": "", "stat failed": "", "status json failure": "", "status text failure": "", From c39f347a553d689bbb7e870ebeb310c3fc088840 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Wed, 21 Sep 2022 18:54:35 +0000 Subject: [PATCH 530/545] Update auto-generated docs and translations --- site/content/en/docs/commands/start.md | 4 ++-- translations/de.json | 5 +++++ translations/es.json | 5 +++++ translations/fr.json | 5 +++++ translations/ja.json | 5 +++++ translations/ko.json | 6 +++++- translations/pl.json | 6 +++++- translations/ru.json | 6 +++++- translations/strings.txt | 6 +++++- translations/zh-CN.json | 5 +++++ 10 files changed, 47 insertions(+), 6 deletions(-) diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index c3e325a0b0..eb91177a5f 100644 --- a/site/content/en/docs/commands/start.md +++ b/site/content/en/docs/commands/start.md @@ -105,8 +105,8 @@ minikube start [flags] --qemu-firmware-path string Path to the qemu firmware file. Defaults: For Linux, the default firmware location. For macOS, the brew installation location. For Windows, C:\Program Files\qemu\share --registry-mirror strings Registry mirrors to pass to the Docker daemon --service-cluster-ip-range string The CIDR to be used for service cluster IPs. (default "10.96.0.0/12") - --socket-vmnet-client-path string Path to the socket vmnet client binary. (default "/opt/socket_vmnet/bin/socket_vmnet_client") - --socket-vmnet-path string Path to socket vmnet binary. (default "/var/run/socket_vmnet") + --socket-vmnet-client-path string Path to the socket vmnet client binary (default "/opt/socket_vmnet/bin/socket_vmnet_client") + --socket-vmnet-path string Path to socket vmnet binary (default "/var/run/socket_vmnet") --ssh-ip-address string IP address (ssh driver only) --ssh-key string SSH key (ssh driver only) --ssh-port int SSH port (ssh driver only) (default 22) diff --git a/translations/de.json b/translations/de.json index 6243d5c08e..b4407a1cfb 100644 --- a/translations/de.json +++ b/translations/de.json @@ -22,6 +22,7 @@ "--container-runtime must be set to \"containerd\" or \"cri-o\" for rootless": "--container-runtime muss für rootless auf \"containerd\" oder \"cri-o\" gesetzt sein", "--kvm-numa-count range is 1-8": "Der Wertebereich für --kvm-numa-count ist 1-8", "--network flag is only valid with the docker/podman and KVM drivers, it will be ignored": "Der Parameter --network kann nur mit dem docker/podman und den KVM Treibern verwendet werden, er wird ignoriert werden", + "--network flag is only valid with the docker/podman, KVM and Qemu drivers, it will be ignored": "", "1) Recreate the cluster with Kubernetes {{.new}}, by running:\n\t \n\t\t minikube delete{{.profile}}\n\t\t minikube start{{.profile}} --kubernetes-version={{.prefix}}{{.new}}\n\t \n\t\t2) Create a second cluster with Kubernetes {{.new}}, by running:\n\t \n\t\t minikube start -p {{.suggestedName}} --kubernetes-version={{.prefix}}{{.new}}\n\t \n\t\t3) Use the existing cluster at version Kubernetes {{.old}}, by running:\n\t \n\t\t minikube start{{.profile}} --kubernetes-version={{.prefix}}{{.old}}\n\t\t": "1) Erstellen Sie den Cluster mit Kubernetes {{.new}} neu, indem Sie folgende Befehle ausführen:\n\t \n\t\t minikube delete{{.profile}}\n\t\t minikube start{{.profile}} --kubernetes-version={{.prefix}}{{.new}}\n\t \n\t\t2) Erstellen Sie einen zweiten Cluster mit Kubernetes {{.new}}, indem Sie folgende Befehle ausführen:\n\t \n\t\t minikube start -p {{.suggestedName}} --kubernetes-version={{.prefix}}{{.new}}\n\t \n\t\t3) Verwenden Sie den existierenden Cluster mit Version {{.old}} von Kubernetes, indem Sie folgende Befehle ausführen:\n\t \n\t\t minikube start{{.profile}} --kubernetes-version={{.prefix}}{{.old}}\n\t\t", "1. Click on \"Docker for Desktop\" menu icon\n\t\t\t2. Click \"Preferences\"\n\t\t\t3. Click \"Resources\"\n\t\t\t4. Increase \"CPUs\" slider bar to 2 or higher\n\t\t\t5. Click \"Apply \u0026 Restart\"": "1. Klicken Sie auf das \"Docker für Desktop\" Menu Icon\n\t\t\t2. Klicken Sie auf \"Einstellungen\"\n\t\t\t3. Klicken Sie auf \"Resourcen\"\n\t\t\t4. Erhöhen Sie den Wert von \"CPUs\" auf 2 oder mehr\n\t\t\t5. Klicken Sie auf \"Anwenden \u0026 Neustarten\"", "1. Click on \"Docker for Desktop\" menu icon\n\t\t\t2. Click \"Preferences\"\n\t\t\t3. Click \"Resources\"\n\t\t\t4. Increase \"Memory\" slider bar to {{.recommend}} or higher\n\t\t\t5. Click \"Apply \u0026 Restart\"": "1. Klicken Sie auf das \"Docker für Desktop\" Menu Icon\n\t\t\t2. Klicken Sie auf \"Einstellungen\"\n\t\t\t3. Klicken Sie auf \"Resourcen\"\n\t\t\t4. Erhöhen Sie den Wert von \"Speicher\" auf {{.recommend}} oder mehr\n\t\t\t5. Klicken Sie auf \"Anwenden \u0026 Neustarten\"", @@ -458,8 +459,10 @@ "Output format. Accepted values: [json]": "Ausgabe Format. Akzeptierte Werte: [json]", "Outputs minikube shell completion for the given shell (bash, zsh or fish)\n\n\tThis depends on the bash-completion binary. Example installation instructions:\n\tOS X:\n\t\t$ brew install bash-completion\n\t\t$ source $(brew --prefix)/etc/bash_completion\n\t\t$ minikube completion bash \u003e ~/.minikube-completion # for bash users\n\t\t$ minikube completion zsh \u003e ~/.minikube-completion # for zsh users\n\t\t$ source ~/.minikube-completion\n\t\t$ minikube completion fish \u003e ~/.config/fish/completions/minikube.fish # for fish users\n\tUbuntu:\n\t\t$ apt-get install bash-completion\n\t\t$ source /etc/bash_completion\n\t\t$ source \u003c(minikube completion bash) # for bash users\n\t\t$ source \u003c(minikube completion zsh) # for zsh users\n\t\t$ minikube completion fish \u003e ~/.config/fish/completions/minikube.fish # for fish users\n\n\tAdditionally, you may want to output the completion to a file and source in your .bashrc\n\n\tNote for zsh users: [1] zsh completions are only supported in versions of zsh \u003e= 5.2\n\tNote for fish users: [2] please refer to this docs for more details https://fishshell.com/docs/current/#tab-completion\n": "", "Overwrite image even if same image:tag name exists": "Überschreibe das Image, auch wenn ein Image mit dem gleichen Image:Tag-Namen existiert", + "Path to socket vmnet binary": "", "Path to the Dockerfile to use (optional)": "Pfad des zu verwendenden Dockerfiles (optional)", "Path to the qemu firmware file. Defaults: For Linux, the default firmware location. For macOS, the brew installation location. For Windows, C:\\Program Files\\qemu\\share": "", + "Path to the socket vmnet client binary": "", "Pause": "", "Paused {{.count}} containers": "{{.count}} Container pausiert", "Paused {{.count}} containers in: {{.namespaces}}": "{{.count}} Container pausiert in: {{.namespaces}}", @@ -845,6 +848,7 @@ "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 qemu with --network=socket for 'socket_vmnet' is experimental": "", "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": "", @@ -996,6 +1000,7 @@ "scheduled stop is not supported on the none driver, skipping scheduling": "Das geplante Stoppen wird von none Treiber nicht unterstützt, überspringe Planung", "service {{.namespace_name}}/{{.service_name}} has no node port": "Service {{.namespace_name}}/{{.service_name}} hat keinen Node Port", "set tunnel bind address, empty or '*' indicates the tunnel should be available for all interfaces": "", + "socket_vmnet network flags are not yet implemented with the qemu2 driver.\n See https://github.com/kubernetes/minikube/pull/14890 for details.": "", "stat failed": "state Fehler", "status json failure": "Status json Fehler", "status text failure": "Status text Fehler", diff --git a/translations/es.json b/translations/es.json index 6b8932c24f..901baa3b3d 100644 --- a/translations/es.json +++ b/translations/es.json @@ -23,6 +23,7 @@ "--container-runtime must be set to \"containerd\" or \"cri-o\" for rootless": "--container-runtime debe ser configurado a \"containerd\" o \"crio-o\" para no usar usuario root", "--kvm-numa-count range is 1-8": "--kvm-numa-count el rango es 1-8", "--network flag is only valid with the docker/podman and KVM drivers, it will be ignored": "el flag --network es válido solamente con docker/podman y KVM, será ignorado", + "--network flag is only valid with the docker/podman, KVM and Qemu drivers, it will be ignored": "", "1) Recreate the cluster with Kubernetes {{.new}}, by running:\n\t \n\t\t minikube delete{{.profile}}\n\t\t minikube start{{.profile}} --kubernetes-version={{.prefix}}{{.new}}\n\t \n\t\t2) Create a second cluster with Kubernetes {{.new}}, by running:\n\t \n\t\t minikube start -p {{.suggestedName}} --kubernetes-version={{.prefix}}{{.new}}\n\t \n\t\t3) Use the existing cluster at version Kubernetes {{.old}}, by running:\n\t \n\t\t minikube start{{.profile}} --kubernetes-version={{.prefix}}{{.old}}\n\t\t": "", "1. Click on \"Docker for Desktop\" menu icon\n\t\t\t2. Click \"Preferences\"\n\t\t\t3. Click \"Resources\"\n\t\t\t4. Increase \"CPUs\" slider bar to 2 or higher\n\t\t\t5. Click \"Apply \u0026 Restart\"": "", "1. Click on \"Docker for Desktop\" menu icon\n\t\t\t2. Click \"Preferences\"\n\t\t\t3. Click \"Resources\"\n\t\t\t4. Increase \"Memory\" slider bar to {{.recommend}} or higher\n\t\t\t5. Click \"Apply \u0026 Restart\"": "", @@ -465,8 +466,10 @@ "Output format. Accepted values: [json, yaml]": "", "Outputs minikube shell completion for the given shell (bash, zsh or fish)\n\n\tThis depends on the bash-completion binary. Example installation instructions:\n\tOS X:\n\t\t$ brew install bash-completion\n\t\t$ source $(brew --prefix)/etc/bash_completion\n\t\t$ minikube completion bash \u003e ~/.minikube-completion # for bash users\n\t\t$ minikube completion zsh \u003e ~/.minikube-completion # for zsh users\n\t\t$ source ~/.minikube-completion\n\t\t$ minikube completion fish \u003e ~/.config/fish/completions/minikube.fish # for fish users\n\tUbuntu:\n\t\t$ apt-get install bash-completion\n\t\t$ source /etc/bash_completion\n\t\t$ source \u003c(minikube completion bash) # for bash users\n\t\t$ source \u003c(minikube completion zsh) # for zsh users\n\t\t$ minikube completion fish \u003e ~/.config/fish/completions/minikube.fish # for fish users\n\n\tAdditionally, you may want to output the completion to a file and source in your .bashrc\n\n\tNote for zsh users: [1] zsh completions are only supported in versions of zsh \u003e= 5.2\n\tNote for fish users: [2] please refer to this docs for more details https://fishshell.com/docs/current/#tab-completion\n": "", "Overwrite image even if same image:tag name exists": "", + "Path to socket vmnet binary": "", "Path to the Dockerfile to use (optional)": "", "Path to the qemu firmware file. Defaults: For Linux, the default firmware location. For macOS, the brew installation location. For Windows, C:\\Program Files\\qemu\\share": "", + "Path to the socket vmnet client binary": "", "Pause": "", "Paused {{.count}} containers": "", "Paused {{.count}} containers in: {{.namespaces}}": "", @@ -846,6 +849,7 @@ "Using image repository {{.name}}": "Utilizando el repositorio de imágenes {{.name}}", "Using image {{.registry}}{{.image}}": "", "Using image {{.registry}}{{.image}} (global image repository)": "", + "Using qemu with --network=socket for 'socket_vmnet' is experimental": "", "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": "", @@ -990,6 +994,7 @@ "scheduled stop is not supported on the none driver, skipping scheduling": "", "service {{.namespace_name}}/{{.service_name}} has no node port": "", "set tunnel bind address, empty or '*' indicates the tunnel should be available for all interfaces": "", + "socket_vmnet network flags are not yet implemented with the qemu2 driver.\n See https://github.com/kubernetes/minikube/pull/14890 for details.": "", "stat failed": "", "status json failure": "", "status text failure": "", diff --git a/translations/fr.json b/translations/fr.json index f8d5f1871c..cf41a28217 100644 --- a/translations/fr.json +++ b/translations/fr.json @@ -23,6 +23,7 @@ "--container-runtime must be set to \"containerd\" or \"cri-o\" for rootless": "--container-runtime doit être défini sur \"containerd\" ou \"cri-o\" pour utilisateur normal", "--kvm-numa-count range is 1-8": "la tranche de --kvm-numa-count est 1 à 8", "--network flag is only valid with the docker/podman and KVM drivers, it will be ignored": "le drapeau --network est valide uniquement avec les pilotes docker/podman et KVM, il va être ignoré", + "--network flag is only valid with the docker/podman, KVM and Qemu drivers, it will be ignored": "", "1) Recreate the cluster with Kubernetes {{.new}}, by running:\n\t \n\t\t minikube delete {{.profile}}\n\t\t minikube start {{.profile}} --kubernetes-version={{.prefix}}{{.new}}\n\t \n\t\t2) Create a second cluster with Kubernetes {{.new}}, by running:\n\t \n\t\t minikube start -p {{.suggestedName}} --kubernetes-version={{.prefix}}{{.new}}\n\t \n\t\t3) Use the existing cluster at version Kubernetes {{.old}}, by running:\n\t \n\t\t minikube start {{.profile}} --kubernetes-version={{.prefix}}{{.old}}\n\t\t": "1) Recréez le cluster avec Kubernetes {{.new}}, en exécutant :\n\t \n\t\t minikube delete {{.profile}}\n\t\t minikube start {{.profile}} - -kubernetes-version={{.prefix}}{{.new}}\n\t \n\t\t2) Créez un deuxième cluster avec Kubernetes {{.new}}, en exécutant :\n\t \n \t\t minikube start -p {{.suggestedName}} --kubernetes-version={{.prefix}}{{.new}}\n\t \n\t\t3) Utiliser le cluster existant à la version Kubernetes {{.old}}, en exécutant :\n\t \n\t\t minikube start {{.profile}} --kubernetes-version={{.prefix}}{{.old}}\n\t \t", "1) Recreate the cluster with Kubernetes {{.new}}, by running:\n\t \n\t\t minikube delete{{.profile}}\n\t\t minikube start{{.profile}} --kubernetes-version={{.prefix}}{{.new}}\n\t \n\t\t2) Create a second cluster with Kubernetes {{.new}}, by running:\n\t \n\t\t minikube start -p {{.suggestedName}} --kubernetes-version={{.prefix}}{{.new}}\n\t \n\t\t3) Use the existing cluster at version Kubernetes {{.old}}, by running:\n\t \n\t\t minikube start{{.profile}} --kubernetes-version={{.prefix}}{{.old}}\n\t\t": "1) Recréez le cluster avec Kubernetes {{.new}}, en exécutant :\n\t \n\t\t minikube delete {{.profile}}\n\t\t minikube start{{.profile}} --kubernetes-version={{.prefix}}{{.new}}\n\t \n\t\t2) Créez un deuxième cluster avec Kubernetes {{.new}}, en exécutant :\n\t \n \t\t minikube start -p {{.suggestedName}} --kubernetes-version={{.prefix}}{{.new}}\n\t \n\t\t3) Utiliser le cluster existant à la version Kubernetes {{.old}}, en exécutant :\n\t \n\t\t minikube start{{.profile}} --kubernetes-version={{.prefix}}{{.old}}\n\t \t", "1. Click on \"Docker for Desktop\" menu icon\n\t\t\t2. Click \"Preferences\"\n\t\t\t3. Click \"Resources\"\n\t\t\t4. Increase \"CPUs\" slider bar to 2 or higher\n\t\t\t5. Click \"Apply \u0026 Restart\"": "1. Cliquez sur l'icône de menu \"Docker for Desktop\"\n\t\t\t2. Cliquez sur \"Preferences\"\n\t\t\t3. Cliquez sur \"Ressources\"\n\t\t\t4. Augmentez la barre de défilement \"CPU\" à 2 ou plus\n\t\t\t5. Cliquez sur \"Apply \u0026 Restart\"", @@ -445,8 +446,10 @@ "Output format. Accepted values: [json]": "Format de sortie. Valeurs acceptées : [json]", "Outputs minikube shell completion for the given shell (bash, zsh or fish)\n\n\tThis depends on the bash-completion binary. Example installation instructions:\n\tOS X:\n\t\t$ brew install bash-completion\n\t\t$ source $(brew --prefix)/etc/bash_completion\n\t\t$ minikube completion bash \u003e ~/.minikube-completion # for bash users\n\t\t$ minikube completion zsh \u003e ~/.minikube-completion # for zsh users\n\t\t$ source ~/.minikube-completion\n\t\t$ minikube completion fish \u003e ~/.config/fish/completions/minikube.fish # for fish users\n\tUbuntu:\n\t\t$ apt-get install bash-completion\n\t\t$ source /etc/bash_completion\n\t\t$ source \u003c(minikube completion bash) # for bash users\n\t\t$ source \u003c(minikube completion zsh) # for zsh users\n\t\t$ minikube completion fish \u003e ~/.config/fish/completions/minikube.fish # for fish users\n\n\tAdditionally, you may want to output the completion to a file and source in your .bashrc\n\n\tNote for zsh users: [1] zsh completions are only supported in versions of zsh \u003e= 5.2\n\tNote for fish users: [2] please refer to this docs for more details https://fishshell.com/docs/current/#tab-completion\n": "Affiche la complétion du shell minikube pour le shell donné (bash, zsh ou fish)\n\n\tCela dépend du binaire bash-completion. Exemple d'instructions d'installation :\n\tOS X :\n\t\t$ brew install bash-completion\n\t\t$ source $(brew --prefix)/etc/bash_completion\n\t\t$ minikube completion bash \u003e ~/.minikube-completion # pour les utilisateurs bash\n\t\t$ minikube completion zsh \u003e ~/.minikube-completion # pour les utilisateurs zsh\n\t\t$ source ~/.minikube-completion\n\t\t$ minikube completion fish \u003e ~/.config/fish/completions/minikube.fish # pour les utilisateurs de fish\n\tUbuntu:\n\t\t$ apt-get install bash-completion\n\t \t$ source /etc/bash_completion\n\t\t$ source \u003c(minikube completion bash) # pour les utilisateurs bash\n\t\t$ source \u003c(minikube completion zsh) # pour les utilisateurs zsh\n\t \t$ minikube completion fish \u003e ~/.config/fish/completions/minikube.fish # pour les utilisateurs de fish\n\n\tDe plus, vous voudrez peut-être sortir la complétion dans un fichier et une source dans votre .bashrc\n n\tRemarque pour les utilisateurs de zsh : [1] les complétions zsh ne sont prises en charge que dans les versions de zsh \u003e= 5.2\n\tRemarque pour les utilisateurs de fish : [2] veuillez vous référer à cette documentation pour plus de détails https://fishshell.com/docs/current/#tab-completion\n", "Overwrite image even if same image:tag name exists": "Écraser l'image même si la même image:balise existe", + "Path to socket vmnet binary": "", "Path to the Dockerfile to use (optional)": "Chemin d'accès au Dockerfile à utiliser (facultatif)", "Path to the qemu firmware file. Defaults: For Linux, the default firmware location. For macOS, the brew installation location. For Windows, C:\\Program Files\\qemu\\share": "Chemin d'accès au fichier du micrologiciel qemu. Valeurs par défaut : pour Linux, l'emplacement du micrologiciel par défaut. Pour macOS, l'emplacement d'installation de brew. Pour Windows, C:\\Program Files\\qemu\\share", + "Path to the socket vmnet client binary": "", "Pause": "Pause", "Paused {{.count}} containers": "{{.count}} conteneurs suspendus", "Paused {{.count}} containers in: {{.namespaces}}": "{{.count}} conteneurs suspendus dans : {{.namespaces}}", @@ -817,6 +820,7 @@ "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 qemu with --network=socket for 'socket_vmnet' is experimental": "", "Using rootless Docker driver was required, but the current Docker does not seem rootless. Try 'docker context use rootless' .": "L'utilisation du pilote Docker sans root était nécessaire, mais le Docker actuel ne semble pas sans root. Essayez 'docker context use rootless' .", "Using rootless driver was required, but the current driver does not seem rootless": "L'utilisation d'un pilote sans root était nécessaire, mais le pilote actuel ne semble pas sans root", "Using rootless {{.driver_name}} driver": "Utilisation du pilote {{.driver_name}} sans root", @@ -965,6 +969,7 @@ "scheduled stop is not supported on the none driver, skipping scheduling": "l'arrêt programmé n'est pas pris en charge sur le pilote none, programmation non prise en compte", "service {{.namespace_name}}/{{.service_name}} has no node port": "le service {{.namespace_name}}/{{.service_name}} n'a pas de port de nœud", "set tunnel bind address, empty or '*' indicates the tunnel should be available for all interfaces": "définit l'adresse de liaison du tunnel, vide ou '*' indique que le tunnel doit être disponible pour toutes les interfaces", + "socket_vmnet network flags are not yet implemented with the qemu2 driver.\n See https://github.com/kubernetes/minikube/pull/14890 for details.": "", "stat failed": "stat en échec", "status json failure": "état du JSON en échec", "status text failure": "état du texte en échec", diff --git a/translations/ja.json b/translations/ja.json index d2e76eec03..f9e204983e 100644 --- a/translations/ja.json +++ b/translations/ja.json @@ -22,6 +22,7 @@ "--container-runtime must be set to \"containerd\" or \"cri-o\" for rootless": "rootless のために、--container-runtime に「containerd」または「cri-o」を設定しなければなりません。", "--kvm-numa-count range is 1-8": "--kvm-numa-count の範囲は 1～8 です", "--network flag is only valid with the docker/podman and KVM drivers, it will be ignored": "--network フラグは、docker/podman および KVM ドライバーでのみ有効であるため、無視されます", + "--network flag is only valid with the docker/podman, KVM and Qemu drivers, it will be ignored": "", "1) Recreate the cluster with Kubernetes {{.new}}, by running:\n\t \n\t\t minikube delete{{.profile}}\n\t\t minikube start{{.profile}} --kubernetes-version={{.prefix}}{{.new}}\n\t \n\t\t2) Create a second cluster with Kubernetes {{.new}}, by running:\n\t \n\t\t minikube start -p {{.suggestedName}} --kubernetes-version={{.prefix}}{{.new}}\n\t \n\t\t3) Use the existing cluster at version Kubernetes {{.old}}, by running:\n\t \n\t\t minikube start{{.profile}} --kubernetes-version={{.prefix}}{{.old}}\n\t\t": "1) 次のコマンドで Kubernetes {{.new}} によるクラスターを再構築します:\n\t \n\t\t minikube delete{{.profile}}\n\t\t minikube start{{.profile}} --kubernetes-version={{.prefix}}{{.new}}\n\t \n\t\t2) 次のコマンドで Kubernetes {{.new}} による第 2 のクラスターを作成します:\n\t \n\t\t minikube start -p {{.suggestedName}} --kubernetes-version={{.prefix}}{{.new}}\n\t \n\t\t3) 次のコマンドで Kubernetes {{.old}} による既存クラスターを使用します:\n\t \n\t\t minikube start{{.profile}} --kubernetes-version={{.prefix}}{{.old}}\n\t\t", "1. Click on \"Docker for Desktop\" menu icon\n\t\t\t2. Click \"Preferences\"\n\t\t\t3. Click \"Resources\"\n\t\t\t4. Increase \"CPUs\" slider bar to 2 or higher\n\t\t\t5. Click \"Apply \u0026 Restart\"": "1. 「Docker for Desktop」メニューアイコンをクリックします\n\t\t\t2. 「Preferences」をクリックします\n\t\t\t3. 「Resources」をクリックします\n\t\t\t4. 「CPUs」スライドバーを 2 以上に増やします\n\t\t\t5. 「Apply \u0026 Restart」をクリックします", "1. Click on \"Docker for Desktop\" menu icon\n\t\t\t2. Click \"Preferences\"\n\t\t\t3. Click \"Resources\"\n\t\t\t4. Increase \"Memory\" slider bar to {{.recommend}} or higher\n\t\t\t5. Click \"Apply \u0026 Restart\"": "1. 「Docker for Desktop」メニューアイコンをクリックします\n\t\t\t2. 「Preferences」をクリックします\n\t\t\t3. 「Resources」をクリックします\n\t\t\t4. 「Memory」スライドバーを {{.recommend}} 以上に増やします\n\t\t\t5. 「Apply \u0026 Restart」をクリックします", @@ -430,8 +431,10 @@ "Output format. Accepted values: [json, yaml]": "出力フォーマット。許容値: [json, yaml]", "Outputs minikube shell completion for the given shell (bash, zsh or fish)\n\n\tThis depends on the bash-completion binary. Example installation instructions:\n\tOS X:\n\t\t$ brew install bash-completion\n\t\t$ source $(brew --prefix)/etc/bash_completion\n\t\t$ minikube completion bash \u003e ~/.minikube-completion # for bash users\n\t\t$ minikube completion zsh \u003e ~/.minikube-completion # for zsh users\n\t\t$ source ~/.minikube-completion\n\t\t$ minikube completion fish \u003e ~/.config/fish/completions/minikube.fish # for fish users\n\tUbuntu:\n\t\t$ apt-get install bash-completion\n\t\t$ source /etc/bash_completion\n\t\t$ source \u003c(minikube completion bash) # for bash users\n\t\t$ source \u003c(minikube completion zsh) # for zsh users\n\t\t$ minikube completion fish \u003e ~/.config/fish/completions/minikube.fish # for fish users\n\n\tAdditionally, you may want to output the completion to a file and source in your .bashrc\n\n\tNote for zsh users: [1] zsh completions are only supported in versions of zsh \u003e= 5.2\n\tNote for fish users: [2] please refer to this docs for more details https://fishshell.com/docs/current/#tab-completion\n": "指定されたシェル用の minikube シェル補完コマンドを出力 (bash、zsh、fish)\n\n\tbash-completion バイナリーに依存しています。インストールコマンドの例:\n\tOS X:\n\t\t$ brew install bash-completion\n\t\t$ source $(brew --prefix)/etc/bash_completion\n\t\t$ minikube completion bash \u003e ~/.minikube-completion # bash ユーザー用\n\t\t$ minikube completion zsh \u003e ~/.minikube-completion # zsh ユーザー用\n\t\t$ source ~/.minikube-completion\n\t\t$ minikube completion fish \u003e ~/.config/fish/completions/minikube.fish # fish ユーザー用\n\tUbuntu:\n\t\t$ apt-get install bash-completion\n\t\t$ source /etc/bash_completion\n\t\t$ source \u003c(minikube completion bash) # bash ユーザー用\n\t\t$ source \u003c(minikube completion zsh) # zsh ユーザー用\n\t\t$ minikube completion fish \u003e ~/.config/fish/completions/minikube.fish # fish ユーザー用\n\n\tさらに、補完コマンドをファイルに出力して .bashrc 内で source を実行するとよいでしょう\n\n\t注意 (zsh ユーザー): [1] zsh 補完コマンドは zsh バージョン \u003e= 5.2 でのみサポートしています\n\t注意 (fish ユーザー): [2] 詳細はこちらのドキュメントを参照してください https://fishshell.com/docs/current/#tab-completion\n", "Overwrite image even if same image:tag name exists": "同じ image:tag 名が存在していてもイメージを上書きします", + "Path to socket vmnet binary": "", "Path to the Dockerfile to use (optional)": "使用する Dockerfile へのパス (任意)", "Path to the qemu firmware file. Defaults: For Linux, the default firmware location. For macOS, the brew installation location. For Windows, C:\\Program Files\\qemu\\share": "qemu ファームウェアファイルへのパス。デフォルト: Linux の場合、デフォルトのファームウェアの場所。macOS の場合、brew のインストール場所。Windows の場合、C:\\Program Files\\qemu\\share", + "Path to the socket vmnet client binary": "", "Pause": "一時停止", "Paused {{.count}} containers": "{{.count}} 個のコンテナーを一時停止しました", "Paused {{.count}} containers in: {{.namespaces}}": "{{.namespaces}} に存在する {{.count}} 個のコンテナーを一時停止しました", @@ -785,6 +788,7 @@ "Using image repository {{.name}}": "{{.name}} イメージリポジトリーを使用しています", "Using image {{.registry}}{{.image}}": "{{.registry}}{{.image}} イメージを使用しています", "Using image {{.registry}}{{.image}} (global image repository)": "{{.registry}}{{.image}} イメージ (グローバルイメージリポジトリー) を使用しています", + "Using qemu with --network=socket for 'socket_vmnet' is experimental": "", "Using rootless Docker driver was required, but the current Docker does not seem rootless. Try 'docker context use rootless' .": "rootless Docker ドライバー使用が必要でしたが、現在の Docker は rootless が必要ないようです。'docker context use rootless' を試してみてください。", "Using rootless driver was required, but the current driver does not seem rootless": "rootless ドライバー使用が必要でしたが、現在のドライバーは rootless が必要ないようです", "Using rootless {{.driver_name}} driver": "rootless {{.driver_name}} ドライバー使用", @@ -926,6 +930,7 @@ "scheduled stop is not supported on the none driver, skipping scheduling": "none ドライバーでは予定停止がサポートされていません (予約をスキップします)", "service {{.namespace_name}}/{{.service_name}} has no node port": "サービス {{.namespace_name}}/{{.service_name}} は NodePort がありません", "set tunnel bind address, empty or '*' indicates the tunnel should be available for all interfaces": "", + "socket_vmnet network flags are not yet implemented with the qemu2 driver.\n See https://github.com/kubernetes/minikube/pull/14890 for details.": "", "stat failed": "stat に失敗しました", "status json failure": "status json に失敗しました", "status text failure": "status text に失敗しました", diff --git a/translations/ko.json b/translations/ko.json index 4d2522c5db..ddb396e721 100644 --- a/translations/ko.json +++ b/translations/ko.json @@ -27,7 +27,7 @@ "- Restart your {{.driver_name}} service": "{{.driver_name}} 서비스를 다시 시작하세요", "--container-runtime must be set to \"containerd\" or \"cri-o\" for rootless": "", "--kvm-numa-count range is 1-8": "--kvm-numa-count 범위는 1부터 8입니다", - "--network flag is only valid with the docker/podman and KVM drivers, it will be ignored": "", + "--network flag is only valid with the docker/podman, KVM and Qemu drivers, it will be ignored": "", "1) Recreate the cluster with Kubernetes {{.new}}, by running:\n\t \n\t\t minikube delete{{.profile}}\n\t\t minikube start{{.profile}} --kubernetes-version={{.prefix}}{{.new}}\n\t \n\t\t2) Create a second cluster with Kubernetes {{.new}}, by running:\n\t \n\t\t minikube start -p {{.suggestedName}} --kubernetes-version={{.prefix}}{{.new}}\n\t \n\t\t3) Use the existing cluster at version Kubernetes {{.old}}, by running:\n\t \n\t\t minikube start{{.profile}} --kubernetes-version={{.prefix}}{{.old}}\n\t\t": "", "1. Click on \"Docker for Desktop\" menu icon\n\t\t\t2. Click \"Preferences\"\n\t\t\t3. Click \"Resources\"\n\t\t\t4. Increase \"CPUs\" slider bar to 2 or higher\n\t\t\t5. Click \"Apply \u0026 Restart\"": "", "1. Click on \"Docker for Desktop\" menu icon\n\t\t\t2. Click \"Preferences\"\n\t\t\t3. Click \"Resources\"\n\t\t\t4. Increase \"Memory\" slider bar to {{.recommend}} or higher\n\t\t\t5. Click \"Apply \u0026 Restart\"": "", @@ -479,8 +479,10 @@ "Output format. Accepted values: [json, yaml]": "", "Outputs minikube shell completion for the given shell (bash, zsh or fish)\n\n\tThis depends on the bash-completion binary. Example installation instructions:\n\tOS X:\n\t\t$ brew install bash-completion\n\t\t$ source $(brew --prefix)/etc/bash_completion\n\t\t$ minikube completion bash \u003e ~/.minikube-completion # for bash users\n\t\t$ minikube completion zsh \u003e ~/.minikube-completion # for zsh users\n\t\t$ source ~/.minikube-completion\n\t\t$ minikube completion fish \u003e ~/.config/fish/completions/minikube.fish # for fish users\n\tUbuntu:\n\t\t$ apt-get install bash-completion\n\t\t$ source /etc/bash_completion\n\t\t$ source \u003c(minikube completion bash) # for bash users\n\t\t$ source \u003c(minikube completion zsh) # for zsh users\n\t\t$ minikube completion fish \u003e ~/.config/fish/completions/minikube.fish # for fish users\n\n\tAdditionally, you may want to output the completion to a file and source in your .bashrc\n\n\tNote for zsh users: [1] zsh completions are only supported in versions of zsh \u003e= 5.2\n\tNote for fish users: [2] please refer to this docs for more details https://fishshell.com/docs/current/#tab-completion\n": "", "Overwrite image even if same image:tag name exists": "", + "Path to socket vmnet binary": "", "Path to the Dockerfile to use (optional)": "", "Path to the qemu firmware file. Defaults: For Linux, the default firmware location. For macOS, the brew installation location. For Windows, C:\\Program Files\\qemu\\share": "", + "Path to the socket vmnet client binary": "", "Pause": "", "Paused {{.count}} containers": "", "Paused {{.count}} containers in: {{.namespaces}}": "", @@ -846,6 +848,7 @@ "Using image repository {{.name}}": "", "Using image {{.registry}}{{.image}}": "", "Using image {{.registry}}{{.image}} (global image repository)": "", + "Using qemu with --network=socket for 'socket_vmnet' is experimental": "", "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": "", @@ -999,6 +1002,7 @@ "scheduled stop is not supported on the none driver, skipping scheduling": "", "service {{.namespace_name}}/{{.service_name}} has no node port": "", "set tunnel bind address, empty or '*' indicates the tunnel should be available for all interfaces": "", + "socket_vmnet network flags are not yet implemented with the qemu2 driver.\n See https://github.com/kubernetes/minikube/pull/14890 for details.": "", "stat failed": "", "status json failure": "", "status text failure": "", diff --git a/translations/pl.json b/translations/pl.json index d55d1174d1..863aa6c5e9 100644 --- a/translations/pl.json +++ b/translations/pl.json @@ -26,7 +26,7 @@ "- Restart your {{.driver_name}} service": "", "--container-runtime must be set to \"containerd\" or \"cri-o\" for rootless": "", "--kvm-numa-count range is 1-8": "", - "--network flag is only valid with the docker/podman and KVM drivers, it will be ignored": "", + "--network flag is only valid with the docker/podman, KVM and Qemu drivers, it will be ignored": "", "1) Recreate the cluster with Kubernetes {{.new}}, by running:\n\t \n\t\t minikube delete{{.profile}}\n\t\t minikube start{{.profile}} --kubernetes-version={{.prefix}}{{.new}}\n\t \n\t\t2) Create a second cluster with Kubernetes {{.new}}, by running:\n\t \n\t\t minikube start -p {{.suggestedName}} --kubernetes-version={{.prefix}}{{.new}}\n\t \n\t\t3) Use the existing cluster at version Kubernetes {{.old}}, by running:\n\t \n\t\t minikube start{{.profile}} --kubernetes-version={{.prefix}}{{.old}}\n\t\t": "", "1. Click on \"Docker for Desktop\" menu icon\n\t\t\t2. Click \"Preferences\"\n\t\t\t3. Click \"Resources\"\n\t\t\t4. Increase \"CPUs\" slider bar to 2 or higher\n\t\t\t5. Click \"Apply \u0026 Restart\"": "", "1. Click on \"Docker for Desktop\" menu icon\n\t\t\t2. Click \"Preferences\"\n\t\t\t3. Click \"Resources\"\n\t\t\t4. Increase \"Memory\" slider bar to {{.recommend}} or higher\n\t\t\t5. Click \"Apply \u0026 Restart\"": "", @@ -473,8 +473,10 @@ "Outputs minikube shell completion for the given shell (bash or zsh)": "Zwraca autouzupełnianie poleceń minikube dla danej powłoki (bash, zsh)", "Outputs minikube shell completion for the given shell (bash, zsh or fish)\n\n\tThis depends on the bash-completion binary. Example installation instructions:\n\tOS X:\n\t\t$ brew install bash-completion\n\t\t$ source $(brew --prefix)/etc/bash_completion\n\t\t$ minikube completion bash \u003e ~/.minikube-completion # for bash users\n\t\t$ minikube completion zsh \u003e ~/.minikube-completion # for zsh users\n\t\t$ source ~/.minikube-completion\n\t\t$ minikube completion fish \u003e ~/.config/fish/completions/minikube.fish # for fish users\n\tUbuntu:\n\t\t$ apt-get install bash-completion\n\t\t$ source /etc/bash_completion\n\t\t$ source \u003c(minikube completion bash) # for bash users\n\t\t$ source \u003c(minikube completion zsh) # for zsh users\n\t\t$ minikube completion fish \u003e ~/.config/fish/completions/minikube.fish # for fish users\n\n\tAdditionally, you may want to output the completion to a file and source in your .bashrc\n\n\tNote for zsh users: [1] zsh completions are only supported in versions of zsh \u003e= 5.2\n\tNote for fish users: [2] please refer to this docs for more details https://fishshell.com/docs/current/#tab-completion\n": "", "Overwrite image even if same image:tag name exists": "Nadpisuje obraz nawet jeśli istnieje obraz o tej samej nazwie i tagu.", + "Path to socket vmnet binary": "", "Path to the Dockerfile to use (optional)": "Ścieżka pliku Dockerfile, którego należy użyć (opcjonalne)", "Path to the qemu firmware file. Defaults: For Linux, the default firmware location. For macOS, the brew installation location. For Windows, C:\\Program Files\\qemu\\share": "", + "Path to the socket vmnet client binary": "", "Pause": "Stop", "Paused {{.count}} containers": "Zatrzymane kontenery: {{.count}}", "Paused {{.count}} containers in: {{.namespaces}}": "Zatrzymane kontenery: {{.count}} w przestrzeniach nazw: {{.namespaces}}", @@ -856,6 +858,7 @@ "Using image repository {{.name}}": "", "Using image {{.registry}}{{.image}}": "", "Using image {{.registry}}{{.image}} (global image repository)": "", + "Using qemu with --network=socket for 'socket_vmnet' is experimental": "", "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": "", @@ -1004,6 +1007,7 @@ "scheduled stop is not supported on the none driver, skipping scheduling": "", "service {{.namespace_name}}/{{.service_name}} has no node port": "", "set tunnel bind address, empty or '*' indicates the tunnel should be available for all interfaces": "", + "socket_vmnet network flags are not yet implemented with the qemu2 driver.\n See https://github.com/kubernetes/minikube/pull/14890 for details.": "", "stat failed": "wykonanie komendy stat nie powiodło się", "status json failure": "", "status text failure": "", diff --git a/translations/ru.json b/translations/ru.json index a9a85c5eec..a3bdd47897 100644 --- a/translations/ru.json +++ b/translations/ru.json @@ -21,7 +21,7 @@ "- Restart your {{.driver_name}} service": "", "--container-runtime must be set to \"containerd\" or \"cri-o\" for rootless": "", "--kvm-numa-count range is 1-8": "", - "--network flag is only valid with the docker/podman and KVM drivers, it will be ignored": "", + "--network flag is only valid with the docker/podman, KVM and Qemu drivers, it will be ignored": "", "1) Recreate the cluster with Kubernetes {{.new}}, by running:\n\t \n\t\t minikube delete{{.profile}}\n\t\t minikube start{{.profile}} --kubernetes-version={{.prefix}}{{.new}}\n\t \n\t\t2) Create a second cluster with Kubernetes {{.new}}, by running:\n\t \n\t\t minikube start -p {{.suggestedName}} --kubernetes-version={{.prefix}}{{.new}}\n\t \n\t\t3) Use the existing cluster at version Kubernetes {{.old}}, by running:\n\t \n\t\t minikube start{{.profile}} --kubernetes-version={{.prefix}}{{.old}}\n\t\t": "1) Пересоздайте кластер с Kubernetes {{.new}}, выполнив:\n\t \n\t\t minikube delete{{.profile}}\n\t\t minikube start{{.profile}} --kubernetes-version={{.prefix}}{{.new}}\n\t \n\t\t2) Создайье второй кластер с Kubernetes {{.new}}, выполнив:\n\t \n\t\t minikube start -p {{.suggestedName}} --kubernetes-version={{.prefix}}{{.new}}\n\t \n\t\t3) Используйте существующий кластер с версией Kubernetes {{.old}}, выполнив:\n\t \n\t\t minikube start{{.profile}} --kubernetes-version={{.prefix}}{{.old}}\n\t\t", "1. Click on \"Docker for Desktop\" menu icon\n\t\t\t2. Click \"Preferences\"\n\t\t\t3. Click \"Resources\"\n\t\t\t4. Increase \"CPUs\" slider bar to 2 or higher\n\t\t\t5. Click \"Apply \u0026 Restart\"": "1. Кликните на иконку \"Docker for Desktop\"\n\t\t\t2. Выберите \"Preferences\"\n\t\t\t3. Нажмите \"Resources\"\n\t\t\t4. Увеличьте кол-во \"CPUs\" до 2 или выше\n\t\t\t5. Нажмите \"Apply \u0026 Перезапуск\"", "1. Click on \"Docker for Desktop\" menu icon\n\t\t\t2. Click \"Preferences\"\n\t\t\t3. Click \"Resources\"\n\t\t\t4. Increase \"Memory\" slider bar to {{.recommend}} or higher\n\t\t\t5. Click \"Apply \u0026 Restart\"": "1. Кликните на иконку \"Docker for Desktop\"\n\t\t\t2. Выберите \"Preferences\"\n\t\t\t3. Нажмите \"Resources\"\n\t\t\t4. Увеличьте кол-во \"emory\" до {{.recommend}} или выше\n\t\t\t5. Нажмите \"Apply \u0026 Перезапуск\"", @@ -429,8 +429,10 @@ "Output format. Accepted values: [json, yaml]": "", "Outputs minikube shell completion for the given shell (bash, zsh or fish)\n\n\tThis depends on the bash-completion binary. Example installation instructions:\n\tOS X:\n\t\t$ brew install bash-completion\n\t\t$ source $(brew --prefix)/etc/bash_completion\n\t\t$ minikube completion bash \u003e ~/.minikube-completion # for bash users\n\t\t$ minikube completion zsh \u003e ~/.minikube-completion # for zsh users\n\t\t$ source ~/.minikube-completion\n\t\t$ minikube completion fish \u003e ~/.config/fish/completions/minikube.fish # for fish users\n\tUbuntu:\n\t\t$ apt-get install bash-completion\n\t\t$ source /etc/bash_completion\n\t\t$ source \u003c(minikube completion bash) # for bash users\n\t\t$ source \u003c(minikube completion zsh) # for zsh users\n\t\t$ minikube completion fish \u003e ~/.config/fish/completions/minikube.fish # for fish users\n\n\tAdditionally, you may want to output the completion to a file and source in your .bashrc\n\n\tNote for zsh users: [1] zsh completions are only supported in versions of zsh \u003e= 5.2\n\tNote for fish users: [2] please refer to this docs for more details https://fishshell.com/docs/current/#tab-completion\n": "", "Overwrite image even if same image:tag name exists": "", + "Path to socket vmnet binary": "", "Path to the Dockerfile to use (optional)": "", "Path to the qemu firmware file. Defaults: For Linux, the default firmware location. For macOS, the brew installation location. For Windows, C:\\Program Files\\qemu\\share": "", + "Path to the socket vmnet client binary": "", "Pause": "", "Paused {{.count}} containers": "", "Paused {{.count}} containers in: {{.namespaces}}": "", @@ -782,6 +784,7 @@ "Using image repository {{.name}}": "", "Using image {{.registry}}{{.image}}": "Используется образ {{.registry}}{{.image}}", "Using image {{.registry}}{{.image}} (global image repository)": "", + "Using qemu with --network=socket for 'socket_vmnet' is experimental": "", "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": "", @@ -923,6 +926,7 @@ "scheduled stop is not supported on the none driver, skipping scheduling": "", "service {{.namespace_name}}/{{.service_name}} has no node port": "", "set tunnel bind address, empty or '*' indicates the tunnel should be available for all interfaces": "", + "socket_vmnet network flags are not yet implemented with the qemu2 driver.\n See https://github.com/kubernetes/minikube/pull/14890 for details.": "", "stat failed": "", "status json failure": "", "status text failure": "", diff --git a/translations/strings.txt b/translations/strings.txt index 9d7bd85439..4cd5fa0ced 100644 --- a/translations/strings.txt +++ b/translations/strings.txt @@ -21,7 +21,7 @@ "- Restart your {{.driver_name}} service": "", "--container-runtime must be set to \"containerd\" or \"cri-o\" for rootless": "", "--kvm-numa-count range is 1-8": "", - "--network flag is only valid with the docker/podman and KVM drivers, it will be ignored": "", + "--network flag is only valid with the docker/podman, KVM and Qemu drivers, it will be ignored": "", "1) Recreate the cluster with Kubernetes {{.new}}, by running:\n\t \n\t\t minikube delete{{.profile}}\n\t\t minikube start{{.profile}} --kubernetes-version={{.prefix}}{{.new}}\n\t \n\t\t2) Create a second cluster with Kubernetes {{.new}}, by running:\n\t \n\t\t minikube start -p {{.suggestedName}} --kubernetes-version={{.prefix}}{{.new}}\n\t \n\t\t3) Use the existing cluster at version Kubernetes {{.old}}, by running:\n\t \n\t\t minikube start{{.profile}} --kubernetes-version={{.prefix}}{{.old}}\n\t\t": "", "1. Click on \"Docker for Desktop\" menu icon\n\t\t\t2. Click \"Preferences\"\n\t\t\t3. Click \"Resources\"\n\t\t\t4. Increase \"CPUs\" slider bar to 2 or higher\n\t\t\t5. Click \"Apply \u0026 Restart\"": "", "1. Click on \"Docker for Desktop\" menu icon\n\t\t\t2. Click \"Preferences\"\n\t\t\t3. Click \"Resources\"\n\t\t\t4. Increase \"Memory\" slider bar to {{.recommend}} or higher\n\t\t\t5. Click \"Apply \u0026 Restart\"": "", @@ -429,8 +429,10 @@ "Output format. Accepted values: [json, yaml]": "", "Outputs minikube shell completion for the given shell (bash, zsh or fish)\n\n\tThis depends on the bash-completion binary. Example installation instructions:\n\tOS X:\n\t\t$ brew install bash-completion\n\t\t$ source $(brew --prefix)/etc/bash_completion\n\t\t$ minikube completion bash \u003e ~/.minikube-completion # for bash users\n\t\t$ minikube completion zsh \u003e ~/.minikube-completion # for zsh users\n\t\t$ source ~/.minikube-completion\n\t\t$ minikube completion fish \u003e ~/.config/fish/completions/minikube.fish # for fish users\n\tUbuntu:\n\t\t$ apt-get install bash-completion\n\t\t$ source /etc/bash_completion\n\t\t$ source \u003c(minikube completion bash) # for bash users\n\t\t$ source \u003c(minikube completion zsh) # for zsh users\n\t\t$ minikube completion fish \u003e ~/.config/fish/completions/minikube.fish # for fish users\n\n\tAdditionally, you may want to output the completion to a file and source in your .bashrc\n\n\tNote for zsh users: [1] zsh completions are only supported in versions of zsh \u003e= 5.2\n\tNote for fish users: [2] please refer to this docs for more details https://fishshell.com/docs/current/#tab-completion\n": "", "Overwrite image even if same image:tag name exists": "", + "Path to socket vmnet binary": "", "Path to the Dockerfile to use (optional)": "", "Path to the qemu firmware file. Defaults: For Linux, the default firmware location. For macOS, the brew installation location. For Windows, C:\\Program Files\\qemu\\share": "", + "Path to the socket vmnet client binary": "", "Pause": "", "Paused {{.count}} containers": "", "Paused {{.count}} containers in: {{.namespaces}}": "", @@ -782,6 +784,7 @@ "Using image repository {{.name}}": "", "Using image {{.registry}}{{.image}}": "", "Using image {{.registry}}{{.image}} (global image repository)": "", + "Using qemu with --network=socket for 'socket_vmnet' is experimental": "", "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": "", @@ -923,6 +926,7 @@ "scheduled stop is not supported on the none driver, skipping scheduling": "", "service {{.namespace_name}}/{{.service_name}} has no node port": "", "set tunnel bind address, empty or '*' indicates the tunnel should be available for all interfaces": "", + "socket_vmnet network flags are not yet implemented with the qemu2 driver.\n See https://github.com/kubernetes/minikube/pull/14890 for details.": "", "stat failed": "", "status json failure": "", "status text failure": "", diff --git a/translations/zh-CN.json b/translations/zh-CN.json index 0ae5ed6e1d..c3a30d3039 100644 --- a/translations/zh-CN.json +++ b/translations/zh-CN.json @@ -29,6 +29,7 @@ "--container-runtime must be set to \"containerd\" or \"cri-o\" for rootless": "--container-runtime 必须被设置为 \"containerd\" 或者 \"cri-o\" 以实现非 root 运行", "--kvm-numa-count range is 1-8": "--kvm-numa-count 取值范围为 1-8", "--network flag is only valid with the docker/podman and KVM drivers, it will be ignored": "--network 标识仅对 docker/podman 和 KVM 驱动程序有效，它将被忽略", + "--network flag is only valid with the docker/podman, KVM and Qemu drivers, it will be ignored": "", "1) Recreate the cluster with Kubernetes {{.new}}, by running:\n\t \n\t\t minikube delete{{.profile}}\n\t\t minikube start{{.profile}} --kubernetes-version={{.prefix}}{{.new}}\n\t \n\t\t2) Create a second cluster with Kubernetes {{.new}}, by running:\n\t \n\t\t minikube start -p {{.suggestedName}} --kubernetes-version={{.prefix}}{{.new}}\n\t \n\t\t3) Use the existing cluster at version Kubernetes {{.old}}, by running:\n\t \n\t\t minikube start{{.profile}} --kubernetes-version={{.prefix}}{{.old}}\n\t\t": "", "1. Click on \"Docker for Desktop\" menu icon\n\t\t\t2. Click \"Preferences\"\n\t\t\t3. Click \"Resources\"\n\t\t\t4. Increase \"CPUs\" slider bar to 2 or higher\n\t\t\t5. Click \"Apply \u0026 Restart\"": "", "1. Click on \"Docker for Desktop\" menu icon\n\t\t\t2. Click \"Preferences\"\n\t\t\t3. Click \"Resources\"\n\t\t\t4. Increase \"Memory\" slider bar to {{.recommend}} or higher\n\t\t\t5. Click \"Apply \u0026 Restart\"": "", @@ -545,8 +546,10 @@ "Output format. Accepted values: [json, yaml]": "", "Outputs minikube shell completion for the given shell (bash, zsh or fish)\n\n\tThis depends on the bash-completion binary. Example installation instructions:\n\tOS X:\n\t\t$ brew install bash-completion\n\t\t$ source $(brew --prefix)/etc/bash_completion\n\t\t$ minikube completion bash \u003e ~/.minikube-completion # for bash users\n\t\t$ minikube completion zsh \u003e ~/.minikube-completion # for zsh users\n\t\t$ source ~/.minikube-completion\n\t\t$ minikube completion fish \u003e ~/.config/fish/completions/minikube.fish # for fish users\n\tUbuntu:\n\t\t$ apt-get install bash-completion\n\t\t$ source /etc/bash_completion\n\t\t$ source \u003c(minikube completion bash) # for bash users\n\t\t$ source \u003c(minikube completion zsh) # for zsh users\n\t\t$ minikube completion fish \u003e ~/.config/fish/completions/minikube.fish # for fish users\n\n\tAdditionally, you may want to output the completion to a file and source in your .bashrc\n\n\tNote for zsh users: [1] zsh completions are only supported in versions of zsh \u003e= 5.2\n\tNote for fish users: [2] please refer to this docs for more details https://fishshell.com/docs/current/#tab-completion\n": "", "Overwrite image even if same image:tag name exists": "", + "Path to socket vmnet binary": "", "Path to the Dockerfile to use (optional)": "", "Path to the qemu firmware file. Defaults: For Linux, the default firmware location. For macOS, the brew installation location. For Windows, C:\\Program Files\\qemu\\share": "", + "Path to the socket vmnet client binary": "", "Pause": "暂停", "Paused kubelet and {{.count}} containers": "已暂停 kubelet 和 {{.count}} 个容器", "Paused kubelet and {{.count}} containers in: {{.namespaces}}": "已暂停 {{.namespaces}} 中的 kubelet 和 {{.count}} 个容器", @@ -956,6 +959,7 @@ "Using image repository {{.name}}": "正在使用镜像存储库 {{.name}}", "Using image {{.registry}}{{.image}}": "", "Using image {{.registry}}{{.image}} (global image repository)": "", + "Using qemu with --network=socket for 'socket_vmnet' is experimental": "", "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": "", @@ -1114,6 +1118,7 @@ "scheduled stop is not supported on the none driver, skipping scheduling": "", "service {{.namespace_name}}/{{.service_name}} has no node port": "", "set tunnel bind address, empty or '*' indicates the tunnel should be available for all interfaces": "", + "socket_vmnet network flags are not yet implemented with the qemu2 driver.\n See https://github.com/kubernetes/minikube/pull/14890 for details.": "", "stat failed": "", "status json failure": "", "status text failure": "", From 411d4579fd248fd57a4259437564c3e08f354535 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Wed, 21 Sep 2022 21:06:03 +0000 Subject: [PATCH 531/545] bump default/newest kubernetes versions --- pkg/minikube/constants/constants.go | 4 ++-- site/content/en/docs/commands/start.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/minikube/constants/constants.go b/pkg/minikube/constants/constants.go index 053bd4df08..f89036d011 100644 --- a/pkg/minikube/constants/constants.go +++ b/pkg/minikube/constants/constants.go @@ -32,10 +32,10 @@ var ( const ( // DefaultKubernetesVersion is the default Kubernetes version - DefaultKubernetesVersion = "v1.25.1" + DefaultKubernetesVersion = "v1.25.2" // NewestKubernetesVersion is the newest Kubernetes version to test against // NOTE: You may need to update coreDNS & etcd versions in pkg/minikube/bootstrapper/images/images.go - NewestKubernetesVersion = "v1.25.1" + NewestKubernetesVersion = "v1.25.2" // OldestKubernetesVersion is the oldest Kubernetes version to test against OldestKubernetesVersion = "v1.16.0" // NoKubernetesVersion is the version used when users does NOT want to install kubernetes diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index eb91177a5f..a9b4d23d22 100644 --- a/site/content/en/docs/commands/start.md +++ b/site/content/en/docs/commands/start.md @@ -71,7 +71,7 @@ minikube start [flags] --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/iso/minikube-v1.27.0-amd64.iso,https://github.com/kubernetes/minikube/releases/download/v1.27.0/minikube-v1.27.0-amd64.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.27.0-amd64.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.25.1, 'latest' for v1.25.1). Defaults to 'stable'. + --kubernetes-version string The Kubernetes version that the minikube VM will use (ex: v1.2.3, 'stable' for v1.25.2, 'latest' for v1.25.2). Defaults to 'stable'. --kvm-gpu Enable experimental NVIDIA GPU support in minikube --kvm-hidden Hide the hypervisor signature from the guest in minikube (kvm2 driver only) --kvm-network string The KVM default network name. (kvm2 driver only) (default "default") From 9bb4006d0cc79784f6e4e2d887e7dcef0ee4db0a Mon Sep 17 00:00:00 2001 From: cokia Date: Thu, 22 Sep 2022 15:33:30 +0900 Subject: [PATCH 532/545] translate(ko):--network flag is only valid --- translations/ko.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/translations/ko.json b/translations/ko.json index ddb396e721..d6030f98ea 100644 --- a/translations/ko.json +++ b/translations/ko.json @@ -27,7 +27,7 @@ "- Restart your {{.driver_name}} service": "{{.driver_name}} 서비스를 다시 시작하세요", "--container-runtime must be set to \"containerd\" or \"cri-o\" for rootless": "", "--kvm-numa-count range is 1-8": "--kvm-numa-count 범위는 1부터 8입니다", - "--network flag is only valid with the docker/podman, KVM and Qemu drivers, it will be ignored": "", + "--network flag is only valid with the docker/podman, KVM and Qemu drivers, it will be ignored": "--network 는 docker나 podman 에서만 유효합니다. KVM이나 Qemu 드라이버에서는 인자가 무시됩니다", "1) Recreate the cluster with Kubernetes {{.new}}, by running:\n\t \n\t\t minikube delete{{.profile}}\n\t\t minikube start{{.profile}} --kubernetes-version={{.prefix}}{{.new}}\n\t \n\t\t2) Create a second cluster with Kubernetes {{.new}}, by running:\n\t \n\t\t minikube start -p {{.suggestedName}} --kubernetes-version={{.prefix}}{{.new}}\n\t \n\t\t3) Use the existing cluster at version Kubernetes {{.old}}, by running:\n\t \n\t\t minikube start{{.profile}} --kubernetes-version={{.prefix}}{{.old}}\n\t\t": "", "1. Click on \"Docker for Desktop\" menu icon\n\t\t\t2. Click \"Preferences\"\n\t\t\t3. Click \"Resources\"\n\t\t\t4. Increase \"CPUs\" slider bar to 2 or higher\n\t\t\t5. Click \"Apply \u0026 Restart\"": "", "1. Click on \"Docker for Desktop\" menu icon\n\t\t\t2. Click \"Preferences\"\n\t\t\t3. Click \"Resources\"\n\t\t\t4. Increase \"Memory\" slider bar to {{.recommend}} or higher\n\t\t\t5. Click \"Apply \u0026 Restart\"": "", From d89feae7923105f65b8dd70ee2a530d51fddee55 Mon Sep 17 00:00:00 2001 From: cokia Date: Thu, 22 Sep 2022 15:35:16 +0900 Subject: [PATCH 533/545] translate(ko): minikube cache will be deprecated --- translations/ko.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/translations/ko.json b/translations/ko.json index d6030f98ea..e5b9925abb 100644 --- a/translations/ko.json +++ b/translations/ko.json @@ -1,7 +1,7 @@ { "\n\n": "", "\"The '{{.minikube_addon}}' addon is disabled": "\"The '{{.minikube_addon}}' 이 비활성화되었습니다", - "\"minikube cache\" will be deprecated in upcoming versions, please switch to \"minikube image load\"": "", + "\"minikube cache\" will be deprecated in upcoming versions, please switch to \"minikube image load\"": "\"minikube cache\"는 추후 버전에서 사용 중단됩니다. \"minikube image load\"로 전환하십시오", "\"{{.context}}\" context has been updated to point to {{.hostname}}:{{.port}}": "\"{{.context}}\" 컨텍스트가 {{.hostname}}:{{.port}}로 갱신되었습니다.", "\"{{.machineName}}\" does not exist, nothing to stop": "\"{{.machineName}}\" 이 존재하지 않아, 중단할 것이 없습니다", "\"{{.name}}\" profile does not exist": "\"{{.name}}\" 프로필이 존재하지 않습니다", From c5073bc46e728db04aa02bf4060d6d2d01d607c8 Mon Sep 17 00:00:00 2001 From: cokia Date: Thu, 22 Sep 2022 15:36:33 +0900 Subject: [PATCH 534/545] translate(ko): Add an image into minikube as a local cache --- translations/ko.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/translations/ko.json b/translations/ko.json index e5b9925abb..f544af1a0f 100644 --- a/translations/ko.json +++ b/translations/ko.json @@ -45,7 +45,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 into minikube as a local cache, or delete, reload the cached images": "이미지를 로컬 캐시로 minikube에 추가하거나, 캐시된 이미지를 삭제하고 다시 로드합니다", "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": "실행 중인 모든 미니큐브 클러스터의 캐시에 이미지를 추가합니다", From 65a580869af46a93aef969a352e909ca52e49b82 Mon Sep 17 00:00:00 2001 From: cokia Date: Thu, 22 Sep 2022 15:38:03 +0900 Subject: [PATCH 535/545] translate(ko): Adding a control-plane node is not yet supported --- translations/ko.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/translations/ko.json b/translations/ko.json index f544af1a0f..366c289cb3 100644 --- a/translations/ko.json +++ b/translations/ko.json @@ -53,7 +53,7 @@ "Add or delete an image from the local cache.": "로컬 캐시에 이미지를 추가하거나 삭제합니다", "Add, delete, or push a local image into minikube": "minikube에 로컬 이미지를 추가하거나 삭제, 푸시합니다", "Add, remove, or list additional nodes": "노드를 추가하거나 삭제, 나열합니다", - "Adding a control-plane node is not yet supported, setting control-plane flag to false": "", + "Adding a control-plane node is not yet supported, setting control-plane flag to false": "control-plane 노드를 추가하는 것은 아직 지원되지 않습니다. control-plane 플래그를 false로 설정합니다", "Adding node {{.name}} to cluster {{.cluster}}": "노드 {{.name}} 를 클러스터 {{.cluster}} 에 추가합니다", "Additional help topics": "", "Additional mount options, such as cache=fscache": "cache=fscache 와 같은 추가적인 마운트 옵션", From e7acfb83646085bdaddf2e70bb879c447595a6bc Mon Sep 17 00:00:00 2001 From: cokia Date: Thu, 22 Sep 2022 15:38:58 +0900 Subject: [PATCH 536/545] translate(ko):Additional help topics --- translations/ko.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/translations/ko.json b/translations/ko.json index 366c289cb3..c02070e8de 100644 --- a/translations/ko.json +++ b/translations/ko.json @@ -55,7 +55,7 @@ "Add, remove, or list additional nodes": "노드를 추가하거나 삭제, 나열합니다", "Adding a control-plane node is not yet supported, setting control-plane flag to false": "control-plane 노드를 추가하는 것은 아직 지원되지 않습니다. control-plane 플래그를 false로 설정합니다", "Adding node {{.name}} to cluster {{.cluster}}": "노드 {{.name}} 를 클러스터 {{.cluster}} 에 추가합니다", - "Additional help topics": "", + "Additional help topics": "추가 도움말 주제", "Additional mount options, such as cache=fscache": "cache=fscache 와 같은 추가적인 마운트 옵션", "Adds a node to the given cluster config, and starts it.": "노드 하나를 주어진 클러스터 컨피그에 추가하고 시작합니다", "Adds a node to the given cluster.": "노드 하나를 주어진 클러스터에 추가합니다", From ca97ae7cd0b8d87cda7946547a5e6e9b7d632aa1 Mon Sep 17 00:00:00 2001 From: cokia Date: Thu, 22 Sep 2022 15:39:20 +0900 Subject: [PATCH 537/545] git add . && git commit -m "translate(ko): Aliases" --- translations/ko.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/translations/ko.json b/translations/ko.json index c02070e8de..09ff766ac4 100644 --- a/translations/ko.json +++ b/translations/ko.json @@ -61,7 +61,7 @@ "Adds a node to the given cluster.": "노드 하나를 주어진 클러스터에 추가합니다", "Advanced Commands:": "고급 명령어:", "After the addon is enabled, please run \"minikube tunnel\" and your ingress resources would be available at \"127.0.0.1\"": "", - "Aliases": "", + "Aliases": "별칭", "All existing scheduled stops cancelled": "예정된 모든 중지 요청이 취소되었습니다", "Allow user prompts for more information": "많은 정보를 위해 사용자 프롬프트를 허가합니다", "Alternative image repository to pull docker images from. This can be used when you have limited access to gcr.io. Set it to \"auto\" to let minikube decide one for you. For Chinese mainland users, you may use local gcr.io mirrors such as registry.cn-hangzhou.aliyuncs.com/google_containers": "", From 575e7363ea46436b7d08627c0833e43165e10c73 Mon Sep 17 00:00:00 2001 From: cokia Date: Thu, 22 Sep 2022 15:39:57 +0900 Subject: [PATCH 538/545] translate(ko): update Adds a node to the given cluster --- translations/ko.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/translations/ko.json b/translations/ko.json index 09ff766ac4..60bebdf69b 100644 --- a/translations/ko.json +++ b/translations/ko.json @@ -57,10 +57,10 @@ "Adding node {{.name}} to cluster {{.cluster}}": "노드 {{.name}} 를 클러스터 {{.cluster}} 에 추가합니다", "Additional help topics": "추가 도움말 주제", "Additional mount options, such as cache=fscache": "cache=fscache 와 같은 추가적인 마운트 옵션", - "Adds a node to the given cluster config, and starts it.": "노드 하나를 주어진 클러스터 컨피그에 추가하고 시작합니다", + "Adds a node to the given cluster config, and starts it.": "노드 하나를 주어진 클러스터 설정에 추가하고 시작합니다", "Adds a node to the given cluster.": "노드 하나를 주어진 클러스터에 추가합니다", "Advanced Commands:": "고급 명령어:", - "After the addon is enabled, please run \"minikube tunnel\" and your ingress resources would be available at \"127.0.0.1\"": "", + "After the addon is enabled, please run \"minikube tunnel\" and your ingress resources would be available at \"127.0.0.1\"": " ", "Aliases": "별칭", "All existing scheduled stops cancelled": "예정된 모든 중지 요청이 취소되었습니다", "Allow user prompts for more information": "많은 정보를 위해 사용자 프롬프트를 허가합니다", From 5542f3cf75b34759533a3f81799daba41fd080cf Mon Sep 17 00:00:00 2001 From: cokia Date: Thu, 22 Sep 2022 16:04:17 +0900 Subject: [PATCH 539/545] translate(ko): Stopping node --- translations/ko.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/translations/ko.json b/translations/ko.json index 60bebdf69b..c7a839bd7e 100644 --- a/translations/ko.json +++ b/translations/ko.json @@ -639,7 +639,7 @@ "Starts an existing stopped node in a cluster.": "클러스터의 중지된 노드를 시작합니다", "Startup with {{.old_driver}} driver failed, trying with alternate driver {{.new_driver}}: {{.error}}": "", "Stopped tunnel for service {{.service}}.": "", - "Stopping node \"{{.name}}\" ...": "", + "Stopping node \"{{.name}}\" ...": "\"{{.name}}\" 노드를 중지하는 중 ...", "Stopping tunnel for service {{.service}}.": "", "Stops a local Kubernetes cluster. This command stops the underlying VM or container, but keeps user data intact. The cluster can be started again with the \"start\" command.": "", "Stops a node in a cluster.": "클러스터의 한 노드를 중지합니다", From 492ed4554a64ba3e79a60e7b52d051c63dd6c16a Mon Sep 17 00:00:00 2001 From: cokia Date: Thu, 22 Sep 2022 16:05:49 +0900 Subject: [PATCH 540/545] translate(ko): Stopping node --- translations/ko.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/translations/ko.json b/translations/ko.json index c7a839bd7e..db1bd81e0d 100644 --- a/translations/ko.json +++ b/translations/ko.json @@ -510,7 +510,7 @@ "Please visit the following link for documentation around this: \n\thttps://help.github.com/en/packages/using-github-packages-with-your-projects-ecosystem/configuring-docker-for-use-with-github-packages#authenticating-to-github-packages\n": "", "Populates the specified folder with documentation in markdown about minikube": "", "PowerShell is running in constrained mode, which is incompatible with Hyper-V scripting.": "", - "Powering off \"{{.profile_name}}\" via SSH ...": "", + "Powering off \"{{.profile_name}}\" via SSH ...": "\"{{.profile_name}}\"를 SSH로 전원을 끕니다 ...", "Preparing Kubernetes {{.k8sVersion}} on {{.runtime}} {{.runtimeVersion}} ...": "쿠버네티스 {{.k8sVersion}} 을 {{.runtime}} {{.runtimeVersion}} 런타임으로 설치하는 중", "Preparing {{.runtime}} {{.runtimeVersion}} ...": "", "Print current and latest version number": "현재 그리고 최신 버전을 출력합니다", @@ -1040,7 +1040,7 @@ "{{.addon}} is an addon maintained by {{.maintainer}}. For any concerns contact minikube on GitHub.\nYou can view the list of minikube maintainers at: https://github.com/kubernetes/minikube/blob/master/OWNERS": "", "{{.addon}} is maintained by {{.maintainer}} for any concerns contact {{.verifiedMaintainer}} on GitHub.": "", "{{.count}} nodes stopped.": "{{.count}}개의 노드가 중지되었습니다.", - "{{.count}} node{{if gt .count 1}}s{{end}} stopped.": "", + "{{.count}} node{{if gt .count 1}}s{{end}} stopped.": "{{.count}}개의 노드가 중지되었습니다.", "{{.driver_name}} \"{{.cluster}}\" {{.machine_type}} is missing, will recreate.": "", "{{.driver_name}} couldn't proceed because {{.driver_name}} service is not healthy.": "", "{{.driver_name}} has less than 2 CPUs available, but Kubernetes requires at least 2 to be available": "", From c737e90938fd178215997ae8aac7b459d168d4fc Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 26 Sep 2022 06:27:47 +0000 Subject: [PATCH 541/545] update image constants for kubeadm images --- pkg/minikube/constants/constants_kubeadm_images.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkg/minikube/constants/constants_kubeadm_images.go b/pkg/minikube/constants/constants_kubeadm_images.go index 8feede5c9e..3dbed2fccc 100644 --- a/pkg/minikube/constants/constants_kubeadm_images.go +++ b/pkg/minikube/constants/constants_kubeadm_images.go @@ -18,6 +18,11 @@ package constants var ( KubeadmImages = map[string]map[string]string{ + "v1.26": { + "coredns/coredns": "v1.9.3", + "etcd": "3.5.5-0", + "pause": "3.8", + }, "v1.25": { "coredns/coredns": "v1.9.3", "etcd": "3.5.4-0", From 02061caecde19b60a8b9a597c2e5fbb736150425 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Mon, 26 Sep 2022 12:55:38 -0700 Subject: [PATCH 542/545] update deployment image --- site/content/en/docs/start/_index.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/site/content/en/docs/start/_index.md b/site/content/en/docs/start/_index.md index 504d799b6b..f19730da92 100644 --- a/site/content/en/docs/start/_index.md +++ b/site/content/en/docs/start/_index.md @@ -537,8 +537,8 @@ minikube dashboard Create a sample deployment and expose it on port 8080: ```shell -kubectl create deployment hello-minikube --image=k8s.gcr.io/echoserver:1.4 -kubectl expose deployment hello-minikube --type=NodePort --port=8080 +kubectl create deployment hello-minikube --image=docker.io/nginx:1.23 +kubectl expose deployment hello-minikube --type=NodePort --port=80 ``` It may take a moment, but your deployment will soon show up when you run: @@ -568,8 +568,8 @@ You should be able to see the request metadata from nginx such as the `CLIENT VA To access a LoadBalancer deployment, use the "minikube tunnel" command. Here is an example deployment: ```shell -kubectl create deployment balanced --image=k8s.gcr.io/echoserver:1.4 -kubectl expose deployment balanced --type=LoadBalancer --port=8080 +kubectl create deployment balanced --image=docker.io/nginx:1.23 +kubectl expose deployment balanced --type=LoadBalancer --port=80 ``` In another window, start the tunnel to create a routable IP for the 'balanced' deployment: From 4106a6b9b6f0dfa12014d01751beb88f1d95df7d Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Mon, 26 Sep 2022 13:10:55 -0700 Subject: [PATCH 543/545] fix wrong port numbers --- site/content/en/docs/start/_index.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/site/content/en/docs/start/_index.md b/site/content/en/docs/start/_index.md index f19730da92..cb56d992ec 100644 --- a/site/content/en/docs/start/_index.md +++ b/site/content/en/docs/start/_index.md @@ -534,7 +534,7 @@ minikube dashboard

4Deploy applications

-Create a sample deployment and expose it on port 8080: +Create a sample deployment and expose it on port 80: ```shell kubectl create deployment hello-minikube --image=docker.io/nginx:1.23 @@ -556,7 +556,7 @@ minikube service hello-minikube Alternatively, use kubectl to forward the port: ```shell -kubectl port-forward service/hello-minikube 7080:8080 +kubectl port-forward service/hello-minikube 7080:80 ``` Tada! Your application is now available at [http://localhost:7080/](http://localhost:7080/). @@ -584,7 +584,7 @@ To find the routable IP, run this command and examine the `EXTERNAL-IP` column: kubectl get services balanced ``` -Your deployment is now available at <EXTERNAL-IP>:8080 +Your deployment is now available at <EXTERNAL-IP>:80

5Manage your cluster

From bafe31f485f5288475f1fd7ceeae37ac4a000f3e Mon Sep 17 00:00:00 2001 From: Jeff MAURY Date: Tue, 27 Sep 2022 10:42:48 +0200 Subject: [PATCH 544/545] Fix french translation Signed-off-by: Jeff MAURY --- translations/fr.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/translations/fr.json b/translations/fr.json index cf41a28217..356f33205b 100644 --- a/translations/fr.json +++ b/translations/fr.json @@ -22,8 +22,8 @@ "- {{.logPath}}": "- {{.logPath}}", "--container-runtime must be set to \"containerd\" or \"cri-o\" for rootless": "--container-runtime doit être défini sur \"containerd\" ou \"cri-o\" pour utilisateur normal", "--kvm-numa-count range is 1-8": "la tranche de --kvm-numa-count est 1 à 8", - "--network flag is only valid with the docker/podman and KVM drivers, it will be ignored": "le drapeau --network est valide uniquement avec les pilotes docker/podman et KVM, il va être ignoré", - "--network flag is only valid with the docker/podman, KVM and Qemu drivers, it will be ignored": "", + "--network flag is only valid with the docker/podman and KVM drivers, it will be ignored": "l'indicateur --network est valide uniquement avec les pilotes docker/podman et KVM, il va être ignoré", + "--network flag is only valid with the docker/podman, KVM and Qemu drivers, it will be ignored": "L'indicateur --network n'est valide qu'avec les pilotes docker/podman, KVM et Qemu, il sera ignoré", "1) Recreate the cluster with Kubernetes {{.new}}, by running:\n\t \n\t\t minikube delete {{.profile}}\n\t\t minikube start {{.profile}} --kubernetes-version={{.prefix}}{{.new}}\n\t \n\t\t2) Create a second cluster with Kubernetes {{.new}}, by running:\n\t \n\t\t minikube start -p {{.suggestedName}} --kubernetes-version={{.prefix}}{{.new}}\n\t \n\t\t3) Use the existing cluster at version Kubernetes {{.old}}, by running:\n\t \n\t\t minikube start {{.profile}} --kubernetes-version={{.prefix}}{{.old}}\n\t\t": "1) Recréez le cluster avec Kubernetes {{.new}}, en exécutant :\n\t \n\t\t minikube delete {{.profile}}\n\t\t minikube start {{.profile}} - -kubernetes-version={{.prefix}}{{.new}}\n\t \n\t\t2) Créez un deuxième cluster avec Kubernetes {{.new}}, en exécutant :\n\t \n \t\t minikube start -p {{.suggestedName}} --kubernetes-version={{.prefix}}{{.new}}\n\t \n\t\t3) Utiliser le cluster existant à la version Kubernetes {{.old}}, en exécutant :\n\t \n\t\t minikube start {{.profile}} --kubernetes-version={{.prefix}}{{.old}}\n\t \t", "1) Recreate the cluster with Kubernetes {{.new}}, by running:\n\t \n\t\t minikube delete{{.profile}}\n\t\t minikube start{{.profile}} --kubernetes-version={{.prefix}}{{.new}}\n\t \n\t\t2) Create a second cluster with Kubernetes {{.new}}, by running:\n\t \n\t\t minikube start -p {{.suggestedName}} --kubernetes-version={{.prefix}}{{.new}}\n\t \n\t\t3) Use the existing cluster at version Kubernetes {{.old}}, by running:\n\t \n\t\t minikube start{{.profile}} --kubernetes-version={{.prefix}}{{.old}}\n\t\t": "1) Recréez le cluster avec Kubernetes {{.new}}, en exécutant :\n\t \n\t\t minikube delete {{.profile}}\n\t\t minikube start{{.profile}} --kubernetes-version={{.prefix}}{{.new}}\n\t \n\t\t2) Créez un deuxième cluster avec Kubernetes {{.new}}, en exécutant :\n\t \n \t\t minikube start -p {{.suggestedName}} --kubernetes-version={{.prefix}}{{.new}}\n\t \n\t\t3) Utiliser le cluster existant à la version Kubernetes {{.old}}, en exécutant :\n\t \n\t\t minikube start{{.profile}} --kubernetes-version={{.prefix}}{{.old}}\n\t \t", "1. Click on \"Docker for Desktop\" menu icon\n\t\t\t2. Click \"Preferences\"\n\t\t\t3. Click \"Resources\"\n\t\t\t4. Increase \"CPUs\" slider bar to 2 or higher\n\t\t\t5. Click \"Apply \u0026 Restart\"": "1. Cliquez sur l'icône de menu \"Docker for Desktop\"\n\t\t\t2. Cliquez sur \"Preferences\"\n\t\t\t3. Cliquez sur \"Ressources\"\n\t\t\t4. Augmentez la barre de défilement \"CPU\" à 2 ou plus\n\t\t\t5. Cliquez sur \"Apply \u0026 Restart\"", @@ -446,10 +446,10 @@ "Output format. Accepted values: [json]": "Format de sortie. Valeurs acceptées : [json]", "Outputs minikube shell completion for the given shell (bash, zsh or fish)\n\n\tThis depends on the bash-completion binary. Example installation instructions:\n\tOS X:\n\t\t$ brew install bash-completion\n\t\t$ source $(brew --prefix)/etc/bash_completion\n\t\t$ minikube completion bash \u003e ~/.minikube-completion # for bash users\n\t\t$ minikube completion zsh \u003e ~/.minikube-completion # for zsh users\n\t\t$ source ~/.minikube-completion\n\t\t$ minikube completion fish \u003e ~/.config/fish/completions/minikube.fish # for fish users\n\tUbuntu:\n\t\t$ apt-get install bash-completion\n\t\t$ source /etc/bash_completion\n\t\t$ source \u003c(minikube completion bash) # for bash users\n\t\t$ source \u003c(minikube completion zsh) # for zsh users\n\t\t$ minikube completion fish \u003e ~/.config/fish/completions/minikube.fish # for fish users\n\n\tAdditionally, you may want to output the completion to a file and source in your .bashrc\n\n\tNote for zsh users: [1] zsh completions are only supported in versions of zsh \u003e= 5.2\n\tNote for fish users: [2] please refer to this docs for more details https://fishshell.com/docs/current/#tab-completion\n": "Affiche la complétion du shell minikube pour le shell donné (bash, zsh ou fish)\n\n\tCela dépend du binaire bash-completion. Exemple d'instructions d'installation :\n\tOS X :\n\t\t$ brew install bash-completion\n\t\t$ source $(brew --prefix)/etc/bash_completion\n\t\t$ minikube completion bash \u003e ~/.minikube-completion # pour les utilisateurs bash\n\t\t$ minikube completion zsh \u003e ~/.minikube-completion # pour les utilisateurs zsh\n\t\t$ source ~/.minikube-completion\n\t\t$ minikube completion fish \u003e ~/.config/fish/completions/minikube.fish # pour les utilisateurs de fish\n\tUbuntu:\n\t\t$ apt-get install bash-completion\n\t \t$ source /etc/bash_completion\n\t\t$ source \u003c(minikube completion bash) # pour les utilisateurs bash\n\t\t$ source \u003c(minikube completion zsh) # pour les utilisateurs zsh\n\t \t$ minikube completion fish \u003e ~/.config/fish/completions/minikube.fish # pour les utilisateurs de fish\n\n\tDe plus, vous voudrez peut-être sortir la complétion dans un fichier et une source dans votre .bashrc\n n\tRemarque pour les utilisateurs de zsh : [1] les complétions zsh ne sont prises en charge que dans les versions de zsh \u003e= 5.2\n\tRemarque pour les utilisateurs de fish : [2] veuillez vous référer à cette documentation pour plus de détails https://fishshell.com/docs/current/#tab-completion\n", "Overwrite image even if same image:tag name exists": "Écraser l'image même si la même image:balise existe", - "Path to socket vmnet binary": "", + "Path to socket vmnet binary": "Chemin d'accès au binaire socket vmnet", "Path to the Dockerfile to use (optional)": "Chemin d'accès au Dockerfile à utiliser (facultatif)", "Path to the qemu firmware file. Defaults: For Linux, the default firmware location. For macOS, the brew installation location. For Windows, C:\\Program Files\\qemu\\share": "Chemin d'accès au fichier du micrologiciel qemu. Valeurs par défaut : pour Linux, l'emplacement du micrologiciel par défaut. Pour macOS, l'emplacement d'installation de brew. Pour Windows, C:\\Program Files\\qemu\\share", - "Path to the socket vmnet client binary": "", + "Path to the socket vmnet client binary": "Chemin d'accès au binaire socket vmnet", "Pause": "Pause", "Paused {{.count}} containers": "{{.count}} conteneurs suspendus", "Paused {{.count}} containers in: {{.namespaces}}": "{{.count}} conteneurs suspendus dans : {{.namespaces}}", @@ -750,7 +750,7 @@ "Try one or more of the following to free up space on the device:\n\t\n\t\t\t1. Run \"sudo podman system prune\" to remove unused podman data\n\t\t\t2. Run \"minikube ssh -- docker system prune\" if using the Docker container runtime": "Essayez une ou plusieurs des solutions suivantes pour libérer de l'espace sur l'appareil :\n\t\n\t\t\t1. Exécutez \"sudo podman system prune\" pour supprimer les données podman inutilisées\n\t\t\t2. Exécutez \"minikube ssh -- docker system prune\" si vous utilisez l'environnement d'exécution du conteneur Docker", "Trying to delete invalid profile {{.profile}}": "Tentative de suppression du profil non valide {{.profile}}", "Tunnel successfully started": "Tunnel démarré avec succès", - "Unable to bind flags": "Impossible de lier les drapeaux", + "Unable to bind flags": "Impossible de lier les indicateurs", "Unable to create dedicated network, this might result in cluster IP change after restart: {{.error}}": "Impossible de créer un réseau dédié, cela peut entraîner une modification de l'adresse IP du cluster après le redémarrage : {{.error}}", "Unable to enable dashboard": "Impossible d'activer le tableau de bord", "Unable to fetch latest version info": "Impossible de récupérer les informations sur la dernière version", @@ -820,7 +820,7 @@ "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 qemu with --network=socket for 'socket_vmnet' is experimental": "", + "Using qemu with --network=socket for 'socket_vmnet' is experimental": "L'utilisation de qemu avec --network=socket pour 'socket_vmnet' est expérimentale", "Using rootless Docker driver was required, but the current Docker does not seem rootless. Try 'docker context use rootless' .": "L'utilisation du pilote Docker sans root était nécessaire, mais le Docker actuel ne semble pas sans root. Essayez 'docker context use rootless' .", "Using rootless driver was required, but the current driver does not seem rootless": "L'utilisation d'un pilote sans root était nécessaire, mais le pilote actuel ne semble pas sans root", "Using rootless {{.driver_name}} driver": "Utilisation du pilote {{.driver_name}} sans root", @@ -969,7 +969,7 @@ "scheduled stop is not supported on the none driver, skipping scheduling": "l'arrêt programmé n'est pas pris en charge sur le pilote none, programmation non prise en compte", "service {{.namespace_name}}/{{.service_name}} has no node port": "le service {{.namespace_name}}/{{.service_name}} n'a pas de port de nœud", "set tunnel bind address, empty or '*' indicates the tunnel should be available for all interfaces": "définit l'adresse de liaison du tunnel, vide ou '*' indique que le tunnel doit être disponible pour toutes les interfaces", - "socket_vmnet network flags are not yet implemented with the qemu2 driver.\n See https://github.com/kubernetes/minikube/pull/14890 for details.": "", + "socket_vmnet network flags are not yet implemented with the qemu2 driver.\n See https://github.com/kubernetes/minikube/pull/14890 for details.": "Les indicateurs de réseau socket_vmnet ne sont pas encore implémentés avec le pilote qemu2.\n Voir https://github.com/kubernetes/minikube/pull/14890 pour plus de détails.", "stat failed": "stat en échec", "status json failure": "état du JSON en échec", "status text failure": "état du texte en échec", From 3e35746d50e41fb711a3bcb2cbd8218c379bd5c1 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Wed, 28 Sep 2022 10:48:34 -0700 Subject: [PATCH 545/545] fix generate-docs on arm64 --- pkg/generate/rewrite.go | 4 ++++ site/content/en/docs/commands/start.md | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pkg/generate/rewrite.go b/pkg/generate/rewrite.go index 5ff4cff5bc..c3e2f1d694 100644 --- a/pkg/generate/rewrite.go +++ b/pkg/generate/rewrite.go @@ -55,6 +55,10 @@ func rewriteFlags(command *cobra.Command) error { }, { flag: "mount-string", usage: "The argument to pass the minikube mount command on start.", + }, { + flag: "iso-url", + usage: "Locations to fetch the minikube ISO from. The list depends on the machine architecture.", + defaultVal: "[]", }}, } rws, ok := rewrites[command.Name()] diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index eb91177a5f..8632124f90 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/iso/minikube-v1.27.0-amd64.iso,https://github.com/kubernetes/minikube/releases/download/v1.27.0/minikube-v1.27.0-amd64.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.27.0-amd64.iso]) + --iso-url strings Locations to fetch the minikube ISO from. The list depends on the machine architecture. --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.25.1, 'latest' for v1.25.1). Defaults to 'stable'. --kvm-gpu Enable experimental NVIDIA GPU support in minikube