Skip to content

Commit 11e57aa

Browse files
Merge pull request #782 from p0lyn0mial/bump-library-go-rm-co-dep
NO-JIRA: Bump library go rm co dep
2 parents b0bfaf3 + ffe2172 commit 11e57aa

File tree

9 files changed

+38
-31
lines changed

9 files changed

+38
-31
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ require (
1010
github.com/openshift/api v0.0.0-20250723112524-86ad96c9f1fd
1111
github.com/openshift/build-machinery-go v0.0.0-20250530140348-dc5b2804eeee
1212
github.com/openshift/client-go v0.0.0-20250710075018-396b36f983ee
13-
github.com/openshift/library-go v0.0.0-20250729191057-91376e1b394e
13+
github.com/openshift/library-go v0.0.0-20250828105733-480b7a0ebfd5
1414
github.com/openshift/multi-operator-manager v0.0.0-20241205181422-20aa3906b99d
1515
github.com/spf13/cobra v1.8.1
1616
github.com/spf13/pflag v1.0.5

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,8 +155,8 @@ github.com/openshift/build-machinery-go v0.0.0-20250530140348-dc5b2804eeee h1:+S
155155
github.com/openshift/build-machinery-go v0.0.0-20250530140348-dc5b2804eeee/go.mod h1:8jcm8UPtg2mCAsxfqKil1xrmRMI3a+XU2TZ9fF8A7TE=
156156
github.com/openshift/client-go v0.0.0-20250710075018-396b36f983ee h1:tOtrrxfDEW8hK3eEsHqxsXurq/D6LcINGfprkQC3hqY=
157157
github.com/openshift/client-go v0.0.0-20250710075018-396b36f983ee/go.mod h1:zhRiYyNMk89llof2qEuGPWPD+joQPhCRUc2IK0SB510=
158-
github.com/openshift/library-go v0.0.0-20250729191057-91376e1b394e h1:xYT+P++PSc9G+Y47pIcU9fm8IDV/tg6tMi3i+0m23pU=
159-
github.com/openshift/library-go v0.0.0-20250729191057-91376e1b394e/go.mod h1:tptKNust9MdRI0p90DoBSPHIrBa9oh+Rok59tF0vT8c=
158+
github.com/openshift/library-go v0.0.0-20250828105733-480b7a0ebfd5 h1:4z0zAMP49ARcZnVjiHe+D+Ee/SEcgv+Ohe+cNbTMHTs=
159+
github.com/openshift/library-go v0.0.0-20250828105733-480b7a0ebfd5/go.mod h1:tptKNust9MdRI0p90DoBSPHIrBa9oh+Rok59tF0vT8c=
160160
github.com/openshift/multi-operator-manager v0.0.0-20241205181422-20aa3906b99d h1:Rzx23P63JFNNz5D23ubhC0FCN5rK8CeJhKcq5QKcdyU=
161161
github.com/openshift/multi-operator-manager v0.0.0-20241205181422-20aa3906b99d/go.mod h1:iVi9Bopa5cLhjG5ie9DoZVVqkH8BGb1FQVTtecOLn4I=
162162
github.com/orisano/pixelmatch v0.0.0-20220722002657-fb0b55479cde/go.mod h1:nZgzbfBr3hhjoZnS66nKrHmduYNpc34ny7RK4z5/HM0=

pkg/controllers/deployment/deployment_controller.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import (
2020
"k8s.io/klog/v2"
2121

2222
configv1 "github.com/openshift/api/config/v1"
23-
configv1client "github.com/openshift/client-go/config/clientset/versioned/typed/config/v1"
2423
configinformer "github.com/openshift/client-go/config/informers/externalversions"
2524
configv1listers "github.com/openshift/client-go/config/listers/config/v1"
2625
routeinformers "github.com/openshift/client-go/route/informers/externalversions"
@@ -77,7 +76,6 @@ func NewOAuthServerWorkloadController(
7776
ensureAtMostOnePodPerNode ensureAtMostOnePodPerNodeFunc,
7877
kubeClient kubernetes.Interface,
7978
nodeInformer coreinformers.NodeInformer,
80-
openshiftClusterConfigClient configv1client.ClusterOperatorInterface,
8179
configInformers configinformer.SharedInformerFactory,
8280
routeInformersForTargetNamespace routeinformers.SharedInformerFactory,
8381
bootstrapUserDataGetter bootstrap.BootstrapUserDataGetter,
@@ -138,7 +136,6 @@ func NewOAuthServerWorkloadController(
138136
routeInformersForTargetNamespace.Route().V1().Routes().Informer(),
139137
},
140138
oauthDeploymentSyncer,
141-
openshiftClusterConfigClient,
142139
eventsRecorder,
143140
versionRecorder,
144141
)

pkg/operator/starter.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,6 @@ func prepareOauthOperator(
266266
workloadcontroller.EnsureAtMostOnePodPerNode,
267267
authOperatorInput.kubeClient,
268268
informerFactories.kubeInformersForNamespaces.InformersFor("").Core().V1().Nodes(),
269-
authOperatorInput.configClient.ConfigV1().ClusterOperators(),
270269
informerFactories.operatorConfigInformer,
271270
informerFactories.namespacedOpenshiftAuthenticationRoutes,
272271
bootstrapauthenticator.NewBootstrapUserDataGetter(authOperatorInput.kubeClient.CoreV1(), authOperatorInput.kubeClient.CoreV1()),
@@ -491,7 +490,6 @@ func prepareOauthAPIServerOperator(
491490
apiServerConditionsPrefix,
492491
authOperatorInput.kubeClient,
493492
authAPIServerWorkload,
494-
authOperatorInput.configClient.ConfigV1().ClusterOperators(),
495493
versionRecorder,
496494
informerFactories.kubeInformersForNamespaces,
497495
authOperatorInput.authenticationOperatorClient.Informer(), // TODO update the library so that the operator client informer is automatically added.

vendor/github.com/openshift/library-go/pkg/operator/apiserver/controller/workload/workload.go

Lines changed: 14 additions & 18 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/apiserver/controllerset/apiservercontrollerset.go

Lines changed: 0 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/certrotation/client_cert_rotation_controller.go

Lines changed: 17 additions & 1 deletion
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/resource/resourceapply/storage.go

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

vendor/modules.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ github.com/openshift/client-go/user/applyconfigurations/internal
316316
github.com/openshift/client-go/user/applyconfigurations/user/v1
317317
github.com/openshift/client-go/user/clientset/versioned/scheme
318318
github.com/openshift/client-go/user/clientset/versioned/typed/user/v1
319-
# github.com/openshift/library-go v0.0.0-20250729191057-91376e1b394e
319+
# github.com/openshift/library-go v0.0.0-20250828105733-480b7a0ebfd5
320320
## explicit; go 1.24.0
321321
github.com/openshift/library-go/pkg/apiserver/jsonpatch
322322
github.com/openshift/library-go/pkg/apps/deployment

0 commit comments

Comments
 (0)