generate clusterEvent queue key in a separate function

mkabilov · mkabilov · commit f2c23021bb6c · 2017-08-17T12:20:03.000+02:00
diff --git a/pkg/controller/controller.go b/pkg/controller/controller.go
@@ -6,6 +6,7 @@ import (
 
 	"github.com/Sirupsen/logrus"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/client-go/pkg/api/v1"
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/cache"
@@ -169,7 +170,7 @@ func (c *Controller) initController() {
 				return "", fmt.Errorf("could not cast to ClusterEvent")
 			}
 
-			return fmt.Sprintf("%s-%s", e.EventType, e.UID), nil
+			return queueClusterKey(e.EventType, e.UID), nil
 		})
 	}
 
@@ -206,3 +207,7 @@ func (c *Controller) runPostgresqlInformer(stopCh <-chan struct{}, wg *sync.Wait
 
 	c.postgresqlInformer.Run(stopCh)
 }
+
+func queueClusterKey(eventType spec.EventType, uid types.UID) string {
+	return fmt.Sprintf("%s-%s", eventType, uid)
+}

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@ import (`
`6`	`6`
`7`	`7`	`"github.com/Sirupsen/logrus"`
`8`	`8`	`metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"`
	`9`	`+ "k8s.io/apimachinery/pkg/types"`
`9`	`10`	`"k8s.io/client-go/pkg/api/v1"`
`10`	`11`	`"k8s.io/client-go/rest"`
`11`	`12`	`"k8s.io/client-go/tools/cache"`
`@@ -169,7 +170,7 @@ func (c *Controller) initController() {`
`169`	`170`	`return "", fmt.Errorf("could not cast to ClusterEvent")`
`170`	`171`	`}`
`171`	`172`
`172`		`- return fmt.Sprintf("%s-%s", e.EventType, e.UID), nil`
	`173`	`+ return queueClusterKey(e.EventType, e.UID), nil`
`173`	`174`	`})`
`174`	`175`	`}`
`175`	`176`
`@@ -206,3 +207,7 @@ func (c Controller) runPostgresqlInformer(stopCh <-chan struct{}, wg sync.Wait`
`206`	`207`
`207`	`208`	`c.postgresqlInformer.Run(stopCh)`
`208`	`209`	`}`
	`210`	`+`
	`211`	`+func queueClusterKey(eventType spec.EventType, uid types.UID) string {`
	`212`	`+ return fmt.Sprintf("%s-%s", eventType, uid)`
	`213`	`+}`