diff --git a/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta2.go b/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta2.go index c00835e8e7..50f8147d6f 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: mk 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 240d23984b..a4c4222b5b 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: mk controlPlaneEndpoint: 1.1.1.1: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 0ce3766fdb..cd1a400c07 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: mk controlPlaneEndpoint: 1.1.1.1: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 c5ecd93bc5..fe006e5d53 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: mk controlPlaneEndpoint: 1.1.1.1: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 cae9608f04..74ec1286eb 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: mk controlPlaneEndpoint: 1.1.1.1: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 d86d853915..3588d336df 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: mk controlPlaneEndpoint: 1.1.1.1: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 eef9a6c7ae..7651466f86 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: mk controlPlaneEndpoint: 1.1.1.1: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 86f4d03bd9..779cceeb46 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: mk controlPlaneEndpoint: 1.1.1.1: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 7b215a01b7..a37e2dda86 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: mk controlPlaneEndpoint: 1.1.1.1: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 dba5ff15d2..c940653ab5 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: mk controlPlaneEndpoint: 1.1.1.1: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 77acbb9ed7..4360299921 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: mk controlPlaneEndpoint: 1.1.1.1: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 5abe34481e..d714225d46 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: mk controlPlaneEndpoint: 1.1.1.1: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 a53b109047..64161c1b0a 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: mk controlPlaneEndpoint: 1.1.1.1: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 0235b34b1f..66dfb8c7ea 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: mk controlPlaneEndpoint: 1.1.1.1: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 d2907dcbc3..862711d0c9 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: mk controlPlaneEndpoint: 1.1.1.1: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 c921f54cdf..6e3eefc76d 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: mk controlPlaneEndpoint: 1.1.1.1: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 bd13212add..c463026f5f 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: mk controlPlaneEndpoint: 1.1.1.1: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 ef954470c0..55ca1f3421 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: mk controlPlaneEndpoint: 1.1.1.1: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 743cbb4e2d..9049b3f987 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: mk controlPlaneEndpoint: 1.1.1.1: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 1f5a6f8df8..c04d7a5011 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: mk controlPlaneEndpoint: 1.1.1.1: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 4cbe5b28d8..980c7e94e7 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: mk controlPlaneEndpoint: 1.1.1.1: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 c2b2c89a2b..0e28179d6b 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: mk controlPlaneEndpoint: 1.1.1.1: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 21f5c1080a..326f80a61d 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: mk controlPlaneEndpoint: 1.1.1.1: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 eb0abc25b0..72ea86b7bc 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: mk controlPlaneEndpoint: 1.1.1.1: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 692a5925a3..aa884e40d1 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: mk controlPlaneEndpoint: 1.1.1.1: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 e384cdda1f..b06f44e6b6 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: mk controlPlaneEndpoint: 1.1.1.1: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 7b50680f2c..7d8f48ca3d 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: mk controlPlaneEndpoint: 1.1.1.1: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 a134555f6a..0adff142eb 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: mk controlPlaneEndpoint: 1.1.1.1:8443 -controllerManager: {} dns: type: CoreDNS etcd: