Merge pull request #14881 from deads2k/agg-09-check

UPSTREAM: 47347: actually check for a live discovery endpoint before …
openshift · Jun 30, 2017 · b75e645 · b75e645
2 parents 7ff213e + f7a3fed
commit b75e645
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/...ernetes/staging/src/k8s.io/kube-aggregator/pkg/controllers/status/available_controller.go b/...ernetes/staging/src/k8s.io/kube-aggregator/pkg/controllers/status/available_controller.go
diff --git a/...es/staging/src/k8s.io/kube-aggregator/pkg/controllers/status/available_controller_test.go b/...es/staging/src/k8s.io/kube-aggregator/pkg/controllers/status/available_controller_test.go