Enabling Soft Affinity and Soft Anti Affinity

FarnazBGH · FarnazBGH · commit 83bd331e01b3 · 2023-09-27T12:58:01.000+02:00
diff --git a/api/v1beta1/cloudstackaffinitygroup_types.go b/api/v1beta1/cloudstackaffinitygroup_types.go
@@ -27,7 +27,7 @@ const (
 // CloudStackAffinityGroupSpec defines the desired state of CloudStackAffinityGroup
 type CloudStackAffinityGroupSpec struct {
 	// Mutually exclusive parameter with AffinityGroupIDs.
-	// Can be "host affinity" or "host anti-affinity". Will create an affinity group per machine set.
+	// Can be "host affinity", "host anti-affinity", "non-strict host affinity"or "non-strict host anti-affinity". Will create an affinity group per machine set.
 	Type string `json:"type,omitempty"`
 
 	// Name.
diff --git a/api/v1beta1/cloudstackmachine_types.go b/api/v1beta1/cloudstackmachine_types.go
@@ -28,6 +28,8 @@ const (
 	MachineFinalizer = "cloudstackmachine.infrastructure.cluster.x-k8s.io"
 	ProAffinity      = "pro"
 	AntiAffinity     = "anti"
+	SoftProAffinity  = "soft-pro"
+	SoftAntiAffinity = "soft-anti"
 	NoAffinity       = "no"
 )
 
diff --git a/api/v1beta2/cloudstackmachine_types.go b/api/v1beta2/cloudstackmachine_types.go
@@ -27,9 +27,11 @@ import (
 const MachineFinalizer = "cloudstackmachine.infrastructure.cluster.x-k8s.io"
 
 const (
-	ProAffinity  = "pro"
-	AntiAffinity = "anti"
-	NoAffinity   = "no"
+	ProAffinity      = "pro"
+	AntiAffinity     = "anti"
+	SoftProAffinity  = "soft-pro"
+	SoftAntiAffinity = "soft-anti"
+	NoAffinity       = "no"
 )
 
 // CloudStackMachineSpec defines the desired state of CloudStackMachine
diff --git a/api/v1beta3/cloudstackaffinitygroup_types.go b/api/v1beta3/cloudstackaffinitygroup_types.go
@@ -25,7 +25,7 @@ const AffinityGroupFinalizer = "affinitygroup.infrastructure.cluster.x-k8s.io"
 // CloudStackAffinityGroupSpec defines the desired state of CloudStackAffinityGroup
 type CloudStackAffinityGroupSpec struct {
 	// Mutually exclusive parameter with AffinityGroupIDs.
-	// Can be "host affinity" or "host anti-affinity". Will create an affinity group per machine set.
+	// Can be "host affinity", "host anti-affinity", "non-strict host affinity" or "non-strict host anti-affinity". Will create an affinity group per machine set.
 	Type string `json:"type,omitempty"`
 
 	// Name.
diff --git a/api/v1beta3/cloudstackmachine_types.go b/api/v1beta3/cloudstackmachine_types.go
@@ -27,9 +27,11 @@ import (
 const MachineFinalizer = "cloudstackmachine.infrastructure.cluster.x-k8s.io"
 
 const (
-	ProAffinity  = "pro"
-	AntiAffinity = "anti"
-	NoAffinity   = "no"
+	ProAffinity      = "pro"
+	AntiAffinity     = "anti"
+	SoftProAffinity  = "soft-pro"
+	SoftAntiAffinity = "soft-anti"
+	NoAffinity       = "no"
 )
 
 // CloudStackMachineSpec defines the desired state of CloudStackMachine
diff --git a/api/v1beta3/cloudstackmachinetemplate_webhook.go b/api/v1beta3/cloudstackmachinetemplate_webhook.go
@@ -63,9 +63,9 @@ func (r *CloudStackMachineTemplate) ValidateCreate() error {
 	spec := r.Spec.Template.Spec
 
 	affinity := strings.ToLower(spec.Affinity)
-	if !(affinity == "" || affinity == "no" || affinity == "pro" || affinity == "anti") {
+	if !(affinity == "" || affinity == "no" || affinity == "pro" || affinity == "anti" || affinity == "soft-pro" || affinity == "soft-anti") {
 		errorList = append(errorList, field.Invalid(field.NewPath("spec", "Affinity"), spec.Affinity,
-			`Affinity must be "no", "pro", "anti", or unspecified.`))
+			`Affinity must be "no", "pro", "anti", "soft-pro", "soft-anti", or unspecified.`))
 	}
 	if affinity != "no" && affinity != "" && len(spec.AffinityGroupIDs) > 0 {
 		errorList = append(errorList, field.Forbidden(field.NewPath("spec", "AffinityGroupIDs"),
diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_cloudstackaffinitygroups.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_cloudstackaffinitygroups.yaml
@@ -45,8 +45,9 @@ spec:
                 type: string
               type:
                 description: Mutually exclusive parameter with AffinityGroupIDs. Can
-                  be "host affinity" or "host anti-affinity". Will create an affinity
-                  group per machine set.
+                  be "host affinity", "host anti-affinity", "non-strict host affinity"or
+                  "non-strict host anti-affinity". Will create an affinity group per
+                  machine set.
                 type: string
             type: object
           status:
@@ -151,8 +152,9 @@ spec:
                 type: string
               type:
                 description: Mutually exclusive parameter with AffinityGroupIDs. Can
-                  be "host affinity" or "host anti-affinity". Will create an affinity
-                  group per machine set.
+                  be "host affinity", "host anti-affinity", "non-strict host affinity"
+                  or "non-strict host anti-affinity". Will create an affinity group
+                  per machine set.
                 type: string
             type: object
           status:
diff --git a/controllers/utils/affinity_group.go b/controllers/utils/affinity_group.go
@@ -55,6 +55,10 @@ func (r *ReconciliationRunner) GetOrCreateAffinityGroup(
 			ag.Spec.Type = "host affinity"
 		} else if affinityType == infrav1.AntiAffinity {
 			ag.Spec.Type = "host anti-affinity"
+		} else if affinityType == infrav1.SoftProAffinity {
+			ag.Spec.Type = "non-strict host affinity"
+		} else if affinityType == infrav1.SoftAntiAffinity {
+			ag.Spec.Type = "non-strict host anti-affinity"
 		} else {
 			return ctrl.Result{}, errors.Errorf("unrecognized affinity type %s", affinityType)
 		}
diff --git a/pkg/cloud/affinity_groups.go b/pkg/cloud/affinity_groups.go
@@ -22,8 +22,10 @@ import (
 )
 
 const (
-	AntiAffinityGroupType = "host anti-affinity"
-	AffinityGroupType     = "host affinity"
+	AntiAffinityGroupType     = "host anti-affinity"
+	AffinityGroupType         = "host affinity"
+	SoftAntiAffinityGroupType = "non-stric anti-affinity"
+	SoftAffinityGroupType     = "non-stric host affinity"
 )
 
 type AffinityGroup struct {
diff --git a/test/e2e/README.md b/test/e2e/README.md
@@ -150,6 +150,8 @@ E2E Test Run Logs: https://github.com/blueorangutan/capc-prs/releases/download/c
 [PASS] When testing with disk offering Should successfully create a cluster with disk offering
 [PASS] When testing affinity group Should have host affinity group when affinity is pro
 [PASS] When testing affinity group Should have host affinity group when affinity is anti
+[PASS] When testing affinity group Should have host affinity group when affinity is soft-pro
+[PASS] When testing affinity group Should have host affinity group when affinity is soft-anti
 [PASS] When the specified resource does not exist Should fail due to the specified account is not found [TC4a]
 [PASS] When the specified resource does not exist Should fail due to the specified domain is not found [TC4b]
 [PASS] When the specified resource does not exist Should fail due to the specified control plane offering is not found [TC7]
diff --git a/test/e2e/affinity_group.go b/test/e2e/affinity_group.go
@@ -73,6 +73,14 @@ func AffinityGroupSpec(ctx context.Context, inputGetter func() CommonSpecInput)
 		affinityIds = executeTest(ctx, input, namespace, specName, clusterResources, "anti")
 	})
 
+	It("Should have host affinity group when affinity is soft-pro", func() {
+		affinityIds = executeTest(ctx, input, namespace, specName, clusterResources, "soft-pro")
+	})
+
+	It("Should have host affinity group when affinity is soft-anti", func() {
+		affinityIds = executeTest(ctx, input, namespace, specName, clusterResources, "soft-anti")
+	})
+
 	AfterEach(func() {
 		// Dumps all the resources in the spec namespace, then cleanups the cluster object and the spec namespace itself.
 		dumpSpecResourcesAndCleanup(ctx, specName, input.BootstrapClusterProxy, input.ArtifactFolder, namespace, cancelWatches, clusterResources.Cluster, input.E2EConfig.GetIntervals, input.SkipCleanup)
diff --git a/test/e2e/common.go b/test/e2e/common.go
@@ -22,9 +22,9 @@ import (
 	"errors"
 	"fmt"
 	"path/filepath"
+	"strconv"
 	"strings"
 	"time"
-	"strconv"
 
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 
@@ -346,6 +346,12 @@ func CheckAffinityGroup(client *cloudstack.CloudStackClient, clusterName string,
 				if affinityType == "anti" && affinity.Type != "host anti-affinity" {
 					Fail(affinity.Type + " does not match " + affinityType)
 				}
+				if affinityType == "soft-pro" && affinity.Type != "non-stric host affinity" {
+					Fail(affinity.Type + " does not match " + affinityType)
+				}
+				if affinityType == "soft-anti" && affinity.Type != "non-strict host anti-affinity" {
+					Fail(affinity.Type + " does not match " + affinityType)
+				}
 			}
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,8 @@ const (`
`28`	`28`	`MachineFinalizer = "cloudstackmachine.infrastructure.cluster.x-k8s.io"`
`29`	`29`	`ProAffinity = "pro"`
`30`	`30`	`AntiAffinity = "anti"`
	`31`	`+ SoftProAffinity = "soft-pro"`
	`32`	`+ SoftAntiAffinity = "soft-anti"`
`31`	`33`	`NoAffinity = "no"`
`32`	`34`	`)`
`33`	`35`
Original file line number	Diff line number	Diff line change
`@@ -22,8 +22,10 @@ import (`
`22`	`22`	`)`
`23`	`23`
`24`	`24`	`const (`
`25`		`- AntiAffinityGroupType = "host anti-affinity"`
`26`		`- AffinityGroupType = "host affinity"`
	`25`	`+ AntiAffinityGroupType = "host anti-affinity"`
	`26`	`+ AffinityGroupType = "host affinity"`
	`27`	`+ SoftAntiAffinityGroupType = "non-stric anti-affinity"`
	`28`	`+ SoftAffinityGroupType = "non-stric host affinity"`
`27`	`29`	`)`
`28`	`30`
`29`	`31`	`type AffinityGroup struct {`