Merge pull request #736 from eggfoobar/library_go_bump

Bug 2034484: Library go bump

Author: openshift-merge-robot

Dockerfile.okd

@@ -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-image-registry-operator
 COPY . .
 RUN make build

go.mod

@@ -27,8 +27,8 @@ require (
 	github.com/goware/urlx v0.3.1
 	github.com/openshift/api v0.0.0-20211215015256-3cf5120f2ce6
 	github.com/openshift/build-machinery-go v0.0.0-20211213093930-7e33a7eb4ce3
-	github.com/openshift/client-go v0.0.0-20210916133943-9acee1a0fb83
-	github.com/openshift/library-go v0.0.0-20211110085240-047b536a17c6
+	github.com/openshift/client-go v0.0.0-20211209144617-7385dd6338e3
+	github.com/openshift/library-go v0.0.0-20211220195323-eca2c467c492
 	github.com/prometheus/client_golang v1.11.0
 	github.com/prometheus/client_model v0.2.0
 	github.com/prometheus/common v0.28.0
@@ -159,7 +159,7 @@ require (
 	sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.25 // indirect
 	sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect
 	sigs.k8s.io/kube-storage-version-migrator v0.0.4 // indirect
-	sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.2.0 // indirect
 	sigs.k8s.io/yaml v1.2.0 // indirect
 )
 

go.sum

@@ -4,43 +4,30 @@ import (
 	"context"
 	"strings"
 	"testing"
+	"time"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/util/retry"
 
-	imageregistryv1 "github.com/openshift/api/imageregistry/v1"
-	operatorapi "github.com/openshift/api/operator/v1"
-
-	"github.com/openshift/cluster-image-registry-operator/pkg/defaults"
 	"github.com/openshift/cluster-image-registry-operator/test/framework"
 )
 
 func TestLeaderElection(t *testing.T) {
-	te := framework.SetupAvailableImageRegistry(t, &imageregistryv1.ImageRegistrySpec{
-		ManagementState: operatorapi.Managed,
-		Storage: imageregistryv1.ImageRegistryConfigStorage{
-			EmptyDir: &imageregistryv1.ImageRegistryConfigStorageEmptyDir{},
-		},
-		Replicas: 1,
-	})
+	te := framework.Setup(t)
 	defer framework.TeardownImageRegistry(te)
 
-	if _, err := framework.WaitForRegistryDeployment(te.Client()); err != nil {
-		t.Fatalf("error awaiting for registry deployment: %v", err)
-	}
-
 	var numberOfReplicas = int32(3)
 	if err := retry.RetryOnConflict(retry.DefaultBackoff, func() error {
-		deploy, err := te.Client().Deployments(defaults.ImageRegistryOperatorNamespace).Get(
-			context.Background(), "cluster-image-registry-operator", metav1.GetOptions{},
+		deploy, err := te.Client().Deployments(framework.OperatorDeploymentNamespace).Get(
+			context.Background(), framework.OperatorDeploymentName, metav1.GetOptions{},
 		)
 		if err != nil {
 			return err
 		}
 
 		deploy.Spec.Replicas = &numberOfReplicas
 
-		_, err = te.Client().Deployments(defaults.ImageRegistryOperatorNamespace).Update(
+		_, err = te.Client().Deployments(framework.OperatorDeploymentNamespace).Update(
 			context.Background(), deploy, metav1.UpdateOptions{},
 		)
 		return err
@@ -49,9 +36,15 @@ func TestLeaderElection(t *testing.T) {
 	}
 
 	framework.WaitUntilDeploymentIsRolledOut(
-		te, defaults.ImageRegistryOperatorNamespace, "cluster-image-registry-operator",
+		te,
+		framework.OperatorDeploymentNamespace,
+		framework.OperatorDeploymentName,
 	)
 
+	// With the convention of leader election we need to wait a couple of seconds
+	// for the pods to write the logs, so we don't get false positives
+	time.Sleep(time.Second * 2)
+
 	allLogs, err := framework.GetOperatorLogs(te.Client())
 	if err != nil {
 		t.Fatalf("error reading operator logs: %v", err)