apis/vmware: add VSphereCluster.spec.placement.workerAntiAffinity.mode

kubernetes-sigs · Feb 20, 2025 · bf1d3d3 · bf1d3d3
1 parent 092907a
commit bf1d3d3
Show file tree

Hide file tree

Showing 4 changed files with 107 additions and 0 deletions.
diff --git a/apis/vmware/v1beta1/vspherecluster_types.go b/apis/vmware/v1beta1/vspherecluster_types.go
@@ -38,8 +38,39 @@ const (
 type VSphereClusterSpec struct {
 	// +optional
 	ControlPlaneEndpoint clusterv1.APIEndpoint `json:"controlPlaneEndpoint"`
+	// placement allows to configure the placement of machines of a VSphereCluster.
+	Placement VSphereClusterPlacement `json:"placement,omitempty"`
 }
 
+// VSphereClusterPlacement defines a placement strategy for machines of a VSphereCluster.
+type VSphereClusterPlacement struct {
+	// workerAntiAffinity configures soft anti-affinity for workers.
+	WorkerAntiAffinity VSphereClusterWorkerAntiAffinity `json:"workerAntiAffinity,omitempty"`
+}
+
+// VSphereClusterWorkerAntiAffinity defines the anti-affinity configuration for workers.
+type VSphereClusterWorkerAntiAffinity struct {
+	// mode allows to set the grouping of (soft) anti-affinity for worker nodes.
+	// Defaults to `Cluster`.
+	// +kubebuilder:validation:Enum=Cluster;None;MachineDeployment
+	// +default:value="Cluster"
+	Mode VSphereClusterWorkerAntiAffinityMode `json:"mode"`
+}
+
+// VSphereClusterWorkerAntiAffinityMode describes the soft anti-affinity mode used across a for distributing virtual machines.
+type VSphereClusterWorkerAntiAffinityMode string
+
+const (
+	// VSphereClusterWorkerAntiAffinityModeCluster means to use all workers as a single group for soft anti-affinity.
+	VSphereClusterWorkerAntiAffinityModeCluster VSphereClusterWorkerAntiAffinityMode = "Cluster"
+
+	// VSphereClusterWorkerAntiAffinityModeNone means to not configure any soft anti-affinity for workers.
+	VSphereClusterWorkerAntiAffinityModeNone VSphereClusterWorkerAntiAffinityMode = "None"
+
+	// VSphereClusterWorkerAntiAffinityModeMachineDeployment means to configure soft anti-affinity for all workers per MachineDeployment.
+	VSphereClusterWorkerAntiAffinityModeMachineDeployment VSphereClusterWorkerAntiAffinityMode = "MachineDeployment"
+)
+
 // VSphereClusterStatus defines the observed state of VSphereClusterSpec.
 type VSphereClusterStatus struct {
 	// Ready indicates the infrastructure required to deploy this cluster is

diff --git a/apis/vmware/v1beta1/zz_generated.deepcopy.go b/apis/vmware/v1beta1/zz_generated.deepcopy.go
diff --git a/config/supervisor/crd/bases/vmware.infrastructure.cluster.x-k8s.io_vsphereclusters.yaml b/config/supervisor/crd/bases/vmware.infrastructure.cluster.x-k8s.io_vsphereclusters.yaml
@@ -55,6 +55,28 @@ spec:
                 - host
                 - port
                 type: object
+              placement:
+                description: placement allows to configure the placement of machines
+                  of a VSphereCluster.
+                properties:
+                  workerAntiAffinity:
+                    description: workerAntiAffinity configures soft anti-affinity
+                      for workers.
+                    properties:
+                      mode:
+                        default: Cluster
+                        description: |-
+                          mode allows to set the grouping of (soft) anti-affinity for worker nodes.
+                          Defaults to `Cluster`.
+                        enum:
+                        - Cluster
+                        - None
+                        - MachineDeployment
+                        type: string
+                    required:
+                    - mode
+                    type: object
+                type: object
             type: object
           status:
             description: VSphereClusterStatus defines the observed state of VSphereClusterSpec.

diff --git a/.../supervisor/crd/bases/vmware.infrastructure.cluster.x-k8s.io_vsphereclustertemplates.yaml b/.../supervisor/crd/bases/vmware.infrastructure.cluster.x-k8s.io_vsphereclustertemplates.yaml
@@ -65,6 +65,28 @@ spec:
                         - host
                         - port
                         type: object
+                      placement:
+                        description: placement allows to configure the placement of
+                          machines of a VSphereCluster.
+                        properties:
+                          workerAntiAffinity:
+                            description: workerAntiAffinity configures soft anti-affinity
+                              for workers.
+                            properties:
+                              mode:
+                                default: Cluster
+                                description: |-
+                                  mode allows to set the grouping of (soft) anti-affinity for worker nodes.
+                                  Defaults to `Cluster`.
+                                enum:
+                                - Cluster
+                                - None
+                                - MachineDeployment
+                                type: string
+                            required:
+                            - mode
+                            type: object
+                        type: object
                     type: object
                 required:
                 - spec