Add licenseConfigurationArns field in AWSMAchineSpec

punkwalker · punkwalker · commit 1ddd74afbf0e · 2025-11-15T06:11:20.000Z
diff --git a/api/v1beta1/awsmachine_conversion.go b/api/v1beta1/awsmachine_conversion.go
@@ -46,6 +46,7 @@ func (src *AWSMachine) ConvertTo(dstRaw conversion.Hub) error {
 	dst.Spec.MarketType = restored.Spec.MarketType
 	dst.Spec.HostID = restored.Spec.HostID
 	dst.Spec.HostResourceGroupArn = restored.Spec.HostResourceGroupArn
+	dst.Spec.LicenseConfigurationArns = restored.Spec.LicenseConfigurationArns
 	dst.Spec.HostAffinity = restored.Spec.HostAffinity
 	dst.Spec.CapacityReservationPreference = restored.Spec.CapacityReservationPreference
 	dst.Spec.NetworkInterfaceType = restored.Spec.NetworkInterfaceType
@@ -119,6 +120,7 @@ func (r *AWSMachineTemplate) ConvertTo(dstRaw conversion.Hub) error {
 	dst.Spec.Template.Spec.MarketType = restored.Spec.Template.Spec.MarketType
 	dst.Spec.Template.Spec.HostID = restored.Spec.Template.Spec.HostID
 	dst.Spec.Template.Spec.HostResourceGroupArn = restored.Spec.Template.Spec.HostResourceGroupArn
+	dst.Spec.Template.Spec.LicenseConfigurationArns = restored.Spec.Template.Spec.LicenseConfigurationArns
 	dst.Spec.Template.Spec.HostAffinity = restored.Spec.Template.Spec.HostAffinity
 	dst.Spec.Template.Spec.CapacityReservationPreference = restored.Spec.Template.Spec.CapacityReservationPreference
 	dst.Spec.Template.Spec.NetworkInterfaceType = restored.Spec.Template.Spec.NetworkInterfaceType
diff --git a/api/v1beta1/zz_generated.conversion.go b/api/v1beta1/zz_generated.conversion.go
diff --git a/api/v1beta2/awsmachine_types.go b/api/v1beta2/awsmachine_types.go
@@ -258,6 +258,12 @@ type AWSMachineSpec struct {
 	// +optional
 	HostResourceGroupArn *string `json:"hostResourceGroupArn,omitempty"`
 
+	// LicenseConfigurationArns specifies the License Configuration ARNs to associate with the instance.
+	// This field is required when HostResourceGroupArn is specified to ensure proper license compliance.
+	// +kubebuilder:validation:MaxItems=10
+	// +optional
+	LicenseConfigurationArns []string `json:"licenseConfigurationArns,omitempty"`
+
 	// HostAffinity specifies the dedicated host affinity setting for the instance.
 	// When HostAffinity is set to host, an instance started onto a specific host always restarts on the same host if stopped.
 	// When HostAffinity is set to default, and you stop and restart the instance, it can be restarted on any available host.
diff --git a/api/v1beta2/awsmachine_webhook.go b/api/v1beta2/awsmachine_webhook.go
@@ -497,6 +497,13 @@ func (r *AWSMachine) validateHostAllocation() field.ErrorList {
 		allErrs = append(allErrs, field.Forbidden(field.NewPath("spec"), "hostID, hostResourceGroupArn, and dynamicHostAllocation are mutually exclusive"))
 	}
 
+	// Validate licenseConfigurationArns is required when hostResourceGroupArn is specified
+	if hasHostResourceGroupArn {
+		if len(r.Spec.LicenseConfigurationArns) == 0 {
+			allErrs = append(allErrs, field.Required(field.NewPath("spec", "licenseConfigurationArns"), "licenseConfigurationArns is required when hostResourceGroupArn is specified"))
+		}
+	}
+
 	return allErrs
 }
 
diff --git a/api/v1beta2/awsmachine_webhook_test.go b/api/v1beta2/awsmachine_webhook_test.go
@@ -648,6 +648,27 @@ func TestAWSMachineCreate(t *testing.T) {
 			},
 			wantErr: true,
 		},
+		{
+			name: "hostResourceGroupArn without licenseConfigurationArns should fail",
+			machine: &AWSMachine{
+				Spec: AWSMachineSpec{
+					InstanceType:         "test",
+					HostResourceGroupArn: aws.String("arn:aws:resource-groups:us-west-2:123456789012:group/test-group"),
+				},
+			},
+			wantErr: true,
+		},
+		{
+			name: "hostResourceGroupArn with licenseConfigurationArns should succeed",
+			machine: &AWSMachine{
+				Spec: AWSMachineSpec{
+					InstanceType:             "test",
+					HostResourceGroupArn:     aws.String("arn:aws:resource-groups:us-west-2:123456789012:group/test-group"),
+					LicenseConfigurationArns: []string{"arn:aws:license-manager:us-west-2:259732043995:license-configuration:lic-4acd3f7c117b9e314cce36e46084d071"},
+				},
+			},
+			wantErr: false,
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
diff --git a/api/v1beta2/awsmachinetemplate_webhook.go b/api/v1beta2/awsmachinetemplate_webhook.go
@@ -197,6 +197,13 @@ func (r *AWSMachineTemplate) validateHostAllocation() field.ErrorList {
 		allErrs = append(allErrs, field.Forbidden(field.NewPath("spec.template.spec"), "hostID, hostResourceGroupArn, and dynamicHostAllocation are mutually exclusive"))
 	}
 
+	// Validate licenseConfigurationArns is required when hostResourceGroupArn is specified
+	if hasHostResourceGroupArn {
+		if len(spec.LicenseConfigurationArns) == 0 {
+			allErrs = append(allErrs, field.Required(field.NewPath("spec", "template", "spec", "licenseConfigurationArns"), "licenseConfigurationArns is required when hostResourceGroupArn is specified"))
+		}
+	}
+
 	return allErrs
 }
 
diff --git a/api/v1beta2/awsmachinetemplate_webhook_test.go b/api/v1beta2/awsmachinetemplate_webhook_test.go
@@ -151,6 +151,37 @@ func TestAWSMachineTemplateValidateCreate(t *testing.T) {
 			},
 			wantError: true,
 		},
