Feat/net/controlplane Manage FailureDomain on multipld az

ubbleai · Dec 5, 2023 · f90fb94 · f90fb94
1 parent 7e07555
commit f90fb94
Show file tree

Hide file tree

Showing 36 changed files with 2,090 additions and 85 deletions.
diff --git a/api/v1beta1/osccluster_types.go b/api/v1beta1/osccluster_types.go
@@ -36,10 +36,11 @@ type OscClusterSpec struct {
 
 // OscClusterStatus defines the observed state of OscCluster
 type OscClusterStatus struct {
-	Ready      bool                 `json:"ready,omitempty"`
-	Network    OscNetworkResource   `json:"network,omitempty"`
-	Conditions clusterv1.Conditions `json:"conditions,omitempty"`
-	VmState    *VmState             `json:"vmState,omitempty"`
+	Ready          bool                     `json:"ready,omitempty"`
+	Network        OscNetworkResource       `json:"network,omitempty"`
+	FailureDomains clusterv1.FailureDomains `json:"failureDomains,omitempty"`
+	Conditions     clusterv1.Conditions     `json:"conditions,omitempty"`
+	VmState        *VmState                 `json:"vmState,omitempty"`
 }
 
 //+kubebuilder:object:root=true

diff --git a/api/v1beta1/oscmachine_webhook.go b/api/v1beta1/oscmachine_webhook.go
@@ -97,12 +97,22 @@ func (m *OscMachine) ValidateUpdate(oldRaw runtime.Object) error {
 	oscMachineLog.Info("validate update old subregionName", "old subregionName", old.Spec.Node.Vm.SubregionName)
 	oscMachineLog.Info("validate update subregionName", "subregionName", m.Spec.Node.Vm.SubregionName)
 
-	if !reflect.DeepEqual(m.Spec.Node.Vm.SubregionName, old.Spec.Node.Vm.SubregionName) {
+	if old.Spec.Node.Vm.SubregionName != "" && !reflect.DeepEqual(m.Spec.Node.Vm.SubregionName, old.Spec.Node.Vm.SubregionName) {
 		allErrs = append(allErrs,
 			field.Invalid(field.NewPath("spec", "subregionName"),
 				m.Spec.Node.Vm.SubregionName, "field is immutable"),
 		)
 	}
+
+	oscMachineLog.Info("validate update old subnetName", "old subnetName", old.Spec.Node.Vm.SubnetName)
+	oscMachineLog.Info("validate update subnetName", "subnetName", m.Spec.Node.Vm.SubnetName)
+
+	if (old.Spec.Node.Vm.SubnetName != "") && !reflect.DeepEqual(m.Spec.Node.Vm.SubnetName, old.Spec.Node.Vm.SubnetName) {
+		allErrs = append(allErrs,
+			field.Invalid(field.NewPath("spec", "subnetName"),
+				m.Spec.Node.Vm.SubnetName, "field is immutable"),
+		)
+	}
 	oscMachineLog.Info("validate update old rootDiskSize", "old rootDiskSize", old.Spec.Node.Vm.RootDisk.RootDiskSize)
 	oscMachineLog.Info("validate update rootDiskSize", "rootDiskSize", m.Spec.Node.Vm.RootDisk.RootDiskSize)
 

diff --git a/api/v1beta1/types.go b/api/v1beta1/types.go
@@ -42,6 +42,8 @@ type OscNetwork struct {
 	// The Net configuration
 	// +optional
 	Net OscNet `json:"net,omitempty"`
+	// List of subnet to spread controlPlane nodes
+	ControlPlaneSubnets []string `json:"controlPlaneSubnets,omitempty"`
 	// The Subnet configuration
 	// +optional
 	Subnets []*OscSubnet `json:"subnets,omitempty"`

diff --git a/cloud/scope/cluster.go b/cloud/scope/cluster.go
@@ -225,6 +225,14 @@ func (s ClusterScope) GetLinkRouteTablesRef() map[string][]string {
 	return s.OscCluster.Status.Network.LinkRouteTableRef
 }
 
+// SetFailureDomain sets the infrastructure provider failure domain key to the spec given as input.
+func (s *ClusterScope) SetFailureDomain(id string, spec clusterv1.FailureDomainSpec) {
+	if s.OscCluster.Status.FailureDomains == nil {
+		s.OscCluster.Status.FailureDomains = make(clusterv1.FailureDomains)
+	}
+	s.OscCluster.Status.FailureDomains[id] = spec
+}
+
 // SetLinkRouteTableRef set the status of route associate with a routeTables (a Map with tag name with cluster uid associate with resource response id)
 func (s ClusterScope) SetLinkRouteTablesRef(linkRouteTableRef map[string][]string) {
 	s.OscCluster.Status.Network.LinkRouteTableRef = linkRouteTableRef

diff --git a/cloud/services/service/load_balancer.go b/cloud/services/service/load_balancer.go
@@ -222,14 +222,15 @@ func (s *Service) GetLoadBalancer(spec *infrastructurev1beta1.OscLoadBalancer) (
 		readLoadBalancersResponse, httpRes, err = oscApiClient.LoadBalancerApi.ReadLoadBalancers(oscAuthClient).ReadLoadBalancersRequest(readLoadBalancerRequest).Execute()
 		if err != nil {
 			if httpRes != nil {
-				return false, fmt.Errorf("error %w httpRes %s", err, httpRes.Status)
-			}
-			requestStr := fmt.Sprintf("%v", readLoadBalancerRequest)
-			if reconciler.KeepRetryWithError(
-				requestStr,
-				httpRes.StatusCode,
-				reconciler.ThrottlingErrors) {
-				return false, nil
+				requestStr := fmt.Sprintf("%v", readLoadBalancerRequest)
+				if reconciler.KeepRetryWithError(
+					requestStr,
+					httpRes.StatusCode,
+					reconciler.ThrottlingErrors) {
+					return false, nil
+				} else {
+					return false, fmt.Errorf("error %w httpRes %s", err, httpRes.Status)
+				}
 			}
 			return false, err
 		}

diff --git a/cloud/tag/tag.go b/cloud/tag/tag.go
@@ -20,11 +20,12 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"net/http"
+	"regexp"
+
 	"github.com/outscale-dev/cluster-api-provider-outscale.git/util/reconciler"
 	osc "github.com/outscale/osc-sdk-go/v2"
 	"k8s.io/apimachinery/pkg/util/wait"
-	"net/http"
-	"regexp"
 )
 
 //go:generate ../../bin/mockgen -destination mock_tag/tag_mock.go -package mock_tag -source ./tag.go
@@ -72,7 +73,9 @@ func (s *Service) ReadTag(tagKey string, tagValue string) (*osc.Tag, error) {
 	oscAuthClient := s.scope.GetAuth()
 	readTagsResponse, httpRes, err := oscApiClient.TagApi.ReadTags(oscAuthClient).ReadTagsRequest(readTagsRequest).Execute()
 	if err != nil {
-		fmt.Printf("Error with http result %s", httpRes.Status)
+		if httpRes != nil {
+			fmt.Printf("Error with http result %s", httpRes.Status)
+		}
 		return nil, err
 	}
 	tags, ok := readTagsResponse.GetTagsOk()