Merge pull request #19416 from pravisankar/fix-router-endpoint-id

openshift-merge-robot · web-flow · commit 55b4666ac696 · 2018-04-23T13:29:46.000-07:00
Bug 1567532 - Unidle handling in router should ignore headless services
diff --git a/pkg/router/template/plugin.go b/pkg/router/template/plugin.go
@@ -15,6 +15,7 @@ import (
 	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/apimachinery/pkg/watch"
 	kapi "k8s.io/kubernetes/pkg/apis/core"
+	kapihelper "k8s.io/kubernetes/pkg/apis/core/helper"
 
 	routeapi "github.com/openshift/origin/pkg/route/apis/route"
 	unidlingapi "github.com/openshift/origin/pkg/unidling/api"
@@ -239,7 +240,7 @@ func createRouterEndpoints(endpoints *kapi.Endpoints, excludeUDP bool, lookupSvc
 			return []Endpoint{}
 		}
 
-		if service.Spec.ClusterIP == "" {
+		if !kapihelper.IsServiceIPSet(service) {
 			utilruntime.HandleError(fmt.Errorf("headless service %s/%s was marked as idled, but cannot setup unidling without a cluster IP", endpoints.Namespace, endpoints.Name))
 			return []Endpoint{}
 		}

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@ import (`
`15`	`15`	`"k8s.io/apimachinery/pkg/util/sets"`
`16`	`16`	`"k8s.io/apimachinery/pkg/watch"`
`17`	`17`	`kapi "k8s.io/kubernetes/pkg/apis/core"`
	`18`	`+ kapihelper "k8s.io/kubernetes/pkg/apis/core/helper"`
`18`	`19`
`19`	`20`	`routeapi "github.com/openshift/origin/pkg/route/apis/route"`
`20`	`21`	`unidlingapi "github.com/openshift/origin/pkg/unidling/api"`
`@@ -239,7 +240,7 @@ func createRouterEndpoints(endpoints *kapi.Endpoints, excludeUDP bool, lookupSvc`
`239`	`240`	`return []Endpoint{}`
`240`	`241`	`}`
`241`	`242`
`242`		`- if service.Spec.ClusterIP == "" {`
	`243`	`+ if !kapihelper.IsServiceIPSet(service) {`
`243`	`244`	`utilruntime.HandleError(fmt.Errorf("headless service %s/%s was marked as idled, but cannot setup unidling without a cluster IP", endpoints.Namespace, endpoints.Name))`
`244`	`245`	`return []Endpoint{}`
`245`	`246`	`}`