Added the capacity reservation id

Thirumalesh Aaraveti · Thirumalesh Aaraveti · commit 5e44fa5724b0 · 2024-07-17T04:09:34.000+05:30
Removed the tests by verify-gen
diff --git a/api/v1beta1/awscluster_conversion.go b/api/v1beta1/awscluster_conversion.go
@@ -59,6 +59,7 @@ func (src *AWSCluster) ConvertTo(dstRaw conversion.Hub) error {
 		dst.Status.Bastion.PlacementGroupPartition = restored.Status.Bastion.PlacementGroupPartition
 		dst.Status.Bastion.PrivateDNSName = restored.Status.Bastion.PrivateDNSName
 		dst.Status.Bastion.PublicIPOnLaunch = restored.Status.Bastion.PublicIPOnLaunch
+		dst.Status.Bastion.CapacityReservationID = restored.Status.Bastion.CapacityReservationID
 	}
 	dst.Spec.Partition = restored.Spec.Partition
 
diff --git a/api/v1beta1/awsmachine_conversion.go b/api/v1beta1/awsmachine_conversion.go
@@ -41,6 +41,7 @@ func (src *AWSMachine) ConvertTo(dstRaw conversion.Hub) error {
 	dst.Spec.PlacementGroupPartition = restored.Spec.PlacementGroupPartition
 	dst.Spec.PrivateDNSName = restored.Spec.PrivateDNSName
 	dst.Spec.SecurityGroupOverrides = restored.Spec.SecurityGroupOverrides
+	dst.Spec.CapacityReservationID = restored.Spec.CapacityReservationID
 	if restored.Spec.ElasticIPPool != nil {
 		if dst.Spec.ElasticIPPool == nil {
 			dst.Spec.ElasticIPPool = &infrav1.ElasticIPPool{}
@@ -102,6 +103,7 @@ func (r *AWSMachineTemplate) ConvertTo(dstRaw conversion.Hub) error {
 	dst.Spec.Template.Spec.PlacementGroupPartition = restored.Spec.Template.Spec.PlacementGroupPartition
 	dst.Spec.Template.Spec.PrivateDNSName = restored.Spec.Template.Spec.PrivateDNSName
 	dst.Spec.Template.Spec.SecurityGroupOverrides = restored.Spec.Template.Spec.SecurityGroupOverrides
+	dst.Spec.Template.Spec.CapacityReservationID = restored.Spec.Template.Spec.CapacityReservationID
 	if restored.Spec.Template.Spec.ElasticIPPool != nil {
 		if dst.Spec.Template.Spec.ElasticIPPool == nil {
 			dst.Spec.Template.Spec.ElasticIPPool = &infrav1.ElasticIPPool{}
diff --git a/api/v1beta2/awsmachine_types.go b/api/v1beta2/awsmachine_types.go
@@ -194,10 +194,9 @@ type AWSMachineSpec struct {
 	// +optional
 	PrivateDNSName *PrivateDNSName `json:"privateDnsName,omitempty"`
 
-	// CapacityReservationID specifies the instance that should be launched in the
-	// reserved compute capacity.
+	// CapacityReservationID specifies the target Capacity Reservation into which the instance should be launched.
 	// +optional
-	CapacityReservationID string `json:"capacityReservationId,omitempty"`
+	CapacityReservationID *string `json:"capacityReservationId,omitempty"`
 }
 
 // CloudInit defines options related to the bootstrapping systems where
diff --git a/api/v1beta2/types.go b/api/v1beta2/types.go
@@ -250,10 +250,9 @@ type Instance struct {
 	// +optional
 	PublicIPOnLaunch *bool `json:"publicIPOnLaunch,omitempty"`
 
-	// CapacityReservationID specifies the instance that should be launched in the
-	// reserved compute capacity.
+	// CapacityReservationID specifies the target Capacity Reservation into which the instance should be launched.
 	// +optional
-	CapacityReservationID string `json:"capacityReservationId,omitempty"`
+	CapacityReservationID *string `json:"capacityReservationId,omitempty"`
 }
 
 // InstanceMetadataState describes the state of InstanceMetadataOptions.HttpEndpoint and InstanceMetadataOptions.InstanceMetadataTags
diff --git a/api/v1beta2/zz_generated.deepcopy.go b/api/v1beta2/zz_generated.deepcopy.go
diff --git a/config/crd/bases/controlplane.cluster.x-k8s.io_awsmanagedcontrolplanes.yaml b/config/crd/bases/controlplane.cluster.x-k8s.io_awsmanagedcontrolplanes.yaml
@@ -1091,9 +1091,8 @@ spec:
                     description: Availability zone of instance
                     type: string
                   capacityReservationId:
-                    description: |-
-                      CapacityReservationID specifies the instance that should be launched in the
-                      reserved compute capacity.
+                    description: CapacityReservationID specifies the target Capacity
+                      Reservation into which the instance should be launched.
                     type: string
                   ebsOptimized:
                     description: Indicates whether the instance is optimized for Amazon
@@ -3100,9 +3099,8 @@ spec:
                     description: Availability zone of instance
                     type: string
                   capacityReservationId:
-                    description: |-
-                      CapacityReservationID specifies the instance that should be launched in the
-                      reserved compute capacity.
+                    description: CapacityReservationID specifies the target Capacity
+                      Reservation into which the instance should be launched.
                     type: string
                   ebsOptimized:
                     description: Indicates whether the instance is optimized for Amazon
diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_awsclusters.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_awsclusters.yaml
@@ -2076,9 +2076,8 @@ spec:
                     description: Availability zone of instance
                     type: string
                   capacityReservationId:
-                    description: |-
-                      CapacityReservationID specifies the instance that should be launched in the
-                      reserved compute capacity.
+                    description: CapacityReservationID specifies the target Capacity
+                      Reservation into which the instance should be launched.
                     type: string
                   ebsOptimized:
                     description: Indicates whether the instance is optimized for Amazon
diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_awsmachines.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_awsmachines.yaml
@@ -625,9 +625,8 @@ spec:
                     type: string
                 type: object
               capacityReservationId:
-                description: |-
-                  CapacityReservationID specifies the instance that should be launched in the
-                  reserved compute capacity.
+                description: CapacityReservationID specifies the target Capacity Reservation
+                  into which the instance should be launched.
                 type: string
               cloudInit:
                 description: |-
diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_awsmachinetemplates.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_awsmachinetemplates.yaml
@@ -555,9 +555,8 @@ spec:
                             type: string
                         type: object
                       capacityReservationId:
-                        description: |-
-                          CapacityReservationID specifies the instance that should be launched in the
-                          reserved compute capacity.
+                        description: CapacityReservationID specifies the target Capacity
+                          Reservation into which the instance should be launched.
                         type: string
                       cloudInit:
                         description: |-
diff --git a/pkg/cloud/services/ec2/instances.go b/pkg/cloud/services/ec2/instances.go
@@ -1122,20 +1122,17 @@ func filterGroups(list []string, strToFilter string) (newList []string) {
 	return
 }
 
-func getCapacityReservationSpecification(capacityReservationID string) *ec2.CapacityReservationSpecification {
-	if capacityReservationID == "" {
-		// Instance is not a CapacityReservation instance
+func getCapacityReservationSpecification(capacityReservationID *string) *ec2.CapacityReservationSpecification {
+	if capacityReservationID == nil {
+		//  Not targeting any specific Capacity Reservation
 		return nil
 	}
 
-	// Set required values for CapacityReservation
-	capacityReservationTargetOptions := &ec2.CapacityReservationTarget{}
-	capacityReservationTargetOptions.SetCapacityReservationId(capacityReservationID)
-
-	capacityReservationSpecification := &ec2.CapacityReservationSpecification{}
-	capacityReservationSpecification.SetCapacityReservationTarget(capacityReservationTargetOptions)
-
-	return capacityReservationSpecification
+	return &ec2.CapacityReservationSpecification{
+		CapacityReservationTarget: &ec2.CapacityReservationTarget{
+			CapacityReservationId: capacityReservationID,
+		},
+	}
 }
 
 func getInstanceMarketOptionsRequest(spotMarketOptions *infrav1.SpotMarketOptions) *ec2.InstanceMarketOptionsRequest {
diff --git a/pkg/cloud/services/ec2/instances_test.go b/pkg/cloud/services/ec2/instances_test.go
@@ -5323,19 +5323,20 @@ func mockedGetPrivateDNSDomainNameFromDHCPOptionsEmptyCalls(m *mocks.MockEC2APIM
 
 func TestGetCapacityReservationSpecification(t *testing.T) {
 	mockCapacityReservationID := "cr-123"
+	mockCapacityReservationIDPtr := &mockCapacityReservationID
 	testCases := []struct {
 		name                  string
-		capacityReservationID string
+		capacityReservationID *string
 		expectedRequest       *ec2.CapacityReservationSpecification
 	}{
 		{
 			name:                  "with no CapacityReservationID options specified",
-			capacityReservationID: "",
+			capacityReservationID: nil,
 			expectedRequest:       nil,
 		},
 		{
-			name:                  "with an valid CapacityReservationID specified",
-			capacityReservationID: *aws.String(mockCapacityReservationID),
+			name:                  "with a valid CapacityReservationID specified",
+			capacityReservationID: mockCapacityReservationIDPtr,
 			expectedRequest: &ec2.CapacityReservationSpecification{
 				CapacityReservationTarget: &ec2.CapacityReservationTarget{
 					CapacityReservationId: aws.String(mockCapacityReservationID),

Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,7 @@ func (src *AWSCluster) ConvertTo(dstRaw conversion.Hub) error {`
`59`	`59`	`dst.Status.Bastion.PlacementGroupPartition = restored.Status.Bastion.PlacementGroupPartition`
`60`	`60`	`dst.Status.Bastion.PrivateDNSName = restored.Status.Bastion.PrivateDNSName`
`61`	`61`	`dst.Status.Bastion.PublicIPOnLaunch = restored.Status.Bastion.PublicIPOnLaunch`
	`62`	`+ dst.Status.Bastion.CapacityReservationID = restored.Status.Bastion.CapacityReservationID`
`62`	`63`	`}`
`63`	`64`	`dst.Spec.Partition = restored.Spec.Partition`
`64`	`65`