Skip to content

Commit 8ef2c1d

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #1767 from p0lyn0mial/bump-library-go
API-1835: bump library-go
2 parents dc7ef78 + ae4e0c3 commit 8ef2c1d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+151
-82
lines changed

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ require (
1717
github.com/openshift/api v0.0.0-20241104230711-4c27e61e5554
1818
github.com/openshift/build-machinery-go v0.0.0-20240613134303-8359781da660
1919
github.com/openshift/client-go v0.0.0-20241001162912-da6d55e4611f
20-
github.com/openshift/library-go v0.0.0-20241114083156-ec00d85ac1e8
20+
github.com/openshift/library-go v0.0.0-20241119162247-f466fdd82330
2121
github.com/pkg/profile v1.7.0 // indirect
2222
github.com/prometheus/client_golang v1.19.1
2323
github.com/spf13/cobra v1.8.1

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,8 +167,8 @@ github.com/openshift/build-machinery-go v0.0.0-20240613134303-8359781da660 h1:F0
167167
github.com/openshift/build-machinery-go v0.0.0-20240613134303-8359781da660/go.mod h1:8jcm8UPtg2mCAsxfqKil1xrmRMI3a+XU2TZ9fF8A7TE=
168168
github.com/openshift/client-go v0.0.0-20241001162912-da6d55e4611f h1:FRc0bVNWprihWS0GqQWzb3dY4dkCwpOP3mDw5NwSoR4=
169169
github.com/openshift/client-go v0.0.0-20241001162912-da6d55e4611f/go.mod h1:KiZi2mJRH1TOJ3FtBDYS6YvUL30s/iIXaGSUrSa36mo=
170-
github.com/openshift/library-go v0.0.0-20241114083156-ec00d85ac1e8 h1:x4pfSoKQcsf+mvBmj4mpFeHSVvIGwz/NSzKslNqtCtQ=
171-
github.com/openshift/library-go v0.0.0-20241114083156-ec00d85ac1e8/go.mod h1:9B1MYPoLtP9tqjWxcbUNVpwxy68zOH/3EIP6c31dAM0=
170+
github.com/openshift/library-go v0.0.0-20241119162247-f466fdd82330 h1:nK16PhWNPIjnv7Vux1jBlzEPgA9q/o/CwqsbRpQJrpY=
171+
github.com/openshift/library-go v0.0.0-20241119162247-f466fdd82330/go.mod h1:9B1MYPoLtP9tqjWxcbUNVpwxy68zOH/3EIP6c31dAM0=
172172
github.com/orisano/pixelmatch v0.0.0-20220722002657-fb0b55479cde/go.mod h1:nZgzbfBr3hhjoZnS66nKrHmduYNpc34ny7RK4z5/HM0=
173173
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
174174
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=

‎pkg/cmd/certregenerationcontroller/cmd.go‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ type Options struct {
3030

3131
func NewCertRegenerationControllerCommand(ctx context.Context) *cobra.Command {
3232
o := &Options{}
33+
c := clock.RealClock{}
3334

3435
ccc := controllercmd.NewControllerCommandConfig("cert-regeneration-controller", version.Get(), func(ctx context.Context, controllerContext *controllercmd.ControllerContext) error {
3536
o.controllerContext = controllerContext
@@ -44,13 +45,13 @@ func NewCertRegenerationControllerCommand(ctx context.Context) *cobra.Command {
4445
return err
4546
}
4647

47-
err = o.Run(ctx)
48+
err = o.Run(ctx, c)
4849
if err != nil {
4950
return err
5051
}
5152

5253
return nil
53-
})
54+
}, c)
5455

5556
// Disable serving for recovery as it introduces a dependency on kube-system::extension-apiserver-authentication
5657
// configmap which prevents it to start as the CA bundle is expired.
@@ -73,7 +74,7 @@ func (o *Options) Complete(ctx context.Context) error {
7374
return nil
7475
}
7576

76-
func (o *Options) Run(ctx context.Context) error {
77+
func (o *Options) Run(ctx context.Context, clock clock.Clock) error {
7778
kubeClient, err := kubernetes.NewForConfig(o.controllerContext.ProtoKubeConfig)
7879
if err != nil {
7980
return fmt.Errorf("can't build kubernetes client: %w", err)
@@ -95,7 +96,7 @@ func (o *Options) Run(ctx context.Context) error {
9596
)
9697

9798
operatorClient, dynamicInformers, err := genericoperatorclient.NewStaticPodOperatorClient(
98-
clock.RealClock{},
99+
clock,
99100
o.controllerContext.KubeConfig,
100101
operatorv1.GroupVersion.WithResource("kubeapiservers"),
101102
operatorv1.GroupVersion.WithKind("KubeAPIServer"),

‎pkg/cmd/checkendpoints/cmd.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import (
1919
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2020
"k8s.io/client-go/informers"
2121
"k8s.io/client-go/kubernetes"
22+
"k8s.io/utils/clock"
2223
)
2324

2425
func NewCheckEndpointsCommand() *cobra.Command {
@@ -55,7 +56,7 @@ func NewCheckEndpointsCommand() *cobra.Command {
5556
if err != nil {
5657
return err
5758
}
58-
recorder := events.NewRecorder(kubeClient.CoreV1().Events(namespace), "check-endpoint", involvedObjectRef)
59+
recorder := events.NewRecorder(kubeClient.CoreV1().Events(namespace), "check-endpoint", involvedObjectRef, cctx.Clock)
5960

6061
check := controller.NewPodNetworkConnectivityCheckController(
6162
podName,
@@ -100,7 +101,7 @@ func NewCheckEndpointsCommand() *cobra.Command {
100101
go stopController.Run(ctx, 1)
101102
<-ctx.Done()
102103
return nil
103-
})
104+
}, clock.RealClock{})
104105
config.DisableLeaderElection = true
105106
cmd := config.NewCommandWithContext(context.Background())
106107
cmd.Use = "check-endpoints"

‎pkg/cmd/checkendpoints/controller/backoff_recorder_test.go‎

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

88
"github.com/openshift/library-go/pkg/operator/events"
99
"github.com/stretchr/testify/assert"
10+
11+
"k8s.io/utils/clock"
1012
)
1113

1214
func TestWithShortWindow(t *testing.T) {
@@ -18,7 +20,7 @@ func TestWithShortWindow(t *testing.T) {
1820
backoffDuration := longDuration
1921
excessiveEventCount := 10
2022

21-
inMemoryRecorder := events.NewInMemoryRecorder(t.Name())
23+
inMemoryRecorder := events.NewInMemoryRecorder(t.Name(), clock.RealClock{})
2224
r := NewBackoffEventRecorder(inMemoryRecorder,
2325
WithShortWindow(shortDuration, shortCountMax),
2426
WithLongWindow(longDuration, longCountMax),
@@ -61,7 +63,7 @@ func TestWithLongWindow(t *testing.T) {
6163
backoffDuration := longDuration
6264
excessiveEventCount := 10
6365

64-
inMemoryRecorder := events.NewInMemoryRecorder(t.Name())
66+
inMemoryRecorder := events.NewInMemoryRecorder(t.Name(), clock.RealClock{})
6567
r := NewBackoffEventRecorder(inMemoryRecorder,
6668
WithShortWindow(shortDuration, shortCountMax),
6769
WithLongWindow(longDuration, longCountMax),

‎pkg/cmd/checkendpoints/controller/connection_checker_test.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import (
1212
"github.com/stretchr/testify/assert"
1313
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1414
"k8s.io/apimachinery/pkg/util/mergepatch"
15+
"k8s.io/utils/clock"
1516

1617
"github.com/openshift/cluster-kube-apiserver-operator/pkg/cmd/checkendpoints/trace"
1718
)
@@ -418,7 +419,7 @@ func TestManageStatusOutage(t *testing.T) {
418419
for _, tc := range testCases {
419420
t.Run(tc.name, func(t *testing.T) {
420421
status := tc.initial
421-
manageStatusOutage(events.NewInMemoryRecorder(t.Name()))(status)
422+
manageStatusOutage(events.NewInMemoryRecorder(t.Name(), clock.RealClock{}))(status)
422423
assert.Equal(t, tc.expected, status.Outages)
423424
if t.Failed() {
424425
t.Log("\n", mergepatch.ToYAMLOrError(tc.expected))

‎pkg/cmd/operator/cmd.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@ import (
66
"github.com/openshift/cluster-kube-apiserver-operator/pkg/operator"
77
"github.com/openshift/cluster-kube-apiserver-operator/pkg/version"
88
"github.com/openshift/library-go/pkg/controller/controllercmd"
9+
"k8s.io/utils/clock"
910
)
1011

1112
func NewOperator() *cobra.Command {
1213
cmd := controllercmd.
13-
NewControllerCommandConfig("kube-apiserver-operator", version.Get(), operator.RunOperator).
14+
NewControllerCommandConfig("kube-apiserver-operator", version.Get(), operator.RunOperator, clock.RealClock{}).
1415
NewCommand()
1516
cmd.Use = "operator"
1617
cmd.Short = "Start the Cluster kube-apiserver Operator"

‎pkg/operator/configobservation/apiserver/observe_apiserver_test.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import (
1111
"k8s.io/apimachinery/pkg/util/diff"
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"
@@ -71,7 +72,7 @@ func TestObserveUserClientCABundle(t *testing.T) {
7172
APIServerLister_: configlistersv1.NewAPIServerLister(indexer),
7273
ResourceSync: &mockResourceSyncer{t: t, synced: synced},
7374
}
74-
result, errs := ObserveUserClientCABundle(listers, events.NewInMemoryRecorder(t.Name()), tc.existing)
75+
result, errs := ObserveUserClientCABundle(listers, events.NewInMemoryRecorder(t.Name(), clock.RealClock{}), tc.existing)
7576
if len(errs) > 0 {
7677
t.Errorf("Expected 0 errors, got %v.", len(errs))
7778
}
@@ -501,7 +502,7 @@ func TestObserveNamedCertificates(t *testing.T) {
501502
ResourceSync: &mockResourceSyncer{t: t, synced: synced},
502503
ConfigSecretLister_: corelistersv1.NewSecretLister(indexer),
503504
}
504-
result, errs := ObserveNamedCertificates(listers, events.NewInMemoryRecorder(t.Name()), tc.existing)
505+
result, errs := ObserveNamedCertificates(listers, events.NewInMemoryRecorder(t.Name(), clock.RealClock{}), tc.existing)
505506
if tc.expectErrs && len(errs) == 0 {
506507
t.Error("Expected errors.", errs)
507508
}

‎pkg/operator/configobservation/apiserver/observe_cors_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/api/equality"
1111
"k8s.io/apimachinery/pkg/util/diff"
1212
"k8s.io/client-go/tools/cache"
13+
"k8s.io/utils/clock"
1314
)
1415

1516
func TestObserveAdditionalCORSAllowedOrigins(t *testing.T) {
@@ -73,7 +74,7 @@ func TestObserveAdditionalCORSAllowedOrigins(t *testing.T) {
7374
APIServerLister_: configlistersv1.NewAPIServerLister(indexer),
7475
ResourceSync: &mockResourceSyncer{t: t, synced: synced},
7576
}
76-
result, errs := ObserveAdditionalCORSAllowedOrigins(listers, events.NewInMemoryRecorder(t.Name()), tc.existing)
77+
result, errs := ObserveAdditionalCORSAllowedOrigins(listers, events.NewInMemoryRecorder(t.Name(), clock.RealClock{}), tc.existing)
7778
if len(errs) > 0 {
7879
t.Errorf("Expected 0 errors, got %v.", len(errs))
7980
}

‎pkg/operator/configobservation/apiserver/observe_send_retry_after_while_not_ready_once_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
kubecontrolplanev1 "github.com/openshift/api/kubecontrolplane/v1"
@@ -94,7 +95,7 @@ func TestObserveSendRetryAfterWhileNotReadyOnce(t *testing.T) {
9495
for _, scenario := range scenarios {
9596
t.Run(scenario.name, func(t *testing.T) {
9697
// test data
97-
eventRecorder := events.NewInMemoryRecorder("")
98+
eventRecorder := events.NewInMemoryRecorder("", clock.RealClock{})
9899
infrastructureIndexer := cache.NewIndexer(cache.MetaNamespaceKeyFunc, cache.Indexers{})
99100
infrastructureIndexer.Add(&configv1.Infrastructure{
100101
ObjectMeta: metav1.ObjectMeta{Name: "cluster"},

0 commit comments

Comments
 (0)