Skip to content

Commit d1a8d30

Browse files
committed
react to library-go changes
1 parent 294adfc commit d1a8d30

File tree

5 files changed

+23
-15
lines changed

5 files changed

+23
-15
lines changed

pkg/cmd/operator/cmd.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,16 @@ package operator
33
import (
44
"github.com/spf13/cobra"
55

6+
"k8s.io/utils/clock"
7+
68
"github.com/openshift/cluster-openshift-apiserver-operator/pkg/operator"
79
"github.com/openshift/cluster-openshift-apiserver-operator/pkg/version"
810
"github.com/openshift/library-go/pkg/controller/controllercmd"
911
)
1012

1113
func NewOperator() *cobra.Command {
1214
cmd := controllercmd.
13-
NewControllerCommandConfig("openshift-apiserver-operator", version.Get(), operator.RunOperator).
15+
NewControllerCommandConfig("openshift-apiserver-operator", version.Get(), operator.RunOperator, clock.RealClock{}).
1416
NewCommand()
1517
cmd.Use = "operator"
1618
cmd.Short = "Start the Cluster openshift-apiserver Operator"

pkg/operator/configobservation/images/observe_images_test.go

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,13 @@ import (
55
"encoding/json"
66
"reflect"
77
"testing"
8+
"time"
89

910
"github.com/openshift/library-go/pkg/operator/events"
1011
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1112
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
1213
"k8s.io/client-go/tools/cache"
14+
clocktesting "k8s.io/utils/clock/testing"
1315

1416
configv1 "github.com/openshift/api/config/v1"
1517
configlistersv1 "github.com/openshift/client-go/config/listers/config/v1"
@@ -135,7 +137,7 @@ func TestObserveImageConfig(t *testing.T) {
135137
ImageConfigLister: configlistersv1.NewImageLister(indexer),
136138
}
137139

138-
result, errs := ObserveInternalRegistryHostname(listers, events.NewInMemoryRecorder(""), map[string]interface{}{})
140+
result, errs := ObserveInternalRegistryHostname(listers, events.NewInMemoryRecorder("", clocktesting.NewFakePassiveClock(time.Now())), map[string]interface{}{})
139141
if len(errs) != 0 {
140142
t.Fatalf("unexpected error: %v", errs)
141143
}
@@ -149,15 +151,15 @@ func TestObserveImageConfig(t *testing.T) {
149151

150152
// When the cache is not synced, the result should be the previously observed
151153
// configuration.
152-
newResult, errs := ObserveInternalRegistryHostname(unsyncedlisters, events.NewInMemoryRecorder("test"), result)
154+
newResult, errs := ObserveInternalRegistryHostname(unsyncedlisters, events.NewInMemoryRecorder("test", clocktesting.NewFakePassiveClock(time.Now())), result)
153155
if len(errs) != 0 {
154156
t.Fatalf("unexpected error: %v", errs)
155157
}
156158
if !reflect.DeepEqual(result, newResult) {
157159
t.Errorf("got: \n%#v\nexpected: \n%#v", newResult, result)
158160
}
159161

160-
result, errs = ObserveExternalRegistryHostnames(listers, events.NewInMemoryRecorder(""), map[string]interface{}{})
162+
result, errs = ObserveExternalRegistryHostnames(listers, events.NewInMemoryRecorder("", clocktesting.NewFakePassiveClock(time.Now())), map[string]interface{}{})
161163
if len(errs) != 0 {
162164
t.Fatalf("unexpected error: %v", errs)
163165
}
@@ -176,15 +178,15 @@ func TestObserveImageConfig(t *testing.T) {
176178

177179
// When the cache is not synced, the result should be the previously observed
178180
// configuration.
179-
newResult, errs = ObserveExternalRegistryHostnames(unsyncedlisters, events.NewInMemoryRecorder(""), result)
181+
newResult, errs = ObserveExternalRegistryHostnames(unsyncedlisters, events.NewInMemoryRecorder("", clocktesting.NewFakePassiveClock(time.Now())), result)
180182
if len(errs) != 0 {
181183
t.Fatalf("unexpected error: %v", errs)
182184
}
183185
if !reflect.DeepEqual(result, newResult) {
184186
t.Errorf("got: \n%#v\nexpected: \n%#v", newResult, result)
185187
}
186188

187-
result, errs = ObserveAllowedRegistriesForImport(listers, events.NewInMemoryRecorder(""), map[string]interface{}{})
189+
result, errs = ObserveAllowedRegistriesForImport(listers, events.NewInMemoryRecorder("", clocktesting.NewFakePassiveClock(time.Now())), map[string]interface{}{})
188190
if len(errs) != 0 {
189191
t.Fatalf("unexpected error: %v", errs)
190192
}
@@ -203,7 +205,7 @@ func TestObserveImageConfig(t *testing.T) {
203205

204206
// When the cache is not synced, the result should be the previously observed
205207
// configuration.
206-
newResult, errs = ObserveAllowedRegistriesForImport(unsyncedlisters, events.NewInMemoryRecorder(""), result)
208+
newResult, errs = ObserveAllowedRegistriesForImport(unsyncedlisters, events.NewInMemoryRecorder("", clocktesting.NewFakePassiveClock(time.Now())), result)
207209
if len(errs) != 0 {
208210
t.Fatalf("unexpected error: %v", errs)
209211
}
@@ -258,7 +260,7 @@ func TestObserveImageConfigImageStreamImportMode(t *testing.T) {
258260
ImageConfigLister: configlistersv1.NewImageLister(indexer),
259261
}
260262

261-
result, errs := ObserveImagestreamImportMode(listers, events.NewInMemoryRecorder(""), map[string]interface{}{})
263+
result, errs := ObserveImagestreamImportMode(listers, events.NewInMemoryRecorder("", clocktesting.NewFakePassiveClock(time.Now())), map[string]interface{}{})
262264
if len(errs) != 0 {
263265
t.Fatalf("unexpected error: %v", errs)
264266
}
@@ -272,7 +274,7 @@ func TestObserveImageConfigImageStreamImportMode(t *testing.T) {
272274

273275
// When the cache is not synced, the result should be the previously observed
274276
// configuration.
275-
newResult, errs := ObserveImagestreamImportMode(unsyncedlisters, events.NewInMemoryRecorder("test"), result)
277+
newResult, errs := ObserveImagestreamImportMode(unsyncedlisters, events.NewInMemoryRecorder("test", clocktesting.NewFakePassiveClock(time.Now())), result)
276278
if len(errs) != 0 {
277279
t.Fatalf("unexpected error: %v", errs)
278280
}

pkg/operator/configobservation/project/observe_projects_test.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,12 @@ package project
22

33
import (
44
"testing"
5+
"time"
56

67
"k8s.io/apimachinery/pkg/api/equality"
78
"k8s.io/apimachinery/pkg/util/diff"
89
"k8s.io/client-go/tools/cache"
10+
clocktesting "k8s.io/utils/clock/testing"
911

1012
projectv1 "github.com/openshift/api/config/v1"
1113
configlistersv1 "github.com/openshift/client-go/config/listers/config/v1"
@@ -70,7 +72,7 @@ func TestObserveProjectRequestMessage(t *testing.T) {
7072
ProjectConfigLister: configlistersv1.NewProjectLister(indexer),
7173
}
7274

73-
eventRecorder := events.NewInMemoryRecorder("")
75+
eventRecorder := events.NewInMemoryRecorder("", clocktesting.NewFakePassiveClock(time.Now()))
7476

7577
result, errs := ObserveProjectRequestMessage(listers, eventRecorder, test.existingConfig)
7678
if len(errs) != test.expectErrorsCount {
@@ -136,7 +138,7 @@ func TestObserveProjectRequestTemplateName(t *testing.T) {
136138
ProjectConfigLister: configlistersv1.NewProjectLister(indexer),
137139
}
138140

139-
eventRecorder := events.NewInMemoryRecorder("")
141+
eventRecorder := events.NewInMemoryRecorder("", clocktesting.NewFakePassiveClock(time.Now()))
140142

141143
result, errs := ObserveProjectRequestTemplateName(listers, eventRecorder, test.existingConfig)
142144
if len(errs) != test.expectErrorsCount {

pkg/operator/starter.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ import (
4949
apiregistrationv1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1"
5050
apiregistrationclient "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset"
5151
apiregistrationinformers "k8s.io/kube-aggregator/pkg/client/informers/externalversions"
52-
"k8s.io/utils/clock"
5352
utilpointer "k8s.io/utils/pointer"
5453
kubemigratorclient "sigs.k8s.io/kube-storage-version-migrator/pkg/clients/clientset"
5554
migrationv1alpha1informer "sigs.k8s.io/kube-storage-version-migrator/pkg/clients/informer"
@@ -114,7 +113,7 @@ func RunOperator(ctx context.Context, controllerConfig *controllercmd.Controller
114113
configInformers := configinformers.NewSharedInformerFactory(configClient, 10*time.Minute)
115114

116115
operatorClient, dynamicInformers, err := genericoperatorclient.NewClusterScopedOperatorClient(
117-
clock.RealClock{},
116+
controllerConfig.Clock,
118117
controllerConfig.KubeConfig,
119118
operatorv1.GroupVersion.WithResource("openshiftapiservers"),
120119
operatorv1.GroupVersion.WithKind("OpenShiftAPIServer"),
@@ -364,6 +363,7 @@ func RunOperator(ctx context.Context, controllerConfig *controllercmd.Controller
364363
)
365364

366365
staleConditions := staleconditions.NewRemoveStaleConditionsController(
366+
"openshift-apiserver",
367367
[]string{
368368
// in 4.1.0-4.3.0 this was used for indicating the apiserver daemonset was progressing
369369
"Progressing",

pkg/operator/workload/workload_openshiftapiserver_v311_00_sync_test.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package workload
33
import (
44
"context"
55
"testing"
6+
"time"
67

78
configv1 "github.com/openshift/api/config/v1"
89
openshiftcontrolplanev1 "github.com/openshift/api/openshiftcontrolplane/v1"
@@ -27,6 +28,7 @@ import (
2728
"k8s.io/client-go/kubernetes/fake"
2829
clientgotesting "k8s.io/client-go/testing"
2930
"k8s.io/client-go/tools/cache"
31+
clocktesting "k8s.io/utils/clock/testing"
3032
)
3133

3234
func fakeCountNodes(_ map[string]string) (*int32, error) {
@@ -120,7 +122,7 @@ func TestOperatorConfigProgressingCondition(t *testing.T) {
120122
ensureAtMostOnePodPerNode: func(spec *appsv1.DeploymentSpec, componentName string) error { return nil },
121123
}
122124

123-
if _, _, err := target.Sync(context.Background(), factory.NewSyncContext("TestSyncCOntext", events.NewInMemoryRecorder(""))); len(err) > 0 {
125+
if _, _, err := target.Sync(context.Background(), factory.NewSyncContext("TestSyncCOntext", events.NewInMemoryRecorder("", clocktesting.NewFakePassiveClock(time.Now())))); len(err) > 0 {
124126
t.Fatal(err)
125127
}
126128

@@ -361,7 +363,7 @@ func TestCapabilities(t *testing.T) {
361363
}
362364

363365
ctx := context.Background()
364-
if _, _, err := target.Sync(ctx, factory.NewSyncContext("TestSyncCOntext", events.NewInMemoryRecorder(""))); len(err) > 0 {
366+
if _, _, err := target.Sync(ctx, factory.NewSyncContext("TestSyncCOntext", events.NewInMemoryRecorder("", clocktesting.NewFakePassiveClock(time.Now())))); len(err) > 0 {
365367
t.Fatal(err)
366368
}
367369

0 commit comments

Comments
 (0)