react to library-go changes

openshift · Feb 24, 2020 · 28b3608 · 28b3608
1 parent 1c35cc8
commit 28b3608
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/pkg/operator/starter.go b/pkg/operator/starter.go
@@ -1,6 +1,7 @@
 package operator
 
 import (
+	"context"
 	"fmt"
 	"os"
 	"time"
@@ -21,21 +22,21 @@ import (
 	"github.com/openshift/library-go/pkg/operator/status"
 )
 
-func RunOperator(ctx *controllercmd.ControllerContext) error {
-	kubeClient, err := kubernetes.NewForConfig(ctx.ProtoKubeConfig)
+func RunOperator(ctx context.Context, controllerCtx *controllercmd.ControllerContext) error {
+	kubeClient, err := kubernetes.NewForConfig(controllerCtx.ProtoKubeConfig)
 	if err != nil {
 		return err
 	}
-	operatorClient, err := operatorclient.NewForConfig(ctx.KubeConfig)
+	operatorClient, err := operatorclient.NewForConfig(controllerCtx.KubeConfig)
 	if err != nil {
 		return err
 	}
 
-	configClient, err := configclient.NewForConfig(ctx.KubeConfig)
+	configClient, err := configclient.NewForConfig(controllerCtx.KubeConfig)
 	if err != nil {
 		return err
 	}
-	dynamicClient, err := dynamic.NewForConfig(ctx.KubeConfig)
+	dynamicClient, err := dynamic.NewForConfig(controllerCtx.KubeConfig)
 	if err != nil {
 		return err
 	}
@@ -56,7 +57,7 @@ func RunOperator(ctx *controllercmd.ControllerContext) error {
 		configClient,
 		kubeClient,
 		dynamicClient,
-		ctx.EventRecorder,
+		controllerCtx.EventRecorder,
 	)
 
 	opClient := &genericClient{
@@ -79,7 +80,7 @@ func RunOperator(ctx *controllercmd.ControllerContext) error {
 		configInformers.Config().V1().ClusterOperators(),
 		opClient,
 		versionGetter,
-		ctx.EventRecorder,
+		controllerCtx.EventRecorder,
 	)
 
 	operatorConfigInformers.Start(ctx.Done())
@@ -89,7 +90,7 @@ func RunOperator(ctx *controllercmd.ControllerContext) error {
 	configMapInformers.Start(ctx.Done())
 
 	go operator.Run(1, ctx.Done())
-	go clusterOperatorStatus.Run(1, ctx.Done())
+	go clusterOperatorStatus.Run(ctx, 1)
 
 	<-ctx.Done()
 	return fmt.Errorf("stopped")

diff --git a/pkg/operator/sync_controllermanager_v311_00.go b/pkg/operator/sync_controllermanager_v311_00.go
@@ -41,7 +41,10 @@ func syncServiceCatalogControllerManager_v311_00_to_latest(c ServiceCatalogContr
 	errors := []error{}
 	var err error
 	operatorConfig := originalOperatorConfig.DeepCopy()
-	directResourceResults := resourceapply.ApplyDirectly(c.kubeClient, c.recorder, v311_00_assets.Asset,
+
+	// react to API change
+	clientHolder := resourceapply.NewKubeClientHolder(c.kubeClient)
+	directResourceResults := resourceapply.ApplyDirectly(clientHolder, c.recorder, v311_00_assets.Asset,
 		"v3.11.0/openshift-svcat-controller-manager/ns.yaml",
 		"v3.11.0/openshift-svcat-controller-manager/crb-catalog-controller.yaml",
 		"v3.11.0/openshift-svcat-controller-manager/crb-controller-namespace-viewer-binding.yaml",