Merge pull request #38264 from liggitt/fix-local-up-cluster

Automatic merge from submit-queue

Disable kubernetes-discovery in local-up-cluster.sh

fix #38257

Fixes local-up-cluster until kubernetes-discovery flags are hooked up
This commit is contained in:
Kubernetes Submit Queue 2016-12-07 06:13:57 -08:00 committed by GitHub
commit fc361206e7

View File

@ -800,7 +800,7 @@ if [[ "${START_MODE}" != "kubeletonly" ]]; then
start_etcd
set_service_accounts
start_apiserver
start_discovery
# start_discovery
start_controller_manager
start_kubeproxy
start_kubedns