Skip to content

Commit 37df1b1

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #1721 from vrutkovs/library-go-1772
OCPBUGS-38335: Bump library-go
2 parents 0ecdda5 + 68bf3c2 commit 37df1b1

File tree

26 files changed

+391
-338
lines changed

26 files changed

+391
-338
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-20240527133614-ba11c1587003
1818
github.com/openshift/build-machinery-go v0.0.0-20240419090851-af9c868bcf52
1919
github.com/openshift/client-go v0.0.0-20240528061634-b054aa794d87
20-
github.com/openshift/library-go v0.0.0-20240619120114-0c65da30ad30
20+
github.com/openshift/library-go v0.0.0-20240816092752-e21e7889fd1a
2121
github.com/pkg/profile v1.5.0 // indirect
2222
github.com/prometheus/client_golang v1.16.0
2323
github.com/spf13/cobra v1.7.0

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,8 +156,8 @@ github.com/openshift/build-machinery-go v0.0.0-20240419090851-af9c868bcf52 h1:bq
156156
github.com/openshift/build-machinery-go v0.0.0-20240419090851-af9c868bcf52/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE=
157157
github.com/openshift/client-go v0.0.0-20240528061634-b054aa794d87 h1:JtLhaGpSEconE+1IKmIgCOof/Len5ceG6H1pk43yv5U=
158158
github.com/openshift/client-go v0.0.0-20240528061634-b054aa794d87/go.mod h1:3IPD4U0qyovZS4EFady2kqY32m8lGcbs/Wx+yprg9z8=
159-
github.com/openshift/library-go v0.0.0-20240619120114-0c65da30ad30 h1:c9PNqAVBbnsR4Ro+P2e2Ih3aacnq5l1IfGX5985Rd7c=
160-
github.com/openshift/library-go v0.0.0-20240619120114-0c65da30ad30/go.mod h1:PdASVamWinll2BPxiUpXajTwZxV8A1pQbWEsCN1od7I=
159+
github.com/openshift/library-go v0.0.0-20240816092752-e21e7889fd1a h1:9FpF0oGwE+ENdD4z0yWIxg04b/Ej3APWJRXO4z/b9bM=
160+
github.com/openshift/library-go v0.0.0-20240816092752-e21e7889fd1a/go.mod h1:PdASVamWinll2BPxiUpXajTwZxV8A1pQbWEsCN1od7I=
161161
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
162162
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
163163
github.com/pkg/profile v1.5.0 h1:042Buzk+NhDI+DeSAA62RwJL8VAuZUMQZUjCsRz1Mug=

‎pkg/operator/certrotationcontroller/certrotationcontroller.go‎

