github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 13:37:30 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #43136 from shashidharatd/kubectl-tests

Browse Source 
Automatic merge from submit-queue

[Federation] Fix Running service controller in federation kubectl tests

Fixes:  #42607

cc @nikhiljindal @kubernetes/sig-federation-bugs
This commit is contained in:
Kubernetes Submit Queue 2017-04-09 11:19:38 -07:00 committed by GitHub
commit eed7d11255
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
federation/cmd/federation-controller-manager/app/controllermanager.go
View File

@ -177,7 +177,7 @@ func StartControllers(s *options.CMServer, restClientCfg *restclient.Config) err
servicecontroller := servicecontroller.New(scClientset, dns, s.FederationName, s.ServiceDnsSuffix, s.ZoneName, s.ZoneID) servicecontroller := servicecontroller.New(scClientset, dns, s.FederationName, s.ServiceDnsSuffix, s.ZoneName, s.ZoneID)
glog.Infof("Running service controller") glog.Infof("Running service controller")
if err := servicecontroller.Run(s.ConcurrentServiceSyncs, wait.NeverStop); err != nil { 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)
} }
} }

12
hack/make-rules/test-federation-cmd.sh
View File

@ -58,16 +58,28 @@ function run_federation_controller_manager() {
kubectl config set-context "context" --cluster="apiserver" --kubeconfig="${kubeconfig}" kubectl config set-context "context" --cluster="apiserver" --kubeconfig="${kubeconfig}"
kubectl config use-context "context" --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 # Start controller manager
kube::log::status "Starting federation-controller-manager" kube::log::status "Starting federation-controller-manager"
"${KUBE_OUTPUT_HOSTBIN}/federation-controller-manager" \ "${KUBE_OUTPUT_HOSTBIN}/federation-controller-manager" \
--port="${CTLRMGR_PORT}" \ --port="${CTLRMGR_PORT}" \
--kubeconfig="${kubeconfig}" \ --kubeconfig="${kubeconfig}" \
--kube-api-content-type="${KUBE_TEST_API_TYPE-}" \ --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 & --master="127.0.0.1:${API_PORT}" 1>&2 &
CTLRMGR_PID=$! CTLRMGR_PID=$!
kube::util::wait_for_url "http://127.0.0.1:${CTLRMGR_PORT}/healthz" "controller-manager" 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" kube::log::status "Running kubectl tests for federation-apiserver"