Revert changed public APIs and adapt internally to v1beta2

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

Author: clebs

api/v1beta1/zz_generated.conversion.go

@@ -20,7 +20,6 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 	clusterv1beta1 "sigs.k8s.io/cluster-api/api/core/v1beta1" //nolint:staticcheck
-	clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
 )
 
 const (
@@ -415,7 +414,7 @@ type AWSMachineStatus struct {
 	Interruptible bool `json:"interruptible,omitempty"`
 
 	// Addresses contains the AWS instance associated addresses.
-	Addresses []clusterv1.MachineAddress `json:"addresses,omitempty"`
+	Addresses []clusterv1beta1.MachineAddress `json:"addresses,omitempty"`
 
 	// InstanceState is the state of the AWS instance for this machine.
 	// +optional

api/v1beta2/awsmachine_types.go

@@ -23,7 +23,7 @@ import (
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/util/validation/field"
 
-	clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
+	clusterv1beta1 "sigs.k8s.io/cluster-api/api/core/v1beta1" //nolint:staticcheck
 )
 
 // Tags defines a map of tags.
@@ -78,7 +78,7 @@ func (t Tags) Validate() []*field.Error {
 	// Defines the maximum number of user tags which can be created for a specific resource
 	const maxUserTagsAllowed = 50
 	var errs field.ErrorList
-	var userTagCount = len(t)
+	userTagCount := len(t)
 	re := regexp.MustCompile(`^[a-zA-Z0-9\s\_\.\:\=\+\-\@\/]*$`)
 
 	for k, v := range t {
@@ -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 *clusterv1.Machine) BuildParams {
+func (b BuildParams) WithMachineName(m *clusterv1beta1.Machine) BuildParams {
 	machineNamespacedName := types.NamespacedName{Namespace: m.Namespace, Name: m.Name}
 	b.Additional[MachineNameTagKey] = machineNamespacedName.String()
 	return b

api/v1beta2/tags.go

@@ -21,7 +21,7 @@ import (
 
 	"k8s.io/apimachinery/pkg/util/sets"
 
-	clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
+	clusterv1beta1 "sigs.k8s.io/cluster-api/api/core/v1beta1" //nolint:staticcheck
 )
 
 const (
@@ -192,7 +192,7 @@ type Instance struct {
 	IAMProfile string `json:"iamProfile,omitempty"`
 
 	// Addresses contains the AWS instance associated addresses.
-	Addresses []clusterv1.MachineAddress `json:"addresses,omitempty"`
+	Addresses []clusterv1beta1.MachineAddress `json:"addresses,omitempty"`
 
 	// The private IPv4 address assigned to the instance.
 	PrivateIP *string `json:"privateIp,omitempty"`

api/v1beta2/types.go

@@ -16,7 +16,7 @@ limitations under the License.
 
 package v1beta1
 
-import clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
+import clusterv1beta1 "sigs.k8s.io/cluster-api/api/core/v1beta1" //nolint:staticcheck
 
 // Conditions and condition Reasons for the EKSConfig object
 // FROM: https://github.com/kubernetes-sigs/cluster-api/blob/main/bootstrap/kubeadm/api/v1beta1/condition_consts.go
@@ -27,7 +27,7 @@ const (
 	// NOTE: When the DataSecret generation starts the process completes immediately and within the
 	// same reconciliation, so the user will always see a transition from Wait to Generated without having
 	// evidence that BootstrapSecret generation is started/in progress.
-	DataSecretAvailableCondition clusterv1.ConditionType = "DataSecretAvailable"
+	DataSecretAvailableCondition clusterv1beta1.ConditionType = "DataSecretAvailable"
 
 	// DataSecretGenerationFailedReason (Severity=Warning) documents a EKSConfig controller detecting
 	// an error while generating a data secret; those kind of errors are usually due to misconfigurations

api/v1beta2/zz_generated.deepcopy.go

@@ -259,7 +259,7 @@ func (m *MachineScope) SetSecretCount(i int32) {
 }
 
 // SetAddresses sets the AWSMachine address status.
-func (m *MachineScope) SetAddresses(addrs []clusterv1.MachineAddress) {
+func (m *MachineScope) SetAddresses(addrs []clusterv1beta1.MachineAddress) {
 	m.AWSMachine.Status.Addresses = addrs
 }
 

bootstrap/eks/api/v1beta1/condition_consts.go

@@ -34,6 +34,7 @@ import (
 	"sigs.k8s.io/cluster-api-provider-aws/v2/pkg/cloud/filter"
 	"sigs.k8s.io/cluster-api-provider-aws/v2/pkg/cloud/scope"
 	"sigs.k8s.io/cluster-api-provider-aws/v2/test/mocks"
+	clusterv1beta1 "sigs.k8s.io/cluster-api/api/core/v1beta1" //nolint:staticcheck
 	clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
 )
 
@@ -419,7 +420,7 @@ func TestServiceReconcileBastion(t *testing.T) {
 				SubnetID:         "subnet-1",
 				ImageID:          "ubuntu-ami-id-latest",
 				IAMProfile:       "foo",
-				Addresses:        []clusterv1.MachineAddress{},
+				Addresses:        []clusterv1beta1.MachineAddress{},
 				AvailabilityZone: "us-east-1",
 				VolumeIDs:        []string{"volume-1"},
 			},
@@ -651,7 +652,7 @@ func TestServiceReconcileBastionUSGOV(t *testing.T) {
 				SubnetID:         "subnet-1",
 				ImageID:          "ubuntu-ami-id-latest",
 				IAMProfile:       "foo",
-				Addresses:        []clusterv1.MachineAddress{},
+				Addresses:        []clusterv1beta1.MachineAddress{},
 				AvailabilityZone: "us-gov-east-1",
 				VolumeIDs:        []string{"volume-1"},
 			},

pkg/cloud/scope/machine.go

@@ -28,6 +28,7 @@ import (
 	"github.com/aws/aws-sdk-go-v2/service/ec2"
 	"github.com/aws/aws-sdk-go-v2/service/ec2/types"
 	"github.com/pkg/errors"
+	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/utils/ptr"
 
 	infrav1 "sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
@@ -39,6 +40,7 @@ import (
 	"sigs.k8s.io/cluster-api-provider-aws/v2/pkg/cloud/services/userdata"
 	"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" //nolint:staticcheck
 	clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
 )
 
@@ -123,6 +125,20 @@ func (s *Service) CreateInstance(ctx context.Context, scope *scope.MachineScope,
 		NetworkInterfaceType: scope.AWSMachine.Spec.NetworkInterfaceType,
 	}
 
+	scheme := runtime.NewScheme()
+	if err := clusterv1beta1.AddToScheme(scheme); err != nil {
+		return nil, fmt.Errorf("error adding clusterv1beta1 to schema for conversion: %s", err)
+	}
+	if err := clusterv1.AddToScheme(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 := 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{
@@ -131,7 +147,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(scope.Machine))
+	}.WithCloudProvider(s.scope.KubernetesClusterName()).WithMachineName(&v1beta1Machine))
 
 	var err error
 
@@ -992,31 +1008,31 @@ func (s *Service) SDKToInstance(v types.Instance) (*infrav1.Instance, error) {
 	return i, nil
 }
 
-func (s *Service) getInstanceAddresses(instance types.Instance) []clusterv1.MachineAddress {
-	addresses := []clusterv1.MachineAddress{}
+func (s *Service) getInstanceAddresses(instance types.Instance) []clusterv1beta1.MachineAddress {
+	addresses := []clusterv1beta1.MachineAddress{}
 	// Check if the DHCP Option Set has domain name set
 	domainName := s.GetDHCPOptionSetDomainName(s.EC2Client, instance.VpcId)
 	for _, eni := range instance.NetworkInterfaces {
 		if addr := aws.ToString(eni.PrivateDnsName); addr != "" {
-			privateDNSAddress := clusterv1.MachineAddress{
-				Type:    clusterv1.MachineInternalDNS,
+			privateDNSAddress := clusterv1beta1.MachineAddress{
+				Type:    clusterv1beta1.MachineInternalDNS,
 				Address: addr,
 			}
 			addresses = append(addresses, privateDNSAddress)
 
 			if domainName != nil {
 				// Add secondary private DNS Name with domain name set in DHCP Option Set
-				additionalPrivateDNSAddress := clusterv1.MachineAddress{
-					Type:    clusterv1.MachineInternalDNS,
+				additionalPrivateDNSAddress := clusterv1beta1.MachineAddress{
+					Type:    clusterv1beta1.MachineInternalDNS,
 					Address: fmt.Sprintf("%s.%s", strings.Split(privateDNSAddress.Address, ".")[0], *domainName),
 				}
 				addresses = append(addresses, additionalPrivateDNSAddress)
 			}
 		}
 
 		if addr := aws.ToString(eni.PrivateIpAddress); addr != "" {
-			privateIPAddress := clusterv1.MachineAddress{
-				Type:    clusterv1.MachineInternalIP,
+			privateIPAddress := clusterv1beta1.MachineAddress{
+				Type:    clusterv1beta1.MachineInternalIP,
 				Address: addr,
 			}
 			addresses = append(addresses, privateIPAddress)
@@ -1025,16 +1041,16 @@ func (s *Service) getInstanceAddresses(instance types.Instance) []clusterv1.Mach
 		// An elastic IP is attached if association is non nil pointer
 		if eni.Association != nil {
 			if addr := aws.ToString(eni.Association.PublicDnsName); addr != "" {
-				publicDNSAddress := clusterv1.MachineAddress{
-					Type:    clusterv1.MachineExternalDNS,
+				publicDNSAddress := clusterv1beta1.MachineAddress{
+					Type:    clusterv1beta1.MachineExternalDNS,
 					Address: addr,
 				}
 				addresses = append(addresses, publicDNSAddress)
 			}
 
 			if addr := aws.ToString(eni.Association.PublicIp); addr != "" {
-				publicIPAddress := clusterv1.MachineAddress{
-					Type:    clusterv1.MachineExternalIP,
+				publicIPAddress := clusterv1beta1.MachineAddress{
+					Type:    clusterv1beta1.MachineExternalIP,
 					Address: addr,
 				}
 				addresses = append(addresses, publicIPAddress)

pkg/cloud/services/ec2/bastion_test.go

@@ -43,6 +43,7 @@ import (
 	"sigs.k8s.io/cluster-api-provider-aws/v2/pkg/cloud/scope"
 	"sigs.k8s.io/cluster-api-provider-aws/v2/pkg/cloud/services/userdata"
 	"sigs.k8s.io/cluster-api-provider-aws/v2/test/mocks"
+	clusterv1beta1 "sigs.k8s.io/cluster-api/api/core/v1beta1" //nolint:staticcheck
 	clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
 )
 
@@ -5321,11 +5322,11 @@ func TestCreateInstance(t *testing.T) {
 				g.Expect(len(instance.Addresses)).To(Equal(3))
 
 				for _, address := range instance.Addresses {
-					if address.Type == clusterv1.MachineInternalIP {
+					if address.Type == clusterv1beta1.MachineInternalIP {
 						g.Expect(address.Address).To(Equal("192.168.1.10"))
 					}
 
-					if address.Type == clusterv1.MachineInternalDNS {
+					if address.Type == clusterv1beta1.MachineInternalDNS {
 						g.Expect(address.Address).To(Or(Equal("ip-192-168-1-10.ec2.internal"), Equal("ip-192-168-1-10.example.com")))
 					}
 				}