react to changes

Author: p0lyn0mial

pkg/cmd/operator/cmd.go

@@ -6,11 +6,13 @@ import (
 	"github.com/openshift/cluster-kube-controller-manager-operator/pkg/operator"
 	"github.com/openshift/cluster-kube-controller-manager-operator/pkg/version"
 	"github.com/openshift/library-go/pkg/controller/controllercmd"
+
+	"k8s.io/utils/clock"
 )
 
 func NewOperator() *cobra.Command {
 	cmd := controllercmd.
-		NewControllerCommandConfig("kube-controller-manager-operator", version.Get(), operator.RunOperator).
+		NewControllerCommandConfig("kube-controller-manager-operator", version.Get(), operator.RunOperator, clock.RealClock{}).
 		NewCommand()
 	cmd.Use = "operator"
 	cmd.Short = "Start the Cluster kube-controller-manager Operator"

pkg/cmd/recoverycontroller/cmd.go

@@ -15,6 +15,7 @@ import (
 	"github.com/openshift/library-go/pkg/operator/v1helpers"
 	"github.com/spf13/cobra"
 	"k8s.io/client-go/kubernetes"
+	"k8s.io/utils/clock"
 )
 
 type Options struct {
@@ -23,6 +24,7 @@ type Options struct {
 
 func NewCertRecoveryControllerCommand(ctx context.Context) *cobra.Command {
 	o := &Options{}
+	c := clock.RealClock{}
 
 	ccc := controllercmd.NewControllerCommandConfig("cert-recovery-controller", version.Get(), func(ctx context.Context, controllerContext *controllercmd.ControllerContext) error {
 		o.controllerContext = controllerContext
@@ -37,13 +39,13 @@ func NewCertRecoveryControllerCommand(ctx context.Context) *cobra.Command {
 			return err
 		}
 
-		err = o.Run(ctx)
+		err = o.Run(ctx, c)
 		if err != nil {
 			return err
 		}
 
 		return nil
-	})
+	}, c)
 
 	// Disable serving for recovery as it introduces a dependency on kube-system::extension-apiserver-authentication
 	// configmap which prevents it to start as the CA bundle is expired.
@@ -66,7 +68,7 @@ func (o *Options) Complete(ctx context.Context) error {
 	return nil
 }
 
-func (o *Options) Run(ctx context.Context) error {
+func (o *Options) Run(ctx context.Context, clock clock.Clock) error {
 	kubeClient, err := kubernetes.NewForConfig(o.controllerContext.ProtoKubeConfig)
 	if err != nil {
 		return fmt.Errorf("can't build kubernetes client: %w", err)
@@ -81,6 +83,7 @@ func (o *Options) Run(ctx context.Context) error {
 	)
 
 	operatorClient, dynamicInformers, err := genericoperatorclient.NewStaticPodOperatorClient(
+		clock,
 		o.controllerContext.KubeConfig,
 		operatorv1.GroupVersion.WithResource("kubecontrollermanagers"),
 		operatorv1.GroupVersion.WithKind("KubeControllerManager"),

pkg/operator/configobservation/clustername/observeinfraid_test.go

@@ -6,6 +6,7 @@ import (
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/tools/cache"
+	"k8s.io/utils/clock"
 
 	configv1 "github.com/openshift/api/config/v1"
 	configlistersv1 "github.com/openshift/client-go/config/listers/config/v1"
@@ -97,7 +98,7 @@ func TestObserveInfraID(t *testing.T) {
 			listers := configobservation.Listers{
 				InfrastructureLister_: configlistersv1.NewInfrastructureLister(indexer),
 			}
-			result, errs := ObserveInfraID(listers, events.NewInMemoryRecorder("infraid"), test.input)
+			result, errs := ObserveInfraID(listers, events.NewInMemoryRecorder("infraid", clock.RealClock{}), test.input)
 			if len(errs) > 0 {
 				t.Fatal(errs)
 			} else {

pkg/operator/configobservation/network/observe_networking_test.go

@@ -6,6 +6,7 @@ import (
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/tools/cache"
+	"k8s.io/utils/clock"
 
 	configv1 "github.com/openshift/api/config/v1"
 	configlistersv1 "github.com/openshift/client-go/config/listers/config/v1"
@@ -78,7 +79,7 @@ func TestObserveClusterCIDRs(t *testing.T) {
 			listers := configobservation.Listers{
 				NetworkLister: configlistersv1.NewNetworkLister(indexer),
 			}
-			result, errs := ObserveClusterCIDRs(listers, events.NewInMemoryRecorder("network"), map[string]interface{}{})
+			result, errs := ObserveClusterCIDRs(listers, events.NewInMemoryRecorder("network", clock.RealClock{}), map[string]interface{}{})
 			if len(errs) > 0 && !test.expectedError {
 				t.Fatal(errs)
 			} else if len(errs) == 0 {
@@ -101,7 +102,7 @@ func TestObserveServiceClusterIPRanges(t *testing.T) {
 	listers := configobservation.Listers{
 		NetworkLister: configlistersv1.NewNetworkLister(indexer),
 	}
-	result, errs := ObserveServiceClusterIPRanges(listers, events.NewInMemoryRecorder("network"), map[string]interface{}{})
+	result, errs := ObserveServiceClusterIPRanges(listers, events.NewInMemoryRecorder("network", clock.RealClock{}), map[string]interface{}{})
 	if len(errs) > 0 {
 		t.Fatal(errs)
 	}

pkg/operator/gcwatchercontroller/gcwatcher_controller_test.go

@@ -17,6 +17,7 @@ import (
 	"k8s.io/client-go/informers"
 	"k8s.io/client-go/kubernetes/fake"
 	"k8s.io/client-go/tools/cache"
+	"k8s.io/utils/clock"
 
 	configv1 "github.com/openshift/api/config/v1"
 	operatorv1 "github.com/openshift/api/operator/v1"
@@ -429,7 +430,7 @@ func TestGarbageCollectorSync(t *testing.T) {
 			tc.gc.configMapClient = configMapGetter
 			clusterListers := configlisters.NewClusterOperatorLister(indexer)
 			tc.gc.clusterLister = clusterListers
-			eventRecorder := events.NewInMemoryRecorder("dummy")
+			eventRecorder := events.NewInMemoryRecorder("dummy", clock.RealClock{})
 			syncContext := factory.NewSyncContext(controllerName, eventRecorder)
 			syncContext.Queue().Add(invalidateAlertingRulesCacheKey)
 			err := tc.gc.sync(context.TODO(), syncContext)

pkg/operator/starter.go

@@ -68,6 +68,7 @@ func RunOperator(ctx context.Context, cc *controllercmd.ControllerContext) error
 	)
 
 	operatorClient, dynamicInformers, err := genericoperatorclient.NewStaticPodOperatorClient(
+		cc.Clock,
 		cc.KubeConfig,
 		operatorv1.GroupVersion.WithResource("kubecontrollermanagers"),
 		operatorv1.GroupVersion.WithKind("KubeControllerManager"),
@@ -213,7 +214,7 @@ func RunOperator(ctx context.Context, cc *controllercmd.ControllerContext) error
 	}
 	versionRecorder.SetVersion("raw-internal", status.VersionForOperatorFromEnv())
 
-	staticPodControllers, err := staticpod.NewBuilder(operatorClient, kubeClient, kubeInformersForNamespaces, configInformers).
+	staticPodControllers, err := staticpod.NewBuilder(operatorClient, kubeClient, kubeInformersForNamespaces, configInformers, cc.Clock).
 		WithEvents(cc.EventRecorder).
 		WithInstaller([]string{"cluster-kube-controller-manager-operator", "installer"}).
 		WithPruning([]string{"cluster-kube-controller-manager-operator", "prune"}, "kube-controller-manager-pod").

pkg/operator/targetconfigcontroller/targetconfigcontroller_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"
 )
 
 func TestIsRequiredConfigPresent(t *testing.T) {
@@ -305,7 +306,7 @@ func TestManageCSRSigner(t *testing.T) {
 				t.Fatal(err.Error())
 			}
 			lister := corev1listers.NewSecretLister(indexer)
-			_, delay, changed, err := ManageCSRSigner(context.Background(), lister, client.CoreV1(), events.NewInMemoryRecorder("target-config-controller"))
+			_, delay, changed, err := ManageCSRSigner(context.Background(), lister, client.CoreV1(), events.NewInMemoryRecorder("target-config-controller", clock.RealClock{}))
 			// there's a 10s difference we need to account for to avoid flakes
 			offset := 10 * time.Second
 			if delay < test.expectedDelay-offset || delay > test.expectedDelay+offset {