Merge pull request #43 from GDATASoftwareAG/cleanup-code

cleanup code

Author: farodin91

main.go

@@ -2,9 +2,7 @@ package main
 
 import (
 	"fmt"
-	"math/rand"
 	"os"
-	"time"
 
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
@@ -29,16 +27,14 @@ const AppName string = "ionoscloud-cloud-controller-manager"
 var version string
 
 func main() {
-	rand.Seed(time.Now().UTC().UnixNano())
-
 	ccmOptions, err := options.NewCloudControllerManagerOptions()
 	if err != nil {
 		klog.Fatalf("unable to initialize command options: %v", err)
 	}
 
 	command := &cobra.Command{
 		Use:  AppName,
-		Long: fmt.Sprintf("%s manages vSphere cloud resources for a Kubernetes cluster.", AppName),
+		Long: fmt.Sprintf("%s manages ionos cloud resources for a Kubernetes cluster.", AppName),
 		Args: func(cmd *cobra.Command, args []string) error {
 			for _, arg := range args {
 				if len(arg) > 0 {

pkg/client/client.go

@@ -195,16 +195,15 @@ func (a *IONOSClient) GetServerByIP(ctx context.Context, loadBalancerIP string)
 	}
 
 	for _, server := range *servers.Items {
-		klog.Infof("Checking server %s", server.Properties.Name)
+		klog.Infof("checking server %s and looking for loadbalancer ip %s", *server.Properties.Name, loadBalancerIP)
 		if !server.Entities.HasNics() {
 			continue
 		}
 		for _, nic := range *server.Entities.Nics.Items {
 			if nic.Properties.HasIps() {
 				for _, ip := range *nic.Properties.Ips {
-					klog.Infof("Found ip  %s", ip)
+					klog.Infof("found ip %s", ip)
 					if loadBalancerIP == ip {
-						klog.Info("Its a match!")
 						return &Server{
 							Name:         *server.Properties.Name,
 							ProviderID:   *server.Id,
@@ -248,14 +247,14 @@ func (a *IONOSClient) convertServerToInstanceMetadata(ctx context.Context, serve
 	}
 
 	var addresses []v1.NodeAddress
-	klog.Infof("Found %v nics", len(*server.Entities.Nics.Items))
+	klog.Infof("found %v nics", len(*server.Entities.Nics.Items))
 	for _, nic := range *server.Entities.Nics.Items {
 		ips := *nic.Properties.Ips
 		nicName := "unknown"
 		if nic.Properties.Name != nil {
 			nicName = *nic.Properties.Name
 		}
-		klog.Infof("Found %v ips for nic %s. Only using the first one as the remaining ones are failover ips", len(ips), nicName)
+		klog.Infof("found %v ips for nic %s. Only using the first one as the remaining ones are failover ips", len(ips), nicName)
 		if len(ips) > 0 {
 			ipStr := ips[0]
 			ip := net.ParseIP(ipStr)
@@ -282,8 +281,6 @@ func (a *IONOSClient) convertServerToInstanceMetadata(ctx context.Context, serve
 		Zone:          *server.Properties.AvailabilityZone,
 		Region:        strings.Replace(location, "/", "-", 1),
 	}
-
-	klog.InfoDepth(1, metadata)
 	return metadata, err
 }
 

pkg/config/types.go

@@ -3,10 +3,10 @@ package config
 const (
 	// RegisteredProviderName is the name of the cloud provider registered with
 	// Kubernetes.
-	RegisteredProviderName string = "ionos"
-	ProviderPrefix                = "ionos://"
+	RegisteredProviderName = "ionos"
+	ProviderPrefix         = "ionos://"
 	// ClientName is the user agent passed into the controller client builder.
-	ClientName string = "ionoscloud-cloud-controller-manager"
+	ClientName = "ionoscloud-cloud-controller-manager"
 )
 
 type Config struct {

pkg/ionos/cloud.go

@@ -4,6 +4,8 @@ import (
 	"context"
 	"encoding/json"
 	"io"
+	"math/rand"
+	"time"
 
 	client2 "github.com/GDATASoftwareAG/cloud-provider-ionoscloud/pkg/client"
 	"github.com/GDATASoftwareAG/cloud-provider-ionoscloud/pkg/config"
@@ -15,6 +17,7 @@ import (
 
 func init() {
 	cloudprovider.RegisterCloudProvider(config.RegisteredProviderName, func(cfg io.Reader) (cloudprovider.Interface, error) {
+		r := rand.New(rand.NewSource(time.Now().UnixNano()))
 		byConfig, err := io.ReadAll(cfg)
 		if err != nil {
 			klog.Errorf("ReadAll failed: %s", err)
@@ -26,19 +29,20 @@ func init() {
 			return nil, err
 		}
 
-		return newProvider(conf), nil
+		return newProvider(conf, r), nil
 	})
 }
 
 var _ cloudprovider.Interface = &IONOS{}
 
-func newProvider(config config.Config) cloudprovider.Interface {
+func newProvider(config config.Config, r *rand.Rand) cloudprovider.Interface {
 	return IONOS{
 		config: config,
 		instances: instances{
 			ionosClients: map[string]*client2.IONOSClient{},
 		},
 		loadbalancer: loadbalancer{
+			r:            r,
 			ionosClients: map[string]*client2.IONOSClient{},
 		},
 	}

pkg/ionos/instances.go

@@ -48,7 +48,7 @@ func (i instances) discoverNode(ctx context.Context, node *v1.Node) (*cloudprovi
 			server, err = client.GetServerByName(ctx, node.Name)
 		}
 		if err != nil {
-			return nil, errors.New(fmt.Sprintf("failed to discoverNode %v", err))
+			return nil, fmt.Errorf("failed to discoverNode %v", err)
 		}
 		if server == nil {
 			continue

pkg/ionos/loadbalancer.go

@@ -3,9 +3,7 @@ package ionos
 import (
 	"context"
 	"errors"
-	"math/rand"
 	"strings"
-	"time"
 
 	v1 "k8s.io/api/core/v1"
 	cloudprovider "k8s.io/cloud-provider"
@@ -36,7 +34,7 @@ func (l loadbalancer) AddClient(datacenterId string, token []byte) error {
 // For the given LB service, the GetLoadBalancer must return "exists=True" if
 // there exists a LoadBalancer instance created by ServiceController.
 // In all other cases, GetLoadBalancer must return a NotFound error.
-func (l loadbalancer) GetLoadBalancer(ctx context.Context, clusterName string, service *v1.Service) (status *v1.LoadBalancerStatus, exists bool, err error) {
+func (l loadbalancer) GetLoadBalancer(ctx context.Context, _ string, service *v1.Service) (status *v1.LoadBalancerStatus, exists bool, err error) {
 	klog.Infof("getLoadBalancer (service %s/%s)", service.Namespace, service.Name)
 
 	server, err := l.ServerWithLoadBalancer(ctx, service.Spec.LoadBalancerIP)
@@ -53,7 +51,7 @@ func (l loadbalancer) GetLoadBalancer(ctx context.Context, clusterName string, s
 
 // GetLoadBalancerName returns the name of the load balancer. Implementations must treat the
 // *v1.Service parameter as read-only and not modify it.
-func (l loadbalancer) GetLoadBalancerName(ctx context.Context, clusterName string, service *v1.Service) string {
+func (l loadbalancer) GetLoadBalancerName(_ context.Context, _ string, service *v1.Service) string {
 	return cloudprovider.DefaultLoadBalancerName(service)
 }
 
@@ -90,7 +88,7 @@ func (l loadbalancer) UpdateLoadBalancer(ctx context.Context, clusterName string
 // Parameter 'clusterName' is the name of the cluster as presented to kube-controller-manager
 // EnsureLoadBalancerDeleted must not return ImplementedElsewhere to ensure
 // proper teardown of resources that were allocated by the ServiceController.
-func (l loadbalancer) EnsureLoadBalancerDeleted(ctx context.Context, clusterName string, service *v1.Service) error {
+func (l loadbalancer) EnsureLoadBalancerDeleted(ctx context.Context, _ string, service *v1.Service) error {
 	klog.Infof("ensureLoadBalancerDeleted (service %s/%s)", service.Namespace, service.Name)
 
 	if len(service.Status.LoadBalancer.Ingress) > 0 {
@@ -130,7 +128,7 @@ func (l loadbalancer) deleteLoadBalancerFromNode(ctx context.Context, loadBalanc
 	return nil
 }
 
-func (l loadbalancer) syncLoadBalancer(ctx context.Context, clusterName string, service *v1.Service, nodes []*v1.Node) (*v1.LoadBalancerStatus, error) {
+func (l loadbalancer) syncLoadBalancer(ctx context.Context, _ string, service *v1.Service, nodes []*v1.Node) (*v1.LoadBalancerStatus, error) {
 	klog.Infof("syncLoadBalancer (service %s/%s, nodes %s)", service.Namespace, service.Name, nodes)
 
 	if len(service.Status.LoadBalancer.Ingress) > 0 && service.Status.LoadBalancer.Ingress[0].IP != service.Spec.LoadBalancerIP {
@@ -192,7 +190,7 @@ func (l loadbalancer) syncLoadBalancer(ctx context.Context, clusterName string,
 		}
 	}
 
-	klog.Infof("Could not attach ip %s to any node", service.Spec.LoadBalancerIP)
+	klog.Infof("could not attach ip %s to any node", service.Spec.LoadBalancerIP)
 	return nil, nil
 }
 
@@ -215,8 +213,7 @@ func (l loadbalancer) GetLoadBalancerNode(nodes []*v1.Node) *v1.Node {
 	if candidates == nil && len(candidates) == 0 {
 		return nil
 	}
-	rand.Seed(time.Now().UnixNano())
-	randomIndex := rand.Intn(len(candidates))
+	randomIndex := l.r.Intn(len(candidates))
 	return candidates[randomIndex]
 }
 

pkg/ionos/types.go

@@ -1,6 +1,8 @@
 package ionos
 
 import (
+	"math/rand"
+
 	"github.com/GDATASoftwareAG/cloud-provider-ionoscloud/pkg/client"
 	"github.com/GDATASoftwareAG/cloud-provider-ionoscloud/pkg/config"
 )
@@ -9,13 +11,13 @@ type IONOS struct {
 	config       config.Config
 	instances    instances
 	loadbalancer loadbalancer
-	client       *client.IONOSClient
 }
 
 type instances struct {
 	ionosClients map[string]*client.IONOSClient
 }
 
 type loadbalancer struct {
+	r            *rand.Rand
 	ionosClients map[string]*client.IONOSClient
 }