delint

Author: wikkyk

api/v1alpha2/groupversion_info.go

@@ -27,10 +27,10 @@ import (
 )
 
 var (
-	// GroupVersion is group version used to register these objects
+	// GroupVersion is group version used to register these objects.
 	GroupVersion = schema.GroupVersion{Group: "infrastructure.cluster.x-k8s.io", Version: "v1alpha2"}
 
-	// SchemeBuilder is used to add go types to the GroupVersionKind scheme
+	// SchemeBuilder is used to add go types to the GroupVersionKind scheme.
 	SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}
 
 	// AddToScheme adds the types in this group-version to the given scheme.

api/v1alpha2/proxmoxmachine_types.go

@@ -490,8 +490,8 @@ type ProxmoxMachineStatus struct {
 	Conditions clusterv1.Conditions `json:"conditions,omitempty"`
 }
 
-// TODO: Unfuck machine status
 // IPAddresses stores the IP addresses of a network interface. Used for status
+// TODO: Unfuck machine status
 type IPAddresses struct {
 	// IPV4 is the IPv4 address.
 	// +optional

internal/controller/suite_test.go

@@ -30,6 +30,7 @@ import (
 
 	"github.com/ionos-cloud/cluster-api-provider-proxmox/pkg/proxmox/proxmoxtest"
 	"github.com/ionos-cloud/cluster-api-provider-proxmox/test/helpers"
+
 	// +kubebuilder:scaffold:imports
 
 	ipamv1 "sigs.k8s.io/cluster-api/exp/ipam/api/v1beta1"

internal/service/vmservice/ip.go

@@ -67,17 +67,15 @@ func reconcileIPAddresses(ctx context.Context, machineScope *scope.MachineScope)
 
 	// update the status.IpAddr.
 
-	// TODO: Unfuck
-	statusAddresses := make(map[string]*infrav1alpha2.IPAddresses)
-
+	statusAddresses := make(map[string]*infrav1alpha2.IPAddresses, len(addresses))
 	for k, v := range addresses {
 		if _, e := statusAddresses[k]; !e {
 			statusAddresses[k] = new(infrav1alpha2.IPAddresses)
 		}
-		if strings.Contains("::", v) {
-			statusAddresses[k].IPV6 = append(statusAddresses[k].IPV6, v)
-		} else {
+		if isIPV4(v) {
 			statusAddresses[k].IPV4 = append(statusAddresses[k].IPV4, v)
+		} else {
+			statusAddresses[k].IPV6 = append(statusAddresses[k].IPV6, v)
 		}
 	}
 	machineScope.Logger.V(4).Info("updating ProxmoxMachine.status.ipAddresses.")
@@ -94,7 +92,7 @@ func findIPAddress(ctx context.Context, machineScope *scope.MachineScope, device
 	return machineScope.IPAMHelper.GetIPAddress(ctx, key)
 }
 
-// findIPAddressesByPool attempts to return all ip addresses belonging to a device
+// findIPAddressesByPool attempts to return all ip addresses belonging to a device.
 func findIPAddressesByPool(ctx context.Context, machineScope *scope.MachineScope, device string, poolRef corev1.TypedLocalObjectReference) ([]ipamv1.IPAddress, error) {
 	addresses, err := machineScope.IPAMHelper.GetIPAddressByPool(ctx, poolRef)
 	if err != nil {

pkg/kubernetes/ipam/ipam.go

@@ -39,6 +39,11 @@ import (
 	infrav1 "github.com/ionos-cloud/cluster-api-provider-proxmox/api/v1alpha2"
 )
 
+const (
+	globalInClusterIPPool = "GlobalInClusterIPPool"
+	inClusterIPPool       = "InClusterIPPool"
+)
+
 // Helper provides handling of ipam objects such as, InClusterPool, IPAddressClaim.
 type Helper struct {
 	ctrlClient client.Client
@@ -200,13 +205,13 @@ func (h *Helper) GetIPPoolAnnotations(ctx context.Context, ipAddress *ipamv1.IPA
 		Name: poolRef.Name,
 	}
 
-	if poolRef.Kind == "InClusterIPPool" {
+	if poolRef.Kind == inClusterIPPool {
 		ipPool, err := h.GetInClusterIPPool(ctx, key)
 		annotations = ipPool.ObjectMeta.Annotations
 		if err != nil {
 			return nil, err
 		}
-	} else if poolRef.Kind == "GlobalInClusterIPPool" {
+	} else if poolRef.Kind == globalInClusterIPPool {
 		ipPool, err := h.GetGlobalInClusterIPPool(ctx, key)
 		annotations = ipPool.ObjectMeta.Annotations
 		if err != nil {
@@ -240,7 +245,7 @@ func (h *Helper) CreateIPAddressClaim(ctx context.Context, owner client.Object,
 		if err != nil {
 			return err
 		}
-	case ref.Kind == "InClusterIPPool":
+	case ref.Kind == inClusterIPPool:
 		pool, err := h.GetInClusterIPPool(ctx, ref)
 		if err != nil {
 			return errors.Wrapf(err, "unable to find inclusterpool for cluster %s", h.cluster.Name)
@@ -250,7 +255,7 @@ func (h *Helper) CreateIPAddressClaim(ctx context.Context, owner client.Object,
 		if err != nil {
 			return err
 		}
-	case ref.Kind == "GlobalInClusterIPPool":
+	case ref.Kind == globalInClusterIPPool:
 		pool, err := h.GetGlobalInClusterIPPool(ctx, ref)
 		if err != nil {
 			return errors.Wrapf(err, "unable to find global inclusterpool for cluster %s", h.cluster.Name)
@@ -302,7 +307,7 @@ func (h *Helper) CreateIPAddressClaimV2(ctx context.Context, owner client.Object
 	suffix := infrav1.DefaultSuffix
 
 	switch {
-	case ref.Kind == "InClusterIPPool":
+	case ref.Kind == inClusterIPPool:
 		pool, err := h.GetInClusterIPPool(ctx, ref)
 		if err != nil {
 			return errors.Wrapf(err, "unable to find inclusterpool for cluster %s", h.cluster.Name)
@@ -312,7 +317,7 @@ func (h *Helper) CreateIPAddressClaimV2(ctx context.Context, owner client.Object
 		if err != nil {
 			return err
 		}
-	case ref.Kind == "GlobalInClusterIPPool":
+	case ref.Kind == globalInClusterIPPool:
 		pool, err := h.GetGlobalInClusterIPPool(ctx, ref)
 		if err != nil {
 			return errors.Wrapf(err, "unable to find global inclusterpool for cluster %s", h.cluster.Name)
@@ -368,9 +373,8 @@ func (h *Helper) GetIPAddress(ctx context.Context, key client.ObjectKey) (*ipamv
 // GetIPAddressByPool attempts to retrieve all IPAddresses belonging to a pool
 func (h *Helper) GetIPAddressByPool(ctx context.Context, poolRef corev1.TypedLocalObjectReference) ([]ipamv1.IPAddress, error) {
 	addresses := &ipamv1.IPAddressList{}
-	var out []ipamv1.IPAddress
 
-	//fieldSelector, err := fields.ParseSelector("spec.poolRef.name=" + poolRef.Name + ",spec.poolRef.kind=" + poolRef.Kind)
+	// fieldSelector, err := fields.ParseSelector("spec.poolRef.name=" + poolRef.Name + ",spec.poolRef.kind=" + poolRef.Kind)
 	fieldSelector, err := fields.ParseSelector("spec.poolRef.name=" + poolRef.Name)
 	if err != nil {
 		return nil, err
@@ -383,6 +387,7 @@ func (h *Helper) GetIPAddressByPool(ctx context.Context, poolRef corev1.TypedLoc
 		return nil, err
 	}
 
+	out := make([]ipamv1.IPAddress, 0, len(addresses.Items))
 	for _, addr := range addresses.Items {
 		groupVersion, _ := schema.ParseGroupVersion(addr.APIVersion)
 		if groupVersion.Group != "ipam.cluster.x-k8s.io" {