api: Granular server groups

Allow users to (a) specify server groups by name or (b) defer management
of server groups to CAPO.

Signed-off-by: Stephen Finucane <[email protected]>

Author: stephenfin

api/v1alpha7/managed_server_groups.go

@@ -0,0 +1,38 @@
+/*
+Copyright 2023 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package v1alpha7
+
+// OpenStackIdentityReference is a reference to an infrastructure
+// provider identity to be used to provision cluster resources.
+type ManagedServerGroups struct {
+	// Policy defines the policy that should be used for control plane machines
+	// +kubebuilder:validation:Enum="";affinity;soft-affinity;anti-affinity;soft-anti-affinity
+	// +optional
+	Policy string `json:"policy,omitempty"`
+
+	// ControlPlanePolicy defines the policy that should be used for control plane machines.
+	// This overrides Policy if specified.
+	// +kubebuilder:validation:Enum="";affinity;soft-affinity;anti-affinity;soft-anti-affinity
+	// +optional
+	ControlPlanePolicy string `json:"controlPlanePolicy,omitempty"`
+
+	// WorkerPolicy defines the policy that should be used for worker machines
+	// This overrides Policy if specified.
+	// +kubebuilder:validation:Enum="";affinity;soft-affinity;anti-affinity;soft-anti-affinity
+	// +optional
+	WorkerPolicy string `json:"workerPolicy,omitempty"`
+}

api/v1alpha7/openstackcluster_types.go

@@ -118,6 +118,13 @@ type OpenStackClusterSpec struct {
 	// +optional
 	ManagedSecurityGroups bool `json:"managedSecurityGroups"`
 
+	// ManagedServerGroups determines whether OpenStack server groups for the cluster will be
+	// managed by the OpenStack provider or whether pre-existing server groups will be
+	// specified as part of the configuration. This can be overridden on a per-machine basis.
+	// By default, no server group will be created.
+	// +optional
+	ManagedServerGroups *ManagedServerGroups `json:"managedServerGroups"`
+
 	// AllowAllInClusterTraffic is only used when managed security groups are in use.
 	// If set to true, the rules for the managed security groups are configured so that all
 	// ingress and egress between cluster nodes is permitted, allowing CNIs other than

api/v1alpha7/openstackmachine_types.go

@@ -87,8 +87,15 @@ type OpenStackMachineSpec struct {
 	AdditionalBlockDevices []AdditionalBlockDevice `json:"additionalBlockDevices,omitempty"`
 
 	// The server group to assign the machine to
+	//
+	// Deprecated: Use serverGroup instead. serverGroupID will be silently ignored if serverGroup is set.
 	ServerGroupID string `json:"serverGroupID,omitempty"`
 
+	// The server group to assign the machine to.
+	// If specified, this will override the managed server group for the machine if server groups are managed.
+	// +optional
+	ServerGroup ServerGroupFilter `json:"serverGroup,omitempty"`
+
 	// IdentityRef is a reference to a identity to be used when reconciling this cluster
 	// +optional
 	IdentityRef *OpenStackIdentityReference `json:"identityRef,omitempty"`

api/v1alpha7/types.go

@@ -215,6 +215,11 @@ type AdditionalBlockDevice struct {
 	Storage BlockDeviceStorage `json:"storage"`
 }
 
+type ServerGroupFilter struct {
+	ID string `json:"id,omitempty"`
+	Name string `json:"name,omityempty"`
+}
+
 // BlockDeviceType defines the type of block device to create.
 type BlockDeviceType string