Remove IP states to Pending, Allocated

Author: afritzler

Makefile

@@ -160,7 +160,7 @@ KUBECTL_BIN ?= $(LOCAL_BIN)/kubectl
 ## Tools versions
 ADDLICENSE_VERSION ?= v1.1.1
 CONTROLLER_GEN_VERSION ?= v0.14.0
-GOLANGCI_LINT_VERSION ?= v1.55.2
+GOLANGCI_LINT_VERSION ?= v1.63
 GOIMPORTS_VERSION ?= v0.16.1
 ENVTEST_K8S_VERSION ?= 1.31.0
 CODE_GENERATOR_VERSION ?= v0.28.3

api/ipam/v1alpha1/ip_types.go

@@ -9,9 +9,10 @@ import (
 )
 
 const (
-	CFailedIPState     IPState = "Failed"
-	CProcessingIPState IPState = "Processing"
-	CFinishedIPState   IPState = "Finished"
+	// TODO: Remove failed state
+	IPStateFailed    IPState = "Failed"
+	IPStatePending   IPState = "Pending"
+	IPStateAllocated IPState = "Allocated"
 )
 
 // IPState is a processing state of IP resource

api/ipam/v1alpha1/subnet_webhook.go

@@ -59,7 +59,7 @@ func (in *Subnet) SetupWebhookWithManager(mgr ctrl.Manager) error {
 		}
 		state := ip.Status.State
 		parentSubnet := ip.Spec.Subnet.Name
-		if state != CFinishedIPState {
+		if state != IPStateAllocated {
 			return nil
 		}
 		return []string{parentSubnet}

api/ipam/v1alpha1/subnet_webhook_test.go

@@ -579,7 +579,7 @@ var _ = Describe("Subnet webhook", func() {
 				return err == nil
 			}, CTimeout, CInterval).Should(BeTrue())
 
-			childIP.Status.State = CFinishedIPState
+			childIP.Status.State = IPStateAllocated
 			Expect(k8sClient.Status().Update(ctx, &childIP)).Should(Succeed())
 			Eventually(func() bool {
 				childIPsMatchingFields := client.MatchingFields{

controllers/ip_controller.go

@@ -109,13 +109,13 @@ func (r *IPReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Re
 		return ctrl.Result{}, err
 	}
 
-	if ip.Status.State == v1alpha1.CFinishedIPState ||
-		ip.Status.State == v1alpha1.CFailedIPState {
+	if ip.Status.State == v1alpha1.IPStateAllocated ||
+		ip.Status.State == v1alpha1.IPStateFailed {
 		return ctrl.Result{}, nil
 	}
 
 	if ip.Status.State == "" {
-		ip.Status.State = v1alpha1.CProcessingIPState
+		ip.Status.State = v1alpha1.IPStatePending
 		ip.Status.Message = ""
 		if err := r.Status().Update(ctx, ip); err != nil {
 			log.Error(err, "unable to update ip resource status", "name", req.NamespacedName, "currentStatus", ip.Status.State, "targetStatus", v1alpha1.CProcessingNetworkState)
@@ -140,7 +140,7 @@ func (r *IPReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Re
 	} else {
 		cidr, err := subnet.ProposeForCapacity(resource.NewScaledQuantity(1, 0))
 		if err != nil {
-			ip.Status.State = v1alpha1.CFailedIPState
+			ip.Status.State = v1alpha1.IPStateFailed
 			ip.Status.Message = err.Error()
 			if err := r.Status().Update(ctx, ip); err != nil {
 				log.Error(err, "unable to update ip status", "name", req.NamespacedName)
@@ -152,7 +152,7 @@ func (r *IPReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Re
 	}
 
 	if err := subnet.Reserve(ipCidrToReserve); err != nil {
-		ip.Status.State = v1alpha1.CFailedIPState
+		ip.Status.State = v1alpha1.IPStateFailed
 		ip.Status.Message = err.Error()
 		if err := r.Status().Update(ctx, ip); err != nil {
 			log.Error(err, "unable to update ip status", "name", req.NamespacedName)
@@ -167,7 +167,7 @@ func (r *IPReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Re
 		return ctrl.Result{}, err
 	}
 
-	ip.Status.State = v1alpha1.CFinishedIPState
+	ip.Status.State = v1alpha1.IPStateAllocated
 	ip.Status.Message = ""
 	ip.Status.Reserved = ipCidrToReserve.AsIPAddr()
 	if err := r.Status().Update(ctx, ip); err != nil {

controllers/ip_controller_test.go

@@ -192,7 +192,7 @@ var _ = Describe("IP controller", func() {
 				if err != nil {
 					return false
 				}
-				if createdIP.Status.State != v1alpha1.CFinishedIPState {
+				if createdIP.Status.State != v1alpha1.IPStateAllocated {
 					return false
 				}
 				return true
@@ -229,7 +229,7 @@ var _ = Describe("IP controller", func() {
 				if err != nil {
 					return false
 				}
-				if ipCopy.Status.State != v1alpha1.CFailedIPState {
+				if ipCopy.Status.State != v1alpha1.IPStateFailed {
 					return false
 				}
 				return true
@@ -249,7 +249,7 @@ var _ = Describe("IP controller", func() {
 				if err != nil {
 					return false
 				}
-				if ipCopy.Status.State != v1alpha1.CFinishedIPState {
+				if ipCopy.Status.State != v1alpha1.IPStateAllocated {
 					return false
 				}
 				if !ipCopy.Status.Reserved.Equal(testIP) {

controllers/subnet_controller.go

@@ -294,7 +294,7 @@ func (r *SubnetReconciler) SetupWithManager(mgr ctrl.Manager) error {
 		if parentSubnet == "" {
 			return nil
 		}
-		if state != v1alpha1.CFailedIPState {
+		if state != v1alpha1.IPStateFailed {
 			return nil
 		}
 		return []string{parentSubnet}
@@ -432,7 +432,7 @@ func (r *SubnetReconciler) requeueFailedIPs(ctx context.Context, log logr.Logger
 	}
 
 	for _, ip := range ips.Items {
-		ip.Status.State = v1alpha1.CProcessingIPState
+		ip.Status.State = v1alpha1.IPStatePending
 		ip.Status.Message = ""
 		if err := r.Status().Update(ctx, &ip); err != nil {
 			log.Error(err, "unable to update child ips", "name", types.NamespacedName{Namespace: subnet.Namespace, Name: subnet.Name}, "subnet", subnet.Name)