Merge branch 'master' of github.com:kubernetes/minikube into m2
commit
f387032d7f
|
@ -58,7 +58,6 @@ kind: ClusterConfiguration
|
||||||
certificatesDir: {{.CertDir}}
|
certificatesDir: {{.CertDir}}
|
||||||
clusterName: mk
|
clusterName: mk
|
||||||
controlPlaneEndpoint: {{.ControlPlaneAddress}}:{{.APIServerPort}}
|
controlPlaneEndpoint: {{.ControlPlaneAddress}}:{{.APIServerPort}}
|
||||||
controllerManager: {}
|
|
||||||
dns:
|
dns:
|
||||||
type: CoreDNS
|
type: CoreDNS
|
||||||
etcd:
|
etcd:
|
||||||
|
|
|
@ -26,7 +26,6 @@ apiServer:
|
||||||
certificatesDir: /var/lib/minikube/certs
|
certificatesDir: /var/lib/minikube/certs
|
||||||
clusterName: mk
|
clusterName: mk
|
||||||
controlPlaneEndpoint: 1.1.1.1:12345
|
controlPlaneEndpoint: 1.1.1.1:12345
|
||||||
controllerManager: {}
|
|
||||||
dns:
|
dns:
|
||||||
type: CoreDNS
|
type: CoreDNS
|
||||||
etcd:
|
etcd:
|
||||||
|
|
|
@ -26,7 +26,6 @@ apiServer:
|
||||||
certificatesDir: /var/lib/minikube/certs
|
certificatesDir: /var/lib/minikube/certs
|
||||||
clusterName: mk
|
clusterName: mk
|
||||||
controlPlaneEndpoint: 1.1.1.1:8443
|
controlPlaneEndpoint: 1.1.1.1:8443
|
||||||
controllerManager: {}
|
|
||||||
dns:
|
dns:
|
||||||
type: CoreDNS
|
type: CoreDNS
|
||||||
etcd:
|
etcd:
|
||||||
|
|
|
@ -26,7 +26,6 @@ apiServer:
|
||||||
certificatesDir: /var/lib/minikube/certs
|
certificatesDir: /var/lib/minikube/certs
|
||||||
clusterName: mk
|
clusterName: mk
|
||||||
controlPlaneEndpoint: 1.1.1.1:8443
|
controlPlaneEndpoint: 1.1.1.1:8443
|
||||||
controllerManager: {}
|
|
||||||
dns:
|
dns:
|
||||||
type: CoreDNS
|
type: CoreDNS
|
||||||
etcd:
|
etcd:
|
||||||
|
|
|
@ -36,7 +36,6 @@ scheduler:
|
||||||
certificatesDir: /var/lib/minikube/certs
|
certificatesDir: /var/lib/minikube/certs
|
||||||
clusterName: mk
|
clusterName: mk
|
||||||
controlPlaneEndpoint: 1.1.1.1:8443
|
controlPlaneEndpoint: 1.1.1.1:8443
|
||||||
controllerManager: {}
|
|
||||||
dns:
|
dns:
|
||||||
type: CoreDNS
|
type: CoreDNS
|
||||||
etcd:
|
etcd:
|
||||||
|
|
|
@ -26,7 +26,6 @@ apiServer:
|
||||||
certificatesDir: /var/lib/minikube/certs
|
certificatesDir: /var/lib/minikube/certs
|
||||||
clusterName: mk
|
clusterName: mk
|
||||||
controlPlaneEndpoint: 1.1.1.1:8443
|
controlPlaneEndpoint: 1.1.1.1:8443
|
||||||
controllerManager: {}
|
|
||||||
dns:
|
dns:
|
||||||
type: CoreDNS
|
type: CoreDNS
|
||||||
etcd:
|
etcd:
|
||||||
|
|
|
@ -26,7 +26,6 @@ apiServer:
|
||||||
certificatesDir: /var/lib/minikube/certs
|
certificatesDir: /var/lib/minikube/certs
|
||||||
clusterName: mk
|
clusterName: mk
|
||||||
controlPlaneEndpoint: 1.1.1.1:8443
|
controlPlaneEndpoint: 1.1.1.1:8443
|
||||||
controllerManager: {}
|
|
||||||
dns:
|
dns:
|
||||||
type: CoreDNS
|
type: CoreDNS
|
||||||
etcd:
|
etcd:
|
||||||
|
|
|
@ -26,7 +26,6 @@ apiServer:
|
||||||
certificatesDir: /var/lib/minikube/certs
|
certificatesDir: /var/lib/minikube/certs
|
||||||
clusterName: mk
|
clusterName: mk
|
||||||
controlPlaneEndpoint: 1.1.1.1:8443
|
controlPlaneEndpoint: 1.1.1.1:8443
|
||||||
controllerManager: {}
|
|
||||||
dns:
|
dns:
|
||||||
type: CoreDNS
|
type: CoreDNS
|
||||||
etcd:
|
etcd:
|
||||||
|
|
|
@ -27,7 +27,6 @@ apiServer:
|
||||||
certificatesDir: /var/lib/minikube/certs
|
certificatesDir: /var/lib/minikube/certs
|
||||||
clusterName: mk
|
clusterName: mk
|
||||||
controlPlaneEndpoint: 1.1.1.1:8443
|
controlPlaneEndpoint: 1.1.1.1:8443
|
||||||
controllerManager: {}
|
|
||||||
dns:
|
dns:
|
||||||
type: CoreDNS
|
type: CoreDNS
|
||||||
etcd:
|
etcd:
|
||||||
|
|
|
@ -33,7 +33,6 @@ scheduler:
|
||||||
certificatesDir: /var/lib/minikube/certs
|
certificatesDir: /var/lib/minikube/certs
|
||||||
clusterName: mk
|
clusterName: mk
|
||||||
controlPlaneEndpoint: 1.1.1.1:8443
|
controlPlaneEndpoint: 1.1.1.1:8443
|
||||||
controllerManager: {}
|
|
||||||
dns:
|
dns:
|
||||||
type: CoreDNS
|
type: CoreDNS
|
||||||
etcd:
|
etcd:
|
||||||
|
|
|
@ -26,7 +26,6 @@ apiServer:
|
||||||
certificatesDir: /var/lib/minikube/certs
|
certificatesDir: /var/lib/minikube/certs
|
||||||
clusterName: mk
|
clusterName: mk
|
||||||
controlPlaneEndpoint: 1.1.1.1:12345
|
controlPlaneEndpoint: 1.1.1.1:12345
|
||||||
controllerManager: {}
|
|
||||||
dns:
|
dns:
|
||||||
type: CoreDNS
|
type: CoreDNS
|
||||||
etcd:
|
etcd:
|
||||||
|
|
|
@ -26,7 +26,6 @@ apiServer:
|
||||||
certificatesDir: /var/lib/minikube/certs
|
certificatesDir: /var/lib/minikube/certs
|
||||||
clusterName: mk
|
clusterName: mk
|
||||||
controlPlaneEndpoint: 1.1.1.1:8443
|
controlPlaneEndpoint: 1.1.1.1:8443
|
||||||
controllerManager: {}
|
|
||||||
dns:
|
dns:
|
||||||
type: CoreDNS
|
type: CoreDNS
|
||||||
etcd:
|
etcd:
|
||||||
|
|
|
@ -26,7 +26,6 @@ apiServer:
|
||||||
certificatesDir: /var/lib/minikube/certs
|
certificatesDir: /var/lib/minikube/certs
|
||||||
clusterName: mk
|
clusterName: mk
|
||||||
controlPlaneEndpoint: 1.1.1.1:8443
|
controlPlaneEndpoint: 1.1.1.1:8443
|
||||||
controllerManager: {}
|
|
||||||
dns:
|
dns:
|
||||||
type: CoreDNS
|
type: CoreDNS
|
||||||
etcd:
|
etcd:
|
||||||
|
|
|
@ -36,7 +36,6 @@ scheduler:
|
||||||
certificatesDir: /var/lib/minikube/certs
|
certificatesDir: /var/lib/minikube/certs
|
||||||
clusterName: mk
|
clusterName: mk
|
||||||
controlPlaneEndpoint: 1.1.1.1:8443
|
controlPlaneEndpoint: 1.1.1.1:8443
|
||||||
controllerManager: {}
|
|
||||||
dns:
|
dns:
|
||||||
type: CoreDNS
|
type: CoreDNS
|
||||||
etcd:
|
etcd:
|
||||||
|
|
|
@ -26,7 +26,6 @@ apiServer:
|
||||||
certificatesDir: /var/lib/minikube/certs
|
certificatesDir: /var/lib/minikube/certs
|
||||||
clusterName: mk
|
clusterName: mk
|
||||||
controlPlaneEndpoint: 1.1.1.1:8443
|
controlPlaneEndpoint: 1.1.1.1:8443
|
||||||
controllerManager: {}
|
|
||||||
dns:
|
dns:
|
||||||
type: CoreDNS
|
type: CoreDNS
|
||||||
etcd:
|
etcd:
|
||||||
|
|
|
@ -26,7 +26,6 @@ apiServer:
|
||||||
certificatesDir: /var/lib/minikube/certs
|
certificatesDir: /var/lib/minikube/certs
|
||||||
clusterName: mk
|
clusterName: mk
|
||||||
controlPlaneEndpoint: 1.1.1.1:8443
|
controlPlaneEndpoint: 1.1.1.1:8443
|
||||||
controllerManager: {}
|
|
||||||
dns:
|
dns:
|
||||||
type: CoreDNS
|
type: CoreDNS
|
||||||
etcd:
|
etcd:
|
||||||
|
|
|
@ -26,7 +26,6 @@ apiServer:
|
||||||
certificatesDir: /var/lib/minikube/certs
|
certificatesDir: /var/lib/minikube/certs
|
||||||
clusterName: mk
|
clusterName: mk
|
||||||
controlPlaneEndpoint: 1.1.1.1:8443
|
controlPlaneEndpoint: 1.1.1.1:8443
|
||||||
controllerManager: {}
|
|
||||||
dns:
|
dns:
|
||||||
type: CoreDNS
|
type: CoreDNS
|
||||||
etcd:
|
etcd:
|
||||||
|
|
|
@ -27,7 +27,6 @@ apiServer:
|
||||||
certificatesDir: /var/lib/minikube/certs
|
certificatesDir: /var/lib/minikube/certs
|
||||||
clusterName: mk
|
clusterName: mk
|
||||||
controlPlaneEndpoint: 1.1.1.1:8443
|
controlPlaneEndpoint: 1.1.1.1:8443
|
||||||
controllerManager: {}
|
|
||||||
dns:
|
dns:
|
||||||
type: CoreDNS
|
type: CoreDNS
|
||||||
etcd:
|
etcd:
|
||||||
|
|
|
@ -33,7 +33,6 @@ scheduler:
|
||||||
certificatesDir: /var/lib/minikube/certs
|
certificatesDir: /var/lib/minikube/certs
|
||||||
clusterName: mk
|
clusterName: mk
|
||||||
controlPlaneEndpoint: 1.1.1.1:8443
|
controlPlaneEndpoint: 1.1.1.1:8443
|
||||||
controllerManager: {}
|
|
||||||
dns:
|
dns:
|
||||||
type: CoreDNS
|
type: CoreDNS
|
||||||
etcd:
|
etcd:
|
||||||
|
|
|
@ -26,7 +26,6 @@ apiServer:
|
||||||
certificatesDir: /var/lib/minikube/certs
|
certificatesDir: /var/lib/minikube/certs
|
||||||
clusterName: mk
|
clusterName: mk
|
||||||
controlPlaneEndpoint: 1.1.1.1:12345
|
controlPlaneEndpoint: 1.1.1.1:12345
|
||||||
controllerManager: {}
|
|
||||||
dns:
|
dns:
|
||||||
type: CoreDNS
|
type: CoreDNS
|
||||||
etcd:
|
etcd:
|
||||||
|
|
|
@ -26,7 +26,6 @@ apiServer:
|
||||||
certificatesDir: /var/lib/minikube/certs
|
certificatesDir: /var/lib/minikube/certs
|
||||||
clusterName: mk
|
clusterName: mk
|
||||||
controlPlaneEndpoint: 1.1.1.1:8443
|
controlPlaneEndpoint: 1.1.1.1:8443
|
||||||
controllerManager: {}
|
|
||||||
dns:
|
dns:
|
||||||
type: CoreDNS
|
type: CoreDNS
|
||||||
etcd:
|
etcd:
|
||||||
|
|
|
@ -26,7 +26,6 @@ apiServer:
|
||||||
certificatesDir: /var/lib/minikube/certs
|
certificatesDir: /var/lib/minikube/certs
|
||||||
clusterName: mk
|
clusterName: mk
|
||||||
controlPlaneEndpoint: 1.1.1.1:8443
|
controlPlaneEndpoint: 1.1.1.1:8443
|
||||||
controllerManager: {}
|
|
||||||
dns:
|
dns:
|
||||||
type: CoreDNS
|
type: CoreDNS
|
||||||
etcd:
|
etcd:
|
||||||
|
|
|
@ -36,7 +36,6 @@ scheduler:
|
||||||
certificatesDir: /var/lib/minikube/certs
|
certificatesDir: /var/lib/minikube/certs
|
||||||
clusterName: mk
|
clusterName: mk
|
||||||
controlPlaneEndpoint: 1.1.1.1:8443
|
controlPlaneEndpoint: 1.1.1.1:8443
|
||||||
controllerManager: {}
|
|
||||||
dns:
|
dns:
|
||||||
type: CoreDNS
|
type: CoreDNS
|
||||||
etcd:
|
etcd:
|
||||||
|
|
|
@ -26,7 +26,6 @@ apiServer:
|
||||||
certificatesDir: /var/lib/minikube/certs
|
certificatesDir: /var/lib/minikube/certs
|
||||||
clusterName: mk
|
clusterName: mk
|
||||||
controlPlaneEndpoint: 1.1.1.1:8443
|
controlPlaneEndpoint: 1.1.1.1:8443
|
||||||
controllerManager: {}
|
|
||||||
dns:
|
dns:
|
||||||
type: CoreDNS
|
type: CoreDNS
|
||||||
etcd:
|
etcd:
|
||||||
|
|
|
@ -26,7 +26,6 @@ apiServer:
|
||||||
certificatesDir: /var/lib/minikube/certs
|
certificatesDir: /var/lib/minikube/certs
|
||||||
clusterName: mk
|
clusterName: mk
|
||||||
controlPlaneEndpoint: 1.1.1.1:8443
|
controlPlaneEndpoint: 1.1.1.1:8443
|
||||||
controllerManager: {}
|
|
||||||
dns:
|
dns:
|
||||||
type: CoreDNS
|
type: CoreDNS
|
||||||
etcd:
|
etcd:
|
||||||
|
|
|
@ -26,7 +26,6 @@ apiServer:
|
||||||
certificatesDir: /var/lib/minikube/certs
|
certificatesDir: /var/lib/minikube/certs
|
||||||
clusterName: mk
|
clusterName: mk
|
||||||
controlPlaneEndpoint: 1.1.1.1:8443
|
controlPlaneEndpoint: 1.1.1.1:8443
|
||||||
controllerManager: {}
|
|
||||||
dns:
|
dns:
|
||||||
type: CoreDNS
|
type: CoreDNS
|
||||||
etcd:
|
etcd:
|
||||||
|
|
|
@ -27,7 +27,6 @@ apiServer:
|
||||||
certificatesDir: /var/lib/minikube/certs
|
certificatesDir: /var/lib/minikube/certs
|
||||||
clusterName: mk
|
clusterName: mk
|
||||||
controlPlaneEndpoint: 1.1.1.1:8443
|
controlPlaneEndpoint: 1.1.1.1:8443
|
||||||
controllerManager: {}
|
|
||||||
dns:
|
dns:
|
||||||
type: CoreDNS
|
type: CoreDNS
|
||||||
etcd:
|
etcd:
|
||||||
|
|
|
@ -33,7 +33,6 @@ scheduler:
|
||||||
certificatesDir: /var/lib/minikube/certs
|
certificatesDir: /var/lib/minikube/certs
|
||||||
clusterName: mk
|
clusterName: mk
|
||||||
controlPlaneEndpoint: 1.1.1.1:8443
|
controlPlaneEndpoint: 1.1.1.1:8443
|
||||||
controllerManager: {}
|
|
||||||
dns:
|
dns:
|
||||||
type: CoreDNS
|
type: CoreDNS
|
||||||
etcd:
|
etcd:
|
||||||
|
|
Loading…
Reference in New Issue