Skip to content

Commit 1390eb4

Browse files
Merge pull request #1365 from sanchezl/bump-library-go
NO-JIRA: bump library-go
2 parents ffa2c08 + c5b19f0 commit 1390eb4

File tree

18 files changed

+406
-148
lines changed

18 files changed

+406
-148
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ require (
1313
github.com/openshift/api v0.0.0-20241001152557-e415140e5d5f
1414
github.com/openshift/build-machinery-go v0.0.0-20240613134303-8359781da660
1515
github.com/openshift/client-go v0.0.0-20241001162912-da6d55e4611f
16-
github.com/openshift/library-go v0.0.0-20241007132721-695e3914ffaa
16+
github.com/openshift/library-go v0.0.0-20241022210936-abb8c75b88dc
1717
github.com/pkg/errors v0.9.1
1818
github.com/prometheus/client_golang v1.19.1
1919
github.com/prometheus/common v0.55.0

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -321,8 +321,8 @@ github.com/openshift/build-machinery-go v0.0.0-20240613134303-8359781da660 h1:F0
321321
github.com/openshift/build-machinery-go v0.0.0-20240613134303-8359781da660/go.mod h1:8jcm8UPtg2mCAsxfqKil1xrmRMI3a+XU2TZ9fF8A7TE=
322322
github.com/openshift/client-go v0.0.0-20241001162912-da6d55e4611f h1:FRc0bVNWprihWS0GqQWzb3dY4dkCwpOP3mDw5NwSoR4=
323323
github.com/openshift/client-go v0.0.0-20241001162912-da6d55e4611f/go.mod h1:KiZi2mJRH1TOJ3FtBDYS6YvUL30s/iIXaGSUrSa36mo=
324-
github.com/openshift/library-go v0.0.0-20241007132721-695e3914ffaa h1:J+yNseiBYDHHX0ln6Jy1iKjNepq2v9PBBtbPb2xU+AQ=
325-
github.com/openshift/library-go v0.0.0-20241007132721-695e3914ffaa/go.mod h1:9B1MYPoLtP9tqjWxcbUNVpwxy68zOH/3EIP6c31dAM0=
324+
github.com/openshift/library-go v0.0.0-20241022210936-abb8c75b88dc h1:fwtWTW+QcTyzGVAYxMPz9amtAURWvSs8p+a37nG/43c=
325+
github.com/openshift/library-go v0.0.0-20241022210936-abb8c75b88dc/go.mod h1:9B1MYPoLtP9tqjWxcbUNVpwxy68zOH/3EIP6c31dAM0=
326326
github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
327327
github.com/orisano/pixelmatch v0.0.0-20220722002657-fb0b55479cde/go.mod h1:nZgzbfBr3hhjoZnS66nKrHmduYNpc34ny7RK4z5/HM0=
328328
github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=

pkg/operator/starter.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ import (
3737
"github.com/openshift/library-go/pkg/operator/status"
3838
"github.com/openshift/library-go/pkg/operator/unsupportedconfigoverridescontroller"
3939
"github.com/openshift/library-go/pkg/operator/v1helpers"
40+
"k8s.io/utils/clock"
4041

4142
"k8s.io/apimachinery/pkg/api/errors"
4243
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -173,7 +174,7 @@ func RunOperator(ctx context.Context, controllerContext *controllercmd.Controlle
173174
// we keep the default behavior of exiting the controller once a gate changes
174175
featureGateAccessor.SetChangeHandler(featuregates.ForceExit)
175176

176-
operatorClient, dynamicInformers, err := genericoperatorclient.NewStaticPodOperatorClient(controllerContext.KubeConfig, operatorv1.GroupVersion.WithResource("etcds"), operatorv1.GroupVersion.WithKind("Etcd"), ExtractStaticPodOperatorSpec, ExtractStaticPodOperatorStatus)
177+
operatorClient, dynamicInformers, err := genericoperatorclient.NewStaticPodOperatorClient(clock.RealClock{}, controllerContext.KubeConfig, operatorv1.GroupVersion.WithResource("etcds"), operatorv1.GroupVersion.WithKind("Etcd"), ExtractStaticPodOperatorSpec, ExtractStaticPodOperatorStatus)
177178
if err != nil {
178179
return err
179180
}

vendor/github.com/openshift/library-go/pkg/apiserver/jsonpatch/jsonpatch.go

Lines changed: 87 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/openshift/library-go/pkg/crypto/crypto.go

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/openshift/library-go/pkg/operator/genericoperatorclient/dynamic_operator_client.go

Lines changed: 30 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/openshift/library-go/pkg/operator/genericoperatorclient/dynamic_staticpod_operator_client.go

Lines changed: 11 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/openshift/library-go/pkg/operator/genericoperatorclient/test_operator_client.go

Lines changed: 10 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)