Merge pull request #1371 from p0lyn0mial/bump-library-go

API-1835: bump library-go
openshift · Nov 22, 2024 · a053e7c · a053e7c
2 parents 9a2aa20 + 03cc5e6
commit a053e7c
Show file tree

Hide file tree

Showing 38 changed files with 473 additions and 256 deletions.
diff --git a/go.mod b/go.mod
@@ -13,7 +13,7 @@ require (
 	github.com/openshift/api v0.0.0-20241001152557-e415140e5d5f
 	github.com/openshift/build-machinery-go v0.0.0-20240613134303-8359781da660
 	github.com/openshift/client-go v0.0.0-20241001162912-da6d55e4611f
-	github.com/openshift/library-go v0.0.0-20241022210936-abb8c75b88dc
+	github.com/openshift/library-go v0.0.0-20241119162247-f466fdd82330
 	github.com/pkg/errors v0.9.1
 	github.com/prometheus/client_golang v1.19.1
 	github.com/prometheus/common v0.55.0

diff --git a/go.sum b/go.sum
@@ -321,8 +321,8 @@ github.com/openshift/build-machinery-go v0.0.0-20240613134303-8359781da660 h1:F0
 github.com/openshift/build-machinery-go v0.0.0-20240613134303-8359781da660/go.mod h1:8jcm8UPtg2mCAsxfqKil1xrmRMI3a+XU2TZ9fF8A7TE=
 github.com/openshift/client-go v0.0.0-20241001162912-da6d55e4611f h1:FRc0bVNWprihWS0GqQWzb3dY4dkCwpOP3mDw5NwSoR4=
 github.com/openshift/client-go v0.0.0-20241001162912-da6d55e4611f/go.mod h1:KiZi2mJRH1TOJ3FtBDYS6YvUL30s/iIXaGSUrSa36mo=
-github.com/openshift/library-go v0.0.0-20241022210936-abb8c75b88dc h1:fwtWTW+QcTyzGVAYxMPz9amtAURWvSs8p+a37nG/43c=
-github.com/openshift/library-go v0.0.0-20241022210936-abb8c75b88dc/go.mod h1:9B1MYPoLtP9tqjWxcbUNVpwxy68zOH/3EIP6c31dAM0=
+github.com/openshift/library-go v0.0.0-20241119162247-f466fdd82330 h1:nK16PhWNPIjnv7Vux1jBlzEPgA9q/o/CwqsbRpQJrpY=
+github.com/openshift/library-go v0.0.0-20241119162247-f466fdd82330/go.mod h1:9B1MYPoLtP9tqjWxcbUNVpwxy68zOH/3EIP6c31dAM0=
 github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
 github.com/orisano/pixelmatch v0.0.0-20220722002657-fb0b55479cde/go.mod h1:nZgzbfBr3hhjoZnS66nKrHmduYNpc34ny7RK4z5/HM0=
 github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=

diff --git a/pkg/cmd/operator/cmd.go b/pkg/cmd/operator/cmd.go
@@ -13,11 +13,12 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apiserver/pkg/server/healthz"
 	"k8s.io/client-go/tools/record"
+	"k8s.io/utils/clock"
 )
 
 func NewOperator() *cobra.Command {
 	cmd := controllercmd.
-		NewControllerCommandConfig("openshift-cluster-etcd-operator", version.Get(), operator.RunOperator).
+		NewControllerCommandConfig("openshift-cluster-etcd-operator", version.Get(), operator.RunOperator, clock.RealClock{}).
 		WithEventRecorderOptions(EtcdOperatorCorrelatorOptions()).
 		WithHealthChecks(healthz.NamedCheck("controller-aliveness", func(_ *http.Request) error {
 			if !operator.AlivenessChecker.Alive() {

diff --git a/pkg/cmd/render/certs.go b/pkg/cmd/render/certs.go
@@ -18,6 +18,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/kubernetes/fake"
 	"k8s.io/component-base/metrics"
+	"k8s.io/utils/clock"
 )
 
 // createCertSecrets will run the etcdcertsigner.EtcdCertSignerController once and collect all respective certs created.
@@ -42,7 +43,7 @@ func createCertSecrets(nodes []*corev1.Node) ([]corev1.Secret, []corev1.ConfigMa
 
 	kubeInformers := v1helpers.NewKubeInformersForNamespaces(fakeKubeClient, "", "kube-system",
 		operatorclient.TargetNamespace, operatorclient.OperatorNamespace, operatorclient.GlobalUserSpecifiedConfigNamespace)
-	recorder := events.NewInMemoryRecorder("etcd")
+	recorder := events.NewInMemoryRecorder("etcd", clock.RealClock{})
 	nodeSelector, err := labels.Parse("node-role.kubernetes.io/master")
 	if err != nil {
 		return nil, nil, fmt.Errorf("could not parse master node labels: %w", err)

diff --git a/pkg/etcdenvvar/envvarcontroller_test.go b/pkg/etcdenvvar/envvarcontroller_test.go
@@ -25,6 +25,7 @@ import (
 	"k8s.io/client-go/kubernetes/fake"
 	corev1listers "k8s.io/client-go/listers/core/v1"
 	"k8s.io/client-go/tools/cache"
+	"k8s.io/utils/clock"
 
 	"github.com/stretchr/testify/require"
 
@@ -175,7 +176,7 @@ func TestEnvVarController(t *testing.T) {
 
 			fakeKubeClient := fake.NewSimpleClientset(scenario.objects...)
 			eventRecorder := events.NewRecorder(fakeKubeClient.CoreV1().Events(operatorclient.TargetNamespace),
-				"test-envvarcontroller", &corev1.ObjectReference{})
+				"test-envvarcontroller", &corev1.ObjectReference{}, clock.RealClock{})
 			indexer := cache.NewIndexer(cache.MetaNamespaceKeyFunc, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc})
 			for _, obj := range defaultObjects {
 				require.NoError(t, indexer.Add(obj))

diff --git a/pkg/operator/clustermembercontroller/clustermembercontroller_test.go b/pkg/operator/clustermembercontroller/clustermembercontroller_test.go
@@ -22,6 +22,7 @@ import (
 	"k8s.io/client-go/kubernetes/fake"
 	corev1listers "k8s.io/client-go/listers/core/v1"
 	"k8s.io/client-go/tools/cache"
+	"k8s.io/utils/clock"
 )
 
 type fakePodLister struct {
@@ -557,7 +558,7 @@ func TestEnsureEtcdLearnerPromotion(t *testing.T) {
 		t.Run(scenario.name, func(t *testing.T) {
 			// test data
 			fakeMachineAPIChecker := &fakeMachineAPI{isMachineAPIFunctional: scenario.isFunctionalMachineAPIFn}
-			eventRecorder := events.NewRecorder(fake.NewSimpleClientset().CoreV1().Events("operator"), "test-cluster-member-controller", &corev1.ObjectReference{})
+			eventRecorder := events.NewRecorder(fake.NewSimpleClientset().CoreV1().Events("operator"), "test-cluster-member-controller", &corev1.ObjectReference{}, clock.RealClock{})
 			machineIndexer := cache.NewIndexer(cache.MetaNamespaceKeyFunc, cache.Indexers{})
 			for _, initialObj := range scenario.initialObjectsForMachineLister {
 				machineIndexer.Add(initialObj)
@@ -794,7 +795,7 @@ func TestReconcileMembers(t *testing.T) {
 	for _, scenario := range scenarios {
 		t.Run(scenario.name, func(t *testing.T) {
 			// test data
-			eventRecorder := events.NewRecorder(fake.NewSimpleClientset().CoreV1().Events("operator"), "test-cluster-member-controller", &corev1.ObjectReference{})
+			eventRecorder := events.NewRecorder(fake.NewSimpleClientset().CoreV1().Events("operator"), "test-cluster-member-controller", &corev1.ObjectReference{}, clock.RealClock{})
 			fakeMachineAPIChecker := &fakeMachineAPI{isMachineAPIFunctional: scenario.isFunctionalMachineAPIFn}
 
 			machineIndexer := cache.NewIndexer(cache.MetaNamespaceKeyFunc, cache.Indexers{})

diff --git a/pkg/operator/clustermemberremovalcontroller/clustermemberremovalcontroller_test.go b/pkg/operator/clustermemberremovalcontroller/clustermemberremovalcontroller_test.go
@@ -26,6 +26,7 @@ import (
 	"k8s.io/client-go/kubernetes/fake"
 	corev1listers "k8s.io/client-go/listers/core/v1"
 	"k8s.io/client-go/tools/cache"
+	"k8s.io/utils/clock"
 )
 
 var (
@@ -133,7 +134,7 @@ func TestAttemptToRemoveLearningMember(t *testing.T) {
 	for _, scenario := range scenarios {
 		t.Run(scenario.name, func(t *testing.T) {
 			// test data
-			eventRecorder := events.NewRecorder(fake.NewSimpleClientset().CoreV1().Events("operator"), "test-cluster-member-removal-controller", &corev1.ObjectReference{})
+			eventRecorder := events.NewRecorder(fake.NewSimpleClientset().CoreV1().Events("operator"), "test-cluster-member-removal-controller", &corev1.ObjectReference{}, clock.RealClock{})
 			configMapTargetNSIndexer := cache.NewIndexer(cache.MetaNamespaceKeyFunc, cache.Indexers{})
 			for _, initialObj := range scenario.initialObjectsForConfigMapTargetNSLister {
 				configMapTargetNSIndexer.Add(initialObj)
@@ -1011,7 +1012,7 @@ func TestAttemptToScaleDown(t *testing.T) {
 	for _, scenario := range scenarios {
 		t.Run(scenario.name, func(t *testing.T) {
 			// test data
-			eventRecorder := events.NewRecorder(fake.NewSimpleClientset().CoreV1().Events("operator"), "test-cluster-member-removal-controller", &corev1.ObjectReference{})
+			eventRecorder := events.NewRecorder(fake.NewSimpleClientset().CoreV1().Events("operator"), "test-cluster-member-removal-controller", &corev1.ObjectReference{}, clock.RealClock{})
 			configMapTargetNSIndexer := cache.NewIndexer(cache.MetaNamespaceKeyFunc, cache.Indexers{})
 			for _, initialObj := range scenario.initialObjectsForConfigMapTargetNSLister {
 				configMapTargetNSIndexer.Add(initialObj)

diff --git a/pkg/operator/defragcontroller/defragcontroller_test.go b/pkg/operator/defragcontroller/defragcontroller_test.go
@@ -26,6 +26,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	corev1listers "k8s.io/client-go/listers/core/v1"
 	"k8s.io/client-go/tools/cache"
+	"k8s.io/utils/clock"
 
 	"github.com/openshift/cluster-etcd-operator/pkg/etcdcli"
 	u "github.com/openshift/cluster-etcd-operator/pkg/testutils"
@@ -165,7 +166,7 @@ func TestNewDefragController(t *testing.T) {
 				etcdcli.WithFakeClusterHealth(scenario.memberHealth),
 				etcdcli.WithFakeStatus(status),
 			)
-			eventRecorder := events.NewInMemoryRecorder(t.Name())
+			eventRecorder := events.NewInMemoryRecorder(t.Name(), clock.RealClock{})
 			require.NoError(t, err)
 			indexer := cache.NewIndexer(cache.MetaNamespaceKeyFunc, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc})
 			for _, obj := range scenario.objects {
@@ -324,7 +325,7 @@ func TestNewDefragControllerMultiSyncs(t *testing.T) {
 			}
 
 			fakeEtcdClient, _ := etcdcli.NewFakeEtcdClient(etcdMembers, fakeOpts...)
-			eventRecorder := events.NewInMemoryRecorder(t.Name())
+			eventRecorder := events.NewInMemoryRecorder(t.Name(), clock.RealClock{})
 			require.NoError(t, err)
 			indexer := cache.NewIndexer(cache.MetaNamespaceKeyFunc, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc})
 			for _, obj := range scenario.objects {

diff --git a/pkg/operator/etcdcertsigner/etcdcertsignercontroller_test.go b/pkg/operator/etcdcertsigner/etcdcertsignercontroller_test.go
@@ -24,6 +24,7 @@ import (
 	"k8s.io/client-go/tools/cache"
 	"k8s.io/component-base/metrics"
 	"k8s.io/component-base/metrics/legacyregistry"
+	"k8s.io/utils/clock"
 
 	"github.com/openshift/library-go/pkg/crypto"
 	"github.com/openshift/library-go/pkg/operator/events"
@@ -592,6 +593,7 @@ func setupController(t *testing.T, objects []runtime.Object, forceSkipRollout bo
 		fakeKubeClient.CoreV1().Events(operatorclient.TargetNamespace),
 		"test-cert-signer",
 		&corev1.ObjectReference{},
+		clock.RealClock{},
 	)
 
 	nodeSelector, err := labels.Parse("node-role.kubernetes.io/master")

diff --git a/pkg/operator/etcdendpointscontroller/etcdendpointscontroller_test.go b/pkg/operator/etcdendpointscontroller/etcdendpointscontroller_test.go
@@ -18,6 +18,7 @@ import (
 	corev1listers "k8s.io/client-go/listers/core/v1"
 	clientgotesting "k8s.io/client-go/testing"
 	"k8s.io/client-go/tools/cache"
+	"k8s.io/utils/clock"
 	"k8s.io/utils/diff"
 
 	"github.com/openshift/library-go/pkg/controller/factory"
@@ -324,7 +325,7 @@ func TestBootstrapAnnotationRemoval(t *testing.T) {
 			if err != nil {
 				t.Fatal(err)
 			}
-			eventRecorder := events.NewRecorder(fakeKubeClient.CoreV1().Events(operatorclient.TargetNamespace), "test-etcdendpointscontroller", &corev1.ObjectReference{})
+			eventRecorder := events.NewRecorder(fakeKubeClient.CoreV1().Events(operatorclient.TargetNamespace), "test-etcdendpointscontroller", &corev1.ObjectReference{}, clock.RealClock{})
 			indexer := cache.NewIndexer(cache.MetaNamespaceKeyFunc, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc})
 
 			for _, obj := range defaultObjects {

diff --git a/pkg/operator/machinedeletionhooks/machinedeletionhooks_test.go b/pkg/operator/machinedeletionhooks/machinedeletionhooks_test.go
@@ -16,6 +16,7 @@ import (
 	k8sfakeclient "k8s.io/client-go/kubernetes/fake"
 	clientgotesting "k8s.io/client-go/testing"
 	"k8s.io/client-go/tools/cache"
+	"k8s.io/utils/clock"
 
 	machinev1beta1 "github.com/openshift/api/machine/v1beta1"
 	machinev1beta1fakeclient "github.com/openshift/client-go/machine/clientset/versioned/fake"
@@ -31,7 +32,7 @@ import (
 )
 
 func TestSyncMethod(t *testing.T) {
-	eventRecorder := events.NewRecorder(k8sfakeclient.NewSimpleClientset().CoreV1().Events("operator"), "test-cluster-machine-deletion-hooks-controller", &corev1.ObjectReference{})
+	eventRecorder := events.NewRecorder(k8sfakeclient.NewSimpleClientset().CoreV1().Events("operator"), "test-cluster-machine-deletion-hooks-controller", &corev1.ObjectReference{}, clock.RealClock{})
 	fakeMachineAPIChecker := &fakeMachineAPI{isMachineAPIFunctional: func() (bool, error) {
 		return false, nil
 	}}
@@ -429,7 +430,7 @@ func TestAttemptToDeleteMachineDeletionHook(t *testing.T) {
 
 	for _, scenario := range scenarios {
 		// test data
-		eventRecorder := events.NewRecorder(k8sfakeclient.NewSimpleClientset().CoreV1().Events("operator"), "test-cluster-machine-deletion-hooks-controller", &corev1.ObjectReference{})
+		eventRecorder := events.NewRecorder(k8sfakeclient.NewSimpleClientset().CoreV1().Events("operator"), "test-cluster-machine-deletion-hooks-controller", &corev1.ObjectReference{}, clock.RealClock{})
 		machineIndexer := cache.NewIndexer(cache.MetaNamespaceKeyFunc, cache.Indexers{})
 		for _, initialObj := range scenario.initialObjectsForMachineLister {
 			machineIndexer.Add(initialObj)
@@ -658,7 +659,7 @@ func TestAttemptToDeleteQuorumGuard(t *testing.T) {
 	for _, scenario := range scenarios {
 		t.Run(scenario.name, func(t *testing.T) {
 			// We only expect a single event.
-			eventRecorder := events.NewInMemoryRecorder("test-cluster-machine-deletion-hooks-controller")
+			eventRecorder := events.NewInMemoryRecorder("test-cluster-machine-deletion-hooks-controller", clock.RealClock{})
 
 			machineIndexer := cache.NewIndexer(cache.MetaNamespaceKeyFunc, cache.Indexers{})
 			for _, initialObj := range scenario.initialObjectsForMachineLister {

diff --git a/pkg/operator/starter.go b/pkg/operator/starter.go
@@ -37,8 +37,6 @@ import (
 	"github.com/openshift/library-go/pkg/operator/status"
 	"github.com/openshift/library-go/pkg/operator/unsupportedconfigoverridescontroller"
 	"github.com/openshift/library-go/pkg/operator/v1helpers"
-	"k8s.io/utils/clock"
-
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
@@ -174,7 +172,7 @@ func RunOperator(ctx context.Context, controllerContext *controllercmd.Controlle
 	// we keep the default behavior of exiting the controller once a gate changes
 	featureGateAccessor.SetChangeHandler(featuregates.ForceExit)
 
-	operatorClient, dynamicInformers, err := genericoperatorclient.NewStaticPodOperatorClient(clock.RealClock{}, controllerContext.KubeConfig, operatorv1.GroupVersion.WithResource("etcds"), operatorv1.GroupVersion.WithKind("Etcd"), ExtractStaticPodOperatorSpec, ExtractStaticPodOperatorStatus)
+	operatorClient, dynamicInformers, err := genericoperatorclient.NewStaticPodOperatorClient(controllerContext.Clock, controllerContext.KubeConfig, operatorv1.GroupVersion.WithResource("etcds"), operatorv1.GroupVersion.WithKind("Etcd"), ExtractStaticPodOperatorSpec, ExtractStaticPodOperatorStatus)
 	if err != nil {
 		return err
 	}
@@ -304,7 +302,7 @@ func RunOperator(ctx context.Context, controllerContext *controllercmd.Controlle
 		return quorumChecker.IsSafeToUpdateRevision()
 	}
 
-	staticPodControllers, err := staticpod.NewBuilder(operatorClient, kubeClient, kubeInformersForNamespaces, configInformers).
+	staticPodControllers, err := staticpod.NewBuilder(operatorClient, kubeClient, kubeInformersForNamespaces, configInformers, controllerContext.Clock).
 		WithEvents(controllerContext.EventRecorder).
 		WithInstaller([]string{"cluster-etcd-operator", "installer"}).
 		WithPruning([]string{"cluster-etcd-operator", "prune"}, "etcd-pod").
@@ -429,6 +427,7 @@ func RunOperator(ctx context.Context, controllerContext *controllercmd.Controlle
 	)
 
 	unsupportedConfigOverridesController := unsupportedconfigoverridescontroller.NewUnsupportedConfigOverridesController(
+		"etcd",
 		operatorClient,
 		controllerContext.EventRecorder,
 	)

diff --git a/pkg/operator/targetconfigcontroller/targetconfigcontroller_test.go b/pkg/operator/targetconfigcontroller/targetconfigcontroller_test.go
@@ -23,6 +23,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/kubernetes/fake"
 	"k8s.io/client-go/tools/cache"
+	"k8s.io/utils/clock"
 
 	"github.com/stretchr/testify/require"
 )
@@ -151,7 +152,7 @@ func getController(t *testing.T, staticPodStatus *operatorv1.StaticPodOperatorSt
 	}
 
 	eventRecorder := events.NewRecorder(fakeKubeClient.CoreV1().Events(operatorclient.TargetNamespace),
-		"test-targetconfigcontroller", &corev1.ObjectReference{})
+		"test-targetconfigcontroller", &corev1.ObjectReference{}, clock.RealClock{})
 	indexer := cache.NewIndexer(cache.MetaNamespaceKeyFunc, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc})
 	for _, obj := range defaultObjects {
 		require.NoError(t, indexer.Add(obj))

diff --git a/pkg/tlshelpers/target_cert_creator_test.go b/pkg/tlshelpers/target_cert_creator_test.go
@@ -25,6 +25,7 @@ import (
 	kubefake "k8s.io/client-go/kubernetes/fake"
 	corev1listers "k8s.io/client-go/listers/core/v1"
 	"k8s.io/client-go/tools/cache"
+	"k8s.io/utils/clock"
 )
 
 type testEmbed struct {
@@ -111,7 +112,7 @@ func TestSignerSignatureRotation(t *testing.T) {
 
 				Client:        client.CoreV1(),
 				Lister:        corev1listers.NewSecretLister(indexer),
-				EventRecorder: events.NewInMemoryRecorder("test"),
+				EventRecorder: events.NewInMemoryRecorder("test", clock.RealClock{}),
 			}
 
 			ca, err := test.caFn()

diff --git a/vendor/github.com/openshift/library-go/pkg/controller/controllercmd/builder.go b/vendor/github.com/openshift/library-go/pkg/controller/controllercmd/builder.go
diff --git a/vendor/github.com/openshift/library-go/pkg/controller/controllercmd/cmd.go b/vendor/github.com/openshift/library-go/pkg/controller/controllercmd/cmd.go