vendor: Bump library-go

go.mod

@@ -9,21 +9,21 @@ 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-20211209153216-ed9bc958bd8a
 	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
 )

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)
 			}
 		})
 	}