From aebcec7bd0097034d603508d17639d9186d3787a Mon Sep 17 00:00:00 2001 From: fenglixa Date: Tue, 11 Jun 2019 21:11:31 +0800 Subject: [PATCH] update for support k8s_v1.15.0-beta.1 --- pkg/minikube/bootstrapper/kubeadm/kubeadm_test.go | 2 +- pkg/minikube/bootstrapper/kubeadm/versions.go | 9 ++++++++- pkg/minikube/constants/constants.go | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/pkg/minikube/bootstrapper/kubeadm/kubeadm_test.go b/pkg/minikube/bootstrapper/kubeadm/kubeadm_test.go index 7785cb8f5223..2261b9cb14c7 100644 --- a/pkg/minikube/bootstrapper/kubeadm/kubeadm_test.go +++ b/pkg/minikube/bootstrapper/kubeadm/kubeadm_test.go @@ -75,7 +75,7 @@ Wants=crio.service [Service] ExecStart= -ExecStart=/usr/bin/kubelet --allow-privileged=true --authorization-mode=Webhook --bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf --cgroup-driver=cgroupfs --client-ca-file=/var/lib/minikube/certs/ca.crt --cluster-dns=10.96.0.10 --cluster-domain=cluster.local --container-runtime=remote --container-runtime-endpoint=/var/run/crio/crio.sock --fail-swap-on=false --hostname-override=minikube --image-service-endpoint=/var/run/crio/crio.sock --kubeconfig=/etc/kubernetes/kubelet.conf --pod-manifest-path=/etc/kubernetes/manifests --runtime-request-timeout=15m +ExecStart=/usr/bin/kubelet --authorization-mode=Webhook --bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf --cgroup-driver=cgroupfs --client-ca-file=/var/lib/minikube/certs/ca.crt --cluster-dns=10.96.0.10 --cluster-domain=cluster.local --container-runtime=remote --container-runtime-endpoint=/var/run/crio/crio.sock --fail-swap-on=false --hostname-override=minikube --image-service-endpoint=/var/run/crio/crio.sock --kubeconfig=/etc/kubernetes/kubelet.conf --pod-manifest-path=/etc/kubernetes/manifests --runtime-request-timeout=15m [Install] `, diff --git a/pkg/minikube/bootstrapper/kubeadm/versions.go b/pkg/minikube/bootstrapper/kubeadm/versions.go index 18563c0ac38e..2c7c9a97f991 100644 --- a/pkg/minikube/bootstrapper/kubeadm/versions.go +++ b/pkg/minikube/bootstrapper/kubeadm/versions.go @@ -242,7 +242,14 @@ var versionSpecificOpts = []VersionedExtraOption{ // System pods args NewUnversionedOption(Kubelet, "pod-manifest-path", "/etc/kubernetes/manifests"), - NewUnversionedOption(Kubelet, "allow-privileged", "true"), + { + Option: util.ExtraOption{ + Component: Kubelet, + Key: "allow-privileged", + Value: "true", + }, + LessThanOrEqual: semver.MustParse("1.15.0-alpha.3"), + }, // Network args NewUnversionedOption(Kubelet, "cluster-dns", "10.96.0.10"), diff --git a/pkg/minikube/constants/constants.go b/pkg/minikube/constants/constants.go index 1a3453b896c2..b40a26be57ec 100644 --- a/pkg/minikube/constants/constants.go +++ b/pkg/minikube/constants/constants.go @@ -165,7 +165,7 @@ var DefaultISOSHAURL = DefaultISOURL + SHASuffix var DefaultKubernetesVersion = "v1.14.3" // NewestKubernetesVersion is the newest Kubernetes version to test against -var NewestKubernetesVersion = "v1.14.3" +var NewestKubernetesVersion = "v1.15.0-beta.1" // OldestKubernetesVersion is the oldest Kubernetes version to test against var OldestKubernetesVersion = "v1.10.13"