Apply review feedback

Signed-off-by: Borja Clemente <[email protected]>

Author: clebs

api/v1beta2/tags.go

@@ -23,7 +23,7 @@ import (
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/util/validation/field"
 
-	clusterv1beta1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
+	clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
 )
 
 // Tags defines a map of tags.
@@ -239,7 +239,7 @@ type BuildParams struct {
 
 // WithMachineName tags the namespaced machine name
 // The machine name will be tagged with key "MachineName".
-func (b BuildParams) WithMachineName(m *clusterv1beta1.Machine) BuildParams {
+func (b BuildParams) WithMachineName(m *clusterv1.Machine) BuildParams {
 	machineNamespacedName := types.NamespacedName{Namespace: m.Namespace, Name: m.Name}
 	b.Additional[MachineNameTagKey] = machineNamespacedName.String()
 	return b

controllers/awsmachine_controller.go

@@ -509,7 +509,7 @@ func (r *AWSMachineReconciler) reconcileNormal(ctx context.Context, machineScope
 		return ctrl.Result{}, nil
 	}
 
-	if !*machineScope.Cluster.Status.Initialization.InfrastructureProvisioned {
+	if !ptr.Deref(machineScope.Cluster.Status.Initialization.InfrastructureProvisioned, false) {
 		machineScope.Info("Cluster infrastructure is not ready yet")
 		v1beta1conditions.MarkFalse(machineScope.AWSMachine, infrav1.InstanceReadyCondition, infrav1.WaitingForClusterInfrastructureReason, clusterv1beta1.ConditionSeverityInfo, "")
 		return ctrl.Result{}, nil

controlplane/eks/controllers/awsmanagedcontrolplane_controller.go

@@ -314,7 +314,7 @@ func (r *AWSManagedControlPlaneReconciler) reconcileNormal(ctx context.Context,
 	// infrastructureRef and controlplaneRef.
 	if managedScope.Cluster.Spec.InfrastructureRef.Kind != awsManagedControlPlaneKind {
 		// Wait for the cluster infrastructure to be ready before creating machines
-		if !*managedScope.Cluster.Status.Initialization.InfrastructureProvisioned {
+		if !ptr.Deref(managedScope.Cluster.Status.Initialization.InfrastructureProvisioned, false) {
 			managedScope.Info("Cluster infrastructure is not ready yet")
 			return ctrl.Result{RequeueAfter: r.WaitInfraPeriod}, nil
 		}

exp/controllers/awsmachinepool_controller.go

@@ -32,6 +32,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/client-go/tools/record"
 	"k8s.io/klog/v2"
+	"k8s.io/utils/ptr"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/controller"
@@ -279,7 +280,7 @@ func (r *AWSMachinePoolReconciler) reconcileNormal(ctx context.Context, machineP
 		}
 	}
 
-	if !*machinePoolScope.Cluster.Status.Initialization.InfrastructureProvisioned {
+	if !ptr.Deref(machinePoolScope.Cluster.Status.Initialization.InfrastructureProvisioned, false) {
 		machinePoolScope.Info("Cluster infrastructure is not ready yet")
 		v1beta1conditions.MarkFalse(machinePoolScope.AWSMachinePool, expinfrav1.ASGReadyCondition, infrav1.WaitingForClusterInfrastructureReason, clusterv1beta1.ConditionSeverityInfo, "")
 		return ctrl.Result{}, nil

pkg/cloud/services/ec2/instances.go

@@ -40,7 +40,6 @@ import (
 	"sigs.k8s.io/cluster-api-provider-aws/v2/pkg/record"
 	"sigs.k8s.io/cluster-api-provider-aws/v2/pkg/utils"
 	clusterv1beta1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
-	clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
 )
 
 // GetRunningInstanceByTags returns the existing instance or nothing if it doesn't exist.
@@ -124,19 +123,6 @@ func (s *Service) CreateInstance(ctx context.Context, scope *scope.MachineScope,
 		NetworkInterfaceType: scope.AWSMachine.Spec.NetworkInterfaceType,
 	}
 
-	if err := clusterv1beta1.AddToScheme(s.scheme); err != nil {
-		return nil, fmt.Errorf("error adding clusterv1beta1 to schema for conversion: %s", err)
-	}
-	if err := clusterv1.AddToScheme(s.scheme); err != nil {
-		return nil, fmt.Errorf("error adding clusterv1 to schema for conversion: %s", err)
-	}
-
-	var v1beta1Machine clusterv1beta1.Machine
-	// Convert v1beta1 to v1beta2
-	if err := s.scheme.Convert(scope.Machine, &v1beta1Machine, nil); err != nil {
-		return nil, fmt.Errorf("error converting v1beta2.Machine to v1beta1.Machine: %s", err)
-	}
-
 	// Make sure to use the MachineScope here to get the merger of AWSCluster and AWSMachine tags
 	additionalTags := scope.AdditionalTags()
 	input.Tags = infrav1.Build(infrav1.BuildParams{
@@ -145,7 +131,7 @@ func (s *Service) CreateInstance(ctx context.Context, scope *scope.MachineScope,
 		Name:        aws.String(scope.Name()),
 		Role:        aws.String(scope.Role()),
 		Additional:  additionalTags,
-	}.WithCloudProvider(s.scope.KubernetesClusterName()).WithMachineName(&v1beta1Machine))
+	}.WithCloudProvider(s.scope.KubernetesClusterName()).WithMachineName(scope.Machine))
 
 	var err error
 

pkg/cloud/services/ec2/service.go

@@ -18,8 +18,6 @@ limitations under the License.
 package ec2
 
 import (
-	"k8s.io/apimachinery/pkg/runtime"
-
 	"sigs.k8s.io/cluster-api-provider-aws/v2/pkg/cloud/scope"
 	"sigs.k8s.io/cluster-api-provider-aws/v2/pkg/cloud/services/common"
 	"sigs.k8s.io/cluster-api-provider-aws/v2/pkg/cloud/services/network"
@@ -40,8 +38,6 @@ type Service struct {
 	// RetryEC2Client is used for dedicated host operations with enhanced retry configuration
 	// If nil, a new retry client will be created as needed
 	RetryEC2Client common.EC2API
-
-	scheme *runtime.Scheme
 }
 
 // NewService returns a new service given the ec2 api client.
@@ -51,6 +47,5 @@ func NewService(clusterScope scope.EC2Scope) *Service {
 		EC2Client:  scope.NewEC2Client(clusterScope, clusterScope, clusterScope, clusterScope.InfraCluster()),
 		SSMClient:  scope.NewSSMClient(clusterScope, clusterScope, clusterScope, clusterScope.InfraCluster()),
 		netService: network.NewService(clusterScope.(scope.NetworkScope)),
-		scheme:     runtime.NewScheme(),
 	}
 }