Added the capacity reservation id

Thirumalesh Aaraveti · Thirumalesh Aaraveti · commit 35cf42371db7 · 2024-07-16T15:59:48.000+05:30
Removed the tests by verify-gen
diff --git a/api/v1beta1/awscluster_conversion.go b/api/v1beta1/awscluster_conversion.go
@@ -104,6 +104,7 @@ func (src *AWSCluster) ConvertTo(dstRaw conversion.Hub) error {
 	dst.Spec.NetworkSpec.VPC.EmptyRoutesDefaultVPCSecurityGroup = restored.Spec.NetworkSpec.VPC.EmptyRoutesDefaultVPCSecurityGroup
 	dst.Spec.NetworkSpec.VPC.PrivateDNSHostnameTypeOnLaunch = restored.Spec.NetworkSpec.VPC.PrivateDNSHostnameTypeOnLaunch
 	dst.Spec.NetworkSpec.VPC.CarrierGatewayID = restored.Spec.NetworkSpec.VPC.CarrierGatewayID
+	dst.Spec.CapacityReservationID = restored.Spec.CapacityReservationID
 
 	if restored.Spec.NetworkSpec.VPC.ElasticIPPool != nil {
 		if dst.Spec.NetworkSpec.VPC.ElasticIPPool == nil {
diff --git a/api/v1beta1/zz_generated.conversion.go b/api/v1beta1/zz_generated.conversion.go
diff --git a/api/v1beta2/awscluster_types.go b/api/v1beta2/awscluster_types.go
@@ -111,6 +111,10 @@ type AWSClusterSpec struct {
 	// BootstrapFormatIgnition feature flag to be enabled).
 	// +optional
 	S3Bucket *S3Bucket `json:"s3Bucket,omitempty"`
+
+	// CapacityReservationID specifies the target Capacity Reservation into which the instance should be launched.
+	// +optional
+	CapacityReservationID string `json:"capacityReservationId,omitempty"`
 }
 
 // AWSIdentityKind defines allowed AWS identity types.
diff --git a/api/v1beta2/awsmachine_types.go b/api/v1beta2/awsmachine_types.go
@@ -194,8 +194,7 @@ 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"`
 }
diff --git a/api/v1beta2/types.go b/api/v1beta2/types.go
@@ -250,8 +250,7 @@ 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"`
 }
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
@@ -958,6 +958,10 @@ spec:
                       will be the default.
                     type: string
                 type: object
+              capacityReservationId:
+                description: CapacityReservationID specifies the target Capacity Reservation
+                  into which the instance should be launched.
+                type: string
               controlPlaneEndpoint:
                 description: ControlPlaneEndpoint represents the endpoint used to
                   communicate with the control plane.
@@ -2076,9 +2080,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_awsclustertemplates.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_awsclustertemplates.yaml
@@ -549,6 +549,10 @@ spec:
                               will be the default.
                             type: string
                         type: object
+                      capacityReservationId:
+                        description: CapacityReservationID specifies the target Capacity
+                          Reservation into which the instance should be launched.
+                        type: string
                       controlPlaneEndpoint:
                         description: ControlPlaneEndpoint represents the endpoint
                           used to communicate with the control plane.
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
@@ -1124,18 +1124,15 @@ func filterGroups(list []string, strToFilter string) (newList []string) {
 
 func getCapacityReservationSpecification(capacityReservationID string) *ec2.CapacityReservationSpecification {
 	if capacityReservationID == "" {
-		// Instance is not a CapacityReservation instance
+		//  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: ptr.To[string](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
@@ -5334,7 +5334,7 @@ func TestGetCapacityReservationSpecification(t *testing.T) {
 			expectedRequest:       nil,
 		},
 		{
-			name:                  "with an valid CapacityReservationID specified",
+			name:                  "with a valid CapacityReservationID specified",
 			capacityReservationID: *aws.String(mockCapacityReservationID),
 			expectedRequest: &ec2.CapacityReservationSpecification{
 				CapacityReservationTarget: &ec2.CapacityReservationTarget{

Original file line number	Diff line number	Diff line change
`@@ -194,8 +194,7 @@ type AWSMachineSpec struct {`
`194`	`194`	`// +optional`
`195`	`195`	PrivateDNSName *PrivateDNSName `json:"privateDnsName,omitempty"`
`196`	`196`
`197`		`- // CapacityReservationID specifies the instance that should be launched in the`
`198`		`- // reserved compute capacity.`
	`197`	`+ // CapacityReservationID specifies the target Capacity Reservation into which the instance should be launched.`
`199`	`198`	`// +optional`
`200`	`199`	CapacityReservationID string `json:"capacityReservationId,omitempty"`
`201`	`200`	`}`
Original file line number	Diff line number	Diff line change
`@@ -250,8 +250,7 @@ type Instance struct {`
`250`	`250`	`// +optional`
`251`	`251`	PublicIPOnLaunch *bool `json:"publicIPOnLaunch,omitempty"`
`252`	`252`
`253`		`- // CapacityReservationID specifies the instance that should be launched in the`
`254`		`- // reserved compute capacity.`
	`253`	`+ // CapacityReservationID specifies the target Capacity Reservation into which the instance should be launched.`
`255`	`254`	`// +optional`
`256`	`255`	CapacityReservationID string `json:"capacityReservationId,omitempty"`
`257`	`256`	`}`