+		{
+			name: "hostResourceGroupArn without licenseConfigurationArns should fail",
+			inputTemplate: &AWSMachineTemplate{
+				ObjectMeta: metav1.ObjectMeta{},
+				Spec: AWSMachineTemplateSpec{
+					Template: AWSMachineTemplateResource{
+						Spec: AWSMachineSpec{
+							InstanceType:         "test",
+							HostResourceGroupArn: aws.String("arn:aws:resource-groups:us-west-2:123456789012:group/test-group"),
+						},
+					},
+				},
+			},
+			wantError: true,
+		},
+		{
+			name: "hostResourceGroupArn with licenseConfigurationArns should succeed",
+			inputTemplate: &AWSMachineTemplate{
+				ObjectMeta: metav1.ObjectMeta{},
+				Spec: AWSMachineTemplateSpec{
+					Template: AWSMachineTemplateResource{
+						Spec: AWSMachineSpec{
+							InstanceType:             "test",
+							HostResourceGroupArn:     aws.String("arn:aws:resource-groups:us-west-2:123456789012:group/test-group"),
+							LicenseConfigurationArns: []string{"arn:aws:license-manager:us-west-2:259732043995:license-configuration:lic-4acd3f7c117b9e314cce36e46084d071"},
+						},
+					},
+				},
+			},
+			wantError: false,
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
diff --git a/api/v1beta2/types.go b/api/v1beta2/types.go
@@ -291,6 +291,11 @@ type Instance struct {
 	// +optional
 	HostResourceGroupArn *string `json:"hostResourceGroupArn,omitempty"`
 
+	// LicenseConfigurationArns specifies the License Configuration ARNs to associate with the instance.
+	// This field is required when HostResourceGroupArn is specified to ensure proper license compliance.
+	// +optional
+	LicenseConfigurationArns []string `json:"licenseConfigurationArns,omitempty"`
+
 	// DynamicHostAllocation enables automatic allocation of dedicated hosts.
 	// This field is mutually exclusive with HostID.
 	// +optional
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
@@ -1296,8 +1296,9 @@ spec:
                       instance should be started.
                     type: string
                   hostResourceGroupArn:
-                    description: HostResourceGroupArn specifies the Dedicated Host
-                      Resource Group ARN on which the instance should be started.
+                    description: |-
+                      HostResourceGroupArn specifies the Dedicated Host Resource Group ARN on which the instance should be started.
+                      Note: The instance's AMI licenses must match the licenses associated with the host resource group.
                     type: string
                   iamProfile:
                     description: The name of the IAM instance profile associated with
@@ -1373,6 +1374,13 @@ spec:
                   instanceState:
                     description: The current state of the instance.
                     type: string
+                  licenseConfigurationArns:
+                    description: |-
+                      LicenseConfigurationArns specifies the License Configuration ARNs to associate with the instance.
+                      This field is required when HostResourceGroupArn is specified to ensure proper license compliance.
+                    items:
+                      type: string
+                    type: array
                   marketType:
                     description: |-
                       MarketType specifies the type of market for the EC2 instance. Valid values include:
@@ -3588,8 +3596,9 @@ spec:
                       instance should be started.
                     type: string
                   hostResourceGroupArn:
-                    description: HostResourceGroupArn specifies the Dedicated Host
-                      Resource Group ARN on which the instance should be started.
+                    description: |-
+                      HostResourceGroupArn specifies the Dedicated Host Resource Group ARN on which the instance should be started.
+                      Note: The instance's AMI licenses must match the licenses associated with the host resource group.
                     type: string
                   iamProfile:
                     description: The name of the IAM instance profile associated with
@@ -3665,6 +3674,13 @@ spec:
                   instanceState:
                     description: The current state of the instance.
                     type: string
+                  licenseConfigurationArns:
+                    description: |-
+                      LicenseConfigurationArns specifies the License Configuration ARNs to associate with the instance.
+                      This field is required when HostResourceGroupArn is specified to ensure proper license compliance.
+                    items:
+                      type: string
+                    type: array
                   marketType:
                     description: |-
                       MarketType specifies the type of market for the EC2 instance. Valid values include:
diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_awsclusters.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_awsclusters.yaml
@@ -2274,8 +2274,9 @@ spec:
                       instance should be started.
                     type: string
                   hostResourceGroupArn:
-                    description: HostResourceGroupArn specifies the Dedicated Host
-                      Resource Group ARN on which the instance should be started.
+                    description: |-
+                      HostResourceGroupArn specifies the Dedicated Host Resource Group ARN on which the instance should be started.
+                      Note: The instance's AMI licenses must match the licenses associated with the host resource group.
                     type: string
                   iamProfile:
                     description: The name of the IAM instance profile associated with
@@ -2351,6 +2352,13 @@ spec:
                   instanceState:
                     description: The current state of the instance.
                     type: string
+                  licenseConfigurationArns:
+                    description: |-
+                      LicenseConfigurationArns specifies the License Configuration ARNs to associate with the instance.
+                      This field is required when HostResourceGroupArn is specified to ensure proper license compliance.
+                    items:
+                      type: string
+                    type: array
                   marketType:
                     description: |-
                       MarketType specifies the type of market for the EC2 instance. Valid values include:
diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_awsmachines.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_awsmachines.yaml
@@ -781,6 +781,8 @@ spec:
                 description: |-
                   HostResourceGroupArn specifies the Dedicated Host Resource Group ARN on which the instance must be started.
                   This field is mutually exclusive with DynamicHostAllocation and HostID.
+                  Note: The instance's AMI licenses must match the licenses associated with the host resource group.
+                  If the host resource group has no associated licenses, ensure the AMI also has no special licensing requirements.
                 pattern: ^arn:aws[a-z\-]*:resource-groups:[a-z0-9\-]+:[0-9]{12}:group/[a-zA-Z0-9\-_]+$
                 type: string
               iamInstanceProfile:
@@ -976,6 +978,14 @@ spec:
                   m4.xlarge'
                 minLength: 2
                 type: string
+              licenseConfigurationArns:
+                description: |-
+                  LicenseConfigurationArns specifies the License Configuration ARNs to associate with the instance.
+                  This field is required when HostResourceGroupArn is specified to ensure proper license compliance.
+                items:
+                  type: string
+                maxItems: 10
+                type: array
               marketType:
                 description: |-
                   MarketType specifies the type of market for the EC2 instance. Valid values include:
diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_awsmachinetemplates.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_awsmachinetemplates.yaml
@@ -701,6 +701,8 @@ spec:
                         description: |-
                           HostResourceGroupArn specifies the Dedicated Host Resource Group ARN on which the instance must be started.
                           This field is mutually exclusive with DynamicHostAllocation and HostID.
+                          Note: The instance's AMI licenses must match the licenses associated with the host resource group.
+                          If the host resource group has no associated licenses, ensure the AMI also has no special licensing requirements.
                         pattern: ^arn:aws[a-z\-]*:resource-groups:[a-z0-9\-]+:[0-9]{12}:group/[a-zA-Z0-9\-_]+$
                         type: string
                       iamInstanceProfile:
@@ -896,6 +898,14 @@ spec:
                           Example: m4.xlarge'
                         minLength: 2
                         type: string
+                      licenseConfigurationArns:
+                        description: |-
+                          LicenseConfigurationArns specifies the License Configuration ARNs to associate with the instance.
+                          This field is required when HostResourceGroupArn is specified to ensure proper license compliance.
+                        items:
+                          type: string
+                        maxItems: 10
+                        type: array
                       marketType:
                         description: |-
                           MarketType specifies the type of market for the EC2 instance. Valid values include:
diff --git a/pkg/cloud/services/ec2/instances.go b/pkg/cloud/services/ec2/instances.go
@@ -276,6 +276,7 @@ func (s *Service) CreateInstance(ctx context.Context, scope *scope.MachineScope,
 		// Use static host allocation if specified
 		input.HostID = scope.AWSMachine.Spec.HostID
 		input.HostResourceGroupArn = scope.AWSMachine.Spec.HostResourceGroupArn
+		input.LicenseConfigurationArns = scope.AWSMachine.Spec.LicenseConfigurationArns
 		input.HostAffinity = scope.AWSMachine.Spec.HostAffinity
 	}
 
@@ -752,9 +753,15 @@ func (s *Service) runInstance(role string, i *infrav1.Instance) (*infrav1.Instan
 			Affinity:             i.HostAffinity,
 			HostResourceGroupArn: i.HostResourceGroupArn,
 		}
-		// input.LicenseSpecifications = &types.LicenseConfiguration{
-		// 	LicenseConfigurationArn: ,
-		// }
+		if len(i.LicenseConfigurationArns) > 0 {
+			licenseSpecs := make([]types.LicenseConfigurationRequest, len(i.LicenseConfigurationArns))
+			for idx, arn := range i.LicenseConfigurationArns {
+				licenseSpecs[idx] = types.LicenseConfigurationRequest{
+					LicenseConfigurationArn: aws.String(arn),
+				}
+			}
+			input.LicenseSpecifications = licenseSpecs
+		}
 	}
 
 	out, err := s.EC2Client.RunInstances(context.TODO(), input)
@@ -1019,6 +1026,21 @@ func (s *Service) SDKToInstance(v types.Instance) (*infrav1.Instance, error) {
 		}
 	}
 
