From edee1c7bbdd89693b2da5f0115397b1328ca15a2 Mon Sep 17 00:00:00 2001 From: Thomas Stromberg Date: Thu, 20 Jun 2019 07:36:07 +0800 Subject: [PATCH 1/4] Update Kubernetes default version to v1.15.0 --- .../kubeadm/testdata/containerd-api-port__default.yaml | 2 +- .../testdata/containerd-pod-network-cidr__default.yaml | 2 +- .../bootstrapper/kubeadm/testdata/containerd__default.yaml | 2 +- .../kubeadm/testdata/crio-options-gates__default.yaml | 2 +- pkg/minikube/bootstrapper/kubeadm/testdata/crio__default.yaml | 2 +- .../bootstrapper/kubeadm/testdata/default__default.yaml | 2 +- .../kubeadm/testdata/image-repository__default.yaml | 2 +- .../bootstrapper/kubeadm/testdata/options__default.yaml | 2 +- pkg/minikube/constants/constants.go | 4 ++-- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkg/minikube/bootstrapper/kubeadm/testdata/containerd-api-port__default.yaml b/pkg/minikube/bootstrapper/kubeadm/testdata/containerd-api-port__default.yaml index f6b37397cae5..0fbf400ebf03 100644 --- a/pkg/minikube/bootstrapper/kubeadm/testdata/containerd-api-port__default.yaml +++ b/pkg/minikube/bootstrapper/kubeadm/testdata/containerd-api-port__default.yaml @@ -28,7 +28,7 @@ dns: etcd: local: dataDir: /data/minikube -kubernetesVersion: v1.14.3 +kubernetesVersion: v1.15.0 networking: dnsDomain: cluster.local podSubnet: "" diff --git a/pkg/minikube/bootstrapper/kubeadm/testdata/containerd-pod-network-cidr__default.yaml b/pkg/minikube/bootstrapper/kubeadm/testdata/containerd-pod-network-cidr__default.yaml index f11516f99dc7..c6354e860bcb 100644 --- a/pkg/minikube/bootstrapper/kubeadm/testdata/containerd-pod-network-cidr__default.yaml +++ b/pkg/minikube/bootstrapper/kubeadm/testdata/containerd-pod-network-cidr__default.yaml @@ -28,7 +28,7 @@ dns: etcd: local: dataDir: /data/minikube -kubernetesVersion: v1.14.3 +kubernetesVersion: v1.15.0 networking: dnsDomain: cluster.local podSubnet: "" diff --git a/pkg/minikube/bootstrapper/kubeadm/testdata/containerd__default.yaml b/pkg/minikube/bootstrapper/kubeadm/testdata/containerd__default.yaml index f11516f99dc7..c6354e860bcb 100644 --- a/pkg/minikube/bootstrapper/kubeadm/testdata/containerd__default.yaml +++ b/pkg/minikube/bootstrapper/kubeadm/testdata/containerd__default.yaml @@ -28,7 +28,7 @@ dns: etcd: local: dataDir: /data/minikube -kubernetesVersion: v1.14.3 +kubernetesVersion: v1.15.0 networking: dnsDomain: cluster.local podSubnet: "" diff --git a/pkg/minikube/bootstrapper/kubeadm/testdata/crio-options-gates__default.yaml b/pkg/minikube/bootstrapper/kubeadm/testdata/crio-options-gates__default.yaml index cdef8bafa1aa..78bbe09f1ce6 100644 --- a/pkg/minikube/bootstrapper/kubeadm/testdata/crio-options-gates__default.yaml +++ b/pkg/minikube/bootstrapper/kubeadm/testdata/crio-options-gates__default.yaml @@ -38,7 +38,7 @@ dns: etcd: local: dataDir: /data/minikube -kubernetesVersion: v1.14.3 +kubernetesVersion: v1.15.0 networking: dnsDomain: cluster.local podSubnet: "" diff --git a/pkg/minikube/bootstrapper/kubeadm/testdata/crio__default.yaml b/pkg/minikube/bootstrapper/kubeadm/testdata/crio__default.yaml index bf8ba7daefa5..b956109b8178 100644 --- a/pkg/minikube/bootstrapper/kubeadm/testdata/crio__default.yaml +++ b/pkg/minikube/bootstrapper/kubeadm/testdata/crio__default.yaml @@ -28,7 +28,7 @@ dns: etcd: local: dataDir: /data/minikube -kubernetesVersion: v1.14.3 +kubernetesVersion: v1.15.0 networking: dnsDomain: cluster.local podSubnet: "" diff --git a/pkg/minikube/bootstrapper/kubeadm/testdata/default__default.yaml b/pkg/minikube/bootstrapper/kubeadm/testdata/default__default.yaml index d2dc46469314..46d6e4e78ca0 100644 --- a/pkg/minikube/bootstrapper/kubeadm/testdata/default__default.yaml +++ b/pkg/minikube/bootstrapper/kubeadm/testdata/default__default.yaml @@ -28,7 +28,7 @@ dns: etcd: local: dataDir: /data/minikube -kubernetesVersion: v1.14.3 +kubernetesVersion: v1.15.0 networking: dnsDomain: cluster.local podSubnet: "" diff --git a/pkg/minikube/bootstrapper/kubeadm/testdata/image-repository__default.yaml b/pkg/minikube/bootstrapper/kubeadm/testdata/image-repository__default.yaml index 66cab56ad3ea..8ab50ff90286 100644 --- a/pkg/minikube/bootstrapper/kubeadm/testdata/image-repository__default.yaml +++ b/pkg/minikube/bootstrapper/kubeadm/testdata/image-repository__default.yaml @@ -29,7 +29,7 @@ dns: etcd: local: dataDir: /data/minikube -kubernetesVersion: v1.14.3 +kubernetesVersion: v1.15.0 networking: dnsDomain: cluster.local podSubnet: "" diff --git a/pkg/minikube/bootstrapper/kubeadm/testdata/options__default.yaml b/pkg/minikube/bootstrapper/kubeadm/testdata/options__default.yaml index 1c1ff1c39522..2e6f561dd489 100644 --- a/pkg/minikube/bootstrapper/kubeadm/testdata/options__default.yaml +++ b/pkg/minikube/bootstrapper/kubeadm/testdata/options__default.yaml @@ -35,7 +35,7 @@ dns: etcd: local: dataDir: /data/minikube -kubernetesVersion: v1.14.3 +kubernetesVersion: v1.15.0 networking: dnsDomain: cluster.local podSubnet: "" diff --git a/pkg/minikube/constants/constants.go b/pkg/minikube/constants/constants.go index b40a26be57ec..bc8f90b27f56 100644 --- a/pkg/minikube/constants/constants.go +++ b/pkg/minikube/constants/constants.go @@ -162,10 +162,10 @@ var DefaultISOURL = fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s.i var DefaultISOSHAURL = DefaultISOURL + SHASuffix // DefaultKubernetesVersion is the default kubernetes version -var DefaultKubernetesVersion = "v1.14.3" +var DefaultKubernetesVersion = "v1.15.0" // NewestKubernetesVersion is the newest Kubernetes version to test against -var NewestKubernetesVersion = "v1.15.0-beta.1" +var NewestKubernetesVersion = "v1.15.0" // OldestKubernetesVersion is the oldest Kubernetes version to test against var OldestKubernetesVersion = "v1.10.13" From bb30ee9e9e0ce8ab1f94f42d5121df096ccbf57d Mon Sep 17 00:00:00 2001 From: Thomas Stromberg Date: Thu, 20 Jun 2019 07:58:42 +0800 Subject: [PATCH 2/4] Update some of the example files (work still required) --- pkg/minikube/bootstrapper/kubeadm/kubeadm_test.go | 6 +++--- .../kubeadm/testdata/containerd-api-port__new.yaml | 2 +- .../kubeadm/testdata/containerd-api-port__recent.yaml | 4 ++-- .../kubeadm/testdata/containerd-pod-network-cidr__new.yaml | 2 +- .../testdata/containerd-pod-network-cidr__recent.yaml | 4 ++-- .../bootstrapper/kubeadm/testdata/containerd__new.yaml | 2 +- .../bootstrapper/kubeadm/testdata/containerd__recent.yaml | 4 ++-- .../kubeadm/testdata/crio-options-gates__new.yaml | 2 +- .../kubeadm/testdata/crio-options-gates__recent.yaml | 5 ++--- pkg/minikube/bootstrapper/kubeadm/testdata/crio__new.yaml | 2 +- .../bootstrapper/kubeadm/testdata/crio__recent.yaml | 4 ++-- .../bootstrapper/kubeadm/testdata/default__new.yaml | 2 +- .../bootstrapper/kubeadm/testdata/default__recent.yaml | 4 ++-- .../kubeadm/testdata/image-repository__new.yaml | 2 +- .../kubeadm/testdata/image-repository__recent.yaml | 4 ++-- .../bootstrapper/kubeadm/testdata/options__new.yaml | 2 +- .../bootstrapper/kubeadm/testdata/options__recent.yaml | 4 ++-- 17 files changed, 27 insertions(+), 28 deletions(-) diff --git a/pkg/minikube/bootstrapper/kubeadm/kubeadm_test.go b/pkg/minikube/bootstrapper/kubeadm/kubeadm_test.go index 2261b9cb14c7..49534960e968 100644 --- a/pkg/minikube/bootstrapper/kubeadm/kubeadm_test.go +++ b/pkg/minikube/bootstrapper/kubeadm/kubeadm_test.go @@ -29,8 +29,8 @@ import ( ) const ( - newMajor = "v1.14.0" - recentMajor = "v1.13.0" + newMajor = "v1.15.0" + recentMajor = "v1.14.0" oldMajor = "v1.12.0" obsoleteMajor = "v1.10.0" ) @@ -56,7 +56,7 @@ Wants=docker.socket [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=docker --fail-swap-on=false --hostname-override=minikube --kubeconfig=/etc/kubernetes/kubelet.conf --pod-manifest-path=/etc/kubernetes/manifests +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=docker --fail-swap-on=false --hostname-override=minikube --kubeconfig=/etc/kubernetes/kubelet.conf --pod-manifest-path=/etc/kubernetes/manifests [Install] `, diff --git a/pkg/minikube/bootstrapper/kubeadm/testdata/containerd-api-port__new.yaml b/pkg/minikube/bootstrapper/kubeadm/testdata/containerd-api-port__new.yaml index cc96f136ac4b..0fbf400ebf03 100644 --- a/pkg/minikube/bootstrapper/kubeadm/testdata/containerd-api-port__new.yaml +++ b/pkg/minikube/bootstrapper/kubeadm/testdata/containerd-api-port__new.yaml @@ -28,7 +28,7 @@ dns: etcd: local: dataDir: /data/minikube -kubernetesVersion: v1.14.0 +kubernetesVersion: v1.15.0 networking: dnsDomain: cluster.local podSubnet: "" diff --git a/pkg/minikube/bootstrapper/kubeadm/testdata/containerd-api-port__recent.yaml b/pkg/minikube/bootstrapper/kubeadm/testdata/containerd-api-port__recent.yaml index e77675563162..3b3452b131d1 100644 --- a/pkg/minikube/bootstrapper/kubeadm/testdata/containerd-api-port__recent.yaml +++ b/pkg/minikube/bootstrapper/kubeadm/testdata/containerd-api-port__recent.yaml @@ -1,4 +1,4 @@ -apiVersion: kubeadm.k8s.io/v1alpha3 +apiVersion: kubeadm.k8s.io/v1beta1 kind: InitConfiguration apiEndpoint: advertiseAddress: 1.1.1.1 @@ -15,7 +15,7 @@ nodeRegistration: name: mk taints: [] --- -apiVersion: kubeadm.k8s.io/v1alpha3 +apiVersion: kubeadm.k8s.io/v1beta1 kind: ClusterConfiguration apiServerExtraArgs: enable-admission-plugins: "Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" diff --git a/pkg/minikube/bootstrapper/kubeadm/testdata/containerd-pod-network-cidr__new.yaml b/pkg/minikube/bootstrapper/kubeadm/testdata/containerd-pod-network-cidr__new.yaml index 147a6ccbec0d..c6354e860bcb 100644 --- a/pkg/minikube/bootstrapper/kubeadm/testdata/containerd-pod-network-cidr__new.yaml +++ b/pkg/minikube/bootstrapper/kubeadm/testdata/containerd-pod-network-cidr__new.yaml @@ -28,7 +28,7 @@ dns: etcd: local: dataDir: /data/minikube -kubernetesVersion: v1.14.0 +kubernetesVersion: v1.15.0 networking: dnsDomain: cluster.local podSubnet: "" diff --git a/pkg/minikube/bootstrapper/kubeadm/testdata/containerd-pod-network-cidr__recent.yaml b/pkg/minikube/bootstrapper/kubeadm/testdata/containerd-pod-network-cidr__recent.yaml index ecc9a146311f..0d2f6f2d64e6 100644 --- a/pkg/minikube/bootstrapper/kubeadm/testdata/containerd-pod-network-cidr__recent.yaml +++ b/pkg/minikube/bootstrapper/kubeadm/testdata/containerd-pod-network-cidr__recent.yaml @@ -1,4 +1,4 @@ -apiVersion: kubeadm.k8s.io/v1alpha3 +apiVersion: kubeadm.k8s.io/v1beta1 kind: InitConfiguration apiEndpoint: advertiseAddress: 1.1.1.1 @@ -15,7 +15,7 @@ nodeRegistration: name: mk taints: [] --- -apiVersion: kubeadm.k8s.io/v1alpha3 +apiVersion: kubeadm.k8s.io/v1beta1 kind: ClusterConfiguration apiServerExtraArgs: enable-admission-plugins: "Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" diff --git a/pkg/minikube/bootstrapper/kubeadm/testdata/containerd__new.yaml b/pkg/minikube/bootstrapper/kubeadm/testdata/containerd__new.yaml index 147a6ccbec0d..c6354e860bcb 100644 --- a/pkg/minikube/bootstrapper/kubeadm/testdata/containerd__new.yaml +++ b/pkg/minikube/bootstrapper/kubeadm/testdata/containerd__new.yaml @@ -28,7 +28,7 @@ dns: etcd: local: dataDir: /data/minikube -kubernetesVersion: v1.14.0 +kubernetesVersion: v1.15.0 networking: dnsDomain: cluster.local podSubnet: "" diff --git a/pkg/minikube/bootstrapper/kubeadm/testdata/containerd__recent.yaml b/pkg/minikube/bootstrapper/kubeadm/testdata/containerd__recent.yaml index a852561fbea0..1838149d29aa 100644 --- a/pkg/minikube/bootstrapper/kubeadm/testdata/containerd__recent.yaml +++ b/pkg/minikube/bootstrapper/kubeadm/testdata/containerd__recent.yaml @@ -1,4 +1,4 @@ -apiVersion: kubeadm.k8s.io/v1alpha3 +apiVersion: kubeadm.k8s.io/v1beta1 kind: InitConfiguration apiEndpoint: advertiseAddress: 1.1.1.1 @@ -15,7 +15,7 @@ nodeRegistration: name: mk taints: [] --- -apiVersion: kubeadm.k8s.io/v1alpha3 +apiVersion: kubeadm.k8s.io/v1beta1 kind: ClusterConfiguration apiServerExtraArgs: enable-admission-plugins: "Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" diff --git a/pkg/minikube/bootstrapper/kubeadm/testdata/crio-options-gates__new.yaml b/pkg/minikube/bootstrapper/kubeadm/testdata/crio-options-gates__new.yaml index 1b35bce5c6a8..78bbe09f1ce6 100644 --- a/pkg/minikube/bootstrapper/kubeadm/testdata/crio-options-gates__new.yaml +++ b/pkg/minikube/bootstrapper/kubeadm/testdata/crio-options-gates__new.yaml @@ -38,7 +38,7 @@ dns: etcd: local: dataDir: /data/minikube -kubernetesVersion: v1.14.0 +kubernetesVersion: v1.15.0 networking: dnsDomain: cluster.local podSubnet: "" diff --git a/pkg/minikube/bootstrapper/kubeadm/testdata/crio-options-gates__recent.yaml b/pkg/minikube/bootstrapper/kubeadm/testdata/crio-options-gates__recent.yaml index 9e5812dbdab8..a61edf583594 100644 --- a/pkg/minikube/bootstrapper/kubeadm/testdata/crio-options-gates__recent.yaml +++ b/pkg/minikube/bootstrapper/kubeadm/testdata/crio-options-gates__recent.yaml @@ -1,5 +1,4 @@ -apiVersion: kubeadm.k8s.io/v1alpha3 -kind: InitConfiguration +apiVersion: kubeadm.k8s.io/v1beta1 apiEndpoint: advertiseAddress: 1.1.1.1 bindPort: 8443 @@ -15,7 +14,7 @@ nodeRegistration: name: mk taints: [] --- -apiVersion: kubeadm.k8s.io/v1alpha3 +apiVersion: kubeadm.k8s.io/v1beta1 kind: ClusterConfiguration apiServerExtraArgs: enable-admission-plugins: "Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" diff --git a/pkg/minikube/bootstrapper/kubeadm/testdata/crio__new.yaml b/pkg/minikube/bootstrapper/kubeadm/testdata/crio__new.yaml index 66dac1c8af47..b956109b8178 100644 --- a/pkg/minikube/bootstrapper/kubeadm/testdata/crio__new.yaml +++ b/pkg/minikube/bootstrapper/kubeadm/testdata/crio__new.yaml @@ -28,7 +28,7 @@ dns: etcd: local: dataDir: /data/minikube -kubernetesVersion: v1.14.0 +kubernetesVersion: v1.15.0 networking: dnsDomain: cluster.local podSubnet: "" diff --git a/pkg/minikube/bootstrapper/kubeadm/testdata/crio__recent.yaml b/pkg/minikube/bootstrapper/kubeadm/testdata/crio__recent.yaml index 57b9f1b12217..d361ec92797b 100644 --- a/pkg/minikube/bootstrapper/kubeadm/testdata/crio__recent.yaml +++ b/pkg/minikube/bootstrapper/kubeadm/testdata/crio__recent.yaml @@ -1,4 +1,4 @@ -apiVersion: kubeadm.k8s.io/v1alpha3 +apiVersion: kubeadm.k8s.io/v1beta1 kind: InitConfiguration apiEndpoint: advertiseAddress: 1.1.1.1 @@ -15,7 +15,7 @@ nodeRegistration: name: mk taints: [] --- -apiVersion: kubeadm.k8s.io/v1alpha3 +apiVersion: kubeadm.k8s.io/v1beta1 kind: ClusterConfiguration apiServerExtraArgs: enable-admission-plugins: "Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" diff --git a/pkg/minikube/bootstrapper/kubeadm/testdata/default__new.yaml b/pkg/minikube/bootstrapper/kubeadm/testdata/default__new.yaml index d88c0efebf78..46d6e4e78ca0 100644 --- a/pkg/minikube/bootstrapper/kubeadm/testdata/default__new.yaml +++ b/pkg/minikube/bootstrapper/kubeadm/testdata/default__new.yaml @@ -28,7 +28,7 @@ dns: etcd: local: dataDir: /data/minikube -kubernetesVersion: v1.14.0 +kubernetesVersion: v1.15.0 networking: dnsDomain: cluster.local podSubnet: "" diff --git a/pkg/minikube/bootstrapper/kubeadm/testdata/default__recent.yaml b/pkg/minikube/bootstrapper/kubeadm/testdata/default__recent.yaml index db611e22633e..45e41ce14848 100644 --- a/pkg/minikube/bootstrapper/kubeadm/testdata/default__recent.yaml +++ b/pkg/minikube/bootstrapper/kubeadm/testdata/default__recent.yaml @@ -1,4 +1,4 @@ -apiVersion: kubeadm.k8s.io/v1alpha3 +apiVersion: kubeadm.k8s.io/v1beta1 kind: InitConfiguration apiEndpoint: advertiseAddress: 1.1.1.1 @@ -15,7 +15,7 @@ nodeRegistration: name: mk taints: [] --- -apiVersion: kubeadm.k8s.io/v1alpha3 +apiVersion: kubeadm.k8s.io/v1beta1 kind: ClusterConfiguration apiServerExtraArgs: enable-admission-plugins: "Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" diff --git a/pkg/minikube/bootstrapper/kubeadm/testdata/image-repository__new.yaml b/pkg/minikube/bootstrapper/kubeadm/testdata/image-repository__new.yaml index bf53791b717f..8ab50ff90286 100644 --- a/pkg/minikube/bootstrapper/kubeadm/testdata/image-repository__new.yaml +++ b/pkg/minikube/bootstrapper/kubeadm/testdata/image-repository__new.yaml @@ -29,7 +29,7 @@ dns: etcd: local: dataDir: /data/minikube -kubernetesVersion: v1.14.0 +kubernetesVersion: v1.15.0 networking: dnsDomain: cluster.local podSubnet: "" diff --git a/pkg/minikube/bootstrapper/kubeadm/testdata/image-repository__recent.yaml b/pkg/minikube/bootstrapper/kubeadm/testdata/image-repository__recent.yaml index 037dd6add234..f0b1d1814737 100644 --- a/pkg/minikube/bootstrapper/kubeadm/testdata/image-repository__recent.yaml +++ b/pkg/minikube/bootstrapper/kubeadm/testdata/image-repository__recent.yaml @@ -1,4 +1,4 @@ -apiVersion: kubeadm.k8s.io/v1alpha3 +apiVersion: kubeadm.k8s.io/v1beta1 kind: InitConfiguration apiEndpoint: advertiseAddress: 1.1.1.1 @@ -15,7 +15,7 @@ nodeRegistration: name: mk taints: [] --- -apiVersion: kubeadm.k8s.io/v1alpha3 +apiVersion: kubeadm.k8s.io/v1beta1 kind: ClusterConfiguration imageRepository: test/repo apiServerExtraArgs: diff --git a/pkg/minikube/bootstrapper/kubeadm/testdata/options__new.yaml b/pkg/minikube/bootstrapper/kubeadm/testdata/options__new.yaml index a85a2447b206..2e6f561dd489 100644 --- a/pkg/minikube/bootstrapper/kubeadm/testdata/options__new.yaml +++ b/pkg/minikube/bootstrapper/kubeadm/testdata/options__new.yaml @@ -35,7 +35,7 @@ dns: etcd: local: dataDir: /data/minikube -kubernetesVersion: v1.14.0 +kubernetesVersion: v1.15.0 networking: dnsDomain: cluster.local podSubnet: "" diff --git a/pkg/minikube/bootstrapper/kubeadm/testdata/options__recent.yaml b/pkg/minikube/bootstrapper/kubeadm/testdata/options__recent.yaml index f1df66954d16..3a6c0cb18ebc 100644 --- a/pkg/minikube/bootstrapper/kubeadm/testdata/options__recent.yaml +++ b/pkg/minikube/bootstrapper/kubeadm/testdata/options__recent.yaml @@ -1,4 +1,4 @@ -apiVersion: kubeadm.k8s.io/v1alpha3 +apiVersion: kubeadm.k8s.io/v1beta1 kind: InitConfiguration apiEndpoint: advertiseAddress: 1.1.1.1 @@ -15,7 +15,7 @@ nodeRegistration: name: mk taints: [] --- -apiVersion: kubeadm.k8s.io/v1alpha3 +apiVersion: kubeadm.k8s.io/v1beta1 kind: ClusterConfiguration apiServerExtraArgs: enable-admission-plugins: "Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" From f26f2ad677c6c7cd7d09900f3ba13da705ae0c27 Mon Sep 17 00:00:00 2001 From: Thomas Stromberg Date: Thu, 20 Jun 2019 15:37:20 +0800 Subject: [PATCH 3/4] Refactor tests to decrease toil when adding new versions --- .../bootstrapper/kubeadm/kubeadm_test.go | 50 +++++++++++-------- .../containerd-api-port.yaml} | 0 .../containerd-pod-network-cidr.yaml} | 0 .../containerd.yaml} | 0 .../crio-options-gates.yaml} | 0 .../{crio__obsolete.yaml => v1.10/crio.yaml} | 0 .../default.yaml} | 0 .../image-repository.yaml} | 0 .../options.yaml} | 0 .../testdata/v1.11/containerd-api-port.yaml | 17 +++++++ .../v1.11/containerd-pod-network-cidr.yaml | 17 +++++++ .../kubeadm/testdata/v1.11/containerd.yaml | 17 +++++++ .../testdata/v1.11/crio-options-gates.yaml | 25 ++++++++++ .../kubeadm/testdata/v1.11/crio.yaml | 17 +++++++ .../kubeadm/testdata/v1.11/default.yaml | 16 ++++++ .../testdata/v1.11/image-repository.yaml | 17 +++++++ .../kubeadm/testdata/v1.11/options.yaml | 21 ++++++++ .../containerd-api-port.yaml} | 0 .../containerd-pod-network-cidr.yaml} | 0 .../containerd.yaml} | 0 .../crio-options-gates.yaml} | 0 .../{crio__old.yaml => v1.12/crio.yaml} | 0 .../{default__old.yaml => v1.12/default.yaml} | 0 .../image-repository.yaml} | 0 .../{options__old.yaml => v1.12/options.yaml} | 0 .../containerd-api-port.yaml} | 4 +- .../containerd-pod-network-cidr.yaml} | 4 +- .../containerd.yaml} | 4 +- .../crio-options-gates.yaml} | 5 +- .../{crio__recent.yaml => v1.13/crio.yaml} | 4 +- .../default.yaml} | 4 +- .../image-repository.yaml} | 4 +- .../options.yaml} | 4 +- .../containerd-api-port.yaml} | 2 +- .../containerd-pod-network-cidr.yaml} | 2 +- .../containerd.yaml} | 2 +- .../crio-options-gates.yaml} | 2 +- .../{crio__new.yaml => v1.14/crio.yaml} | 2 +- .../{default__new.yaml => v1.14/default.yaml} | 2 +- .../image-repository.yaml} | 2 +- .../{options__new.yaml => v1.14/options.yaml} | 2 +- .../containerd-api-port.yaml} | 0 .../containerd-pod-network-cidr.yaml} | 0 .../containerd.yaml} | 0 .../crio-options-gates.yaml} | 0 .../{crio__default.yaml => v1.15/crio.yaml} | 0 .../default.yaml} | 0 .../image-repository.yaml} | 0 .../options.yaml} | 0 49 files changed, 201 insertions(+), 45 deletions(-) rename pkg/minikube/bootstrapper/kubeadm/testdata/{containerd-api-port__obsolete.yaml => v1.10/containerd-api-port.yaml} (100%) rename pkg/minikube/bootstrapper/kubeadm/testdata/{containerd-pod-network-cidr__obsolete.yaml => v1.10/containerd-pod-network-cidr.yaml} (100%) rename pkg/minikube/bootstrapper/kubeadm/testdata/{containerd__obsolete.yaml => v1.10/containerd.yaml} (100%) rename pkg/minikube/bootstrapper/kubeadm/testdata/{crio-options-gates__obsolete.yaml => v1.10/crio-options-gates.yaml} (100%) rename pkg/minikube/bootstrapper/kubeadm/testdata/{crio__obsolete.yaml => v1.10/crio.yaml} (100%) rename pkg/minikube/bootstrapper/kubeadm/testdata/{default__obsolete.yaml => v1.10/default.yaml} (100%) rename pkg/minikube/bootstrapper/kubeadm/testdata/{image-repository__obsolete.yaml => v1.10/image-repository.yaml} (100%) rename pkg/minikube/bootstrapper/kubeadm/testdata/{options__obsolete.yaml => v1.10/options.yaml} (100%) create mode 100644 pkg/minikube/bootstrapper/kubeadm/testdata/v1.11/containerd-api-port.yaml create mode 100644 pkg/minikube/bootstrapper/kubeadm/testdata/v1.11/containerd-pod-network-cidr.yaml create mode 100644 pkg/minikube/bootstrapper/kubeadm/testdata/v1.11/containerd.yaml create mode 100644 pkg/minikube/bootstrapper/kubeadm/testdata/v1.11/crio-options-gates.yaml create mode 100644 pkg/minikube/bootstrapper/kubeadm/testdata/v1.11/crio.yaml create mode 100644 pkg/minikube/bootstrapper/kubeadm/testdata/v1.11/default.yaml create mode 100644 pkg/minikube/bootstrapper/kubeadm/testdata/v1.11/image-repository.yaml create mode 100644 pkg/minikube/bootstrapper/kubeadm/testdata/v1.11/options.yaml rename pkg/minikube/bootstrapper/kubeadm/testdata/{containerd-api-port__old.yaml => v1.12/containerd-api-port.yaml} (100%) rename pkg/minikube/bootstrapper/kubeadm/testdata/{containerd-pod-network-cidr__old.yaml => v1.12/containerd-pod-network-cidr.yaml} (100%) rename pkg/minikube/bootstrapper/kubeadm/testdata/{containerd__old.yaml => v1.12/containerd.yaml} (100%) rename pkg/minikube/bootstrapper/kubeadm/testdata/{crio-options-gates__old.yaml => v1.12/crio-options-gates.yaml} (100%) rename pkg/minikube/bootstrapper/kubeadm/testdata/{crio__old.yaml => v1.12/crio.yaml} (100%) rename pkg/minikube/bootstrapper/kubeadm/testdata/{default__old.yaml => v1.12/default.yaml} (100%) rename pkg/minikube/bootstrapper/kubeadm/testdata/{image-repository__old.yaml => v1.12/image-repository.yaml} (100%) rename pkg/minikube/bootstrapper/kubeadm/testdata/{options__old.yaml => v1.12/options.yaml} (100%) rename pkg/minikube/bootstrapper/kubeadm/testdata/{containerd-api-port__recent.yaml => v1.13/containerd-api-port.yaml} (93%) rename pkg/minikube/bootstrapper/kubeadm/testdata/{containerd-pod-network-cidr__recent.yaml => v1.13/containerd-pod-network-cidr.yaml} (93%) rename pkg/minikube/bootstrapper/kubeadm/testdata/{containerd__recent.yaml => v1.13/containerd.yaml} (93%) rename pkg/minikube/bootstrapper/kubeadm/testdata/{crio-options-gates__recent.yaml => v1.13/crio-options-gates.yaml} (92%) rename pkg/minikube/bootstrapper/kubeadm/testdata/{crio__recent.yaml => v1.13/crio.yaml} (93%) rename pkg/minikube/bootstrapper/kubeadm/testdata/{default__recent.yaml => v1.13/default.yaml} (93%) rename pkg/minikube/bootstrapper/kubeadm/testdata/{image-repository__recent.yaml => v1.13/image-repository.yaml} (93%) rename pkg/minikube/bootstrapper/kubeadm/testdata/{options__recent.yaml => v1.13/options.yaml} (94%) rename pkg/minikube/bootstrapper/kubeadm/testdata/{containerd-api-port__new.yaml => v1.14/containerd-api-port.yaml} (97%) rename pkg/minikube/bootstrapper/kubeadm/testdata/{containerd__new.yaml => v1.14/containerd-pod-network-cidr.yaml} (97%) rename pkg/minikube/bootstrapper/kubeadm/testdata/{containerd__default.yaml => v1.14/containerd.yaml} (97%) rename pkg/minikube/bootstrapper/kubeadm/testdata/{crio-options-gates__new.yaml => v1.14/crio-options-gates.yaml} (97%) rename pkg/minikube/bootstrapper/kubeadm/testdata/{crio__new.yaml => v1.14/crio.yaml} (97%) rename pkg/minikube/bootstrapper/kubeadm/testdata/{default__new.yaml => v1.14/default.yaml} (97%) rename pkg/minikube/bootstrapper/kubeadm/testdata/{image-repository__new.yaml => v1.14/image-repository.yaml} (97%) rename pkg/minikube/bootstrapper/kubeadm/testdata/{options__new.yaml => v1.14/options.yaml} (97%) rename pkg/minikube/bootstrapper/kubeadm/testdata/{containerd-api-port__default.yaml => v1.15/containerd-api-port.yaml} (100%) rename pkg/minikube/bootstrapper/kubeadm/testdata/{containerd-pod-network-cidr__default.yaml => v1.15/containerd-pod-network-cidr.yaml} (100%) rename pkg/minikube/bootstrapper/kubeadm/testdata/{containerd-pod-network-cidr__new.yaml => v1.15/containerd.yaml} (100%) rename pkg/minikube/bootstrapper/kubeadm/testdata/{crio-options-gates__default.yaml => v1.15/crio-options-gates.yaml} (100%) rename pkg/minikube/bootstrapper/kubeadm/testdata/{crio__default.yaml => v1.15/crio.yaml} (100%) rename pkg/minikube/bootstrapper/kubeadm/testdata/{default__default.yaml => v1.15/default.yaml} (100%) rename pkg/minikube/bootstrapper/kubeadm/testdata/{image-repository__default.yaml => v1.15/image-repository.yaml} (100%) rename pkg/minikube/bootstrapper/kubeadm/testdata/{options__default.yaml => v1.15/options.yaml} (100%) diff --git a/pkg/minikube/bootstrapper/kubeadm/kubeadm_test.go b/pkg/minikube/bootstrapper/kubeadm/kubeadm_test.go index 49534960e968..6a691c950e40 100644 --- a/pkg/minikube/bootstrapper/kubeadm/kubeadm_test.go +++ b/pkg/minikube/bootstrapper/kubeadm/kubeadm_test.go @@ -19,6 +19,7 @@ package kubeadm import ( "fmt" "io/ioutil" + "strings" "testing" "github.com/pmezard/go-difflib/difflib" @@ -28,12 +29,6 @@ import ( "k8s.io/minikube/pkg/util" ) -const ( - newMajor = "v1.15.0" - recentMajor = "v1.14.0" - oldMajor = "v1.12.0" - obsoleteMajor = "v1.10.0" -) func TestGenerateKubeletConfig(t *testing.T) { tests := []struct { @@ -43,10 +38,10 @@ func TestGenerateKubeletConfig(t *testing.T) { shouldErr bool }{ { - description: "docker runtime", + description: "old docker", cfg: config.KubernetesConfig{ NodeIP: "192.168.1.100", - KubernetesVersion: recentMajor, + KubernetesVersion: constants.OldestKubernetesVersion, NodeName: "minikube", ContainerRuntime: "docker", }, @@ -56,7 +51,7 @@ Wants=docker.socket [Service] ExecStart= -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=docker --fail-swap-on=false --hostname-override=minikube --kubeconfig=/etc/kubernetes/kubelet.conf --pod-manifest-path=/etc/kubernetes/manifests +ExecStart=/usr/bin/kubelet --allow-privileged=true --authorization-mode=Webhook --bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf --cadvisor-port=0 --cgroup-driver=cgroupfs --client-ca-file=/var/lib/minikube/certs/ca.crt --cluster-dns=10.96.0.10 --cluster-domain=cluster.local --container-runtime=docker --fail-swap-on=false --hostname-override=minikube --kubeconfig=/etc/kubernetes/kubelet.conf --pod-manifest-path=/etc/kubernetes/manifests [Install] `, @@ -95,7 +90,7 @@ Wants=docker.socket [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=docker --fail-swap-on=false --hostname-override=minikube --kubeconfig=/etc/kubernetes/kubelet.conf --pod-infra-container-image=docker-proxy-image.io/google_containers/pause:3.1 --pod-manifest-path=/etc/kubernetes/manifests +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=docker --fail-swap-on=false --hostname-override=minikube --kubeconfig=/etc/kubernetes/kubelet.conf --pod-infra-container-image=docker-proxy-image.io/google_containers/pause:3.1 --pod-manifest-path=/etc/kubernetes/manifests [Install] `, @@ -173,15 +168,28 @@ func TestGenerateConfig(t *testing.T) { }, } - // Test version policy: Last 4 major releases (slightly looser than our general policy) - versions := map[string]string{ - "default": constants.DefaultKubernetesVersion, - "new": newMajor, - "recent": recentMajor, - "old": oldMajor, - "obsolete": obsoleteMajor, + // test the 6 most recent releases + versions := []string{"v1.15", "v1.14", "v1.13", "v1.12", "v1.11", "v1.10"} + foundNewest := false + foundDefault := false + + for _, v := range versions { + if strings.HasPrefix(constants.NewestKubernetesVersion, v) { + foundNewest = true + } + if strings.HasPrefix(constants.DefaultKubernetesVersion, v) { + foundDefault = true + } + } + + if !foundNewest { + t.Errorf("No tests exist yet for newest minor version: %s", constants.NewestKubernetesVersion) } + if !foundDefault { + t.Errorf("No tests exist yet for default minor version: %s", constants.DefaultKubernetesVersion) + } + tests := []struct { name string runtime string @@ -198,18 +206,18 @@ func TestGenerateConfig(t *testing.T) { {"containerd-pod-network-cidr", "containerd", false, config.KubernetesConfig{ExtraOptions: extraOptsPodCidr}}, {"image-repository", "docker", false, config.KubernetesConfig{ImageRepository: "test/repo"}}, } - for vname, version := range versions { + for _, version := range versions { for _, tc := range tests { runtime, err := cruntime.New(cruntime.Config{Type: tc.runtime}) if err != nil { t.Fatalf("runtime: %v", err) } - tname := tc.name + "__" + vname + tname := tc.name + "_" + version t.Run(tname, func(t *testing.T) { cfg := tc.cfg cfg.NodeIP = "1.1.1.1" cfg.NodeName = "mk" - cfg.KubernetesVersion = version + cfg.KubernetesVersion = version + ".0" got, err := generateConfig(cfg, runtime) if err != nil && !tc.shouldErr { @@ -221,7 +229,7 @@ func TestGenerateConfig(t *testing.T) { if tc.shouldErr { return } - expected, err := ioutil.ReadFile(fmt.Sprintf("testdata/%s.yaml", tname)) + expected, err := ioutil.ReadFile(fmt.Sprintf("testdata/%s/%s.yaml", version, tc.name)) if err != nil { t.Fatalf("unable to read testdata: %v", err) } diff --git a/pkg/minikube/bootstrapper/kubeadm/testdata/containerd-api-port__obsolete.yaml b/pkg/minikube/bootstrapper/kubeadm/testdata/v1.10/containerd-api-port.yaml similarity index 100% rename from pkg/minikube/bootstrapper/kubeadm/testdata/containerd-api-port__obsolete.yaml rename to pkg/minikube/bootstrapper/kubeadm/testdata/v1.10/containerd-api-port.yaml diff --git a/pkg/minikube/bootstrapper/kubeadm/testdata/containerd-pod-network-cidr__obsolete.yaml b/pkg/minikube/bootstrapper/kubeadm/testdata/v1.10/containerd-pod-network-cidr.yaml similarity index 100% rename from pkg/minikube/bootstrapper/kubeadm/testdata/containerd-pod-network-cidr__obsolete.yaml rename to pkg/minikube/bootstrapper/kubeadm/testdata/v1.10/containerd-pod-network-cidr.yaml diff --git a/pkg/minikube/bootstrapper/kubeadm/testdata/containerd__obsolete.yaml b/pkg/minikube/bootstrapper/kubeadm/testdata/v1.10/containerd.yaml similarity index 100% rename from pkg/minikube/bootstrapper/kubeadm/testdata/containerd__obsolete.yaml rename to pkg/minikube/bootstrapper/kubeadm/testdata/v1.10/containerd.yaml diff --git a/pkg/minikube/bootstrapper/kubeadm/testdata/crio-options-gates__obsolete.yaml b/pkg/minikube/bootstrapper/kubeadm/testdata/v1.10/crio-options-gates.yaml similarity index 100% rename from pkg/minikube/bootstrapper/kubeadm/testdata/crio-options-gates__obsolete.yaml rename to pkg/minikube/bootstrapper/kubeadm/testdata/v1.10/crio-options-gates.yaml diff --git a/pkg/minikube/bootstrapper/kubeadm/testdata/crio__obsolete.yaml b/pkg/minikube/bootstrapper/kubeadm/testdata/v1.10/crio.yaml similarity index 100% rename from pkg/minikube/bootstrapper/kubeadm/testdata/crio__obsolete.yaml rename to pkg/minikube/bootstrapper/kubeadm/testdata/v1.10/crio.yaml diff --git a/pkg/minikube/bootstrapper/kubeadm/testdata/default__obsolete.yaml b/pkg/minikube/bootstrapper/kubeadm/testdata/v1.10/default.yaml similarity index 100% rename from pkg/minikube/bootstrapper/kubeadm/testdata/default__obsolete.yaml rename to pkg/minikube/bootstrapper/kubeadm/testdata/v1.10/default.yaml diff --git a/pkg/minikube/bootstrapper/kubeadm/testdata/image-repository__obsolete.yaml b/pkg/minikube/bootstrapper/kubeadm/testdata/v1.10/image-repository.yaml similarity index 100% rename from pkg/minikube/bootstrapper/kubeadm/testdata/image-repository__obsolete.yaml rename to pkg/minikube/bootstrapper/kubeadm/testdata/v1.10/image-repository.yaml diff --git a/pkg/minikube/bootstrapper/kubeadm/testdata/options__obsolete.yaml b/pkg/minikube/bootstrapper/kubeadm/testdata/v1.10/options.yaml similarity index 100% rename from pkg/minikube/bootstrapper/kubeadm/testdata/options__obsolete.yaml rename to pkg/minikube/bootstrapper/kubeadm/testdata/v1.10/options.yaml diff --git a/pkg/minikube/bootstrapper/kubeadm/testdata/v1.11/containerd-api-port.yaml b/pkg/minikube/bootstrapper/kubeadm/testdata/v1.11/containerd-api-port.yaml new file mode 100644 index 000000000000..c7edeea5f254 --- /dev/null +++ b/pkg/minikube/bootstrapper/kubeadm/testdata/v1.11/containerd-api-port.yaml @@ -0,0 +1,17 @@ +apiVersion: kubeadm.k8s.io/v1alpha1 +kind: MasterConfiguration +noTaintMaster: true +api: + advertiseAddress: 1.1.1.1 + bindPort: 12345 + controlPlaneEndpoint: localhost +kubernetesVersion: v1.11.0 +certificatesDir: /var/lib/minikube/certs/ +networking: + serviceSubnet: 10.96.0.0/12 +etcd: + dataDir: /data/minikube +nodeName: mk +criSocket: /run/containerd/containerd.sock +apiServerExtraArgs: + enable-admission-plugins: "Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" diff --git a/pkg/minikube/bootstrapper/kubeadm/testdata/v1.11/containerd-pod-network-cidr.yaml b/pkg/minikube/bootstrapper/kubeadm/testdata/v1.11/containerd-pod-network-cidr.yaml new file mode 100644 index 000000000000..320c88592764 --- /dev/null +++ b/pkg/minikube/bootstrapper/kubeadm/testdata/v1.11/containerd-pod-network-cidr.yaml @@ -0,0 +1,17 @@ +apiVersion: kubeadm.k8s.io/v1alpha1 +kind: MasterConfiguration +noTaintMaster: true +api: + advertiseAddress: 1.1.1.1 + bindPort: 8443 + controlPlaneEndpoint: localhost +kubernetesVersion: v1.11.0 +certificatesDir: /var/lib/minikube/certs/ +networking: + serviceSubnet: 10.96.0.0/12 +etcd: + dataDir: /data/minikube +nodeName: mk +criSocket: /run/containerd/containerd.sock +apiServerExtraArgs: + enable-admission-plugins: "Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" diff --git a/pkg/minikube/bootstrapper/kubeadm/testdata/v1.11/containerd.yaml b/pkg/minikube/bootstrapper/kubeadm/testdata/v1.11/containerd.yaml new file mode 100644 index 000000000000..320c88592764 --- /dev/null +++ b/pkg/minikube/bootstrapper/kubeadm/testdata/v1.11/containerd.yaml @@ -0,0 +1,17 @@ +apiVersion: kubeadm.k8s.io/v1alpha1 +kind: MasterConfiguration +noTaintMaster: true +api: + advertiseAddress: 1.1.1.1 + bindPort: 8443 + controlPlaneEndpoint: localhost +kubernetesVersion: v1.11.0 +certificatesDir: /var/lib/minikube/certs/ +networking: + serviceSubnet: 10.96.0.0/12 +etcd: + dataDir: /data/minikube +nodeName: mk +criSocket: /run/containerd/containerd.sock +apiServerExtraArgs: + enable-admission-plugins: "Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" diff --git a/pkg/minikube/bootstrapper/kubeadm/testdata/v1.11/crio-options-gates.yaml b/pkg/minikube/bootstrapper/kubeadm/testdata/v1.11/crio-options-gates.yaml new file mode 100644 index 000000000000..37e2d4729ab3 --- /dev/null +++ b/pkg/minikube/bootstrapper/kubeadm/testdata/v1.11/crio-options-gates.yaml @@ -0,0 +1,25 @@ +apiVersion: kubeadm.k8s.io/v1alpha1 +kind: MasterConfiguration +noTaintMaster: true +api: + advertiseAddress: 1.1.1.1 + bindPort: 8443 + controlPlaneEndpoint: localhost +kubernetesVersion: v1.11.0 +certificatesDir: /var/lib/minikube/certs/ +networking: + serviceSubnet: 10.96.0.0/12 +etcd: + dataDir: /data/minikube +nodeName: mk +criSocket: /var/run/crio/crio.sock +apiServerExtraArgs: + enable-admission-plugins: "Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" + fail-no-swap: "true" + feature-gates: "a=b" +controllerManagerExtraArgs: + feature-gates: "a=b" + kube-api-burst: "32" +schedulerExtraArgs: + feature-gates: "a=b" + scheduler-name: "mini-scheduler" diff --git a/pkg/minikube/bootstrapper/kubeadm/testdata/v1.11/crio.yaml b/pkg/minikube/bootstrapper/kubeadm/testdata/v1.11/crio.yaml new file mode 100644 index 000000000000..2b394b5335ea --- /dev/null +++ b/pkg/minikube/bootstrapper/kubeadm/testdata/v1.11/crio.yaml @@ -0,0 +1,17 @@ +apiVersion: kubeadm.k8s.io/v1alpha1 +kind: MasterConfiguration +noTaintMaster: true +api: + advertiseAddress: 1.1.1.1 + bindPort: 8443 + controlPlaneEndpoint: localhost +kubernetesVersion: v1.11.0 +certificatesDir: /var/lib/minikube/certs/ +networking: + serviceSubnet: 10.96.0.0/12 +etcd: + dataDir: /data/minikube +nodeName: mk +criSocket: /var/run/crio/crio.sock +apiServerExtraArgs: + enable-admission-plugins: "Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" diff --git a/pkg/minikube/bootstrapper/kubeadm/testdata/v1.11/default.yaml b/pkg/minikube/bootstrapper/kubeadm/testdata/v1.11/default.yaml new file mode 100644 index 000000000000..f831b4e46ee5 --- /dev/null +++ b/pkg/minikube/bootstrapper/kubeadm/testdata/v1.11/default.yaml @@ -0,0 +1,16 @@ +apiVersion: kubeadm.k8s.io/v1alpha1 +kind: MasterConfiguration +noTaintMaster: true +api: + advertiseAddress: 1.1.1.1 + bindPort: 8443 + controlPlaneEndpoint: localhost +kubernetesVersion: v1.11.0 +certificatesDir: /var/lib/minikube/certs/ +networking: + serviceSubnet: 10.96.0.0/12 +etcd: + dataDir: /data/minikube +nodeName: mk +apiServerExtraArgs: + enable-admission-plugins: "Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" diff --git a/pkg/minikube/bootstrapper/kubeadm/testdata/v1.11/image-repository.yaml b/pkg/minikube/bootstrapper/kubeadm/testdata/v1.11/image-repository.yaml new file mode 100644 index 000000000000..72ac00feb798 --- /dev/null +++ b/pkg/minikube/bootstrapper/kubeadm/testdata/v1.11/image-repository.yaml @@ -0,0 +1,17 @@ +apiVersion: kubeadm.k8s.io/v1alpha1 +kind: MasterConfiguration +noTaintMaster: true +api: + advertiseAddress: 1.1.1.1 + bindPort: 8443 + controlPlaneEndpoint: localhost +kubernetesVersion: v1.11.0 +certificatesDir: /var/lib/minikube/certs/ +networking: + serviceSubnet: 10.96.0.0/12 +etcd: + dataDir: /data/minikube +nodeName: mk +imageRepository: test/repo +apiServerExtraArgs: + enable-admission-plugins: "Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" diff --git a/pkg/minikube/bootstrapper/kubeadm/testdata/v1.11/options.yaml b/pkg/minikube/bootstrapper/kubeadm/testdata/v1.11/options.yaml new file mode 100644 index 000000000000..653a3e4428a3 --- /dev/null +++ b/pkg/minikube/bootstrapper/kubeadm/testdata/v1.11/options.yaml @@ -0,0 +1,21 @@ +apiVersion: kubeadm.k8s.io/v1alpha1 +kind: MasterConfiguration +noTaintMaster: true +api: + advertiseAddress: 1.1.1.1 + bindPort: 8443 + controlPlaneEndpoint: localhost +kubernetesVersion: v1.11.0 +certificatesDir: /var/lib/minikube/certs/ +networking: + serviceSubnet: 10.96.0.0/12 +etcd: + dataDir: /data/minikube +nodeName: mk +apiServerExtraArgs: + enable-admission-plugins: "Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" + fail-no-swap: "true" +controllerManagerExtraArgs: + kube-api-burst: "32" +schedulerExtraArgs: + scheduler-name: "mini-scheduler" diff --git a/pkg/minikube/bootstrapper/kubeadm/testdata/containerd-api-port__old.yaml b/pkg/minikube/bootstrapper/kubeadm/testdata/v1.12/containerd-api-port.yaml similarity index 100% rename from pkg/minikube/bootstrapper/kubeadm/testdata/containerd-api-port__old.yaml rename to pkg/minikube/bootstrapper/kubeadm/testdata/v1.12/containerd-api-port.yaml diff --git a/pkg/minikube/bootstrapper/kubeadm/testdata/containerd-pod-network-cidr__old.yaml b/pkg/minikube/bootstrapper/kubeadm/testdata/v1.12/containerd-pod-network-cidr.yaml similarity index 100% rename from pkg/minikube/bootstrapper/kubeadm/testdata/containerd-pod-network-cidr__old.yaml rename to pkg/minikube/bootstrapper/kubeadm/testdata/v1.12/containerd-pod-network-cidr.yaml diff --git a/pkg/minikube/bootstrapper/kubeadm/testdata/containerd__old.yaml b/pkg/minikube/bootstrapper/kubeadm/testdata/v1.12/containerd.yaml similarity index 100% rename from pkg/minikube/bootstrapper/kubeadm/testdata/containerd__old.yaml rename to pkg/minikube/bootstrapper/kubeadm/testdata/v1.12/containerd.yaml diff --git a/pkg/minikube/bootstrapper/kubeadm/testdata/crio-options-gates__old.yaml b/pkg/minikube/bootstrapper/kubeadm/testdata/v1.12/crio-options-gates.yaml similarity index 100% rename from pkg/minikube/bootstrapper/kubeadm/testdata/crio-options-gates__old.yaml rename to pkg/minikube/bootstrapper/kubeadm/testdata/v1.12/crio-options-gates.yaml diff --git a/pkg/minikube/bootstrapper/kubeadm/testdata/crio__old.yaml b/pkg/minikube/bootstrapper/kubeadm/testdata/v1.12/crio.yaml similarity index 100% rename from pkg/minikube/bootstrapper/kubeadm/testdata/crio__old.yaml rename to pkg/minikube/bootstrapper/kubeadm/testdata/v1.12/crio.yaml diff --git a/pkg/minikube/bootstrapper/kubeadm/testdata/default__old.yaml b/pkg/minikube/bootstrapper/kubeadm/testdata/v1.12/default.yaml similarity index 100% rename from pkg/minikube/bootstrapper/kubeadm/testdata/default__old.yaml rename to pkg/minikube/bootstrapper/kubeadm/testdata/v1.12/default.yaml diff --git a/pkg/minikube/bootstrapper/kubeadm/testdata/image-repository__old.yaml b/pkg/minikube/bootstrapper/kubeadm/testdata/v1.12/image-repository.yaml similarity index 100% rename from pkg/minikube/bootstrapper/kubeadm/testdata/image-repository__old.yaml rename to pkg/minikube/bootstrapper/kubeadm/testdata/v1.12/image-repository.yaml diff --git a/pkg/minikube/bootstrapper/kubeadm/testdata/options__old.yaml b/pkg/minikube/bootstrapper/kubeadm/testdata/v1.12/options.yaml similarity index 100% rename from pkg/minikube/bootstrapper/kubeadm/testdata/options__old.yaml rename to pkg/minikube/bootstrapper/kubeadm/testdata/v1.12/options.yaml diff --git a/pkg/minikube/bootstrapper/kubeadm/testdata/containerd-api-port__recent.yaml b/pkg/minikube/bootstrapper/kubeadm/testdata/v1.13/containerd-api-port.yaml similarity index 93% rename from pkg/minikube/bootstrapper/kubeadm/testdata/containerd-api-port__recent.yaml rename to pkg/minikube/bootstrapper/kubeadm/testdata/v1.13/containerd-api-port.yaml index 3b3452b131d1..e77675563162 100644 --- a/pkg/minikube/bootstrapper/kubeadm/testdata/containerd-api-port__recent.yaml +++ b/pkg/minikube/bootstrapper/kubeadm/testdata/v1.13/containerd-api-port.yaml @@ -1,4 +1,4 @@ -apiVersion: kubeadm.k8s.io/v1beta1 +apiVersion: kubeadm.k8s.io/v1alpha3 kind: InitConfiguration apiEndpoint: advertiseAddress: 1.1.1.1 @@ -15,7 +15,7 @@ nodeRegistration: name: mk taints: [] --- -apiVersion: kubeadm.k8s.io/v1beta1 +apiVersion: kubeadm.k8s.io/v1alpha3 kind: ClusterConfiguration apiServerExtraArgs: enable-admission-plugins: "Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" diff --git a/pkg/minikube/bootstrapper/kubeadm/testdata/containerd-pod-network-cidr__recent.yaml b/pkg/minikube/bootstrapper/kubeadm/testdata/v1.13/containerd-pod-network-cidr.yaml similarity index 93% rename from pkg/minikube/bootstrapper/kubeadm/testdata/containerd-pod-network-cidr__recent.yaml rename to pkg/minikube/bootstrapper/kubeadm/testdata/v1.13/containerd-pod-network-cidr.yaml index 0d2f6f2d64e6..ecc9a146311f 100644 --- a/pkg/minikube/bootstrapper/kubeadm/testdata/containerd-pod-network-cidr__recent.yaml +++ b/pkg/minikube/bootstrapper/kubeadm/testdata/v1.13/containerd-pod-network-cidr.yaml @@ -1,4 +1,4 @@ -apiVersion: kubeadm.k8s.io/v1beta1 +apiVersion: kubeadm.k8s.io/v1alpha3 kind: InitConfiguration apiEndpoint: advertiseAddress: 1.1.1.1 @@ -15,7 +15,7 @@ nodeRegistration: name: mk taints: [] --- -apiVersion: kubeadm.k8s.io/v1beta1 +apiVersion: kubeadm.k8s.io/v1alpha3 kind: ClusterConfiguration apiServerExtraArgs: enable-admission-plugins: "Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" diff --git a/pkg/minikube/bootstrapper/kubeadm/testdata/containerd__recent.yaml b/pkg/minikube/bootstrapper/kubeadm/testdata/v1.13/containerd.yaml similarity index 93% rename from pkg/minikube/bootstrapper/kubeadm/testdata/containerd__recent.yaml rename to pkg/minikube/bootstrapper/kubeadm/testdata/v1.13/containerd.yaml index 1838149d29aa..a852561fbea0 100644 --- a/pkg/minikube/bootstrapper/kubeadm/testdata/containerd__recent.yaml +++ b/pkg/minikube/bootstrapper/kubeadm/testdata/v1.13/containerd.yaml @@ -1,4 +1,4 @@ -apiVersion: kubeadm.k8s.io/v1beta1 +apiVersion: kubeadm.k8s.io/v1alpha3 kind: InitConfiguration apiEndpoint: advertiseAddress: 1.1.1.1 @@ -15,7 +15,7 @@ nodeRegistration: name: mk taints: [] --- -apiVersion: kubeadm.k8s.io/v1beta1 +apiVersion: kubeadm.k8s.io/v1alpha3 kind: ClusterConfiguration apiServerExtraArgs: enable-admission-plugins: "Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" diff --git a/pkg/minikube/bootstrapper/kubeadm/testdata/crio-options-gates__recent.yaml b/pkg/minikube/bootstrapper/kubeadm/testdata/v1.13/crio-options-gates.yaml similarity index 92% rename from pkg/minikube/bootstrapper/kubeadm/testdata/crio-options-gates__recent.yaml rename to pkg/minikube/bootstrapper/kubeadm/testdata/v1.13/crio-options-gates.yaml index a61edf583594..9e5812dbdab8 100644 --- a/pkg/minikube/bootstrapper/kubeadm/testdata/crio-options-gates__recent.yaml +++ b/pkg/minikube/bootstrapper/kubeadm/testdata/v1.13/crio-options-gates.yaml @@ -1,4 +1,5 @@ -apiVersion: kubeadm.k8s.io/v1beta1 +apiVersion: kubeadm.k8s.io/v1alpha3 +kind: InitConfiguration apiEndpoint: advertiseAddress: 1.1.1.1 bindPort: 8443 @@ -14,7 +15,7 @@ nodeRegistration: name: mk taints: [] --- -apiVersion: kubeadm.k8s.io/v1beta1 +apiVersion: kubeadm.k8s.io/v1alpha3 kind: ClusterConfiguration apiServerExtraArgs: enable-admission-plugins: "Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" diff --git a/pkg/minikube/bootstrapper/kubeadm/testdata/crio__recent.yaml b/pkg/minikube/bootstrapper/kubeadm/testdata/v1.13/crio.yaml similarity index 93% rename from pkg/minikube/bootstrapper/kubeadm/testdata/crio__recent.yaml rename to pkg/minikube/bootstrapper/kubeadm/testdata/v1.13/crio.yaml index d361ec92797b..57b9f1b12217 100644 --- a/pkg/minikube/bootstrapper/kubeadm/testdata/crio__recent.yaml +++ b/pkg/minikube/bootstrapper/kubeadm/testdata/v1.13/crio.yaml @@ -1,4 +1,4 @@ -apiVersion: kubeadm.k8s.io/v1beta1 +apiVersion: kubeadm.k8s.io/v1alpha3 kind: InitConfiguration apiEndpoint: advertiseAddress: 1.1.1.1 @@ -15,7 +15,7 @@ nodeRegistration: name: mk taints: [] --- -apiVersion: kubeadm.k8s.io/v1beta1 +apiVersion: kubeadm.k8s.io/v1alpha3 kind: ClusterConfiguration apiServerExtraArgs: enable-admission-plugins: "Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" diff --git a/pkg/minikube/bootstrapper/kubeadm/testdata/default__recent.yaml b/pkg/minikube/bootstrapper/kubeadm/testdata/v1.13/default.yaml similarity index 93% rename from pkg/minikube/bootstrapper/kubeadm/testdata/default__recent.yaml rename to pkg/minikube/bootstrapper/kubeadm/testdata/v1.13/default.yaml index 45e41ce14848..db611e22633e 100644 --- a/pkg/minikube/bootstrapper/kubeadm/testdata/default__recent.yaml +++ b/pkg/minikube/bootstrapper/kubeadm/testdata/v1.13/default.yaml @@ -1,4 +1,4 @@ -apiVersion: kubeadm.k8s.io/v1beta1 +apiVersion: kubeadm.k8s.io/v1alpha3 kind: InitConfiguration apiEndpoint: advertiseAddress: 1.1.1.1 @@ -15,7 +15,7 @@ nodeRegistration: name: mk taints: [] --- -apiVersion: kubeadm.k8s.io/v1beta1 +apiVersion: kubeadm.k8s.io/v1alpha3 kind: ClusterConfiguration apiServerExtraArgs: enable-admission-plugins: "Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" diff --git a/pkg/minikube/bootstrapper/kubeadm/testdata/image-repository__recent.yaml b/pkg/minikube/bootstrapper/kubeadm/testdata/v1.13/image-repository.yaml similarity index 93% rename from pkg/minikube/bootstrapper/kubeadm/testdata/image-repository__recent.yaml rename to pkg/minikube/bootstrapper/kubeadm/testdata/v1.13/image-repository.yaml index f0b1d1814737..037dd6add234 100644 --- a/pkg/minikube/bootstrapper/kubeadm/testdata/image-repository__recent.yaml +++ b/pkg/minikube/bootstrapper/kubeadm/testdata/v1.13/image-repository.yaml @@ -1,4 +1,4 @@ -apiVersion: kubeadm.k8s.io/v1beta1 +apiVersion: kubeadm.k8s.io/v1alpha3 kind: InitConfiguration apiEndpoint: advertiseAddress: 1.1.1.1 @@ -15,7 +15,7 @@ nodeRegistration: name: mk taints: [] --- -apiVersion: kubeadm.k8s.io/v1beta1 +apiVersion: kubeadm.k8s.io/v1alpha3 kind: ClusterConfiguration imageRepository: test/repo apiServerExtraArgs: diff --git a/pkg/minikube/bootstrapper/kubeadm/testdata/options__recent.yaml b/pkg/minikube/bootstrapper/kubeadm/testdata/v1.13/options.yaml similarity index 94% rename from pkg/minikube/bootstrapper/kubeadm/testdata/options__recent.yaml rename to pkg/minikube/bootstrapper/kubeadm/testdata/v1.13/options.yaml index 3a6c0cb18ebc..f1df66954d16 100644 --- a/pkg/minikube/bootstrapper/kubeadm/testdata/options__recent.yaml +++ b/pkg/minikube/bootstrapper/kubeadm/testdata/v1.13/options.yaml @@ -1,4 +1,4 @@ -apiVersion: kubeadm.k8s.io/v1beta1 +apiVersion: kubeadm.k8s.io/v1alpha3 kind: InitConfiguration apiEndpoint: advertiseAddress: 1.1.1.1 @@ -15,7 +15,7 @@ nodeRegistration: name: mk taints: [] --- -apiVersion: kubeadm.k8s.io/v1beta1 +apiVersion: kubeadm.k8s.io/v1alpha3 kind: ClusterConfiguration apiServerExtraArgs: enable-admission-plugins: "Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" diff --git a/pkg/minikube/bootstrapper/kubeadm/testdata/containerd-api-port__new.yaml b/pkg/minikube/bootstrapper/kubeadm/testdata/v1.14/containerd-api-port.yaml similarity index 97% rename from pkg/minikube/bootstrapper/kubeadm/testdata/containerd-api-port__new.yaml rename to pkg/minikube/bootstrapper/kubeadm/testdata/v1.14/containerd-api-port.yaml index 0fbf400ebf03..cc96f136ac4b 100644 --- a/pkg/minikube/bootstrapper/kubeadm/testdata/containerd-api-port__new.yaml +++ b/pkg/minikube/bootstrapper/kubeadm/testdata/v1.14/containerd-api-port.yaml @@ -28,7 +28,7 @@ dns: etcd: local: dataDir: /data/minikube -kubernetesVersion: v1.15.0 +kubernetesVersion: v1.14.0 networking: dnsDomain: cluster.local podSubnet: "" diff --git a/pkg/minikube/bootstrapper/kubeadm/testdata/containerd__new.yaml b/pkg/minikube/bootstrapper/kubeadm/testdata/v1.14/containerd-pod-network-cidr.yaml similarity index 97% rename from pkg/minikube/bootstrapper/kubeadm/testdata/containerd__new.yaml rename to pkg/minikube/bootstrapper/kubeadm/testdata/v1.14/containerd-pod-network-cidr.yaml index c6354e860bcb..147a6ccbec0d 100644 --- a/pkg/minikube/bootstrapper/kubeadm/testdata/containerd__new.yaml +++ b/pkg/minikube/bootstrapper/kubeadm/testdata/v1.14/containerd-pod-network-cidr.yaml @@ -28,7 +28,7 @@ dns: etcd: local: dataDir: /data/minikube -kubernetesVersion: v1.15.0 +kubernetesVersion: v1.14.0 networking: dnsDomain: cluster.local podSubnet: "" diff --git a/pkg/minikube/bootstrapper/kubeadm/testdata/containerd__default.yaml b/pkg/minikube/bootstrapper/kubeadm/testdata/v1.14/containerd.yaml similarity index 97% rename from pkg/minikube/bootstrapper/kubeadm/testdata/containerd__default.yaml rename to pkg/minikube/bootstrapper/kubeadm/testdata/v1.14/containerd.yaml index c6354e860bcb..147a6ccbec0d 100644 --- a/pkg/minikube/bootstrapper/kubeadm/testdata/containerd__default.yaml +++ b/pkg/minikube/bootstrapper/kubeadm/testdata/v1.14/containerd.yaml @@ -28,7 +28,7 @@ dns: etcd: local: dataDir: /data/minikube -kubernetesVersion: v1.15.0 +kubernetesVersion: v1.14.0 networking: dnsDomain: cluster.local podSubnet: "" diff --git a/pkg/minikube/bootstrapper/kubeadm/testdata/crio-options-gates__new.yaml b/pkg/minikube/bootstrapper/kubeadm/testdata/v1.14/crio-options-gates.yaml similarity index 97% rename from pkg/minikube/bootstrapper/kubeadm/testdata/crio-options-gates__new.yaml rename to pkg/minikube/bootstrapper/kubeadm/testdata/v1.14/crio-options-gates.yaml index 78bbe09f1ce6..1b35bce5c6a8 100644 --- a/pkg/minikube/bootstrapper/kubeadm/testdata/crio-options-gates__new.yaml +++ b/pkg/minikube/bootstrapper/kubeadm/testdata/v1.14/crio-options-gates.yaml @@ -38,7 +38,7 @@ dns: etcd: local: dataDir: /data/minikube -kubernetesVersion: v1.15.0 +kubernetesVersion: v1.14.0 networking: dnsDomain: cluster.local podSubnet: "" diff --git a/pkg/minikube/bootstrapper/kubeadm/testdata/crio__new.yaml b/pkg/minikube/bootstrapper/kubeadm/testdata/v1.14/crio.yaml similarity index 97% rename from pkg/minikube/bootstrapper/kubeadm/testdata/crio__new.yaml rename to pkg/minikube/bootstrapper/kubeadm/testdata/v1.14/crio.yaml index b956109b8178..66dac1c8af47 100644 --- a/pkg/minikube/bootstrapper/kubeadm/testdata/crio__new.yaml +++ b/pkg/minikube/bootstrapper/kubeadm/testdata/v1.14/crio.yaml @@ -28,7 +28,7 @@ dns: etcd: local: dataDir: /data/minikube -kubernetesVersion: v1.15.0 +kubernetesVersion: v1.14.0 networking: dnsDomain: cluster.local podSubnet: "" diff --git a/pkg/minikube/bootstrapper/kubeadm/testdata/default__new.yaml b/pkg/minikube/bootstrapper/kubeadm/testdata/v1.14/default.yaml similarity index 97% rename from pkg/minikube/bootstrapper/kubeadm/testdata/default__new.yaml rename to pkg/minikube/bootstrapper/kubeadm/testdata/v1.14/default.yaml index 46d6e4e78ca0..d88c0efebf78 100644 --- a/pkg/minikube/bootstrapper/kubeadm/testdata/default__new.yaml +++ b/pkg/minikube/bootstrapper/kubeadm/testdata/v1.14/default.yaml @@ -28,7 +28,7 @@ dns: etcd: local: dataDir: /data/minikube -kubernetesVersion: v1.15.0 +kubernetesVersion: v1.14.0 networking: dnsDomain: cluster.local podSubnet: "" diff --git a/pkg/minikube/bootstrapper/kubeadm/testdata/image-repository__new.yaml b/pkg/minikube/bootstrapper/kubeadm/testdata/v1.14/image-repository.yaml similarity index 97% rename from pkg/minikube/bootstrapper/kubeadm/testdata/image-repository__new.yaml rename to pkg/minikube/bootstrapper/kubeadm/testdata/v1.14/image-repository.yaml index 8ab50ff90286..bf53791b717f 100644 --- a/pkg/minikube/bootstrapper/kubeadm/testdata/image-repository__new.yaml +++ b/pkg/minikube/bootstrapper/kubeadm/testdata/v1.14/image-repository.yaml @@ -29,7 +29,7 @@ dns: etcd: local: dataDir: /data/minikube -kubernetesVersion: v1.15.0 +kubernetesVersion: v1.14.0 networking: dnsDomain: cluster.local podSubnet: "" diff --git a/pkg/minikube/bootstrapper/kubeadm/testdata/options__new.yaml b/pkg/minikube/bootstrapper/kubeadm/testdata/v1.14/options.yaml similarity index 97% rename from pkg/minikube/bootstrapper/kubeadm/testdata/options__new.yaml rename to pkg/minikube/bootstrapper/kubeadm/testdata/v1.14/options.yaml index 2e6f561dd489..a85a2447b206 100644 --- a/pkg/minikube/bootstrapper/kubeadm/testdata/options__new.yaml +++ b/pkg/minikube/bootstrapper/kubeadm/testdata/v1.14/options.yaml @@ -35,7 +35,7 @@ dns: etcd: local: dataDir: /data/minikube -kubernetesVersion: v1.15.0 +kubernetesVersion: v1.14.0 networking: dnsDomain: cluster.local podSubnet: "" diff --git a/pkg/minikube/bootstrapper/kubeadm/testdata/containerd-api-port__default.yaml b/pkg/minikube/bootstrapper/kubeadm/testdata/v1.15/containerd-api-port.yaml similarity index 100% rename from pkg/minikube/bootstrapper/kubeadm/testdata/containerd-api-port__default.yaml rename to pkg/minikube/bootstrapper/kubeadm/testdata/v1.15/containerd-api-port.yaml diff --git a/pkg/minikube/bootstrapper/kubeadm/testdata/containerd-pod-network-cidr__default.yaml b/pkg/minikube/bootstrapper/kubeadm/testdata/v1.15/containerd-pod-network-cidr.yaml similarity index 100% rename from pkg/minikube/bootstrapper/kubeadm/testdata/containerd-pod-network-cidr__default.yaml rename to pkg/minikube/bootstrapper/kubeadm/testdata/v1.15/containerd-pod-network-cidr.yaml diff --git a/pkg/minikube/bootstrapper/kubeadm/testdata/containerd-pod-network-cidr__new.yaml b/pkg/minikube/bootstrapper/kubeadm/testdata/v1.15/containerd.yaml similarity index 100% rename from pkg/minikube/bootstrapper/kubeadm/testdata/containerd-pod-network-cidr__new.yaml rename to pkg/minikube/bootstrapper/kubeadm/testdata/v1.15/containerd.yaml diff --git a/pkg/minikube/bootstrapper/kubeadm/testdata/crio-options-gates__default.yaml b/pkg/minikube/bootstrapper/kubeadm/testdata/v1.15/crio-options-gates.yaml similarity index 100% rename from pkg/minikube/bootstrapper/kubeadm/testdata/crio-options-gates__default.yaml rename to pkg/minikube/bootstrapper/kubeadm/testdata/v1.15/crio-options-gates.yaml diff --git a/pkg/minikube/bootstrapper/kubeadm/testdata/crio__default.yaml b/pkg/minikube/bootstrapper/kubeadm/testdata/v1.15/crio.yaml similarity index 100% rename from pkg/minikube/bootstrapper/kubeadm/testdata/crio__default.yaml rename to pkg/minikube/bootstrapper/kubeadm/testdata/v1.15/crio.yaml diff --git a/pkg/minikube/bootstrapper/kubeadm/testdata/default__default.yaml b/pkg/minikube/bootstrapper/kubeadm/testdata/v1.15/default.yaml similarity index 100% rename from pkg/minikube/bootstrapper/kubeadm/testdata/default__default.yaml rename to pkg/minikube/bootstrapper/kubeadm/testdata/v1.15/default.yaml diff --git a/pkg/minikube/bootstrapper/kubeadm/testdata/image-repository__default.yaml b/pkg/minikube/bootstrapper/kubeadm/testdata/v1.15/image-repository.yaml similarity index 100% rename from pkg/minikube/bootstrapper/kubeadm/testdata/image-repository__default.yaml rename to pkg/minikube/bootstrapper/kubeadm/testdata/v1.15/image-repository.yaml diff --git a/pkg/minikube/bootstrapper/kubeadm/testdata/options__default.yaml b/pkg/minikube/bootstrapper/kubeadm/testdata/v1.15/options.yaml similarity index 100% rename from pkg/minikube/bootstrapper/kubeadm/testdata/options__default.yaml rename to pkg/minikube/bootstrapper/kubeadm/testdata/v1.15/options.yaml From c2569cf0d704c7c67f463abc43f68d58bc360567 Mon Sep 17 00:00:00 2001 From: Thomas Stromberg Date: Thu, 20 Jun 2019 15:38:30 +0800 Subject: [PATCH 4/4] Run goimports --- pkg/minikube/bootstrapper/kubeadm/kubeadm_test.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkg/minikube/bootstrapper/kubeadm/kubeadm_test.go b/pkg/minikube/bootstrapper/kubeadm/kubeadm_test.go index 6a691c950e40..4a1662862ec1 100644 --- a/pkg/minikube/bootstrapper/kubeadm/kubeadm_test.go +++ b/pkg/minikube/bootstrapper/kubeadm/kubeadm_test.go @@ -29,7 +29,6 @@ import ( "k8s.io/minikube/pkg/util" ) - func TestGenerateKubeletConfig(t *testing.T) { tests := []struct { description string @@ -172,7 +171,7 @@ func TestGenerateConfig(t *testing.T) { versions := []string{"v1.15", "v1.14", "v1.13", "v1.12", "v1.11", "v1.10"} foundNewest := false foundDefault := false - + for _, v := range versions { if strings.HasPrefix(constants.NewestKubernetesVersion, v) { foundNewest = true @@ -189,7 +188,7 @@ func TestGenerateConfig(t *testing.T) { if !foundDefault { t.Errorf("No tests exist yet for default minor version: %s", constants.DefaultKubernetesVersion) } - + tests := []struct { name string runtime string