From 9bb3d64267f1438d6d6aa7fabfb08d9335f3c0fe Mon Sep 17 00:00:00 2001 From: Rahul Sharma Date: Mon, 16 Dec 2024 21:59:45 +0000 Subject: [PATCH] fix lint errors --- cloud/linode/node_controller.go | 4 ++-- cloud/linode/service_controller.go | 2 +- go.mod | 8 ++++---- go.sum | 9 +++++++++ 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/cloud/linode/node_controller.go b/cloud/linode/node_controller.go index fe502a6a..52e19422 100644 --- a/cloud/linode/node_controller.go +++ b/cloud/linode/node_controller.go @@ -39,7 +39,7 @@ type nodeController struct { metadataLastUpdate map[string]time.Time ttl time.Duration - queue workqueue.DelayingInterface + queue workqueue.TypedDelayingInterface[any] } func newNodeController(kubeclient kubernetes.Interface, client client.Client, informer v1informers.NodeInformer) *nodeController { @@ -57,7 +57,7 @@ func newNodeController(kubeclient kubernetes.Interface, client client.Client, in informer: informer, ttl: timeout, metadataLastUpdate: make(map[string]time.Time), - queue: workqueue.NewDelayingQueue(), + queue: workqueue.NewTypedDelayingQueue[any](), } } diff --git a/cloud/linode/service_controller.go b/cloud/linode/service_controller.go index f04167e9..057a0dc5 100644 --- a/cloud/linode/service_controller.go +++ b/cloud/linode/service_controller.go @@ -21,7 +21,7 @@ type serviceController struct { loadbalancers *loadbalancers informer v1informers.ServiceInformer - queue workqueue.DelayingInterface + queue workqueue.TypedDelayingInterface[any] } func newServiceController(loadbalancers *loadbalancers, informer v1informers.ServiceInformer) *serviceController { diff --git a/go.mod b/go.mod index 62fdb539..57eefa34 100644 --- a/go.mod +++ b/go.mod @@ -13,7 +13,7 @@ require ( github.com/linode/linodego v1.43.0 github.com/spf13/pflag v1.0.6-0.20210604193023-d5e0c0615ace github.com/stretchr/testify v1.10.0 - golang.org/x/exp v0.0.0-20241210194714-1829a127f884 + golang.org/x/exp v0.0.0-20241215155358-4a5509556b9e k8s.io/api v0.32.0 k8s.io/apimachinery v0.32.0 k8s.io/client-go v0.32.0 @@ -34,8 +34,8 @@ require ( github.com/cenkalti/backoff/v4 v4.3.0 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/cilium/ebpf v0.16.0 // indirect - github.com/cilium/hive v0.0.0-20241205140635-d02f07f3d452 // indirect - github.com/cilium/proxy v0.0.0-20241211072844-8b82fff98d75 // indirect + github.com/cilium/hive v0.0.0-20241213121623-605c1412b9b3 // indirect + github.com/cilium/proxy v0.0.0-20241216122539-268a44ec93e9 // indirect github.com/coreos/go-semver v0.3.1 // indirect github.com/coreos/go-systemd/v22 v22.5.0 // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect @@ -77,7 +77,7 @@ require ( github.com/kylelemons/godebug v1.1.0 // indirect github.com/mackerelio/go-osstat v0.2.5 // indirect github.com/magiconair/properties v1.8.9 // indirect - github.com/mailru/easyjson v0.7.7 // indirect + github.com/mailru/easyjson v0.9.0 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/moby/term v0.5.0 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect diff --git a/go.sum b/go.sum index 5ce73983..6bd4f9a6 100644 --- a/go.sum +++ b/go.sum @@ -30,14 +30,19 @@ github.com/cilium/ebpf v0.16.0 h1:+BiEnHL6Z7lXnlGUsXQPPAE7+kenAd4ES8MQ5min0Ok= github.com/cilium/ebpf v0.16.0/go.mod h1:L7u2Blt2jMM/vLAVgjxluxtBKlz3/GWjB0dMOEngfwE= github.com/cilium/hive v0.0.0-20241205140635-d02f07f3d452 h1:phyHNaED0wvK8Q5Mne8glGH6lWGx7jmyO/bsIzWHEtA= github.com/cilium/hive v0.0.0-20241205140635-d02f07f3d452/go.mod h1:pI2GJ1n3SLKIQVFrKF7W6A6gb6BQkZ+3Hp4PAEo5SuI= +github.com/cilium/hive v0.0.0-20241213121623-605c1412b9b3 h1:RfmUH1ouzj0LzORYJRhp43e1rlGpx6GNv4NIRUakU2w= +github.com/cilium/hive v0.0.0-20241213121623-605c1412b9b3/go.mod h1:pI2GJ1n3SLKIQVFrKF7W6A6gb6BQkZ+3Hp4PAEo5SuI= github.com/cilium/proxy v0.0.0-20241211072844-8b82fff98d75 h1:Henq40WBZjYDKG3MmX69BSP9tOk9jX3+IvzPxVL39E8= github.com/cilium/proxy v0.0.0-20241211072844-8b82fff98d75/go.mod h1:S4CbQuF5xZEUfBOtkTwK8aRdWXjET++9OQ6r98IQOZY= +github.com/cilium/proxy v0.0.0-20241216122539-268a44ec93e9 h1:3m0eujK8+y8cKqkQsLSulES72gFayNgcaGXlpwc6bKY= +github.com/cilium/proxy v0.0.0-20241216122539-268a44ec93e9/go.mod h1:1jlssjN+8AsZeex4+7ERavw5vRa/lce/ybVRamfeQSU= github.com/cilium/statedb v0.2.4 h1:jCyXGcsiXgpJSfpfRRGKd+TD3U1teeDtOnqCyErsHsI= github.com/cilium/statedb v0.2.4/go.mod h1:KPwsudjhZ90zoBguYMtssKpstR74jVKd/D+73PZy+sg= github.com/cilium/stream v0.0.0-20240226091623-f979d32855f8 h1:j6VF1s6gz3etRH5ObCr0UUyJblP9cK5fbgkQTz8fTRA= github.com/cilium/stream v0.0.0-20240226091623-f979d32855f8/go.mod h1:/e83AwqvNKpyg4n3C41qmnmj1x2G9DwzI+jb7GkF4lI= github.com/cncf/xds/go v0.0.0-20240905190251-b4127c9b8d78 h1:QVw89YDxXxEe+l8gU8ETbOasdwEV+avkR75ZzsVV9WI= github.com/cncf/xds/go v0.0.0-20240905190251-b4127c9b8d78/go.mod h1:W+zGtBO5Y1IgJhy4+A9GOqVhqLpfZi+vwmdNXUehLA8= +github.com/cncf/xds/go v0.0.0-20241213214725-57cfbe6fad57 h1:put7Je9ZyxbHtwr7IqGrW4LLVUupJQ2gbsDshKISSgU= github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0/go.mod h1:4Zcjuz89kmFXt9morQgcfYZAYZ5n8WHjt81YYWIwtTM= github.com/codeskyblue/go-sh v0.0.0-20200712050446-30169cf553fe/go.mod h1:VQx0hjo2oUeQkQUET7wRwradO6f+fN5jzXgB/zROxxE= github.com/coreos/go-semver v0.3.1 h1:yi21YpKnrx1gt5R+la8n5WgS0kCrsPp33dmEyHReZr4= @@ -187,6 +192,8 @@ github.com/magiconair/properties v1.8.9 h1:nWcCbLq1N2v/cpNsy5WvQ37Fb+YElfq20WJ/a github.com/magiconair/properties v1.8.9/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0= github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= +github.com/mailru/easyjson v0.9.0 h1:PrnmzHw7262yW8sTBwxi1PdJA3Iw/EKBa8psRf7d9a4= +github.com/mailru/easyjson v0.9.0/go.mod h1:1+xMtQp2MRNVL/V1bOzuP3aP8VNwRW55fQUto+XFtTU= github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= github.com/mdlayher/netlink v1.7.2 h1:/UtM3ofJap7Vl4QWCPDGXY8d3GIY2UGSDbK+QWmY8/g= @@ -354,6 +361,8 @@ golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U= golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk= golang.org/x/exp v0.0.0-20241210194714-1829a127f884 h1:Y/Mj/94zIQQGHVSv1tTtQBDaQaJe62U9bkDZKKyhPCU= golang.org/x/exp v0.0.0-20241210194714-1829a127f884/go.mod h1:qj5a5QZpwLU2NLQudwIN5koi3beDhSAlJwa67PuM98c= +golang.org/x/exp v0.0.0-20241215155358-4a5509556b9e h1:4qufH0hlUYs6AO6XmZC3GqfDPGSXHVXUFR6OND+iJX4= +golang.org/x/exp v0.0.0-20241215155358-4a5509556b9e/go.mod h1:qj5a5QZpwLU2NLQudwIN5koi3beDhSAlJwa67PuM98c= golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=