Merge pull request #46985 from deads2k/controller-09-agg-health

make the health check wait for ready apiservices

Merge pull request #46985 from deads2k/controller-09-agg-health
cc294cfb · Anirudh Ramanathan · GitHub · 0cff8393 · 0ad98c29 · cc294cfb
Commit cc294cfb authored Jun 05, 2017 by Anirudh Ramanathan Committed by GitHub Jun 05, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

aggregator.go cmd/kube-apiserver/app/aggregator.go +4 -1

No files found.
--- a/cmd/kube-apiserver/app/aggregator.go
+++ b/cmd/kube-apiserver/app/aggregator.go
@@ -119,7 +119,10 @@ func createAggregatorServer(aggregatorConfig *aggregatorapiserver.Config, delega
 		for _, apiService := range apiServices {
 			found := false
 			for _, item := range items {
-				if item.Name == apiService.Name {
+				if item.Name != apiService.Name {
+					continue
+				}
+				if apiregistration.IsAPIServiceConditionTrue(item, apiregistration.Available) {
 					found = true
 					break
 				}