From 1909c4bb7cc1c6539419a35c80481d5052efd3bd Mon Sep 17 00:00:00 2001 From: Asare Worae Date: Fri, 15 May 2020 11:33:39 +0200 Subject: [PATCH 01/21] add support for `--docker-volume` command line flag to mount host volumes on start --- cmd/minikube/cmd/start_flags.go | 7 +++ pkg/drivers/kic/kic.go | 1 + pkg/drivers/kic/oci/types.go | 47 +++++++++++++++++++++ pkg/minikube/config/types.go | 1 + pkg/minikube/registry/drvs/docker/docker.go | 10 +++++ 5 files changed, 66 insertions(+) diff --git a/cmd/minikube/cmd/start_flags.go b/cmd/minikube/cmd/start_flags.go index 59d3f8166c..7eb3422f65 100644 --- a/cmd/minikube/cmd/start_flags.go +++ b/cmd/minikube/cmd/start_flags.go @@ -101,6 +101,8 @@ const ( deleteOnFailure = "delete-on-failure" forceSystemd = "force-systemd" kicBaseImage = "base-image" + + dockerVolume = "docker-volume" ) // initMinikubeFlags includes commandline flags for minikube. @@ -190,6 +192,10 @@ func initDriverFlags() { startCmd.Flags().String(hypervVirtualSwitch, "", "The hyperv virtual switch name. Defaults to first found. (hyperv driver only)") startCmd.Flags().Bool(hypervUseExternalSwitch, false, "Whether to use external switch over Default Switch if virtual switch not explicitly specified. (hyperv driver only)") startCmd.Flags().String(hypervExternalAdapter, "", "External Adapter on which external switch will be created if no external switch is found. (hyperv driver only)") + + // docker + // TODO: beter description + startCmd.Flags().StringSlice(dockerVolume, []string{}, "Volumes to mount into from host into minikube") } // initNetworkingFlags inits the commandline flags for connectivity related flags for start @@ -296,6 +302,7 @@ func generateClusterConfig(cmd *cobra.Command, existing *config.ClusterConfig, k DockerOpt: config.DockerOpt, InsecureRegistry: insecureRegistry, RegistryMirror: registryMirror, + DockerVolume: viper.GetStringSlice(dockerVolume), HostOnlyCIDR: viper.GetString(hostOnlyCIDR), HypervVirtualSwitch: viper.GetString(hypervVirtualSwitch), HypervUseExternalSwitch: viper.GetBool(hypervUseExternalSwitch), diff --git a/pkg/drivers/kic/kic.go b/pkg/drivers/kic/kic.go index 290aab0722..fe28144f04 100644 --- a/pkg/drivers/kic/kic.go +++ b/pkg/drivers/kic/kic.go @@ -68,6 +68,7 @@ func NewDriver(c Config) *Driver { // Create a host using the driver's config func (d *Driver) Create() error { params := oci.CreateParams{ + Mounts: d.NodeConfig.Mounts, Name: d.NodeConfig.MachineName, Image: d.NodeConfig.ImageDigest, ClusterLabel: oci.ProfileLabelKey + "=" + d.MachineName, diff --git a/pkg/drivers/kic/oci/types.go b/pkg/drivers/kic/oci/types.go index ae65b99c62..6f564d8ada 100644 --- a/pkg/drivers/kic/oci/types.go +++ b/pkg/drivers/kic/oci/types.go @@ -16,6 +16,13 @@ limitations under the License. package oci +import ( + "errors" + "fmt" + "path/filepath" + "strings" +) + const ( // DefaultBindIPV4 is The default IP the container will listen on. DefaultBindIPV4 = "127.0.0.1" @@ -94,6 +101,46 @@ type Mount struct { Propagation MountPropagation `protobuf:"varint,5,opt,name=propagation,proto3,enum=runtime.v1alpha2.MountPropagation" json:"propagation,omitempty"` } +// ParseMountString parses a mount string of format: +// '[host-path:]container-path[:]' The comma-delimited 'options' are +// [rw|ro], [Z], [srhared|rslave|rprivate]. +func ParseMountString(spec string) (m Mount, err error) { + switch fields := strings.Split(spec, ":"); len(fields) { + case 0: + err = errors.New("invalid empty spec") + case 1: + m.ContainerPath = fields[0] + case 3: + for _, opt := range strings.Split(fields[2], ",") { + switch opt { + case "Z": + m.SelinuxRelabel = true + case "ro": + m.Readonly = true + case "rw": + m.Readonly = false + case "rslave": + m.Propagation = MountPropagationHostToContainer + case "rshared": + m.Propagation = MountPropagationBidirectional + case "private": + m.Propagation = MountPropagationNone + default: + err = fmt.Errorf("unknown mount option: '%s'", opt) + } + } + fallthrough + case 2: + m.HostPath, m.ContainerPath = fields[0], fields[1] + if !filepath.IsAbs(m.ContainerPath) { + err = fmt.Errorf("'%s' container path must be absolute.", m.ContainerPath) + } + default: + err = errors.New("spec must be in form: :[:]") + } + return +} + // PortMapping specifies a host port mapped into a container port. // In yaml this looks like: // containerPort: 80 diff --git a/pkg/minikube/config/types.go b/pkg/minikube/config/types.go index f9ebbf5273..1eb3d74151 100644 --- a/pkg/minikube/config/types.go +++ b/pkg/minikube/config/types.go @@ -51,6 +51,7 @@ type ClusterConfig struct { HyperkitVpnKitSock string // Only used by the Hyperkit driver HyperkitVSockPorts []string // Only used by the Hyperkit driver DockerEnv []string // Each entry is formatted as KEY=VALUE. + DockerVolume []string InsecureRegistry []string RegistryMirror []string HostOnlyCIDR string // Only used by the virtualbox driver diff --git a/pkg/minikube/registry/drvs/docker/docker.go b/pkg/minikube/registry/drvs/docker/docker.go index dbd6b1f981..7bf4a911c3 100644 --- a/pkg/minikube/registry/drvs/docker/docker.go +++ b/pkg/minikube/registry/drvs/docker/docker.go @@ -56,10 +56,20 @@ func init() { } func configure(cc config.ClusterConfig, n config.Node) (interface{}, error) { + mounts := make([]oci.Mount, len(cc.DockerVolume)) + for i, spec := range cc.DockerVolume { + var err error + mounts[i], err = oci.ParseMountString(spec) + if err != nil { + return nil, err + } + } + return kic.NewDriver(kic.Config{ MachineName: driver.MachineName(cc, n), StorePath: localpath.MiniPath(), ImageDigest: cc.KicBaseImage, + Mounts: mounts, CPU: cc.CPUs, Memory: cc.Memory, OCIBinary: oci.Docker, From 59de926bf1fa89ed904dbbb6eba980a23d6ee253 Mon Sep 17 00:00:00 2001 From: Asare Worae Date: Fri, 15 May 2020 12:03:56 +0200 Subject: [PATCH 02/21] updated --docker-volume flag description and ran docs generator --- cmd/minikube/cmd/start_flags.go | 6 ++---- pkg/drivers/kic/oci/types.go | 4 ++-- site/content/en/docs/commands/start.md | 1 + 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/cmd/minikube/cmd/start_flags.go b/cmd/minikube/cmd/start_flags.go index 7eb3422f65..5bb735d74d 100644 --- a/cmd/minikube/cmd/start_flags.go +++ b/cmd/minikube/cmd/start_flags.go @@ -101,8 +101,7 @@ const ( deleteOnFailure = "delete-on-failure" forceSystemd = "force-systemd" kicBaseImage = "base-image" - - dockerVolume = "docker-volume" + dockerVolume = "docker-volume" ) // initMinikubeFlags includes commandline flags for minikube. @@ -194,8 +193,7 @@ func initDriverFlags() { startCmd.Flags().String(hypervExternalAdapter, "", "External Adapter on which external switch will be created if no external switch is found. (hyperv driver only)") // docker - // TODO: beter description - startCmd.Flags().StringSlice(dockerVolume, []string{}, "Volumes to mount into from host into minikube") + startCmd.Flags().StringSlice(dockerVolume, []string{}, "Volumes to mount from host into the minikube container on start. (format: [host-src:]container-dest[:], the comma-delimited options are [rw|ro], [Z], [srhared|rslave|rprivate]) (docker driver only)") } // initNetworkingFlags inits the commandline flags for connectivity related flags for start diff --git a/pkg/drivers/kic/oci/types.go b/pkg/drivers/kic/oci/types.go index 6f564d8ada..a1d729ac2a 100644 --- a/pkg/drivers/kic/oci/types.go +++ b/pkg/drivers/kic/oci/types.go @@ -133,12 +133,12 @@ func ParseMountString(spec string) (m Mount, err error) { case 2: m.HostPath, m.ContainerPath = fields[0], fields[1] if !filepath.IsAbs(m.ContainerPath) { - err = fmt.Errorf("'%s' container path must be absolute.", m.ContainerPath) + err = fmt.Errorf("'%s' container path must be absolute", m.ContainerPath) } default: err = errors.New("spec must be in form: :[:]") } - return + return m, err } // PortMapping specifies a host port mapped into a container port. diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index 75b3eff79b..611de89ead 100644 --- a/site/content/en/docs/commands/start.md +++ b/site/content/en/docs/commands/start.md @@ -39,6 +39,7 @@ minikube start [flags] --dns-proxy Enable proxy for NAT DNS requests (virtualbox driver only) --docker-env stringArray Environment variables to pass to the Docker daemon. (format: key=value) --docker-opt stringArray Specify arbitrary flags to pass to the Docker daemon. (format: key=value) + --docker-volume strings Volumes to mount from host into the minikube container on start. (format: [host-src:]container-dest[:], the comma-delimited options are [rw|ro], [Z], [srhared|rslave|rprivate]) (docker driver only) --download-only If true, only download and cache files for later use - don't install or start anything. --driver string Used to specify the driver to run Kubernetes in. The list of available drivers depends on operating system. --dry-run dry-run mode. Validates configuration, but does not mutate system state From 134ec1b14440a703698ce7cace062e86711d3302 Mon Sep 17 00:00:00 2001 From: Asare Worae Date: Thu, 25 Jun 2020 09:16:04 +0200 Subject: [PATCH 03/21] changed `--docker-volume` flag logic to work from `--mount-string` and `--mount` flags --- cmd/minikube/cmd/start_flags.go | 8 +++----- pkg/minikube/config/types.go | 2 +- pkg/minikube/registry/drvs/docker/docker.go | 4 ++-- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/cmd/minikube/cmd/start_flags.go b/cmd/minikube/cmd/start_flags.go index 5bb735d74d..cfd71ea154 100644 --- a/cmd/minikube/cmd/start_flags.go +++ b/cmd/minikube/cmd/start_flags.go @@ -101,7 +101,6 @@ const ( deleteOnFailure = "delete-on-failure" forceSystemd = "force-systemd" kicBaseImage = "base-image" - dockerVolume = "docker-volume" ) // initMinikubeFlags includes commandline flags for minikube. @@ -191,9 +190,6 @@ func initDriverFlags() { startCmd.Flags().String(hypervVirtualSwitch, "", "The hyperv virtual switch name. Defaults to first found. (hyperv driver only)") startCmd.Flags().Bool(hypervUseExternalSwitch, false, "Whether to use external switch over Default Switch if virtual switch not explicitly specified. (hyperv driver only)") startCmd.Flags().String(hypervExternalAdapter, "", "External Adapter on which external switch will be created if no external switch is found. (hyperv driver only)") - - // docker - startCmd.Flags().StringSlice(dockerVolume, []string{}, "Volumes to mount from host into the minikube container on start. (format: [host-src:]container-dest[:], the comma-delimited options are [rw|ro], [Z], [srhared|rslave|rprivate]) (docker driver only)") } // initNetworkingFlags inits the commandline flags for connectivity related flags for start @@ -300,7 +296,6 @@ func generateClusterConfig(cmd *cobra.Command, existing *config.ClusterConfig, k DockerOpt: config.DockerOpt, InsecureRegistry: insecureRegistry, RegistryMirror: registryMirror, - DockerVolume: viper.GetStringSlice(dockerVolume), HostOnlyCIDR: viper.GetString(hostOnlyCIDR), HypervVirtualSwitch: viper.GetString(hypervVirtualSwitch), HypervUseExternalSwitch: viper.GetBool(hypervUseExternalSwitch), @@ -336,6 +331,9 @@ func generateClusterConfig(cmd *cobra.Command, existing *config.ClusterConfig, k }, } cc.VerifyComponents = interpretWaitFlag(*cmd) + if viper.GetBool(createMount) { + cc.VolumeMounts = []string{viper.GetString(mountString)} + } } r, err := cruntime.New(cruntime.Config{Type: cc.KubernetesConfig.ContainerRuntime}) diff --git a/pkg/minikube/config/types.go b/pkg/minikube/config/types.go index 1eb3d74151..b7954b1e0b 100644 --- a/pkg/minikube/config/types.go +++ b/pkg/minikube/config/types.go @@ -51,7 +51,7 @@ type ClusterConfig struct { HyperkitVpnKitSock string // Only used by the Hyperkit driver HyperkitVSockPorts []string // Only used by the Hyperkit driver DockerEnv []string // Each entry is formatted as KEY=VALUE. - DockerVolume []string + VolumeMounts []string InsecureRegistry []string RegistryMirror []string HostOnlyCIDR string // Only used by the virtualbox driver diff --git a/pkg/minikube/registry/drvs/docker/docker.go b/pkg/minikube/registry/drvs/docker/docker.go index 7bf4a911c3..01ae6e657d 100644 --- a/pkg/minikube/registry/drvs/docker/docker.go +++ b/pkg/minikube/registry/drvs/docker/docker.go @@ -56,8 +56,8 @@ func init() { } func configure(cc config.ClusterConfig, n config.Node) (interface{}, error) { - mounts := make([]oci.Mount, len(cc.DockerVolume)) - for i, spec := range cc.DockerVolume { + mounts := make([]oci.Mount, len(cc.VolumeMounts)) + for i, spec := range cc.VolumeMounts { var err error mounts[i], err = oci.ParseMountString(spec) if err != nil { From e771ee8426903d23484beb8719236b450dcdc048 Mon Sep 17 00:00:00 2001 From: Asare Worae Date: Thu, 25 Jun 2020 09:24:17 +0200 Subject: [PATCH 04/21] re-generated docs after --docker-volume rename to --mount-string --- site/content/en/docs/commands/start.md | 1 - 1 file changed, 1 deletion(-) diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index 611de89ead..75b3eff79b 100644 --- a/site/content/en/docs/commands/start.md +++ b/site/content/en/docs/commands/start.md @@ -39,7 +39,6 @@ minikube start [flags] --dns-proxy Enable proxy for NAT DNS requests (virtualbox driver only) --docker-env stringArray Environment variables to pass to the Docker daemon. (format: key=value) --docker-opt stringArray Specify arbitrary flags to pass to the Docker daemon. (format: key=value) - --docker-volume strings Volumes to mount from host into the minikube container on start. (format: [host-src:]container-dest[:], the comma-delimited options are [rw|ro], [Z], [srhared|rslave|rprivate]) (docker driver only) --download-only If true, only download and cache files for later use - don't install or start anything. --driver string Used to specify the driver to run Kubernetes in. The list of available drivers depends on operating system. --dry-run dry-run mode. Validates configuration, but does not mutate system state From 52e19e1bc9a1e941d2c28a4fad7c5417cd58d3a2 Mon Sep 17 00:00:00 2001 From: Asare Worae Date: Tue, 30 Jun 2020 10:11:06 +0200 Subject: [PATCH 05/21] merge conflict typo --- cmd/minikube/cmd/start_flags.go | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/cmd/minikube/cmd/start_flags.go b/cmd/minikube/cmd/start_flags.go index fbb14627fe..0d4b1c2a50 100644 --- a/cmd/minikube/cmd/start_flags.go +++ b/cmd/minikube/cmd/start_flags.go @@ -323,11 +323,9 @@ func generateClusterConfig(cmd *cobra.Command, existing *config.ClusterConfig, k }, } cc.VerifyComponents = interpretWaitFlag(*cmd) -<<<<<<< HEAD if viper.GetBool(createMount) { cc.VolumeMounts = []string{viper.GetString(mountString)} -======= - + } cnm, err := cni.New(cc) if err != nil { return cc, config.Node{}, errors.Wrap(err, "cni") @@ -336,7 +334,6 @@ func generateClusterConfig(cmd *cobra.Command, existing *config.ClusterConfig, k if _, ok := cnm.(cni.Disabled); !ok { glog.Infof("Found %q CNI - setting NetworkPlugin=cni", cnm) cc.KubernetesConfig.NetworkPlugin = "cni" ->>>>>>> 0d146db62f08056d453572654fecb72001938807 } } From e00cf6c1e14dfc1e6be06197302c190b17c061e6 Mon Sep 17 00:00:00 2001 From: Ambor Date: Tue, 21 Jul 2020 11:57:06 +0800 Subject: [PATCH 06/21] fix error usage for the WaitGroup in the pkg addons --- pkg/addons/addons.go | 1 - pkg/addons/addons_test.go | 3 ++- pkg/minikube/node/start.go | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkg/addons/addons.go b/pkg/addons/addons.go index c197913d12..1b7a731965 100644 --- a/pkg/addons/addons.go +++ b/pkg/addons/addons.go @@ -340,7 +340,6 @@ func verifyAddonStatus(cc *config.ClusterConfig, name string, val string) error // Start enables the default addons for a profile, plus any additional func Start(wg *sync.WaitGroup, cc *config.ClusterConfig, toEnable map[string]bool, additional []string) { - wg.Add(1) defer wg.Done() start := time.Now() diff --git a/pkg/addons/addons_test.go b/pkg/addons/addons_test.go index 004d0f5047..86a14203ee 100644 --- a/pkg/addons/addons_test.go +++ b/pkg/addons/addons_test.go @@ -130,7 +130,8 @@ func TestStart(t *testing.T) { } var wg sync.WaitGroup - Start(&wg, cc, map[string]bool{}, []string{"dashboard"}) + wg.Add(1) + go Start(&wg, cc, map[string]bool{}, []string{"dashboard"}) wg.Wait() if !assets.Addons["dashboard"].IsEnabled(cc) { diff --git a/pkg/minikube/node/start.go b/pkg/minikube/node/start.go index 6a1d386db6..15204a311c 100644 --- a/pkg/minikube/node/start.go +++ b/pkg/minikube/node/start.go @@ -146,6 +146,7 @@ func Start(starter Starter, apiServer bool) (*kubeconfig.Settings, error) { // enable addons, both old and new! if starter.ExistingAddons != nil { + wg.Add(1) go addons.Start(&wg, starter.Cfg, starter.ExistingAddons, config.AddonList) } From a31e359b01bcd1cd19f4e8aaba7f71284d659743 Mon Sep 17 00:00:00 2001 From: Asare Worae Date: Thu, 23 Jul 2020 11:47:16 +0200 Subject: [PATCH 07/21] fixed unwanted spinning up of mount deamon when using KIC drivers, and added same host mounted volumes logic for the Podman driver --- cmd/minikube/cmd/start_flags.go | 4 ++-- pkg/minikube/config/types.go | 2 +- pkg/minikube/node/start.go | 4 +++- pkg/minikube/registry/drvs/docker/docker.go | 4 ++-- pkg/minikube/registry/drvs/podman/podman.go | 10 ++++++++++ 5 files changed, 18 insertions(+), 6 deletions(-) diff --git a/cmd/minikube/cmd/start_flags.go b/cmd/minikube/cmd/start_flags.go index 0d4b1c2a50..00b4baddf8 100644 --- a/cmd/minikube/cmd/start_flags.go +++ b/cmd/minikube/cmd/start_flags.go @@ -323,8 +323,8 @@ func generateClusterConfig(cmd *cobra.Command, existing *config.ClusterConfig, k }, } cc.VerifyComponents = interpretWaitFlag(*cmd) - if viper.GetBool(createMount) { - cc.VolumeMounts = []string{viper.GetString(mountString)} + if viper.GetBool(createMount) && driver.IsKIC(drvName) { + cc.ContainerVolumeMounts = []string{viper.GetString(mountString)} } cnm, err := cni.New(cc) if err != nil { diff --git a/pkg/minikube/config/types.go b/pkg/minikube/config/types.go index d7f238d78c..1b63652a18 100644 --- a/pkg/minikube/config/types.go +++ b/pkg/minikube/config/types.go @@ -43,7 +43,7 @@ type ClusterConfig struct { HyperkitVpnKitSock string // Only used by the Hyperkit driver HyperkitVSockPorts []string // Only used by the Hyperkit driver DockerEnv []string // Each entry is formatted as KEY=VALUE. - VolumeMounts []string + ContainerVolumeMounts []string // Only used by container drivers: Docker, Podman InsecureRegistry []string RegistryMirror []string HostOnlyCIDR string // Only used by the virtualbox driver diff --git a/pkg/minikube/node/start.go b/pkg/minikube/node/start.go index 65dfc78e36..fe431383ad 100644 --- a/pkg/minikube/node/start.go +++ b/pkg/minikube/node/start.go @@ -133,7 +133,9 @@ func Start(starter Starter, apiServer bool) (*kubeconfig.Settings, error) { } var wg sync.WaitGroup - go configureMounts(&wg) + if !driver.IsKIC(starter.Cfg.Driver) { + go configureMounts(&wg) + } wg.Add(1) go func() { diff --git a/pkg/minikube/registry/drvs/docker/docker.go b/pkg/minikube/registry/drvs/docker/docker.go index 5c19b52862..150f4172a8 100644 --- a/pkg/minikube/registry/drvs/docker/docker.go +++ b/pkg/minikube/registry/drvs/docker/docker.go @@ -58,8 +58,8 @@ func init() { } func configure(cc config.ClusterConfig, n config.Node) (interface{}, error) { - mounts := make([]oci.Mount, len(cc.VolumeMounts)) - for i, spec := range cc.VolumeMounts { + mounts := make([]oci.Mount, len(cc.ContainerVolumeMounts)) + for i, spec := range cc.ContainerVolumeMounts { var err error mounts[i], err = oci.ParseMountString(spec) if err != nil { diff --git a/pkg/minikube/registry/drvs/podman/podman.go b/pkg/minikube/registry/drvs/podman/podman.go index c5fa66da90..b4faa63d1f 100644 --- a/pkg/minikube/registry/drvs/podman/podman.go +++ b/pkg/minikube/registry/drvs/podman/podman.go @@ -59,10 +59,20 @@ func init() { } func configure(cc config.ClusterConfig, n config.Node) (interface{}, error) { + mounts := make([]oci.Mount, len(cc.ContainerVolumeMounts)) + for i, spec := range cc.ContainerVolumeMounts { + var err error + mounts[i], err = oci.ParseMountString(spec) + if err != nil { + return nil, err + } + } + return kic.NewDriver(kic.Config{ MachineName: driver.MachineName(cc, n), StorePath: localpath.MiniPath(), ImageDigest: strings.Split(cc.KicBaseImage, "@")[0], // for podman does not support docker images references with both a tag and digest. + Mounts: mounts, CPU: cc.CPUs, Memory: cc.Memory, OCIBinary: oci.Podman, From 68bc935e7fdf0aa00b62940bbc975b2ce70a9ad4 Mon Sep 17 00:00:00 2001 From: staticdev Date: Sat, 25 Jul 2020 07:44:57 -0300 Subject: [PATCH 08/21] Bump nginx-ingress-controller --- deploy/addons/ingress/ingress-dp.yaml.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/addons/ingress/ingress-dp.yaml.tmpl b/deploy/addons/ingress/ingress-dp.yaml.tmpl index b8c7742a35..fc5916a1fd 100644 --- a/deploy/addons/ingress/ingress-dp.yaml.tmpl +++ b/deploy/addons/ingress/ingress-dp.yaml.tmpl @@ -48,7 +48,7 @@ spec: serviceAccountName: ingress-nginx containers: - name: controller - image: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.33.0 + image: us.gcr.io/k8s-artifacts-prod/ingress-nginx/controller:v0.34.1@sha256:0e072dddd1f7f8fc8909a2ca6f65e76c5f0d2fcfb8be47935ae3457e8bbceb20 imagePullPolicy: IfNotPresent lifecycle: preStop: From 969bc9fd2c93d9c730d6937471656a8160eee8f4 Mon Sep 17 00:00:00 2001 From: staticdev Date: Wed, 12 Aug 2020 08:09:38 -0300 Subject: [PATCH 09/21] Add timing enable ingress --- pkg/minikube/perf/start.go | 34 ++++++++++++++++++++++++++-------- 1 file changed, 26 insertions(+), 8 deletions(-) diff --git a/pkg/minikube/perf/start.go b/pkg/minikube/perf/start.go index e41547f31c..cbe0bc608d 100644 --- a/pkg/minikube/perf/start.go +++ b/pkg/minikube/perf/start.go @@ -58,6 +58,11 @@ func collectResults(ctx context.Context, binaries []*Binary, driver string) (*re return nil, errors.Wrapf(err, "timing run %d with %s", run, binary.Name()) } rm.addResult(binary, r) + r, err = timeEnableIngress(ctx, binary, driver) + if err != nil { + return nil, errors.Wrapf(err, "timing run %d with %s", run, binary.Name()) + } + rm.addResult(binary, r) } } return rm, nil @@ -72,18 +77,10 @@ func average(nums []float64) float64 { } // timeMinikubeStart returns the time it takes to execute `minikube start` -// It deletes the VM after `minikube start`. func timeMinikubeStart(ctx context.Context, binary *Binary, driver string) (*result, error) { startCmd := exec.CommandContext(ctx, binary.path, "start", fmt.Sprintf("--driver=%s", driver)) startCmd.Stderr = os.Stderr - deleteCmd := exec.CommandContext(ctx, binary.path, "delete") - defer func() { - if err := deleteCmd.Run(); err != nil { - log.Printf("error deleting minikube: %v", err) - } - }() - log.Printf("Running: %v...", startCmd.Args) r, err := timeCommandLogs(startCmd) if err != nil { @@ -91,3 +88,24 @@ func timeMinikubeStart(ctx context.Context, binary *Binary, driver string) (*res } return r, nil } + +// timeEnableIngress returns the time it takes to execute `minikube addons enable ingress` +// It deletes the VM after `minikube addons enable ingress`. +func timeEnableIngress(ctx context.Context, binary *Binary, driver string) (*result, error) { + enableCmd := exec.CommandContext(ctx, binary.path, "addons enable ingress") + enableCmd.Stderr = os.Stderr + + deleteCmd := exec.CommandContext(ctx, binary.path, "delete") + defer func() { + if err := deleteCmd.Run(); err != nil { + log.Printf("error deleting minikube: %v", err) + } + }() + + log.Printf("Running: %v...", enableCmd.Args) + r, err := timeCommandLogs(enableCmd) + if err != nil { + return nil, errors.Wrapf(err, "timing cmd: %v", enableCmd.Args) + } + return r, nil +} From 4c5109b435d9797af69c723418721d8996d0b91c Mon Sep 17 00:00:00 2001 From: staticdev Date: Wed, 12 Aug 2020 08:48:22 -0300 Subject: [PATCH 10/21] Fix go lint --- pkg/minikube/perf/start.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/minikube/perf/start.go b/pkg/minikube/perf/start.go index cbe0bc608d..b587e907c5 100644 --- a/pkg/minikube/perf/start.go +++ b/pkg/minikube/perf/start.go @@ -58,7 +58,7 @@ func collectResults(ctx context.Context, binaries []*Binary, driver string) (*re return nil, errors.Wrapf(err, "timing run %d with %s", run, binary.Name()) } rm.addResult(binary, r) - r, err = timeEnableIngress(ctx, binary, driver) + r, err = timeEnableIngress(ctx, binary) if err != nil { return nil, errors.Wrapf(err, "timing run %d with %s", run, binary.Name()) } @@ -91,7 +91,7 @@ func timeMinikubeStart(ctx context.Context, binary *Binary, driver string) (*res // timeEnableIngress returns the time it takes to execute `minikube addons enable ingress` // It deletes the VM after `minikube addons enable ingress`. -func timeEnableIngress(ctx context.Context, binary *Binary, driver string) (*result, error) { +func timeEnableIngress(ctx context.Context, binary *Binary) (*result, error) { enableCmd := exec.CommandContext(ctx, binary.path, "addons enable ingress") enableCmd.Stderr = os.Stderr From 640e9b64f8cb2b700589bcf3c0cf060410202ee3 Mon Sep 17 00:00:00 2001 From: Li Zhijian Date: Wed, 19 Aug 2020 16:54:17 +0800 Subject: [PATCH 11/21] cleanup tempdir properly for localpath_test 'path' could be changed during the test Signed-off-by: Li Zhijian --- pkg/minikube/localpath/localpath_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/minikube/localpath/localpath_test.go b/pkg/minikube/localpath/localpath_test.go index 00f52d09da..782ae87c97 100644 --- a/pkg/minikube/localpath/localpath_test.go +++ b/pkg/minikube/localpath/localpath_test.go @@ -33,12 +33,12 @@ func TestReplaceWinDriveLetterToVolumeName(t *testing.T) { if err != nil { t.Fatalf("Error make tmp directory: %v", err) } - defer func() { //clean up tempdir + defer func(path string) { //clean up tempdir err := os.RemoveAll(path) if err != nil { t.Errorf("failed to clean up temp folder %q", path) } - }() + }(path) if runtime.GOOS != "windows" { // Replace to fake func. From 50459e0566e91da6bb8d4ff791ffee4fbbb896c5 Mon Sep 17 00:00:00 2001 From: Li Zhijian Date: Wed, 19 Aug 2020 18:09:24 +0800 Subject: [PATCH 12/21] add testing cleanup hook for createTestProfile T.cleanup() is introduced since go-1.14 Signed-off-by: Li Zhijian --- pkg/addons/addons_test.go | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkg/addons/addons_test.go b/pkg/addons/addons_test.go index 004d0f5047..9ecbd277ff 100644 --- a/pkg/addons/addons_test.go +++ b/pkg/addons/addons_test.go @@ -35,6 +35,13 @@ func createTestProfile(t *testing.T) string { t.Fatalf("tempdir: %v", err) } + t.Cleanup(func() { + err := os.RemoveAll(td) + t.Logf("remove path %q", td) + if err != nil { + t.Errorf("failed to clean up temp folder %q", td) + } + }) err = os.Setenv(localpath.MinikubeHome, td) if err != nil { t.Errorf("error setting up test environment. could not set %s", localpath.MinikubeHome) From 95e7203900ddcaba3ca2a306348b858aabcb1837 Mon Sep 17 00:00:00 2001 From: Li Zhijian Date: Wed, 19 Aug 2020 18:10:52 +0800 Subject: [PATCH 13/21] add a temp MinikubeHome for TestStart this test will write a config.json into MinikubeHome, create a temp dir for it Signed-off-by: Li Zhijian --- pkg/addons/addons_test.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkg/addons/addons_test.go b/pkg/addons/addons_test.go index 9ecbd277ff..1f123220be 100644 --- a/pkg/addons/addons_test.go +++ b/pkg/addons/addons_test.go @@ -26,6 +26,7 @@ import ( "k8s.io/minikube/pkg/minikube/assets" "k8s.io/minikube/pkg/minikube/config" "k8s.io/minikube/pkg/minikube/localpath" + "k8s.io/minikube/pkg/minikube/tests" ) func createTestProfile(t *testing.T) string { @@ -129,6 +130,10 @@ func TestSetAndSave(t *testing.T) { } func TestStart(t *testing.T) { + // this test will write a config.json into MinikubeHome, create a temp dir for it + tempDir := tests.MakeTempDir() + defer tests.RemoveTempDir(tempDir) + cc := &config.ClusterConfig{ Name: "start", CPUs: 2, From 113e640c0dbdcbacd6ff42ca08b0dc67330badb0 Mon Sep 17 00:00:00 2001 From: Li Zhijian Date: Wed, 19 Aug 2020 18:48:39 +0800 Subject: [PATCH 14/21] create a temp MinikubeHome for a few cluster tests these tests will write something to the MinikubeHome. Previously, these tests will use the environment value of MinikubeHome directly which might dirty the previous MiniKubeHome Signed-off-by: Li Zhijian --- pkg/minikube/machine/cluster_test.go | 36 ++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/pkg/minikube/machine/cluster_test.go b/pkg/minikube/machine/cluster_test.go index 80e5e7389e..2085bca3f3 100644 --- a/pkg/minikube/machine/cluster_test.go +++ b/pkg/minikube/machine/cluster_test.go @@ -71,6 +71,9 @@ var defaultClusterConfig = config.ClusterConfig{ } func TestCreateHost(t *testing.T) { + tempDir := tests.MakeTempDir() + defer tests.RemoveTempDir(tempDir) + download.EnableMock(true) RegisterMockDriver(t) @@ -116,6 +119,9 @@ func TestCreateHost(t *testing.T) { } func TestStartHostExists(t *testing.T) { + tempDir := tests.MakeTempDir() + defer tests.RemoveTempDir(tempDir) + download.EnableMock(true) RegisterMockDriver(t) @@ -155,6 +161,9 @@ func TestStartHostExists(t *testing.T) { } func TestStartHostErrMachineNotExist(t *testing.T) { + tempDir := tests.MakeTempDir() + defer tests.RemoveTempDir(tempDir) + download.EnableMock(true) RegisterMockDriver(t) @@ -202,6 +211,9 @@ func TestStartHostErrMachineNotExist(t *testing.T) { } func TestStartStoppedHost(t *testing.T) { + tempDir := tests.MakeTempDir() + defer tests.RemoveTempDir(tempDir) + download.EnableMock(true) RegisterMockDriver(t) @@ -239,6 +251,9 @@ func TestStartStoppedHost(t *testing.T) { } func TestStartHost(t *testing.T) { + tempDir := tests.MakeTempDir() + defer tests.RemoveTempDir(tempDir) + download.EnableMock(true) RegisterMockDriver(t) @@ -269,6 +284,9 @@ func TestStartHost(t *testing.T) { } func TestStartHostConfig(t *testing.T) { + tempDir := tests.MakeTempDir() + defer tests.RemoveTempDir(tempDir) + download.EnableMock(true) RegisterMockDriver(t) @@ -311,6 +329,9 @@ func TestStopHostError(t *testing.T) { } func TestStopHost(t *testing.T) { + tempDir := tests.MakeTempDir() + defer tests.RemoveTempDir(tempDir) + RegisterMockDriver(t) api := tests.NewMockAPI(t) h, err := createHost(api, &defaultClusterConfig, &config.Node{Name: "minikube"}) @@ -330,6 +351,9 @@ func TestStopHost(t *testing.T) { } func TestDeleteHost(t *testing.T) { + tempDir := tests.MakeTempDir() + defer tests.RemoveTempDir(tempDir) + RegisterMockDriver(t) api := tests.NewMockAPI(t) if _, err := createHost(api, &defaultClusterConfig, &config.Node{Name: "minikube"}); err != nil { @@ -345,6 +369,9 @@ func TestDeleteHost(t *testing.T) { } func TestDeleteHostErrorDeletingVM(t *testing.T) { + tempDir := tests.MakeTempDir() + defer tests.RemoveTempDir(tempDir) + RegisterMockDriver(t) api := tests.NewMockAPI(t) h, err := createHost(api, &defaultClusterConfig, &config.Node{Name: "minikube"}) @@ -361,6 +388,9 @@ func TestDeleteHostErrorDeletingVM(t *testing.T) { } func TestDeleteHostErrorDeletingFiles(t *testing.T) { + tempDir := tests.MakeTempDir() + defer tests.RemoveTempDir(tempDir) + RegisterMockDriver(t) api := tests.NewMockAPI(t) api.RemoveError = true @@ -374,6 +404,9 @@ func TestDeleteHostErrorDeletingFiles(t *testing.T) { } func TestDeleteHostErrMachineNotExist(t *testing.T) { + tempDir := tests.MakeTempDir() + defer tests.RemoveTempDir(tempDir) + RegisterMockDriver(t) api := tests.NewMockAPI(t) // Create an incomplete host with machine does not exist error(i.e. User Interrupt Cancel) @@ -389,6 +422,9 @@ func TestDeleteHostErrMachineNotExist(t *testing.T) { } func TestStatus(t *testing.T) { + tempDir := tests.MakeTempDir() + defer tests.RemoveTempDir(tempDir) + RegisterMockDriver(t) api := tests.NewMockAPI(t) From 464bd48ea1782d20ae55b3ee1002db1175f81f05 Mon Sep 17 00:00:00 2001 From: Thomas Stromberg Date: Sun, 30 Aug 2020 22:32:20 -0700 Subject: [PATCH 15/21] Update dashboard to v2.0.3 --- deploy/addons/dashboard/dashboard-dp.yaml | 2 +- pkg/minikube/bootstrapper/images/images_test.go | 2 +- pkg/minikube/bootstrapper/images/kubeadm_test.go | 10 +++++----- pkg/minikube/cruntime/containerd_test.go | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/deploy/addons/dashboard/dashboard-dp.yaml b/deploy/addons/dashboard/dashboard-dp.yaml index aec28edf63..157db6f22f 100644 --- a/deploy/addons/dashboard/dashboard-dp.yaml +++ b/deploy/addons/dashboard/dashboard-dp.yaml @@ -90,7 +90,7 @@ spec: containers: - name: kubernetes-dashboard # WARNING: This must match pkg/minikube/bootstrapper/images/images.go - image: kubernetesui/dashboard:v2.0.1 + image: kubernetesui/dashboard:v2.0.3 ports: - containerPort: 9090 protocol: TCP diff --git a/pkg/minikube/bootstrapper/images/images_test.go b/pkg/minikube/bootstrapper/images/images_test.go index 2bc369b87c..5661f3bd3e 100644 --- a/pkg/minikube/bootstrapper/images/images_test.go +++ b/pkg/minikube/bootstrapper/images/images_test.go @@ -25,7 +25,7 @@ import ( func TestAuxiliary(t *testing.T) { want := []string{ "gcr.io/k8s-minikube/storage-provisioner:v2", - "kubernetesui/dashboard:v2.0.1", + "kubernetesui/dashboard:v2.0.3", "kubernetesui/metrics-scraper:v1.0.4", } got := auxiliary("") diff --git a/pkg/minikube/bootstrapper/images/kubeadm_test.go b/pkg/minikube/bootstrapper/images/kubeadm_test.go index f1348ce901..89e0c1c6fc 100644 --- a/pkg/minikube/bootstrapper/images/kubeadm_test.go +++ b/pkg/minikube/bootstrapper/images/kubeadm_test.go @@ -38,7 +38,7 @@ func TestKubeadmImages(t *testing.T) { "k8s.gcr.io/etcd:3.4.3-0", "k8s.gcr.io/pause:3.1", "gcr.io/k8s-minikube/storage-provisioner:v2", - "kubernetesui/dashboard:v2.0.1", + "kubernetesui/dashboard:v2.0.3", "kubernetesui/metrics-scraper:v1.0.4", }}, {"v1.16.1", "mirror.k8s.io", []string{ @@ -62,7 +62,7 @@ func TestKubeadmImages(t *testing.T) { "k8s.gcr.io/etcd:3.3.10", "k8s.gcr.io/pause:3.1", "gcr.io/k8s-minikube/storage-provisioner:v2", - "kubernetesui/dashboard:v2.0.1", + "kubernetesui/dashboard:v2.0.3", "kubernetesui/metrics-scraper:v1.0.4", }}, {"v1.14.0", "", []string{ @@ -74,7 +74,7 @@ func TestKubeadmImages(t *testing.T) { "k8s.gcr.io/etcd:3.3.10", "k8s.gcr.io/pause:3.1", "gcr.io/k8s-minikube/storage-provisioner:v2", - "kubernetesui/dashboard:v2.0.1", + "kubernetesui/dashboard:v2.0.3", "kubernetesui/metrics-scraper:v1.0.4", }}, {"v1.13.0", "", []string{ @@ -86,7 +86,7 @@ func TestKubeadmImages(t *testing.T) { "k8s.gcr.io/etcd:3.2.24", "k8s.gcr.io/pause:3.1", "gcr.io/k8s-minikube/storage-provisioner:v2", - "kubernetesui/dashboard:v2.0.1", + "kubernetesui/dashboard:v2.0.3", "kubernetesui/metrics-scraper:v1.0.4", }}, {"v1.12.0", "", []string{ @@ -98,7 +98,7 @@ func TestKubeadmImages(t *testing.T) { "k8s.gcr.io/etcd:3.2.24", "k8s.gcr.io/pause:3.1", "gcr.io/k8s-minikube/storage-provisioner:v2", - "kubernetesui/dashboard:v2.0.1", + "kubernetesui/dashboard:v2.0.3", "kubernetesui/metrics-scraper:v1.0.4", }}, } diff --git a/pkg/minikube/cruntime/containerd_test.go b/pkg/minikube/cruntime/containerd_test.go index 5b1e6414f9..93a58ae001 100644 --- a/pkg/minikube/cruntime/containerd_test.go +++ b/pkg/minikube/cruntime/containerd_test.go @@ -25,7 +25,7 @@ func TestAddRepoTagToImageName(t *testing.T) { imgName string want string }{ - {"kubernetesui/dashboard:v2.0.1", "docker.io/kubernetesui/dashboard:v2.0.1"}, + {"kubernetesui/dashboard:v2.0.3", "docker.io/kubernetesui/dashboard:v2.0.3"}, {"kubernetesui/metrics-scraper:v1.0.4", "docker.io/kubernetesui/metrics-scraper:v1.0.4"}, {"gcr.io/k8s-minikube/storage-provisioner:v2", "gcr.io/k8s-minikube/storage-provisioner:v2"}, } From 69214c08bb1ce14a4f4bfba980540b375a97f87b Mon Sep 17 00:00:00 2001 From: Thomas Stromberg Date: Mon, 31 Aug 2020 11:11:25 -0700 Subject: [PATCH 16/21] Update test data --- pkg/minikube/bootstrapper/images/images.go | 2 +- pkg/minikube/bootstrapper/images/images_test.go | 2 +- pkg/minikube/bootstrapper/images/kubeadm_test.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/minikube/bootstrapper/images/images.go b/pkg/minikube/bootstrapper/images/images.go index 6cf71f0e07..631e62510e 100644 --- a/pkg/minikube/bootstrapper/images/images.go +++ b/pkg/minikube/bootstrapper/images/images.go @@ -141,7 +141,7 @@ func dashboardFrontend(repo string) string { repo = "kubernetesui" } // See 'kubernetes-dashboard' in deploy/addons/dashboard/dashboard-dp.yaml - return path.Join(repo, "dashboard:v2.0.1") + return path.Join(repo, "dashboard:v2.0.3") } // dashboardMetrics returns the image used for the dashboard metrics scraper diff --git a/pkg/minikube/bootstrapper/images/images_test.go b/pkg/minikube/bootstrapper/images/images_test.go index 5661f3bd3e..5b7fe84809 100644 --- a/pkg/minikube/bootstrapper/images/images_test.go +++ b/pkg/minikube/bootstrapper/images/images_test.go @@ -37,7 +37,7 @@ func TestAuxiliary(t *testing.T) { func TestAuxiliaryMirror(t *testing.T) { want := []string{ "test.mirror/storage-provisioner:v2", - "test.mirror/dashboard:v2.0.1", + "test.mirror/dashboard:v2.0.3", "test.mirror/metrics-scraper:v1.0.4", } got := auxiliary("test.mirror") diff --git a/pkg/minikube/bootstrapper/images/kubeadm_test.go b/pkg/minikube/bootstrapper/images/kubeadm_test.go index 89e0c1c6fc..0880fb0994 100644 --- a/pkg/minikube/bootstrapper/images/kubeadm_test.go +++ b/pkg/minikube/bootstrapper/images/kubeadm_test.go @@ -50,7 +50,7 @@ func TestKubeadmImages(t *testing.T) { "mirror.k8s.io/etcd:3.3.15-0", "mirror.k8s.io/pause:3.1", "mirror.k8s.io/storage-provisioner:v2", - "mirror.k8s.io/dashboard:v2.0.1", + "mirror.k8s.io/dashboard:v2.0.3", "mirror.k8s.io/metrics-scraper:v1.0.4", }}, {"v1.15.0", "", []string{ From e323a6f86e28de7b511b84cc08c73699039f5822 Mon Sep 17 00:00:00 2001 From: Priya Wadhwa Date: Mon, 31 Aug 2020 15:27:46 -0400 Subject: [PATCH 17/21] Set leader-elect=false in code instead of in config This sets leader-elect=false as extra options for the scheduler and controller manager. This way, users can easily override those values. This will also allow users to specify additional flags via `--extra-config` without overwriting the leader-elect section in the config. --- .../bootstrapper/bsutil/ktmpl/v1beta1.go | 6 ------ .../bootstrapper/bsutil/ktmpl/v1beta2.go | 6 ------ .../testdata/v1.14/containerd-api-port.yaml | 12 ++++++------ .../v1.14/containerd-pod-network-cidr.yaml | 12 ++++++------ .../bsutil/testdata/v1.14/containerd.yaml | 12 ++++++------ .../testdata/v1.14/crio-options-gates.yaml | 8 ++------ .../bsutil/testdata/v1.14/crio.yaml | 12 ++++++------ .../bsutil/testdata/v1.14/default.yaml | 12 ++++++------ .../bootstrapper/bsutil/testdata/v1.14/dns.yaml | 12 ++++++------ .../bsutil/testdata/v1.14/image-repository.yaml | 12 ++++++------ .../bsutil/testdata/v1.14/options.yaml | 8 ++------ .../testdata/v1.15/containerd-api-port.yaml | 12 ++++++------ .../v1.15/containerd-pod-network-cidr.yaml | 12 ++++++------ .../bsutil/testdata/v1.15/containerd.yaml | 12 ++++++------ .../testdata/v1.15/crio-options-gates.yaml | 8 ++------ .../bsutil/testdata/v1.15/crio.yaml | 12 ++++++------ .../bsutil/testdata/v1.15/default.yaml | 12 ++++++------ .../bootstrapper/bsutil/testdata/v1.15/dns.yaml | 12 ++++++------ .../bsutil/testdata/v1.15/image-repository.yaml | 12 ++++++------ .../bsutil/testdata/v1.15/options.yaml | 8 ++------ .../testdata/v1.16/containerd-api-port.yaml | 12 ++++++------ .../v1.16/containerd-pod-network-cidr.yaml | 12 ++++++------ .../bsutil/testdata/v1.16/containerd.yaml | 12 ++++++------ .../testdata/v1.16/crio-options-gates.yaml | 8 ++------ .../bsutil/testdata/v1.16/crio.yaml | 12 ++++++------ .../bsutil/testdata/v1.16/default.yaml | 12 ++++++------ .../bootstrapper/bsutil/testdata/v1.16/dns.yaml | 12 ++++++------ .../bsutil/testdata/v1.16/image-repository.yaml | 12 ++++++------ .../bsutil/testdata/v1.16/options.yaml | 8 ++------ .../testdata/v1.17/containerd-api-port.yaml | 12 ++++++------ .../v1.17/containerd-pod-network-cidr.yaml | 12 ++++++------ .../bsutil/testdata/v1.17/containerd.yaml | 12 ++++++------ .../testdata/v1.17/crio-options-gates.yaml | 8 ++------ .../bsutil/testdata/v1.17/crio.yaml | 12 ++++++------ .../bsutil/testdata/v1.17/default.yaml | 12 ++++++------ .../bootstrapper/bsutil/testdata/v1.17/dns.yaml | 12 ++++++------ .../bsutil/testdata/v1.17/image-repository.yaml | 12 ++++++------ .../bsutil/testdata/v1.17/options.yaml | 8 ++------ .../testdata/v1.18/containerd-api-port.yaml | 12 ++++++------ .../v1.18/containerd-pod-network-cidr.yaml | 12 ++++++------ .../bsutil/testdata/v1.18/containerd.yaml | 12 ++++++------ .../testdata/v1.18/crio-options-gates.yaml | 8 ++------ .../bsutil/testdata/v1.18/crio.yaml | 12 ++++++------ .../bsutil/testdata/v1.18/default.yaml | 12 ++++++------ .../bootstrapper/bsutil/testdata/v1.18/dns.yaml | 12 ++++++------ .../bsutil/testdata/v1.18/image-repository.yaml | 12 ++++++------ .../bsutil/testdata/v1.18/options.yaml | 8 ++------ .../testdata/v1.19/containerd-api-port.yaml | 12 ++++++------ .../v1.19/containerd-pod-network-cidr.yaml | 12 ++++++------ .../bsutil/testdata/v1.19/containerd.yaml | 12 ++++++------ .../testdata/v1.19/crio-options-gates.yaml | 8 ++------ .../bsutil/testdata/v1.19/crio.yaml | 12 ++++++------ .../bsutil/testdata/v1.19/default.yaml | 12 ++++++------ .../bootstrapper/bsutil/testdata/v1.19/dns.yaml | 12 ++++++------ .../bsutil/testdata/v1.19/image-repository.yaml | 12 ++++++------ .../bsutil/testdata/v1.19/options.yaml | 8 ++------ pkg/minikube/bootstrapper/bsutil/versions.go | 17 ++++++++++++++++- 57 files changed, 292 insertions(+), 337 deletions(-) diff --git a/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta1.go b/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta1.go index d4813642ea..342425f82d 100644 --- a/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta1.go +++ b/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta1.go @@ -65,12 +65,6 @@ etcd: dataDir: {{.EtcdDataDir}} extraArgs: listen-metrics-urls: http://127.0.0.1:2381,http://{{.AdvertiseAddress}}:2381 -controllerManager: - extraArgs: - "leader-elect": "false" -scheduler: - extraArgs: - "leader-elect": "false" kubernetesVersion: {{.KubernetesVersion}} networking: dnsDomain: {{if .DNSDomain}}{{.DNSDomain}}{{else}}cluster.local{{end}} diff --git a/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta2.go b/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta2.go index 23bb0665f1..9e1cc650d5 100644 --- a/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta2.go +++ b/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta2.go @@ -68,12 +68,6 @@ etcd: {{- range $i, $val := printMapInOrder .EtcdExtraArgs ": " }} {{$val}} {{- end}} -controllerManager: - extraArgs: - "leader-elect": "false" -scheduler: - extraArgs: - "leader-elect": "false" kubernetesVersion: {{.KubernetesVersion}} networking: dnsDomain: {{if .DNSDomain}}{{.DNSDomain}}{{else}}cluster.local{{end}} diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd-api-port.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd-api-port.yaml index 2bd931ce86..7e367f9763 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd-api-port.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd-api-port.yaml @@ -23,6 +23,12 @@ 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: + leader-elect: "false" +scheduler: + extraArgs: + leader-elect: "false" certificatesDir: /var/lib/minikube/certs clusterName: mk controlPlaneEndpoint: control-plane.minikube.internal:12345 @@ -33,12 +39,6 @@ etcd: dataDir: /var/lib/minikube/etcd extraArgs: listen-metrics-urls: http://127.0.0.1:2381,http://1.1.1.1:2381 -controllerManager: - extraArgs: - "leader-elect": "false" -scheduler: - extraArgs: - "leader-elect": "false" kubernetesVersion: v1.14.0 networking: dnsDomain: cluster.local diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd-pod-network-cidr.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd-pod-network-cidr.yaml index 35686aff25..49e49992ec 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd-pod-network-cidr.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd-pod-network-cidr.yaml @@ -23,6 +23,12 @@ 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: + leader-elect: "false" +scheduler: + extraArgs: + leader-elect: "false" certificatesDir: /var/lib/minikube/certs clusterName: mk controlPlaneEndpoint: control-plane.minikube.internal:8443 @@ -33,12 +39,6 @@ etcd: dataDir: /var/lib/minikube/etcd extraArgs: listen-metrics-urls: http://127.0.0.1:2381,http://1.1.1.1:2381 -controllerManager: - extraArgs: - "leader-elect": "false" -scheduler: - extraArgs: - "leader-elect": "false" kubernetesVersion: v1.14.0 networking: dnsDomain: cluster.local diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd.yaml index 6df17df9a0..4d2e6ef796 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd.yaml @@ -23,6 +23,12 @@ 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: + leader-elect: "false" +scheduler: + extraArgs: + leader-elect: "false" certificatesDir: /var/lib/minikube/certs clusterName: mk controlPlaneEndpoint: control-plane.minikube.internal:8443 @@ -33,12 +39,6 @@ etcd: dataDir: /var/lib/minikube/etcd extraArgs: listen-metrics-urls: http://127.0.0.1:2381,http://1.1.1.1:2381 -controllerManager: - extraArgs: - "leader-elect": "false" -scheduler: - extraArgs: - "leader-elect": "false" kubernetesVersion: v1.14.0 networking: dnsDomain: cluster.local diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/crio-options-gates.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/crio-options-gates.yaml index 4b8c27e8ba..b300459369 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/crio-options-gates.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/crio-options-gates.yaml @@ -29,9 +29,11 @@ controllerManager: extraArgs: 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 @@ -43,12 +45,6 @@ etcd: dataDir: /var/lib/minikube/etcd extraArgs: listen-metrics-urls: http://127.0.0.1:2381,http://1.1.1.1:2381 -controllerManager: - extraArgs: - "leader-elect": "false" -scheduler: - extraArgs: - "leader-elect": "false" kubernetesVersion: v1.14.0 networking: dnsDomain: cluster.local diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/crio.yaml index 1a4fdd56bc..a447921c99 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/crio.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/crio.yaml @@ -23,6 +23,12 @@ 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: + leader-elect: "false" +scheduler: + extraArgs: + leader-elect: "false" certificatesDir: /var/lib/minikube/certs clusterName: mk controlPlaneEndpoint: control-plane.minikube.internal:8443 @@ -33,12 +39,6 @@ etcd: dataDir: /var/lib/minikube/etcd extraArgs: listen-metrics-urls: http://127.0.0.1:2381,http://1.1.1.1:2381 -controllerManager: - extraArgs: - "leader-elect": "false" -scheduler: - extraArgs: - "leader-elect": "false" kubernetesVersion: v1.14.0 networking: dnsDomain: cluster.local diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/default.yaml index ce9946026f..9a2be297b6 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/default.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/default.yaml @@ -23,6 +23,12 @@ 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: + leader-elect: "false" +scheduler: + extraArgs: + leader-elect: "false" certificatesDir: /var/lib/minikube/certs clusterName: mk controlPlaneEndpoint: control-plane.minikube.internal:8443 @@ -33,12 +39,6 @@ etcd: dataDir: /var/lib/minikube/etcd extraArgs: listen-metrics-urls: http://127.0.0.1:2381,http://1.1.1.1:2381 -controllerManager: - extraArgs: - "leader-elect": "false" -scheduler: - extraArgs: - "leader-elect": "false" kubernetesVersion: v1.14.0 networking: dnsDomain: cluster.local diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/dns.yaml index 369af2a1cf..5c24065898 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/dns.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/dns.yaml @@ -23,6 +23,12 @@ 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: + leader-elect: "false" +scheduler: + extraArgs: + leader-elect: "false" certificatesDir: /var/lib/minikube/certs clusterName: mk controlPlaneEndpoint: control-plane.minikube.internal:8443 @@ -33,12 +39,6 @@ etcd: dataDir: /var/lib/minikube/etcd extraArgs: listen-metrics-urls: http://127.0.0.1:2381,http://1.1.1.1:2381 -controllerManager: - extraArgs: - "leader-elect": "false" -scheduler: - extraArgs: - "leader-elect": "false" kubernetesVersion: v1.14.0 networking: dnsDomain: 1.1.1.1 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/image-repository.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/image-repository.yaml index 1882af8429..8e18b41e91 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/image-repository.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/image-repository.yaml @@ -24,6 +24,12 @@ 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: + leader-elect: "false" +scheduler: + extraArgs: + leader-elect: "false" certificatesDir: /var/lib/minikube/certs clusterName: mk controlPlaneEndpoint: control-plane.minikube.internal:8443 @@ -34,12 +40,6 @@ etcd: dataDir: /var/lib/minikube/etcd extraArgs: listen-metrics-urls: http://127.0.0.1:2381,http://1.1.1.1:2381 -controllerManager: - extraArgs: - "leader-elect": "false" -scheduler: - extraArgs: - "leader-elect": "false" kubernetesVersion: v1.14.0 networking: dnsDomain: cluster.local diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/options.yaml index 36abbc58b8..ae0e3b33bb 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/options.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/options.yaml @@ -27,8 +27,10 @@ apiServer: controllerManager: extraArgs: kube-api-burst: "32" + leader-elect: "false" scheduler: extraArgs: + leader-elect: "false" scheduler-name: "mini-scheduler" certificatesDir: /var/lib/minikube/certs clusterName: mk @@ -40,12 +42,6 @@ etcd: dataDir: /var/lib/minikube/etcd extraArgs: listen-metrics-urls: http://127.0.0.1:2381,http://1.1.1.1:2381 -controllerManager: - extraArgs: - "leader-elect": "false" -scheduler: - extraArgs: - "leader-elect": "false" kubernetesVersion: v1.14.0 networking: dnsDomain: cluster.local diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd-api-port.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd-api-port.yaml index 51dc8711c7..f847dc27ca 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd-api-port.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd-api-port.yaml @@ -23,6 +23,12 @@ 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: + leader-elect: "false" +scheduler: + extraArgs: + leader-elect: "false" certificatesDir: /var/lib/minikube/certs clusterName: mk controlPlaneEndpoint: control-plane.minikube.internal:12345 @@ -33,12 +39,6 @@ etcd: dataDir: /var/lib/minikube/etcd extraArgs: listen-metrics-urls: http://127.0.0.1:2381,http://1.1.1.1:2381 -controllerManager: - extraArgs: - "leader-elect": "false" -scheduler: - extraArgs: - "leader-elect": "false" kubernetesVersion: v1.15.0 networking: dnsDomain: cluster.local diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd-pod-network-cidr.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd-pod-network-cidr.yaml index 32bff46119..acc7c1cc3e 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd-pod-network-cidr.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd-pod-network-cidr.yaml @@ -23,6 +23,12 @@ 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: + leader-elect: "false" +scheduler: + extraArgs: + leader-elect: "false" certificatesDir: /var/lib/minikube/certs clusterName: mk controlPlaneEndpoint: control-plane.minikube.internal:8443 @@ -33,12 +39,6 @@ etcd: dataDir: /var/lib/minikube/etcd extraArgs: listen-metrics-urls: http://127.0.0.1:2381,http://1.1.1.1:2381 -controllerManager: - extraArgs: - "leader-elect": "false" -scheduler: - extraArgs: - "leader-elect": "false" kubernetesVersion: v1.15.0 networking: dnsDomain: cluster.local diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd.yaml index ab76cbaee5..0fe66c2290 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd.yaml @@ -23,6 +23,12 @@ 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: + leader-elect: "false" +scheduler: + extraArgs: + leader-elect: "false" certificatesDir: /var/lib/minikube/certs clusterName: mk controlPlaneEndpoint: control-plane.minikube.internal:8443 @@ -33,12 +39,6 @@ etcd: dataDir: /var/lib/minikube/etcd extraArgs: listen-metrics-urls: http://127.0.0.1:2381,http://1.1.1.1:2381 -controllerManager: - extraArgs: - "leader-elect": "false" -scheduler: - extraArgs: - "leader-elect": "false" kubernetesVersion: v1.15.0 networking: dnsDomain: cluster.local diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/crio-options-gates.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/crio-options-gates.yaml index 73ea4bf1ae..886ecc55fd 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/crio-options-gates.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/crio-options-gates.yaml @@ -29,9 +29,11 @@ controllerManager: extraArgs: 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 @@ -43,12 +45,6 @@ etcd: dataDir: /var/lib/minikube/etcd extraArgs: listen-metrics-urls: http://127.0.0.1:2381,http://1.1.1.1:2381 -controllerManager: - extraArgs: - "leader-elect": "false" -scheduler: - extraArgs: - "leader-elect": "false" kubernetesVersion: v1.15.0 networking: dnsDomain: cluster.local diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/crio.yaml index 8c4a3494b1..f797584ae6 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/crio.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/crio.yaml @@ -23,6 +23,12 @@ 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: + leader-elect: "false" +scheduler: + extraArgs: + leader-elect: "false" certificatesDir: /var/lib/minikube/certs clusterName: mk controlPlaneEndpoint: control-plane.minikube.internal:8443 @@ -33,12 +39,6 @@ etcd: dataDir: /var/lib/minikube/etcd extraArgs: listen-metrics-urls: http://127.0.0.1:2381,http://1.1.1.1:2381 -controllerManager: - extraArgs: - "leader-elect": "false" -scheduler: - extraArgs: - "leader-elect": "false" kubernetesVersion: v1.15.0 networking: dnsDomain: cluster.local diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/default.yaml index 158eb53826..a1ff88dfe0 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/default.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/default.yaml @@ -23,6 +23,12 @@ 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: + leader-elect: "false" +scheduler: + extraArgs: + leader-elect: "false" certificatesDir: /var/lib/minikube/certs clusterName: mk controlPlaneEndpoint: control-plane.minikube.internal:8443 @@ -33,12 +39,6 @@ etcd: dataDir: /var/lib/minikube/etcd extraArgs: listen-metrics-urls: http://127.0.0.1:2381,http://1.1.1.1:2381 -controllerManager: - extraArgs: - "leader-elect": "false" -scheduler: - extraArgs: - "leader-elect": "false" kubernetesVersion: v1.15.0 networking: dnsDomain: cluster.local diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/dns.yaml index 0d8183a059..91132a6da2 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/dns.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/dns.yaml @@ -23,6 +23,12 @@ 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: + leader-elect: "false" +scheduler: + extraArgs: + leader-elect: "false" certificatesDir: /var/lib/minikube/certs clusterName: mk controlPlaneEndpoint: control-plane.minikube.internal:8443 @@ -33,12 +39,6 @@ etcd: dataDir: /var/lib/minikube/etcd extraArgs: listen-metrics-urls: http://127.0.0.1:2381,http://1.1.1.1:2381 -controllerManager: - extraArgs: - "leader-elect": "false" -scheduler: - extraArgs: - "leader-elect": "false" kubernetesVersion: v1.15.0 networking: dnsDomain: 1.1.1.1 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/image-repository.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/image-repository.yaml index f4ba9146de..753e0f5808 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/image-repository.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/image-repository.yaml @@ -24,6 +24,12 @@ 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: + leader-elect: "false" +scheduler: + extraArgs: + leader-elect: "false" certificatesDir: /var/lib/minikube/certs clusterName: mk controlPlaneEndpoint: control-plane.minikube.internal:8443 @@ -34,12 +40,6 @@ etcd: dataDir: /var/lib/minikube/etcd extraArgs: listen-metrics-urls: http://127.0.0.1:2381,http://1.1.1.1:2381 -controllerManager: - extraArgs: - "leader-elect": "false" -scheduler: - extraArgs: - "leader-elect": "false" kubernetesVersion: v1.15.0 networking: dnsDomain: cluster.local diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/options.yaml index b6de73bf54..ac34fb54c9 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/options.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/options.yaml @@ -27,8 +27,10 @@ apiServer: controllerManager: extraArgs: kube-api-burst: "32" + leader-elect: "false" scheduler: extraArgs: + leader-elect: "false" scheduler-name: "mini-scheduler" certificatesDir: /var/lib/minikube/certs clusterName: mk @@ -40,12 +42,6 @@ etcd: dataDir: /var/lib/minikube/etcd extraArgs: listen-metrics-urls: http://127.0.0.1:2381,http://1.1.1.1:2381 -controllerManager: - extraArgs: - "leader-elect": "false" -scheduler: - extraArgs: - "leader-elect": "false" kubernetesVersion: v1.15.0 networking: dnsDomain: cluster.local diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd-api-port.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd-api-port.yaml index 90ebee7d8d..43c3a51676 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd-api-port.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd-api-port.yaml @@ -23,6 +23,12 @@ 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: + leader-elect: "false" +scheduler: + extraArgs: + leader-elect: "false" certificatesDir: /var/lib/minikube/certs clusterName: mk controlPlaneEndpoint: control-plane.minikube.internal:12345 @@ -33,12 +39,6 @@ etcd: dataDir: /var/lib/minikube/etcd extraArgs: listen-metrics-urls: http://127.0.0.1:2381,http://1.1.1.1:2381 -controllerManager: - extraArgs: - "leader-elect": "false" -scheduler: - extraArgs: - "leader-elect": "false" kubernetesVersion: v1.16.0 networking: dnsDomain: cluster.local diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd-pod-network-cidr.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd-pod-network-cidr.yaml index 376d2051ee..541fe28d7d 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd-pod-network-cidr.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd-pod-network-cidr.yaml @@ -23,6 +23,12 @@ 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: + leader-elect: "false" +scheduler: + extraArgs: + leader-elect: "false" certificatesDir: /var/lib/minikube/certs clusterName: mk controlPlaneEndpoint: control-plane.minikube.internal:8443 @@ -33,12 +39,6 @@ etcd: dataDir: /var/lib/minikube/etcd extraArgs: listen-metrics-urls: http://127.0.0.1:2381,http://1.1.1.1:2381 -controllerManager: - extraArgs: - "leader-elect": "false" -scheduler: - extraArgs: - "leader-elect": "false" kubernetesVersion: v1.16.0 networking: dnsDomain: cluster.local diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd.yaml index 7056670795..c1220ac31c 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd.yaml @@ -23,6 +23,12 @@ 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: + leader-elect: "false" +scheduler: + extraArgs: + leader-elect: "false" certificatesDir: /var/lib/minikube/certs clusterName: mk controlPlaneEndpoint: control-plane.minikube.internal:8443 @@ -33,12 +39,6 @@ etcd: dataDir: /var/lib/minikube/etcd extraArgs: listen-metrics-urls: http://127.0.0.1:2381,http://1.1.1.1:2381 -controllerManager: - extraArgs: - "leader-elect": "false" -scheduler: - extraArgs: - "leader-elect": "false" kubernetesVersion: v1.16.0 networking: dnsDomain: cluster.local diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/crio-options-gates.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/crio-options-gates.yaml index 075cd7b3a3..1dcc285066 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/crio-options-gates.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/crio-options-gates.yaml @@ -29,9 +29,11 @@ controllerManager: extraArgs: 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 @@ -43,12 +45,6 @@ etcd: dataDir: /var/lib/minikube/etcd extraArgs: listen-metrics-urls: http://127.0.0.1:2381,http://1.1.1.1:2381 -controllerManager: - extraArgs: - "leader-elect": "false" -scheduler: - extraArgs: - "leader-elect": "false" kubernetesVersion: v1.16.0 networking: dnsDomain: cluster.local diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/crio.yaml index 1458b349e1..bcbe3e1adb 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/crio.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/crio.yaml @@ -23,6 +23,12 @@ 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: + leader-elect: "false" +scheduler: + extraArgs: + leader-elect: "false" certificatesDir: /var/lib/minikube/certs clusterName: mk controlPlaneEndpoint: control-plane.minikube.internal:8443 @@ -33,12 +39,6 @@ etcd: dataDir: /var/lib/minikube/etcd extraArgs: listen-metrics-urls: http://127.0.0.1:2381,http://1.1.1.1:2381 -controllerManager: - extraArgs: - "leader-elect": "false" -scheduler: - extraArgs: - "leader-elect": "false" kubernetesVersion: v1.16.0 networking: dnsDomain: cluster.local diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/default.yaml index b045ccc6ac..d3bddc93ff 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/default.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/default.yaml @@ -23,6 +23,12 @@ 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: + leader-elect: "false" +scheduler: + extraArgs: + leader-elect: "false" certificatesDir: /var/lib/minikube/certs clusterName: mk controlPlaneEndpoint: control-plane.minikube.internal:8443 @@ -33,12 +39,6 @@ etcd: dataDir: /var/lib/minikube/etcd extraArgs: listen-metrics-urls: http://127.0.0.1:2381,http://1.1.1.1:2381 -controllerManager: - extraArgs: - "leader-elect": "false" -scheduler: - extraArgs: - "leader-elect": "false" kubernetesVersion: v1.16.0 networking: dnsDomain: cluster.local diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/dns.yaml index 9087314332..2167eec380 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/dns.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/dns.yaml @@ -23,6 +23,12 @@ 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: + leader-elect: "false" +scheduler: + extraArgs: + leader-elect: "false" certificatesDir: /var/lib/minikube/certs clusterName: mk controlPlaneEndpoint: control-plane.minikube.internal:8443 @@ -33,12 +39,6 @@ etcd: dataDir: /var/lib/minikube/etcd extraArgs: listen-metrics-urls: http://127.0.0.1:2381,http://1.1.1.1:2381 -controllerManager: - extraArgs: - "leader-elect": "false" -scheduler: - extraArgs: - "leader-elect": "false" kubernetesVersion: v1.16.0 networking: dnsDomain: 1.1.1.1 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/image-repository.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/image-repository.yaml index 421afab0e1..a5fabb7591 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/image-repository.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/image-repository.yaml @@ -24,6 +24,12 @@ 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: + leader-elect: "false" +scheduler: + extraArgs: + leader-elect: "false" certificatesDir: /var/lib/minikube/certs clusterName: mk controlPlaneEndpoint: control-plane.minikube.internal:8443 @@ -34,12 +40,6 @@ etcd: dataDir: /var/lib/minikube/etcd extraArgs: listen-metrics-urls: http://127.0.0.1:2381,http://1.1.1.1:2381 -controllerManager: - extraArgs: - "leader-elect": "false" -scheduler: - extraArgs: - "leader-elect": "false" kubernetesVersion: v1.16.0 networking: dnsDomain: cluster.local diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/options.yaml index fc83b1cf6b..fb7d61c5bd 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/options.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/options.yaml @@ -27,8 +27,10 @@ apiServer: controllerManager: extraArgs: kube-api-burst: "32" + leader-elect: "false" scheduler: extraArgs: + leader-elect: "false" scheduler-name: "mini-scheduler" certificatesDir: /var/lib/minikube/certs clusterName: mk @@ -40,12 +42,6 @@ etcd: dataDir: /var/lib/minikube/etcd extraArgs: listen-metrics-urls: http://127.0.0.1:2381,http://1.1.1.1:2381 -controllerManager: - extraArgs: - "leader-elect": "false" -scheduler: - extraArgs: - "leader-elect": "false" kubernetesVersion: v1.16.0 networking: dnsDomain: cluster.local diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd-api-port.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd-api-port.yaml index 10b16c79ef..88319aefdf 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd-api-port.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd-api-port.yaml @@ -23,6 +23,12 @@ 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: + leader-elect: "false" +scheduler: + extraArgs: + leader-elect: "false" certificatesDir: /var/lib/minikube/certs clusterName: mk controlPlaneEndpoint: control-plane.minikube.internal:12345 @@ -33,12 +39,6 @@ etcd: dataDir: /var/lib/minikube/etcd extraArgs: proxy-refresh-interval: "70000" -controllerManager: - extraArgs: - "leader-elect": "false" -scheduler: - extraArgs: - "leader-elect": "false" kubernetesVersion: v1.17.0 networking: dnsDomain: cluster.local diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd-pod-network-cidr.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd-pod-network-cidr.yaml index 3cd14fc1ac..055a20bd15 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd-pod-network-cidr.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd-pod-network-cidr.yaml @@ -23,6 +23,12 @@ 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: + leader-elect: "false" +scheduler: + extraArgs: + leader-elect: "false" certificatesDir: /var/lib/minikube/certs clusterName: mk controlPlaneEndpoint: control-plane.minikube.internal:8443 @@ -33,12 +39,6 @@ etcd: dataDir: /var/lib/minikube/etcd extraArgs: proxy-refresh-interval: "70000" -controllerManager: - extraArgs: - "leader-elect": "false" -scheduler: - extraArgs: - "leader-elect": "false" kubernetesVersion: v1.17.0 networking: dnsDomain: cluster.local diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd.yaml index 928385bea4..bfb66f2e43 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd.yaml @@ -23,6 +23,12 @@ 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: + leader-elect: "false" +scheduler: + extraArgs: + leader-elect: "false" certificatesDir: /var/lib/minikube/certs clusterName: mk controlPlaneEndpoint: control-plane.minikube.internal:8443 @@ -33,12 +39,6 @@ etcd: dataDir: /var/lib/minikube/etcd extraArgs: proxy-refresh-interval: "70000" -controllerManager: - extraArgs: - "leader-elect": "false" -scheduler: - extraArgs: - "leader-elect": "false" kubernetesVersion: v1.17.0 networking: dnsDomain: cluster.local diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio-options-gates.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio-options-gates.yaml index b8309685d7..4451a1c2c1 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio-options-gates.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio-options-gates.yaml @@ -29,9 +29,11 @@ controllerManager: extraArgs: 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 @@ -43,12 +45,6 @@ etcd: dataDir: /var/lib/minikube/etcd extraArgs: proxy-refresh-interval: "70000" -controllerManager: - extraArgs: - "leader-elect": "false" -scheduler: - extraArgs: - "leader-elect": "false" kubernetesVersion: v1.17.0 networking: dnsDomain: cluster.local diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio.yaml index 176dc7885e..fa9d43a70b 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio.yaml @@ -23,6 +23,12 @@ 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: + leader-elect: "false" +scheduler: + extraArgs: + leader-elect: "false" certificatesDir: /var/lib/minikube/certs clusterName: mk controlPlaneEndpoint: control-plane.minikube.internal:8443 @@ -33,12 +39,6 @@ etcd: dataDir: /var/lib/minikube/etcd extraArgs: proxy-refresh-interval: "70000" -controllerManager: - extraArgs: - "leader-elect": "false" -scheduler: - extraArgs: - "leader-elect": "false" kubernetesVersion: v1.17.0 networking: dnsDomain: cluster.local diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/default.yaml index 91decc51dc..bd43de8704 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/default.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/default.yaml @@ -23,6 +23,12 @@ 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: + leader-elect: "false" +scheduler: + extraArgs: + leader-elect: "false" certificatesDir: /var/lib/minikube/certs clusterName: mk controlPlaneEndpoint: control-plane.minikube.internal:8443 @@ -33,12 +39,6 @@ etcd: dataDir: /var/lib/minikube/etcd extraArgs: proxy-refresh-interval: "70000" -controllerManager: - extraArgs: - "leader-elect": "false" -scheduler: - extraArgs: - "leader-elect": "false" kubernetesVersion: v1.17.0 networking: dnsDomain: cluster.local diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/dns.yaml index ad58257e9e..0447ecc4ee 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/dns.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/dns.yaml @@ -23,6 +23,12 @@ 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: + leader-elect: "false" +scheduler: + extraArgs: + leader-elect: "false" certificatesDir: /var/lib/minikube/certs clusterName: mk controlPlaneEndpoint: control-plane.minikube.internal:8443 @@ -33,12 +39,6 @@ etcd: dataDir: /var/lib/minikube/etcd extraArgs: proxy-refresh-interval: "70000" -controllerManager: - extraArgs: - "leader-elect": "false" -scheduler: - extraArgs: - "leader-elect": "false" kubernetesVersion: v1.17.0 networking: dnsDomain: 1.1.1.1 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/image-repository.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/image-repository.yaml index ebe9637fb1..47a5f98af5 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/image-repository.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/image-repository.yaml @@ -24,6 +24,12 @@ 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: + leader-elect: "false" +scheduler: + extraArgs: + leader-elect: "false" certificatesDir: /var/lib/minikube/certs clusterName: mk controlPlaneEndpoint: control-plane.minikube.internal:8443 @@ -34,12 +40,6 @@ etcd: dataDir: /var/lib/minikube/etcd extraArgs: proxy-refresh-interval: "70000" -controllerManager: - extraArgs: - "leader-elect": "false" -scheduler: - extraArgs: - "leader-elect": "false" kubernetesVersion: v1.17.0 networking: dnsDomain: cluster.local diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/options.yaml index b7558c4a57..210d15bf35 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/options.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/options.yaml @@ -27,8 +27,10 @@ apiServer: controllerManager: extraArgs: kube-api-burst: "32" + leader-elect: "false" scheduler: extraArgs: + leader-elect: "false" scheduler-name: "mini-scheduler" certificatesDir: /var/lib/minikube/certs clusterName: mk @@ -40,12 +42,6 @@ etcd: dataDir: /var/lib/minikube/etcd extraArgs: proxy-refresh-interval: "70000" -controllerManager: - extraArgs: - "leader-elect": "false" -scheduler: - extraArgs: - "leader-elect": "false" kubernetesVersion: v1.17.0 networking: dnsDomain: cluster.local diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd-api-port.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd-api-port.yaml index 7176081d05..499011c336 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd-api-port.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd-api-port.yaml @@ -23,6 +23,12 @@ 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: + leader-elect: "false" +scheduler: + extraArgs: + leader-elect: "false" certificatesDir: /var/lib/minikube/certs clusterName: mk controlPlaneEndpoint: control-plane.minikube.internal:12345 @@ -33,12 +39,6 @@ etcd: dataDir: /var/lib/minikube/etcd extraArgs: proxy-refresh-interval: "70000" -controllerManager: - extraArgs: - "leader-elect": "false" -scheduler: - extraArgs: - "leader-elect": "false" kubernetesVersion: v1.18.0 networking: dnsDomain: cluster.local diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd-pod-network-cidr.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd-pod-network-cidr.yaml index 4ef6e03203..979a943896 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd-pod-network-cidr.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd-pod-network-cidr.yaml @@ -23,6 +23,12 @@ 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: + leader-elect: "false" +scheduler: + extraArgs: + leader-elect: "false" certificatesDir: /var/lib/minikube/certs clusterName: mk controlPlaneEndpoint: control-plane.minikube.internal:8443 @@ -33,12 +39,6 @@ etcd: dataDir: /var/lib/minikube/etcd extraArgs: proxy-refresh-interval: "70000" -controllerManager: - extraArgs: - "leader-elect": "false" -scheduler: - extraArgs: - "leader-elect": "false" kubernetesVersion: v1.18.0 networking: dnsDomain: cluster.local diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd.yaml index ab01ac609f..c13bc4d030 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd.yaml @@ -23,6 +23,12 @@ 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: + leader-elect: "false" +scheduler: + extraArgs: + leader-elect: "false" certificatesDir: /var/lib/minikube/certs clusterName: mk controlPlaneEndpoint: control-plane.minikube.internal:8443 @@ -33,12 +39,6 @@ etcd: dataDir: /var/lib/minikube/etcd extraArgs: proxy-refresh-interval: "70000" -controllerManager: - extraArgs: - "leader-elect": "false" -scheduler: - extraArgs: - "leader-elect": "false" kubernetesVersion: v1.18.0 networking: dnsDomain: cluster.local diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio-options-gates.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio-options-gates.yaml index 5393f1ea8f..78f6655b66 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio-options-gates.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio-options-gates.yaml @@ -29,9 +29,11 @@ controllerManager: extraArgs: 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 @@ -43,12 +45,6 @@ etcd: dataDir: /var/lib/minikube/etcd extraArgs: proxy-refresh-interval: "70000" -controllerManager: - extraArgs: - "leader-elect": "false" -scheduler: - extraArgs: - "leader-elect": "false" kubernetesVersion: v1.18.0 networking: dnsDomain: cluster.local diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio.yaml index 8c904fafc8..33a8a87757 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio.yaml @@ -23,6 +23,12 @@ 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: + leader-elect: "false" +scheduler: + extraArgs: + leader-elect: "false" certificatesDir: /var/lib/minikube/certs clusterName: mk controlPlaneEndpoint: control-plane.minikube.internal:8443 @@ -33,12 +39,6 @@ etcd: dataDir: /var/lib/minikube/etcd extraArgs: proxy-refresh-interval: "70000" -controllerManager: - extraArgs: - "leader-elect": "false" -scheduler: - extraArgs: - "leader-elect": "false" kubernetesVersion: v1.18.0 networking: dnsDomain: cluster.local diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/default.yaml index 8f705884d8..edb2737949 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/default.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/default.yaml @@ -23,6 +23,12 @@ 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: + leader-elect: "false" +scheduler: + extraArgs: + leader-elect: "false" certificatesDir: /var/lib/minikube/certs clusterName: mk controlPlaneEndpoint: control-plane.minikube.internal:8443 @@ -33,12 +39,6 @@ etcd: dataDir: /var/lib/minikube/etcd extraArgs: proxy-refresh-interval: "70000" -controllerManager: - extraArgs: - "leader-elect": "false" -scheduler: - extraArgs: - "leader-elect": "false" kubernetesVersion: v1.18.0 networking: dnsDomain: cluster.local diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/dns.yaml index 08eca1ab6c..0ed2f3dcc3 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/dns.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/dns.yaml @@ -23,6 +23,12 @@ 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: + leader-elect: "false" +scheduler: + extraArgs: + leader-elect: "false" certificatesDir: /var/lib/minikube/certs clusterName: mk controlPlaneEndpoint: control-plane.minikube.internal:8443 @@ -33,12 +39,6 @@ etcd: dataDir: /var/lib/minikube/etcd extraArgs: proxy-refresh-interval: "70000" -controllerManager: - extraArgs: - "leader-elect": "false" -scheduler: - extraArgs: - "leader-elect": "false" kubernetesVersion: v1.18.0 networking: dnsDomain: 1.1.1.1 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/image-repository.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/image-repository.yaml index dd634650ff..3d73fb78bc 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/image-repository.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/image-repository.yaml @@ -24,6 +24,12 @@ 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: + leader-elect: "false" +scheduler: + extraArgs: + leader-elect: "false" certificatesDir: /var/lib/minikube/certs clusterName: mk controlPlaneEndpoint: control-plane.minikube.internal:8443 @@ -34,12 +40,6 @@ etcd: dataDir: /var/lib/minikube/etcd extraArgs: proxy-refresh-interval: "70000" -controllerManager: - extraArgs: - "leader-elect": "false" -scheduler: - extraArgs: - "leader-elect": "false" kubernetesVersion: v1.18.0 networking: dnsDomain: cluster.local diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/options.yaml index 782a74c8c3..c0ef89ccaa 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/options.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/options.yaml @@ -27,8 +27,10 @@ apiServer: controllerManager: extraArgs: kube-api-burst: "32" + leader-elect: "false" scheduler: extraArgs: + leader-elect: "false" scheduler-name: "mini-scheduler" certificatesDir: /var/lib/minikube/certs clusterName: mk @@ -40,12 +42,6 @@ etcd: dataDir: /var/lib/minikube/etcd extraArgs: proxy-refresh-interval: "70000" -controllerManager: - extraArgs: - "leader-elect": "false" -scheduler: - extraArgs: - "leader-elect": "false" kubernetesVersion: v1.18.0 networking: dnsDomain: cluster.local diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd-api-port.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd-api-port.yaml index 5c46412603..617e821e6b 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd-api-port.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd-api-port.yaml @@ -23,6 +23,12 @@ 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: + leader-elect: "false" +scheduler: + extraArgs: + leader-elect: "false" certificatesDir: /var/lib/minikube/certs clusterName: mk controlPlaneEndpoint: control-plane.minikube.internal:12345 @@ -33,12 +39,6 @@ etcd: dataDir: /var/lib/minikube/etcd extraArgs: proxy-refresh-interval: "70000" -controllerManager: - extraArgs: - "leader-elect": "false" -scheduler: - extraArgs: - "leader-elect": "false" kubernetesVersion: v1.19.0 networking: dnsDomain: cluster.local diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd-pod-network-cidr.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd-pod-network-cidr.yaml index 3270ee9112..d91d3e926e 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd-pod-network-cidr.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd-pod-network-cidr.yaml @@ -23,6 +23,12 @@ 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: + leader-elect: "false" +scheduler: + extraArgs: + leader-elect: "false" certificatesDir: /var/lib/minikube/certs clusterName: mk controlPlaneEndpoint: control-plane.minikube.internal:8443 @@ -33,12 +39,6 @@ etcd: dataDir: /var/lib/minikube/etcd extraArgs: proxy-refresh-interval: "70000" -controllerManager: - extraArgs: - "leader-elect": "false" -scheduler: - extraArgs: - "leader-elect": "false" kubernetesVersion: v1.19.0 networking: dnsDomain: cluster.local diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd.yaml index 944f6e3f37..6c12857ab2 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd.yaml @@ -23,6 +23,12 @@ 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: + leader-elect: "false" +scheduler: + extraArgs: + leader-elect: "false" certificatesDir: /var/lib/minikube/certs clusterName: mk controlPlaneEndpoint: control-plane.minikube.internal:8443 @@ -33,12 +39,6 @@ etcd: dataDir: /var/lib/minikube/etcd extraArgs: proxy-refresh-interval: "70000" -controllerManager: - extraArgs: - "leader-elect": "false" -scheduler: - extraArgs: - "leader-elect": "false" kubernetesVersion: v1.19.0 networking: dnsDomain: cluster.local diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio-options-gates.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio-options-gates.yaml index f2788b1449..1dcff3d334 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio-options-gates.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio-options-gates.yaml @@ -29,9 +29,11 @@ controllerManager: extraArgs: 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 @@ -43,12 +45,6 @@ etcd: dataDir: /var/lib/minikube/etcd extraArgs: proxy-refresh-interval: "70000" -controllerManager: - extraArgs: - "leader-elect": "false" -scheduler: - extraArgs: - "leader-elect": "false" kubernetesVersion: v1.19.0 networking: dnsDomain: cluster.local diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio.yaml index faca2cc7ce..751041646e 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio.yaml @@ -23,6 +23,12 @@ 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: + leader-elect: "false" +scheduler: + extraArgs: + leader-elect: "false" certificatesDir: /var/lib/minikube/certs clusterName: mk controlPlaneEndpoint: control-plane.minikube.internal:8443 @@ -33,12 +39,6 @@ etcd: dataDir: /var/lib/minikube/etcd extraArgs: proxy-refresh-interval: "70000" -controllerManager: - extraArgs: - "leader-elect": "false" -scheduler: - extraArgs: - "leader-elect": "false" kubernetesVersion: v1.19.0 networking: dnsDomain: cluster.local diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/default.yaml index 86d214edb6..da68c6fbcd 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/default.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/default.yaml @@ -23,6 +23,12 @@ 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: + leader-elect: "false" +scheduler: + extraArgs: + leader-elect: "false" certificatesDir: /var/lib/minikube/certs clusterName: mk controlPlaneEndpoint: control-plane.minikube.internal:8443 @@ -33,12 +39,6 @@ etcd: dataDir: /var/lib/minikube/etcd extraArgs: proxy-refresh-interval: "70000" -controllerManager: - extraArgs: - "leader-elect": "false" -scheduler: - extraArgs: - "leader-elect": "false" kubernetesVersion: v1.19.0 networking: dnsDomain: cluster.local diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/dns.yaml index b4d7860fea..cadb2556e0 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/dns.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/dns.yaml @@ -23,6 +23,12 @@ 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: + leader-elect: "false" +scheduler: + extraArgs: + leader-elect: "false" certificatesDir: /var/lib/minikube/certs clusterName: mk controlPlaneEndpoint: control-plane.minikube.internal:8443 @@ -33,12 +39,6 @@ etcd: dataDir: /var/lib/minikube/etcd extraArgs: proxy-refresh-interval: "70000" -controllerManager: - extraArgs: - "leader-elect": "false" -scheduler: - extraArgs: - "leader-elect": "false" kubernetesVersion: v1.19.0 networking: dnsDomain: 1.1.1.1 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/image-repository.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/image-repository.yaml index 933aaee359..be593e2fd0 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/image-repository.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/image-repository.yaml @@ -24,6 +24,12 @@ 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: + leader-elect: "false" +scheduler: + extraArgs: + leader-elect: "false" certificatesDir: /var/lib/minikube/certs clusterName: mk controlPlaneEndpoint: control-plane.minikube.internal:8443 @@ -34,12 +40,6 @@ etcd: dataDir: /var/lib/minikube/etcd extraArgs: proxy-refresh-interval: "70000" -controllerManager: - extraArgs: - "leader-elect": "false" -scheduler: - extraArgs: - "leader-elect": "false" kubernetesVersion: v1.19.0 networking: dnsDomain: cluster.local diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/options.yaml index 216b59b45d..f9bad9233f 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/options.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/options.yaml @@ -27,8 +27,10 @@ apiServer: controllerManager: extraArgs: kube-api-burst: "32" + leader-elect: "false" scheduler: extraArgs: + leader-elect: "false" scheduler-name: "mini-scheduler" certificatesDir: /var/lib/minikube/certs clusterName: mk @@ -40,12 +42,6 @@ etcd: dataDir: /var/lib/minikube/etcd extraArgs: proxy-refresh-interval: "70000" -controllerManager: - extraArgs: - "leader-elect": "false" -scheduler: - extraArgs: - "leader-elect": "false" kubernetesVersion: v1.19.0 networking: dnsDomain: cluster.local diff --git a/pkg/minikube/bootstrapper/bsutil/versions.go b/pkg/minikube/bootstrapper/bsutil/versions.go index 78e3c76e7a..6222380c8d 100644 --- a/pkg/minikube/bootstrapper/bsutil/versions.go +++ b/pkg/minikube/bootstrapper/bsutil/versions.go @@ -89,7 +89,6 @@ var versionSpecificOpts = []config.VersionedExtraOption{ }, GreaterThanOrEqual: semver.MustParse("1.14.0-alpha.0"), }, - { Option: config.ExtraOption{ Component: Kubelet, @@ -98,4 +97,20 @@ var versionSpecificOpts = []config.VersionedExtraOption{ }, LessThanOrEqual: semver.MustParse("1.11.1000"), }, + { + Option: config.ExtraOption{ + Component: ControllerManager, + Key: "leader-elect", + Value: "false", + }, + GreaterThanOrEqual: semver.MustParse("1.14.0"), + }, + { + Option: config.ExtraOption{ + Component: Scheduler, + Key: "leader-elect", + Value: "false", + }, + GreaterThanOrEqual: semver.MustParse("1.14.0"), + }, } From 3e79f85065baf6ed424b93f54c183cd8ee9f75d7 Mon Sep 17 00:00:00 2001 From: vinu2003 Date: Fri, 28 Aug 2020 17:55:26 +1000 Subject: [PATCH 18/21] start: fixed the type value for latest minikube version availability message --- pkg/minikube/notify/notify.go | 4 ++-- pkg/minikube/notify/notify_test.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/minikube/notify/notify.go b/pkg/minikube/notify/notify.go index 48e85fba9e..8bf34b96c2 100644 --- a/pkg/minikube/notify/notify.go +++ b/pkg/minikube/notify/notify.go @@ -67,8 +67,8 @@ func MaybePrintUpdateText(url string, lastUpdatePath string) bool { glog.Errorf("write time failed: %v", err) } url := "https://github.com/kubernetes/minikube/releases/tag/v" + latestVersion.String() - out.ErrT(style.Celebrate, `minikube {{.version}} is available! Download it: {{.url}}`, out.V{"version": latestVersion, "url": url}) - out.ErrT(style.Tip, "To disable this notice, run: 'minikube config set WantUpdateNotification false'\n") + out.T(style.Celebrate, `minikube {{.version}} is available! Download it: {{.url}}`, out.V{"version": latestVersion, "url": url}) + out.T(style.Tip, "To disable this notice, run: 'minikube config set WantUpdateNotification false'\n") return true } return false diff --git a/pkg/minikube/notify/notify_test.go b/pkg/minikube/notify/notify_test.go index 46e44d5589..85a135ca2a 100644 --- a/pkg/minikube/notify/notify_test.go +++ b/pkg/minikube/notify/notify_test.go @@ -154,7 +154,7 @@ func TestMaybePrintUpdateText(t *testing.T) { tempDir := tests.MakeTempDir() defer tests.RemoveTempDir(tempDir) outputBuffer := tests.NewFakeFile() - out.SetErrFile(outputBuffer) + out.SetOutFile(outputBuffer) var tc = []struct { len int From 2ec39f0ad6ccaded83e7dfa8635ee1ffcd541e7b Mon Sep 17 00:00:00 2001 From: Thomas Stromberg Date: Tue, 1 Sep 2020 10:59:27 -0700 Subject: [PATCH 19/21] Fix incorrect exit code for RsrcInsufficientDarwinDockerMemory --- 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 35a023091b..c5a96d9932 100644 --- a/pkg/minikube/reason/reason.go +++ b/pkg/minikube/reason/reason.go @@ -155,7 +155,7 @@ var ( } RsrcInsufficientDarwinDockerMemory = Kind{ ID: "RSRC_DOCKER_MEMORY", - ExitCode: ExInsufficientCores, + ExitCode: ExInsufficientMemory, Advice: `1. Click on "Docker for Desktop" menu icon 2. Click "Preferences" 3. Click "Resources" From 085bd38a092990a14d83ed478c366f4351af775c Mon Sep 17 00:00:00 2001 From: Thomas Stromberg Date: Tue, 1 Sep 2020 13:20:42 -0700 Subject: [PATCH 20/21] Improve none usage documentation --- pkg/minikube/reason/known_issues.go | 11 +++++++++++ .../en/docs/drivers/includes/none_usage.inc | 18 ++++++++++-------- 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/pkg/minikube/reason/known_issues.go b/pkg/minikube/reason/known_issues.go index b26c6df610..d83f6cdcf2 100644 --- a/pkg/minikube/reason/known_issues.go +++ b/pkg/minikube/reason/known_issues.go @@ -92,6 +92,17 @@ var resourceIssues = []match{ }, Regexp: re(`An existing connection was forcibly closed by the remote host`), }, + { + // Fallback to deliver a good error message even if internal checks are not run + Kind: Kind{ + ID: "RSRC_INSUFFICIENT_CORES", + ExitCode: ExInsufficientCores, + Advice: "Kubernetes requires at least 2 CPU's to start", + Issues: []int{7905}, + URL: "https://kubernetes.io/docs/setup/production-environment/tools/kubeadm/install-kubeadm/", + }, + Regexp: re(`ERROR.*the number of available CPUs 1 is less than the required 2`), + }, } // hostIssues are related to the host operating system or BIOS diff --git a/site/content/en/docs/drivers/includes/none_usage.inc b/site/content/en/docs/drivers/includes/none_usage.inc index bf36312abf..e1664e6199 100644 --- a/site/content/en/docs/drivers/includes/none_usage.inc +++ b/site/content/en/docs/drivers/includes/none_usage.inc @@ -2,16 +2,18 @@ A Linux VM with the following: -* Docker -* systemd (OpenRC based systems are also supported in v1.10+) +* systemd or OpenRC +* a container runtime, such as Docker or CRIO -This VM must also meet the [kubeadm requirements.](https://kubernetes.io/docs/setup/production-environment/tools/kubeadm/install-kubeadm/) +This VM must also meet the [kubeadm requirements](https://kubernetes.io/docs/setup/production-environment/tools/kubeadm/install-kubeadm/), such as: -Kubernetes v1.18+ needs conntract to be installed on debian based machines. - -```shell - sudo apt-get install conntrack -y -``` +* 2 CPU's +* 2GB RAM +* iptables (in legacy mode) +* conntrack +* crictl +* SELinux permissive +* cgroups v1 (v2 is not yet supported by Kubernetes) ## Usage From 0408d3ba1a8250c928d19b98d4a85a9f34b8b3b8 Mon Sep 17 00:00:00 2001 From: Pablo Caderno Date: Sat, 22 Aug 2020 17:22:02 +1000 Subject: [PATCH 21/21] Added code to inspect docker networks to get the bridgeID correctly Signed-off-by: Pablo Caderno --- pkg/drivers/kic/oci/network.go | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/pkg/drivers/kic/oci/network.go b/pkg/drivers/kic/oci/network.go index dc905a2777..d41e8729fd 100644 --- a/pkg/drivers/kic/oci/network.go +++ b/pkg/drivers/kic/oci/network.go @@ -58,9 +58,20 @@ func digDNS(ociBin, containerName, dns string) (net.IP, error) { return ip, nil } +// profileInContainers checks whether the profile is within the containers list +func profileInContainers(profile string, containers []string) bool { + for _, container := range containers { + if container == profile { + return true + } + } + return false +} + // dockerGatewayIP gets the default gateway ip for the docker bridge on the user's host machine // gets the ip from user's host docker func dockerGatewayIP(profile string) (net.IP, error) { + var bridgeID string // check if using custom network first if networkExists(profile) { ip := net.ParseIP(DefaultGateway) @@ -70,8 +81,25 @@ func dockerGatewayIP(profile string) (net.IP, error) { if err != nil { return nil, errors.Wrapf(err, "get network bridge") } + networksOutput := strings.TrimSpace(rr.Stdout.String()) + networksSlice := strings.Fields(networksOutput) + // Look for the minikube container within each docker network + for _, net := range networksSlice { + // get all containers in the network + rs, err := runCmd(exec.Command(Docker, "network", "inspect", net, "-f", "{{range $k, $v := .Containers}}{{$v.Name}} {{end}}")) + if err != nil { + return nil, errors.Wrapf(err, "get containers in network") + } + containersSlice := strings.Fields(rs.Stdout.String()) + if profileInContainers(profile, containersSlice) { + bridgeID = net + break + } + } - bridgeID := strings.TrimSpace(rr.Stdout.String()) + if bridgeID == "" { + return nil, errors.Errorf("unable to determine bridge network id from %q", networksOutput) + } rr, err = runCmd(exec.Command(Docker, "network", "inspect", "--format", "{{(index .IPAM.Config 0).Gateway}}", bridgeID)) if err != nil {