chore(RedisInstance): no longer put cloud provider errors in conditions

kyma-project · Dec 12, 2024 · 83fa31c · 83fa31c
1 parent b0ebfa1
commit 83fa31c
Show file tree

Hide file tree

Showing 12 changed files with 30 additions and 24 deletions.
diff --git a/pkg/kcp/provider/aws/redisinstance/createElastiCacheCluster.go b/pkg/kcp/provider/aws/redisinstance/createElastiCacheCluster.go
@@ -2,7 +2,6 @@ package redisinstance
 
 import (
 	"context"
-	"fmt"
 
 	"github.com/aws/aws-sdk-go-v2/service/elasticache/types"
 	"github.com/kyma-project/cloud-manager/api/cloud-control/v1beta1"
@@ -69,8 +68,8 @@ func createElastiCacheCluster(ctx context.Context, st composed.State) (error, co
 		meta.SetStatusCondition(redisInstance.Conditions(), metav1.Condition{
 			Type:    v1beta1.ConditionTypeError,
 			Status:  "True",
-			Reason:  v1beta1.ConditionTypeError,
-			Message: fmt.Sprintf("Failed creating AWS Elasticache: %s", err),
+			Reason:  v1beta1.ReasonCloudProviderError,
+			Message: "Failed to create RedisInstance",
 		})
 		redisInstance.Status.State = cloudcontrolv1beta1.ErrorState
 		err = state.UpdateObjStatus(ctx)

diff --git a/pkg/kcp/provider/aws/redisinstance/updateElastiCacheCluster.go b/pkg/kcp/provider/aws/redisinstance/updateElastiCacheCluster.go
@@ -2,7 +2,6 @@ package redisinstance
 
 import (
 	"context"
-	"fmt"
 
 	cloudcontrolv1beta1 "github.com/kyma-project/cloud-manager/api/cloud-control/v1beta1"
 
@@ -45,8 +44,8 @@ func updateElastiCacheCluster(ctx context.Context, st composed.State) (error, co
 		meta.SetStatusCondition(redisInstance.Conditions(), metav1.Condition{
 			Type:    cloudcontrolv1beta1.ConditionTypeError,
 			Status:  "True",
-			Reason:  cloudcontrolv1beta1.ConditionTypeError,
-			Message: fmt.Sprintf("Failed updating GwsRedis: %s", err),
+			Reason:  cloudcontrolv1beta1.ReasonCloudProviderError,
+			Message: "Failed to update RedisInstance",
 		})
 		redisInstance.Status.State = cloudcontrolv1beta1.ErrorState
 		err = state.UpdateObjStatus(ctx)

diff --git a/pkg/kcp/provider/aws/redisinstance/waitElastiCacheAvailable.go b/pkg/kcp/provider/aws/redisinstance/waitElastiCacheAvailable.go
@@ -2,6 +2,7 @@ package redisinstance
 
 import (
 	"context"
+	"errors"
 
 	"github.com/kyma-project/cloud-manager/api/cloud-control/v1beta1"
 	cloudcontrolv1beta1 "github.com/kyma-project/cloud-manager/api/cloud-control/v1beta1"
@@ -18,13 +19,14 @@ func waitElastiCacheAvailable(ctx context.Context, st composed.State) (error, co
 
 	if state.elastiCacheReplicationGroup == nil {
 		errorMsg := "Error: elasti cache cluster instance is not loaded"
+		logger.Error(errors.New(errorMsg), errorMsg)
 		redisInstance := st.Obj().(*v1beta1.RedisInstance)
 		redisInstance.Status.State = cloudcontrolv1beta1.ErrorState
 		return composed.UpdateStatus(redisInstance).
 			SetExclusiveConditions(metav1.Condition{
 				Type:    v1beta1.ConditionTypeError,
 				Status:  metav1.ConditionTrue,
-				Reason:  v1beta1.ConditionTypeError,
+				Reason:  v1beta1.ReasonUnknown,
 				Message: errorMsg,
 			}).
 			SuccessError(composed.StopAndForget).

diff --git a/pkg/kcp/provider/aws/redisinstance/waitElastiCacheDeleted.go b/pkg/kcp/provider/aws/redisinstance/waitElastiCacheDeleted.go
@@ -2,6 +2,7 @@ package redisinstance
 
 import (
 	"context"
+	"errors"
 	"fmt"
 
 	"github.com/kyma-project/cloud-manager/api/cloud-control/v1beta1"
@@ -25,13 +26,14 @@ func waitElastiCacheDeleted(ctx context.Context, st composed.State) (error, cont
 
 	if cacheState != awsmeta.ElastiCache_DELETING {
 		errorMsg := fmt.Sprintf("Error: unexpected aws elasticache cluster state: %s", cacheState)
+		logger.Error(errors.New(errorMsg), errorMsg)
 		redisInstance := st.Obj().(*v1beta1.RedisInstance)
 		redisInstance.Status.State = cloudcontrolv1beta1.ErrorState
 		return composed.UpdateStatus(redisInstance).
 			SetExclusiveConditions(metav1.Condition{
 				Type:    v1beta1.ConditionTypeError,
 				Status:  metav1.ConditionTrue,
-				Reason:  v1beta1.ConditionTypeError,
+				Reason:  v1beta1.ReasonUnknown,
 				Message: errorMsg,
 			}).
 			SuccessError(composed.StopAndForget).

diff --git a/pkg/kcp/provider/aws/redisinstance/waitUserGroupDeleted.go b/pkg/kcp/provider/aws/redisinstance/waitUserGroupDeleted.go
@@ -2,6 +2,7 @@ package redisinstance
 
 import (
 	"context"
+	"errors"
 	"fmt"
 
 	"github.com/kyma-project/cloud-manager/api/cloud-control/v1beta1"
@@ -25,13 +26,14 @@ func waitUserGroupDeleted(ctx context.Context, st composed.State) (error, contex
 
 	if cacheState != awsmeta.ElastiCache_UserGroup_DELETING {
 		errorMsg := fmt.Sprintf("Error: unexpected aws elasticache user group state: %s", cacheState)
+		logger.Error(errors.New(errorMsg), errorMsg)
 		redisInstance := st.Obj().(*v1beta1.RedisInstance)
 		redisInstance.Status.State = cloudcontrolv1beta1.ErrorState
 		return composed.UpdateStatus(redisInstance).
 			SetExclusiveConditions(metav1.Condition{
 				Type:    v1beta1.ConditionTypeError,
 				Status:  metav1.ConditionTrue,
-				Reason:  v1beta1.ConditionTypeError,
+				Reason:  v1beta1.ReasonUnknown,
 				Message: errorMsg,
 			}).
 			SuccessError(composed.StopAndForget).

diff --git a/pkg/kcp/provider/gcp/redisinstance/createRedis.go b/pkg/kcp/provider/gcp/redisinstance/createRedis.go
@@ -55,8 +55,8 @@ func createRedis(ctx context.Context, st composed.State) (error, context.Context
 		meta.SetStatusCondition(redisInstance.Conditions(), metav1.Condition{
 			Type:    v1beta1.ConditionTypeError,
 			Status:  "True",
-			Reason:  v1beta1.ReasonGcpError,
-			Message: fmt.Sprintf("Failed creating GcpRedis: %s", err),
+			Reason:  v1beta1.ReasonCloudProviderError,
+			Message: "Failed to create RedisInstance",
 		})
 		redisInstance.Status.State = cloudcontrolv1beta1.ErrorState
 

diff --git a/pkg/kcp/provider/gcp/redisinstance/deleteRedis.go b/pkg/kcp/provider/gcp/redisinstance/deleteRedis.go
@@ -2,7 +2,6 @@ package redisinstance
 
 import (
 	"context"
-	"fmt"
 
 	"cloud.google.com/go/redis/apiv1/redispb"
 	"github.com/kyma-project/cloud-manager/api/cloud-control/v1beta1"
@@ -43,8 +42,8 @@ func deleteRedis(ctx context.Context, st composed.State) (error, context.Context
 		meta.SetStatusCondition(redisInstance.Conditions(), metav1.Condition{
 			Type:    v1beta1.ConditionTypeError,
 			Status:  "True",
-			Reason:  v1beta1.ReasonGcpError,
-			Message: fmt.Sprintf("Failed deleting GcpRedis: %s", err),
+			Reason:  v1beta1.ReasonCloudProviderError,
+			Message: "Failed to delete RedisInstance",
 		})
 		redisInstance.Status.State = cloudcontrolv1beta1.ErrorState
 

diff --git a/pkg/kcp/provider/gcp/redisinstance/loadRedis.go b/pkg/kcp/provider/gcp/redisinstance/loadRedis.go
@@ -2,7 +2,6 @@ package redisinstance
 
 import (
 	"context"
-	"fmt"
 
 	"github.com/kyma-project/cloud-manager/api/cloud-control/v1beta1"
 	cloudcontrolv1beta1 "github.com/kyma-project/cloud-manager/api/cloud-control/v1beta1"
@@ -40,8 +39,8 @@ func loadRedis(ctx context.Context, st composed.State) (error, context.Context)
 		meta.SetStatusCondition(redisInstance.Conditions(), metav1.Condition{
 			Type:    v1beta1.ConditionTypeError,
 			Status:  "True",
-			Reason:  v1beta1.ReasonGcpError,
-			Message: fmt.Sprintf("Failed loading GcpRedis: %s", err),
+			Reason:  v1beta1.ReasonCloudProviderError,
+			Message: "Failed to load RedisInstance",
 		})
 		redisInstance.Status.State = cloudcontrolv1beta1.ErrorState
 

diff --git a/pkg/kcp/provider/gcp/redisinstance/new.go b/pkg/kcp/provider/gcp/redisinstance/new.go
@@ -18,14 +18,15 @@ func New(stateFactory StateFactory) composed.Action {
 
 		state, err := stateFactory.NewState(ctx, st.(types.State))
 		if err != nil {
+			composed.LoggerFromCtx(ctx).Error(err, "Failed to bootstrap GCP RedisInstance state")
 			redisInstance := st.Obj().(*v1beta1.RedisInstance)
 			redisInstance.Status.State = cloudcontrolv1beta1.ErrorState
 			return composed.UpdateStatus(redisInstance).
 				SetExclusiveConditions(metav1.Condition{
 					Type:    v1beta1.ConditionTypeError,
 					Status:  metav1.ConditionTrue,
-					Reason:  v1beta1.ReasonGcpError,
-					Message: err.Error(),
+					Reason:  v1beta1.ReasonCloudProviderError,
+					Message: "Failed to create RedisInstance state",
 				}).
 				SuccessError(composed.StopAndForget).
 				SuccessLogMsg(fmt.Sprintf("Error creating new GCP RedisInstance state: %s", err)).

diff --git a/pkg/kcp/provider/gcp/redisinstance/updateRedis.go b/pkg/kcp/provider/gcp/redisinstance/updateRedis.go
@@ -2,7 +2,6 @@ package redisinstance
 
 import (
 	"context"
-	"fmt"
 
 	cloudcontrolv1beta1 "github.com/kyma-project/cloud-manager/api/cloud-control/v1beta1"
 	"github.com/kyma-project/cloud-manager/pkg/composed"
@@ -43,8 +42,8 @@ func updateRedis(ctx context.Context, st composed.State) (error, context.Context
 		meta.SetStatusCondition(redisInstance.Conditions(), metav1.Condition{
 			Type:    cloudcontrolv1beta1.ConditionTypeError,
 			Status:  "True",
-			Reason:  cloudcontrolv1beta1.ReasonGcpError,
-			Message: fmt.Sprintf("Failed updating GcpRedis: %s", err),
+			Reason:  cloudcontrolv1beta1.ReasonCloudProviderError,
+			Message: "Failed to update RedisInstance",
 		})
 		err = state.UpdateObjStatus(ctx)
 		if err != nil {

diff --git a/pkg/kcp/provider/gcp/redisinstance/waitRedisAvailable.go b/pkg/kcp/provider/gcp/redisinstance/waitRedisAvailable.go
@@ -2,6 +2,7 @@ package redisinstance
 
 import (
 	"context"
+	"errors"
 
 	"cloud.google.com/go/redis/apiv1/redispb"
 	"github.com/kyma-project/cloud-manager/api/cloud-control/v1beta1"
@@ -17,13 +18,14 @@ func waitRedisAvailable(ctx context.Context, st composed.State) (error, context.
 
 	if state.gcpRedisInstance == nil {
 		errorMsg := "Error: redis instance is not loaded"
+		logger.Error(errors.New(errorMsg), errorMsg)
 		redisInstance := st.Obj().(*v1beta1.RedisInstance)
 		redisInstance.Status.State = cloudcontrolv1beta1.ErrorState
 		return composed.UpdateStatus(redisInstance).
 			SetExclusiveConditions(metav1.Condition{
 				Type:    v1beta1.ConditionTypeError,
 				Status:  metav1.ConditionTrue,
-				Reason:  v1beta1.ReasonGcpError,
+				Reason:  v1beta1.ReasonUnknown,
 				Message: errorMsg,
 			}).
 			SuccessError(composed.StopAndForget).

diff --git a/pkg/kcp/provider/gcp/redisinstance/waitRedisDeleted.go b/pkg/kcp/provider/gcp/redisinstance/waitRedisDeleted.go
@@ -2,6 +2,7 @@ package redisinstance
 
 import (
 	"context"
+	"errors"
 
 	"cloud.google.com/go/redis/apiv1/redispb"
 	"github.com/kyma-project/cloud-manager/api/cloud-control/v1beta1"
@@ -21,13 +22,14 @@ func waitRedisDeleted(ctx context.Context, st composed.State) (error, context.Co
 
 	if state.gcpRedisInstance.State != redispb.Instance_DELETING {
 		errorMsg := "Error: unexpected gcp redis state"
+		logger.Error(errors.New(errorMsg), errorMsg)
 		redisInstance := st.Obj().(*v1beta1.RedisInstance)
 		redisInstance.Status.State = cloudcontrolv1beta1.ErrorState
 		return composed.UpdateStatus(redisInstance).
 			SetExclusiveConditions(metav1.Condition{
 				Type:    v1beta1.ConditionTypeError,
 				Status:  metav1.ConditionTrue,
-				Reason:  v1beta1.ReasonGcpError,
+				Reason:  v1beta1.ReasonUnknown,
 				Message: errorMsg,
 			}).
 			SuccessError(composed.StopAndForget).