Skip to content

Commit b96d9c5

Browse files
committed
react to changes
1 parent 101e486 commit b96d9c5

File tree

4 files changed

+8
-0
lines changed

4 files changed

+8
-0
lines changed

pkg/cmd/certregenerationcontroller/cmd.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88
"github.com/spf13/cobra"
99

1010
"k8s.io/client-go/kubernetes"
11+
"k8s.io/utils/clock"
1112

1213
operatorv1 "github.com/openshift/api/operator/v1"
1314
configeversionedclient "github.com/openshift/client-go/config/clientset/versioned"
@@ -94,6 +95,7 @@ func (o *Options) Run(ctx context.Context) error {
9495
)
9596

9697
operatorClient, dynamicInformers, err := genericoperatorclient.NewStaticPodOperatorClient(
98+
clock.RealClock{},
9799
o.controllerContext.KubeConfig,
98100
operatorv1.GroupVersion.WithResource("kubeapiservers"),
99101
operatorv1.GroupVersion.WithKind("KubeAPIServer"),

pkg/operator/starter.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ import (
7575
"k8s.io/client-go/dynamic/dynamicinformer"
7676
"k8s.io/client-go/kubernetes"
7777
"k8s.io/klog/v2"
78+
"k8s.io/utils/clock"
7879
"k8s.io/utils/ptr"
7980
kubemigratorclient "sigs.k8s.io/kube-storage-version-migrator/pkg/clients/clientset"
8081
migrationv1alpha1informer "sigs.k8s.io/kube-storage-version-migrator/pkg/clients/informer"
@@ -132,6 +133,7 @@ func RunOperator(ctx context.Context, controllerContext *controllercmd.Controlle
132133
)
133134
configInformers := configv1informers.NewSharedInformerFactory(configClient, 10*time.Minute)
134135
operatorClient, dynamicInformersForAllNamespaces, err := genericoperatorclient.NewStaticPodOperatorClient(
136+
clock.RealClock{},
135137
controllerContext.KubeConfig,
136138
operatorv1.GroupVersion.WithResource("kubeapiservers"),
137139
operatorv1.GroupVersion.WithKind("KubeAPIServer"),

test/e2e/certrotation_test.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import (
1414
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1515
"k8s.io/apimachinery/pkg/util/wait"
1616
"k8s.io/client-go/kubernetes"
17+
"k8s.io/utils/clock"
1718

1819
configv1 "github.com/openshift/api/config/v1"
1920
operatorv1 "github.com/openshift/api/operator/v1"
@@ -30,6 +31,7 @@ func TestCertRotationTimeUpgradeable(t *testing.T) {
3031
kubeConfig, err := test.NewClientConfigForTest()
3132
require.NoError(t, err)
3233
operatorClient, _, err := genericoperatorclient.NewStaticPodOperatorClient(
34+
clock.RealClock{},
3335
kubeConfig,
3436
operatorv1.GroupVersion.WithResource("kubeapiservers"),
3537
operatorv1.GroupVersion.WithKind("KubeAPIServer"),

test/e2e/operator_test.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import (
1717
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1818
"k8s.io/apimachinery/pkg/util/wait"
1919
"k8s.io/client-go/kubernetes"
20+
"k8s.io/utils/clock"
2021
)
2122

2223
func TestOperatorNamespace(t *testing.T) {
@@ -50,6 +51,7 @@ func TestRevisionLimits(t *testing.T) {
5051
kubeClient, err := kubernetes.NewForConfig(kubeConfig)
5152
require.NoError(t, err)
5253
operatorClient, _, err := genericoperatorclient.NewStaticPodOperatorClient(
54+
clock.RealClock{},
5355
kubeConfig,
5456
operatorv1.GroupVersion.WithResource("kubeapiservers"),
5557
operatorv1.GroupVersion.WithKind("KubeAPIServer"),

0 commit comments

Comments
 (0)