Skip to content

Commit d3ecb4e

Browse files
aaurenaauren
committed
fix: syntax updates for Go 1.20.X and k8s 1.27
1 parent 562a50e commit d3ecb4e

File tree

3 files changed

+42
-28
lines changed

3 files changed

+42
-28
lines changed

‎pkg/cmd/kube-router.go

+25-21
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package cmd
22

33
import (
44
"errors"
5+
"fmt"
56
"os"
67
"os/signal"
78
"sync"
@@ -42,18 +43,18 @@ func NewKubeRouterDefault(config *options.KubeRouterConfig) (*KubeRouter, error)
4243
if len(config.Master) != 0 || len(config.Kubeconfig) != 0 {
4344
clientconfig, err = clientcmd.BuildConfigFromFlags(config.Master, config.Kubeconfig)
4445
if err != nil {
45-
return nil, errors.New("Failed to build configuration from CLI: " + err.Error())
46+
return nil, fmt.Errorf("failed to build configuration from CLI: %v", err)
4647
}
4748
} else {
4849
clientconfig, err = rest.InClusterConfig()
4950
if err != nil {
50-
return nil, errors.New("unable to initialize inclusterconfig: " + err.Error())
51+
return nil, fmt.Errorf("unable to initialize inclusterconfig: %v", err)
5152
}
5253
}
5354

5455
clientset, err := kubernetes.NewForConfig(clientconfig)
5556
if err != nil {
56-
return nil, errors.New("Failed to create Kubernetes client: " + err.Error())
57+
return nil, fmt.Errorf("failed to create Kubernetes client: %v", err)
5758
}
5859

5960
return &KubeRouter{Client: clientset, Config: config}, nil
@@ -88,7 +89,7 @@ func (kr *KubeRouter) Run() error {
8889

8990
hc, err := healthcheck.NewHealthController(kr.Config)
9091
if err != nil {
91-
return errors.New("Failed to create health controller: " + err.Error())
92+
return fmt.Errorf("failed to create health controller: %v", err)
9293
}
9394
wg.Add(1)
9495
go hc.RunServer(stopCh, &wg)
@@ -104,7 +105,7 @@ func (kr *KubeRouter) Run() error {
104105

105106
err = kr.CacheSyncOrTimeout(informerFactory, stopCh)
106107
if err != nil {
107-
return errors.New("Failed to synchronize cache: " + err.Error())
108+
return fmt.Errorf("failed to synchronize cache: %v", err)
108109
}
109110

110111
hc.SetAlive()
@@ -115,7 +116,7 @@ func (kr *KubeRouter) Run() error {
115116
kr.Config.MetricsEnabled = true
116117
mc, err := metrics.NewMetricsController(kr.Config)
117118
if err != nil {
118-
return errors.New("Failed to create metrics controller: " + err.Error())
119+
return fmt.Errorf("failed to create metrics controller: %v", err)
119120
}
120121
wg.Add(1)
121122
go mc.Run(healthChan, stopCh, &wg)
@@ -147,20 +148,20 @@ func (kr *KubeRouter) Run() error {
147148
nrc, err := routing.NewNetworkRoutingController(kr.Client, kr.Config,
148149
nodeInformer, svcInformer, epInformer, &ipsetMutex)
149150
if err != nil {
150-
return errors.New("Failed to create network routing controller: " + err.Error())
151+
return fmt.Errorf("failed to create network routing controller: %v", err)
151152
}
152153

153154
_, err = nodeInformer.AddEventHandler(nrc.NodeEventHandler)
154155
if err != nil {
155-
return errors.New("Failed to add NodeEventHandler: " + err.Error())
156+
return fmt.Errorf("failed to add NodeEventHandler: %v", err)
156157
}
157158
_, err = svcInformer.AddEventHandler(nrc.ServiceEventHandler)
158159
if err != nil {
159-
return errors.New("Failed to add ServiceEventHandler: " + err.Error())
160+
return fmt.Errorf("failed to add ServiceEventHandler: %v", err)
160161
}
161162
_, err = epInformer.AddEventHandler(nrc.EndpointsEventHandler)
162163
if err != nil {
163-
return errors.New("Failed to add EndpointsEventHandler: " + err.Error())
164+
return fmt.Errorf("failed to add EndpointsEventHandler: %v", err)
164165
}
165166

166167
wg.Add(1)
@@ -178,16 +179,16 @@ func (kr *KubeRouter) Run() error {
178179
nsc, err := proxy.NewNetworkServicesController(kr.Client, kr.Config,
179180
svcInformer, epInformer, podInformer, &ipsetMutex)
180181
if err != nil {
181-
return errors.New("Failed to create network services controller: " + err.Error())
182+
return fmt.Errorf("failed to create network services controller: %v", err)
182183
}
183184

184185
_, err = svcInformer.AddEventHandler(nsc.ServiceEventHandler)
185186
if err != nil {
186-
return errors.New("Failed to add ServiceEventHandler: " + err.Error())
187+
return fmt.Errorf("failed to add ServiceEventHandler: %v", err)
187188
}
188189
_, err = epInformer.AddEventHandler(nsc.EndpointsEventHandler)
189190
if err != nil {
190-
return errors.New("Failed to add EndpointsEventHandler: " + err.Error())
191+
return fmt.Errorf("failed to add EndpointsEventHandler: %v", err)
191192
}
192193

193194
wg.Add(1)
@@ -204,25 +205,25 @@ func (kr *KubeRouter) Run() error {
204205
if kr.Config.RunFirewall {
205206
iptablesCmdHandlers, ipSetHandlers, err := netpol.NewIPTablesHandlers(kr.Config)
206207
if err != nil {
207-
return errors.New("Failed to create iptables handlers: " + err.Error())
208+
return fmt.Errorf("failed to create iptables handlers: %v", err)
208209
}
209210
npc, err := netpol.NewNetworkPolicyController(kr.Client,
210211
kr.Config, podInformer, npInformer, nsInformer, &ipsetMutex, iptablesCmdHandlers, ipSetHandlers)
211212
if err != nil {
212-
return errors.New("Failed to create network policy controller: " + err.Error())
213+
return fmt.Errorf("failed to create network policy controller: %v", err)
213214
}
214215

215216
_, err = podInformer.AddEventHandler(npc.PodEventHandler)
216217
if err != nil {
217-
return errors.New("Failed to add PodEventHandler: " + err.Error())
218+
return fmt.Errorf("failed to add PodEventHandler: %v", err)
218219
}
219220
_, err = nsInformer.AddEventHandler(npc.NamespaceEventHandler)
220221
if err != nil {
221-
return errors.New("Failed to add NamespaceEventHandler: " + err.Error())
222+
return fmt.Errorf("failed to add NamespaceEventHandler: %v", err)
222223
}
223224
_, err = npInformer.AddEventHandler(npc.NetworkPolicyEventHandler)
224225
if err != nil {
225-
return errors.New("Failed to add NetworkPolicyEventHandler: " + err.Error())
226+
return fmt.Errorf("failed to add NetworkPolicyEventHandler: %v", err)
226227
}
227228

228229
wg.Add(1)
@@ -233,10 +234,13 @@ func (kr *KubeRouter) Run() error {
233234
klog.V(0).Info("running load balancer allocator controller")
234235
lbc, err := lballoc.NewLoadBalancerController(kr.Client, kr.Config, svcInformer)
235236
if err != nil {
236-
return errors.New("Failed to create load balancer allocator: " + err.Error())
237+
return fmt.Errorf("failed to create load balancer allocator: %v", err)
237238
}
238239

239-
svcInformer.AddEventHandler(lbc)
240+
_, err = svcInformer.AddEventHandler(lbc)
241+
if err != nil {
242+
return fmt.Errorf("failed to add ServiceEventHandler: %v", err)
243+
}
240244

241245
wg.Add(1)
242246
go lbc.Run(healthChan, stopCh, &wg)
@@ -265,7 +269,7 @@ func (kr *KubeRouter) CacheSyncOrTimeout(informerFactory informers.SharedInforme
265269

266270
select {
267271
case <-time.After(kr.Config.CacheSyncTimeout):
268-
return errors.New(kr.Config.CacheSyncTimeout.String() + " timeout")
272+
return fmt.Errorf("%s timeout", kr.Config.CacheSyncTimeout.String())
269273
case <-syncOverCh:
270274
return nil
271275
}

‎pkg/controllers/lballoc/lballoc.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ func (lbc *LoadBalancerController) runLeaderElection(ctx context.Context, isLead
169169
})
170170
}
171171

172-
func (lbc *LoadBalancerController) OnAdd(obj interface{}) {
172+
func (lbc *LoadBalancerController) OnAdd(obj interface{}, isInitialList bool) {
173173
if svc, ok := obj.(*v1core.Service); ok {
174174
lbc.addChan <- *svc
175175
}

‎pkg/controllers/lballoc/lballoc_test.go

+16-6
Original file line numberDiff line numberDiff line change
@@ -625,20 +625,29 @@ func (mf *mockInformer) AddIndexers(_ cache.Indexers) error {
625625
return nil
626626
}
627627

628-
func (mf *mockInformer) AddEventHandler(_ cache.ResourceEventHandler) {
628+
func (mf *mockInformer) AddEventHandler(_ cache.ResourceEventHandler) (cache.ResourceEventHandlerRegistration, error) {
629+
return nil, nil
629630
}
630631

631-
func (mf *mockInformer) AddEventHandlerWithResyncPeriod(_ cache.ResourceEventHandler, _ time.Duration) {
632+
func (mf *mockInformer) AddEventHandlerWithResyncPeriod(_ cache.ResourceEventHandler, _ time.Duration) (cache.ResourceEventHandlerRegistration, error) {
633+
return nil, nil
632634
}
633635

634-
func (mf *mockInformer) GetController() cache.Controller {
636+
func (mf *mockInformer) RemoveEventHandler(_ cache.ResourceEventHandlerRegistration) error {
635637
return nil
636638
}
637639

638640
func (mf *mockInformer) GetStore() cache.Store {
639641
return nil
640642
}
641643

644+
func (mf *mockInformer) GetController() cache.Controller {
645+
return nil
646+
}
647+
648+
func (mf *mockInformer) Run(_ <-chan struct{}) {
649+
}
650+
642651
func (mf *mockInformer) HasSynced() bool {
643652
return false
644653
}
@@ -647,15 +656,16 @@ func (mf *mockInformer) LastSyncResourceVersion() string {
647656
return ""
648657
}
649658

650-
func (mf *mockInformer) Run(_ <-chan struct{}) {
659+
func (mf *mockInformer) SetWatchErrorHandler(_ cache.WatchErrorHandler) error {
660+
return nil
651661
}
652662

653663
func (mf *mockInformer) SetTransform(_ cache.TransformFunc) error {
654664
return nil
655665
}
656666

657-
func (mf *mockInformer) SetWatchErrorHandler(_ cache.WatchErrorHandler) error {
658-
return nil
667+
func (mf *mockInformer) IsStopped() bool {
668+
return false
659669
}
660670

661671
func TestNewLoadBalancerController(t *testing.T) {

0 commit comments

Comments
 (0)