Skip to content

Commit ead11c6

Browse files
authored
Merge pull request #9897 from medyagh/update_k8s_version20
update default kubernetes version to 1.20.0
2 parents 6eadee3 + 34ff43c commit ead11c6

File tree

11 files changed

+12
-12
lines changed

11 files changed

+12
-12
lines changed

pkg/minikube/bootstrapper/bsutil/testdata/v1.20/containerd-api-port.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ etcd:
3939
dataDir: /var/lib/minikube/etcd
4040
extraArgs:
4141
proxy-refresh-interval: "70000"
42-
kubernetesVersion: v1.20.0-beta.1
42+
kubernetesVersion: v1.20.0
4343
networking:
4444
dnsDomain: cluster.local
4545
podSubnet: "10.244.0.0/16"

pkg/minikube/bootstrapper/bsutil/testdata/v1.20/containerd-pod-network-cidr.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ etcd:
3939
dataDir: /var/lib/minikube/etcd
4040
extraArgs:
4141
proxy-refresh-interval: "70000"
42-
kubernetesVersion: v1.20.0-beta.1
42+
kubernetesVersion: v1.20.0
4343
networking:
4444
dnsDomain: cluster.local
4545
podSubnet: "192.168.32.0/20"

pkg/minikube/bootstrapper/bsutil/testdata/v1.20/containerd.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ etcd:
3939
dataDir: /var/lib/minikube/etcd
4040
extraArgs:
4141
proxy-refresh-interval: "70000"
42-
kubernetesVersion: v1.20.0-beta.1
42+
kubernetesVersion: v1.20.0
4343
networking:
4444
dnsDomain: cluster.local
4545
podSubnet: "10.244.0.0/16"

pkg/minikube/bootstrapper/bsutil/testdata/v1.20/crio-options-gates.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ etcd:
4545
dataDir: /var/lib/minikube/etcd
4646
extraArgs:
4747
proxy-refresh-interval: "70000"
48-
kubernetesVersion: v1.20.0-beta.1
48+
kubernetesVersion: v1.20.0
4949
networking:
5050
dnsDomain: cluster.local
5151
podSubnet: "10.244.0.0/16"

pkg/minikube/bootstrapper/bsutil/testdata/v1.20/crio.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ etcd:
3939
dataDir: /var/lib/minikube/etcd
4040
extraArgs:
4141
proxy-refresh-interval: "70000"
42-
kubernetesVersion: v1.20.0-beta.1
42+
kubernetesVersion: v1.20.0
4343
networking:
4444
dnsDomain: cluster.local
4545
podSubnet: "10.244.0.0/16"

pkg/minikube/bootstrapper/bsutil/testdata/v1.20/default.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ etcd:
3939
dataDir: /var/lib/minikube/etcd
4040
extraArgs:
4141
proxy-refresh-interval: "70000"
42-
kubernetesVersion: v1.20.0-beta.1
42+
kubernetesVersion: v1.20.0
4343
networking:
4444
dnsDomain: cluster.local
4545
podSubnet: "10.244.0.0/16"

pkg/minikube/bootstrapper/bsutil/testdata/v1.20/dns.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ etcd:
3939
dataDir: /var/lib/minikube/etcd
4040
extraArgs:
4141
proxy-refresh-interval: "70000"
42-
kubernetesVersion: v1.20.0-beta.1
42+
kubernetesVersion: v1.20.0
4343
networking:
4444
dnsDomain: 1.1.1.1
4545
podSubnet: "10.244.0.0/16"

pkg/minikube/bootstrapper/bsutil/testdata/v1.20/image-repository.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ etcd:
4040
dataDir: /var/lib/minikube/etcd
4141
extraArgs:
4242
proxy-refresh-interval: "70000"
43-
kubernetesVersion: v1.20.0-beta.1
43+
kubernetesVersion: v1.20.0
4444
networking:
4545
dnsDomain: cluster.local
4646
podSubnet: "10.244.0.0/16"

pkg/minikube/bootstrapper/bsutil/testdata/v1.20/options.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ etcd:
4242
dataDir: /var/lib/minikube/etcd
4343
extraArgs:
4444
proxy-refresh-interval: "70000"
45-
kubernetesVersion: v1.20.0-beta.1
45+
kubernetesVersion: v1.20.0
4646
networking:
4747
dnsDomain: cluster.local
4848
podSubnet: "10.244.0.0/16"

pkg/minikube/constants/constants.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ import (
2727

2828
const (
2929
// DefaultKubernetesVersion is the default Kubernetes version
30-
DefaultKubernetesVersion = "v1.19.4"
30+
DefaultKubernetesVersion = "v1.20.0"
3131
// NewestKubernetesVersion is the newest Kubernetes version to test against
3232
// NOTE: You may need to update coreDNS & etcd versions in pkg/minikube/bootstrapper/images/images.go
33-
NewestKubernetesVersion = "v1.20.0-beta.1"
33+
NewestKubernetesVersion = "v1.20.0"
3434
// OldestKubernetesVersion is the oldest Kubernetes version to test against
3535
OldestKubernetesVersion = "v1.13.0"
3636
// DefaultClusterName is the default nane for the k8s cluster

site/content/en/docs/commands/start.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ minikube start [flags]
6666
--interactive Allow user prompts for more information (default true)
6767
--iso-url strings Locations to fetch the minikube ISO from. (default [https://storage.googleapis.com/minikube/iso/minikube-v1.16.0-snapshot1.iso,https://github.com/kubernetes/minikube/releases/download/v1.16.0-snapshot1/minikube-v1.16.0-snapshot1.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.16.0-snapshot1.iso])
6868
--keep-context This will keep the existing kubectl context and will create a minikube context.
69-
--kubernetes-version string The Kubernetes version that the minikube VM will use (ex: v1.2.3, 'stable' for v1.19.4, 'latest' for v1.20.0-beta.1). Defaults to 'stable'.
69+
--kubernetes-version string The Kubernetes version that the minikube VM will use (ex: v1.2.3, 'stable' for v1.20.0, 'latest' for v1.20.0). Defaults to 'stable'.
7070
--kvm-gpu Enable experimental NVIDIA GPU support in minikube
7171
--kvm-hidden Hide the hypervisor signature from the guest in minikube (kvm2 driver only)
7272
--kvm-network string The KVM network name. (kvm2 driver only) (default "default")

0 commit comments

Comments
 (0)