Skip to content

Commit 9385abf

Browse files
Merge pull request #1360 from swghosh/bump-lib-go-latency-profile
Bug 2100347: Bump(openshift/library-go) latency profile observer, controller
2 parents 0378867 + 087bd03 commit 9385abf

File tree

11 files changed

+542
-195
lines changed

11 files changed

+542
-195
lines changed

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ require (
1515
github.com/openshift/api v0.0.0-20220525145417-ee5b62754c68
1616
github.com/openshift/build-machinery-go v0.0.0-20211213093930-7e33a7eb4ce3
1717
github.com/openshift/client-go v0.0.0-20220525160904-9e1acff93e4a
18-
github.com/openshift/library-go v0.0.0-20220525173854-9b950a41acdc
18+
github.com/openshift/library-go v0.0.0-20220622115547-84d884f4c9f6
1919
github.com/pkg/profile v1.5.0 // indirect
2020
github.com/prometheus-operator/prometheus-operator/pkg/client v0.45.0
2121
github.com/prometheus/client_golang v1.12.1

go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -524,8 +524,8 @@ github.com/openshift/build-machinery-go v0.0.0-20211213093930-7e33a7eb4ce3 h1:65
524524
github.com/openshift/build-machinery-go v0.0.0-20211213093930-7e33a7eb4ce3/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE=
525525
github.com/openshift/client-go v0.0.0-20220525160904-9e1acff93e4a h1:ylsEgoC8Dlg4A0C1TLH0A4x/TZao7k1YveLwROhRUdk=
526526
github.com/openshift/client-go v0.0.0-20220525160904-9e1acff93e4a/go.mod h1:eDO5QeVi2IiXmDwB0e2z1DpAznWroZKe978pzZwFBzg=
527-
github.com/openshift/library-go v0.0.0-20220525173854-9b950a41acdc h1:j+upvKc1uLzuL+q/JXie8+IMohOooTCaEC9w+4d1Ztk=
528-
github.com/openshift/library-go v0.0.0-20220525173854-9b950a41acdc/go.mod h1:AMZwYwSdbvALDl3QobEzcJ2IeDO7DYLsr42izKzh524=
527+
github.com/openshift/library-go v0.0.0-20220622115547-84d884f4c9f6 h1:lmfmsIGq62lmj17qrZh4Gbbb86WvJw6pLhCNwNjB2Yk=
528+
github.com/openshift/library-go v0.0.0-20220622115547-84d884f4c9f6/go.mod h1:AMZwYwSdbvALDl3QobEzcJ2IeDO7DYLsr42izKzh524=
529529
github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
530530
github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
531531
github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k=

pkg/operator/configobservation/configobservercontroller/observe_config_controller.go

+7-5
Original file line numberDiff line numberDiff line change
@@ -145,11 +145,13 @@ func NewConfigObserver(
145145
network.ObserveServicesNodePortRange,
146146
nodeobserver.NewLatencyProfileObserver(
147147
node.LatencyConfigs,
148-
nodeobserver.NewSuppressConfigUpdateUntilSameProfileFunc(
149-
operatorClient,
150-
kubeInformersForNamespaces.ConfigMapLister().ConfigMaps(operatorclient.TargetNamespace),
151-
node.LatencyConfigs,
152-
),
148+
[]nodeobserver.ShouldSuppressConfigUpdatesFunc{
149+
nodeobserver.NewSuppressConfigUpdateUntilSameProfileFunc(
150+
operatorClient,
151+
kubeInformersForNamespaces.ConfigMapLister().ConfigMaps(operatorclient.TargetNamespace),
152+
node.LatencyConfigs,
153+
),
154+
},
153155
),
154156
proxy.NewProxyObserveFunc([]string{"targetconfigcontroller", "proxy"}),
155157
images.ObserveInternalRegistryHostname,

pkg/operator/starter.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,7 @@ func RunOperator(ctx context.Context, controllerContext *controllercmd.Controlle
375375
latencyProfileController := latencyprofilecontroller.NewLatencyProfileController(
376376
operatorClient,
377377
operatorclient.TargetNamespace,
378-
node.LatencyConfigs,
378+
nil, // profile rejection logic is not required for this operator
379379
latencyprofilecontroller.NewInstallerRevisionConfigMatcher(
380380
kubeInformersForNamespaces.ConfigMapLister().ConfigMaps(operatorclient.TargetNamespace),
381381
node.LatencyConfigs,

vendor/github.com/openshift/library-go/pkg/operator/configobserver/node/helpers.go

+89
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/configobserver/node/observe_latency_profile.go

+36-131
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)