Linter fixes

Author: wnagele

internal/cniconfig/cniconfig.go

@@ -49,11 +49,11 @@ type Address struct {
 }
 
 func CNIConfigForVPCAttachment(vpc galacticv1alpha.VPC, vpcAttachment galacticv1alpha.VPCAttachment) (NetConfList, error) {
-	var terminations []Termination
-	var addresses []Address
-	var routes []Route
+	terminations := make([]Termination, 0, 10)
+	addresses := make([]Address, 0, 10)
+	routes := make([]Route, 0, 10)
 
-	var netAddresses []net.IP // to check if a route is local
+	netAddresses := make([]net.IP, 0, 10) // to check if a route is local
 
 	for _, address := range vpcAttachment.Spec.Interface.Addresses {
 		netAddress, network, err := net.ParseCIDR(address)

internal/controller/vpcattachment_controller.go

@@ -84,8 +84,8 @@ func (r *VPCAttachmentReconciler) Reconcile(ctx context.Context, req ctrl.Reques
 
 	nad := &nadv1.NetworkAttachmentDefinition{
 		ObjectMeta: metav1.ObjectMeta{
-			Name:      vpcAttachment.ObjectMeta.Name,
-			Namespace: vpcAttachment.ObjectMeta.Namespace,
+			Name:      vpcAttachment.Name,
+			Namespace: vpcAttachment.Namespace,
 		},
 		Spec: nadv1.NetworkAttachmentDefinitionSpec{
 			Config: string(cniPluginConfigJson),
@@ -112,8 +112,8 @@ func vpcAttachmentsToIdentifiers(vpc galacticv1alpha.VPC, vpcAttachments galacti
 	identifiers := make([]string, 0, len(vpcAttachments.Items))
 	for _, vpcAttachment := range vpcAttachments.Items {
 		if vpcAttachment.Status.Identifier != "" &&
-			vpcAttachment.Spec.VPC.Name == vpc.ObjectMeta.Name &&
-			vpcAttachment.Spec.VPC.Namespace == vpc.ObjectMeta.Namespace {
+			vpcAttachment.Spec.VPC.Name == vpc.Name &&
+			vpcAttachment.Spec.VPC.Namespace == vpc.Namespace {
 			identifiers = append(identifiers, vpcAttachment.Status.Identifier)
 		}
 	}

internal/controller/vpcattachment_controller_test.go

@@ -110,6 +110,7 @@ var _ = Describe("VPCAttachment Controller", func() {
 			_, err := vpcControllerReconciler.Reconcile(ctx, reconcile.Request{
 				NamespacedName: vpcTypeNamespacedName,
 			})
+			Expect(err).NotTo(HaveOccurred())
 			vpcAttachmentControllerReconciler := &VPCAttachmentReconciler{
 				Client:     k8sClient,
 				Scheme:     k8sClient.Scheme(),

internal/webhook/v1/pod_webhook.go

@@ -106,13 +106,13 @@ func (v *PodCustomValidator) ValidateDelete(ctx context.Context, obj runtime.Obj
 	return nil, nil
 }
 
-func vpcAttachmentByName(client client.Client, ctx context.Context, name, namespace string) (*galacticv1alpha.VPCAttachment, error) {
+func vpcAttachmentByName(k8sClient client.Client, ctx context.Context, name, namespace string) (*galacticv1alpha.VPCAttachment, error) {
 	typeNamespacedName := types.NamespacedName{
 		Name:      name,
 		Namespace: namespace,
 	}
 	var vpcAttachment galacticv1alpha.VPCAttachment
-	if err := client.Get(ctx, typeNamespacedName, &vpcAttachment); err != nil {
+	if err := k8sClient.Get(ctx, typeNamespacedName, &vpcAttachment); err != nil {
 		return nil, err
 	}
 	return &vpcAttachment, nil