chore: adjust code after deps update

Author: machine424

Diff for: pkg/client/client_test.go

@@ -42,6 +42,7 @@ import (
 	"k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/client-go/kubernetes/fake"
 	"k8s.io/utils/ptr"
+	"k8s.io/utils/clock"
 )
 
 const (
@@ -510,7 +511,7 @@ func TestCreateOrUpdateSecret(t *testing.T) {
 
 			c := Client{
 				kclient:       fake.NewSimpleClientset(initial),
-				eventRecorder: events.NewInMemoryRecorder("cluster-monitoring-operator"),
+				eventRecorder: events.NewInMemoryRecorder("cluster-monitoring-operator", clock.RealClock{}),
 			}
 
 			_, err := c.kclient.CoreV1().Secrets(ns).Get(ctx, initial.Name, metav1.GetOptions{})
@@ -634,7 +635,7 @@ func TestCreateOrUpdateConfigMap(t *testing.T) {
 
 			c := Client{
 				kclient:       fake.NewSimpleClientset(initial),
-				eventRecorder: events.NewInMemoryRecorder("cluster-monitoring-operator"),
+				eventRecorder: events.NewInMemoryRecorder("cluster-monitoring-operator", clock.RealClock{}),
 			}
 
 			_, err := c.kclient.CoreV1().ConfigMaps(ns).Get(ctx, initial.Name, metav1.GetOptions{})
@@ -782,7 +783,7 @@ func TestCreateOrUpdateService(t *testing.T) {
 
 			c := Client{
 				kclient:       fake.NewSimpleClientset(initial),
-				eventRecorder: events.NewInMemoryRecorder("cluster-monitoring-operator"),
+				eventRecorder: events.NewInMemoryRecorder("cluster-monitoring-operator", clock.RealClock{}),
 			}
 
 			initial, err := c.kclient.CoreV1().Services(ns).Get(ctx, initial.Name, metav1.GetOptions{})
@@ -902,7 +903,7 @@ func TestCreateOrUpdateServiceAccount(t *testing.T) {
 		},
 	}
 
-	eventRecorder := events.NewInMemoryRecorder("cluster-monitoring-operator")
+	eventRecorder := events.NewInMemoryRecorder("cluster-monitoring-operator", clock.RealClock{})
 	for _, tc := range testCases {
 		t.Run(tc.name, func(st *testing.T) {
 			sa := &v1.ServiceAccount{
@@ -1026,7 +1027,7 @@ func TestCreateOrUpdateRole(t *testing.T) {
 			}
 			c := Client{
 				kclient:       fake.NewSimpleClientset(initial),
-				eventRecorder: events.NewInMemoryRecorder("cluster-monitoring-operator"),
+				eventRecorder: events.NewInMemoryRecorder("cluster-monitoring-operator", clock.RealClock{}),
 			}
 			_, err := c.kclient.RbacV1().Roles(ns).Get(ctx, initial.Name, metav1.GetOptions{})
 			require.NoError(t, err)
@@ -1176,7 +1177,7 @@ func TestCreateOrUpdateRoleBinding(t *testing.T) {
 			}
 			c := Client{
 				kclient:       fake.NewSimpleClientset(initial),
-				eventRecorder: events.NewInMemoryRecorder("cluster-monitoring-operator"),
+				eventRecorder: events.NewInMemoryRecorder("cluster-monitoring-operator", clock.RealClock{}),
 			}
 			initial, err := c.kclient.RbacV1().RoleBindings(ns).Get(ctx, initial.Name, metav1.GetOptions{})
 			require.NoError(t, err)
@@ -1270,7 +1271,7 @@ func TestCreateOrUpdateClusterRole(t *testing.T) {
 			}
 			c := Client{
 				kclient:       fake.NewSimpleClientset(initial),
-				eventRecorder: events.NewInMemoryRecorder("cluster-monitoring-operator"),
+				eventRecorder: events.NewInMemoryRecorder("cluster-monitoring-operator", clock.RealClock{}),
 			}
 			_, err := c.kclient.RbacV1().ClusterRoles().Get(ctx, initial.Name, metav1.GetOptions{})
 			require.NoError(t, err)
@@ -1416,7 +1417,7 @@ func TestCreateOrUpdateClusterRoleBinding(t *testing.T) {
 
 			c := Client{
 				kclient:       fake.NewSimpleClientset(initial.DeepCopy()),
-				eventRecorder: events.NewInMemoryRecorder("cluster-monitoring-operator"),
+				eventRecorder: events.NewInMemoryRecorder("cluster-monitoring-operator", clock.RealClock{}),
 			}
 			initial, err := c.kclient.RbacV1().ClusterRoleBindings().Get(ctx, initial.Name, metav1.GetOptions{})
 			require.NoError(t, err)
@@ -1932,7 +1933,7 @@ func TestCreateOrUpdateValidatingWebhookConfiguration(t *testing.T) {
 
 	c := Client{
 		kclient:       fake.NewSimpleClientset(webhook.DeepCopy()),
-		eventRecorder: events.NewInMemoryRecorder("cluster-monitoring-operator"),
+		eventRecorder: events.NewInMemoryRecorder("cluster-monitoring-operator", clock.RealClock{}),
 		resourceCache: resourceapply.NewResourceCache(),
 	}
 

Diff for: pkg/manifests/manifests.go

@@ -3447,8 +3447,8 @@ func addRemoteWriteConfigs(clusterID string, rw []monv1.RemoteWriteSpec, rwTarge
 		writeRelabelConfigs = append(writeRelabelConfigs, tmpRelabelDrop)
 		rwConf := monv1.RemoteWriteSpec{
 			URL:                 target.URL,
-			Name:                target.Name,
-			RemoteTimeout:       monv1.Duration(target.RemoteTimeout),
+			Name:                ptr.To(target.Name),
+			RemoteTimeout:       ptr.To(monv1.Duration(target.RemoteTimeout)),
 			Headers:             target.Headers,
 			QueueConfig:         target.QueueConfig,
 			WriteRelabelConfigs: writeRelabelConfigs,

Diff for: pkg/operator/operator.go

@@ -45,6 +45,7 @@ import (
 	"k8s.io/client-go/tools/cache"
 	"k8s.io/client-go/util/workqueue"
 	"k8s.io/klog/v2"
+	"k8s.io/utils/clock"
 
 	"github.com/openshift/cluster-monitoring-operator/pkg/alert"
 	"github.com/openshift/cluster-monitoring-operator/pkg/client"
@@ -238,6 +239,7 @@ func New(
 		events.RecommendedClusterSingletonCorrelatorOptions(),
 		"cluster-monitoring-operator",
 		controllerRef,
+		clock.RealClock{},
 	)
 
 	configClient, err := configv1client.NewForConfig(config)

Diff for: test/e2e/framework/framework.go

@@ -19,14 +19,15 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	apiextensionsclient "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
 	"os/exec"
 	"regexp"
 	"strconv"
 	"strings"
 	"testing"
 	"time"
 
+	apiextensionsclient "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
+
 	"github.com/imdario/mergo"
 	configv1 "github.com/openshift/api/config/v1"
 	openshiftconfigclientset "github.com/openshift/client-go/config/clientset/versioned"
@@ -35,6 +36,7 @@ import (
 	"github.com/openshift/cluster-monitoring-operator/pkg/client"
 	"github.com/openshift/cluster-monitoring-operator/pkg/manifests"
 	authenticationv1 "k8s.io/api/authentication/v1"
+	"k8s.io/utils/clock"
 	"k8s.io/utils/ptr"
 
 	"github.com/openshift/library-go/pkg/operator/events"
@@ -125,7 +127,7 @@ func New(kubeConfigPath string) (*Framework, CleanUpFunc, error) {
 	}
 
 	// The event recorder will be used by some CreateOrUpdateXXX utils for creation/update events.
-	operatorClient, err := client.NewForConfig(config, "", namespaceName, userWorkloadNamespaceName, client.EventRecorder(events.NewInMemoryRecorder("cluster-monitoring-operator")))
+	operatorClient, err := client.NewForConfig(config, "", namespaceName, userWorkloadNamespaceName, client.EventRecorder(events.NewInMemoryRecorder("cluster-monitoring-operator", clock.RealClock{})))
 	if err != nil {
 		return nil, nil, fmt.Errorf("creating operator client failed: %w", err)
 	}

Diff for: test/e2e/framework/prometheus.go

@@ -19,14 +19,14 @@ import (
 	"compress/gzip"
 	"fmt"
 	"io"
-	"os"
 	"testing"
 
-	"github.com/go-kit/log"
 	routev1 "github.com/openshift/api/route/v1"
 	monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
+	"github.com/prometheus/common/promslog"
 	promConfig "github.com/prometheus/prometheus/config"
 	"github.com/stretchr/testify/require"
+
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/intstr"
@@ -147,7 +147,7 @@ func (f Framework) PrometheusConfigFromSecret(t *testing.T, namespace, secretNam
 	require.NoError(t, err)
 	unzippedData, err := io.ReadAll(reader)
 	require.NoError(t, err)
-	prometheusConfig, err := promConfig.Load(string(unzippedData), false, log.NewLogfmtLogger(log.NewSyncWriter(os.Stderr)))
+	prometheusConfig, err := promConfig.Load(string(unzippedData), promslog.NewNopLogger())
 	require.NoError(t, err, "failed to load the config.")
 	return prometheusConfig
 }