chore: reduce logs for skr iprange

pkg/composed/action.go

@@ -3,10 +3,8 @@ package composed
 import (
 	"context"
 	"errors"
-	"fmt"
 	"reflect"
 	"runtime"
-	"sigs.k8s.io/controller-runtime/pkg/log"
 )
 
 func findActionName(a Action) string {
@@ -18,23 +16,17 @@ type Action func(ctx context.Context, state State) (error, context.Context)
 
 // ===========================
 
-func ComposeActions(name string, actions ...Action) Action {
+func ComposeActions(_ string, actions ...Action) Action {
 	return func(ctx context.Context, state State) (error, context.Context) {
-		logger := log.FromContext(ctx).WithValues("action", name)
-		var actionName string
 		var lastError error
 		currentCtx := ctx
 	loop:
 		for _, a := range actions {
-			actionName = findActionName(a)
 			select {
 			case <-currentCtx.Done():
 				lastError = currentCtx.Err()
 				break loop
 			default:
-				//logger.
-				//	WithValues("targetAction", actionName).
-				//	Info("Running action")
 				err, nextCtx := a(currentCtx, state)
 				lastError = err
 				if nextCtx != nil {
@@ -46,26 +38,16 @@ func ComposeActions(name string, actions ...Action) Action {
 			}
 		}
 
-		l := logger.
-			WithValues(
-				"lastAction", actionName,
-			)
-
+		var fce FlowControlError
 		if lastError == nil {
-			//l.Info("Reconciliation finished")
 			return nil, currentCtx
-		} else if fce, ok := lastError.(FlowControlError); ok {
-			l.Info(fmt.Sprintf("Reconciliation finished with flow control: %s", fce))
+		} else if errors.As(lastError, &fce) {
 			if !fce.ShouldReturnError() {
 				lastError = nil
 			}
 			return lastError, currentCtx
-		} else if errors.Is(lastError, context.DeadlineExceeded) {
-			l.Info("Reconciliation finished with DeadlineExceeded")
-			return nil, currentCtx
 		}
 
-		l.Error(lastError, "Reconciliation finished with error")
 		return lastError, currentCtx
 	}
 }

pkg/composed/conditions.go

@@ -0,0 +1,23 @@
+package composed
+
+import (
+	"k8s.io/apimachinery/pkg/api/meta"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+func HasCondition(desired metav1.Condition, existingConditions []metav1.Condition) bool {
+	cond := meta.FindStatusCondition(existingConditions, desired.Type)
+	if cond == nil {
+		return false
+	}
+	if cond.Status != desired.Status {
+		return false
+	}
+	if cond.Reason != desired.Reason {
+		return false
+	}
+	if cond.Message != desired.Message {
+		return false
+	}
+	return true
+}

pkg/skr/iprange/loadKcpIpRange.go

@@ -12,8 +12,6 @@ func loadKcpIpRange(ctx context.Context, st composed.State) (error, context.Cont
 	state := st.(*State)
 	logger := composed.LoggerFromCtx(ctx)
 
-	logger.Info("Loading KCP IpRange")
-
 	kcpIpRange := &cloudcontrolv1beta1.IpRange{}
 	err := state.KcpCluster.K8sClient().Get(ctx, types.NamespacedName{
 		Namespace: state.KymaRef.Namespace,
@@ -27,7 +25,6 @@ func loadKcpIpRange(ctx context.Context, st composed.State) (error, context.Cont
 		return composed.LogErrorAndReturn(err, "Error loading KCP IpRange", composed.StopWithRequeue, ctx)
 	}
 
-	logger.Info("KCP IpRange is loaded")
 	state.KcpIpRange = kcpIpRange
 	return nil, nil
 }

pkg/skr/iprange/updateId.go

@@ -12,7 +12,6 @@ func updateId(ctx context.Context, st composed.State) (error, context.Context) {
 	logger := composed.LoggerFromCtx(ctx)
 
 	if state.ObjAsIpRange().Status.Id != "" {
-		logger.Info("SKR IpRange already has ID set")
 		return nil, nil
 	}
 

pkg/skr/iprange/updateStatus.go

@@ -16,40 +16,46 @@ func updateStatus(ctx context.Context, st composed.State) (error, context.Contex
 	state := st.(*State)
 	logger := composed.LoggerFromCtx(ctx)
 
-	logger.WithValues("kcpIpRangeConditions", pie.Map(state.KcpIpRange.Status.Conditions, func(c metav1.Condition) string {
+	logger = logger.WithValues("kcpIpRangeConditions", pie.Map(state.KcpIpRange.Status.Conditions, func(c metav1.Condition) string {
 		return fmt.Sprintf("%s:%s", c.Type, c.Status)
-	})).Info("Updating SKR IpRange status from KCP IpRange conditions")
+	}))
 
-	condErr := meta.FindStatusCondition(state.KcpIpRange.Status.Conditions, cloudcontrolv1beta1.ConditionTypeError)
-	condReady := meta.FindStatusCondition(state.KcpIpRange.Status.Conditions, cloudcontrolv1beta1.ConditionTypeReady)
+	kcpCondErr := meta.FindStatusCondition(state.KcpIpRange.Status.Conditions, cloudcontrolv1beta1.ConditionTypeError)
+	kcpCondReady := meta.FindStatusCondition(state.KcpIpRange.Status.Conditions, cloudcontrolv1beta1.ConditionTypeReady)
 	kcpMarkedForDeletion := composed.IsMarkedForDeletion(state.KcpIpRange)
 
-	if condErr != nil {
-		logger.Info("Updating IpRange status with Error condition")
-		return composed.UpdateStatus(state.ObjAsIpRange()).
-			SetExclusiveConditions(metav1.Condition{
-				Type:    cloudresourcesv1beta1.ConditionTypeError,
-				Status:  metav1.ConditionTrue,
-				Reason:  cloudresourcesv1beta1.ConditionReasonError,
-				Message: condErr.Message,
-			}).
-			DeriveStateFromConditions(state.MapConditionToState()).
-			ErrorLogMessage("Error updating IpRange status with not ready condition due to KCP error").
-			Run(ctx, state)
+	if kcpCondErr != nil {
+		desiredCond := metav1.Condition{
+			Type:    cloudresourcesv1beta1.ConditionTypeError,
+			Status:  metav1.ConditionTrue,
+			Reason:  cloudresourcesv1beta1.ConditionReasonError,
+			Message: kcpCondErr.Message,
+		}
+		if !composed.HasCondition(desiredCond, state.ObjAsIpRange().Status.Conditions) {
+			logger.Info("Updating IpRange status with Error condition")
+			return composed.UpdateStatus(state.ObjAsIpRange()).
+				SetExclusiveConditions(desiredCond).
+				DeriveStateFromConditions(state.MapConditionToState()).
+				ErrorLogMessage("Error updating IpRange status with not ready condition due to KCP error").
+				Run(ctx, state)
+		}
 	}
 
-	if condReady != nil && !kcpMarkedForDeletion {
-		logger.Info("Updating IpRange status with Ready condition")
-		return composed.UpdateStatus(state.ObjAsIpRange()).
-			SetExclusiveConditions(metav1.Condition{
-				Type:    cloudresourcesv1beta1.ConditionTypeReady,
-				Status:  metav1.ConditionTrue,
-				Reason:  cloudresourcesv1beta1.ConditionTypeReady,
-				Message: condReady.Message,
-			}).
-			DeriveStateFromConditions(state.MapConditionToState()).
-			ErrorLogMessage("Error updating IpRange status with ready condition").
-			Run(ctx, state)
+	if kcpCondReady != nil && !kcpMarkedForDeletion {
+		desiredCond := metav1.Condition{
+			Type:    cloudresourcesv1beta1.ConditionTypeReady,
+			Status:  metav1.ConditionTrue,
+			Reason:  cloudresourcesv1beta1.ConditionTypeReady,
+			Message: kcpCondReady.Message,
+		}
+		if !composed.HasCondition(desiredCond, state.ObjAsIpRange().Status.Conditions) {
+			logger.Info("Updating IpRange status with Ready condition")
+			return composed.UpdateStatus(state.ObjAsIpRange()).
+				SetExclusiveConditions(desiredCond).
+				DeriveStateFromConditions(state.MapConditionToState()).
+				ErrorLogMessage("Error updating IpRange status with ready condition").
+				Run(ctx, state)
+		}
 	}
 
 	// keep looping until KCP IpRange gets some condition