chore(VpcPeering): remove duplicated code that loads local and remote KCP Network

Author: vandjelk

internal/controller/cloud-control/vpcpeering_aws_test.go

@@ -182,13 +182,6 @@ var _ = Describe("Feature: KCP VpcPeering", func() {
 
 		})
 
-		By("Then KCP VpcPeering is in missing local network error state", func() {
-			Eventually(LoadAndCheck).
-				WithArguments(infra.Ctx(), infra.KCP().Client(), kcpPeering, NewObjActions(),
-					HavingCondition(cloudcontrolv1beta1.ConditionTypeError, metav1.ConditionTrue, cloudcontrolv1beta1.ReasonMissingDependency, "Local network not found"),
-				).Should(Succeed())
-		})
-
 		var localKcpNet *cloudcontrolv1beta1.Network
 
 		By("When local KCP Network is created", func() {
@@ -202,13 +195,6 @@ var _ = Describe("Feature: KCP VpcPeering", func() {
 				Should(Succeed())
 		})
 
-		By("Then KCP VpcPeering is in waiting local network to be ready", func() {
-			Eventually(LoadAndCheck).
-				WithArguments(infra.Ctx(), infra.KCP().Client(), kcpPeering, NewObjActions(),
-					HavingCondition(cloudcontrolv1beta1.ConditionTypeError, metav1.ConditionTrue, cloudcontrolv1beta1.ReasonWaitingDependency, "Local network not ready"),
-				).Should(Succeed())
-		})
-
 		By("When local KCP Network is ready", func() {
 			kcpnetwork.Ignore.RemoveName(localKcpNetworkName)
 			// trigger the reconciliation
@@ -219,13 +205,6 @@ var _ = Describe("Feature: KCP VpcPeering", func() {
 				Should(Succeed(), "expected local kcp network to become ready but it didn't")
 		})
 
-		By("Then KCP VpcPeering is in missing remote network", func() {
-			Eventually(LoadAndCheck).
-				WithArguments(infra.Ctx(), infra.KCP().Client(), kcpPeering, NewObjActions(),
-					HavingCondition(cloudcontrolv1beta1.ConditionTypeError, metav1.ConditionTrue, cloudcontrolv1beta1.ReasonMissingDependency, "Remote network not found"),
-				).Should(Succeed())
-		})
-
 		var remoteKcpNet *cloudcontrolv1beta1.Network
 
 		By("When remote KCP Network is created", func() {
@@ -239,13 +218,6 @@ var _ = Describe("Feature: KCP VpcPeering", func() {
 				Should(Succeed())
 		})
 
-		By("Then KCP VpcPeering is in waiting remote network to be ready", func() {
-			Eventually(LoadAndCheck).
-				WithArguments(infra.Ctx(), infra.KCP().Client(), kcpPeering, NewObjActions(),
-					HavingCondition(cloudcontrolv1beta1.ConditionTypeError, metav1.ConditionTrue, cloudcontrolv1beta1.ReasonWaitingDependency, "Remote network not ready"),
-				).Should(Succeed())
-		})
-
 		By("When remote KCP Network is ready", func() {
 			kcpnetwork.Ignore.RemoveName(remoteKcpNetworkName)
 			// trigger the reconciliation

internal/controller/cloud-control/vpcpeering_azure_test.go

@@ -81,13 +81,6 @@ var _ = Describe("Feature: KCP VpcPeering", func() {
 				Should(Succeed())
 		})
 
-		By("Then KCP VpcPeering is in missing local network error state", func() {
-			Eventually(LoadAndCheck).
-				WithArguments(infra.Ctx(), infra.KCP().Client(), kcpPeering, NewObjActions(),
-					HavingCondition(cloudcontrolv1beta1.ConditionTypeError, metav1.ConditionTrue, cloudcontrolv1beta1.ReasonMissingDependency, "Local network not found"),
-				).Should(Succeed())
-		})
-
 		var localKcpNet *cloudcontrolv1beta1.Network
 
 		By("When local KCP Network is created", func() {
@@ -101,13 +94,6 @@ var _ = Describe("Feature: KCP VpcPeering", func() {
 				Should(Succeed())
 		})
 
-		By("Then KCP VpcPeering is in waiting local network to be ready error state", func() {
-			Eventually(LoadAndCheck).
-				WithArguments(infra.Ctx(), infra.KCP().Client(), kcpPeering, NewObjActions(),
-					HavingCondition(cloudcontrolv1beta1.ConditionTypeError, metav1.ConditionTrue, cloudcontrolv1beta1.ReasonWaitingDependency, "Local network not ready"),
-				).Should(Succeed())
-		})
-
 		By("When local KCP Network is Ready", func() {
 			kcpnetwork.Ignore.RemoveName(localKcpNetworkName)
 			// trigger the reconciliation
@@ -118,13 +104,6 @@ var _ = Describe("Feature: KCP VpcPeering", func() {
 				Should(Succeed(), "expected local kcp network to become ready but it didn't")
 		})
 
-		By("Then KCP VpcPeering is in missing remote network error state", func() {
-			Eventually(LoadAndCheck).
-				WithArguments(infra.Ctx(), infra.KCP().Client(), kcpPeering, NewObjActions(),
-					HavingCondition(cloudcontrolv1beta1.ConditionTypeError, metav1.ConditionTrue, cloudcontrolv1beta1.ReasonMissingDependency, "Remote network not found"),
-				).Should(Succeed())
-		})
-
 		var remoteKcpNet *cloudcontrolv1beta1.Network
 
 		By("When remote KCP Network is created", func() {
@@ -138,13 +117,6 @@ var _ = Describe("Feature: KCP VpcPeering", func() {
 				Should(Succeed())
 		})
 
-		By("Then KCP VpcPeering is in waiting remote network to be ready error state", func() {
-			Eventually(LoadAndCheck).
-				WithArguments(infra.Ctx(), infra.KCP().Client(), kcpPeering, NewObjActions(),
-					HavingCondition(cloudcontrolv1beta1.ConditionTypeError, metav1.ConditionTrue, cloudcontrolv1beta1.ReasonWaitingDependency, "Remote network not ready"),
-				).Should(Succeed())
-		})
-
 		By("When remote KCP Network is Ready", func() {
 			kcpnetwork.Ignore.RemoveName(remoteKcpNetworkName)
 			// trigger the reconciliation

pkg/kcp/vpcpeering/networkLocalLoad.go

@@ -3,6 +3,7 @@ package vpcpeering
 import (
 	"context"
 	"fmt"
+	"k8s.io/apimachinery/pkg/api/meta"
 
 	cloudcontrolv1beta1 "github.com/kyma-project/cloud-manager/api/cloud-control/v1beta1"
 	"github.com/kyma-project/cloud-manager/pkg/composed"
@@ -36,36 +37,48 @@ func kcpNetworkLocalLoad(ctx context.Context, st composed.State) (error, context
 		if composed.IsMarkedForDeletion(state.Obj()) {
 			return composed.LogErrorAndReturn(err, "KCP VpcPeering marked for deletion but, local KCP Network not found", nil, ctx)
 		}
-		return composed.PatchStatus(state.ObjAsVpcPeering()).
-			SetExclusiveConditions(metav1.Condition{
-				Type:    cloudcontrolv1beta1.ConditionTypeError,
-				Status:  metav1.ConditionTrue,
-				Reason:  cloudcontrolv1beta1.ReasonMissingDependency,
-				Message: "Local network not found",
-			}).
-			ErrorLogMessage("Error patching KCP VpcPeering status with missing local network dependency").
-			SuccessError(composed.StopWithRequeueDelay(util.Timing.T10000ms())).
-			SuccessLogMsg("KCP VpcPeering local KCP Network not found").
-			Run(ctx, state)
+
+		// Patch status was triggered reconciliation immediately. Changing delay to 1 second to reduce wait time.
+		return composed.StopWithRequeueDelay(util.Timing.T1000ms()), ctx
 	}
 
-	if net.Status.Network == nil {
+	state.localNetwork = net
+
+	// Ignore state check if marked for deletion
+	if composed.IsMarkedForDeletion(state.Obj()) {
+		return composed.LogErrorAndReturn(err, "KCP VpcPeering marked for deletion, continue", nil, ctx)
+	}
+
+	if net.Status.State == string(cloudcontrolv1beta1.StateError) {
+		changed := false
+
+		if meta.RemoveStatusCondition(state.ObjAsVpcPeering().Conditions(), cloudcontrolv1beta1.ConditionTypeReady) {
+			changed = true
+		}
+
+		if meta.SetStatusCondition(state.ObjAsVpcPeering().Conditions(), metav1.Condition{
+			Type:    cloudcontrolv1beta1.ConditionTypeError,
+			Status:  metav1.ConditionTrue,
+			Reason:  cloudcontrolv1beta1.ReasonWaitingDependency,
+			Message: "Local network not ready",
+		}) {
+			changed = true
+		}
+
+		if !changed {
+			return composed.StopAndForget, ctx
+		}
+
 		return composed.PatchStatus(state.ObjAsVpcPeering()).
-			SetExclusiveConditions(metav1.Condition{
-				Type:    cloudcontrolv1beta1.ConditionTypeError,
-				Status:  metav1.ConditionTrue,
-				Reason:  cloudcontrolv1beta1.ReasonWaitingDependency,
-				Message: "Local network not ready",
-			}).
 			ErrorLogMessage("Error patching KCP VpcPeering status with local network not ready").
-			SuccessError(composed.StopWithRequeue).
+			SuccessError(composed.StopAndForget).
 			SuccessLogMsg("KCP VpcPeering local KCP Network not ready").
 			Run(ctx, state)
 	}
 
-	state.localNetwork = net
-
-	logger.Info("KCP VpcPeering local network loaded")
+	if net.Status.State != string(cloudcontrolv1beta1.StateReady) {
+		return composed.StopWithRequeueDelay(util.Timing.T1000ms()), ctx
+	}
 
-	return nil, composed.LoggerIntoCtx(ctx, logger)
+	return nil, ctx
 }

pkg/kcp/vpcpeering/networkRemoteLoad.go

@@ -2,6 +2,8 @@ package vpcpeering
 
 import (
 	"context"
+	"fmt"
+	"k8s.io/apimachinery/pkg/api/meta"
 
 	cloudcontrolv1beta1 "github.com/kyma-project/cloud-manager/api/cloud-control/v1beta1"
 	"github.com/kyma-project/cloud-manager/pkg/composed"
@@ -13,13 +15,17 @@ import (
 
 func kcpNetworkRemoteLoad(ctx context.Context, st composed.State) (error, context.Context) {
 	state := st.(*State)
+	logger := composed.LoggerFromCtx(ctx)
 
 	net := &cloudcontrolv1beta1.Network{}
 	namespace := state.ObjAsVpcPeering().Spec.Details.RemoteNetwork.Namespace
 	if namespace == "" {
 		namespace = state.ObjAsVpcPeering().Namespace
 	}
 
+	logger = logger.
+		WithValues("remoteKcpNetwork", fmt.Sprintf("%s/%s", namespace, state.ObjAsVpcPeering().Spec.Details.LocalNetwork.Name))
+
 	err := state.Cluster().K8sClient().Get(ctx, client.ObjectKey{
 		Namespace: namespace,
 		Name:      state.ObjAsVpcPeering().Spec.Details.RemoteNetwork.Name,
@@ -34,37 +40,44 @@ func kcpNetworkRemoteLoad(ctx context.Context, st composed.State) (error, contex
 			return composed.LogErrorAndReturn(err, "KCP VpcPeering marked for deletion but, remote KCP Network not found", nil, ctx)
 		}
 
-		return composed.PatchStatus(state.ObjAsVpcPeering()).
-			SetExclusiveConditions(metav1.Condition{
-				Type:    cloudcontrolv1beta1.ConditionTypeError,
-				Status:  metav1.ConditionTrue,
-				Reason:  cloudcontrolv1beta1.ReasonMissingDependency,
-				Message: "Remote network not found",
-			}).
-			ErrorLogMessage("Error patching KCP VpcPeering status with missing remote network dependency").
-			SuccessError(composed.StopWithRequeueDelay(util.Timing.T10000ms())).
-			SuccessLogMsg("KCP VpcPeering remote KCP Network not found").
-			Run(ctx, state)
+		// Patch status was triggered reconciliation immediately. Changing delay to 1 second to reduce wait time.
+		return composed.StopWithRequeueDelay(util.Timing.T1000ms()), ctx
 	}
 
-	if net.Status.Network == nil {
+	state.remoteNetwork = net
+
+	if composed.IsMarkedForDeletion(state.Obj()) {
+		return composed.LogErrorAndReturn(err, "KCP VpcPeering marked for deletion, continue", nil, ctx)
+	}
+
+	if net.Status.State == string(cloudcontrolv1beta1.StateError) {
+		changed := false
+		if meta.RemoveStatusCondition(state.ObjAsVpcPeering().Conditions(), cloudcontrolv1beta1.ConditionTypeReady) {
+			changed = true
+		}
+		if meta.SetStatusCondition(state.ObjAsVpcPeering().Conditions(), metav1.Condition{
+			Type:    cloudcontrolv1beta1.ConditionTypeError,
+			Status:  metav1.ConditionTrue,
+			Reason:  cloudcontrolv1beta1.ReasonWaitingDependency,
+			Message: "Remote network not ready",
+		}) {
+			changed = true
+		}
+
+		if !changed {
+			return composed.StopAndForget, ctx
+		}
+
 		return composed.PatchStatus(state.ObjAsVpcPeering()).
-			SetExclusiveConditions(metav1.Condition{
-				Type:    cloudcontrolv1beta1.ConditionTypeError,
-				Status:  metav1.ConditionTrue,
-				Reason:  cloudcontrolv1beta1.ReasonWaitingDependency,
-				Message: "Remote network not ready",
-			}).
 			ErrorLogMessage("Error patching KCP VpcPeering status with remote network not ready").
-			SuccessError(composed.StopWithRequeue).
+			SuccessError(composed.StopAndForget).
 			SuccessLogMsg("KCP VpcPeering remote KCP Network not ready").
 			Run(ctx, state)
 	}
 
-	logger := composed.LoggerFromCtx(ctx)
-	state.remoteNetwork = net
-
-	logger.Info("KCP VpcPeering remote network loaded")
+	if net.Status.State != string(cloudcontrolv1beta1.StateReady) {
+		return composed.StopWithRequeueDelay(util.Timing.T1000ms()), ctx
+	}
 
 	return nil, ctx
 }