+	// Extract host allocation information from placement
+	if v.Placement != nil {
+		i.HostID = v.Placement.HostId
+		i.HostResourceGroupArn = v.Placement.HostResourceGroupArn
+		i.HostAffinity = v.Placement.Affinity
+	}
+
+	// Extract license configuration ARNs from license specifications
+	if len(v.Licenses) > 0 {
+		i.LicenseConfigurationArns = make([]string, len(v.Licenses))
+		for idx, license := range v.Licenses {
+			i.LicenseConfigurationArns[idx] = aws.ToString(license.LicenseConfigurationArn)
+		}
+	}
+
 	return i, nil
 }
 

Original file line number	Diff line number	Diff line change
`@@ -497,6 +497,13 @@ func (r *AWSMachine) validateHostAllocation() field.ErrorList {`
`497`	`497`	`allErrs = append(allErrs, field.Forbidden(field.NewPath("spec"), "hostID, hostResourceGroupArn, and dynamicHostAllocation are mutually exclusive"))`
`498`	`498`	`}`
`499`	`499`
	`500`	`+ // Validate licenseConfigurationArns is required when hostResourceGroupArn is specified`
	`501`	`+ if hasHostResourceGroupArn {`
	`502`	`+ if len(r.Spec.LicenseConfigurationArns) == 0 {`
	`503`	`+ allErrs = append(allErrs, field.Required(field.NewPath("spec", "licenseConfigurationArns"), "licenseConfigurationArns is required when hostResourceGroupArn is specified"))`
	`504`	`+ }`
	`505`	`+ }`
	`506`	`+`
`500`	`507`	`return allErrs`
`501`	`508`	`}`
`502`	`509`
Original file line number	Diff line number	Diff line change
`@@ -197,6 +197,13 @@ func (r *AWSMachineTemplate) validateHostAllocation() field.ErrorList {`
`197`	`197`	`allErrs = append(allErrs, field.Forbidden(field.NewPath("spec.template.spec"), "hostID, hostResourceGroupArn, and dynamicHostAllocation are mutually exclusive"))`
`198`	`198`	`}`
`199`	`199`
	`200`	`+ // Validate licenseConfigurationArns is required when hostResourceGroupArn is specified`
	`201`	`+ if hasHostResourceGroupArn {`
	`202`	`+ if len(spec.LicenseConfigurationArns) == 0 {`
	`203`	`+ allErrs = append(allErrs, field.Required(field.NewPath("spec", "template", "spec", "licenseConfigurationArns"), "licenseConfigurationArns is required when hostResourceGroupArn is specified"))`
	`204`	`+ }`
	`205`	`+ }`
	`206`	`+`
`200`	`207`	`return allErrs`
`201`	`208`	`}`
`202`	`209`