Infra: Add Dedicated Host resource

Add a Dedicated Host resource definition and add support
to define Dedicate Hosts for Infrastructure cluster resources,
to allow creation of Dedicated Hosts during resource creation.

Author: cjschaef

api/v1beta1/zz_generated.conversion.go

@@ -88,6 +88,11 @@ const (
 	// NetworkReconciliationFailedReason used when an error occurs during network reconciliation.
 	NetworkReconciliationFailedReason = "NetworkReconciliationFailed"
 
+	// VPCDedicatedHostReadyCondition reports on the successful reconcilication of a VPC Dedicated Host.
+	VPCDedicatedHostReadyCondition capiv1beta1.ConditionType = "VPCDedicatedHostReady"
+	// VPCDedicatedHostReconciliationFailedReason used when an error occurs during VPC Dedicated Host reconciliation.
+	VPCDedicatedHostReconciliationFailedReason = "VPCDedicatedHostReconciliationFailed"
+
 	// VPCSecurityGroupReadyCondition reports on the successful reconciliation of a VPC.
 	VPCSecurityGroupReadyCondition capiv1beta1.ConditionType = "VPCSecurityGroupReady"
 	// VPCSecurityGroupReconciliationFailedReason used when an error occurs during VPC reconciliation.

api/v1beta2/conditions_consts.go

@@ -56,6 +56,9 @@ type IBMVPCClusterSpec struct {
 	// +optional
 	ControlPlaneLoadBalancer *VPCLoadBalancerSpec `json:"controlPlaneLoadBalancer,omitempty"`
 
+	// DedicatedHosts represents the Dedicated Hosts to create for the cluster.
+	DedicatedHosts []VPCDedicatedHost `json:"dedicatedHosts,omitempty"`
+
 	// image represents the Image details used for the cluster.
 	// +optional
 	Image *ImageSpec `json:"image,omitempty"`
@@ -288,6 +291,11 @@ type IBMVPCClusterStatus struct {
 	// dep: rely on Network instead.
 	VPC VPC `json:"vpc,omitempty"`
 
+	// DedicatedHosts references the Dedicated Hosts of the cluster.
+	// The map simplifies lookups.
+	// +optional
+	DedicatedHosts map[string]*ResourceStatus `json:"dedicatedHosts,omitempty"`
+
 	// image is the status of the VPC Custom Image.
 	// +optional
 	Image *ResourceStatus `json:"image,omitempty"`

api/v1beta2/ibmvpccluster_types.go

@@ -279,6 +279,8 @@ var (
 	ResourceTypePublicGateway = ResourceType("publicGateway")
 	// ResourceTypeCustomImage is a VPC Custom Image.
 	ResourceTypeCustomImage = ResourceType("customImage")
+	// ResourceTypeDedicatedHost is a VPC Dedicated Host.
+	ResourceTypeDedicatedHost = ResourceType("dedicatedHost")
 )
 
 const (
@@ -388,6 +390,31 @@ type NetworkInterface struct {
 	Subnet string `json:"subnet,omitempty"`
 }
 
+// VPCDedicatedHost represents a VPC Dedicated Host.
+// +kubebuilder:validation:XValidation:rule="has(self.id) || has(self.name)",message="an id or a name must be defined"
+// +kubebuilder:validation:XValidation:rule="(has(self.profile) && has(self.name)) || !has(self.profile)",message="a name must be defined if a profile has been defined"
+type VPCDedicatedHost struct {
+	// Group defines the VPC Dedicated Host Group the host resides in.
+	// +optional
+	Group *string `json:"group,omitempty"`
+
+	// ID defines the ID of a VPC Dedicated Host.
+	// +optional
+	ID *string `json:"id,omitempty"`
+
+	// Name defines the name of a VPC Dedicated Host.
+	// +optional
+	Name *string `json:"name,omitempty"`
+
+	// Profile defines the profile of a VPC Dedicated Host.
+	// +optional
+	Profile *string `json:"profile,omitempty"`
+
+	// Zone defines the zone of a VPC Dedicated Host.
+	// +required
+	Zone string `json:"zone"`
+}
+
 // VPCLoadBalancerBackendPoolMember represents a VPC Load Balancer Backend Pool Member.
 type VPCLoadBalancerBackendPoolMember struct {
 	// LoadBalancer defines the Load Balancer the Pool Member is for.
@@ -411,6 +438,7 @@ type VPCLoadBalancerBackendPoolMember struct {
 // +kubebuilder:validation:XValidation:rule="(has(self.dedicatedHost) && !has(self.dedicatedHostGroup) && !has(self.placementGroup)) || (!has(self.dedicatedHost) && has(self.dedicatedHostGroup) && !has(self.placementGroup)) || (!has(self.dedicatedHost) && !has(self.dedicatedHostGroup) && has(self.placementGroup))",message="only one of dedicatedHost, dedicatedHostGroup, or placementGroup must be defined for machine placement"
 type VPCMachinePlacementTarget struct {
 	// DedicatedHost defines the Dedicated Host to place a VPC Machine (Instance) on.
+	// TODO(cjschaef): Migrate to unified type with DedicatedHostProfile.
 	// +optional
 	DedicatedHost *VPCResource `json:"dedicatedHost,omitempty"`
 

api/v1beta2/types.go

@@ -436,6 +436,38 @@ spec:
                         rule: has(self.id) || has(self.name)
                     type: array
                 type: object
+              dedicatedHosts:
+                description: DedicatedHosts represents the Dedicated Hosts to create
+                  for the cluster.
+                items:
+                  description: VPCDedicatedHost represents a VPC Dedicated Host.
+                  properties:
+                    group:
+                      description: Group defines the VPC Dedicated Host Group the
+                        host resides in.
+                      type: string
+                    id:
+                      description: ID defines the ID of a VPC Dedicated Host.
+                      type: string
+                    name:
+                      description: Name defines the name of a VPC Dedicated Host.
+                      type: string
+                    profile:
+                      description: Profile defines the profile of a VPC Dedicated
+                        Host.
+                      type: string
+                    zone:
+                      description: Zone defines the zone of a VPC Dedicated Host.
+                      type: string
+                  required:
+                  - zone
+                  type: object
+                  x-kubernetes-validations:
+                  - message: an id or a name must be defined
+                    rule: has(self.id) || has(self.name)
+                  - message: a name must be defined if a profile has been defined
+                    rule: (has(self.profile) && has(self.name)) || !has(self.profile)
+                type: array
               image:
                 description: image represents the Image details used for the cluster.
                 properties:
@@ -1162,6 +1194,30 @@ spec:
                 description: ControlPlaneLoadBalancerState is the status of the load
                   balancer.
                 type: string
+              dedicatedHosts:
+                additionalProperties:
+                  description: ResourceStatus identifies a resource by id (and name)
+                    and whether it is ready.
+                  properties:
+                    id:
+                      description: id defines the Id of the IBM Cloud resource status.
+                      type: string
+                    name:
+                      description: name defines the name of the IBM Cloud resource
+                        status.
+                      type: string
+                    ready:
+                      description: ready defines whether the IBM Cloud resource is
+                        ready.
+                      type: boolean
+                  required:
+                  - id
+                  - ready
+                  type: object
+                description: |-
+                  DedicatedHosts references the Dedicated Hosts of the cluster.
+                  The map simplifies lookups.
+                type: object
               image:
                 description: image is the status of the VPC Custom Image.
                 properties:

api/v1beta2/zz_generated.deepcopy.go

@@ -287,6 +287,42 @@ spec:
                                 rule: has(self.id) || has(self.name)
                             type: array
                         type: object
+                      dedicatedHosts:
+                        description: DedicatedHosts represents the Dedicated Hosts
+                          to create for the cluster.
+                        items:
+                          description: VPCDedicatedHost represents a VPC Dedicated
+                            Host.
+                          properties:
+                            group:
+                              description: Group defines the VPC Dedicated Host Group
+                                the host resides in.
+                              type: string
+                            id:
+                              description: ID defines the ID of a VPC Dedicated Host.
+                              type: string
+                            name:
+                              description: Name defines the name of a VPC Dedicated
+                                Host.
+                              type: string
+                            profile:
+                              description: Profile defines the profile of a VPC Dedicated
+                                Host.
+                              type: string
+                            zone:
+                              description: Zone defines the zone of a VPC Dedicated
+                                Host.
+                              type: string
+                          required:
+                          - zone
+                          type: object
+                          x-kubernetes-validations:
+                          - message: an id or a name must be defined
+                            rule: has(self.id) || has(self.name)
+                          - message: a name must be defined if a profile has been
+                              defined
+                            rule: (has(self.profile) && has(self.name)) || !has(self.profile)
+                        type: array
                       image:
                         description: image represents the Image details used for the
                           cluster.