wip: testing, refactoring

Author: rvanderp3

api/v1beta2/awsmachine_types.go

@@ -228,8 +228,8 @@ type AWSMachineSpec struct {
 	// +optional
 	HostID *string `json:"hostID,omitempty"`
 
-	// Affinity specifies the dedicated host affinity setting for the instance.
-	// When affinity is set to Host, an instance started onto a specific host always restarts on the same host if stopped.
+	// 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.
 	// +optional
 	// +kubebuilder:validation:Enum:=Default;Host
 	HostAffinity *string `json:"hostAffinity,omitempty"`

config/crd/bases/infrastructure.cluster.x-k8s.io_awsmachines.yaml

@@ -688,8 +688,8 @@ spec:
                 type: object
               hostAffinity:
                 description: |-
-                  Affinity specifies the dedicated host affinity setting for the instance.
-                  When affinity is set to Host, an instance started onto a specific host always restarts on the same host if stopped.
+                  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.
                 enum:
                 - Default
                 - Host

config/crd/bases/infrastructure.cluster.x-k8s.io_awsmachinetemplates.yaml

@@ -622,8 +622,8 @@ spec:
                         type: object
                       hostAffinity:
                         description: |-
-                          Affinity specifies the dedicated host affinity setting for the instance.
-                          When affinity is set to Host, an instance started onto a specific host always restarts on the same host if stopped.
+                          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.
                         enum:
                         - Default
                         - Host

pkg/cloud/services/ec2/instances.go

@@ -686,11 +686,10 @@ func (s *Service) runInstance(role string, i *infrav1.Instance) (*infrav1.Instan
 			"hostId", i.HostID,
 			"affinity", i.HostAffinity)
 		if input.Placement != nil {
-			placementStr := input.Placement.GoString()
 			s.scope.Warn("Placement already set for instance, overwriting with dedicated host placement",
 				"hostId", i.HostID,
 				"affinity", i.HostAffinity,
-				"placement", placementStr)
+				"placement", input.Placement.GoString())
 		}
 
 		input.Placement = &ec2.Placement{

test/e2e/suites/unmanaged/unmanaged_functional_test.go

@@ -986,10 +986,7 @@ var _ = ginkgo.Context("[unmanaged] [functional]", func() {
 
 			ginkgo.By("Creating cluster")
 			clusterName := fmt.Sprintf("%s-%s", specName, util.RandomString(6))
-			vars := map[string]string{
-				"HOST_ID":       hostID,
-				"HOST_AFFINITY": "Default",
-			}
+
 			// Create a cluster with a dedicated host
 			clusterctl.ApplyClusterTemplateAndWait(ctx, clusterctl.ApplyClusterTemplateAndWaitInput{
 				ClusterProxy: e2eCtx.Environment.BootstrapClusterProxy,
@@ -1004,7 +1001,10 @@ var _ = ginkgo.Context("[unmanaged] [functional]", func() {
 					KubernetesVersion:        e2eCtx.E2EConfig.GetVariable(shared.KubernetesVersion),
 					ControlPlaneMachineCount: ptr.To[int64](1),
 					WorkerMachineCount:       ptr.To[int64](0),
-					ClusterctlVariables:      vars,
+					ClusterctlVariables:      map[string]string{
+						"HOST_ID":       hostID,
+						"HOST_AFFINITY": "Default",
+					},
 				},
 				WaitForClusterIntervals:      e2eCtx.E2EConfig.GetIntervals(specName, "wait-cluster"),
 				WaitForControlPlaneIntervals: e2eCtx.E2EConfig.GetIntervals(specName, "wait-control-plane"),