From f9fe37762c6d5e7e74db8496d33c4c10aef48813 Mon Sep 17 00:00:00 2001 From: shashidharatd Date: Wed, 15 Mar 2017 17:09:45 +0530 Subject: [PATCH 1/2] Failfast if federation service controller init fails --- .../cmd/federation-controller-manager/app/controllermanager.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/federation/cmd/federation-controller-manager/app/controllermanager.go b/federation/cmd/federation-controller-manager/app/controllermanager.go index ebc64c38cf9..e159dfa3d48 100644 --- a/federation/cmd/federation-controller-manager/app/controllermanager.go +++ b/federation/cmd/federation-controller-manager/app/controllermanager.go @@ -178,7 +178,7 @@ func StartControllers(s *options.CMServer, restClientCfg *restclient.Config) err servicecontroller := servicecontroller.New(scClientset, dns, s.FederationName, s.ServiceDnsSuffix, s.ZoneName, s.ZoneID) glog.Infof("Running service controller") if err := servicecontroller.Run(s.ConcurrentServiceSyncs, wait.NeverStop); err != nil { - glog.Errorf("Failed to start service controller: %v", err) + glog.Fatalf("Failed to start service controller: %v", err) } } From 7943ed758594705bf3523540144d60f9bd33bbab Mon Sep 17 00:00:00 2001 From: shashidharatd Date: Wed, 15 Mar 2017 17:11:07 +0530 Subject: [PATCH 2/2] Use CoreDNS provider for starting federation controller manager in kubectl tests --- hack/make-rules/test-federation-cmd.sh | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/hack/make-rules/test-federation-cmd.sh b/hack/make-rules/test-federation-cmd.sh index 1bcce54086d..5d9897ca6a5 100755 --- a/hack/make-rules/test-federation-cmd.sh +++ b/hack/make-rules/test-federation-cmd.sh @@ -58,16 +58,28 @@ function run_federation_controller_manager() { kubectl config set-context "context" --cluster="apiserver" --kubeconfig="${kubeconfig}" kubectl config use-context "context" --kubeconfig="${kubeconfig}" + cat << EOF > /tmp/dns-provider.conf +[Global] +etcd-endpoints = http://127.0.0.1:2379 +zones = f8n.io +EOF + # Start controller manager kube::log::status "Starting federation-controller-manager" "${KUBE_OUTPUT_HOSTBIN}/federation-controller-manager" \ --port="${CTLRMGR_PORT}" \ --kubeconfig="${kubeconfig}" \ --kube-api-content-type="${KUBE_TEST_API_TYPE-}" \ + --federation-name=federation \ + --dns-provider=coredns \ + --dns-provider-config=/tmp/dns-provider.conf \ + --zone-name=f8n.io \ --master="127.0.0.1:${API_PORT}" 1>&2 & CTLRMGR_PID=$! kube::util::wait_for_url "http://127.0.0.1:${CTLRMGR_PORT}/healthz" "controller-manager" + + rm -rf /tmp/dns-provider.conf } kube::log::status "Running kubectl tests for federation-apiserver"