From bee2907b8affa4d2369b7225ecc49ff76fb2d027 Mon Sep 17 00:00:00 2001 From: Richard Wall Date: Fri, 13 Mar 2020 17:01:35 +0000 Subject: [PATCH] Remove controllerManager from the kubeadm v1beta2 template Signed-off-by: Richard Wall --- pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta2.go | 1 - .../bootstrapper/bsutil/testdata/v1.17/containerd-api-port.yaml | 1 - .../bsutil/testdata/v1.17/containerd-pod-network-cidr.yaml | 1 - pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd.yaml | 1 - .../bootstrapper/bsutil/testdata/v1.17/crio-options-gates.yaml | 1 - pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio.yaml | 1 - pkg/minikube/bootstrapper/bsutil/testdata/v1.17/default.yaml | 1 - pkg/minikube/bootstrapper/bsutil/testdata/v1.17/dns.yaml | 1 - .../bootstrapper/bsutil/testdata/v1.17/image-repository.yaml | 1 - pkg/minikube/bootstrapper/bsutil/testdata/v1.17/options.yaml | 1 - .../bootstrapper/bsutil/testdata/v1.18/containerd-api-port.yaml | 1 - .../bsutil/testdata/v1.18/containerd-pod-network-cidr.yaml | 1 - pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd.yaml | 1 - .../bootstrapper/bsutil/testdata/v1.18/crio-options-gates.yaml | 1 - pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio.yaml | 1 - pkg/minikube/bootstrapper/bsutil/testdata/v1.18/default.yaml | 1 - pkg/minikube/bootstrapper/bsutil/testdata/v1.18/dns.yaml | 1 - .../bootstrapper/bsutil/testdata/v1.18/image-repository.yaml | 1 - pkg/minikube/bootstrapper/bsutil/testdata/v1.18/options.yaml | 1 - .../bootstrapper/bsutil/testdata/v1.19/containerd-api-port.yaml | 1 - .../bsutil/testdata/v1.19/containerd-pod-network-cidr.yaml | 1 - pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd.yaml | 1 - .../bootstrapper/bsutil/testdata/v1.19/crio-options-gates.yaml | 1 - pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio.yaml | 1 - pkg/minikube/bootstrapper/bsutil/testdata/v1.19/default.yaml | 1 - pkg/minikube/bootstrapper/bsutil/testdata/v1.19/dns.yaml | 1 - .../bootstrapper/bsutil/testdata/v1.19/image-repository.yaml | 1 - pkg/minikube/bootstrapper/bsutil/testdata/v1.19/options.yaml | 1 - 28 files changed, 28 deletions(-) diff --git a/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta2.go b/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta2.go index c4718f9c98cc..d4894876bb55 100644 --- a/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta2.go +++ b/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta2.go @@ -58,7 +58,6 @@ kind: ClusterConfiguration certificatesDir: {{.CertDir}} clusterName: kubernetes controlPlaneEndpoint: {{.ControlPlaneAddress}}:{{.APIServerPort}} -controllerManager: {} dns: type: CoreDNS etcd: diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd-api-port.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd-api-port.yaml index f10bad367879..cc6ffe6f0b82 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd-api-port.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd-api-port.yaml @@ -26,7 +26,6 @@ apiServer: certificatesDir: /var/lib/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:12345 -controllerManager: {} dns: type: CoreDNS etcd: diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd-pod-network-cidr.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd-pod-network-cidr.yaml index a8b4286a19fd..e2c056197741 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd-pod-network-cidr.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd-pod-network-cidr.yaml @@ -26,7 +26,6 @@ apiServer: certificatesDir: /var/lib/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 -controllerManager: {} dns: type: CoreDNS etcd: diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd.yaml index 4eb28ddba960..966a8bd99389 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd.yaml @@ -26,7 +26,6 @@ apiServer: certificatesDir: /var/lib/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 -controllerManager: {} dns: type: CoreDNS etcd: diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio-options-gates.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio-options-gates.yaml index 78f465b4ab19..e8cbd19ca935 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio-options-gates.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio-options-gates.yaml @@ -36,7 +36,6 @@ scheduler: certificatesDir: /var/lib/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 -controllerManager: {} dns: type: CoreDNS etcd: diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio.yaml index 179f18da35e1..7be737204491 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio.yaml @@ -26,7 +26,6 @@ apiServer: certificatesDir: /var/lib/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 -controllerManager: {} dns: type: CoreDNS etcd: diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/default.yaml index b223f2a7c559..92d300e3167b 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/default.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/default.yaml @@ -26,7 +26,6 @@ apiServer: certificatesDir: /var/lib/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 -controllerManager: {} dns: type: CoreDNS etcd: diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/dns.yaml index 5e8102e6ed87..aaed488d7bf8 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/dns.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/dns.yaml @@ -26,7 +26,6 @@ apiServer: certificatesDir: /var/lib/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 -controllerManager: {} dns: type: CoreDNS etcd: diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/image-repository.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/image-repository.yaml index 676e6de52bc2..29539e671c47 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/image-repository.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/image-repository.yaml @@ -27,7 +27,6 @@ apiServer: certificatesDir: /var/lib/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 -controllerManager: {} dns: type: CoreDNS etcd: diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/options.yaml index 608569fb84b7..34ceceafab19 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/options.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/options.yaml @@ -33,7 +33,6 @@ scheduler: certificatesDir: /var/lib/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 -controllerManager: {} dns: type: CoreDNS etcd: diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd-api-port.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd-api-port.yaml index af5af1f0225c..8b43a8ff90a6 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd-api-port.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd-api-port.yaml @@ -26,7 +26,6 @@ apiServer: certificatesDir: /var/lib/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:12345 -controllerManager: {} dns: type: CoreDNS etcd: diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd-pod-network-cidr.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd-pod-network-cidr.yaml index b1f3d8214f85..df0718542eca 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd-pod-network-cidr.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd-pod-network-cidr.yaml @@ -26,7 +26,6 @@ apiServer: certificatesDir: /var/lib/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 -controllerManager: {} dns: type: CoreDNS etcd: diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd.yaml index 317e578be82d..5ad344a4ae89 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd.yaml @@ -26,7 +26,6 @@ apiServer: certificatesDir: /var/lib/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 -controllerManager: {} dns: type: CoreDNS etcd: diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio-options-gates.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio-options-gates.yaml index 402ef57a02c9..f0b4a1886973 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio-options-gates.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio-options-gates.yaml @@ -36,7 +36,6 @@ scheduler: certificatesDir: /var/lib/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 -controllerManager: {} dns: type: CoreDNS etcd: diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio.yaml index 74a7bd15362c..87cd69c53cff 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio.yaml @@ -26,7 +26,6 @@ apiServer: certificatesDir: /var/lib/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 -controllerManager: {} dns: type: CoreDNS etcd: diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/default.yaml index 7caa19fa2be8..9e2c74b129a7 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/default.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/default.yaml @@ -26,7 +26,6 @@ apiServer: certificatesDir: /var/lib/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 -controllerManager: {} dns: type: CoreDNS etcd: diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/dns.yaml index 80a20ba800fe..5c654c39cba1 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/dns.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/dns.yaml @@ -26,7 +26,6 @@ apiServer: certificatesDir: /var/lib/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 -controllerManager: {} dns: type: CoreDNS etcd: diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/image-repository.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/image-repository.yaml index 7c1b7989db8d..afcdcea56521 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/image-repository.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/image-repository.yaml @@ -27,7 +27,6 @@ apiServer: certificatesDir: /var/lib/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 -controllerManager: {} dns: type: CoreDNS etcd: diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/options.yaml index 6205c948bcd0..014ce83eefa3 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/options.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/options.yaml @@ -33,7 +33,6 @@ scheduler: certificatesDir: /var/lib/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 -controllerManager: {} dns: type: CoreDNS etcd: diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd-api-port.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd-api-port.yaml index ba8872e7ce96..74fd2313e6f5 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd-api-port.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd-api-port.yaml @@ -26,7 +26,6 @@ apiServer: certificatesDir: /var/lib/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:12345 -controllerManager: {} dns: type: CoreDNS etcd: diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd-pod-network-cidr.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd-pod-network-cidr.yaml index 6b1a12c922c7..79de1f51237a 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd-pod-network-cidr.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd-pod-network-cidr.yaml @@ -26,7 +26,6 @@ apiServer: certificatesDir: /var/lib/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 -controllerManager: {} dns: type: CoreDNS etcd: diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd.yaml index c92bd1a31407..64df35076514 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd.yaml @@ -26,7 +26,6 @@ apiServer: certificatesDir: /var/lib/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 -controllerManager: {} dns: type: CoreDNS etcd: diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio-options-gates.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio-options-gates.yaml index 405c3354d271..be8c0aec3c5a 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio-options-gates.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio-options-gates.yaml @@ -36,7 +36,6 @@ scheduler: certificatesDir: /var/lib/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 -controllerManager: {} dns: type: CoreDNS etcd: diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio.yaml index c1dd4916df3d..f0f0d6318db8 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio.yaml @@ -26,7 +26,6 @@ apiServer: certificatesDir: /var/lib/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 -controllerManager: {} dns: type: CoreDNS etcd: diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/default.yaml index 9f76b719a73f..cfe2ec33ded1 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/default.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/default.yaml @@ -26,7 +26,6 @@ apiServer: certificatesDir: /var/lib/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 -controllerManager: {} dns: type: CoreDNS etcd: diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/dns.yaml index bc0db1cb07c1..dbbd63b757e5 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/dns.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/dns.yaml @@ -26,7 +26,6 @@ apiServer: certificatesDir: /var/lib/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 -controllerManager: {} dns: type: CoreDNS etcd: diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/image-repository.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/image-repository.yaml index 14cc7bb8b611..2abe0945cf09 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/image-repository.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/image-repository.yaml @@ -27,7 +27,6 @@ apiServer: certificatesDir: /var/lib/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 -controllerManager: {} dns: type: CoreDNS etcd: diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/options.yaml index 7b60865e1565..c35c0ea5883d 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/options.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/options.yaml @@ -33,7 +33,6 @@ scheduler: certificatesDir: /var/lib/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 -controllerManager: {} dns: type: CoreDNS etcd: