[WIP] Library go bump test

Dockerfile

@@ -1,4 +1,4 @@
-FROM registry.ci.openshift.org/openshift/release:golang-1.16 AS builder
+FROM registry.ci.openshift.org/openshift/release:golang-1.17 AS builder
 WORKDIR /go/src/github.com/openshift/cluster-version-operator
 COPY . .
 RUN hack/build-go.sh; \

go.mod

@@ -1,6 +1,6 @@
 module github.com/openshift/cluster-version-operator
 
-go 1.15
+go 1.17
 
 require (
 	github.com/blang/semver/v4 v4.0.0
@@ -9,21 +9,58 @@ require (
 	github.com/google/go-cmp v0.5.5
 	github.com/google/uuid v1.1.2
 	github.com/imdario/mergo v0.3.8 // indirect
-	github.com/openshift/api v0.0.0-20210923172539-00988ef88ee0
-	github.com/openshift/client-go v0.0.0-20200827190008-3062137373b5
-	github.com/openshift/library-go v0.0.0-20201013192036-5bd7c282e3e7
+	github.com/openshift/api v0.0.0-20211209135129-c58d9f695577
+	github.com/openshift/client-go v0.0.0-20211209144617-7385dd6338e3
+	github.com/openshift/library-go v0.0.0-20211220195323-eca2c467c492
 	github.com/pkg/errors v0.9.1
 	github.com/prometheus/client_golang v1.11.0
 	github.com/prometheus/client_model v0.2.0
-	github.com/prometheus/common v0.26.0
-	github.com/spf13/cobra v1.1.3
-	golang.org/x/net v0.0.0-20210520170846-37e1c6afe023
+	github.com/prometheus/common v0.28.0
+	github.com/spf13/cobra v1.2.1
+	golang.org/x/net v0.0.0-20210825183410-e898025ed96a
 	golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac
-	k8s.io/api v0.22.1
-	k8s.io/apiextensions-apiserver v0.22.1
-	k8s.io/apimachinery v0.22.1
-	k8s.io/client-go v0.22.1
-	k8s.io/klog/v2 v2.9.0
-	k8s.io/kube-aggregator v0.22.1
-	k8s.io/utils v0.0.0-20210707171843-4b05e18ac7d9
+	k8s.io/api v0.23.0
+	k8s.io/apiextensions-apiserver v0.23.0
+	k8s.io/apimachinery v0.23.0
+	k8s.io/client-go v0.23.0
+	k8s.io/klog/v2 v2.30.0
+	k8s.io/kube-aggregator v0.23.0
+	k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b
+)
+
+require (
+	github.com/beorn7/perks v1.0.1 // indirect
+	github.com/cespare/xxhash/v2 v2.1.1 // indirect
+	github.com/evanphx/json-patch v4.12.0+incompatible // indirect
+	github.com/go-logr/logr v1.2.0 // indirect
+	github.com/gogo/protobuf v1.3.2 // indirect
+	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/google/gofuzz v1.1.0 // indirect
+	github.com/googleapis/gnostic v0.5.5 // indirect
+	github.com/inconshreveable/mousetrap v1.0.0 // indirect
+	github.com/jpillora/backoff v1.0.0 // indirect
+	github.com/json-iterator/go v1.1.12 // indirect
+	github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
+	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
+	github.com/modern-go/reflect2 v1.0.2 // indirect
+	github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect
+	github.com/prometheus/procfs v0.6.0 // indirect
+	github.com/spf13/pflag v1.0.5 // indirect
+	golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect
+	golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f // indirect
+	golang.org/x/sys v0.0.0-20210831042530-f4d43177bf5e // indirect
+	golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b // indirect
+	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
+	google.golang.org/appengine v1.6.7 // indirect
+	google.golang.org/protobuf v1.27.1 // indirect
+	gopkg.in/inf.v0 v0.9.1 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
+	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
+	k8s.io/apiserver v0.23.0 // indirect
+	k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect
+	sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.2.0 // indirect
+	sigs.k8s.io/yaml v1.2.0 // indirect
 )

lib/resourcemerge/core.go

@@ -185,18 +185,18 @@ func ensureProbe(modified *bool, existing *corev1.Probe, required corev1.Probe)
 	setInt32(modified, &existing.SuccessThreshold, required.SuccessThreshold)
 	setInt32(modified, &existing.FailureThreshold, required.FailureThreshold)
 
-	ensureProbeHandler(modified, &existing.Handler, required.Handler)
+	ensureProbeHandler(modified, &existing.ProbeHandler, required.ProbeHandler)
 }
 
-func ensureProbeHandler(modified *bool, existing *corev1.Handler, required corev1.Handler) {
+func ensureProbeHandler(modified *bool, existing *corev1.ProbeHandler, required corev1.ProbeHandler) {
 	ensureProbeHandlerDefaults(&required)
 	if !equality.Semantic.DeepEqual(required, *existing) {
 		*modified = true
 		*existing = required
 	}
 }
 
-func ensureProbeHandlerDefaults(handler *corev1.Handler) {
+func ensureProbeHandlerDefaults(handler *corev1.ProbeHandler) {
 	if handler.HTTPGet != nil && handler.HTTPGet.Scheme == "" {
 		handler.HTTPGet.Scheme = corev1.URISchemeHTTP
 	}

pkg/payload/payload_test.go

@@ -6,10 +6,11 @@ import (
 	"reflect"
 	"testing"
 
+	"github.com/google/go-cmp/cmp"
+	"github.com/google/go-cmp/cmp/cmpopts"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime/schema"
-	"k8s.io/apimachinery/pkg/util/diff"
 
 	configv1 "github.com/openshift/api/config/v1"
 	imagev1 "github.com/openshift/api/image/v1"
@@ -117,8 +118,11 @@ func Test_loadUpdatePayload(t *testing.T) {
 				t.Errorf("loadUpdatePayload() error = %v, wantErr %v", err, tt.wantErr)
 				return
 			}
-			if !reflect.DeepEqual(got, tt.want) {
-				t.Errorf("loadUpdatePayload() = %s", diff.ObjectReflectDiff(tt.want, got))
+			// Manifest holds an unexported type of 'resourceID' with a field name of 'id'
+			// DeepEqual fails so here we use cmp.Diff to ignore just that field to avoid false postives
+			stringDiff := cmp.Diff(tt.want, got, cmpopts.IgnoreFields(manifest.Manifest{}, "id"))
+			if !reflect.DeepEqual(got, tt.want) && stringDiff != "" {
+				t.Errorf("loadUpdatePayload() = %s", stringDiff)
 			}
 		})
 	}

pkg/start/start.go

@@ -38,6 +38,8 @@ import (
 	"github.com/openshift/cluster-version-operator/pkg/featurechangestopper"
 	"github.com/openshift/cluster-version-operator/pkg/internal"
 	"github.com/openshift/cluster-version-operator/pkg/payload"
+	"github.com/openshift/library-go/pkg/config/clusterstatus"
+	libgoleaderelection "github.com/openshift/library-go/pkg/config/leaderelection"
 	"github.com/openshift/library-go/pkg/crypto"
 )
 
@@ -46,10 +48,6 @@ const (
 	defaultComponentNamespace = "openshift-cluster-version"
 
 	minResyncPeriod = 2 * time.Minute
-
-	leaseDuration = 137 * time.Second
-	renewDeadline = 107 * time.Second
-	retryPeriod   = 26 * time.Second
 )
 
 // Options are the valid inputs to starting the CVO.
@@ -77,6 +75,8 @@ type Options struct {
 	Namespace       string
 	PayloadOverride string
 	ResyncInterval  time.Duration
+
+	leaderElection configv1.LeaderElection
 }
 
 type asyncResult struct {
@@ -157,7 +157,7 @@ func (o *Options) Run(ctx context.Context) error {
 	if err := controllerCtx.CVO.InitializeFromPayload(cb.RestConfig(defaultQPS), cb.RestConfig(highQPS)); err != nil {
 		return err
 	}
-
+	o.leaderElection = getLeaderElectionConfig(ctx, cb.RestConfig(defaultQPS))
 	o.run(ctx, controllerCtx, lock)
 	return nil
 }
@@ -234,9 +234,9 @@ func (o *Options) run(ctx context.Context, controllerCtx *Context, lock *resourc
 		leaderelection.RunOrDie(postMainContext, leaderelection.LeaderElectionConfig{
 			Lock:            lock,
 			ReleaseOnCancel: true,
-			LeaseDuration:   leaseDuration,
-			RenewDeadline:   renewDeadline,
-			RetryPeriod:     retryPeriod,
+			LeaseDuration:   o.leaderElection.LeaseDuration.Duration,
+			RenewDeadline:   o.leaderElection.RenewDeadline.Duration,
+			RetryPeriod:     o.leaderElection.RetryPeriod.Duration,
 			Callbacks: leaderelection.LeaderCallbacks{
 				OnStartedLeading: func(_ context.Context) { // no need for this passed-through postMainContext, because goroutines we launch inside will use runContext
 					launchedMain = true
@@ -417,6 +417,27 @@ func useProtobuf(config *rest.Config) {
 	config.ContentType = "application/vnd.kubernetes.protobuf"
 }
 
+func getLeaderElectionConfig(ctx context.Context, restcfg *rest.Config) configv1.LeaderElection {
+
+	// Defaults follow conventions
+	// https://github.com/openshift/enhancements/pull/832/files#diff-2e28754e69aa417e5b6d89e99e42f05bfb6330800fa823753383db1d170fbc2fR183
+	// see rhbz#1986477 for more detail
+	defaultLeaderElection := libgoleaderelection.LeaderElectionDefaulting(
+		configv1.LeaderElection{},
+		"", "",
+	)
+
+	if infra, err := clusterstatus.GetClusterInfraStatus(ctx, restcfg); err == nil && infra != nil {
+		if infra.ControlPlaneTopology == configv1.SingleReplicaTopologyMode {
+			return libgoleaderelection.LeaderElectionSNOConfig(defaultLeaderElection)
+		}
+	} else {
+		klog.Warningf("unable to get cluster infrastructure status, using HA cluster values for leader election: %v", err)
+	}
+
+	return defaultLeaderElection
+}
+
 // Context holds the controllers for this operator and exposes a unified start command.
 type Context struct {
 	CVO                     *cvo.Operator

pkg/start/start_integration_test.go

@@ -284,6 +284,7 @@ func TestIntegrationCVO_initializeAndUpgrade(t *testing.T) {
 	options.NodeName = "test-node"
 	options.ReleaseImage = payloadImage1
 	options.PayloadOverride = filepath.Join(dir, "ignored")
+	options.leaderElection = getLeaderElectionConfig(ctx, cfg)
 	includeTechPreview := false
 	controllers := options.NewControllerContext(cb, includeTechPreview)
 
@@ -447,6 +448,7 @@ func TestIntegrationCVO_initializeAndHandleError(t *testing.T) {
 	options.ReleaseImage = payloadImage1
 	options.PayloadOverride = filepath.Join(dir, "ignored")
 	options.ResyncInterval = 3 * time.Second
+	options.leaderElection = getLeaderElectionConfig(ctx, cfg)
 	includeTechPreview := false
 	controllers := options.NewControllerContext(cb, includeTechPreview)
 
@@ -563,6 +565,7 @@ func TestIntegrationCVO_gracefulStepDown(t *testing.T) {
 	options.Name = ns
 	options.ListenAddr = ""
 	options.NodeName = "test-node"
+	options.leaderElection = getLeaderElectionConfig(ctx, cfg)
 	includeTechPreview := false
 	controllers := options.NewControllerContext(cb, includeTechPreview)
 
@@ -752,6 +755,7 @@ metadata:
 	options.NodeName = "test-node"
 	options.ReleaseImage = payloadImage1
 	options.PayloadOverride = payloadDir
+	options.leaderElection = getLeaderElectionConfig(ctx, cfg)
 	includeTechPreview := false
 	controllers := options.NewControllerContext(cb, includeTechPreview)
 	if err := controllers.CVO.InitializeFromPayload(cb.RestConfig(defaultQPS), cb.RestConfig(highQPS)); err != nil {