Bug 1984635: use new default leader election values to handle SNO environments

go.mod

@@ -4,23 +4,23 @@ go 1.15
 
 require (
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
+	github.com/fsnotify/fsnotify v1.4.9 // indirect
 	github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32 // indirect
 	github.com/go-bindata/go-bindata v3.1.2+incompatible
 	github.com/openshift/api v0.0.0-20210726144523-6fcabc0010ca
 	github.com/openshift/build-machinery-go v0.0.0-20210712174854-1bb7fd1518d3
-	github.com/openshift/client-go v0.0.0-20210112165513-ebc401615f47
-	github.com/openshift/library-go v0.0.0-20210127081712-a4f002827e42
+	github.com/openshift/client-go v0.0.0-20210521082421-73d9475a9142
+	github.com/openshift/library-go v0.0.0-20210728105326-4a78e9dddb00
 	github.com/spf13/cobra v1.1.1
 	github.com/spf13/pflag v1.0.5
 	github.com/stretchr/testify v1.6.1
 	gopkg.in/gcfg.v1 v1.2.0
 	gopkg.in/warnings.v0 v0.1.1 // indirect
 	k8s.io/api v0.21.1
 	k8s.io/apimachinery v0.21.1
-	k8s.io/apiserver v0.21.0 // indirect
-	k8s.io/client-go v0.21.0
-	k8s.io/component-base v0.21.0
-	k8s.io/klog v1.0.0
+	k8s.io/client-go v0.21.1
+	k8s.io/component-base v0.21.1
+	k8s.io/klog/v2 v2.8.0
 	sigs.k8s.io/yaml v1.2.0
 )
 

pkg/cmd/render/render.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 
 	configv1 "github.com/openshift/api/config/v1"
 	kubecloudconfig "github.com/openshift/cluster-config-operator/pkg/operator/kube_cloud_config"

pkg/operator/kube_cloud_config/controller.go

@@ -122,7 +122,7 @@ func (c KubeCloudConfigController) sync(ctx context.Context, syncCtx factory.Syn
 	} else { // apply the target
 		target.Name = targetCloudConfigMap
 		target.Namespace = operatorclient.GlobalMachineSpecifiedConfigNamespace
-		_, updated, err := resourceapply.ApplyConfigMap(c.configMapClient, syncCtx.Recorder(), target)
+		_, updated, err := resourceapply.ApplyConfigMap(ctx, c.configMapClient, syncCtx.Recorder(), target)
 		if err != nil {
 			return err
 		}