Merge branch 'master' into feature/tests

# Conflicts:
#	pkg/util/teams/teams.go

pkg/util/config/config.go

@@ -15,7 +15,6 @@ type TPR struct {
 }
 
 type Resources struct {
-	ResyncPeriodPod        time.Duration     `name:"resync_period_pod" default:"5m"`
 	ResourceCheckInterval  time.Duration     `name:"resource_check_interval" default:"3s"`
 	ResourceCheckTimeout   time.Duration     `name:"resource_check_timeout" default:"10m"`
 	PodLabelWaitTimeout    time.Duration     `name:"pod_label_wait_timeout" default:"10m"`

pkg/util/constants/kubernetes.go

@@ -10,4 +10,7 @@ const (
 	K8sAPIPath                  = "/api"
 	StatefulsetDeletionInterval = 1 * time.Second
 	StatefulsetDeletionTimeout  = 30 * time.Second
+
+	QueueResyncPeriodPod = 5 * time.Minute
+	QueueResyncPeriodTPR = 5 * time.Minute
 )

pkg/util/util_test.go

@@ -25,13 +25,6 @@ var pgUsers = []struct {
 		MemberOf: []string{}},
 		"md592f413f3974bdf3799bb6fecb5f9f2c6"}}
 
-var prettyTest = []struct {
-	in  interface{}
-	out string
-}{
-	{pgUsers, `[{{test password [] []} md587f77988ccb5aa917c93201ba314fcd4} {{test md592f413f3974bdf3799bb6fecb5f9f2c6 [] []} md592f413f3974bdf3799bb6fecb5f9f2c6}]`},
-}
-
 var prettyDiffTest = []struct {
 	inA interface{}
 	inB interface{}