Skip to content

Commit

Permalink
Bump to sigs.k8s.io/controller-runtime@v0.18.4
Browse files Browse the repository at this point in the history 
go get sigs.k8s.io/controller-runtime@v0.18.4
go mod vendor
go mod tidy

Fix API changes

Signed-off-by: Jaime Caamaño Ruiz <jcaamano@redhat.com>
  • Loading branch information
@jcaamano
jcaamano committed Jul 4, 2024
1 parent fc02e0c commit 67dffeb
Show file tree
Hide file tree
Showing 131 changed files with 7,124 additions and 1,763 deletions.
10 changes: 5 additions & 5 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ require (
github.com/containernetworking/cni v0.8.0
github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32
github.com/go-bindata/go-bindata v3.1.2+incompatible
github.com/onsi/gomega v1.31.0
github.com/onsi/gomega v1.32.0
github.com/openshift/build-machinery-go v0.0.0-20240613134303-8359781da660
github.com/pkg/errors v0.9.1
github.com/prometheus/client_golang v1.16.0
Expand All @@ -28,7 +28,7 @@ require (
k8s.io/klog/v2 v2.120.1
k8s.io/kube-proxy v0.30.2
k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0
sigs.k8s.io/controller-runtime v0.16.0
sigs.k8s.io/controller-runtime v0.18.4
)

require (
Expand Down Expand Up @@ -70,7 +70,7 @@ require (
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_model v0.4.0 // indirect
github.com/prometheus/common v0.44.0 // indirect
github.com/prometheus/procfs v0.10.1 // indirect
github.com/prometheus/procfs v0.12.0 // indirect
github.com/robfig/cron v1.2.0 // indirect
github.com/sirupsen/logrus v1.9.3 // indirect
go.etcd.io/etcd/api/v3 v3.5.10 // indirect
Expand All @@ -87,7 +87,7 @@ require (
go.uber.org/zap v1.26.0 // indirect
golang.org/x/crypto v0.21.0 // indirect
golang.org/x/mod v0.15.0 // indirect
golang.org/x/oauth2 v0.10.0 // indirect
golang.org/x/oauth2 v0.12.0 // indirect
golang.org/x/sync v0.6.0 // indirect
golang.org/x/sys v0.18.0 // indirect
golang.org/x/term v0.18.0 // indirect
Expand Down Expand Up @@ -135,7 +135,7 @@ require (
github.com/coreos/ignition/v2 v2.15.0 // indirect
github.com/coreos/vcontext v0.0.0-20230201181013-d72178a18687 // indirect
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/google/btree v1.1.2 // indirect
github.com/google/cel-go v0.17.8 // indirect
Expand Down
26 changes: 12 additions & 14 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,8 @@ github.com/envoyproxy/protoc-gen-validate v1.0.2 h1:QkIBuU5k+x7/QXPvPPnWXWlCdaBF
github.com/envoyproxy/protoc-gen-validate v1.0.2/go.mod h1:GpiZQP3dDbg4JouG/NNS7QWXpgx6x8QiMKdmN72jogE=
github.com/evanphx/json-patch v5.6.0+incompatible h1:jBYDEEiFBPxA0v50tFdvOzQQTCvpL6mnFh5mB2/l16U=
github.com/evanphx/json-patch v5.6.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
github.com/evanphx/json-patch/v5 v5.6.0 h1:b91NhWfaz02IuVxO9faSllyAtNXHMPkC5J8sJCLunww=
github.com/evanphx/json-patch/v5 v5.6.0/go.mod h1:G79N1coSVB93tBe7j6PhzjmR3/2VvlbKOFpnXhI9Bw4=
github.com/evanphx/json-patch/v5 v5.9.0 h1:kcBlZQbplgElYIlo/n1hJbls2z/1awpXxpRi0/FOJfg=
github.com/evanphx/json-patch/v5 v5.9.0/go.mod h1:VNkHZ/282BpEyt/tObQO8s5CMPmYYq14uClGH4abBuQ=
github.com/felixge/httpsnoop v1.0.3 h1:s/nj+GCswXYzN5v2DpNMuMQYe+0DDwt5WVCU6CWBdXk=
github.com/felixge/httpsnoop v1.0.3/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
github.com/frankban/quicktest v1.14.4 h1:g2rn0vABPOOXmZUj+vbmUp0lPoXEMuhTpIluN0XL9UY=
Expand Down Expand Up @@ -219,7 +219,6 @@ github.com/imdario/mergo v0.3.16 h1:wwQJbIsHYGMUyLSPrEq1CT16AhnhNJQ51+4fdHUnCl4=
github.com/imdario/mergo v0.3.16/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY=
github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
Expand Down Expand Up @@ -266,12 +265,12 @@ github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+W
github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
github.com/onsi/ginkgo/v2 v2.15.0 h1:79HwNRBAZHOEwrczrgSOPy+eFTTlIGELKy5as+ClttY=
github.com/onsi/ginkgo/v2 v2.15.0/go.mod h1:HlxMHtYF57y6Dpf+mc5529KKmSq9h2FpCF+/ZkwUxKM=
github.com/onsi/ginkgo/v2 v2.17.1 h1:V++EzdbhI4ZV4ev0UTIj0PzhzOcReJFyJaLjtSF55M8=
github.com/onsi/ginkgo/v2 v2.17.1/go.mod h1:llBI3WDLL9Z6taip6f33H76YcWtJv+7R3HigUjbIBOs=
github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
github.com/onsi/gomega v1.31.0 h1:54UJxxj6cPInHS3a35wm6BK/F9nHYueZ1NVujHDrnXE=
github.com/onsi/gomega v1.31.0/go.mod h1:DW9aCi7U6Yi40wNVAvT6kzFnEVEI5n3DloYBiKiT6zk=
github.com/onsi/gomega v1.32.0 h1:JRYU78fJ1LPxlckP6Txi/EYqJvjtMrDC04/MM5XRHPk=
github.com/onsi/gomega v1.32.0/go.mod h1:a4x4gW6Pz2yK1MAmvluYme5lvYTn61afQ2ETw/8n4Lg=
github.com/openshift/api v0.0.0-20240704102751-33ed71ab039f h1:8qy74aofCvUwCdPafxgdWFsd3oCoMXhjaaCsXaWNCGM=
github.com/openshift/api v0.0.0-20240704102751-33ed71ab039f/go.mod h1:OOh6Qopf21pSzqNVCB5gomomBXb8o5sGKZxG2KNpaXM=
github.com/openshift/build-machinery-go v0.0.0-20240613134303-8359781da660 h1:F0zE2bmdVvaEd18VXuGYQdJJ1FYJu4MIDW9PYZWc9No=
Expand All @@ -283,7 +282,6 @@ github.com/openshift/library-go v0.0.0-20240704110337-4002bdd84f05/go.mod h1:PdA
github.com/openshift/machine-config-operator v0.0.1-0.20231002195040-a2469941c0dc h1:m8c26gPEv0p621926Kl26kYQvnkOrW7pOirvYzORn24=
github.com/openshift/machine-config-operator v0.0.1-0.20231002195040-a2469941c0dc/go.mod h1:ftCpVtU6Q31exB0DTBn9s2eu90RJESOSisNAruWkvcE=
github.com/pin/tftp v2.1.0+incompatible/go.mod h1:xVpZOMCXTy+A5QMjEVN0Glwa1sUvaJhFXbr/aAxuxGY=
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pkg/profile v1.3.0 h1:OQIvuDgm00gWVWGTf4m4mCt6W1/0YqU7Ntg0mySWgaI=
Expand All @@ -297,8 +295,8 @@ github.com/prometheus/client_model v0.4.0 h1:5lQXD3cAg1OXBf4Wq03gTrXHeaV0TQvGfUo
github.com/prometheus/client_model v0.4.0/go.mod h1:oMQmHW1/JoDwqLtg57MGgP/Fb1CJEYF2imWWhWtMkYU=
github.com/prometheus/common v0.44.0 h1:+5BrQJwiBB9xsMygAB3TNvpQKOwlkc25LbISbrdOOfY=
github.com/prometheus/common v0.44.0/go.mod h1:ofAIvZbQ1e/nugmZGz4/qCb9Ap1VoSTIO7x0VV9VvuY=
github.com/prometheus/procfs v0.10.1 h1:kYK1Va/YMlutzCGazswoHKo//tZVlFpKYh+PymziUAg=
github.com/prometheus/procfs v0.10.1/go.mod h1:nwNm2aOCAYw8uTR/9bWRREkZFxAUcWzPHWJq+XBB/FM=
github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo=
github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo=
github.com/robfig/cron v1.2.0 h1:ZjScXvvxeQ63Dbyxy76Fj3AT3Ut0aKsyd2/tl3DTMuQ=
github.com/robfig/cron v1.2.0/go.mod h1:JGuDeoQd7Z6yL4zQhZ3OPEVHB7fL6Ka6skscFHfmt2k=
github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
Expand Down Expand Up @@ -471,8 +469,8 @@ golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4Iltr
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
golang.org/x/oauth2 v0.10.0 h1:zHCpF2Khkwy4mMB4bv0U37YtJdTGW8jI0glAApi0Kh8=
golang.org/x/oauth2 v0.10.0/go.mod h1:kTpgurOux7LqtuxjuyZa4Gj2gdezIt/jQtGnNFfypQI=
golang.org/x/oauth2 v0.12.0 h1:smVPGxink+n1ZI5pkQa8y6fZT0RW0MgCO5bFpepy4B4=
golang.org/x/oauth2 v0.12.0/go.mod h1:A74bZ3aGXgCY0qaIC9Ahg6Lglin4AMAco8cIv9baba4=
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
Expand Down Expand Up @@ -683,8 +681,8 @@ rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 h1:2770sDpzrjjsAtVhSeUFseziht227YAWYHLGNM8QPwY=
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw=
sigs.k8s.io/controller-runtime v0.16.0 h1:5koYaaRVBHDr0LZAJjO5dWzUjMsh6cwa7q1Mmusrdvk=
sigs.k8s.io/controller-runtime v0.16.0/go.mod h1:77DnuwA8+J7AO0njzv3wbNlMOnGuLrwFr8JPNwx3J7g=
sigs.k8s.io/controller-runtime v0.18.4 h1:87+guW1zhvuPLh1PHybKdYFLU0YJp4FhJRmiHvm5BZw=
sigs.k8s.io/controller-runtime v0.18.4/go.mod h1:TVoGrfdpbA9VRFaRnKgk9P5/atA0pMwq+f+msb9M8Sg=
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
sigs.k8s.io/kube-storage-version-migrator v0.0.6-0.20230721195810-5c8923c5ff96 h1:PFWFSkpArPNJxFX4ZKWAk9NSeRoZaXschn+ULa4xVek=
Expand Down
22 changes: 12 additions & 10 deletions pkg/controller/allowlist/allowlist_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,16 +64,18 @@ func add(mgr manager.Manager, r *ReconcileAllowlist) error {

r.client.Default().AddCustomInformer(cmInformer) // Tell the ClusterClient about this informer

return c.Watch(&source.Informer{Informer: cmInformer},
&handler.EnqueueRequestForObject{},
predicate.ResourceVersionChangedPredicate{},
predicate.NewPredicateFuncs(func(object crclient.Object) bool {
// Only care about cni-sysctl-allowlist, but also watching for default-cni-sysctl-allowlist
// as a trigger for creating cni-sysctl-allowlist if it doesn't exist
return (strings.Contains(object.GetName(), names.ALLOWLIST_CONFIG_NAME))

}),
)
return c.Watch(&source.Informer{
Informer: cmInformer,
Handler: &handler.EnqueueRequestForObject{},
Predicates: []predicate.TypedPredicate[crclient.Object]{
predicate.ResourceVersionChangedPredicate{},
predicate.NewPredicateFuncs(func(object crclient.Object) bool {
// Only care about cni-sysctl-allowlist, but also watching for default-cni-sysctl-allowlist
// as a trigger for creating cni-sysctl-allowlist if it doesn't exist
return (strings.Contains(object.GetName(), names.ALLOWLIST_CONFIG_NAME))
}),
},
})
}

var _ reconcile.Reconciler = &ReconcileAllowlist{}
Expand Down
3 changes: 2 additions & 1 deletion pkg/controller/clusterconfig/clusterconfig_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/controller"
"sigs.k8s.io/controller-runtime/pkg/handler"
"sigs.k8s.io/controller-runtime/pkg/manager"
Expand Down Expand Up @@ -43,7 +44,7 @@ func add(mgr manager.Manager, r reconcile.Reconciler) error {
}

// Watch for changes to primary resource config.openshift.io/v1/Network
err = c.Watch(source.Kind(mgr.GetCache(), &configv1.Network{}), &handler.EnqueueRequestForObject{}, predicate.GenerationChangedPredicate{})
err = c.Watch(source.Kind[client.Object](mgr.GetCache(), &configv1.Network{}, &handler.EnqueueRequestForObject{}, predicate.GenerationChangedPredicate{}))
if err != nil {
return err
}
Expand Down
22 changes: 14 additions & 8 deletions pkg/controller/configmap_ca_injector/controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,16 +81,22 @@ func add(mgr manager.Manager, r *ReconcileConfigMapInjector) error {
}

// Wire up the informers to the queue
if err := c.Watch(&source.Informer{Informer: r.labelInformer},
&handler.EnqueueRequestForObject{},
predicate.ResourceVersionChangedPredicate{},
); err != nil {
if err := c.Watch(&source.Informer{
Informer: r.labelInformer,
Handler: &handler.EnqueueRequestForObject{},
Predicates: []predicate.TypedPredicate[crclient.Object]{
predicate.ResourceVersionChangedPredicate{},
},
}); err != nil {
return err
}
if err := c.Watch(&source.Informer{Informer: r.nsInformer},
&handler.EnqueueRequestForObject{},
predicate.NewPredicateFuncs(isCABundle),
); err != nil {
if err := c.Watch(&source.Informer{
Informer: r.nsInformer,
Handler: &handler.EnqueueRequestForObject{},
Predicates: []predicate.TypedPredicate[crclient.Object]{
predicate.NewPredicateFuncs(isCABundle),
},
}); err != nil {
return err
}

Expand Down
31 changes: 17 additions & 14 deletions pkg/controller/dashboards/dashboard_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,22 +83,25 @@ func add(mgr manager.Manager, r *ReconcileDashboard) error {
r.client.Default().AddCustomInformer(cmInformer) // Tell the ClusterClient about this informer

firstRun := true
return c.Watch(&source.Informer{Informer: cmInformer},
&handler.EnqueueRequestForObject{},
predicate.ResourceVersionChangedPredicate{},
predicate.NewPredicateFuncs(func(object crclient.Object) bool {
if firstRun {
firstRun = false
return true
}
for _, ref := range dashboardRefs {
if object.GetName() == ref.name {
return c.Watch(&source.Informer{
Informer: cmInformer,
Handler: &handler.EnqueueRequestForObject{},
Predicates: []predicate.TypedPredicate[crclient.Object]{
predicate.ResourceVersionChangedPredicate{},
predicate.NewPredicateFuncs(func(object crclient.Object) bool {
if firstRun {
firstRun = false
return true
}
}
return false
}),
)
for _, ref := range dashboardRefs {
if object.GetName() == ref.name {
return true
}
}
return false
}),
},
})
}

var _ reconcile.Reconciler = &ReconcileDashboard{}
Expand Down
3 changes: 2 additions & 1 deletion pkg/controller/egress_router/egress_router_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import (

netopv1 "github.com/openshift/api/networkoperator/v1"
"github.com/openshift/cluster-network-operator/pkg/controller/statusmanager"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/handler"
"sigs.k8s.io/controller-runtime/pkg/source"

Expand All @@ -50,7 +51,7 @@ func Add(mgr manager.Manager, status *statusmanager.StatusManager, cli cnoclient
}

// Watch for changes to primary resource EgressRouter.network.operator.openshift.io/v1
err = c.Watch(source.Kind(mgr.GetCache(), &netopv1.EgressRouter{}), &handler.EnqueueRequestForObject{})
err = c.Watch(source.Kind[client.Object](mgr.GetCache(), &netopv1.EgressRouter{}, &handler.EnqueueRequestForObject{}))
if err != nil {
return err
}
Expand Down
3 changes: 2 additions & 1 deletion pkg/controller/infrastructureconfig/infrastructureconfig_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import (
apierrors "k8s.io/apimachinery/pkg/api/errors"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/controller"
"sigs.k8s.io/controller-runtime/pkg/handler"
"sigs.k8s.io/controller-runtime/pkg/manager"
Expand Down Expand Up @@ -49,7 +50,7 @@ func add(mgr manager.Manager, r reconcile.Reconciler) error {
}

// Watch for changes to primary resource config.openshift.io/v1/Infrastructure
err = c.Watch(source.Kind(mgr.GetCache(), &configv1.Infrastructure{}), &handler.EnqueueRequestForObject{}, onPremPlatformPredicate())
err = c.Watch(source.Kind[client.Object](mgr.GetCache(), &configv1.Infrastructure{}, &handler.EnqueueRequestForObject{}, onPremPlatformPredicate()))
if err != nil {
return err
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/ingressconfig/ingressconfig_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ func add(mgr manager.Manager, r *ReconcileIngressConfigs) error {
if err != nil {
return err
}
err = c.Watch(source.Kind(mgr.GetCache(), &operv1.IngressController{}), &handler.EnqueueRequestForObject{})
err = c.Watch(source.Kind[crclient.Object](mgr.GetCache(), &operv1.IngressController{}, &handler.EnqueueRequestForObject{}))
if err != nil {
return err
}
Expand Down
35 changes: 17 additions & 18 deletions pkg/controller/operconfig/operconfig_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ func add(mgr manager.Manager, r *ReconcileOperConfig) error {
}

// Watch for changes to networkDiagnostics in network.config
err = c.Watch(source.Kind(mgr.GetCache(), &configv1.Network{}), &handler.EnqueueRequestForObject{}, predicate.Funcs{
err = c.Watch(source.Kind[crclient.Object](mgr.GetCache(), &configv1.Network{}, &handler.EnqueueRequestForObject{}, predicate.Funcs{
UpdateFunc: func(evt event.UpdateEvent) bool {
old, ok := evt.ObjectOld.(*configv1.Network)
if !ok {
Expand All @@ -149,13 +149,13 @@ func add(mgr manager.Manager, r *ReconcileOperConfig) error {
}
return true
},
})
}))
if err != nil {
return err
}

// Watch for changes to primary resource Network (as long as the spec changes)
err = c.Watch(source.Kind(mgr.GetCache(), &operv1.Network{}), &handler.EnqueueRequestForObject{}, predicate.Funcs{
err = c.Watch(source.Kind[crclient.Object](mgr.GetCache(), &operv1.Network{}, &handler.EnqueueRequestForObject{}, predicate.Funcs{
UpdateFunc: func(evt event.UpdateEvent) bool {
old, ok := evt.ObjectOld.(*operv1.Network)
if !ok {
Expand All @@ -171,7 +171,7 @@ func add(mgr manager.Manager, r *ReconcileOperConfig) error {
}
return true
},
})
}))
if err != nil {
return err
}
Expand All @@ -187,15 +187,18 @@ func add(mgr manager.Manager, r *ReconcileOperConfig) error {

r.client.Default().AddCustomInformer(cmInformer) // Tell the ClusterClient about this informer

if err := c.Watch(&source.Informer{Informer: cmInformer},
handler.EnqueueRequestsFromMapFunc(reconcileOperConfig),
predicate.ResourceVersionChangedPredicate{},
predicate.NewPredicateFuncs(func(object crclient.Object) bool {
// Ignore ConfigMaps we manage as part of this loop
return !(object.GetName() == "network-operator-lock" ||
object.GetName() == "applied-cluster")
}),
); err != nil {
if err := c.Watch(&source.Informer{
Informer: cmInformer,
Handler: handler.EnqueueRequestsFromMapFunc(reconcileOperConfig),
Predicates: []predicate.TypedPredicate[crclient.Object]{
predicate.ResourceVersionChangedPredicate{},
predicate.NewPredicateFuncs(func(object crclient.Object) bool {
// Ignore ConfigMaps we manage as part of this loop
return !(object.GetName() == "network-operator-lock" ||
object.GetName() == "applied-cluster")
}),
},
}); err != nil {
return err
}

Expand All @@ -218,11 +221,7 @@ func add(mgr manager.Manager, r *ReconcileOperConfig) error {
return true
},
}
if err := c.Watch(
source.Kind(mgr.GetCache(), &corev1.Node{}),
handler.EnqueueRequestsFromMapFunc(reconcileOperConfig),
nodePredicate,
); err != nil {
if err := c.Watch(source.Kind[crclient.Object](mgr.GetCache(), &corev1.Node{}, handler.EnqueueRequestsFromMapFunc(reconcileOperConfig), nodePredicate)); err != nil {
return err
}

Expand Down
3 changes: 2 additions & 1 deletion pkg/controller/pki/pki_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import (
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
"k8s.io/client-go/informers"
"k8s.io/client-go/kubernetes"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/controller"
"sigs.k8s.io/controller-runtime/pkg/handler"
"sigs.k8s.io/controller-runtime/pkg/manager"
Expand All @@ -56,7 +57,7 @@ func Add(mgr manager.Manager, status *statusmanager.StatusManager, _ cnoclient.C
}

// Watch for changes to primary resource PKI.network.operator.openshift.io/v1
err = c.Watch(source.Kind(mgr.GetCache(), &netopv1.OperatorPKI{}), &handler.EnqueueRequestForObject{})
err = c.Watch(source.Kind[client.Object](mgr.GetCache(), &netopv1.OperatorPKI{}, &handler.EnqueueRequestForObject{}))
if err != nil {
return err
}
Expand Down
9 changes: 5 additions & 4 deletions pkg/controller/proxyconfig/controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,14 +65,15 @@ func add(mgr manager.Manager, r *ReconcileProxyConfig) error {
}

// watch for changes to configmaps in openshift-config
if err := c.Watch(&source.Informer{Informer: r.cmInformer},
&handler.EnqueueRequestForObject{},
); err != nil {
if err := c.Watch(&source.Informer{
Informer: r.cmInformer,
Handler: &handler.EnqueueRequestForObject{},
}); err != nil {
return err
}

// Watch for changes to the proxy resource.
err = c.Watch(source.Kind(mgr.GetCache(), &configv1.Proxy{}), &handler.EnqueueRequestForObject{})
err = c.Watch(source.Kind[crclient.Object](mgr.GetCache(), &configv1.Proxy{}, &handler.EnqueueRequestForObject{}))
if err != nil {
return err
}
Expand Down
Loading

0 comments on commit 67dffeb

Please sign in to comment.