From d550079c4e6c0f508855215edf10e9b8670c461d Mon Sep 17 00:00:00 2001 From: Andrei Kvapil Date: Mon, 7 Oct 2024 16:21:10 +0200 Subject: [PATCH] Fix lint Signed-off-by: Andrei Kvapil --- cmd/kubevirt-cloud-controller-manager/kubevirteps.go | 4 +--- cmd/kubevirt-cloud-controller-manager/main.go | 4 +++- pkg/controller/kubevirteps/kubevirteps_controller.go | 9 ++++++--- .../kubevirteps/kubevirteps_controller_test.go | 11 ++++++----- .../kubevirteps/kubevirteps_controller_utils.go | 3 ++- 5 files changed, 18 insertions(+), 13 deletions(-) diff --git a/cmd/kubevirt-cloud-controller-manager/kubevirteps.go b/cmd/kubevirt-cloud-controller-manager/kubevirteps.go index f8a5999b9..74166b5d9 100644 --- a/cmd/kubevirt-cloud-controller-manager/kubevirteps.go +++ b/cmd/kubevirt-cloud-controller-manager/kubevirteps.go @@ -20,13 +20,11 @@ import ( func StartKubevirtCloudControllerWrapper(initContext app.ControllerInitContext, completedConfig *config.CompletedConfig, cloud cloudprovider.Interface) app.InitFunc { return func(ctx context.Context, controllerContext genericcontrollermanager.ControllerContext) (controller.Interface, bool, error) { - return startKubevirtCloudController(ctx, initContext, controllerContext, completedConfig, cloud) + return startKubevirtCloudController(controllerContext, completedConfig, cloud) } } func startKubevirtCloudController( - ctx context.Context, - initContext app.ControllerInitContext, controllerContext genericcontrollermanager.ControllerContext, ccmConfig *config.CompletedConfig, cloud cloudprovider.Interface) (controller.Interface, bool, error) { diff --git a/cmd/kubevirt-cloud-controller-manager/main.go b/cmd/kubevirt-cloud-controller-manager/main.go index 3f91c4cd0..22efe0f4b 100644 --- a/cmd/kubevirt-cloud-controller-manager/main.go +++ b/cmd/kubevirt-cloud-controller-manager/main.go @@ -35,6 +35,8 @@ import ( _ "k8s.io/component-base/metrics/prometheus/clientgo" // load all the prometheus client-go plugins _ "k8s.io/component-base/metrics/prometheus/version" // for version metric registration "k8s.io/klog/v2" + + _ "kubevirt.io/cloud-provider-kubevirt/pkg/provider" ) func main() { @@ -51,7 +53,7 @@ func main() { Constructor: StartKubevirtCloudControllerWrapper, } - command := app.NewCloudControllerManagerCommand(ccmOptions, cloudInitializer, controllerInitializers, fss, wait.NeverStop) + command := app.NewCloudControllerManagerCommand(ccmOptions, cloudInitializer, controllerInitializers, map[string]string{}, fss, wait.NeverStop) code := cli.Run(command) os.Exit(code) } diff --git a/pkg/controller/kubevirteps/kubevirteps_controller.go b/pkg/controller/kubevirteps/kubevirteps_controller.go index 4dabf238b..a3c1aa338 100644 --- a/pkg/controller/kubevirteps/kubevirteps_controller.go +++ b/pkg/controller/kubevirteps/kubevirteps_controller.go @@ -150,7 +150,8 @@ func (c *Controller) Init() error { eps := obj.(*discovery.EndpointSlice) if c.tenantEPSTracker.contains(eps) { klog.Infof("get Infra Service for Tenant EndpointSlice: %v/%v", eps.Namespace, eps.Name) - infraSvc, err := c.getInfraServiceFromTenantEPS(context.TODO(), eps) + var infraSvc *v1.Service + infraSvc, err = c.getInfraServiceFromTenantEPS(context.TODO(), eps) if err != nil { klog.Errorf("Failed to get Service in Infra cluster for EndpointSlice %s/%s: %v", eps.Namespace, eps.Name, err) return @@ -163,7 +164,8 @@ func (c *Controller) Init() error { eps := newObj.(*discovery.EndpointSlice) if c.tenantEPSTracker.contains(eps) { klog.Infof("get Infra Service for Tenant EndpointSlice: %v/%v", eps.Namespace, eps.Name) - infraSvc, err := c.getInfraServiceFromTenantEPS(context.TODO(), eps) + var infraSvc *v1.Service + infraSvc, err = c.getInfraServiceFromTenantEPS(context.TODO(), eps) if err != nil { klog.Errorf("Failed to get Service in Infra cluster for EndpointSlice %s/%s: %v", eps.Namespace, eps.Name, err) return @@ -177,7 +179,8 @@ func (c *Controller) Init() error { if c.tenantEPSTracker.contains(eps) { c.tenantEPSTracker.remove(eps) klog.Infof("get Infra Service for Tenant EndpointSlice: %v/%v", eps.Namespace, eps.Name) - infraSvc, err := c.getInfraServiceFromTenantEPS(context.TODO(), eps) + var infraSvc *v1.Service + infraSvc, err = c.getInfraServiceFromTenantEPS(context.TODO(), eps) if err != nil { klog.Errorf("Failed to get Service in Infra cluster for EndpointSlice %s/%s: %v", eps.Namespace, eps.Name, err) return diff --git a/pkg/controller/kubevirteps/kubevirteps_controller_test.go b/pkg/controller/kubevirteps/kubevirteps_controller_test.go index 23b38d369..99664b903 100644 --- a/pkg/controller/kubevirteps/kubevirteps_controller_test.go +++ b/pkg/controller/kubevirteps/kubevirteps_controller_test.go @@ -1,3 +1,4 @@ +//nolint:unparam package kubevirteps import ( @@ -172,7 +173,7 @@ func createAndAssertInfraServiceLB(name, tenantServiceName, clusterName string, }).Should(BeTrue(), "") } -func setupTestKubevirtEPSController(ctx context.Context) *testKubevirtEPSController { +func setupTestKubevirtEPSController() *testKubevirtEPSController { var tenantClient *fake.Clientset var infraClient *fake.Clientset @@ -181,7 +182,7 @@ func setupTestKubevirtEPSController(ctx context.Context) *testKubevirtEPSControl s := runtime.NewScheme() infraDynamic := dfake.NewSimpleDynamicClientWithCustomListKinds(s, map[schema.GroupVersionResource]string{ - schema.GroupVersionResource{ + { Group: kubevirtv1.GroupVersion.Group, Version: kubevirtv1.GroupVersion.Version, Resource: "virtualmachineinstances", @@ -215,7 +216,7 @@ var _ = g.Describe("KubevirtEPSController start", g.Ordered, func() { g.It("Should start the controller", func() { ctx, stop := context.WithCancel(context.Background()) defer stop() - testVals := setupTestKubevirtEPSController(ctx) + testVals = setupTestKubevirtEPSController() testVals.runKubevirtEPSController(ctx) }) }) @@ -233,7 +234,7 @@ var _ = g.Describe("KubevirtEPSController", g.Ordered, func() { g.It("Should start the controller", func() { ctx, stop = context.WithCancel(context.Background()) defer stop() - testVals := setupTestKubevirtEPSController(ctx) + testVals = setupTestKubevirtEPSController() testVals.runKubevirtEPSController(ctx) cache.WaitForCacheSync(ctx.Done(), @@ -246,7 +247,7 @@ var _ = g.Describe("KubevirtEPSController", g.Ordered, func() { // Startup and wait for cache sync g.BeforeEach(func() { ctx, stop = context.WithCancel(context.Background()) - testVals = setupTestKubevirtEPSController(ctx) + testVals = setupTestKubevirtEPSController() testVals.runKubevirtEPSController(ctx) cache.WaitForCacheSync(ctx.Done(), diff --git a/pkg/controller/kubevirteps/kubevirteps_controller_utils.go b/pkg/controller/kubevirteps/kubevirteps_controller_utils.go index 0d3dbfd5e..385128521 100644 --- a/pkg/controller/kubevirteps/kubevirteps_controller_utils.go +++ b/pkg/controller/kubevirteps/kubevirteps_controller_utils.go @@ -1,13 +1,14 @@ package kubevirteps import ( + "sync" + v1 "k8s.io/api/core/v1" discovery "k8s.io/api/discovery/v1" "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/klog/v2" utilnet "k8s.io/utils/net" - "sync" ) // source: https://github.com/kubernetes/endpointslice/blob/master/utils.go#L280