rename colliding variable

openshift · Jul 5, 2021 · 4094754 · 4094754
1 parent eb47c69
commit 4094754
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/pkg/cmd/controller/quota.go b/pkg/cmd/controller/quota.go
@@ -45,12 +45,12 @@ func RunResourceQuotaManager(ctx context.Context, controllerCtx *EnhancedControl
 		InformerFactory:           controllerCtx.GenericResourceInformer,
 		DiscoveryFunc:             discoveryFunc,
 	}
-	controller, err := kresourcequota.NewController(resourceQuotaControllerOptions)
+	ctrl, err := kresourcequota.NewController(resourceQuotaControllerOptions)
 	if err != nil {
 		return true, err
 	}
-	go controller.Run(concurrentResourceQuotaSyncs, ctx.Done())
-	go controller.Sync(discoveryFunc, 30*time.Second, ctx.Done())
+	go ctrl.Run(concurrentResourceQuotaSyncs, ctx.Done())
+	go ctrl.Sync(discoveryFunc, 30*time.Second, ctx.Done())
 
 	return true, nil
 }

diff --git a/pkg/security/controller/namespace_scc_allocation_controller.go b/pkg/security/controller/namespace_scc_allocation_controller.go
@@ -60,7 +60,7 @@ type NamespaceSCCAllocationController struct {
 	encoder runtime.Encoder
 }
 
-func NewNamespaceSCCAllocationController(namespaceInformer corev1informers.NamespaceInformer, client corev1client.NamespaceInterface, rangeAllocationClient securityv1client.RangeAllocationsGetter, requiredUIDRange *uid.Range, mcs MCSAllocationFunc, eventRecorder events.Recorder, ) factory.Controller {
+func NewNamespaceSCCAllocationController(namespaceInformer corev1informers.NamespaceInformer, client corev1client.NamespaceInterface, rangeAllocationClient securityv1client.RangeAllocationsGetter, requiredUIDRange *uid.Range, mcs MCSAllocationFunc, eventRecorder events.Recorder) factory.Controller {
 	scheme := runtime.NewScheme()
 	utilruntime.Must(corev1.AddToScheme(scheme))
 	codecs := serializer.NewCodecFactory(scheme)