v1-12-0.patch

diff --git a/pkg/minikube/bootstrapper/kubeadm/templates.go b/pkg/minikube/bootstrapper/kubeadm/templates.go
index cbb3f2bce..b60dce984 100644
--- a/pkg/minikube/bootstrapper/kubeadm/templates.go
+++ b/pkg/minikube/bootstrapper/kubeadm/templates.go
@@ -24,7 +24,7 @@ import (

 var kubeadmConfigTemplate = template.Must(template.New("kubeadmConfigTemplate").Funcs(template.FuncMap{
        "printMapInOrder": printMapInOrder,
-}).Parse(`apiVersion: kubeadm.k8s.io/v1alpha1
+}).Parse(`apiVersion: kubeadm.k8s.io/v1alpha2
 kind: MasterConfiguration
 {{if .NoTaintMaster}}noTaintMaster: true{{end}}
 api:
diff --git a/pkg/minikube/bootstrapper/kubeadm/versions.go b/pkg/minikube/bootstrapper/kubeadm/versions.go
index 4d92bc043..4d13cf2a1 100644
--- a/pkg/minikube/bootstrapper/kubeadm/versions.go
+++ b/pkg/minikube/bootstrapper/kubeadm/versions.go
@@ -241,7 +241,6 @@ var versionSpecificOpts = []VersionedExtraOption{
        NewUnversionedOption(Kubelet, "client-ca-file", path.Join(util.DefaultCertPath, "ca.crt")),

        // Cgroup args
-       NewUnversionedOption(Kubelet, "cadvisor-port", "0"),
        NewUnversionedOption(Kubelet, "cgroup-driver", "cgroupfs"),
        {
                Option: util.ExtraOption{