From 47ab49eb4f78de3abba31d6e4c8e2ae881d570f7 Mon Sep 17 00:00:00 2001
From: shashidharatd <shashidhara.td@huawei.com>
Date: Wed, 17 May 2017 10:22:47 +0530
Subject: [PATCH] Disabling service-dns controller for federation kubectl tests

---
 hack/make-rules/test-federation-cmd.sh | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/hack/make-rules/test-federation-cmd.sh b/hack/make-rules/test-federation-cmd.sh
index 4fdec716e3..45e49a5d30 100755
--- a/hack/make-rules/test-federation-cmd.sh
+++ b/hack/make-rules/test-federation-cmd.sh
@@ -60,28 +60,17 @@ 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 \
+    --controllers="service-dns=false" \
     --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"