react to changes

Author: p0lyn0mial

pkg/cmd/certregenerationcontroller/cmd.go

@@ -30,6 +30,7 @@ type Options struct {
 
 func NewCertRegenerationControllerCommand(ctx context.Context) *cobra.Command {
 	o := &Options{}
+	c := clock.RealClock{}
 
 	ccc := controllercmd.NewControllerCommandConfig("cert-regeneration-controller", version.Get(), func(ctx context.Context, controllerContext *controllercmd.ControllerContext) error {
 		o.controllerContext = controllerContext
@@ -44,13 +45,13 @@ func NewCertRegenerationControllerCommand(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.
@@ -73,7 +74,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)
@@ -95,7 +96,7 @@ func (o *Options) Run(ctx context.Context) error {
 	)
 
 	operatorClient, dynamicInformers, err := genericoperatorclient.NewStaticPodOperatorClient(
-		clock.RealClock{},
+		clock,
 		o.controllerContext.KubeConfig,
 		operatorv1.GroupVersion.WithResource("kubeapiservers"),
 		operatorv1.GroupVersion.WithKind("KubeAPIServer"),

pkg/cmd/checkendpoints/cmd.go

@@ -19,6 +19,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/informers"
 	"k8s.io/client-go/kubernetes"
+	"k8s.io/utils/clock"
 )
 
 func NewCheckEndpointsCommand() *cobra.Command {
@@ -55,7 +56,7 @@ func NewCheckEndpointsCommand() *cobra.Command {
 		if err != nil {
 			return err
 		}
-		recorder := events.NewRecorder(kubeClient.CoreV1().Events(namespace), "check-endpoint", involvedObjectRef)
+		recorder := events.NewRecorder(kubeClient.CoreV1().Events(namespace), "check-endpoint", involvedObjectRef, cctx.Clock)
 
 		check := controller.NewPodNetworkConnectivityCheckController(
 			podName,
@@ -100,7 +101,7 @@ func NewCheckEndpointsCommand() *cobra.Command {
 		go stopController.Run(ctx, 1)
 		<-ctx.Done()
 		return nil
-	})
+	}, clock.RealClock{})
 	config.DisableLeaderElection = true
 	cmd := config.NewCommandWithContext(context.Background())
 	cmd.Use = "check-endpoints"

pkg/cmd/operator/cmd.go

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

pkg/operator/starter.go

@@ -75,7 +75,6 @@ import (
 	"k8s.io/client-go/dynamic/dynamicinformer"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/klog/v2"
-	"k8s.io/utils/clock"
 	"k8s.io/utils/ptr"
 	kubemigratorclient "sigs.k8s.io/kube-storage-version-migrator/pkg/clients/clientset"
 	migrationv1alpha1informer "sigs.k8s.io/kube-storage-version-migrator/pkg/clients/informer"
@@ -133,7 +132,7 @@ func RunOperator(ctx context.Context, controllerContext *controllercmd.Controlle
 	)
 	configInformers := configv1informers.NewSharedInformerFactory(configClient, 10*time.Minute)
 	operatorClient, dynamicInformersForAllNamespaces, err := genericoperatorclient.NewStaticPodOperatorClient(
-		clock.RealClock{},
+		controllerContext.Clock,
 		controllerContext.KubeConfig,
 		operatorv1.GroupVersion.WithResource("kubeapiservers"),
 		operatorv1.GroupVersion.WithKind("KubeAPIServer"),
@@ -304,7 +303,7 @@ func RunOperator(ctx context.Context, controllerContext *controllercmd.Controlle
 	}
 	versionRecorder.SetVersion("raw-internal", status.VersionForOperatorFromEnv())
 
-	staticPodControllers, err := staticpod.NewBuilder(operatorClient, kubeClient, kubeInformersForNamespaces, configInformers).
+	staticPodControllers, err := staticpod.NewBuilder(operatorClient, kubeClient, kubeInformersForNamespaces, configInformers, controllerContext.Clock).
 		WithEvents(controllerContext.EventRecorder).
 		WithCustomInstaller([]string{"cluster-kube-apiserver-operator", "installer"}, installerErrorInjector(operatorClient)).
 		WithPruning([]string{"cluster-kube-apiserver-operator", "prune"}, "kube-apiserver-pod").