add constructors for mfojtik

openshift · Jan 23, 2020 · 205b982 · 205b982
1 parent b77f02f
commit 205b982
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/pkg/operator/resource/resourceapply/generic.go b/pkg/operator/resource/resourceapply/generic.go
@@ -47,6 +47,14 @@ type ClientHolder struct {
 	kubeInformers       v1helpers.KubeInformersForNamespaces
 }
 
+func NewClientHolder() *ClientHolder {
+	return &ClientHolder{}
+}
+
+func NewKubeClientHolder(client kubernetes.Interface) *ClientHolder {
+	return NewClientHolder().WithKubernetes(client)
+}
+
 func (c *ClientHolder) WithKubernetes(client kubernetes.Interface) *ClientHolder {
 	c.kubeClient = client
 	return c

diff --git a/pkg/operator/staticpod/controller/backingresource/backing_resource_controller_test.go b/pkg/operator/staticpod/controller/backingresource/backing_resource_controller_test.go
@@ -180,7 +180,7 @@ func TestBackingResourceController(t *testing.T) {
 					"manifests/installer-sa.yaml",
 					"manifests/installer-cluster-rolebinding.yaml",
 				},
-				(&resourceapply.ClientHolder{}).WithKubernetes(kubeClient),
+				resourceapply.NewKubeClientHolder(kubeClient),
 				tc.operatorClient,
 				eventRecorder,
 			)

diff --git a/pkg/operator/staticpod/controller/monitoring/monitoring_resource_controller.go b/pkg/operator/staticpod/controller/monitoring/monitoring_resource_controller.go
@@ -103,7 +103,7 @@ func (c MonitoringResourceController) sync() error {
 		return nil
 	}
 
-	directResourceResults := resourceapply.ApplyDirectly((&resourceapply.ClientHolder{}).WithKubernetes(c.kubeClient), c.eventRecorder, c.mustTemplateAsset,
+	directResourceResults := resourceapply.ApplyDirectly(resourceapply.NewKubeClientHolder(c.kubeClient), c.eventRecorder, c.mustTemplateAsset,
 		"manifests/prometheus-role.yaml",
 		"manifests/prometheus-role-binding.yaml",
 	)

diff --git a/pkg/operator/staticpod/controllers.go b/pkg/operator/staticpod/controllers.go
@@ -251,7 +251,7 @@ func (b *staticPodOperatorControllerBuilder) ToControllers() (RunnableController
 			"manifests/installer-sa.yaml",
 			"manifests/installer-cluster-rolebinding.yaml",
 		},
-		(&resourceapply.ClientHolder{}).WithKubernetes(b.kubeClient),
+		resourceapply.NewKubeClientHolder(b.kubeClient),
 		b.staticPodOperatorClient,
 		eventRecorder,
 	).AddKubeInformers(b.kubeInformers))