Skip to content

Commit 5eb43be

Browse files
vrutkovsvrutkovs
committed
Adjust to changes
1 parent e811801 commit 5eb43be

File tree

14 files changed

+30
-16
lines changed

14 files changed

+30
-16
lines changed

‎pkg/cmd/operator/cmd.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package operator
22

33
import (
44
"github.com/spf13/cobra"
5+
"k8s.io/utils/clock"
56

67
"github.com/openshift/cluster-authentication-operator/pkg/operator"
78
"github.com/openshift/cluster-authentication-operator/pkg/version"
@@ -11,7 +12,7 @@ import (
1112
const componentName = "cluster-authentication-operator"
1213

1314
func NewOperator() *cobra.Command {
14-
cmd := controllercmd.NewControllerCommandConfig(componentName, version.Get(), operator.RunOperator).NewCommand()
15+
cmd := controllercmd.NewControllerCommandConfig(componentName, version.Get(), operator.RunOperator, clock.RealClock{}).NewCommand()
1516
cmd.Use = "operator"
1617
cmd.Short = "Start the Authentication Operator"
1718
return cmd

‎pkg/controllers/configobservation/console/observe_consoleurl_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import (
77

88
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
99
"k8s.io/client-go/tools/cache"
10+
"k8s.io/utils/clock"
1011

1112
configv1 "github.com/openshift/api/config/v1"
1213
configlistersv1 "github.com/openshift/client-go/config/listers/config/v1"
@@ -111,7 +112,7 @@ func TestObserveConsoleURL(t *testing.T) {
111112
ClusterVersionLister: configlistersv1.NewClusterVersionLister(clusterVersionIndexer),
112113
}
113114

114-
eventRecorder := events.NewInMemoryRecorder(tt.name)
115+
eventRecorder := events.NewInMemoryRecorder(tt.name, clock.RealClock{})
115116
gotConfig, errs := ObserveConsoleURL(listers, eventRecorder, tt.existingConfig)
116117
if !reflect.DeepEqual(gotConfig, tt.expectedConfig) {
117118
t.Errorf("ObserveConsoleURL() gotConfig = %v, want %v", gotConfig, tt.expectedConfig)

‎pkg/controllers/configobservation/infrastructure/observe_apiserverurl_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import (
77

88
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
99
"k8s.io/client-go/tools/cache"
10+
"k8s.io/utils/clock"
1011

1112
configv1 "github.com/openshift/api/config/v1"
1213
configlistersv1 "github.com/openshift/client-go/config/listers/config/v1"
@@ -73,7 +74,7 @@ func TestObserveAPIServerURL(t *testing.T) {
7374
InfrastructureLister: configlistersv1.NewInfrastructureLister(indexer),
7475
}
7576

76-
eventRecorder := events.NewInMemoryRecorder(tt.name)
77+
eventRecorder := events.NewInMemoryRecorder(tt.name, clock.RealClock{})
7778
gotConfig, errs := ObserveAPIServerURL(listers, eventRecorder, tt.existingConfig)
7879
if !reflect.DeepEqual(gotConfig, tt.expectedConfig) {
7980
t.Errorf("ObserveAPIServerURL() gotConfig = %v, want %v", gotConfig, tt.expectedConfig)

‎pkg/controllers/configobservation/oauth/observe_audit_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88
"k8s.io/apimachinery/pkg/api/equality"
99
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1010
"k8s.io/client-go/tools/cache"
11+
"k8s.io/utils/clock"
1112

1213
configv1 "github.com/openshift/api/config/v1"
1314
configlistersv1 "github.com/openshift/client-go/config/listers/config/v1"
@@ -120,7 +121,7 @@ func TestAuditProfile(t *testing.T) {
120121
APIServerLister_: configlistersv1.NewAPIServerLister(indexer),
121122
}
122123

123-
have, errs := oauth.ObserveAudit(listers, events.NewInMemoryRecorder(t.Name()), tt.previouslyObservedConfig)
124+
have, errs := oauth.ObserveAudit(listers, events.NewInMemoryRecorder(t.Name(), clock.RealClock{}), tt.previouslyObservedConfig)
124125
if len(errs) > 0 {
125126
t.Errorf("Expected 0 errors, have %v.", len(errs))
126127
}

‎pkg/controllers/configobservation/oauth/observe_idps_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import (
1111
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1212
corelistersv1 "k8s.io/client-go/listers/core/v1"
1313
"k8s.io/client-go/tools/cache"
14+
"k8s.io/utils/clock"
1415

1516
configv1 "github.com/openshift/api/config/v1"
1617
configlistersv1 "github.com/openshift/client-go/config/listers/config/v1"
@@ -199,7 +200,7 @@ func TestObserveIdentityProviders(t *testing.T) {
199200
OAuthLister_: configlistersv1.NewOAuthLister(indexer),
200201
ResourceSync: &mockResourceSyncer{t: t, synced: syncerData},
201202
}
202-
eventsRecorder := events.NewInMemoryRecorder(t.Name())
203+
eventsRecorder := events.NewInMemoryRecorder(t.Name(), clock.RealClock{})
203204

204205
got, errs := ObserveIdentityProviders(listers, eventsRecorder, tt.previouslyObservedConfig)
205206

‎pkg/controllers/configobservation/oauth/observe_templates_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import (
99
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1010
corelistersv1 "k8s.io/client-go/listers/core/v1"
1111
"k8s.io/client-go/tools/cache"
12+
"k8s.io/utils/clock"
1213

1314
configv1 "github.com/openshift/api/config/v1"
1415
configlistersv1 "github.com/openshift/client-go/config/listers/config/v1"
@@ -88,7 +89,7 @@ func TestObserveTemplates(t *testing.T) {
8889
ConfigMapLister: corelistersv1.NewConfigMapLister(indexer),
8990
ResourceSync: &mockResourceSyncer{t: t, synced: syncerData},
9091
}
91-
got, errs := ObserveTemplates(listers, events.NewInMemoryRecorder(t.Name()), tt.previouslyObservedConfig)
92+
got, errs := ObserveTemplates(listers, events.NewInMemoryRecorder(t.Name(), clock.RealClock{}), tt.previouslyObservedConfig)
9293
if len(errs) > 0 {
9394
t.Errorf("Expected 0 errors, got %v.", len(errs))
9495
}

‎pkg/controllers/configobservation/oauth/observe_tokenconfig_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88
"k8s.io/apimachinery/pkg/api/equality"
99
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1010
"k8s.io/client-go/tools/cache"
11+
"k8s.io/utils/clock"
1112

1213
configv1 "github.com/openshift/api/config/v1"
1314
configlistersv1 "github.com/openshift/client-go/config/listers/config/v1"
@@ -119,7 +120,7 @@ func TestObserveTokenConfig(t *testing.T) {
119120
listers := configobservation.Listers{
120121
OAuthLister_: configlistersv1.NewOAuthLister(indexer),
121122
}
122-
got, errs := ObserveTokenConfig(listers, events.NewInMemoryRecorder(t.Name()), tt.previouslyObservedConfig)
123+
got, errs := ObserveTokenConfig(listers, events.NewInMemoryRecorder(t.Name(), clock.RealClock{}), tt.previouslyObservedConfig)
123124
if len(errs) > 0 {
124125
t.Errorf("Expected 0 errors, got %v.", len(errs))
125126
}

‎pkg/controllers/configobservation/routersecret/observe_router_secret_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import (
1010
"k8s.io/apimachinery/pkg/runtime/schema"
1111
corev1listers "k8s.io/client-go/listers/core/v1"
1212
"k8s.io/client-go/tools/cache"
13+
"k8s.io/utils/clock"
1314

1415
configv1 "github.com/openshift/api/config/v1"
1516
configlistersv1 "github.com/openshift/client-go/config/listers/config/v1"
@@ -180,7 +181,7 @@ func TestObserveRouterSecret(t *testing.T) {
180181
IngressLister: configlistersv1.NewIngressLister(indexer),
181182
}
182183

183-
eventRecorder := events.NewInMemoryRecorder(tt.name)
184+
eventRecorder := events.NewInMemoryRecorder(tt.name, clock.RealClock{})
184185
gotConfig, errs := ObserveRouterSecret(listers, eventRecorder, tt.existingConfig)
185186
if !reflect.DeepEqual(gotConfig, tt.expectedConfig) {
186187
t.Errorf("ObserveRouterSecret() gotConfig = %v, want %v", gotConfig, tt.expectedConfig)

‎pkg/controllers/routercerts/controller_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import (
2222
"k8s.io/client-go/kubernetes/fake"
2323
corev1listers "k8s.io/client-go/listers/core/v1"
2424
"k8s.io/client-go/tools/cache"
25+
"k8s.io/utils/clock"
2526

2627
configv1 "github.com/openshift/api/config/v1"
2728
operatorv1 "github.com/openshift/api/operator/v1"
@@ -249,7 +250,7 @@ func TestValidateRouterCertificates(t *testing.T) {
249250
systemCertPool: tc.systemCertPool,
250251
secretsClient: secretsClient.CoreV1(),
251252
}
252-
err = controller.sync(context.TODO(), factory.NewSyncContext("testctx", events.NewInMemoryRecorder("test-recorder")))
253+
err = controller.sync(context.TODO(), factory.NewSyncContext("testctx", events.NewInMemoryRecorder("test-recorder", clock.RealClock{})))
253254
require.NoError(t, err)
254255
_, s, _, _ := operatorClient.GetOperatorState()
255256
require.Len(t, s.Conditions, 1)

‎pkg/libs/endpointaccessible/endpoint_accessible_controller_test.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ import (
55
"fmt"
66
"testing"
77

8+
"k8s.io/utils/clock"
9+
810
operatorv1 "github.com/openshift/api/operator/v1"
911
"github.com/openshift/library-go/pkg/operator/v1helpers"
1012

@@ -52,7 +54,7 @@ func Test_endpointAccessibleController_sync(t *testing.T) {
5254
operatorClient: v1helpers.NewFakeOperatorClient(&operatorv1.OperatorSpec{}, &operatorv1.OperatorStatus{}, nil),
5355
endpointListFn: tt.endpointListFn,
5456
}
55-
if err := c.sync(context.Background(), factory.NewSyncContext(tt.name, events.NewInMemoryRecorder(tt.name))); (err != nil) != tt.wantErr {
57+
if err := c.sync(context.Background(), factory.NewSyncContext(tt.name, events.NewInMemoryRecorder(tt.name, clock.RealClock{}))); (err != nil) != tt.wantErr {
5658
t.Errorf("sync() error = %v, wantErr %v", err, tt.wantErr)
5759
}
5860
})

‎pkg/operator/configobservation/authentication/apiaudiences_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import (
77

88
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
99
"k8s.io/client-go/tools/cache"
10+
"k8s.io/utils/clock"
1011

1112
configv1 "github.com/openshift/api/config/v1"
1213
configlistersv1 "github.com/openshift/client-go/config/listers/config/v1"
@@ -82,7 +83,7 @@ func TestObservedConfig(t *testing.T) {
8283
require.NoError(t, err)
8384
}
8485

85-
testRecorder := events.NewInMemoryRecorder("APIAudiencesTest")
86+
testRecorder := events.NewInMemoryRecorder("APIAudiencesTest", clock.RealClock{})
8687
listers := configobservation.Listers{
8788
AuthConfigLister_: configlistersv1.NewAuthenticationLister(indexer),
8889
}

‎pkg/operator/configobservation/oauth/inactivity_timeout_test.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import (
1010
"k8s.io/apimachinery/pkg/api/equality"
1111
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1212
"k8s.io/client-go/tools/cache"
13+
"k8s.io/utils/clock"
1314

1415
configv1 "github.com/openshift/api/config/v1"
1516
configlistersv1 "github.com/openshift/client-go/config/listers/config/v1"
@@ -181,7 +182,7 @@ func TestObserveAccessTokenInactivityTimeout(t *testing.T) {
181182

182183
lister := testLister{lister: configlistersv1.NewOAuthLister(indexer)}
183184

184-
got, errs := ObserveAccessTokenInactivityTimeout(lister, events.NewInMemoryRecorder(t.Name()), tt.previouslyObservedConfig)
185+
got, errs := ObserveAccessTokenInactivityTimeout(lister, events.NewInMemoryRecorder(t.Name(), clock.RealClock{}), tt.previouslyObservedConfig)
185186
if len(errs) != len(tt.errors) {
186187
t.Errorf("Expected %d errors, got %d.", len(tt.errors), errs)
187188
}
@@ -197,7 +198,7 @@ func TestObserveAccessTokenInactivityTimeout(t *testing.T) {
197198
},
198199
}
199200

200-
got, errs := ObserveAccessTokenInactivityTimeout(invalidLister{}, events.NewInMemoryRecorder("fakeRecorder"), existingConfig)
201+
got, errs := ObserveAccessTokenInactivityTimeout(invalidLister{}, events.NewInMemoryRecorder("fakeRecorder", clock.RealClock{}), existingConfig)
201202

202203
// There must be only one kind of error asserting the lister type.
203204
if len(errs) != 1 {

‎pkg/operator/replacement_starter.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ func CreateOperatorInputFromMOM(ctx context.Context, momInput libraryapplyconfig
118118
Kind: "Deployment",
119119
Namespace: "openshift-authentication-operator",
120120
Name: "authentication-operator",
121-
})
121+
}, clock.RealClock{})
122122

123123
return &authenticationOperatorInput{
124124
kubeClient: kubeClient,
@@ -187,7 +187,7 @@ func CreateControllerInputFromControllerContext(ctx context.Context, controllerC
187187
Namespace: "openshift-authentication-operator",
188188
Name: "authentication-operator",
189189
},
190-
)
190+
clock.RealClock{})
191191

192192
return &authenticationOperatorInput{
193193
kubeClient: kubeClient,

‎pkg/operator/workload/sync_openshift_oauth_apiserver_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import (
1919
"k8s.io/client-go/kubernetes/fake"
2020
"k8s.io/client-go/kubernetes/scheme"
2121
clientgotesting "k8s.io/client-go/testing"
22+
"k8s.io/utils/clock"
2223
)
2324

2425
var codec = scheme.Codecs.LegacyCodec(scheme.Scheme.PrioritizedVersionsAllGroups()...)
@@ -136,7 +137,7 @@ func TestSyncOAuthAPIServerDeployment(t *testing.T) {
136137

137138
for _, scenario := range scenarios {
138139
t.Run(scenario.name, func(t *testing.T) {
139-
eventRecorder := events.NewInMemoryRecorder("")
140+
eventRecorder := events.NewInMemoryRecorder("", clock.RealClock{})
140141
fakeKubeClient := fake.NewSimpleClientset()
141142

142143
target := &OAuthAPIServerWorkload{

0 commit comments

Comments
 (0)