Look up stale routes by annotation

openshift · Feb 26, 2019 · 4d9df6b · 4d9df6b
1 parent 76c641b
commit 4d9df6b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/pkg/resource/generator.go b/pkg/resource/generator.go
@@ -156,7 +156,7 @@ func (g *Generator) removeObsoleteRoutes(cr *imageregistryv1.Config) error {
 		PropagationPolicy:  &propagationPolicy,
 	}
 	for _, route := range routes {
-		if !metaapi.IsControlledBy(route, cr) {
+		if !RouteIsCreatedByOperator(route) {
 			continue
 		}
 		if _, found := knownNames[route.Name]; found {

diff --git a/pkg/resource/imageconfig.go b/pkg/resource/imageconfig.go
@@ -147,8 +147,7 @@ func (gic *generatorImageConfig) getRouteHostnames() ([]string, error) {
 	}
 	defaultHost := ""
 	for _, route := range routes {
-		// ignore routes that weren't created by the registry operator
-		if _, ok := route.Annotations[RouteOwnerAnnotation]; !ok {
+		if !RouteIsCreatedByOperator(route) {
 			continue
 		}
 		for _, ingress := range route.Status.Ingress {

diff --git a/pkg/resource/route.go b/pkg/resource/route.go
@@ -15,6 +15,11 @@ import (
 
 const RouteOwnerAnnotation = "imageregistry.openshift.io"
 
+func RouteIsCreatedByOperator(route *routeapi.Route) bool {
+	_, ok := route.Annotations[RouteOwnerAnnotation]
+	return ok
+}
+
 var _ Mutator = &generatorRoute{}
 
 type generatorRoute struct {