github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-09 20:17:41 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #45936 from shashidharatd/kubectl-tests

Browse Source 
Automatic merge from submit-queue

Disabling service-dns controller for federation kubectl tests

**What this PR does / why we need it**:

DNS was unnecessary to do kubectl tests against federation, but it was required earlier as service-controller would not start without initializing dns-provider. Now since we have the capability to disable service-dns controller, we no longer need to initialize federation-controller-manger with DNS specific stuff. So removing it.

Ref: https://github.com/kubernetes/kubernetes/pull/43136#issuecomment-287242198

**Release note**:
```
NONE
```
/cc @nikhiljindal @marun 
@kubernetes/sig-federation-pr-reviews
This commit is contained in:
Kubernetes Submit Queue 2017-05-17 05:57:43 -07:00 committed by GitHub
commit c26f5123dc
1 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -60,28 +60,17 @@ 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 \ --controllers="service-dns=false" \
--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"