Bug 2034484: Upgrade library-go version

bindata/network-diagnostics/001-rbac.yaml

@@ -94,6 +94,13 @@ rules:
   - tokenreviews
   verbs:
   - create
+- apiGroups: ["config.openshift.io"]
+  resources:
+  - infrastructures
+  verbs:
+  - get
+  - list
+  - watch
 
 ---
 apiVersion: rbac.authorization.k8s.io/v1

go.mod

@@ -8,6 +8,7 @@ require (
 	github.com/Masterminds/semver v1.5.0
 	github.com/Masterminds/sprig v2.22.0+incompatible
 	github.com/containernetworking/cni v0.8.0
+	github.com/evanphx/json-patch v5.6.0+incompatible // indirect
 	github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32
 	github.com/go-bindata/go-bindata v3.1.2+incompatible
 	github.com/google/gofuzz v1.2.0 // indirect
@@ -17,12 +18,11 @@ require (
 	github.com/huandu/xstrings v1.3.2 // indirect
 	github.com/mitchellh/copystructure v1.0.0 // indirect
 	github.com/mitchellh/reflectwalk v1.0.1 // indirect
-	github.com/onsi/ginkgo v1.16.4 // indirect
-	github.com/onsi/gomega v1.13.0
-	github.com/openshift/api v0.0.0-20211203184245-fb6f933bb8d5
+	github.com/onsi/gomega v1.17.0
+	github.com/openshift/api v0.0.0-20211209135129-c58d9f695577
 	github.com/openshift/build-machinery-go v0.0.0-20211213093930-7e33a7eb4ce3
-	github.com/openshift/client-go v0.0.0-20210521082421-73d9475a9142
-	github.com/openshift/library-go v0.0.0-20210708173104-7e7d216ed91c
+	github.com/openshift/client-go v0.0.0-20211209144617-7385dd6338e3
+	github.com/openshift/library-go v0.0.0-20211220195323-eca2c467c492
 	github.com/openshift/machine-api-operator v0.2.1-0.20201203125141-79567cb3368e
 	github.com/pkg/errors v0.9.1
 	github.com/prometheus/client_golang v1.11.0
@@ -31,22 +31,19 @@ require (
 	github.com/stretchr/testify v1.7.0
 	github.com/vishvananda/netlink v1.1.0
 	github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae // indirect
-	golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a // indirect
-	golang.org/x/net v0.0.0-20210520170846-37e1c6afe023
-	golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c // indirect
-	golang.org/x/tools v0.1.5 // indirect
+	golang.org/x/net v0.0.0-20210825183410-e898025ed96a
 	gopkg.in/yaml.v2 v2.4.0
-	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/code-generator v0.22.1
-	k8s.io/component-base v0.22.1
-	k8s.io/klog/v2 v2.9.0
+	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/code-generator v0.23.0
+	k8s.io/component-base v0.23.0
+	k8s.io/klog/v2 v2.30.0
 	k8s.io/kube-proxy v0.22.1
-	k8s.io/utils v0.0.0-20210820185131-d34e5cb4466e
+	k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b
 	sigs.k8s.io/cluster-api-provider-openstack v0.3.3
-	sigs.k8s.io/controller-runtime v0.9.0-beta.0
+	sigs.k8s.io/controller-runtime v0.11.0
 )
 
 replace (

pkg/client/operatorclient.go

@@ -45,7 +45,7 @@ func (c *OperatorHelperClient) GetObjectMeta() (*metav1.ObjectMeta, error) {
 	return &instance.ObjectMeta, nil
 }
 
-func (c *OperatorHelperClient) UpdateOperatorSpec(resourceVersion string, spec *operatorv1.OperatorSpec) (*operatorv1.OperatorSpec, string, error) {
+func (c *OperatorHelperClient) UpdateOperatorSpec(ctx context.Context, resourceVersion string, spec *operatorv1.OperatorSpec) (*operatorv1.OperatorSpec, string, error) {
 	original, err := c.informer.Lister().Get(names.OPERATOR_CONFIG)
 	if err != nil {
 		return nil, "", err
@@ -54,15 +54,15 @@ func (c *OperatorHelperClient) UpdateOperatorSpec(resourceVersion string, spec *
 	updated.ResourceVersion = resourceVersion
 	updated.Spec.OperatorSpec = *spec
 
-	ret, err := c.client.Update(context.TODO(), updated, metav1.UpdateOptions{})
+	ret, err := c.client.Update(ctx, updated, metav1.UpdateOptions{})
 	if err != nil {
 		return nil, "", err
 	}
 
 	return &ret.Spec.OperatorSpec, ret.ResourceVersion, nil
 }
 
-func (c *OperatorHelperClient) UpdateOperatorStatus(resourceVersion string, status *operatorv1.OperatorStatus) (*operatorv1.OperatorStatus, error) {
+func (c *OperatorHelperClient) UpdateOperatorStatus(ctx context.Context, resourceVersion string, status *operatorv1.OperatorStatus) (*operatorv1.OperatorStatus, error) {
 	original, err := c.informer.Lister().Get(names.OPERATOR_CONFIG)
 	if err != nil {
 		return nil, err
@@ -71,7 +71,7 @@ func (c *OperatorHelperClient) UpdateOperatorStatus(resourceVersion string, stat
 	updated.ResourceVersion = resourceVersion
 	updated.Status.OperatorStatus = *status
 
-	ret, err := c.client.Update(context.TODO(), updated, metav1.UpdateOptions{})
+	ret, err := c.client.Update(ctx, updated, metav1.UpdateOptions{})
 	if err != nil {
 		return nil, err
 	}

pkg/controller/eventrecorder/event_recorder.go

@@ -1,6 +1,7 @@
 package eventrecorder
 
 import (
+	"context"
 	"log"
 
 	"github.com/openshift/library-go/pkg/operator/events"
@@ -41,3 +42,7 @@ func (r *LoggingRecorder) ComponentName() string {
 func (r *LoggingRecorder) Shutdown() {
 	//not implemented
 }
+
+func (r *LoggingRecorder) WithContext(_ context.Context) events.Recorder {
+	return r
+}

pkg/controller/pki/pki_controller.go

@@ -188,7 +188,7 @@ func newPKI(config *netopv1.OperatorPKI, clientset *kubernetes.Clientset, mgr ma
 
 	cont := certrotation.NewCertRotationController(
 		fmt.Sprintf("%s/%s", config.Namespace, config.Name), // name, not really used
-		certrotation.SigningRotation{
+		certrotation.RotatedSigningCASecret{
 			Namespace:     config.Namespace,
 			Name:          config.Name + "-ca",
 			Validity:      10 * OneYear,
@@ -198,15 +198,15 @@ func newPKI(config *netopv1.OperatorPKI, clientset *kubernetes.Clientset, mgr ma
 			Client:        clientset.CoreV1(),
 			EventRecorder: &eventrecorder.LoggingRecorder{},
 		},
-		certrotation.CABundleRotation{
+		certrotation.CABundleConfigMap{
 			Namespace:     config.Namespace,
 			Name:          config.Name + "-ca",
 			Lister:        inf.Core().V1().ConfigMaps().Lister(),
 			Informer:      inf.Core().V1().ConfigMaps(),
 			Client:        clientset.CoreV1(),
 			EventRecorder: &eventrecorder.LoggingRecorder{},
 		},
-		certrotation.TargetRotation{
+		certrotation.RotatedSelfSignedCertKeySecret{
 			Namespace: config.Namespace,
 			Name:      config.Name + "-cert",
 			Validity:  OneYear / 2,

pkg/operator/operator.go

@@ -8,7 +8,7 @@ import (
 	"github.com/openshift/cluster-network-operator/pkg/controller"
 	"github.com/openshift/cluster-network-operator/pkg/controller/connectivitycheck"
 	"github.com/openshift/cluster-network-operator/pkg/controller/statusmanager"
-
+	"github.com/openshift/library-go/pkg/operator/managementstatecontroller"
 	"k8s.io/apimachinery/pkg/api/meta"
 	"k8s.io/client-go/rest"
 	"k8s.io/klog/v2"
@@ -74,7 +74,7 @@ func RunOperator(ctx context.Context, controllerConfig *controllercmd.Controller
 
 	// managementStateController syncs Operator.Spec.ManagementState down to
 	// an Operator.Status.Condition
-	managementStateController := management.NewOperatorManagementStateController("cluster-network-operator", o.client.OperatorHelperClient(), controllerConfig.EventRecorder)
+	managementStateController := managementstatecontroller.NewOperatorManagementStateController("cluster-network-operator", o.client.OperatorHelperClient(), controllerConfig.EventRecorder)
 	management.SetOperatorNotRemovable()
 
 	// TODO: Enable the library-go ClusterOperatorStatusController once