Merge pull request #1208 from srm09/feature-0.7/failure-domain

Multi AZ failure domain support

Author: k8s-ci-robot

Makefile

@@ -106,8 +106,9 @@ help: ## Display this help
 ## --------------------------------------
 
 .PHONY: test
-test: generate lint-go ## Run tests
-	source ./hack/fetch_ext_bins.sh; fetch_tools; setup_envs; go test -v ./api/... ./controllers/... ./pkg/...
+test: $(GOVC)
+	$(MAKE) generate lint-go
+	source ./hack/fetch_ext_bins.sh; fetch_tools; setup_envs; export GOVC_BIN_PATH=$(GOVC); go test -v ./api/... ./controllers/... ./pkg/...
 
 .PHONY: e2e-image
 e2e-image: ## Build the e2e manager image

PROJECT

@@ -26,4 +26,9 @@ resources:
 - group: infrastructure
   version: v1alpha3
   kind: HAProxyLoadBalancer
-
+- group: infrastructure
+  version: v1alpha3
+  kind: VSphereFailureDomain
+- group: infrastructure
+  version: v1alpha3
+  kind: VSphereDeploymentZone

api/v1alpha2/vspherecluster_conversion.go

@@ -65,6 +65,7 @@ func (src *VSphereCluster) ConvertTo(dstRaw conversion.Hub) error { // nolint
 	}
 
 	dst.Status.Conditions = restored.Status.Conditions
+	dst.Status.FailureDomains = restored.Status.FailureDomains
 
 	return nil
 }

api/v1alpha2/vspheremachine_conversion.go

@@ -38,6 +38,7 @@ func (src *VSphereMachine) ConvertTo(dstRaw conversion.Hub) error { // nolint
 
 	dst.Spec.VirtualMachineCloneSpec = restored.Spec.VirtualMachineCloneSpec
 	dst.Status.Conditions = restored.Status.Conditions
+	dst.Spec.FailureDomain = restored.Spec.FailureDomain
 
 	return nil
 }

api/v1alpha2/vspheremachinetemplate_conversion.go

@@ -37,6 +37,7 @@ func (src *VSphereMachineTemplate) ConvertTo(dstRaw conversion.Hub) error { // n
 	}
 
 	dst.Spec.Template.Spec.VirtualMachineCloneSpec = restored.Spec.Template.Spec.VirtualMachineCloneSpec
+	dst.Spec.Template.Spec.FailureDomain = restored.Spec.Template.Spec.FailureDomain
 
 	return nil
 }

api/v1alpha2/zz_generated.conversion.go

@@ -47,6 +47,20 @@ const (
 	// while installing the container storage interface  addon; those kind of errors are usually transient
 	// the operation is automatically re-tried by the controller.
 	CSIProvisioningFailedReason = "CSIProvisioningFailed"
+
+	// FailureDomainsAvailableCondition documents the status of the failure domains
+	// associated to the VSphereCluster.
+	FailureDomainsAvailableCondition clusterv1.ConditionType = "FailureDomainsAvailable"
+
+	// FailureDomainsSkippedReason (Severity=Info) documents that some of the failure domain statuses
+	// associated to the VSphereCluster are reported as not ready.
+	FailureDomainsSkippedReason = "FailureDomainsSkipped"
+
+	// WaitingForFailureDomainStatusReason (Severity=Info) documents that some of the failure domains
+	// associated to the VSphereCluster are not reporting the Ready status.
+	// Instead of reporting a false ready status, these failure domains are still under the process of reconciling
+	// and hence not yet reporting their status.
+	WaitingForFailureDomainStatusReason = "WaitingForFailureDomainStatus"
 )
 
 // Conditions and condition Reasons for the VSphereMachine and the VSphereVM object.
