controller: cleanup: Remove unnecessary patch methods

openshift · Aug 5, 2020 · aadc6ab · aadc6ab
1 parent ade383f
commit aadc6ab
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 32 deletions.
diff --git a/pkg/controller/container-runtime-config/container_runtime_config_controller.go b/pkg/controller/container-runtime-config/container_runtime_config_controller.go
@@ -98,10 +98,6 @@ type Controller struct {
 
 	queue    workqueue.RateLimitingInterface
 	imgQueue workqueue.RateLimitingInterface
-
-	// we need this method to mock out patch calls in unit until https://github.com/openshift/machine-config-operator/pull/611#issuecomment-481397185
-	// which is probably going to be in kube 1.14
-	patchContainerRuntimeConfigsFunc func(string, []byte) error
 }
 
 // New returns a new container runtime config controller
@@ -170,8 +166,6 @@ func New(
 	ctrl.clusterVersionLister = clusterVersionInformer.Lister()
 	ctrl.clusterVersionListerSynced = clusterVersionInformer.Informer().HasSynced
 
-	ctrl.patchContainerRuntimeConfigsFunc = ctrl.patchContainerRuntimeConfigs
-
 	return ctrl
 }
 
@@ -846,7 +840,7 @@ func (ctrl *Controller) popFinalizerFromContainerRuntimeConfig(ctrCfg *mcfgv1.Co
 		if err != nil {
 			return err
 		}
-		return ctrl.patchContainerRuntimeConfigsFunc(ctrCfg.Name, patch)
+		return ctrl.patchContainerRuntimeConfigs(ctrCfg.Name, patch)
 	})
 }
 
@@ -882,7 +876,7 @@ func (ctrl *Controller) addFinalizerToContainerRuntimeConfig(ctrCfg *mcfgv1.Cont
 		if err != nil {
 			return err
 		}
-		return ctrl.patchContainerRuntimeConfigsFunc(ctrCfg.Name, patch)
+		return ctrl.patchContainerRuntimeConfigs(ctrCfg.Name, patch)
 	})
 }
 

diff --git a/pkg/controller/container-runtime-config/container_runtime_config_controller_test.go b/pkg/controller/container-runtime-config/container_runtime_config_controller_test.go
@@ -179,11 +179,6 @@ func (f *fixture) newController() *Controller {
 		ci.Config().V1().ClusterVersions(),
 		k8sfake.NewSimpleClientset(), f.client, f.imgClient)
 
-	c.patchContainerRuntimeConfigsFunc = func(name string, patch []byte) error {
-		f.client.Invokes(core.NewRootPatchAction(schema.GroupVersionResource{Version: "v1", Group: "machineconfiguration.openshift.io", Resource: "containerruntimeconfigs"}, name, types.MergePatchType, patch), nil)
-		return nil
-	}
-
 	c.mcpListerSynced = alwaysReady
 	c.mccrListerSynced = alwaysReady
 	c.ccListerSynced = alwaysReady

diff --git a/pkg/controller/kubelet-config/kubelet_config_controller.go b/pkg/controller/kubelet-config/kubelet_config_controller.go
@@ -87,10 +87,6 @@ type Controller struct {
 
 	queue        workqueue.RateLimitingInterface
 	featureQueue workqueue.RateLimitingInterface
-
-	// we need this method to mock out patch calls in unit until https://github.com/openshift/machine-config-operator/pull/611#issuecomment-481397185
-	// which is probably going to be in kube 1.14
-	patchKubeletConfigsFunc func(string, []byte) error
 }
 
 // New returns a new kubelet config controller
@@ -142,8 +138,6 @@ func New(
 	ctrl.featLister = featInformer.Lister()
 	ctrl.featListerSynced = featInformer.Informer().HasSynced
 
-	ctrl.patchKubeletConfigsFunc = ctrl.patchKubeletConfigs
-
 	return ctrl
 }
 
@@ -550,7 +544,7 @@ func (ctrl *Controller) popFinalizerFromKubeletConfig(kc *mcfgv1.KubeletConfig)
 		if err != nil {
 			return err
 		}
-		return ctrl.patchKubeletConfigsFunc(newcfg.Name, patch)
+		return ctrl.patchKubeletConfigs(newcfg.Name, patch)
 	})
 }
 
@@ -594,7 +588,7 @@ func (ctrl *Controller) addFinalizerToKubeletConfig(kc *mcfgv1.KubeletConfig, mc
 		if err != nil {
 			return err
 		}
-		return ctrl.patchKubeletConfigsFunc(newcfg.Name, patch)
+		return ctrl.patchKubeletConfigs(newcfg.Name, patch)
 	})
 }
 

diff --git a/pkg/controller/kubelet-config/kubelet_config_controller_test.go b/pkg/controller/kubelet-config/kubelet_config_controller_test.go
@@ -6,8 +6,11 @@ import (
 	"testing"
 	"time"
 
+	ign3types "github.com/coreos/ignition/v2/config/v3_1/types"
 	"github.com/golang/glog"
-
+	osev1 "github.com/openshift/api/config/v1"
+	oseconfigfake "github.com/openshift/client-go/config/clientset/versioned/fake"
+	oseinformersv1 "github.com/openshift/client-go/config/informers/externalversions"
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/equality"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -22,11 +25,6 @@ import (
 	"k8s.io/client-go/tools/record"
 	kubeletconfigv1beta1 "k8s.io/kubelet/config/v1beta1"
 
-	osev1 "github.com/openshift/api/config/v1"
-	oseinformersv1 "github.com/openshift/client-go/config/informers/externalversions"
-
-	ign3types "github.com/coreos/ignition/v2/config/v3_1/types"
-	oseconfigfake "github.com/openshift/client-go/config/clientset/versioned/fake"
 	mcfgv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1"
 	ctrlcommon "github.com/openshift/machine-config-operator/pkg/controller/common"
 	"github.com/openshift/machine-config-operator/pkg/generated/clientset/versioned/fake"
@@ -155,11 +153,6 @@ func (f *fixture) newController() *Controller {
 	c.featListerSynced = alwaysReady
 	c.eventRecorder = &record.FakeRecorder{}
 
-	c.patchKubeletConfigsFunc = func(name string, patch []byte) error {
-		f.client.Invokes(core.NewRootPatchAction(schema.GroupVersionResource{Version: "v1", Group: "machineconfiguration.openshift.io", Resource: "kubeletconfigs"}, name, types.MergePatchType, patch), nil)
-		return nil
-	}
-
 	stopCh := make(chan struct{})
 	defer close(stopCh)
 	i.Start(stopCh)