Skip to content

Upgrade sigs.k8s.io/controller-runtime to v0.23.3 #264

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
felix-kaestner merged 1 commit into from
Mar 30, 2026
Merged

Upgrade sigs.k8s.io/controller-runtime to v0.23.3 #264

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 28 additions & 28 deletions cmd/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ func main() {

mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), ctrl.Options{
Cache: cache.Options{ReaderFailOnMissingInformer: true, DefaultNamespaces: watchNamespaces},
Controller: config.Controller{UsePriorityQueue: new(true), MaxConcurrentReconciles: maxConcurrentReconciles},
Controller: config.Controller{MaxConcurrentReconciles: maxConcurrentReconciles},
Scheme: scheme,
Metrics: metricsServerOptions,
WebhookServer: webhookServer,
Expand Down Expand Up @@ -276,7 +276,7 @@ func main() {
if err := (&corecontroller.DeviceReconciler{
Client: mgr.GetClient(),
Scheme: mgr.GetScheme(),
Recorder: mgr.GetEventRecorderFor("device-controller"),
Recorder: mgr.GetEventRecorder("device-controller"),
WatchFilterValue: watchFilterValue,
Provider: prov,
RequeueInterval: requeueInterval,
Expand All @@ -288,7 +288,7 @@ func main() {
if err := (&corecontroller.InterfaceReconciler{
Client: mgr.GetClient(),
Scheme: mgr.GetScheme(),
Recorder: mgr.GetEventRecorderFor("interface-controller"),
Recorder: mgr.GetEventRecorder("interface-controller"),
WatchFilterValue: watchFilterValue,
Provider: prov,
Locker: locker,
Expand All @@ -301,7 +301,7 @@ func main() {
if err := (&corecontroller.BannerReconciler{
Client: mgr.GetClient(),
Scheme: mgr.GetScheme(),
Recorder: mgr.GetEventRecorderFor("banner-controller"),
Recorder: mgr.GetEventRecorder("banner-controller"),
WatchFilterValue: watchFilterValue,
Provider: prov,
Locker: locker,
Expand All @@ -313,7 +313,7 @@ func main() {
if err := (&corecontroller.UserReconciler{
Client: mgr.GetClient(),
Scheme: mgr.GetScheme(),
Recorder: mgr.GetEventRecorderFor("user-controller"),
Recorder: mgr.GetEventRecorder("user-controller"),
WatchFilterValue: watchFilterValue,
Provider: prov,
Locker: locker,
Expand All @@ -325,7 +325,7 @@ func main() {
if err := (&corecontroller.DNSReconciler{
Client: mgr.GetClient(),
Scheme: mgr.GetScheme(),
Recorder: mgr.GetEventRecorderFor("dns-controller"),
Recorder: mgr.GetEventRecorder("dns-controller"),
WatchFilterValue: watchFilterValue,
Provider: prov,
Locker: locker,
Expand All @@ -337,7 +337,7 @@ func main() {
if err := (&corecontroller.NTPReconciler{
Client: mgr.GetClient(),
Scheme: mgr.GetScheme(),
Recorder: mgr.GetEventRecorderFor("ntp-controller"),
Recorder: mgr.GetEventRecorder("ntp-controller"),
WatchFilterValue: watchFilterValue,
Provider: prov,
Locker: locker,
Expand All @@ -349,7 +349,7 @@ func main() {
if err := (&corecontroller.AccessControlListReconciler{
Client: mgr.GetClient(),
Scheme: mgr.GetScheme(),
Recorder: mgr.GetEventRecorderFor("acl-controller"),
Recorder: mgr.GetEventRecorder("acl-controller"),
WatchFilterValue: watchFilterValue,
Provider: prov,
Locker: locker,
Expand All @@ -361,7 +361,7 @@ func main() {
if err := (&corecontroller.CertificateReconciler{
Client: mgr.GetClient(),
Scheme: mgr.GetScheme(),
Recorder: mgr.GetEventRecorderFor("certificate-controller"),
Recorder: mgr.GetEventRecorder("certificate-controller"),
WatchFilterValue: watchFilterValue,
Provider: prov,
Locker: locker,
Expand All @@ -373,7 +373,7 @@ func main() {
if err := (&corecontroller.SNMPReconciler{
Client: mgr.GetClient(),
Scheme: mgr.GetScheme(),
Recorder: mgr.GetEventRecorderFor("snmp-controller"),
Recorder: mgr.GetEventRecorder("snmp-controller"),
WatchFilterValue: watchFilterValue,
Provider: prov,
Locker: locker,
Expand All @@ -385,7 +385,7 @@ func main() {
if err := (&corecontroller.SyslogReconciler{
Client: mgr.GetClient(),
Scheme: mgr.GetScheme(),
Recorder: mgr.GetEventRecorderFor("syslog-controller"),
Recorder: mgr.GetEventRecorder("syslog-controller"),
WatchFilterValue: watchFilterValue,
Provider: prov,
Locker: locker,
Expand All @@ -397,7 +397,7 @@ func main() {
if err := (&corecontroller.ManagementAccessReconciler{
Client: mgr.GetClient(),
Scheme: mgr.GetScheme(),
Recorder: mgr.GetEventRecorderFor("managementaccess-controller"),
Recorder: mgr.GetEventRecorder("managementaccess-controller"),
WatchFilterValue: watchFilterValue,
Provider: prov,
Locker: locker,
Expand All @@ -409,7 +409,7 @@ func main() {
if err := (&corecontroller.ISISReconciler{
Client: mgr.GetClient(),
Scheme: mgr.GetScheme(),
Recorder: mgr.GetEventRecorderFor("isis-controller"),
Recorder: mgr.GetEventRecorder("isis-controller"),
WatchFilterValue: watchFilterValue,
Provider: prov,
Locker: locker,
Expand All @@ -422,7 +422,7 @@ func main() {
if err := (&corecontroller.PIMReconciler{
Client: mgr.GetClient(),
Scheme: mgr.GetScheme(),
Recorder: mgr.GetEventRecorderFor("pim-controller"),
Recorder: mgr.GetEventRecorder("pim-controller"),
WatchFilterValue: watchFilterValue,
Provider: prov,
Locker: locker,
Expand All @@ -435,7 +435,7 @@ func main() {
if err := (&corecontroller.BGPReconciler{
Client: mgr.GetClient(),
Scheme: mgr.GetScheme(),
Recorder: mgr.GetEventRecorderFor("bgp-controller"),
Recorder: mgr.GetEventRecorder("bgp-controller"),
WatchFilterValue: watchFilterValue,
Provider: prov,
Locker: locker,
Expand All @@ -448,7 +448,7 @@ func main() {
if err := (&corecontroller.BGPPeerReconciler{
Client: mgr.GetClient(),
Scheme: mgr.GetScheme(),
Recorder: mgr.GetEventRecorderFor("bgppeer-controller"),
Recorder: mgr.GetEventRecorder("bgppeer-controller"),
WatchFilterValue: watchFilterValue,
Provider: prov,
Locker: locker,
Expand All @@ -461,7 +461,7 @@ func main() {
if err := (&corecontroller.LLDPReconciler{
Client: mgr.GetClient(),
Scheme: mgr.GetScheme(),
Recorder: mgr.GetEventRecorderFor("lldp-controller"),
Recorder: mgr.GetEventRecorder("lldp-controller"),
WatchFilterValue: watchFilterValue,
Provider: prov,
Locker: locker,
Expand All @@ -474,7 +474,7 @@ func main() {
if err := (&corecontroller.OSPFReconciler{
Client: mgr.GetClient(),
Scheme: mgr.GetScheme(),
Recorder: mgr.GetEventRecorderFor("ospf-controller"),
Recorder: mgr.GetEventRecorder("ospf-controller"),
WatchFilterValue: watchFilterValue,
Provider: prov,
Locker: locker,
Expand All @@ -487,7 +487,7 @@ func main() {
if err := (&corecontroller.VLANReconciler{
Client: mgr.GetClient(),
Scheme: mgr.GetScheme(),
Recorder: mgr.GetEventRecorderFor("vlan-controller"),
Recorder: mgr.GetEventRecorder("vlan-controller"),
WatchFilterValue: watchFilterValue,
Provider: prov,
Locker: locker,
Expand All @@ -500,7 +500,7 @@ func main() {
if err := (&corecontroller.VRFReconciler{
Client: mgr.GetClient(),
Scheme: mgr.GetScheme(),
Recorder: mgr.GetEventRecorderFor("vrf-controller"),
Recorder: mgr.GetEventRecorder("vrf-controller"),
WatchFilterValue: watchFilterValue,
Provider: prov,
Locker: locker,
Expand All @@ -513,7 +513,7 @@ func main() {
if err := (&nxcontroller.VPCDomainReconciler{
Client: mgr.GetClient(),
Scheme: mgr.GetScheme(),
Recorder: mgr.GetEventRecorderFor("cisco-nx-vpcdomain-controller"),
Recorder: mgr.GetEventRecorder("cisco-nx-vpcdomain-controller"),
WatchFilterValue: watchFilterValue,
Provider: prov,
Locker: locker,
Expand All @@ -526,7 +526,7 @@ func main() {
if err := (&corecontroller.NetworkVirtualizationEdgeReconciler{
Client: mgr.GetClient(),
Scheme: mgr.GetScheme(),
Recorder: mgr.GetEventRecorderFor("nve-controller"),
Recorder: mgr.GetEventRecorder("nve-controller"),
WatchFilterValue: watchFilterValue,
Provider: prov,
Locker: locker,
Expand All @@ -539,7 +539,7 @@ func main() {
if err := (&nxcontroller.SystemReconciler{
Client: mgr.GetClient(),
Scheme: mgr.GetScheme(),
Recorder: mgr.GetEventRecorderFor("cisco-nx-system-controller"),
Recorder: mgr.GetEventRecorder("cisco-nx-system-controller"),
WatchFilterValue: watchFilterValue,
Provider: prov,
Locker: locker,
Expand All @@ -551,7 +551,7 @@ func main() {
if err := (&corecontroller.EVPNInstanceReconciler{
Client: mgr.GetClient(),
Scheme: mgr.GetScheme(),
Recorder: mgr.GetEventRecorderFor("evpn-instance-controller"),
Recorder: mgr.GetEventRecorder("evpn-instance-controller"),
WatchFilterValue: watchFilterValue,
Provider: prov,
Locker: locker,
Expand All @@ -563,7 +563,7 @@ func main() {
if err := (&corecontroller.PrefixSetReconciler{
Client: mgr.GetClient(),
Scheme: mgr.GetScheme(),
Recorder: mgr.GetEventRecorderFor("prefixset-controller"),
Recorder: mgr.GetEventRecorder("prefixset-controller"),
WatchFilterValue: watchFilterValue,
Provider: prov,
Locker: locker,
Expand All @@ -575,7 +575,7 @@ func main() {
if err := (&corecontroller.RoutingPolicyReconciler{
Client: mgr.GetClient(),
Scheme: mgr.GetScheme(),
Recorder: mgr.GetEventRecorderFor("routingpolicy-controller"),
Recorder: mgr.GetEventRecorder("routingpolicy-controller"),
WatchFilterValue: watchFilterValue,
Provider: prov,
Locker: locker,
Expand All @@ -587,7 +587,7 @@ func main() {
if err := (&nxcontroller.BorderGatewayReconciler{
Client: mgr.GetClient(),
Scheme: mgr.GetScheme(),
Recorder: mgr.GetEventRecorderFor("cisco-nx-border-gateway-controller"),
Recorder: mgr.GetEventRecorder("cisco-nx-border-gateway-controller"),
WatchFilterValue: watchFilterValue,
Provider: prov,
Locker: locker,
Expand Down Expand Up @@ -642,7 +642,7 @@ func main() {
provisioningServer := &provisioning.HTTPServer{
Client: mgr.GetClient(),
Logger: klog.NewKlogr().WithName("provisioning"),
Recorder: mgr.GetEventRecorderFor("provisioning"),
Recorder: mgr.GetEventRecorder("provisioning"),
ValidateSourceIP: provisioningHTTPValidateSourceIP,
Provider: provisioningProvider,
Port: provisioningHTTPPort,
Expand Down
4 changes: 2 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ require (
k8s.io/client-go v0.35.0
k8s.io/klog/v2 v2.130.1
rsc.io/script v0.0.2
sigs.k8s.io/controller-runtime v0.22.4
sigs.k8s.io/controller-runtime v0.23.3
sigs.k8s.io/yaml v1.6.0
)

Expand Down Expand Up @@ -126,5 +126,5 @@ require (
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.34.0 // indirect
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
sigs.k8s.io/randfill v1.0.0 // indirect
sigs.k8s.io/structured-merge-diff/v6 v6.3.1 // indirect
sigs.k8s.io/structured-merge-diff/v6 v6.3.2-0.20260122202528-d9cc6641c482 // indirect
)
8 changes: 4 additions & 4 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,13 +300,13 @@ rsc.io/script v0.0.2 h1:eYoG7A3GFC3z1pRx3A2+s/vZ9LA8cxojHyCvslnj4RI=
rsc.io/script v0.0.2/go.mod h1:cKBjCtFBBeZ0cbYFRXkRoxP+xGqhArPa9t3VWhtXfzU=
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.34.0 h1:hSfpvjjTQXQY2Fol2CS0QHMNs/WI1MOSGzCm1KhM5ec=
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.34.0/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw=
sigs.k8s.io/controller-runtime v0.22.4 h1:GEjV7KV3TY8e+tJ2LCTxUTanW4z/FmNB7l327UfMq9A=
sigs.k8s.io/controller-runtime v0.22.4/go.mod h1:+QX1XUpTXN4mLoblf4tqr5CQcyHPAki2HLXqQMY6vh8=
sigs.k8s.io/controller-runtime v0.23.3 h1:VjB/vhoPoA9l1kEKZHBMnQF33tdCLQKJtydy4iqwZ80=
sigs.k8s.io/controller-runtime v0.23.3/go.mod h1:B6COOxKptp+YaUT5q4l6LqUJTRpizbgf9KSRNdQGns0=
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 h1:IpInykpT6ceI+QxKBbEflcR5EXP7sU1kvOlxwZh5txg=
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730/go.mod h1:mdzfpAEoE6DHQEN0uh9ZbOCuHbLK5wOm7dK4ctXE9Tg=
sigs.k8s.io/randfill v1.0.0 h1:JfjMILfT8A6RbawdsK2JXGBR5AQVfd+9TbzrlneTyrU=
sigs.k8s.io/randfill v1.0.0/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY=
sigs.k8s.io/structured-merge-diff/v6 v6.3.1 h1:JrhdFMqOd/+3ByqlP2I45kTOZmTRLBUm5pvRjeheg7E=
sigs.k8s.io/structured-merge-diff/v6 v6.3.1/go.mod h1:M3W8sfWvn2HhQDIbGWj3S099YozAsymCo/wrT5ohRUE=
sigs.k8s.io/structured-merge-diff/v6 v6.3.2-0.20260122202528-d9cc6641c482 h1:2WOzJpHUBVrrkDjU4KBT8n5LDcj824eX0I5UKcgeRUs=
sigs.k8s.io/structured-merge-diff/v6 v6.3.2-0.20260122202528-d9cc6641c482/go.mod h1:M3W8sfWvn2HhQDIbGWj3S099YozAsymCo/wrT5ohRUE=
sigs.k8s.io/yaml v1.6.0 h1:G8fkbMSAFqgEFgh4b1wmtzDnioxFCUgTZhlbj5P9QYs=
sigs.k8s.io/yaml v1.6.0/go.mod h1:796bPqUfzR/0jLAl6XjHl3Ck7MiyVv8dbTdyT3/pMf4=
4 changes: 2 additions & 2 deletions internal/controller/cisco/nx/bordergateway_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
kerrors "k8s.io/apimachinery/pkg/util/errors"
"k8s.io/client-go/tools/record"
"k8s.io/client-go/tools/events"
"k8s.io/klog/v2"
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/builder"
Expand Down Expand Up @@ -47,7 +47,7 @@ type BorderGatewayReconciler struct {

// Recorder is used to record events for the controller.
// More info: https://book.kubebuilder.io/reference/raising-events
Recorder record.EventRecorder
Recorder events.EventRecorder

// Provider is the driver that will be used to create & delete the bordergateway.
Provider provider.ProviderFunc
Expand Down
4 changes: 2 additions & 2 deletions internal/controller/cisco/nx/suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/kubernetes/scheme"
"k8s.io/client-go/tools/record"
"k8s.io/client-go/tools/events"
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/envtest"
Expand Down Expand Up @@ -92,7 +92,7 @@ var _ = BeforeSuite(func() {
})
Expect(err).ToNot(HaveOccurred())

recorder := record.NewFakeRecorder(0)
recorder := events.NewFakeRecorder(0)
go func() {
for event := range recorder.Events {
GinkgoLogr.Info("Event", "event", event)
Expand Down
4 changes: 2 additions & 2 deletions internal/controller/cisco/nx/system_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
kerrors "k8s.io/apimachinery/pkg/util/errors"
"k8s.io/client-go/tools/record"
"k8s.io/client-go/tools/events"
"k8s.io/klog/v2"
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/builder"
Expand Down Expand Up @@ -44,7 +44,7 @@ type SystemReconciler struct {

// Recorder is used to record events for the controller.
// More info: https://book.kubebuilder.io/reference/raising-events
Recorder record.EventRecorder
Recorder events.EventRecorder

// Provider is the driver that will be used to create & delete the system.
Provider provider.ProviderFunc
Expand Down
4 changes: 2 additions & 2 deletions internal/controller/cisco/nx/vpcdomain_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
kerrors "k8s.io/apimachinery/pkg/util/errors"
"k8s.io/client-go/tools/record"
"k8s.io/client-go/tools/events"
"k8s.io/klog/v2"
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/builder"
Expand Down Expand Up @@ -49,7 +49,7 @@ type VPCDomainReconciler struct {

// Recorder is used to record events for the controller.
// More info: https://book.kubebuilder.io/reference/raising-events
Recorder record.EventRecorder
Recorder events.EventRecorder

// Provider is the driver that will be used to create & delete the vPC
Provider provider.ProviderFunc
Expand Down
4 changes: 2 additions & 2 deletions internal/controller/core/acl_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/types"
kerrors "k8s.io/apimachinery/pkg/util/errors"
"k8s.io/client-go/tools/record"
"k8s.io/client-go/tools/events"
"k8s.io/klog/v2"
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/builder"
Expand Down Expand Up @@ -46,7 +46,7 @@ type AccessControlListReconciler struct {

// Recorder is used to record events for the controller.
// More info: https://book.kubebuilder.io/reference/raising-events
Recorder record.EventRecorder
Recorder events.EventRecorder

// Provider is the driver that will be used to create & delete the accesscontrollist.
Provider provider.ProviderFunc
Expand Down
4 changes: 2 additions & 2 deletions internal/controller/core/banner_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/types"
kerrors "k8s.io/apimachinery/pkg/util/errors"
"k8s.io/client-go/tools/record"
"k8s.io/client-go/tools/events"
"k8s.io/klog/v2"
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/builder"
Expand Down Expand Up @@ -48,7 +48,7 @@ type BannerReconciler struct {

// Recorder is used to record events for the controller.
// More info: https://book.kubebuilder.io/reference/raising-events
Recorder record.EventRecorder
Recorder events.EventRecorder

// Provider is the driver that will be used to create & delete the banner.
Provider provider.ProviderFunc
Expand Down
Loading
Loading