add defaultPortIP to lbm status

stackitcloud · Dec 22, 2022 · b1c541d · b1c541d
1 parent 1b66247
commit b1c541d
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 2 deletions.
diff --git a/api/v1beta1/loadbalancermachine_types.go b/api/v1beta1/loadbalancermachine_types.go
@@ -75,9 +75,12 @@ type LoadBalancerMachineStatus struct {
 	// DefaultPortID contains the default openstack port ID for a LoadBalancerMachine.
 	// +optional
 	DefaultPortID *string `json:"defaultPortID,omitempty"`
-	// DefaultPortID contains the default openstack port ID for a LoadBalancerMachine.
+	// DefaultPortName contains the default openstack port Name for a LoadBalancerMachine.
 	// +optional
 	DefaultPortName *string `json:"defaultPortName,omitempty"`
+	// DefaultPortIP contains the default openstack port IP for a LoadBalancerMachine.
+	// +optional
+	DefaultPortIP *string `json:"defaultPortIP,omitempty"`
 	// ServiceAccountName contains the namespacedName from the ServiceAccount for a LoadBalancerMachine.
 	// +optional
 	ServiceAccountName *string `json:"serviceAccountName,omitempty"`

diff --git a/api/v1beta1/zz_generated.deepcopy.go b/api/v1beta1/zz_generated.deepcopy.go
diff --git a/charts/yawol-controller/crds/yawol.stackit.cloud_loadbalancermachines.yaml b/charts/yawol-controller/crds/yawol.stackit.cloud_loadbalancermachines.yaml
@@ -266,8 +266,12 @@ spec:
                 description: DefaultPortID contains the default openstack port ID
                   for a LoadBalancerMachine.
                 type: string
+              defaultPortIP:
+                description: DefaultPortIP contains the default openstack port IP
+                  for a LoadBalancerMachine.
+                type: string
               defaultPortName:
-                description: DefaultPortID contains the default openstack port ID
+                description: DefaultPortName contains the default openstack port Name
                   for a LoadBalancerMachine.
                 type: string
               lastOpenstackReconcile:

diff --git a/controllers/yawol-controller/loadbalancermachine/loadbalancermachine_controller.go b/controllers/yawol-controller/loadbalancermachine/loadbalancermachine_controller.go
@@ -476,6 +476,16 @@ func (r *LoadBalancerMachineReconciler) reconcilePort(
 		return helper.ErrFailedToCreatePortForLBM
 	}
 
+	// Patch defaultPortIP to status
+	if len(port.FixedIPs) >= 1 &&
+		(lbm.Status.DefaultPortIP == nil || *lbm.Status.DefaultPortIP != port.FixedIPs[0].IPAddress) {
+		if err := helper.PatchLBMStatus(ctx, r.Status(), lbm, yawolv1beta1.LoadBalancerMachineStatus{
+			DefaultPortIP: &port.FixedIPs[0].IPAddress,
+		}); err != nil {
+			return err
+		}
+	}
+
 	return nil
 }
 
@@ -808,6 +818,7 @@ func (r *LoadBalancerMachineReconciler) deletePort(
 		if err = openstackhelper.DeletePort(ctx, portClient, *lbm.Status.DefaultPortID); err != nil {
 			switch err.(type) {
 			case gophercloud.ErrDefault404:
+				_ = helper.RemoveFromLBMStatus(ctx, r.Status(), lbm, "defaultPortIP")
 				if err := helper.RemoveFromLBMStatus(ctx, r.Client.Status(), lbm, "defaultPortID"); err != nil {
 					return false, err
 				}

diff --git a/controllers/yawol-controller/loadbalancermachine/loadbalancermachine_controller_test.go b/controllers/yawol-controller/loadbalancermachine/loadbalancermachine_controller_test.go
@@ -262,9 +262,14 @@ var _ = Describe("load balancer machine", func() {
 				g.Expect(k8sClient.Get(ctx, lbmNN, &actual)).To(Succeed())
 
 				g.Expect(actual.Status.DefaultPortName).ToNot(BeNil())
+				g.Expect(actual.Status.DefaultPortIP).ToNot(BeNil())
+				g.Expect(actual.Status.DefaultPortID).ToNot(BeNil())
 				port, err := client.PortClientObj.Get(ctx, *actual.Status.DefaultPortID)
 				g.Expect(err).To(Succeed())
 				g.Expect(len(port.AllowedAddressPairs)).To(Equal(1))
+				g.Expect(len(port.AllowedAddressPairs)).To(Equal(1))
+				g.Expect(len(port.FixedIPs)).To(Equal(1))
+				g.Expect(port.FixedIPs[0].IPAddress).To(Equal(*actual.Status.DefaultPortIP))
 
 				var actualLB yawolv1beta1.LoadBalancer
 				g.Expect(k8sClient.Get(ctx, lbNN, &actualLB)).To(Succeed())