Skip to content

Commit

Permalink
Merge pull request #7030 from wallrj/7028-kubeadm-v1beta2-extra-confi…
Browse files Browse the repository at this point in the history 
…g-controller-manager

Remove controllerManager from the kubeadm v1beta2 template
  • Loading branch information
@medyagh
medyagh authored Mar 16, 2020
2 parents bf1b6d7 + bee2907 commit 82900a7
Show file tree
Hide file tree
Showing 28 changed files with 0 additions and 28 deletions.
1 change: 0 additions & 1 deletion pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta2.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ kind: ClusterConfiguration
certificatesDir: {{.CertDir}}
clusterName: kubernetes
controlPlaneEndpoint: {{.ControlPlaneAddress}}:{{.APIServerPort}}
controllerManager: {}
dns:
type: CoreDNS
etcd:
Expand Down
1 change: 0 additions & 1 deletion pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd-api-port.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ apiServer:
certificatesDir: /var/lib/minikube/certs
clusterName: kubernetes
controlPlaneEndpoint: localhost:12345
controllerManager: {}
dns:
type: CoreDNS
etcd:
Expand Down
1 change: 0 additions & 1 deletion pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd-pod-network-cidr.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ apiServer:
certificatesDir: /var/lib/minikube/certs
clusterName: kubernetes
controlPlaneEndpoint: localhost:8443
controllerManager: {}
dns:
type: CoreDNS
etcd:
Expand Down
1 change: 0 additions & 1 deletion pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ apiServer:
certificatesDir: /var/lib/minikube/certs
clusterName: kubernetes
controlPlaneEndpoint: localhost:8443
controllerManager: {}
dns:
type: CoreDNS
etcd:
Expand Down
1 change: 0 additions & 1 deletion pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio-options-gates.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ scheduler:
certificatesDir: /var/lib/minikube/certs
clusterName: kubernetes
controlPlaneEndpoint: localhost:8443
controllerManager: {}
dns:
type: CoreDNS
etcd:
Expand Down
1 change: 0 additions & 1 deletion pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ apiServer:
certificatesDir: /var/lib/minikube/certs
clusterName: kubernetes
controlPlaneEndpoint: localhost:8443
controllerManager: {}
dns:
type: CoreDNS
etcd:
Expand Down
1 change: 0 additions & 1 deletion pkg/minikube/bootstrapper/bsutil/testdata/v1.17/default.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ apiServer:
certificatesDir: /var/lib/minikube/certs
clusterName: kubernetes
controlPlaneEndpoint: localhost:8443
controllerManager: {}
dns:
type: CoreDNS
etcd:
Expand Down
1 change: 0 additions & 1 deletion pkg/minikube/bootstrapper/bsutil/testdata/v1.17/dns.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ apiServer:
certificatesDir: /var/lib/minikube/certs
clusterName: kubernetes
controlPlaneEndpoint: localhost:8443
controllerManager: {}
dns:
type: CoreDNS
etcd:
Expand Down
1 change: 0 additions & 1 deletion pkg/minikube/bootstrapper/bsutil/testdata/v1.17/image-repository.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ apiServer:
certificatesDir: /var/lib/minikube/certs
clusterName: kubernetes
controlPlaneEndpoint: localhost:8443
controllerManager: {}
dns:
type: CoreDNS
etcd:
Expand Down
1 change: 0 additions & 1 deletion pkg/minikube/bootstrapper/bsutil/testdata/v1.17/options.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ scheduler:
certificatesDir: /var/lib/minikube/certs
clusterName: kubernetes
controlPlaneEndpoint: localhost:8443
controllerManager: {}
dns:
type: CoreDNS
etcd:
Expand Down
1 change: 0 additions & 1 deletion pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd-api-port.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ apiServer:
certificatesDir: /var/lib/minikube/certs
clusterName: kubernetes
controlPlaneEndpoint: localhost:12345
controllerManager: {}
dns:
type: CoreDNS
etcd:
Expand Down
1 change: 0 additions & 1 deletion pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd-pod-network-cidr.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ apiServer:
certificatesDir: /var/lib/minikube/certs
clusterName: kubernetes
controlPlaneEndpoint: localhost:8443
controllerManager: {}
dns:
type: CoreDNS
etcd:
Expand Down
1 change: 0 additions & 1 deletion pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ apiServer:
certificatesDir: /var/lib/minikube/certs
clusterName: kubernetes
controlPlaneEndpoint: localhost:8443
controllerManager: {}
dns:
type: CoreDNS
etcd:
Expand Down
1 change: 0 additions & 1 deletion pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio-options-gates.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ scheduler:
certificatesDir: /var/lib/minikube/certs
clusterName: kubernetes
controlPlaneEndpoint: localhost:8443
controllerManager: {}
dns:
type: CoreDNS
etcd:
Expand Down
1 change: 0 additions & 1 deletion pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ apiServer:
certificatesDir: /var/lib/minikube/certs
clusterName: kubernetes
controlPlaneEndpoint: localhost:8443
controllerManager: {}
dns:
type: CoreDNS
etcd:
Expand Down
1 change: 0 additions & 1 deletion pkg/minikube/bootstrapper/bsutil/testdata/v1.18/default.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ apiServer:
certificatesDir: /var/lib/minikube/certs
clusterName: kubernetes
controlPlaneEndpoint: localhost:8443
controllerManager: {}
dns:
type: CoreDNS
etcd:
Expand Down
1 change: 0 additions & 1 deletion pkg/minikube/bootstrapper/bsutil/testdata/v1.18/dns.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ apiServer:
certificatesDir: /var/lib/minikube/certs
clusterName: kubernetes
controlPlaneEndpoint: localhost:8443
controllerManager: {}
dns:
type: CoreDNS
etcd:
Expand Down
1 change: 0 additions & 1 deletion pkg/minikube/bootstrapper/bsutil/testdata/v1.18/image-repository.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ apiServer:
certificatesDir: /var/lib/minikube/certs
clusterName: kubernetes
controlPlaneEndpoint: localhost:8443
controllerManager: {}
dns:
type: CoreDNS
etcd:
Expand Down
1 change: 0 additions & 1 deletion pkg/minikube/bootstrapper/bsutil/testdata/v1.18/options.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ scheduler:
certificatesDir: /var/lib/minikube/certs
clusterName: kubernetes
controlPlaneEndpoint: localhost:8443
controllerManager: {}
dns:
type: CoreDNS
etcd:
Expand Down
1 change: 0 additions & 1 deletion pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd-api-port.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ apiServer:
certificatesDir: /var/lib/minikube/certs
clusterName: kubernetes
controlPlaneEndpoint: localhost:12345
controllerManager: {}
dns:
type: CoreDNS
etcd:
Expand Down
1 change: 0 additions & 1 deletion pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd-pod-network-cidr.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ apiServer:
certificatesDir: /var/lib/minikube/certs
clusterName: kubernetes
controlPlaneEndpoint: localhost:8443
controllerManager: {}
dns:
type: CoreDNS
etcd:
Expand Down
1 change: 0 additions & 1 deletion pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ apiServer:
certificatesDir: /var/lib/minikube/certs
clusterName: kubernetes
controlPlaneEndpoint: localhost:8443
controllerManager: {}
dns:
type: CoreDNS
etcd:
Expand Down
1 change: 0 additions & 1 deletion pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio-options-gates.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ scheduler:
certificatesDir: /var/lib/minikube/certs
clusterName: kubernetes
controlPlaneEndpoint: localhost:8443
controllerManager: {}
dns:
type: CoreDNS
etcd:
Expand Down
1 change: 0 additions & 1 deletion pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ apiServer:
certificatesDir: /var/lib/minikube/certs
clusterName: kubernetes
controlPlaneEndpoint: localhost:8443
controllerManager: {}
dns:
type: CoreDNS
etcd:
Expand Down
1 change: 0 additions & 1 deletion pkg/minikube/bootstrapper/bsutil/testdata/v1.19/default.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ apiServer:
certificatesDir: /var/lib/minikube/certs
clusterName: kubernetes
controlPlaneEndpoint: localhost:8443
controllerManager: {}
dns:
type: CoreDNS
etcd:
Expand Down
1 change: 0 additions & 1 deletion pkg/minikube/bootstrapper/bsutil/testdata/v1.19/dns.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ apiServer:
certificatesDir: /var/lib/minikube/certs
clusterName: kubernetes
controlPlaneEndpoint: localhost:8443
controllerManager: {}
dns:
type: CoreDNS
etcd:
Expand Down
1 change: 0 additions & 1 deletion pkg/minikube/bootstrapper/bsutil/testdata/v1.19/image-repository.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ apiServer:
certificatesDir: /var/lib/minikube/certs
clusterName: kubernetes
controlPlaneEndpoint: localhost:8443
controllerManager: {}
dns:
type: CoreDNS
etcd:
Expand Down
1 change: 0 additions & 1 deletion pkg/minikube/bootstrapper/bsutil/testdata/v1.19/options.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ scheduler:
certificatesDir: /var/lib/minikube/certs
clusterName: kubernetes
controlPlaneEndpoint: localhost:8443
controllerManager: {}
dns:
type: CoreDNS
etcd:
Expand Down

0 comments on commit 82900a7

Please sign in to comment.