Merge pull request #29 from GDATASoftwareAG/define-lans-in-spec

define lans in spec

Author: farodin91

api/v1alpha1/ionoscloudcluster_types.go

@@ -99,8 +99,10 @@ type IONOSCloudClusterSpec struct {
 	Location Location `json:"location"`
 
 	// +kubebuilder:validation:MinLength=1
-	IdentityName         string                `json:"identityName"`
-	ControlPlaneEndpoint clusterv1.APIEndpoint `json:"controlPlaneEndpoint"`
+	IdentityName         string                 `json:"identityName"`
+	ControlPlaneEndpoint clusterv1.APIEndpoint  `json:"controlPlaneEndpoint"`
+	Lans                 []IONOSLanSpec         `json:"lans,omitempty"`
+	LoadBalancer         *IONOSLoadBalancerSpec `json:"loadBalancer,omitempty"`
 
 	// +kubebuilder:validation:XValidation:rule="self == oldSelf",message="DataCenterID is immutable"
 	DataCenterID string `json:"dataCenterID,omitempty"`
@@ -156,3 +158,51 @@ func (c *IONOSCloudCluster) SetConditions(conditions clusterv1.Conditions) {
 func init() {
 	SchemeBuilder.Register(&IONOSCloudCluster{}, &IONOSCloudClusterList{})
 }
+
+type IONOSLanSpec struct {
+	LanID  *int32 `json:"lanID,omitempty"` //validate?
+	Name   string `json:"name"`            //validate?
+	Public bool   `json:"public"`
+	//NameTemplate string   `json:"nameTemplate"`
+	//FailoverIPs  []string `json:"failoverIPs,omitempty"`
+}
+
+type IONOSLoadBalancerSpec struct {
+	ID             string          `json:"id,omitempty"`
+	ListenerLanRef IONOSLanRefSpec `json:"listenerLanRef"`
+	TargetLanRef   IONOSLanRefSpec `json:"targetLanRef"`
+}
+
+func (c *IONOSCloudCluster) Lan(name string) *IONOSLanSpec {
+	for i := range c.Spec.Lans {
+		if c.Spec.Lans[i].Name == name {
+			return &c.Spec.Lans[i]
+		}
+	}
+	return nil
+}
+
+func (c *IONOSCloudCluster) LanBy(id *int32) *IONOSLanSpec {
+	if id == nil || *id == 0 {
+		return nil
+	}
+	for i := range c.Spec.Lans {
+		if c.Spec.Lans[i].LanID == id {
+			return &c.Spec.Lans[i]
+		}
+	}
+	return nil
+}
+
+func (c *IONOSCloudCluster) EnsureLan(spec IONOSLanSpec) {
+	if spec.Name == "" {
+		return
+	}
+	for i := range c.Spec.Lans {
+		if c.Spec.Lans[i].Name == spec.Name {
+			c.Spec.Lans[i] = spec
+			return
+		}
+	}
+	c.Spec.Lans = append(c.Spec.Lans, spec)
+}

api/v1alpha1/ionoscloudmachine_types.go

@@ -59,7 +59,8 @@ type IONOSCloudMachineSpec struct {
 	// +kubebuilder:validation:XValidation:rule="self == oldSelf",message="IP is immutable"
 	IP *string `json:"ip,omitempty"`
 	// +kubebuilder:validation:XValidation:rule="self == oldSelf",message="ProviderID is immutable"
-	ProviderID string `json:"providerID,omitempty"`
+	ProviderID string         `json:"providerID,omitempty"`
+	Nics       []IONOSNicSpec `json:"nics,omitempty"`
 }
 
 // +kubebuilder:validation:XValidation:rule="!has(oldSelf.sshKeys) || has(self.sshKeys)", message="SSHKeys is required once set"
@@ -75,6 +76,12 @@ type IONOSVolumeSpec struct {
 	SSHKeys *[]string `json:"sshKeys,omitempty"`
 }
 
+type IONOSNicSpec struct {
+	LanRef    IONOSLanRefSpec `json:"lanRef"`
+	PrimaryIP *string         `json:"primaryIP,omitempty"`
+	//NameTemplate string  `json:"nameTemplate"`
+}
+
 // IONOSCloudMachineStatus defines the observed state of IONOSCloudMachine
 type IONOSCloudMachineStatus struct {
 	// Ready is true when the provider resource is ready.
@@ -117,3 +124,16 @@ func (c *IONOSCloudMachine) SetConditions(conditions clusterv1.Conditions) {
 func init() {
 	SchemeBuilder.Register(&IONOSCloudMachine{}, &IONOSCloudMachineList{})
 }
+
+func (c *IONOSCloudMachine) EnsureNic(spec IONOSNicSpec) {
+	if spec.LanRef.Name == "" {
+		return
+	}
+	for i := range c.Spec.Nics {
+		if c.Spec.Nics[i].LanRef.Name == spec.LanRef.Name {
+			c.Spec.Nics[i] = spec
+			return
+		}
+	}
+	c.Spec.Nics = append(c.Spec.Nics, spec)
+}

api/v1alpha1/types.go

@@ -0,0 +1,5 @@
+package v1alpha1
+
+type IONOSLanRefSpec struct {
+	Name string `json:"name"`
+}

api/v1alpha1/zz_generated.deepcopy.go

@@ -62,6 +62,43 @@ spec:
                 x-kubernetes-validations:
                 - message: InternetLanID is immutable
                   rule: self == oldSelf
+              lans:
+                items:
+                  properties:
+                    lanID:
+                      format: int32
+                      type: integer
+                    name:
+                      type: string
+                    public:
+                      type: boolean
+                  required:
+                  - name
+                  - public
+                  type: object
+                type: array
+              loadBalancer:
+                properties:
+                  id:
+                    type: string
+                  listenerLanRef:
+                    properties:
+                      name:
+                        type: string
+                    required:
+                    - name
+                    type: object
+                  targetLanRef:
+                    properties:
+                      name:
+                        type: string
+                    required:
+                    - name
+                    type: object
+                required:
+                - listenerLanRef
+                - targetLanRef
+                type: object
               loadBalancerID:
                 type: string
                 x-kubernetes-validations:

config/crd/bases/infrastructure.cluster.x-k8s.io_ionoscloudclusters.yaml

@@ -104,6 +104,22 @@ spec:
               name:
                 description: The name of the  resource.
                 type: string
+              nics:
+                items:
+                  properties:
+                    lanRef:
+                      properties:
+                        name:
+                          type: string
+                      required:
+                      - name
+                      type: object
+                    primaryIP:
+                      type: string
+                  required:
+                  - lanRef
+                  type: object
+                type: array
               providerID:
                 type: string
                 x-kubernetes-validations:

config/crd/bases/infrastructure.cluster.x-k8s.io_ionoscloudmachines.yaml

@@ -115,6 +115,22 @@ spec:
                       name:
                         description: The name of the  resource.
                         type: string
+                      nics:
+                        items:
+                          properties:
+                            lanRef:
+                              properties:
+                                name:
+                                  type: string
+                              required:
+                              - name
+                              type: object
+                            primaryIP:
+                              type: string
+                          required:
+                          - lanRef
+                          type: object
+                        type: array
                       providerID:
                         type: string
                         x-kubernetes-validations:

config/crd/bases/infrastructure.cluster.x-k8s.io_ionoscloudmachinetemplates.yaml

@@ -221,6 +221,12 @@ func (r *IONOSCloudClusterReconciler) reconcilePrivateLan(ctx *context.ClusterCo
 		ctx.IONOSCloudCluster.Spec.PrivateLanID = lanID
 	}
 
+	ctx.IONOSCloudCluster.EnsureLan(v1alpha1.IONOSLanSpec{
+		Name:   "private",
+		LanID:  ctx.IONOSCloudCluster.Spec.PrivateLanID,
+		Public: false,
+	})
+
 	// check status
 	lanId := fmt.Sprint(*ctx.IONOSCloudCluster.Spec.PrivateLanID)
 	lan, resp, err := ctx.IONOSClient.GetLan(ctx, ctx.IONOSCloudCluster.Spec.DataCenterID, lanId)
@@ -248,6 +254,12 @@ func (r *IONOSCloudClusterReconciler) reconcilePublicLan(ctx *context.ClusterCon
 		ctx.IONOSCloudCluster.Spec.PublicLanID = lanID
 	}
 
+	ctx.IONOSCloudCluster.EnsureLan(v1alpha1.IONOSLanSpec{
+		Name:   "public",
+		LanID:  ctx.IONOSCloudCluster.Spec.PublicLanID,
+		Public: true,
+	})
+
 	// check status
 	lanId := fmt.Sprint(*ctx.IONOSCloudCluster.Spec.PublicLanID)
 	lan, resp, err := ctx.IONOSClient.GetLan(ctx, ctx.IONOSCloudCluster.Spec.DataCenterID, lanId)
@@ -274,6 +286,12 @@ func (r *IONOSCloudClusterReconciler) reconcileInternet(ctx *context.ClusterCont
 		ctx.IONOSCloudCluster.Spec.InternetLanID = lanID
 	}
 
+	ctx.IONOSCloudCluster.EnsureLan(v1alpha1.IONOSLanSpec{
+		Name:   "internet",
+		LanID:  ctx.IONOSCloudCluster.Spec.InternetLanID,
+		Public: true,
+	})
+
 	// check status
 	lanId := fmt.Sprint(*ctx.IONOSCloudCluster.Spec.InternetLanID)
 	lan, resp, err := ctx.IONOSClient.GetLan(ctx, ctx.IONOSCloudCluster.Spec.DataCenterID, lanId)
@@ -325,6 +343,16 @@ func (r *IONOSCloudClusterReconciler) reconcileLoadBalancer(ctx *context.Cluster
 		ctx.IONOSCloudCluster.Spec.LoadBalancerID = *loadBalancer.Id
 	}
 
+	ctx.IONOSCloudCluster.Spec.LoadBalancer = &v1alpha1.IONOSLoadBalancerSpec{
+		ID: ctx.IONOSCloudCluster.Spec.LoadBalancerID,
+		ListenerLanRef: v1alpha1.IONOSLanRefSpec{
+			Name: "public",
+		},
+		TargetLanRef: v1alpha1.IONOSLanRefSpec{
+			Name: "private",
+		},
+	}
+
 	// check status
 	loadBalancer, resp, err := ctx.IONOSClient.GetLoadBalancer(ctx, ctx.IONOSCloudCluster.Spec.DataCenterID, ctx.IONOSCloudCluster.Spec.LoadBalancerID)
 	if err != nil && resp.StatusCode != http.StatusNotFound {

internal/controller/ionoscloudcluster_controller.go

@@ -384,10 +384,20 @@ func (r *IONOSCloudMachineReconciler) reconcileServer(ctx *context.MachineContex
 
 	nics := *server.Entities.Nics.Items
 	for _, nic := range nics {
+		ips := *nic.Properties.Ips
 		if strings.HasSuffix(*nic.Properties.Name, "-nic-lb") {
-			ips := *nic.Properties.Ips
 			ctx.IONOSCloudMachine.Spec.IP = &ips[0]
 		}
+		lan := ctx.IONOSCloudCluster.LanBy(nic.Properties.Lan)
+		if lan == nil {
+			continue
+		}
+		ctx.IONOSCloudMachine.EnsureNic(v1alpha1.IONOSNicSpec{
+			LanRef: v1alpha1.IONOSLanRefSpec{
+				Name: lan.Name,
+			},
+			PrimaryIP: &ips[0],
+		})
 	}
 
 	if ctx.IONOSCloudMachine.Spec.IP == nil {