@@ -105,13 +119,15 @@ const (
 
 const (
 	// VCenterAvailableCondition documents the connectivity with vcenter
-	// for a given VSphereCluster
+	// for a given resource
 	VCenterAvailableCondition clusterv1.ConditionType = "VCenterAvailable"
 
-	// VCenterUnreachableReason (Severity=Error) documents a VSphereCluster controller detecting
-	// issues with VCenter reachability;
+	// VCenterUnreachableReason (Severity=Error) documents a controller detecting
+	// issues with VCenter reachability
 	VCenterUnreachableReason = "VCenterUnreachable"
+)
 
+const (
 	// CredentialsAvailableCondidtion is used by VSphereClusterIdentity when a credential secret is available and unused by other VSphereClusterIdentities
 	CredentialsAvailableCondidtion clusterv1.ConditionType = "CredentialsAvailable"
 
@@ -124,3 +140,48 @@ const (
 	// SecretAlreadyInUseReason is used when another VSphereClusterIdentity is using the secret
 	SecretAlreadyInUseReason = "SecretInUse"
 )
+
+const (
+	// PlacementConstraintMetCondition documents whether the placement constraint is configured correctly or not.
+	PlacementConstraintMetCondition clusterv1.ConditionType = "PlacementConstraintMet"
+
+	// ResourcePoolNotFoundReason (Severity=Error) documents that the resource pool in the placement constraint
+	// associated to the VSphereDeploymentZone is misconfigured.
+	ResourcePoolNotFoundReason = "ResourcePoolNotFound"
+
+	// FolderNotFoundReason (Severity=Error) documents that the folder in the placement constraint
+	// associated to the VSphereDeploymentZone is misconfigured.
+	FolderNotFoundReason = "FolderNotFound"
+)
+
+const (
+	// VSphereFailureDomainValidatedCondition documents whether the failure domain for the deployment zone is configured correctly or not.
+	VSphereFailureDomainValidatedCondition clusterv1.ConditionType = "VSphereFailureDomainValidated"
+
+	// RegionMisconfiguredReason (Severity=Error) documents that the region for the Failure Domain associated to
+	// the VSphereDeploymentZone is misconfigured.
+	RegionMisconfiguredReason = "FailureDomainRegionMisconfigured"
+
+	// ZoneMisconfiguredReason (Severity=Error) documents that the zone for the Failure Domain associated to
+	// the VSphereDeploymentZone is misconfigured.
+	ZoneMisconfiguredReason = "FailureDomainZoneMisconfigured"
+
+	// ComputeClusterNotFoundReason (Severity=Error) documents that the Compute Cluster for the Failure Domain
+	// associated to the VSphereDeploymentZone cannot be found.
+	ComputeClusterNotFoundReason = "ComputeClusterNotFound"
+
+	// HostsMisconfiguredReason (Severity=Error) documents that the VM & Host Group details for the Failure Domain
+	// associated to the VSphereDeploymentZone are misconfigured.
+	HostsMisconfiguredReason = "HostsMisconfigured"
+
+	// HostsAffinityMisconfiguredReason (Severity=Warning) documents that the VM & Host Group affinity rule for the FailureDomain is disabled.
+	HostsAffinityMisconfiguredReason = "HostsAffinityMisconfigured"
+
+	// NetworkNotFoundReason (Severity=Error) documents that the networks in the topology for the Failure Domain
+	// associated to the VSphereDeploymentZone are misconfigured.
+	NetworkNotFoundReason = "NetworkNotFound"
+
+	// DatastoreNotFoundReason (Severity=Error) documents that the datastore in the topology for the Failure Domain
+	// associated to the VSphereDeploymentZone is misconfigured.
+	DatastoreNotFoundReason = "DatastoreNotFound"
+)

api/v1alpha3/condition_consts.go

@@ -77,6 +77,9 @@ type VSphereClusterStatus struct {
 	// Conditions defines current service state of the VSphereCluster.
 	// +optional
 	Conditions clusterv1.Conditions `json:"conditions,omitempty"`
+
+	// FailureDomains is a list of failure domain objects synced from the infrastructure provider.
+	FailureDomains clusterv1.FailureDomains `json:"failureDomains,omitempty"`
 }
 
 // +kubebuilder:object:root=true

api/v1alpha3/vspherecluster_types.go

@@ -0,0 +1,99 @@
+/*
+Copyright 2021 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 v1alpha3
+
+import (
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha3"
+)
+
+// VSphereDeploymentZoneSpec defines the desired state of VSphereDeploymentZone
+type VSphereDeploymentZoneSpec struct {
+
+	// Server is the address of the vSphere endpoint.
+	Server string `json:"server,omitempty"`
+
+	// failureDomain is the name of the VSphereFailureDomain used for this VSphereDeploymentZone
+	FailureDomain string `json:"failureDomain,omitempty"`
+
+	// ControlPlane determines if this failure domain is suitable for use by control plane machines.
+	// +optional
+	ControlPlane *bool `json:"controlPlane,omitempty"`
+
+	// PlacementConstraint encapsulates the placement constraints
+	// used within this deployment zone.
+	PlacementConstraint PlacementConstraint `json:"placementConstraint"`
+}
+
+// PlacementConstraint is the context information for VM placements within a failure domain
+type PlacementConstraint struct {
+	// ResourcePool is the name or inventory path of the resource pool in which
+	// the virtual machine is created/located.
+	// +optional
+	ResourcePool string `json:"resourcePool,omitempty"`
+
+	// Folder is the name or inventory path of the folder in which the
+	// virtual machine is created/located.
+	// +optional
+	Folder string `json:"folder,omitempty"`
+}
+
+type VSphereDeploymentZoneStatus struct {
+	// Ready is true when the VSphereDeploymentZone resource is ready.
+	// If set to false, it will be ignored by VSphereClusters
+	// +optional
+	Ready *bool `json:"ready,omitempty"`
+
+	// Conditions defines current service state of the VSphereMachine.
+	// +optional
+	Conditions clusterv1.Conditions `json:"conditions,omitempty"`
+}
+
+// +kubebuilder:object:root=true
+// +kubebuilder:resource:path=vspheredeploymentzones,scope=Cluster,categories=cluster-api
+// +kubebuilder:storageversion
+// +kubebuilder:subresource:status
+
+// VSphereDeploymentZone is the Schema for the vspheredeploymentzones API
+type VSphereDeploymentZone struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+
+	Spec   VSphereDeploymentZoneSpec   `json:"spec,omitempty"`
+	Status VSphereDeploymentZoneStatus `json:"status,omitempty"`
+}
+
+func (z *VSphereDeploymentZone) GetConditions() clusterv1.Conditions {
+	return z.Status.Conditions
+}
+
+func (z *VSphereDeploymentZone) SetConditions(conditions clusterv1.Conditions) {
+	z.Status.Conditions = conditions
+}
+
+// +kubebuilder:object:root=true
+
+// VSphereDeploymentZoneList contains a list of VSphereDeploymentZone
+type VSphereDeploymentZoneList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata,omitempty"`
+	Items           []VSphereDeploymentZone `json:"items"`
+}
+
+func init() {
+	SchemeBuilder.Register(&VSphereDeploymentZone{}, &VSphereDeploymentZoneList{})
+}

api/v1alpha3/vspheredeploymentzone_types.go

@@ -0,0 +1,40 @@
+/*
+Copyright 2021 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 v1alpha3
+
+import (
+	"k8s.io/utils/pointer"
+	ctrl "sigs.k8s.io/controller-runtime"
+	"sigs.k8s.io/controller-runtime/pkg/webhook"
+)
+
+func (r *VSphereDeploymentZone) SetupWebhookWithManager(mgr ctrl.Manager) error {
+	return ctrl.NewWebhookManagedBy(mgr).
+		For(r).
+		Complete()
+}
+
+// +kubebuilder:webhook:verbs=create;update,path=/mutate-infrastructure-cluster-x-k8s-io-v1alpha3-vspheredeploymentzone,mutating=true,failurePolicy=fail,matchPolicy=Equivalent,groups=infrastructure.cluster.x-k8s.io,resources=vspheredeploymentzones,versions=v1alpha3,name=default.vspheredeploymentzone.infrastructure.cluster.x-k8s.io,sideEffects=None
+
+var _ webhook.Defaulter = &VSphereDeploymentZone{}
+
+// Default implements webhook.Defaulter so a webhook will be registered for the type
+func (r *VSphereDeploymentZone) Default() {
+	if r.Spec.ControlPlane == nil {
+		r.Spec.ControlPlane = pointer.BoolPtr(true)
+	}
+}