Lines changed: 0 additions & 96 deletions
Original file line numberDiff line numberDiff line change
@@ -143,10 +143,6 @@ func newCertRotationController(
143143
Lister: kubeInformersForNamespaces.InformersFor(operatorclient.OperatorNamespace).Core().V1().Secrets().Lister(),
144144
Client: kubeClient.CoreV1(),
145145
EventRecorder: eventRecorder,
146-
147-
// we will remove this when we migrate all of the affected secret
148-
// objects to their intended type: https://issues.redhat.com/browse/API-1800
149-
UseSecretUpdateOnly: true,
150146
},
151147
certrotation.CABundleConfigMap{
152148
Namespace: operatorclient.GlobalMachineSpecifiedConfigNamespace,
@@ -175,10 +171,6 @@ func newCertRotationController(
175171
Lister: kubeInformersForNamespaces.InformersFor(operatorclient.TargetNamespace).Core().V1().Secrets().Lister(),
176172
Client: kubeClient.CoreV1(),
177173
EventRecorder: eventRecorder,
178-
179-
// we will remove this when we migrate all of the affected secret
180-
// objects to their intended type: https://issues.redhat.com/browse/API-1800
181-
UseSecretUpdateOnly: true,
182174
},
183175
eventRecorder,
184176
&certrotation.StaticPodConditionStatusReporter{OperatorClient: operatorClient},
@@ -202,10 +194,6 @@ func newCertRotationController(
202194
Lister: kubeInformersForNamespaces.InformersFor(operatorclient.OperatorNamespace).Core().V1().Secrets().Lister(),
203195
Client: kubeClient.CoreV1(),
204196
EventRecorder: eventRecorder,
205-
206-
// we will remove this when we migrate all of the affected secret
207-
// objects to their intended type: https://issues.redhat.com/browse/API-1800
208-
UseSecretUpdateOnly: true,
209197
},
210198
certrotation.CABundleConfigMap{
211199
Namespace: operatorclient.OperatorNamespace,
@@ -234,10 +222,6 @@ func newCertRotationController(
234222
Lister: kubeInformersForNamespaces.InformersFor(operatorclient.TargetNamespace).Core().V1().Secrets().Lister(),
235223
Client: kubeClient.CoreV1(),
236224
EventRecorder: eventRecorder,
237-
238-
// we will remove this when we migrate all of the affected secret
239-
// objects to their intended type: https://issues.redhat.com/browse/API-1800
240-
UseSecretUpdateOnly: true,
241225
},
242226
eventRecorder,
243227
&certrotation.StaticPodConditionStatusReporter{OperatorClient: operatorClient},
@@ -263,10 +247,6 @@ func newCertRotationController(
263247
Lister: kubeInformersForNamespaces.InformersFor(operatorclient.OperatorNamespace).Core().V1().Secrets().Lister(),
264248
Client: kubeClient.CoreV1(),
265249
EventRecorder: eventRecorder,
266-
267-
// we will remove this when we migrate all of the affected secret
268-
// objects to their intended type: https://issues.redhat.com/browse/API-1800
269-
UseSecretUpdateOnly: true,
270250
},
271251
certrotation.CABundleConfigMap{
272252
Namespace: operatorclient.OperatorNamespace,
@@ -295,10 +275,6 @@ func newCertRotationController(
295275
Lister: kubeInformersForNamespaces.InformersFor(operatorclient.TargetNamespace).Core().V1().Secrets().Lister(),
296276
Client: kubeClient.CoreV1(),
297277
EventRecorder: eventRecorder,
298-
299-
// we will remove this when we migrate all of the affected secret
300-
// objects to their intended type: https://issues.redhat.com/browse/API-1800
301-
UseSecretUpdateOnly: true,
302278
},
303279
eventRecorder,
304280
&certrotation.StaticPodConditionStatusReporter{OperatorClient: operatorClient},
@@ -324,10 +300,6 @@ func newCertRotationController(
324300
Lister: kubeInformersForNamespaces.InformersFor(operatorclient.OperatorNamespace).Core().V1().Secrets().Lister(),
325301
Client: kubeClient.CoreV1(),
326302
EventRecorder: eventRecorder,
327-
328-
// we will remove this when we migrate all of the affected secret
329-
// objects to their intended type: https://issues.redhat.com/browse/API-1800
330-
UseSecretUpdateOnly: true,
331303
},
332304
certrotation.CABundleConfigMap{
333305
Namespace: operatorclient.OperatorNamespace,
@@ -357,10 +329,6 @@ func newCertRotationController(
357329
Lister: kubeInformersForNamespaces.InformersFor(operatorclient.TargetNamespace).Core().V1().Secrets().Lister(),
358330
Client: kubeClient.CoreV1(),
359331
EventRecorder: eventRecorder,
360-
361-
// we will remove this when we migrate all of the affected secret
362-
// objects to their intended type: https://issues.redhat.com/browse/API-1800
363-
UseSecretUpdateOnly: true,
364332
},
365333
eventRecorder,
366334
&certrotation.StaticPodConditionStatusReporter{OperatorClient: operatorClient},
@@ -386,10 +354,6 @@ func newCertRotationController(
386354
Lister: kubeInformersForNamespaces.InformersFor(operatorclient.OperatorNamespace).Core().V1().Secrets().Lister(),
387355
Client: kubeClient.CoreV1(),
388356
EventRecorder: eventRecorder,
389-
390-
// we will remove this when we migrate all of the affected secret
391-
// objects to their intended type: https://issues.redhat.com/browse/API-1800
392-
UseSecretUpdateOnly: true,
393357
},
394358
certrotation.CABundleConfigMap{
395359
Namespace: operatorclient.OperatorNamespace,
@@ -419,10 +383,6 @@ func newCertRotationController(
419383
Lister: kubeInformersForNamespaces.InformersFor(operatorclient.TargetNamespace).Core().V1().Secrets().Lister(),
420384
Client: kubeClient.CoreV1(),
421385
EventRecorder: eventRecorder,
422-
423-
// we will remove this when we migrate all of the affected secret
424-
// objects to their intended type: https://issues.redhat.com/browse/API-1800
425-
UseSecretUpdateOnly: true,
426386
},
427387
eventRecorder,
428388
&certrotation.StaticPodConditionStatusReporter{OperatorClient: operatorClient},
@@ -448,10 +408,6 @@ func newCertRotationController(
448408
Lister: kubeInformersForNamespaces.InformersFor(operatorclient.OperatorNamespace).Core().V1().Secrets().Lister(),
449409
Client: kubeClient.CoreV1(),
450410
EventRecorder: eventRecorder,
451-
452-
// we will remove this when we migrate all of the affected secret
453-
// objects to their intended type: https://issues.redhat.com/browse/API-1800
454-
UseSecretUpdateOnly: true,
455411
},
456412
certrotation.CABundleConfigMap{
457413
Namespace: operatorclient.OperatorNamespace,
@@ -481,10 +437,6 @@ func newCertRotationController(
481437
Lister: kubeInformersForNamespaces.InformersFor(operatorclient.TargetNamespace).Core().V1().Secrets().Lister(),
482438
Client: kubeClient.CoreV1(),
483439
EventRecorder: eventRecorder,
484-
485-
// we will remove this when we migrate all of the affected secret
486-
// objects to their intended type: https://issues.redhat.com/browse/API-1800
487-
UseSecretUpdateOnly: true,
488440
},
489441
eventRecorder,
490442
&certrotation.StaticPodConditionStatusReporter{OperatorClient: operatorClient},
@@ -509,10 +461,6 @@ func newCertRotationController(
509461
Lister: kubeInformersForNamespaces.InformersFor(operatorclient.OperatorNamespace).Core().V1().Secrets().Lister(),
510462
Client: kubeClient.CoreV1(),
511463
EventRecorder: eventRecorder,
512-
513-
// we will remove this when we migrate all of the affected secret
514-
// objects to their intended type: https://issues.redhat.com/browse/API-1800
515-
UseSecretUpdateOnly: true,
516464
},
517465
certrotation.CABundleConfigMap{
518466
Namespace: operatorclient.OperatorNamespace,
@@ -544,10 +492,6 @@ func newCertRotationController(
544492
Lister: kubeInformersForNamespaces.InformersFor(operatorclient.TargetNamespace).Core().V1().Secrets().Lister(),
545493
Client: kubeClient.CoreV1(),
546494
EventRecorder: eventRecorder,
547-
548-
// we will remove this when we migrate all of the affected secret
549-
// objects to their intended type: https://issues.redhat.com/browse/API-1800
550-
UseSecretUpdateOnly: true,
551495
},
552496
eventRecorder,
553497
&certrotation.StaticPodConditionStatusReporter{OperatorClient: operatorClient},
@@ -569,10 +513,6 @@ func newCertRotationController(
569513
Lister: kubeInformersForNamespaces.InformersFor(operatorclient.OperatorNamespace).Core().V1().Secrets().Lister(),
570514
Client: kubeClient.CoreV1(),
571515
EventRecorder: eventRecorder,
572-
573-
// we will remove this when we migrate all of the affected secret
574-
// objects to their intended type: https://issues.redhat.com/browse/API-1800
575-
UseSecretUpdateOnly: true,
576516
},
577517
certrotation.CABundleConfigMap{
578518
Namespace: operatorclient.OperatorNamespace,
@@ -601,10 +541,6 @@ func newCertRotationController(
601541
Lister: kubeInformersForNamespaces.InformersFor(operatorclient.GlobalMachineSpecifiedConfigNamespace).Core().V1().Secrets().Lister(),
602542
Client: kubeClient.CoreV1(),
603543
EventRecorder: eventRecorder,
604-
605-
// we will remove this when we migrate all of the affected secret
606-
// objects to their intended type: https://issues.redhat.com/browse/API-1800
607-
UseSecretUpdateOnly: true,
608544
},
609545
eventRecorder,
610546
&certrotation.StaticPodConditionStatusReporter{OperatorClient: operatorClient},
@@ -626,10 +562,6 @@ func newCertRotationController(
626562
Lister: kubeInformersForNamespaces.InformersFor(operatorclient.OperatorNamespace).Core().V1().Secrets().Lister(),
627563
Client: kubeClient.CoreV1(),
628564
EventRecorder: eventRecorder,
629-
630-
// we will remove this when we migrate all of the affected secret
631-
// objects to their intended type: https://issues.redhat.com/browse/API-1800
632-
UseSecretUpdateOnly: true,
633565
},
634566
certrotation.CABundleConfigMap{
635567
Namespace: operatorclient.OperatorNamespace,
@@ -658,10 +590,6 @@ func newCertRotationController(
658590
Lister: kubeInformersForNamespaces.InformersFor(operatorclient.GlobalMachineSpecifiedConfigNamespace).Core().V1().Secrets().Lister(),
659591
Client: kubeClient.CoreV1(),
660592
EventRecorder: eventRecorder,
661-
662-
// we will remove this when we migrate all of the affected secret
663-
// objects to their intended type: https://issues.redhat.com/browse/API-1800
664-
UseSecretUpdateOnly: true,
665593
},
666594
eventRecorder,
667595
&certrotation.StaticPodConditionStatusReporter{OperatorClient: operatorClient},
@@ -683,10 +611,6 @@ func newCertRotationController(
683611
Lister: kubeInformersForNamespaces.InformersFor(operatorclient.OperatorNamespace).Core().V1().Secrets().Lister(),
684612
Client: kubeClient.CoreV1(),
685613
EventRecorder: eventRecorder,
686-
687-
// we will remove this when we migrate all of the affected secret
688-
// objects to their intended type: https://issues.redhat.com/browse/API-1800
689-
UseSecretUpdateOnly: true,
690614
},
691615
certrotation.CABundleConfigMap{
692616
Namespace: operatorclient.OperatorNamespace,
@@ -715,10 +639,6 @@ func newCertRotationController(
715639
Lister: kubeInformersForNamespaces.InformersFor(operatorclient.TargetNamespace).Core().V1().Secrets().Lister(),
716640
Client: kubeClient.CoreV1(),
717641
EventRecorder: eventRecorder,
718-
719-
// we will remove this when we migrate all of the affected secret
720-
// objects to their intended type: https://issues.redhat.com/browse/API-1800
721-
UseSecretUpdateOnly: true,
722642
},
723643
eventRecorder,
724644
&certrotation.StaticPodConditionStatusReporter{OperatorClient: operatorClient},
@@ -740,10 +660,6 @@ func newCertRotationController(
740660
Lister: kubeInformersForNamespaces.InformersFor(operatorclient.OperatorNamespace).Core().V1().Secrets().Lister(),
741661
Client: kubeClient.CoreV1(),
742662
EventRecorder: eventRecorder,
743-
744-
// we will remove this when we migrate all of the affected secret
745-
// objects to their intended type: https://issues.redhat.com/browse/API-1800
746-
UseSecretUpdateOnly: true,
747663
},
748664
certrotation.CABundleConfigMap{
749665
Namespace: operatorclient.OperatorNamespace,
@@ -772,10 +688,6 @@ func newCertRotationController(
772688
Lister: kubeInformersForNamespaces.InformersFor(operatorclient.TargetNamespace).Core().V1().Secrets().Lister(),
773689
Client: kubeClient.CoreV1(),
774690
EventRecorder: eventRecorder,
775-
776-
// we will remove this when we migrate all of the affected secret
777-
// objects to their intended type: https://issues.redhat.com/browse/API-1800
778-
UseSecretUpdateOnly: true,
779691
},
780692
eventRecorder,
781693
&certrotation.StaticPodConditionStatusReporter{OperatorClient: operatorClient},
@@ -799,10 +711,6 @@ func newCertRotationController(
799711
Lister: kubeInformersForNamespaces.InformersFor(operatorclient.OperatorNamespace).Core().V1().Secrets().Lister(),
800712
Client: kubeClient.CoreV1(),
801713
EventRecorder: eventRecorder,
802-
803-
// we will remove this when we migrate all of the affected secret
804-
// objects to their intended type: https://issues.redhat.com/browse/API-1800
805-
UseSecretUpdateOnly: true,
806714
},
807715
certrotation.CABundleConfigMap{
808716
Namespace: operatorclient.OperatorNamespace,
@@ -838,10 +746,6 @@ func newCertRotationController(
838746
Lister: kubeInformersForNamespaces.InformersFor(operatorclient.OperatorNamespace).Core().V1().Secrets().Lister(),
839747
Client: kubeClient.CoreV1(),
840748
EventRecorder: eventRecorder,
841-
842-
// we will remove this when we migrate all of the affected secret
843-
// objects to their intended type: https://issues.redhat.com/browse/API-1800
844-
UseSecretUpdateOnly: true,
845749
},
846750
eventRecorder,
847751
&certrotation.StaticPodConditionStatusReporter{OperatorClient: operatorClient},

‎vendor/github.com/openshift/library-go/pkg/controller/factory/controller_context.go‎

Lines changed: 1 addition & 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/operator/certrotation/cabundle.go‎

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

0 commit comments

Comments
 (0)