kubernetes
/
minikube
mirror of https://github.com/kubernetes/minikube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into nsswitch

pull/9029/head
Thomas Stromberg 2020-08-21 14:22:15 -07:00
parent 2e122e6768 e108abc4e0
commit 024051b116
36 changed files with 96 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/minikube/cmd/start_flags.go
View File

@ -227,14 +227,14 @@ func generateClusterConfig(cmd *cobra.Command, existing *config.ClusterConfig, k
mem := suggestMemoryAllocation(sysLimit, containerLimit, viper.GetInt(nodes))
if cmd.Flags().Changed(memory) {
mem, err := pkgutil.CalculateSizeInMB(viper.GetString(memory))
var err error
mem, err = pkgutil.CalculateSizeInMB(viper.GetString(memory))
if err != nil {
exit.WithCodeT(exit.Config, "Generate unable to parse memory '{{.memory}}': {{.error}}", out.V{"memory": viper.GetString(memory), "error": err})
}
if driver.IsKIC(drvName) && mem > containerLimit {
exit.UsageT("{{.driver_name}} has only {{.container_limit}}MB memory but you specified {{.specified_memory}}MB", out.V{"container_limit": containerLimit, "specified_memory": mem, "driver_name": driver.FullName(drvName)})
}
} else {
validateMemorySize(mem, drvName)
glog.Infof("Using suggested %dMB memory alloc based on sys=%dMB, container=%dMB", mem, sysLimit, containerLimit)

8
cmd/minikube/cmd/stop.go
View File

@ -38,6 +38,7 @@ import (
)
var stopAll bool
var keepActive bool
// stopCmd represents the stop command
var stopCmd = &cobra.Command{
@ -51,6 +52,7 @@ itself, leaving all files intact. The cluster can be started again with the "sta
func init() {
stopCmd.Flags().BoolVar(&stopAll, "all", false, "Set flag to stop all profiles (clusters)")
stopCmd.Flags().BoolVar(&keepActive, "keep-context-active", false, "keep the kube-context active after cluster is stopped. Defaults to false.")
if err := viper.GetViper().BindPFlags(stopCmd.Flags()); err != nil {
exit.WithError("unable to bind flags", err)
@ -111,8 +113,10 @@ func stopProfile(profile string) int {
out.WarningT("Unable to kill mount process: {{.error}}", out.V{"error": err})
}
if err := kubeconfig.UnsetCurrentContext(profile, kubeconfig.PathFromEnv()); err != nil {
exit.WithError("update config", err)
if !keepActive {
if err := kubeconfig.UnsetCurrentContext(profile, kubeconfig.PathFromEnv()); err != nil {
exit.WithError("update config", err)
}
}
return stoppedNodes

10
deploy/addons/ingress-dns/README.md
View File

@ -87,6 +87,16 @@ TODO add supporting docs for Linux OS that do not use `systemctl`
See https://linux.die.net/man/5/resolver
When you are using Network Manager with the dnsmasq plugin, you can add an additional configuration file, but you need
to restart NetworkManager to activate the change.
```bash
echo "server=/test/$(minikube ip)" >/etc/NetworkManager/dnsmasq.d/minikube.conf
systemctl restart NetworkManager.service
```
Also see `dns=` in [NetworkManager.conf](https://developer.gnome.org/NetworkManager/stable/NetworkManager.conf.html).
#### Windows
TODO

3
pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta2.go
View File

@ -63,12 +63,11 @@ dns:
etcd:
local:
dataDir: {{.EtcdDataDir}}
{{- if .EtcdExtraArgs}}
extraArgs:
proxy-refresh-interval: "70000"
{{- range $i, $val := printMapInOrder .EtcdExtraArgs ": " }}
{{$val}}
{{- end}}
{{- end}}
controllerManager:
extraArgs:
"leader-elect": "false"

2
pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd-api-port.yaml vendored
View File

@ -31,6 +31,8 @@ dns:
etcd:
local:
dataDir: /var/lib/minikube/etcd
extraArgs:
proxy-refresh-interval: "70000"
controllerManager:
extraArgs:
"leader-elect": "false"

2
pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd-pod-network-cidr.yaml vendored
View File

@ -31,6 +31,8 @@ dns:
etcd:
local:
dataDir: /var/lib/minikube/etcd
extraArgs:
proxy-refresh-interval: "70000"
controllerManager:
extraArgs:
"leader-elect": "false"

2
pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd.yaml vendored
View File

@ -31,6 +31,8 @@ dns:
etcd:
local:
dataDir: /var/lib/minikube/etcd
extraArgs:
proxy-refresh-interval: "70000"
controllerManager:
extraArgs:
"leader-elect": "false"

2
pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio-options-gates.yaml vendored
View File

@ -41,6 +41,8 @@ dns:
etcd:
local:
dataDir: /var/lib/minikube/etcd
extraArgs:
proxy-refresh-interval: "70000"
controllerManager:
extraArgs:
"leader-elect": "false"

2
pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio.yaml vendored
View File

@ -31,6 +31,8 @@ dns:
etcd:
local:
dataDir: /var/lib/minikube/etcd
extraArgs:
proxy-refresh-interval: "70000"
controllerManager:
extraArgs:
"leader-elect": "false"

2
pkg/minikube/bootstrapper/bsutil/testdata/v1.17/default.yaml vendored
View File

@ -31,6 +31,8 @@ dns:
etcd:
local:
dataDir: /var/lib/minikube/etcd
extraArgs:
proxy-refresh-interval: "70000"
controllerManager:
extraArgs:
"leader-elect": "false"

2
pkg/minikube/bootstrapper/bsutil/testdata/v1.17/dns.yaml vendored
View File

@ -31,6 +31,8 @@ dns:
etcd:
local:
dataDir: /var/lib/minikube/etcd
extraArgs:
proxy-refresh-interval: "70000"
controllerManager:
extraArgs:
"leader-elect": "false"

2
pkg/minikube/bootstrapper/bsutil/testdata/v1.17/image-repository.yaml vendored
View File

@ -32,6 +32,8 @@ dns:
etcd:
local:
dataDir: /var/lib/minikube/etcd
extraArgs:
proxy-refresh-interval: "70000"
controllerManager:
extraArgs:
"leader-elect": "false"

2
pkg/minikube/bootstrapper/bsutil/testdata/v1.17/options.yaml vendored
View File

@ -38,6 +38,8 @@ dns:
etcd:
local:
dataDir: /var/lib/minikube/etcd
extraArgs:
proxy-refresh-interval: "70000"
controllerManager:
extraArgs:
"leader-elect": "false"

2
pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd-api-port.yaml vendored
View File

@ -31,6 +31,8 @@ dns:
etcd:
local:
dataDir: /var/lib/minikube/etcd
extraArgs:
proxy-refresh-interval: "70000"
controllerManager:
extraArgs:
"leader-elect": "false"

2
pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd-pod-network-cidr.yaml vendored
View File

@ -31,6 +31,8 @@ dns:
etcd:
local:
dataDir: /var/lib/minikube/etcd
extraArgs:
proxy-refresh-interval: "70000"
controllerManager:
extraArgs:
"leader-elect": "false"

2
pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd.yaml vendored
View File

@ -31,6 +31,8 @@ dns:
etcd:
local:
dataDir: /var/lib/minikube/etcd
extraArgs:
proxy-refresh-interval: "70000"
controllerManager:
extraArgs:
"leader-elect": "false"

2
pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio-options-gates.yaml vendored
View File

@ -41,6 +41,8 @@ dns:
etcd:
local:
dataDir: /var/lib/minikube/etcd
extraArgs:
proxy-refresh-interval: "70000"
controllerManager:
extraArgs:
"leader-elect": "false"

2
pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio.yaml vendored
View File

@ -31,6 +31,8 @@ dns:
etcd:
local:
dataDir: /var/lib/minikube/etcd
extraArgs:
proxy-refresh-interval: "70000"
controllerManager:
extraArgs:
"leader-elect": "false"

2
pkg/minikube/bootstrapper/bsutil/testdata/v1.18/default.yaml vendored
View File

@ -31,6 +31,8 @@ dns:
etcd:
local:
dataDir: /var/lib/minikube/etcd
extraArgs:
proxy-refresh-interval: "70000"
controllerManager:
extraArgs:
"leader-elect": "false"

2
pkg/minikube/bootstrapper/bsutil/testdata/v1.18/dns.yaml vendored
View File

@ -31,6 +31,8 @@ dns:
etcd:
local:
dataDir: /var/lib/minikube/etcd
extraArgs:
proxy-refresh-interval: "70000"
controllerManager:
extraArgs:
"leader-elect": "false"

2
pkg/minikube/bootstrapper/bsutil/testdata/v1.18/image-repository.yaml vendored
View File

@ -32,6 +32,8 @@ dns:
etcd:
local:
dataDir: /var/lib/minikube/etcd
extraArgs:
proxy-refresh-interval: "70000"
controllerManager:
extraArgs:
"leader-elect": "false"

2
pkg/minikube/bootstrapper/bsutil/testdata/v1.18/options.yaml vendored
View File

@ -38,6 +38,8 @@ dns:
etcd:
local:
dataDir: /var/lib/minikube/etcd
extraArgs:
proxy-refresh-interval: "70000"
controllerManager:
extraArgs:
"leader-elect": "false"

2
pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd-api-port.yaml vendored
View File

@ -31,6 +31,8 @@ dns:
etcd:
local:
dataDir: /var/lib/minikube/etcd
extraArgs:
proxy-refresh-interval: "70000"
controllerManager:
extraArgs:
"leader-elect": "false"

2
pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd-pod-network-cidr.yaml vendored
View File

@ -31,6 +31,8 @@ dns:
etcd:
local:
dataDir: /var/lib/minikube/etcd
extraArgs:
proxy-refresh-interval: "70000"
controllerManager:
extraArgs:
"leader-elect": "false"

2
pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd.yaml vendored
View File

@ -31,6 +31,8 @@ dns:
etcd:
local:
dataDir: /var/lib/minikube/etcd
extraArgs:
proxy-refresh-interval: "70000"
controllerManager:
extraArgs:
"leader-elect": "false"

2
pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio-options-gates.yaml vendored
View File

@ -41,6 +41,8 @@ dns:
etcd:
local:
dataDir: /var/lib/minikube/etcd
extraArgs:
proxy-refresh-interval: "70000"
controllerManager:
extraArgs:
"leader-elect": "false"

2
pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio.yaml vendored
View File

@ -31,6 +31,8 @@ dns:
etcd:
local:
dataDir: /var/lib/minikube/etcd
extraArgs:
proxy-refresh-interval: "70000"
controllerManager:
extraArgs:
"leader-elect": "false"

2
pkg/minikube/bootstrapper/bsutil/testdata/v1.19/default.yaml vendored
View File

@ -31,6 +31,8 @@ dns:
etcd:
local:
dataDir: /var/lib/minikube/etcd
extraArgs:
proxy-refresh-interval: "70000"
controllerManager:
extraArgs:
"leader-elect": "false"

2
pkg/minikube/bootstrapper/bsutil/testdata/v1.19/dns.yaml vendored
View File

@ -31,6 +31,8 @@ dns:
etcd:
local:
dataDir: /var/lib/minikube/etcd
extraArgs:
proxy-refresh-interval: "70000"
controllerManager:
extraArgs:
"leader-elect": "false"

2
pkg/minikube/bootstrapper/bsutil/testdata/v1.19/image-repository.yaml vendored
View File

@ -32,6 +32,8 @@ dns:
etcd:
local:
dataDir: /var/lib/minikube/etcd
extraArgs:
proxy-refresh-interval: "70000"
controllerManager:
extraArgs:
"leader-elect": "false"

2
pkg/minikube/bootstrapper/bsutil/testdata/v1.19/options.yaml vendored
View File

@ -38,6 +38,8 @@ dns:
etcd:
local:
dataDir: /var/lib/minikube/etcd
extraArgs:
proxy-refresh-interval: "70000"
controllerManager:
extraArgs:
"leader-elect": "false"

8
pkg/minikube/bootstrapper/images/images.go
View File

@ -66,8 +66,10 @@ func componentImage(name string, v semver.Version, mirror string) string {
func coreDNS(v semver.Version, mirror string) string {
// Should match `CoreDNSVersion` in
// https://github.com/kubernetes/kubernetes/blob/master/cmd/kubeadm/app/constants/constants.go
cv := "1.6.7"
cv := "1.7.0"
switch v.Minor {
case 18:
cv = "1.6.7"
case 17:
cv = "1.6.5"
case 16:
@ -94,8 +96,10 @@ func etcd(v semver.Version, mirror string) string {
// Should match `DefaultEtcdVersion` in:
// https://github.com/kubernetes/kubernetes/blob/master/cmd/kubeadm/app/constants/constants.go
ev := "3.4.3-0"
ev := "3.4.9-1"
switch v.Minor {
case 17, 18:
ev = "3.4.3-0"
case 16:
ev = "3.3.15-0"
case 14, 15:

11
pkg/minikube/cni/flannel.go
View File

@ -18,9 +18,12 @@ package cni
import (
"os/exec"
"path/filepath"
"github.com/golang/glog"
"github.com/pkg/errors"
"k8s.io/minikube/pkg/minikube/config"
"k8s.io/minikube/pkg/minikube/driver"
)
// From https://raw.githubusercontent.com/coreos/flannel/master/Documentation/kube-flannel.yml
@ -646,6 +649,14 @@ func (c Flannel) Apply(r Runner) error {
return errors.Wrap(err, "required 'portmap' CNI plug-in not found")
}
if driver.IsKIC(c.cc.Driver) {
conflict := "/etc/cni/net.d/100-crio-bridge.conf"
_, err := r.RunCmd(exec.Command("sudo", "mv", conflict, filepath.Join(filepath.Dir(conflict), "DISABLED-"+filepath.Base(conflict))))
if err != nil {
glog.Errorf("unable to disable %s: %v", conflict, err)
}
}
return applyManifest(c.cc, r, manifestAsset([]byte(flannelTmpl)))
}

3
pkg/minikube/constants/constants.go
View File

@ -29,7 +29,8 @@ const (
// DefaultKubernetesVersion is the default Kubernetes version
DefaultKubernetesVersion = "v1.18.3"
// NewestKubernetesVersion is the newest Kubernetes version to test against
NewestKubernetesVersion = "v1.18.4-rc.0"
// NOTE: You may need to update coreDNS & etcd versions in pkg/minikube/bootstrapper/images/images.go
NewestKubernetesVersion = "v1.19.0-rc.4"
// OldestKubernetesVersion is the oldest Kubernetes version to test against
OldestKubernetesVersion = "v1.13.0"
// DefaultClusterName is the default nane for the k8s cluster

2
site/content/en/docs/commands/start.md
View File

@ -68,7 +68,7 @@ minikube start [flags]
--interactive Allow user prompts for more information (default true)
--iso-url strings Locations to fetch the minikube ISO from. (default [https://storage.googleapis.com/minikube/iso/minikube-v1.12.2.iso,https://github.com/kubernetes/minikube/releases/download/v1.12.2/minikube-v1.12.2.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.12.2.iso])
--keep-context This will keep the existing kubectl context and will create a minikube context.
--kubernetes-version string The Kubernetes version that the minikube VM will use (ex: v1.2.3, 'stable' for v1.18.3, 'latest' for v1.18.4-rc.0). Defaults to 'stable'.
--kubernetes-version string The Kubernetes version that the minikube VM will use (ex: v1.2.3, 'stable' for v1.18.3, 'latest' for v1.19.0-rc.4). Defaults to 'stable'.
--kvm-gpu Enable experimental NVIDIA GPU support in minikube
--kvm-hidden Hide the hypervisor signature from the guest in minikube (kvm2 driver only)
--kvm-network string The KVM network name. (kvm2 driver only) (default "default")

5
site/content/en/docs/commands/stop.md
View File

@ -22,8 +22,9 @@ minikube stop [flags]
### Options
```
--all Set flag to stop all profiles (clusters)
-h, --help help for stop
--all Set flag to stop all profiles (clusters)
-h, --help help for stop
--keep-context-active keep the kube-context active after cluster is stopped. Defaults to false.
```
### Options inherited from parent commands