From 27d8c3e5d2f6512fc02e622b1ff0a76116600283 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Du=C5=A1an=20Panti=C4=87?= Date: Thu, 12 Dec 2024 12:38:42 +0100 Subject: [PATCH 1/5] chore(RedisInstance): no longer put cloud provider errors in conditions (#885) --- .../provider/aws/redisinstance/createElastiCacheCluster.go | 5 ++--- .../provider/aws/redisinstance/updateElastiCacheCluster.go | 5 ++--- .../provider/aws/redisinstance/waitElastiCacheAvailable.go | 4 +++- pkg/kcp/provider/aws/redisinstance/waitElastiCacheDeleted.go | 4 +++- pkg/kcp/provider/aws/redisinstance/waitUserGroupDeleted.go | 4 +++- pkg/kcp/provider/gcp/redisinstance/createRedis.go | 4 ++-- pkg/kcp/provider/gcp/redisinstance/deleteRedis.go | 5 ++--- pkg/kcp/provider/gcp/redisinstance/loadRedis.go | 5 ++--- pkg/kcp/provider/gcp/redisinstance/new.go | 5 +++-- pkg/kcp/provider/gcp/redisinstance/updateRedis.go | 5 ++--- pkg/kcp/provider/gcp/redisinstance/waitRedisAvailable.go | 4 +++- pkg/kcp/provider/gcp/redisinstance/waitRedisDeleted.go | 4 +++- 12 files changed, 30 insertions(+), 24 deletions(-) diff --git a/pkg/kcp/provider/aws/redisinstance/createElastiCacheCluster.go b/pkg/kcp/provider/aws/redisinstance/createElastiCacheCluster.go index 7840a351f..577c40c58 100644 --- 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 index 057af9593..86464d3ed 100644 --- 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 index e1e3da94e..d29cfb256 100644 --- 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 index 2e2d43a64..071bad805 100644 --- 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 index bd376f28e..90b21c374 100644 --- 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 index d5127e259..7583c43df 100644 --- 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 index 5c75008f2..2998be3b8 100644 --- 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 index 167a85fb7..1246bdd21 100644 --- 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 index cff76f0e3..250d7d563 100644 --- 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 index 11eb9c60f..4dd59e8ee 100644 --- 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 index 590149795..4fd115ccb 100644 --- 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 index 88ffa4a54..f929bd41d 100644 --- 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). From 3b5c3d8c199050b974fb7aaeed767055e5d2cb1e Mon Sep 17 00:00:00 2001 From: Milos Tomic <59831542+tmilos77@users.noreply.github.com> Date: Thu, 12 Dec 2024 12:57:56 +0100 Subject: [PATCH 2/5] chore: run merge-gate on pr label change (#883) --- .github/workflows/merge-gate.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/merge-gate.yaml b/.github/workflows/merge-gate.yaml index b78ca8672..7a1e6243a 100644 --- a/.github/workflows/merge-gate.yaml +++ b/.github/workflows/merge-gate.yaml @@ -1,6 +1,7 @@ name: Merge Gate on: pull_request: + types: [opened, edited, synchronize, reopened, ready_for_review, converted_to_draft, ready_for_review, labeled, unlabeled] permissions: checks: read From df75b80917fbe636817c88e387caf384c4c38f5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Du=C5=A1an=20Panti=C4=87?= Date: Thu, 12 Dec 2024 13:06:17 +0100 Subject: [PATCH 3/5] refactor(RedisInstance): move auth secret to separate file (#886) --- api/cloud-resources/v1beta1/gcpredisinstance_types.go | 6 ------ api/cloud-resources/v1beta1/redisinstance_authsecret.go | 7 +++++++ 2 files changed, 7 insertions(+), 6 deletions(-) create mode 100644 api/cloud-resources/v1beta1/redisinstance_authsecret.go diff --git a/api/cloud-resources/v1beta1/gcpredisinstance_types.go b/api/cloud-resources/v1beta1/gcpredisinstance_types.go index 015373e53..659d7308a 100644 --- a/api/cloud-resources/v1beta1/gcpredisinstance_types.go +++ b/api/cloud-resources/v1beta1/gcpredisinstance_types.go @@ -43,12 +43,6 @@ const ( GcpRedisTierP6 GcpRedisTier = "P6" ) -type AuthSecretSpec struct { - Name string `json:"name,omitempty"` - Labels map[string]string `json:"labels,omitempty"` - Annotations map[string]string `json:"annotations,omitempty"` -} - type TimeOfDay struct { // Hours of day in 24 hour format. Should be from 0 to 23. // +kubebuilder:validation:Required diff --git a/api/cloud-resources/v1beta1/redisinstance_authsecret.go b/api/cloud-resources/v1beta1/redisinstance_authsecret.go new file mode 100644 index 000000000..c26a80101 --- /dev/null +++ b/api/cloud-resources/v1beta1/redisinstance_authsecret.go @@ -0,0 +1,7 @@ +package v1beta1 + +type AuthSecretSpec struct { + Name string `json:"name,omitempty"` + Labels map[string]string `json:"labels,omitempty"` + Annotations map[string]string `json:"annotations,omitempty"` +} From 215728f5502822879f0607692969978269541628 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Du=C5=A1an=20Panti=C4=87?= Date: Thu, 12 Dec 2024 16:51:20 +0100 Subject: [PATCH 4/5] refactor: move state from suffix to prefix in state name const (#887) --- .../v1beta1/redisinstance_types.go | 4 ++-- api/cloud-control/v1beta1/types.go | 10 ++++----- .../cloud-control/iprange_azure_test.go | 5 +++-- .../cloud-control/iprange_delete_test.go | 5 +++-- .../cloud-control/network_azure_test.go | 2 +- .../cloud-control/network_reference_test.go | 21 ++++++++++--------- .../cloud-control/nfsinstance_gcp_test.go | 11 +++++----- .../cloud-control/redisinstance_azure_test.go | 5 +++-- .../cloud-control/vpcpeering_aws_test.go | 5 +++-- .../cloud-control/vpcpeering_azure_test.go | 5 +++-- .../cloud-resources/gcpnfsvolume_test.go | 19 +++++++++-------- pkg/kcp/iprange/kcpNetworkCreate.go | 7 ++++--- pkg/kcp/iprange/kcpNetworkWait.go | 3 ++- pkg/kcp/iprange/kymaNetworkLoad.go | 3 ++- pkg/kcp/iprange/kymaNetworkWait.go | 3 ++- pkg/kcp/iprange/kymaPeeringWait.go | 3 ++- .../preventDeleteOnNfsInstanceUsage.go | 3 ++- .../preventDeleteOnRedisInstanceUsage.go | 3 ++- pkg/kcp/iprange/statusReady.go | 5 +++-- pkg/kcp/network/handleNetworkReference.go | 5 +++-- .../logLogicalErrorOnManagedNetworkMissing.go | 3 ++- .../preventCreationOfNonCmManagedNetwork.go | 5 +++-- .../network/preventDeleteWhenUsedByIpRange.go | 2 +- ...ventDeleteWhenUsedByPeeringLocalNetwork.go | 3 ++- ...entDeleteWhenUsedByPeeringRemoteNetwork.go | 3 ++- pkg/kcp/nfsinstance/loadIpRange.go | 3 ++- pkg/kcp/nuke/loadResources.go | 3 ++- .../aws/iprange/v2/allocateIpRange.go | 3 ++- .../ensureShootZonesAndRangeSubnetsMatch.go | 3 ++- .../aws/iprange/v2/rangeCheckOverlap.go | 3 ++- .../provider/aws/iprange/v2/statusSuccess.go | 5 +++-- .../aws/nfsinstance/loadSecurityGroup.go | 5 +++-- .../validateExistingMountTargets.go | 3 ++- .../redisinstance/createElastiCacheCluster.go | 2 +- .../aws/redisinstance/loadSecurityGroup.go | 2 +- .../aws/redisinstance/removeReadyCondition.go | 2 +- .../redisinstance/updateElastiCacheCluster.go | 2 +- .../aws/redisinstance/updateStatus.go | 4 ++-- .../redisinstance/waitElastiCacheAvailable.go | 2 +- .../redisinstance/waitElastiCacheDeleted.go | 2 +- .../aws/redisinstance/waitUserGroupDeleted.go | 2 +- .../vpcpeering/acceptVpcPeeringConnection.go | 3 ++- .../aws/vpcpeering/createRemoteClient.go | 5 +++-- .../aws/vpcpeering/createRemoteRoutes.go | 5 +++-- .../provider/aws/vpcpeering/createRoutes.go | 5 +++-- .../vpcpeering/createVpcPeeringConnection.go | 5 +++-- .../aws/vpcpeering/kcpNetworkLocalLoad.go | 5 +++-- .../aws/vpcpeering/kcpNetworkRemoteLoad.go | 5 +++-- .../provider/azure/iprange/allocateIpRange.go | 3 ++- .../provider/azure/iprange/namesDetermine.go | 3 ++- .../azure/iprange/privateDnsZoneCreate.go | 3 ++- .../azure/iprange/privateDnsZoneDelete.go | 3 ++- .../azure/iprange/securityGroupCreate.go | 3 ++- .../azure/iprange/securityGroupDelete.go | 3 ++- .../azure/iprange/securityGroupLoad.go | 3 ++- .../provider/azure/iprange/subnetCreate.go | 3 ++- .../provider/azure/iprange/subnetDelete.go | 3 ++- pkg/kcp/provider/azure/iprange/subnetLoad.go | 3 ++- .../azure/iprange/virtualNetworkLinkCreate.go | 3 ++- .../azure/iprange/virtualNetworkLinkDelete.go | 3 ++- pkg/kcp/provider/azure/network/statusReady.go | 5 +++-- .../azure/redisinstance/updateStatus.go | 4 ++-- .../azure/vpcpeering/kcpNetworkLocalLoad.go | 5 +++-- .../azure/vpcpeering/kcpNetworkRemoteLoad.go | 5 +++-- .../azure/vpcpeering/peeringLocalCreate.go | 9 ++++---- .../azure/vpcpeering/peeringRemoteCreate.go | 5 +++-- .../azure/vpcpeering/peeringRemoteLoad.go | 5 +++-- .../peeringRemoteRequireSpecifiedName.go | 5 +++-- .../azure/vpcpeering/remoteClientCreate.go | 3 ++- .../azure/vpcpeering/vpcRemoteLoad.go | 5 +++-- .../provider/ccee/nfsinstance/accessGrant.go | 3 ++- .../provider/ccee/nfsinstance/accessRevoke.go | 5 +++-- .../ccee/nfsinstance/conditionsInit.go | 3 ++- .../nfsinstance/networkStopWhenNotFound.go | 3 ++- .../provider/ccee/nfsinstance/shareCreate.go | 3 ++- .../provider/ccee/nfsinstance/shareDelete.go | 5 +++-- .../ccee/nfsinstance/shareExpandShrink.go | 3 ++- .../ccee/nfsinstance/shareExportRead.go | 9 ++++---- .../ccee/nfsinstance/shareNetworkCreate.go | 3 ++- .../ccee/nfsinstance/shareNetworkDelete.go | 5 +++-- .../ccee/nfsinstance/shareWaitAvailable.go | 3 ++- .../provider/ccee/nfsinstance/statusReady.go | 5 +++-- .../ccee/nfsinstance/subnetStopWhenNoFound.go | 3 ++- .../gcp/iprange/v2/allocateIpRange.go | 3 ++- .../provider/gcp/iprange/v2/compareStates.go | 3 ++- .../gcp/iprange/v2/compareStates_test.go | 9 ++++---- .../provider/gcp/iprange/v2/updateState.go | 3 ++- .../gcp/nfsinstance/checkNUpdateState.go | 8 +++---- .../gcp/nfsinstance/checkNUpdateState_test.go | 19 +++++++++-------- pkg/kcp/provider/gcp/nuke/loadNfsBackups.go | 3 ++- .../provider/gcp/redisinstance/createRedis.go | 2 +- .../provider/gcp/redisinstance/deleteRedis.go | 2 +- .../provider/gcp/redisinstance/loadRedis.go | 2 +- pkg/kcp/provider/gcp/redisinstance/new.go | 2 +- .../gcp/redisinstance/removeReadyCondition.go | 2 +- .../gcp/redisinstance/updateStatus.go | 4 ++-- .../gcp/redisinstance/waitRedisAvailable.go | 2 +- .../gcp/redisinstance/waitRedisDeleted.go | 2 +- .../gcp/vpcpeering/loadKymaNetwork.go | 4 ++-- .../gcp/vpcpeering/loadRemoteNetwork.go | 4 ++-- pkg/kcp/scope/addReadyCondition.go | 5 +++-- 101 files changed, 259 insertions(+), 182 deletions(-) diff --git a/api/cloud-control/v1beta1/redisinstance_types.go b/api/cloud-control/v1beta1/redisinstance_types.go index 6091ebd1d..a2d3c568d 100644 --- a/api/cloud-control/v1beta1/redisinstance_types.go +++ b/api/cloud-control/v1beta1/redisinstance_types.go @@ -320,11 +320,11 @@ func (in *RedisInstance) CloneForPatchStatus() client.Object { } func (in *RedisInstance) SetStatusStateToReady() { - in.Status.State = ReadyState + in.Status.State = StateReady } func (in *RedisInstance) SetStatusStateToError() { - in.Status.State = ErrorState + in.Status.State = StateError } //+kubebuilder:object:root=true diff --git a/api/cloud-control/v1beta1/types.go b/api/cloud-control/v1beta1/types.go index 10a9daedc..e8ce68952 100644 --- a/api/cloud-control/v1beta1/types.go +++ b/api/cloud-control/v1beta1/types.go @@ -3,11 +3,11 @@ package v1beta1 type StatusState string const ( - ReadyState StatusState = "Ready" - ErrorState StatusState = "Error" - ProcessingState StatusState = "Processing" - WarningState StatusState = "Warning" - DeletingState StatusState = "Deleting" + StateReady StatusState = "Ready" + StateError StatusState = "Error" + StateProcessing StatusState = "Processing" + StateWarning StatusState = "Warning" + StateDeleting StatusState = "Deleting" ) const ( diff --git a/internal/controller/cloud-control/iprange_azure_test.go b/internal/controller/cloud-control/iprange_azure_test.go index 6a0630916..769831aa1 100644 --- a/internal/controller/cloud-control/iprange_azure_test.go +++ b/internal/controller/cloud-control/iprange_azure_test.go @@ -2,6 +2,7 @@ package cloudcontrol import ( "fmt" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v5" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/privatedns/armprivatedns" cloudcontrolv1beta1 "github.com/kyma-project/cloud-manager/api/cloud-control/v1beta1" @@ -140,7 +141,7 @@ var _ = Describe("Feature: KCP IpRange for Azure", func() { }) By("When KCP CM Network has Ready condition", func() { - kcpNetworkCm.Status.State = string(cloudcontrolv1beta1.ReadyState) + kcpNetworkCm.Status.State = string(cloudcontrolv1beta1.StateReady) meta.SetStatusCondition(&kcpNetworkCm.Status.Conditions, metav1.Condition{ Type: cloudcontrolv1beta1.ConditionTypeReady, Status: metav1.ConditionTrue, @@ -181,7 +182,7 @@ var _ = Describe("Feature: KCP IpRange for Azure", func() { }) By("When KCP VpcPeering has Ready condition", func() { - kcpVpcPeering.Status.State = string(cloudcontrolv1beta1.ReadyState) + kcpVpcPeering.Status.State = string(cloudcontrolv1beta1.StateReady) meta.SetStatusCondition(&kcpVpcPeering.Status.Conditions, metav1.Condition{ Type: cloudcontrolv1beta1.ConditionTypeReady, Status: metav1.ConditionTrue, diff --git a/internal/controller/cloud-control/iprange_delete_test.go b/internal/controller/cloud-control/iprange_delete_test.go index caa9bfb3f..ec9b98e91 100644 --- a/internal/controller/cloud-control/iprange_delete_test.go +++ b/internal/controller/cloud-control/iprange_delete_test.go @@ -2,6 +2,7 @@ package cloudcontrol import ( "fmt" + ec2Types "github.com/aws/aws-sdk-go-v2/service/ec2/types" "github.com/elliotchance/pie/v2" cloudcontrolv1beta1 "github.com/kyma-project/cloud-manager/api/cloud-control/v1beta1" @@ -118,7 +119,7 @@ var _ = Describe("Feature: KCP IpRange deletion with dependant objects", func() Eventually(LoadAndCheck). WithArguments(infra.Ctx(), infra.KCP().Client(), iprange, NewObjActions(), - HavingState(string(cloudcontrolv1beta1.WarningState)), + HavingState(string(cloudcontrolv1beta1.StateWarning)), ). Should(Succeed()) }) @@ -263,7 +264,7 @@ var _ = Describe("Feature: KCP IpRange deletion with dependant objects", func() Eventually(LoadAndCheck). WithArguments(infra.Ctx(), infra.KCP().Client(), iprange, NewObjActions(), - HavingState(string(cloudcontrolv1beta1.WarningState)), + HavingState(string(cloudcontrolv1beta1.StateWarning)), ). Should(Succeed()) }) diff --git a/internal/controller/cloud-control/network_azure_test.go b/internal/controller/cloud-control/network_azure_test.go index dfa0b8272..48984476d 100644 --- a/internal/controller/cloud-control/network_azure_test.go +++ b/internal/controller/cloud-control/network_azure_test.go @@ -44,7 +44,7 @@ var _ = Describe("Feature: KCP Azure managed Network", func() { By("Then KCP Network state is Ready", func() { Eventually(LoadAndCheck). - WithArguments(infra.Ctx(), infra.KCP().Client(), net, NewObjActions(), HavingState(string(cloudcontrolv1beta1.ReadyState))). + WithArguments(infra.Ctx(), infra.KCP().Client(), net, NewObjActions(), HavingState(string(cloudcontrolv1beta1.StateReady))). Should(Succeed()) }) diff --git a/internal/controller/cloud-control/network_reference_test.go b/internal/controller/cloud-control/network_reference_test.go index 2c830a263..d0051d876 100644 --- a/internal/controller/cloud-control/network_reference_test.go +++ b/internal/controller/cloud-control/network_reference_test.go @@ -1,6 +1,8 @@ package cloudcontrol import ( + "time" + cloudcontrolv1beta1 "github.com/kyma-project/cloud-manager/api/cloud-control/v1beta1" "github.com/kyma-project/cloud-manager/pkg/common" kcpiprange "github.com/kyma-project/cloud-manager/pkg/kcp/iprange" @@ -12,7 +14,6 @@ import ( "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" - "time" ) var _ = Describe("Feature: KCP Network reference", func() { @@ -43,7 +44,7 @@ var _ = Describe("Feature: KCP Network reference", func() { By("Then Network state is Ready", func() { Eventually(LoadAndCheck). - WithArguments(infra.Ctx(), infra.KCP().Client(), net, NewObjActions(), HavingState(string(cloudcontrolv1beta1.ReadyState))). + WithArguments(infra.Ctx(), infra.KCP().Client(), net, NewObjActions(), HavingState(string(cloudcontrolv1beta1.StateReady))). Should(Succeed()) }) @@ -103,7 +104,7 @@ var _ = Describe("Feature: KCP Network reference", func() { By("And Given Network state is Ready", func() { Eventually(LoadAndCheck). - WithArguments(infra.Ctx(), infra.KCP().Client(), net, NewObjActions(), HavingState(string(cloudcontrolv1beta1.ReadyState))). + WithArguments(infra.Ctx(), infra.KCP().Client(), net, NewObjActions(), HavingState(string(cloudcontrolv1beta1.StateReady))). Should(Succeed()) }) @@ -131,7 +132,7 @@ var _ = Describe("Feature: KCP Network reference", func() { Eventually(LoadAndCheck). WithArguments(infra.Ctx(), infra.KCP().Client(), net, NewObjActions(), - HavingState(string(cloudcontrolv1beta1.WarningState)), + HavingState(string(cloudcontrolv1beta1.StateWarning)), ). Should(Succeed()) }) @@ -189,7 +190,7 @@ var _ = Describe("Feature: KCP Network reference", func() { By("And Given local Network state is Ready", func() { Eventually(LoadAndCheck). - WithArguments(infra.Ctx(), infra.KCP().Client(), localNet, NewObjActions(), HavingState(string(cloudcontrolv1beta1.ReadyState))). + WithArguments(infra.Ctx(), infra.KCP().Client(), localNet, NewObjActions(), HavingState(string(cloudcontrolv1beta1.StateReady))). Should(Succeed()) }) @@ -201,7 +202,7 @@ var _ = Describe("Feature: KCP Network reference", func() { By("And Given remote Network state is Ready", func() { Eventually(LoadAndCheck). - WithArguments(infra.Ctx(), infra.KCP().Client(), remoteNet, NewObjActions(), HavingState(string(cloudcontrolv1beta1.ReadyState))). + WithArguments(infra.Ctx(), infra.KCP().Client(), remoteNet, NewObjActions(), HavingState(string(cloudcontrolv1beta1.StateReady))). Should(Succeed()) }) @@ -230,7 +231,7 @@ var _ = Describe("Feature: KCP Network reference", func() { Eventually(LoadAndCheck). WithArguments(infra.Ctx(), infra.KCP().Client(), localNet, NewObjActions(), - HavingState(string(cloudcontrolv1beta1.WarningState)), + HavingState(string(cloudcontrolv1beta1.StateWarning)), ). Should(Succeed()) }) @@ -296,7 +297,7 @@ var _ = Describe("Feature: KCP Network reference", func() { By("And Given local Network state is Ready", func() { Eventually(LoadAndCheck). - WithArguments(infra.Ctx(), infra.KCP().Client(), localNet, NewObjActions(), HavingState(string(cloudcontrolv1beta1.ReadyState))). + WithArguments(infra.Ctx(), infra.KCP().Client(), localNet, NewObjActions(), HavingState(string(cloudcontrolv1beta1.StateReady))). Should(Succeed()) }) @@ -308,7 +309,7 @@ var _ = Describe("Feature: KCP Network reference", func() { By("And Given remote Network state is Ready", func() { Eventually(LoadAndCheck). - WithArguments(infra.Ctx(), infra.KCP().Client(), remoteNet, NewObjActions(), HavingState(string(cloudcontrolv1beta1.ReadyState))). + WithArguments(infra.Ctx(), infra.KCP().Client(), remoteNet, NewObjActions(), HavingState(string(cloudcontrolv1beta1.StateReady))). Should(Succeed()) }) @@ -337,7 +338,7 @@ var _ = Describe("Feature: KCP Network reference", func() { Eventually(LoadAndCheck). WithArguments(infra.Ctx(), infra.KCP().Client(), remoteNet, NewObjActions(), - HavingState(string(cloudcontrolv1beta1.WarningState)), + HavingState(string(cloudcontrolv1beta1.StateWarning)), ). Should(Succeed()) }) diff --git a/internal/controller/cloud-control/nfsinstance_gcp_test.go b/internal/controller/cloud-control/nfsinstance_gcp_test.go index 1a3c5302b..4284dd329 100644 --- a/internal/controller/cloud-control/nfsinstance_gcp_test.go +++ b/internal/controller/cloud-control/nfsinstance_gcp_test.go @@ -2,9 +2,10 @@ package cloudcontrol import ( "context" - "github.com/kyma-project/cloud-manager/pkg/composed" "time" + "github.com/kyma-project/cloud-manager/pkg/composed" + cloudcontrolv1beta1 "github.com/kyma-project/cloud-manager/api/cloud-control/v1beta1" iprangePkg "github.com/kyma-project/cloud-manager/pkg/kcp/iprange" client2 "github.com/kyma-project/cloud-manager/pkg/kcp/provider/gcp/client" @@ -105,7 +106,7 @@ var _ = Describe("Feature: KCP NFSVolume for GCP", func() { Should(BeTrue(), "expected NfsInstance for GCP with Ready condition") }) By("And KCP NfsVolume has Ready state", func() { - Expect(gcpNfsInstance.Status.State).To(Equal(cloudcontrolv1beta1.ReadyState)) + Expect(gcpNfsInstance.Status.State).To(Equal(cloudcontrolv1beta1.StateReady)) }) }) @@ -139,7 +140,7 @@ var _ = Describe("Feature: KCP NFSVolume for GCP", func() { if err != nil { return false, err } - exists = gcpNfsInstance.Status.State == cloudcontrolv1beta1.ReadyState + exists = gcpNfsInstance.Status.State == cloudcontrolv1beta1.StateReady return exists, nil }, timeout, interval) }) @@ -533,7 +534,7 @@ var _ = Describe("Feature: KCP NFSVolume for GCP", func() { Should(BeTrue(), "expected NfsInstance for GCP with Ready condition") }) By("And KCP NfsVolume has Ready state", func() { - Expect(gcpNfsInstance.Status.State).To(Equal(cloudcontrolv1beta1.ReadyState)) + Expect(gcpNfsInstance.Status.State).To(Equal(cloudcontrolv1beta1.StateReady)) }) }) @@ -567,7 +568,7 @@ var _ = Describe("Feature: KCP NFSVolume for GCP", func() { if err != nil { return false, err } - exists = gcpNfsInstance.Status.State == cloudcontrolv1beta1.ReadyState + exists = gcpNfsInstance.Status.State == cloudcontrolv1beta1.StateReady return exists, nil }, timeout, interval) }) diff --git a/internal/controller/cloud-control/redisinstance_azure_test.go b/internal/controller/cloud-control/redisinstance_azure_test.go index aed30684b..dd6144f15 100644 --- a/internal/controller/cloud-control/redisinstance_azure_test.go +++ b/internal/controller/cloud-control/redisinstance_azure_test.go @@ -2,11 +2,12 @@ package cloudcontrol import ( "fmt" + "time" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/redis/armredis" azurecommon "github.com/kyma-project/cloud-manager/pkg/kcp/provider/azure/common" azuremeta "github.com/kyma-project/cloud-manager/pkg/kcp/provider/azure/meta" "k8s.io/utils/ptr" - "time" cloudcontrolv1beta1 "github.com/kyma-project/cloud-manager/api/cloud-control/v1beta1" iprangePkg "github.com/kyma-project/cloud-manager/pkg/kcp/iprange" @@ -124,7 +125,7 @@ var _ = Describe("Feature: KCP RedisInstance", func() { }) By("And Then KCP RedisInstance has status state Ready", func() { - Expect(redisInstance.Status.State).To(Equal(cloudcontrolv1beta1.ReadyState)) + Expect(redisInstance.Status.State).To(Equal(cloudcontrolv1beta1.StateReady)) }) By("And Then KCP RedisInstance has .status.primaryEndpoint set", func() { diff --git a/internal/controller/cloud-control/vpcpeering_aws_test.go b/internal/controller/cloud-control/vpcpeering_aws_test.go index d12fea451..0344a2973 100644 --- a/internal/controller/cloud-control/vpcpeering_aws_test.go +++ b/internal/controller/cloud-control/vpcpeering_aws_test.go @@ -3,6 +3,7 @@ package cloudcontrol import ( "errors" "fmt" + ec2Types "github.com/aws/aws-sdk-go-v2/service/ec2/types" cloudcontrolv1beta1 "github.com/kyma-project/cloud-manager/api/cloud-control/v1beta1" "github.com/kyma-project/cloud-manager/pkg/common" @@ -463,7 +464,7 @@ var _ = Describe("Feature: KCP VpcPeering", func() { To(Succeed()) localKcpNet.Status.Network = localKcpNet.Spec.Network.Reference.DeepCopy() - localKcpNet.Status.State = string(cloudcontrolv1beta1.ReadyState) + localKcpNet.Status.State = string(cloudcontrolv1beta1.StateReady) meta.SetStatusCondition(&localKcpNet.Status.Conditions, metav1.Condition{ Type: cloudcontrolv1beta1.ConditionTypeReady, Status: metav1.ConditionTrue, @@ -487,7 +488,7 @@ var _ = Describe("Feature: KCP VpcPeering", func() { Should(Succeed()) remoteKcpNet.Status.Network = remoteKcpNet.Spec.Network.Reference.DeepCopy() - remoteKcpNet.Status.State = string(cloudcontrolv1beta1.ReadyState) + remoteKcpNet.Status.State = string(cloudcontrolv1beta1.StateReady) meta.SetStatusCondition(&remoteKcpNet.Status.Conditions, metav1.Condition{ Type: cloudcontrolv1beta1.ConditionTypeReady, Status: metav1.ConditionTrue, diff --git a/internal/controller/cloud-control/vpcpeering_azure_test.go b/internal/controller/cloud-control/vpcpeering_azure_test.go index c41ac057e..4085e779a 100644 --- a/internal/controller/cloud-control/vpcpeering_azure_test.go +++ b/internal/controller/cloud-control/vpcpeering_azure_test.go @@ -2,6 +2,7 @@ package cloudcontrol import ( "errors" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v5" cloudcontrolv1beta1 "github.com/kyma-project/cloud-manager/api/cloud-control/v1beta1" "github.com/kyma-project/cloud-manager/pkg/common" @@ -356,7 +357,7 @@ var _ = Describe("Feature: KCP VpcPeering", func() { Should(Succeed()) localKcpNet.Status.Network = localKcpNet.Spec.Network.Reference.DeepCopy() - localKcpNet.Status.State = string(cloudcontrolv1beta1.ReadyState) + localKcpNet.Status.State = string(cloudcontrolv1beta1.StateReady) meta.SetStatusCondition(&localKcpNet.Status.Conditions, metav1.Condition{ Type: cloudcontrolv1beta1.ConditionTypeReady, Status: metav1.ConditionTrue, @@ -380,7 +381,7 @@ var _ = Describe("Feature: KCP VpcPeering", func() { Should(Succeed()) remoteKcpNet.Status.Network = remoteKcpNet.Spec.Network.Reference.DeepCopy() - remoteKcpNet.Status.State = string(cloudcontrolv1beta1.ReadyState) + remoteKcpNet.Status.State = string(cloudcontrolv1beta1.StateReady) meta.SetStatusCondition(&remoteKcpNet.Status.Conditions, metav1.Condition{ Type: cloudcontrolv1beta1.ConditionTypeReady, Status: metav1.ConditionTrue, diff --git a/internal/controller/cloud-resources/gcpnfsvolume_test.go b/internal/controller/cloud-resources/gcpnfsvolume_test.go index 82e2ac4de..c80521c5b 100644 --- a/internal/controller/cloud-resources/gcpnfsvolume_test.go +++ b/internal/controller/cloud-resources/gcpnfsvolume_test.go @@ -3,9 +3,10 @@ package cloudresources import ( "context" "fmt" - "github.com/kyma-project/cloud-manager/pkg/feature" "time" + "github.com/kyma-project/cloud-manager/pkg/feature" + cloudcontrolv1beta1 "github.com/kyma-project/cloud-manager/api/cloud-control/v1beta1" cloudresourcesv1beta1 "github.com/kyma-project/cloud-manager/api/cloud-resources/v1beta1" kcpiprange "github.com/kyma-project/cloud-manager/pkg/kcp/iprange" @@ -195,7 +196,7 @@ var _ = Describe("Feature: SKR GcpNfsVolume", func() { WithArguments( infra.Ctx(), infra.KCP().Client(), kcpNfsInstance, WithConditions(KcpReadyCondition()), - WithKcpNfsStatusState(cloudcontrolv1beta1.ReadyState), + WithKcpNfsStatusState(cloudcontrolv1beta1.StateReady), WithKcpNfsStatusHost(nfsIpAddress), WithKcpNfsStatusCapacity(gcpNfsVolume.Spec.CapacityGb), ). @@ -382,7 +383,7 @@ var _ = Describe("Feature: SKR GcpNfsVolume", func() { WithArguments( infra.Ctx(), infra.KCP().Client(), kcpNfsInstance, WithConditions(KcpReadyCondition()), - WithKcpNfsStatusState(cloudcontrolv1beta1.ReadyState), + WithKcpNfsStatusState(cloudcontrolv1beta1.StateReady), WithKcpNfsStatusHost(nfsIpAddress), WithKcpNfsStatusCapacity(gcpNfsVolume.Spec.CapacityGb), ). @@ -464,7 +465,7 @@ var _ = Describe("Feature: SKR GcpNfsVolume", func() { WithArguments( infra.Ctx(), infra.KCP().Client(), kcpNfsInstance, WithConditions(KcpReadyCondition()), - WithKcpNfsStatusState(cloudcontrolv1beta1.ReadyState), + WithKcpNfsStatusState(cloudcontrolv1beta1.StateReady), WithKcpNfsStatusHost(nfsIpAddress), WithKcpNfsStatusCapacity(updatedCapacityGb), ). @@ -598,7 +599,7 @@ var _ = Describe("Feature: SKR GcpNfsVolume", func() { WithArguments( infra.Ctx(), infra.KCP().Client(), kcpNfsInstance, WithConditions(KcpReadyCondition()), - WithKcpNfsStatusState(cloudcontrolv1beta1.ReadyState), + WithKcpNfsStatusState(cloudcontrolv1beta1.StateReady), WithKcpNfsStatusHost(nfsIpAddress), WithKcpNfsStatusCapacity(gcpNfsVolume.Spec.CapacityGb), ). @@ -795,7 +796,7 @@ var _ = Describe("Feature: SKR GcpNfsVolume", func() { WithArguments( infra.Ctx(), infra.KCP().Client(), kcpNfsInstance, WithConditions(KcpReadyCondition()), - WithKcpNfsStatusState(cloudcontrolv1beta1.ReadyState), + WithKcpNfsStatusState(cloudcontrolv1beta1.StateReady), WithKcpNfsStatusHost(nfsIpAddress), WithKcpNfsStatusCapacity(gcpNfsVolume.Spec.CapacityGb), ). @@ -1001,7 +1002,7 @@ var _ = Describe("Feature: SKR GcpNfsVolume", func() { WithArguments( infra.Ctx(), infra.KCP().Client(), kcpNfsInstance, WithConditions(KcpReadyCondition()), - WithKcpNfsStatusState(cloudcontrolv1beta1.ReadyState), + WithKcpNfsStatusState(cloudcontrolv1beta1.StateReady), WithKcpNfsStatusHost(nfsIpAddress), WithKcpNfsStatusCapacity(gcpNfsVolume.Spec.CapacityGb), ). @@ -1082,7 +1083,7 @@ var _ = Describe("Feature: SKR GcpNfsVolume", func() { WithArguments( infra.Ctx(), infra.KCP().Client(), kcpNfsInstance, WithConditions(KcpReadyCondition()), - WithKcpNfsStatusState(cloudcontrolv1beta1.ReadyState), + WithKcpNfsStatusState(cloudcontrolv1beta1.StateReady), WithKcpNfsStatusHost(nfsIpAddress), WithKcpNfsStatusCapacity(updatedCapacityGb), ). @@ -1236,7 +1237,7 @@ var _ = Describe("Feature: SKR GcpNfsVolume", func() { WithArguments( infra.Ctx(), infra.KCP().Client(), kcpNfsInstance, WithConditions(KcpReadyCondition()), - WithKcpNfsStatusState(cloudcontrolv1beta1.ReadyState), + WithKcpNfsStatusState(cloudcontrolv1beta1.StateReady), WithKcpNfsStatusHost(nfsIpAddress), WithKcpNfsStatusCapacity(gcpNfsVolume.Spec.CapacityGb), ). diff --git a/pkg/kcp/iprange/kcpNetworkCreate.go b/pkg/kcp/iprange/kcpNetworkCreate.go index 1fd865c8d..69b74dc69 100644 --- a/pkg/kcp/iprange/kcpNetworkCreate.go +++ b/pkg/kcp/iprange/kcpNetworkCreate.go @@ -3,6 +3,7 @@ package iprange import ( "context" "errors" + cloudcontrolv1beta1 "github.com/kyma-project/cloud-manager/api/cloud-control/v1beta1" "github.com/kyma-project/cloud-manager/pkg/composed" "github.com/kyma-project/cloud-manager/pkg/util" @@ -25,7 +26,7 @@ func kcpNetworkCreate(ctx context.Context, st composed.State) (error, context.Co if state.isKymaNetwork { logger.Error(errors.New("network not found"), "Error loading Kyma KCP Network that should exist!!!") - state.ObjAsIpRange().Status.State = cloudcontrolv1beta1.ErrorState + state.ObjAsIpRange().Status.State = cloudcontrolv1beta1.StateError return composed.PatchStatus(state.ObjAsIpRange()). SetExclusiveConditions(metav1.Condition{ @@ -42,7 +43,7 @@ func kcpNetworkCreate(ctx context.Context, st composed.State) (error, context.Co if !state.isCloudManagerNetwork { logger.Error(errors.New("network not found"), "Error loading non-CM KCP Network") - state.ObjAsIpRange().Status.State = cloudcontrolv1beta1.ErrorState + state.ObjAsIpRange().Status.State = cloudcontrolv1beta1.StateError return composed.PatchStatus(state.ObjAsIpRange()). SetExclusiveConditions(metav1.Condition{ @@ -81,7 +82,7 @@ func kcpNetworkCreate(ctx context.Context, st composed.State) (error, context.Co } if err != nil { logger.Error(err, "Error creating CM KCP Network") - state.ObjAsIpRange().Status.State = cloudcontrolv1beta1.ErrorState + state.ObjAsIpRange().Status.State = cloudcontrolv1beta1.StateError return composed.PatchStatus(state.ObjAsIpRange()). SetExclusiveConditions(metav1.Condition{ Type: cloudcontrolv1beta1.ConditionTypeError, diff --git a/pkg/kcp/iprange/kcpNetworkWait.go b/pkg/kcp/iprange/kcpNetworkWait.go index f9761cb13..a7bc35388 100644 --- a/pkg/kcp/iprange/kcpNetworkWait.go +++ b/pkg/kcp/iprange/kcpNetworkWait.go @@ -2,6 +2,7 @@ package iprange import ( "context" + cloudcontrolv1beta1 "github.com/kyma-project/cloud-manager/api/cloud-control/v1beta1" "github.com/kyma-project/cloud-manager/pkg/composed" "github.com/kyma-project/cloud-manager/pkg/util" @@ -24,7 +25,7 @@ func kcpNetworkWait(ctx context.Context, st composed.State) (error, context.Cont if meta.IsStatusConditionTrue(state.network.Status.Conditions, cloudcontrolv1beta1.ConditionTypeError) { logger.Info("KCP IpRange network has error condition") - state.ObjAsIpRange().Status.State = cloudcontrolv1beta1.ErrorState + state.ObjAsIpRange().Status.State = cloudcontrolv1beta1.StateError return composed.PatchStatus(state.ObjAsIpRange()). SetExclusiveConditions(metav1.Condition{ Type: cloudcontrolv1beta1.ConditionTypeError, diff --git a/pkg/kcp/iprange/kymaNetworkLoad.go b/pkg/kcp/iprange/kymaNetworkLoad.go index 821d0afec..250f860bf 100644 --- a/pkg/kcp/iprange/kymaNetworkLoad.go +++ b/pkg/kcp/iprange/kymaNetworkLoad.go @@ -2,6 +2,7 @@ package iprange import ( "context" + cloudcontrolv1beta1 "github.com/kyma-project/cloud-manager/api/cloud-control/v1beta1" "github.com/kyma-project/cloud-manager/pkg/common" "github.com/kyma-project/cloud-manager/pkg/composed" @@ -27,7 +28,7 @@ func kymaNetworkLoad(ctx context.Context, st composed.State) (error, context.Con if apierrors.IsNotFound(err) { logger.Info("Kyma network does not exist") - state.ObjAsIpRange().Status.State = cloudcontrolv1beta1.ErrorState + state.ObjAsIpRange().Status.State = cloudcontrolv1beta1.StateError return composed.PatchStatus(state.ObjAsIpRange()). SetExclusiveConditions(metav1.Condition{ Type: cloudcontrolv1beta1.ConditionTypeError, diff --git a/pkg/kcp/iprange/kymaNetworkWait.go b/pkg/kcp/iprange/kymaNetworkWait.go index fa06c52ba..c869b183b 100644 --- a/pkg/kcp/iprange/kymaNetworkWait.go +++ b/pkg/kcp/iprange/kymaNetworkWait.go @@ -2,6 +2,7 @@ package iprange import ( "context" + cloudcontrolv1beta1 "github.com/kyma-project/cloud-manager/api/cloud-control/v1beta1" "github.com/kyma-project/cloud-manager/pkg/composed" "github.com/kyma-project/cloud-manager/pkg/util" @@ -23,7 +24,7 @@ func kymaNetworkWait(ctx context.Context, st composed.State) (error, context.Con if meta.IsStatusConditionTrue(state.kymaNetwork.Status.Conditions, cloudcontrolv1beta1.ConditionTypeError) { logger.Info("KCP IpRange kyma network has error condition") - state.kymaNetwork.Status.State = string(cloudcontrolv1beta1.ErrorState) + state.kymaNetwork.Status.State = string(cloudcontrolv1beta1.StateError) return composed.PatchStatus(state.kymaNetwork). SetExclusiveConditions(metav1.Condition{ Type: cloudcontrolv1beta1.ConditionTypeError, diff --git a/pkg/kcp/iprange/kymaPeeringWait.go b/pkg/kcp/iprange/kymaPeeringWait.go index e89b27be3..23b81ba08 100644 --- a/pkg/kcp/iprange/kymaPeeringWait.go +++ b/pkg/kcp/iprange/kymaPeeringWait.go @@ -2,6 +2,7 @@ package iprange import ( "context" + cloudcontrolv1beta1 "github.com/kyma-project/cloud-manager/api/cloud-control/v1beta1" "github.com/kyma-project/cloud-manager/pkg/composed" "github.com/kyma-project/cloud-manager/pkg/util" @@ -23,7 +24,7 @@ func kymaPeeringWait(ctx context.Context, st composed.State) (error, context.Con if meta.IsStatusConditionTrue(state.kymaPeering.Status.Conditions, cloudcontrolv1beta1.ConditionTypeError) { logger.Info("KCP IpRange kyma peering has error condition") - state.kymaPeering.Status.State = string(cloudcontrolv1beta1.ErrorState) + state.kymaPeering.Status.State = string(cloudcontrolv1beta1.StateError) return composed.PatchStatus(state.kymaPeering). SetExclusiveConditions(metav1.Condition{ Type: cloudcontrolv1beta1.ConditionTypeError, diff --git a/pkg/kcp/iprange/preventDeleteOnNfsInstanceUsage.go b/pkg/kcp/iprange/preventDeleteOnNfsInstanceUsage.go index e7c0eef4d..8738c3b3e 100644 --- a/pkg/kcp/iprange/preventDeleteOnNfsInstanceUsage.go +++ b/pkg/kcp/iprange/preventDeleteOnNfsInstanceUsage.go @@ -3,6 +3,7 @@ package iprange import ( "context" "fmt" + cloudcontrolv1beta1 "github.com/kyma-project/cloud-manager/api/cloud-control/v1beta1" "github.com/kyma-project/cloud-manager/pkg/composed" "github.com/kyma-project/cloud-manager/pkg/util" @@ -17,7 +18,7 @@ func preventDeleteOnNfsInstanceUsage(ctx context.Context, st composed.State) (er cloudcontrolv1beta1.IpRangeField, func(ctx context.Context, st composed.State, _ client.ObjectList, usedByNames []string) (error, context.Context) { state := st.(*State) - state.ObjAsIpRange().Status.State = cloudcontrolv1beta1.WarningState + state.ObjAsIpRange().Status.State = cloudcontrolv1beta1.StateWarning return composed.PatchStatus(state.ObjAsIpRange()). SetExclusiveConditions(metav1.Condition{ Type: cloudcontrolv1beta1.ConditionTypeWarning, diff --git a/pkg/kcp/iprange/preventDeleteOnRedisInstanceUsage.go b/pkg/kcp/iprange/preventDeleteOnRedisInstanceUsage.go index bd52f0e08..b84dcf84a 100644 --- a/pkg/kcp/iprange/preventDeleteOnRedisInstanceUsage.go +++ b/pkg/kcp/iprange/preventDeleteOnRedisInstanceUsage.go @@ -3,6 +3,7 @@ package iprange import ( "context" "fmt" + cloudcontrolv1beta1 "github.com/kyma-project/cloud-manager/api/cloud-control/v1beta1" "github.com/kyma-project/cloud-manager/pkg/composed" "github.com/kyma-project/cloud-manager/pkg/util" @@ -17,7 +18,7 @@ func preventDeleteOnRedisInstanceUsage(ctx context.Context, st composed.State) ( cloudcontrolv1beta1.IpRangeField, func(ctx context.Context, st composed.State, _ client.ObjectList, usedByNames []string) (error, context.Context) { state := st.(*State) - state.ObjAsIpRange().Status.State = cloudcontrolv1beta1.WarningState + state.ObjAsIpRange().Status.State = cloudcontrolv1beta1.StateWarning return composed.PatchStatus(state.ObjAsIpRange()). SetExclusiveConditions(metav1.Condition{ Type: cloudcontrolv1beta1.ConditionTypeWarning, diff --git a/pkg/kcp/iprange/statusReady.go b/pkg/kcp/iprange/statusReady.go index 9c1b82635..11b4e89d7 100644 --- a/pkg/kcp/iprange/statusReady.go +++ b/pkg/kcp/iprange/statusReady.go @@ -2,6 +2,7 @@ package iprange import ( "context" + cloudcontrolv1beta1 "github.com/kyma-project/cloud-manager/api/cloud-control/v1beta1" "github.com/kyma-project/cloud-manager/pkg/composed" "k8s.io/apimachinery/pkg/api/meta" @@ -17,8 +18,8 @@ func statusReady(ctx context.Context, st composed.State) (error, context.Context changed := false - if state.ObjAsIpRange().Status.State != cloudcontrolv1beta1.ReadyState { - state.ObjAsIpRange().Status.State = cloudcontrolv1beta1.ReadyState + if state.ObjAsIpRange().Status.State != cloudcontrolv1beta1.StateReady { + state.ObjAsIpRange().Status.State = cloudcontrolv1beta1.StateReady changed = true } diff --git a/pkg/kcp/network/handleNetworkReference.go b/pkg/kcp/network/handleNetworkReference.go index 33726528e..6341d33ee 100644 --- a/pkg/kcp/network/handleNetworkReference.go +++ b/pkg/kcp/network/handleNetworkReference.go @@ -2,6 +2,7 @@ package network import ( "context" + cloudcontrolv1beta1 "github.com/kyma-project/cloud-manager/api/cloud-control/v1beta1" "github.com/kyma-project/cloud-manager/pkg/common/actions" "github.com/kyma-project/cloud-manager/pkg/composed" @@ -48,8 +49,8 @@ func handleNetworkReference(ctx context.Context, st composed.State) (error, cont changed = true } - if state.ObjAsNetwork().Status.State != string(cloudcontrolv1beta1.ReadyState) { - state.ObjAsNetwork().Status.State = string(cloudcontrolv1beta1.ReadyState) + if state.ObjAsNetwork().Status.State != string(cloudcontrolv1beta1.StateReady) { + state.ObjAsNetwork().Status.State = string(cloudcontrolv1beta1.StateReady) changed = true } diff --git a/pkg/kcp/network/logLogicalErrorOnManagedNetworkMissing.go b/pkg/kcp/network/logLogicalErrorOnManagedNetworkMissing.go index 6600543db..3abb2be3f 100644 --- a/pkg/kcp/network/logLogicalErrorOnManagedNetworkMissing.go +++ b/pkg/kcp/network/logLogicalErrorOnManagedNetworkMissing.go @@ -3,6 +3,7 @@ package network import ( "context" "errors" + cloudcontrolv1beta1 "github.com/kyma-project/cloud-manager/api/cloud-control/v1beta1" "github.com/kyma-project/cloud-manager/pkg/composed" "github.com/kyma-project/cloud-manager/pkg/util" @@ -19,7 +20,7 @@ func logLogicalErrorOnManagedNetworkMissing(ctx context.Context, st composed.Sta if state.Scope() == nil || state.Scope().Name == "" { err := errors.New("scope not found") logger.Error(err, "Logical error") - state.ObjAsNetwork().Status.State = string(cloudcontrolv1beta1.ErrorState) + state.ObjAsNetwork().Status.State = string(cloudcontrolv1beta1.StateError) return composed.PatchStatus(state.ObjAsNetwork()). SetExclusiveConditions(metav1.Condition{ Type: cloudcontrolv1beta1.ConditionTypeError, diff --git a/pkg/kcp/network/preventCreationOfNonCmManagedNetwork.go b/pkg/kcp/network/preventCreationOfNonCmManagedNetwork.go index 4e1237daa..cd926f6c7 100644 --- a/pkg/kcp/network/preventCreationOfNonCmManagedNetwork.go +++ b/pkg/kcp/network/preventCreationOfNonCmManagedNetwork.go @@ -3,6 +3,7 @@ package network import ( "context" "errors" + cloudcontrolv1beta1 "github.com/kyma-project/cloud-manager/api/cloud-control/v1beta1" "github.com/kyma-project/cloud-manager/pkg/common" "github.com/kyma-project/cloud-manager/pkg/composed" @@ -25,8 +26,8 @@ func preventCreationOfNonCmManagedNetwork(ctx context.Context, st composed.State changed := false - if state.ObjAsNetwork().Status.State != string(cloudcontrolv1beta1.ErrorState) { - state.ObjAsNetwork().Status.State = string(cloudcontrolv1beta1.ErrorState) + if state.ObjAsNetwork().Status.State != string(cloudcontrolv1beta1.StateError) { + state.ObjAsNetwork().Status.State = string(cloudcontrolv1beta1.StateError) changed = true } diff --git a/pkg/kcp/network/preventDeleteWhenUsedByIpRange.go b/pkg/kcp/network/preventDeleteWhenUsedByIpRange.go index bef0815fb..f12c704d3 100644 --- a/pkg/kcp/network/preventDeleteWhenUsedByIpRange.go +++ b/pkg/kcp/network/preventDeleteWhenUsedByIpRange.go @@ -18,7 +18,7 @@ func preventDeleteWhenUsedByIpRange(ctx context.Context, st composed.State) (err cloudcontrolv1beta1.IpRangeNetworkField, func(ctx context.Context, st composed.State, _ client.ObjectList, usedByNames []string) (error, context.Context) { state := st.(*state) - state.ObjAsNetwork().Status.State = string(cloudcontrolv1beta1.WarningState) + state.ObjAsNetwork().Status.State = string(cloudcontrolv1beta1.StateWarning) return composed.PatchStatus(state.ObjAsNetwork()). SetExclusiveConditions(metav1.Condition{ Type: cloudcontrolv1beta1.ConditionTypeWarning, diff --git a/pkg/kcp/network/preventDeleteWhenUsedByPeeringLocalNetwork.go b/pkg/kcp/network/preventDeleteWhenUsedByPeeringLocalNetwork.go index 86aaf329b..2e26abe6c 100644 --- a/pkg/kcp/network/preventDeleteWhenUsedByPeeringLocalNetwork.go +++ b/pkg/kcp/network/preventDeleteWhenUsedByPeeringLocalNetwork.go @@ -3,6 +3,7 @@ package network import ( "context" "fmt" + cloudcontrolv1beta1 "github.com/kyma-project/cloud-manager/api/cloud-control/v1beta1" "github.com/kyma-project/cloud-manager/pkg/composed" "github.com/kyma-project/cloud-manager/pkg/util" @@ -17,7 +18,7 @@ func preventDeleteWhenUsedByPeeringLocalNetwork(ctx context.Context, st composed cloudcontrolv1beta1.VpcPeeringLocalNetworkField, func(ctx context.Context, st composed.State, _ client.ObjectList, usedByNames []string) (error, context.Context) { state := st.(*state) - state.ObjAsNetwork().Status.State = string(cloudcontrolv1beta1.WarningState) + state.ObjAsNetwork().Status.State = string(cloudcontrolv1beta1.StateWarning) return composed.PatchStatus(state.ObjAsNetwork()). SetExclusiveConditions(metav1.Condition{ Type: cloudcontrolv1beta1.ConditionTypeWarning, diff --git a/pkg/kcp/network/preventDeleteWhenUsedByPeeringRemoteNetwork.go b/pkg/kcp/network/preventDeleteWhenUsedByPeeringRemoteNetwork.go index 3972612fe..b81406f6f 100644 --- a/pkg/kcp/network/preventDeleteWhenUsedByPeeringRemoteNetwork.go +++ b/pkg/kcp/network/preventDeleteWhenUsedByPeeringRemoteNetwork.go @@ -3,6 +3,7 @@ package network import ( "context" "fmt" + cloudcontrolv1beta1 "github.com/kyma-project/cloud-manager/api/cloud-control/v1beta1" "github.com/kyma-project/cloud-manager/pkg/composed" "github.com/kyma-project/cloud-manager/pkg/util" @@ -17,7 +18,7 @@ func preventDeleteWhenUsedByPeeringRemoteNetwork(ctx context.Context, st compose cloudcontrolv1beta1.VpcPeeringRemoteNetworkField, func(ctx context.Context, st composed.State, _ client.ObjectList, usedByNames []string) (error, context.Context) { state := st.(*state) - state.ObjAsNetwork().Status.State = string(cloudcontrolv1beta1.WarningState) + state.ObjAsNetwork().Status.State = string(cloudcontrolv1beta1.StateWarning) return composed.PatchStatus(state.ObjAsNetwork()). SetExclusiveConditions(metav1.Condition{ Type: cloudcontrolv1beta1.ConditionTypeWarning, diff --git a/pkg/kcp/nfsinstance/loadIpRange.go b/pkg/kcp/nfsinstance/loadIpRange.go index e41df41cc..9dccc4ab2 100644 --- a/pkg/kcp/nfsinstance/loadIpRange.go +++ b/pkg/kcp/nfsinstance/loadIpRange.go @@ -3,6 +3,7 @@ package nfsinstance import ( "context" "fmt" + types2 "github.com/kyma-project/cloud-manager/pkg/kcp/nfsinstance/types" cloudcontrolv1beta1 "github.com/kyma-project/cloud-manager/api/cloud-control/v1beta1" @@ -42,7 +43,7 @@ func loadIpRange(ctx context.Context, st composed.State) (error, context.Context Reason: cloudcontrolv1beta1.ReasonInvalidIpRangeReference, Message: fmt.Sprintf("Referred IpRange %s/%s does not exist", state.Obj().GetNamespace(), state.ObjAsNfsInstance().Spec.IpRange.Name), }) - state.ObjAsNfsInstance().Status.State = cloudcontrolv1beta1.ErrorState + state.ObjAsNfsInstance().Status.State = cloudcontrolv1beta1.StateError err = state.UpdateObjStatus(ctx) if err != nil { return composed.LogErrorAndReturn(err, "Error updating NfsInstance status after referred IpRange not found", composed.StopWithRequeue, ctx) diff --git a/pkg/kcp/nuke/loadResources.go b/pkg/kcp/nuke/loadResources.go index 3c59a56a8..bb085cd9e 100644 --- a/pkg/kcp/nuke/loadResources.go +++ b/pkg/kcp/nuke/loadResources.go @@ -3,6 +3,7 @@ package nuke import ( "context" "fmt" + cloudcontrolv1beta1 "github.com/kyma-project/cloud-manager/api/cloud-control/v1beta1" "github.com/kyma-project/cloud-manager/pkg/common/actions/focal" "github.com/kyma-project/cloud-manager/pkg/composed" @@ -52,7 +53,7 @@ func loadResources(ctx context.Context, st composed.State) (error, context.Conte if err != nil { logger.Error(err, "Error listing resources") - state.ObjAsNuke().Status.State = string(cloudcontrolv1beta1.ErrorState) + state.ObjAsNuke().Status.State = string(cloudcontrolv1beta1.StateError) return composed.PatchStatus(state.ObjAsNuke()). SetExclusiveConditions(metav1.Condition{ diff --git a/pkg/kcp/provider/aws/iprange/v2/allocateIpRange.go b/pkg/kcp/provider/aws/iprange/v2/allocateIpRange.go index bcb8761c4..65a19aa3c 100644 --- a/pkg/kcp/provider/aws/iprange/v2/allocateIpRange.go +++ b/pkg/kcp/provider/aws/iprange/v2/allocateIpRange.go @@ -2,6 +2,7 @@ package v2 import ( "context" + cloudcontrolv1beta1 "github.com/kyma-project/cloud-manager/api/cloud-control/v1beta1" "github.com/kyma-project/cloud-manager/pkg/composed" iprangetypes "github.com/kyma-project/cloud-manager/pkg/kcp/iprange/types" @@ -17,7 +18,7 @@ func NewAllocateIpRangeAction(_ StateFactory) composed.Action { state := st.(iprangetypes.State) if len(state.Scope().Spec.Scope.Aws.Network.Nodes) == 0 { - state.ObjAsIpRange().Status.State = cloudcontrolv1beta1.ErrorState + state.ObjAsIpRange().Status.State = cloudcontrolv1beta1.StateError return composed.PatchStatus(state.ObjAsIpRange()). SetExclusiveConditions(metav1.Condition{ Type: cloudcontrolv1beta1.ConditionTypeError, diff --git a/pkg/kcp/provider/aws/iprange/v2/ensureShootZonesAndRangeSubnetsMatch.go b/pkg/kcp/provider/aws/iprange/v2/ensureShootZonesAndRangeSubnetsMatch.go index 1cf21de16..c8d536700 100644 --- a/pkg/kcp/provider/aws/iprange/v2/ensureShootZonesAndRangeSubnetsMatch.go +++ b/pkg/kcp/provider/aws/iprange/v2/ensureShootZonesAndRangeSubnetsMatch.go @@ -3,6 +3,7 @@ package v2 import ( "context" "fmt" + cloudcontrolv1beta1 "github.com/kyma-project/cloud-manager/api/cloud-control/v1beta1" "github.com/kyma-project/cloud-manager/pkg/composed" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -21,7 +22,7 @@ func ensureShootZonesAndRangeSubnetsMatch(ctx context.Context, st composed.State ) ctx = composed.LoggerIntoCtx(ctx, logger) - state.ObjAsIpRange().Status.State = cloudcontrolv1beta1.ErrorState + state.ObjAsIpRange().Status.State = cloudcontrolv1beta1.StateError return composed.PatchStatus(state.ObjAsIpRange()). SetExclusiveConditions(metav1.Condition{ Type: cloudcontrolv1beta1.ConditionTypeError, diff --git a/pkg/kcp/provider/aws/iprange/v2/rangeCheckOverlap.go b/pkg/kcp/provider/aws/iprange/v2/rangeCheckOverlap.go index 53f9a1d87..0f36f19ef 100644 --- a/pkg/kcp/provider/aws/iprange/v2/rangeCheckOverlap.go +++ b/pkg/kcp/provider/aws/iprange/v2/rangeCheckOverlap.go @@ -3,6 +3,7 @@ package v2 import ( "context" "fmt" + "github.com/3th1nk/cidr" cloudcontrolv1beta1 "github.com/kyma-project/cloud-manager/api/cloud-control/v1beta1" "github.com/kyma-project/cloud-manager/pkg/composed" @@ -28,7 +29,7 @@ func rangeCheckOverlap(ctx context.Context, st composed.State) (error, context.C } if util.CidrOverlap(rangeCidr.CIDR(), cdr.CIDR()) { - state.ObjAsIpRange().Status.State = cloudcontrolv1beta1.ErrorState + state.ObjAsIpRange().Status.State = cloudcontrolv1beta1.StateError return composed.PatchStatus(state.ObjAsIpRange()). SetExclusiveConditions(metav1.Condition{ Type: cloudcontrolv1beta1.ConditionTypeError, diff --git a/pkg/kcp/provider/aws/iprange/v2/statusSuccess.go b/pkg/kcp/provider/aws/iprange/v2/statusSuccess.go index e27bdd7d9..08ae11841 100644 --- a/pkg/kcp/provider/aws/iprange/v2/statusSuccess.go +++ b/pkg/kcp/provider/aws/iprange/v2/statusSuccess.go @@ -2,6 +2,7 @@ package v2 import ( "context" + ec2Types "github.com/aws/aws-sdk-go-v2/service/ec2/types" "github.com/elliotchance/pie/v2" cloudcontrolv1beta1 "github.com/kyma-project/cloud-manager/api/cloud-control/v1beta1" @@ -16,8 +17,8 @@ func statusSuccess(ctx context.Context, st composed.State) (error, context.Conte changed := false - if state.ObjAsIpRange().Status.State != cloudcontrolv1beta1.ReadyState { - state.ObjAsIpRange().Status.State = cloudcontrolv1beta1.ReadyState + if state.ObjAsIpRange().Status.State != cloudcontrolv1beta1.StateReady { + state.ObjAsIpRange().Status.State = cloudcontrolv1beta1.StateReady changed = true } diff --git a/pkg/kcp/provider/aws/nfsinstance/loadSecurityGroup.go b/pkg/kcp/provider/aws/nfsinstance/loadSecurityGroup.go index bef722ac3..dcec7f1f7 100644 --- a/pkg/kcp/provider/aws/nfsinstance/loadSecurityGroup.go +++ b/pkg/kcp/provider/aws/nfsinstance/loadSecurityGroup.go @@ -2,6 +2,7 @@ package nfsinstance import ( "context" + ec2Types "github.com/aws/aws-sdk-go-v2/service/ec2/types" cloudcontrolv1beta1 "github.com/kyma-project/cloud-manager/api/cloud-control/v1beta1" "github.com/kyma-project/cloud-manager/pkg/composed" @@ -26,7 +27,7 @@ func loadSecurityGroup(ctx context.Context, st composed.State) (error, context.C Reason: cloudcontrolv1beta1.ReasonUnknown, Message: "Unable to load security group", }) - state.ObjAsNfsInstance().Status.State = cloudcontrolv1beta1.ErrorState + state.ObjAsNfsInstance().Status.State = cloudcontrolv1beta1.StateError err := state.UpdateObjStatus(ctx) if err != nil { return composed.LogErrorAndReturn(err, "Error updating NfsInstance status after missing security group id", composed.StopWithRequeue, ctx) @@ -55,7 +56,7 @@ func loadSecurityGroup(ctx context.Context, st composed.State) (error, context.C Reason: cloudcontrolv1beta1.ReasonUnknown, Message: "Unable to load security group", }) - state.ObjAsNfsInstance().Status.State = cloudcontrolv1beta1.ErrorState + state.ObjAsNfsInstance().Status.State = cloudcontrolv1beta1.StateError err := state.UpdateObjStatus(ctx) if err != nil { return composed.LogErrorAndReturn(err, "Error updating NfsInstance status after missing created security group", composed.StopWithRequeue, ctx) diff --git a/pkg/kcp/provider/aws/nfsinstance/validateExistingMountTargets.go b/pkg/kcp/provider/aws/nfsinstance/validateExistingMountTargets.go index 91e5027eb..7150f7b51 100644 --- a/pkg/kcp/provider/aws/nfsinstance/validateExistingMountTargets.go +++ b/pkg/kcp/provider/aws/nfsinstance/validateExistingMountTargets.go @@ -3,6 +3,7 @@ package nfsinstance import ( "context" "fmt" + efsTypes "github.com/aws/aws-sdk-go-v2/service/efs/types" "github.com/elliotchance/pie/v2" cloudcontrolv1beta1 "github.com/kyma-project/cloud-manager/api/cloud-control/v1beta1" @@ -66,7 +67,7 @@ func validateExistingMountTargets(ctx context.Context, st composed.State) (error return composed.LogErrorAndReturn(err, "Error updating NfsInstance status conditions after invalid mount targets found", composed.StopWithRequeue, ctx) } - state.ObjAsNfsInstance().Status.State = cloudcontrolv1beta1.ErrorState + state.ObjAsNfsInstance().Status.State = cloudcontrolv1beta1.StateError err = state.UpdateObj(ctx) if err != nil { return composed.LogErrorAndReturn(err, "Error updating NfsInstance status state after invalid mount targets found", composed.StopWithRequeue, ctx) diff --git a/pkg/kcp/provider/aws/redisinstance/createElastiCacheCluster.go b/pkg/kcp/provider/aws/redisinstance/createElastiCacheCluster.go index 577c40c58..39892d773 100644 --- a/pkg/kcp/provider/aws/redisinstance/createElastiCacheCluster.go +++ b/pkg/kcp/provider/aws/redisinstance/createElastiCacheCluster.go @@ -71,7 +71,7 @@ func createElastiCacheCluster(ctx context.Context, st composed.State) (error, co Reason: v1beta1.ReasonCloudProviderError, Message: "Failed to create RedisInstance", }) - redisInstance.Status.State = cloudcontrolv1beta1.ErrorState + redisInstance.Status.State = cloudcontrolv1beta1.StateError err = state.UpdateObjStatus(ctx) if err != nil { return composed.LogErrorAndReturn(err, diff --git a/pkg/kcp/provider/aws/redisinstance/loadSecurityGroup.go b/pkg/kcp/provider/aws/redisinstance/loadSecurityGroup.go index 60bee77d4..03d9cffa6 100644 --- a/pkg/kcp/provider/aws/redisinstance/loadSecurityGroup.go +++ b/pkg/kcp/provider/aws/redisinstance/loadSecurityGroup.go @@ -46,7 +46,7 @@ func loadSecurityGroup(ctx context.Context, st composed.State) (error, context.C Reason: cloudcontrolv1beta1.ReasonUnknown, Message: "Unable to load security group", }) - redisInstance.Status.State = cloudcontrolv1beta1.ErrorState + redisInstance.Status.State = cloudcontrolv1beta1.StateError err := state.UpdateObjStatus(ctx) if err != nil { return composed.LogErrorAndReturn(err, "Error updating RedisInstance status after missing created security group", composed.StopWithRequeue, ctx) diff --git a/pkg/kcp/provider/aws/redisinstance/removeReadyCondition.go b/pkg/kcp/provider/aws/redisinstance/removeReadyCondition.go index d0d5ef544..d82a41382 100644 --- a/pkg/kcp/provider/aws/redisinstance/removeReadyCondition.go +++ b/pkg/kcp/provider/aws/redisinstance/removeReadyCondition.go @@ -22,7 +22,7 @@ func removeReadyCondition(ctx context.Context, st composed.State) (error, contex logger.Info("Removing Ready condition") meta.RemoveStatusCondition(redisInstance.Conditions(), cloudcontrolv1beta1.ConditionTypeReady) - redisInstance.Status.State = cloudcontrolv1beta1.DeletingState + redisInstance.Status.State = cloudcontrolv1beta1.StateDeleting err := state.UpdateObjStatus(ctx) if err != nil { return composed.LogErrorAndReturn(err, "Error updating RedisInstance status after removing Ready condition", composed.StopWithRequeue, ctx) diff --git a/pkg/kcp/provider/aws/redisinstance/updateElastiCacheCluster.go b/pkg/kcp/provider/aws/redisinstance/updateElastiCacheCluster.go index 86464d3ed..67b9a9753 100644 --- a/pkg/kcp/provider/aws/redisinstance/updateElastiCacheCluster.go +++ b/pkg/kcp/provider/aws/redisinstance/updateElastiCacheCluster.go @@ -47,7 +47,7 @@ func updateElastiCacheCluster(ctx context.Context, st composed.State) (error, co Reason: cloudcontrolv1beta1.ReasonCloudProviderError, Message: "Failed to update RedisInstance", }) - redisInstance.Status.State = cloudcontrolv1beta1.ErrorState + redisInstance.Status.State = cloudcontrolv1beta1.StateError err = state.UpdateObjStatus(ctx) if err != nil { return composed.LogErrorAndReturn(err, diff --git a/pkg/kcp/provider/aws/redisinstance/updateStatus.go b/pkg/kcp/provider/aws/redisinstance/updateStatus.go index d17d27de7..96b596587 100644 --- a/pkg/kcp/provider/aws/redisinstance/updateStatus.go +++ b/pkg/kcp/provider/aws/redisinstance/updateStatus.go @@ -47,13 +47,13 @@ func updateStatus(ctx context.Context, st composed.State) (error, context.Contex } hasReadyCondition := meta.FindStatusCondition(redisInstance.Status.Conditions, cloudcontrolv1beta1.ConditionTypeReady) != nil - hasReadyStatusState := redisInstance.Status.State == cloudcontrolv1beta1.ReadyState + hasReadyStatusState := redisInstance.Status.State == cloudcontrolv1beta1.StateReady if !hasChanged && hasReadyCondition && hasReadyStatusState { composed.LoggerFromCtx(ctx).Info("RedisInstance status fields are already up-to-date, StopAndForget-ing") return composed.StopAndForget, nil } - redisInstance.Status.State = cloudcontrolv1beta1.ReadyState + redisInstance.Status.State = cloudcontrolv1beta1.StateReady return composed.UpdateStatus(redisInstance). SetExclusiveConditions(metav1.Condition{ Type: cloudcontrolv1beta1.ConditionTypeReady, diff --git a/pkg/kcp/provider/aws/redisinstance/waitElastiCacheAvailable.go b/pkg/kcp/provider/aws/redisinstance/waitElastiCacheAvailable.go index d29cfb256..1fec796a8 100644 --- a/pkg/kcp/provider/aws/redisinstance/waitElastiCacheAvailable.go +++ b/pkg/kcp/provider/aws/redisinstance/waitElastiCacheAvailable.go @@ -21,7 +21,7 @@ func waitElastiCacheAvailable(ctx context.Context, st composed.State) (error, co 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 + redisInstance.Status.State = cloudcontrolv1beta1.StateError return composed.UpdateStatus(redisInstance). SetExclusiveConditions(metav1.Condition{ Type: v1beta1.ConditionTypeError, diff --git a/pkg/kcp/provider/aws/redisinstance/waitElastiCacheDeleted.go b/pkg/kcp/provider/aws/redisinstance/waitElastiCacheDeleted.go index 071bad805..d91fc6119 100644 --- a/pkg/kcp/provider/aws/redisinstance/waitElastiCacheDeleted.go +++ b/pkg/kcp/provider/aws/redisinstance/waitElastiCacheDeleted.go @@ -28,7 +28,7 @@ func waitElastiCacheDeleted(ctx context.Context, st composed.State) (error, cont 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 + redisInstance.Status.State = cloudcontrolv1beta1.StateError return composed.UpdateStatus(redisInstance). SetExclusiveConditions(metav1.Condition{ Type: v1beta1.ConditionTypeError, diff --git a/pkg/kcp/provider/aws/redisinstance/waitUserGroupDeleted.go b/pkg/kcp/provider/aws/redisinstance/waitUserGroupDeleted.go index 90b21c374..6c0a1be86 100644 --- a/pkg/kcp/provider/aws/redisinstance/waitUserGroupDeleted.go +++ b/pkg/kcp/provider/aws/redisinstance/waitUserGroupDeleted.go @@ -28,7 +28,7 @@ func waitUserGroupDeleted(ctx context.Context, st composed.State) (error, contex 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 + redisInstance.Status.State = cloudcontrolv1beta1.StateError return composed.UpdateStatus(redisInstance). SetExclusiveConditions(metav1.Condition{ Type: v1beta1.ConditionTypeError, diff --git a/pkg/kcp/provider/aws/vpcpeering/acceptVpcPeeringConnection.go b/pkg/kcp/provider/aws/vpcpeering/acceptVpcPeeringConnection.go index e4790a533..68cf0a42e 100644 --- a/pkg/kcp/provider/aws/vpcpeering/acceptVpcPeeringConnection.go +++ b/pkg/kcp/provider/aws/vpcpeering/acceptVpcPeeringConnection.go @@ -3,6 +3,7 @@ package vpcpeering import ( "context" "fmt" + cloudcontrolv1beta1 "github.com/kyma-project/cloud-manager/api/cloud-control/v1beta1" "github.com/kyma-project/cloud-manager/pkg/composed" awsmeta "github.com/kyma-project/cloud-manager/pkg/kcp/provider/aws/meta" @@ -27,7 +28,7 @@ func acceptVpcPeeringConnection(ctx context.Context, st composed.State) (error, if err != nil { logger.Error(err, "Error accepting VPC Peering") - state.ObjAsVpcPeering().Status.State = string(cloudcontrolv1beta1.ErrorState) + state.ObjAsVpcPeering().Status.State = string(cloudcontrolv1beta1.StateError) return composed.PatchStatus(state.ObjAsVpcPeering()). SetExclusiveConditions(metav1.Condition{ diff --git a/pkg/kcp/provider/aws/vpcpeering/createRemoteClient.go b/pkg/kcp/provider/aws/vpcpeering/createRemoteClient.go index 8f4cb338d..1bda3e90f 100644 --- a/pkg/kcp/provider/aws/vpcpeering/createRemoteClient.go +++ b/pkg/kcp/provider/aws/vpcpeering/createRemoteClient.go @@ -3,6 +3,7 @@ package vpcpeering import ( "context" "fmt" + cloudcontrolv1beta1 "github.com/kyma-project/cloud-manager/api/cloud-control/v1beta1" "github.com/kyma-project/cloud-manager/pkg/composed" "github.com/kyma-project/cloud-manager/pkg/util" @@ -53,8 +54,8 @@ func createRemoteClient(ctx context.Context, st composed.State) (error, context. changed = true } - if state.ObjAsVpcPeering().Status.State != string(cloudcontrolv1beta1.ErrorState) { - state.ObjAsVpcPeering().Status.State = string(cloudcontrolv1beta1.ErrorState) + if state.ObjAsVpcPeering().Status.State != string(cloudcontrolv1beta1.StateError) { + state.ObjAsVpcPeering().Status.State = string(cloudcontrolv1beta1.StateError) changed = true } diff --git a/pkg/kcp/provider/aws/vpcpeering/createRemoteRoutes.go b/pkg/kcp/provider/aws/vpcpeering/createRemoteRoutes.go index 237cc85db..5299ef55a 100644 --- a/pkg/kcp/provider/aws/vpcpeering/createRemoteRoutes.go +++ b/pkg/kcp/provider/aws/vpcpeering/createRemoteRoutes.go @@ -3,6 +3,7 @@ package vpcpeering import ( "context" "fmt" + "github.com/aws/aws-sdk-go-v2/service/ec2/types" "github.com/elliotchance/pie/v2" cloudcontrolv1beta1 "github.com/kyma-project/cloud-manager/api/cloud-control/v1beta1" @@ -50,8 +51,8 @@ func createRemoteRoutes(ctx context.Context, st composed.State) (error, context. changed = true } - if obj.Status.State != string(cloudcontrolv1beta1.WarningState) { - obj.Status.State = string(cloudcontrolv1beta1.WarningState) + if obj.Status.State != string(cloudcontrolv1beta1.StateWarning) { + obj.Status.State = string(cloudcontrolv1beta1.StateWarning) changed = true } diff --git a/pkg/kcp/provider/aws/vpcpeering/createRoutes.go b/pkg/kcp/provider/aws/vpcpeering/createRoutes.go index 1c962e58d..9b274c44d 100644 --- a/pkg/kcp/provider/aws/vpcpeering/createRoutes.go +++ b/pkg/kcp/provider/aws/vpcpeering/createRoutes.go @@ -3,6 +3,7 @@ package vpcpeering import ( "context" "fmt" + "github.com/aws/aws-sdk-go-v2/service/ec2/types" "github.com/elliotchance/pie/v2" cloudcontrolv1beta1 "github.com/kyma-project/cloud-manager/api/cloud-control/v1beta1" @@ -60,8 +61,8 @@ func createRoutes(ctx context.Context, st composed.State) (error, context.Contex changed = true } - if obj.Status.State != string(cloudcontrolv1beta1.ErrorState) { - obj.Status.State = string(cloudcontrolv1beta1.ErrorState) + if obj.Status.State != string(cloudcontrolv1beta1.StateError) { + obj.Status.State = string(cloudcontrolv1beta1.StateError) changed = true } diff --git a/pkg/kcp/provider/aws/vpcpeering/createVpcPeeringConnection.go b/pkg/kcp/provider/aws/vpcpeering/createVpcPeeringConnection.go index 8f8eca200..9df6644b3 100644 --- a/pkg/kcp/provider/aws/vpcpeering/createVpcPeeringConnection.go +++ b/pkg/kcp/provider/aws/vpcpeering/createVpcPeeringConnection.go @@ -3,6 +3,7 @@ package vpcpeering import ( "context" "fmt" + ec2types "github.com/aws/aws-sdk-go-v2/service/ec2/types" cloudcontrolv1beta1 "github.com/kyma-project/cloud-manager/api/cloud-control/v1beta1" "github.com/kyma-project/cloud-manager/pkg/common" @@ -77,8 +78,8 @@ func createVpcPeeringConnection(ctx context.Context, st composed.State) (error, changed = true } - if state.ObjAsVpcPeering().Status.State != string(cloudcontrolv1beta1.WarningState) { - state.ObjAsVpcPeering().Status.State = string(cloudcontrolv1beta1.WarningState) + if state.ObjAsVpcPeering().Status.State != string(cloudcontrolv1beta1.StateWarning) { + state.ObjAsVpcPeering().Status.State = string(cloudcontrolv1beta1.StateWarning) } if !changed { diff --git a/pkg/kcp/provider/aws/vpcpeering/kcpNetworkLocalLoad.go b/pkg/kcp/provider/aws/vpcpeering/kcpNetworkLocalLoad.go index 780259153..10bfbd09e 100644 --- a/pkg/kcp/provider/aws/vpcpeering/kcpNetworkLocalLoad.go +++ b/pkg/kcp/provider/aws/vpcpeering/kcpNetworkLocalLoad.go @@ -3,6 +3,7 @@ package vpcpeering import ( "context" "fmt" + cloudcontrolv1beta1 "github.com/kyma-project/cloud-manager/api/cloud-control/v1beta1" "github.com/kyma-project/cloud-manager/pkg/composed" "github.com/kyma-project/cloud-manager/pkg/util" @@ -35,7 +36,7 @@ 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) } - state.ObjAsVpcPeering().Status.State = string(cloudcontrolv1beta1.ErrorState) + state.ObjAsVpcPeering().Status.State = string(cloudcontrolv1beta1.StateError) return composed.PatchStatus(state.ObjAsVpcPeering()). SetExclusiveConditions(metav1.Condition{ Type: cloudcontrolv1beta1.ConditionTypeError, @@ -50,7 +51,7 @@ func kcpNetworkLocalLoad(ctx context.Context, st composed.State) (error, context } if net.Status.Network == nil { - state.ObjAsVpcPeering().Status.State = string(cloudcontrolv1beta1.ErrorState) + state.ObjAsVpcPeering().Status.State = string(cloudcontrolv1beta1.StateError) return composed.PatchStatus(state.ObjAsVpcPeering()). SetExclusiveConditions(metav1.Condition{ Type: cloudcontrolv1beta1.ConditionTypeError, diff --git a/pkg/kcp/provider/aws/vpcpeering/kcpNetworkRemoteLoad.go b/pkg/kcp/provider/aws/vpcpeering/kcpNetworkRemoteLoad.go index da25c5dc4..da055b88f 100644 --- a/pkg/kcp/provider/aws/vpcpeering/kcpNetworkRemoteLoad.go +++ b/pkg/kcp/provider/aws/vpcpeering/kcpNetworkRemoteLoad.go @@ -2,6 +2,7 @@ package vpcpeering import ( "context" + cloudcontrolv1beta1 "github.com/kyma-project/cloud-manager/api/cloud-control/v1beta1" "github.com/kyma-project/cloud-manager/pkg/composed" "github.com/kyma-project/cloud-manager/pkg/util" @@ -33,7 +34,7 @@ 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) } - state.ObjAsVpcPeering().Status.State = string(cloudcontrolv1beta1.ErrorState) + state.ObjAsVpcPeering().Status.State = string(cloudcontrolv1beta1.StateError) return composed.PatchStatus(state.ObjAsVpcPeering()). SetExclusiveConditions(metav1.Condition{ Type: cloudcontrolv1beta1.ConditionTypeError, @@ -48,7 +49,7 @@ func kcpNetworkRemoteLoad(ctx context.Context, st composed.State) (error, contex } if net.Status.Network == nil { - state.ObjAsVpcPeering().Status.State = string(cloudcontrolv1beta1.ErrorState) + state.ObjAsVpcPeering().Status.State = string(cloudcontrolv1beta1.StateError) return composed.PatchStatus(state.ObjAsVpcPeering()). SetExclusiveConditions(metav1.Condition{ Type: cloudcontrolv1beta1.ConditionTypeError, diff --git a/pkg/kcp/provider/azure/iprange/allocateIpRange.go b/pkg/kcp/provider/azure/iprange/allocateIpRange.go index 4c2064c66..ee580fe14 100644 --- a/pkg/kcp/provider/azure/iprange/allocateIpRange.go +++ b/pkg/kcp/provider/azure/iprange/allocateIpRange.go @@ -3,6 +3,7 @@ package iprange import ( "context" "errors" + cloudcontrolv1beta1 "github.com/kyma-project/cloud-manager/api/cloud-control/v1beta1" "github.com/kyma-project/cloud-manager/pkg/composed" iprangetypes "github.com/kyma-project/cloud-manager/pkg/kcp/iprange/types" @@ -23,7 +24,7 @@ func NewAllocateIpRangeAction(_ StateFactory) composed.Action { if len(state.Scope().Spec.Scope.Azure.Network.Nodes) == 0 { logger := composed.LoggerFromCtx(ctx) logger.Error(errors.New("network nodes empty"), "Azure scope has no nodes specified, unable to allocate IpRange cidr") - state.ObjAsIpRange().Status.State = cloudcontrolv1beta1.ErrorState + state.ObjAsIpRange().Status.State = cloudcontrolv1beta1.StateError return composed.PatchStatus(state.ObjAsIpRange()). SetExclusiveConditions(metav1.Condition{ Type: cloudcontrolv1beta1.ConditionTypeError, diff --git a/pkg/kcp/provider/azure/iprange/namesDetermine.go b/pkg/kcp/provider/azure/iprange/namesDetermine.go index ed5526a9e..6db2068cd 100644 --- a/pkg/kcp/provider/azure/iprange/namesDetermine.go +++ b/pkg/kcp/provider/azure/iprange/namesDetermine.go @@ -3,6 +3,7 @@ package iprange import ( "context" "errors" + cloudcontrolv1beta1 "github.com/kyma-project/cloud-manager/api/cloud-control/v1beta1" "github.com/kyma-project/cloud-manager/pkg/composed" azurecommon "github.com/kyma-project/cloud-manager/pkg/kcp/provider/azure/common" @@ -28,7 +29,7 @@ func namesDetermine(ctx context.Context, st composed.State) (error, context.Cont Error(errors.New("invalid network type"), "Azure IpRange can be created on CM network only") ctx = composed.LoggerIntoCtx(ctx, logger) - state.ObjAsIpRange().Status.State = cloudcontrolv1beta1.ErrorState + state.ObjAsIpRange().Status.State = cloudcontrolv1beta1.StateError return composed.PatchStatus(state.ObjAsIpRange()). SetExclusiveConditions(metav1.Condition{ diff --git a/pkg/kcp/provider/azure/iprange/privateDnsZoneCreate.go b/pkg/kcp/provider/azure/iprange/privateDnsZoneCreate.go index eafa3d5ff..d30f57e16 100644 --- a/pkg/kcp/provider/azure/iprange/privateDnsZoneCreate.go +++ b/pkg/kcp/provider/azure/iprange/privateDnsZoneCreate.go @@ -2,6 +2,7 @@ package iprange import ( "context" + "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/privatedns/armprivatedns" cloudcontrol1beta1 "github.com/kyma-project/cloud-manager/api/cloud-control/v1beta1" @@ -40,7 +41,7 @@ func privateDnsZoneCreate(ctx context.Context, st composed.State) (error, contex if err != nil { logger.Error(err, "Error creating Azure KCP IpRange privateDnsZone") - state.ObjAsIpRange().Status.State = cloudcontrol1beta1.ErrorState + state.ObjAsIpRange().Status.State = cloudcontrol1beta1.StateError return composed.PatchStatus(state.ObjAsIpRange()). SetExclusiveConditions(metav1.Condition{ diff --git a/pkg/kcp/provider/azure/iprange/privateDnsZoneDelete.go b/pkg/kcp/provider/azure/iprange/privateDnsZoneDelete.go index 876121f2e..f2f33f7cc 100644 --- a/pkg/kcp/provider/azure/iprange/privateDnsZoneDelete.go +++ b/pkg/kcp/provider/azure/iprange/privateDnsZoneDelete.go @@ -2,6 +2,7 @@ package iprange import ( "context" + cloudcontrolv1beta1 "github.com/kyma-project/cloud-manager/api/cloud-control/v1beta1" "github.com/kyma-project/cloud-manager/pkg/composed" azuremeta "github.com/kyma-project/cloud-manager/pkg/kcp/provider/azure/meta" @@ -34,7 +35,7 @@ func privateDnsZoneDelete(ctx context.Context, st composed.State) (error, contex if err != nil { logger.Error(err, "Error deleting Azure KCP IpRange dnsZone") - state.ObjAsIpRange().Status.State = cloudcontrolv1beta1.ErrorState + state.ObjAsIpRange().Status.State = cloudcontrolv1beta1.StateError return composed.PatchStatus(state.ObjAsIpRange()). SetExclusiveConditions(metav1.Condition{ diff --git a/pkg/kcp/provider/azure/iprange/securityGroupCreate.go b/pkg/kcp/provider/azure/iprange/securityGroupCreate.go index 26e212b96..10659b041 100644 --- a/pkg/kcp/provider/azure/iprange/securityGroupCreate.go +++ b/pkg/kcp/provider/azure/iprange/securityGroupCreate.go @@ -2,6 +2,7 @@ package iprange import ( "context" + cloudcontrol1beta1 "github.com/kyma-project/cloud-manager/api/cloud-control/v1beta1" "github.com/kyma-project/cloud-manager/pkg/composed" azuremeta "github.com/kyma-project/cloud-manager/pkg/kcp/provider/azure/meta" @@ -37,7 +38,7 @@ func securityGroupCreate(ctx context.Context, st composed.State) (error, context if err != nil { logger.Error(err, "Error creating Azure KCP IpRange security group", ctx) - state.ObjAsIpRange().Status.State = cloudcontrol1beta1.ErrorState + state.ObjAsIpRange().Status.State = cloudcontrol1beta1.StateError return composed.PatchStatus(state.ObjAsIpRange()). SetExclusiveConditions(metav1.Condition{ diff --git a/pkg/kcp/provider/azure/iprange/securityGroupDelete.go b/pkg/kcp/provider/azure/iprange/securityGroupDelete.go index 104f84686..94e657dba 100644 --- a/pkg/kcp/provider/azure/iprange/securityGroupDelete.go +++ b/pkg/kcp/provider/azure/iprange/securityGroupDelete.go @@ -2,6 +2,7 @@ package iprange import ( "context" + cloudcontrolv1beta1 "github.com/kyma-project/cloud-manager/api/cloud-control/v1beta1" "github.com/kyma-project/cloud-manager/pkg/composed" azuremeta "github.com/kyma-project/cloud-manager/pkg/kcp/provider/azure/meta" @@ -30,7 +31,7 @@ func securityGroupDelete(ctx context.Context, st composed.State) (error, context if err != nil { logger.Error(err, "Error deleting Azure KCP IpRange security group") - state.ObjAsIpRange().Status.State = cloudcontrolv1beta1.ErrorState + state.ObjAsIpRange().Status.State = cloudcontrolv1beta1.StateError return composed.PatchStatus(state.ObjAsIpRange()). SetExclusiveConditions(metav1.Condition{ diff --git a/pkg/kcp/provider/azure/iprange/securityGroupLoad.go b/pkg/kcp/provider/azure/iprange/securityGroupLoad.go index 9ce9ce814..f01f17a2d 100644 --- a/pkg/kcp/provider/azure/iprange/securityGroupLoad.go +++ b/pkg/kcp/provider/azure/iprange/securityGroupLoad.go @@ -2,6 +2,7 @@ package iprange import ( "context" + cloudcontrolv1beta1 "github.com/kyma-project/cloud-manager/api/cloud-control/v1beta1" "github.com/kyma-project/cloud-manager/pkg/composed" azuremeta "github.com/kyma-project/cloud-manager/pkg/kcp/provider/azure/meta" @@ -28,7 +29,7 @@ func securityGroupLoad(ctx context.Context, st composed.State) (error, context.C if err != nil { logger.Error(err, "Error loading Azure KCP IpRange security group") - state.ObjAsIpRange().Status.State = cloudcontrolv1beta1.ErrorState + state.ObjAsIpRange().Status.State = cloudcontrolv1beta1.StateError return composed.PatchStatus(state.ObjAsIpRange()). SetExclusiveConditions(metav1.Condition{ diff --git a/pkg/kcp/provider/azure/iprange/subnetCreate.go b/pkg/kcp/provider/azure/iprange/subnetCreate.go index d30877006..5f5b3a1cc 100644 --- a/pkg/kcp/provider/azure/iprange/subnetCreate.go +++ b/pkg/kcp/provider/azure/iprange/subnetCreate.go @@ -2,6 +2,7 @@ package iprange import ( "context" + cloudcontrol1beta1 "github.com/kyma-project/cloud-manager/api/cloud-control/v1beta1" "github.com/kyma-project/cloud-manager/pkg/composed" azuremeta "github.com/kyma-project/cloud-manager/pkg/kcp/provider/azure/meta" @@ -38,7 +39,7 @@ func subnetCreate(ctx context.Context, st composed.State) (error, context.Contex if err != nil { logger.Error(err, "Error creating Azure Subnet for KCP IpRange") - state.ObjAsIpRange().Status.State = cloudcontrol1beta1.ErrorState + state.ObjAsIpRange().Status.State = cloudcontrol1beta1.StateError return composed.PatchStatus(state.ObjAsIpRange()). SetExclusiveConditions(metav1.Condition{ diff --git a/pkg/kcp/provider/azure/iprange/subnetDelete.go b/pkg/kcp/provider/azure/iprange/subnetDelete.go index f14bcd8cc..192a7c5ae 100644 --- a/pkg/kcp/provider/azure/iprange/subnetDelete.go +++ b/pkg/kcp/provider/azure/iprange/subnetDelete.go @@ -2,6 +2,7 @@ package iprange import ( "context" + cloudcontrolv1beta1 "github.com/kyma-project/cloud-manager/api/cloud-control/v1beta1" "github.com/kyma-project/cloud-manager/pkg/composed" azuremeta "github.com/kyma-project/cloud-manager/pkg/kcp/provider/azure/meta" @@ -30,7 +31,7 @@ func subnetDelete(ctx context.Context, st composed.State) (error, context.Contex if err != nil { logger.Error(err, "Error deleting Azure KCP IpRange subnet") - state.ObjAsIpRange().Status.State = cloudcontrolv1beta1.ErrorState + state.ObjAsIpRange().Status.State = cloudcontrolv1beta1.StateError return composed.PatchStatus(state.ObjAsIpRange()). SetExclusiveConditions(metav1.Condition{ diff --git a/pkg/kcp/provider/azure/iprange/subnetLoad.go b/pkg/kcp/provider/azure/iprange/subnetLoad.go index 5b33c481e..8a7ca1ca6 100644 --- a/pkg/kcp/provider/azure/iprange/subnetLoad.go +++ b/pkg/kcp/provider/azure/iprange/subnetLoad.go @@ -2,6 +2,7 @@ package iprange import ( "context" + cloudcontrolv1beta1 "github.com/kyma-project/cloud-manager/api/cloud-control/v1beta1" "github.com/kyma-project/cloud-manager/pkg/composed" azuremeta "github.com/kyma-project/cloud-manager/pkg/kcp/provider/azure/meta" @@ -28,7 +29,7 @@ func subnetLoad(ctx context.Context, st composed.State) (error, context.Context) if err != nil { logger.Error(err, "Error loading Azure KCP IpRange subnet") - state.ObjAsIpRange().Status.State = cloudcontrolv1beta1.ErrorState + state.ObjAsIpRange().Status.State = cloudcontrolv1beta1.StateError return composed.PatchStatus(state.ObjAsIpRange()). SetExclusiveConditions(metav1.Condition{ diff --git a/pkg/kcp/provider/azure/iprange/virtualNetworkLinkCreate.go b/pkg/kcp/provider/azure/iprange/virtualNetworkLinkCreate.go index 8877abf47..a3eda5535 100644 --- a/pkg/kcp/provider/azure/iprange/virtualNetworkLinkCreate.go +++ b/pkg/kcp/provider/azure/iprange/virtualNetworkLinkCreate.go @@ -2,6 +2,7 @@ package iprange import ( "context" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/privatedns/armprivatedns" cloudcontrol1beta1 "github.com/kyma-project/cloud-manager/api/cloud-control/v1beta1" "github.com/kyma-project/cloud-manager/pkg/composed" @@ -49,7 +50,7 @@ func virtualNetworkLinkCreate(ctx context.Context, st composed.State) (error, co if err != nil { logger.Error(err, "Error creating Azure KCP IpRange virtualNetworkLink") - state.ObjAsIpRange().Status.State = cloudcontrol1beta1.ErrorState + state.ObjAsIpRange().Status.State = cloudcontrol1beta1.StateError return composed.PatchStatus(state.ObjAsIpRange()). SetExclusiveConditions(metav1.Condition{ diff --git a/pkg/kcp/provider/azure/iprange/virtualNetworkLinkDelete.go b/pkg/kcp/provider/azure/iprange/virtualNetworkLinkDelete.go index a4ab09c5f..3863a622d 100644 --- a/pkg/kcp/provider/azure/iprange/virtualNetworkLinkDelete.go +++ b/pkg/kcp/provider/azure/iprange/virtualNetworkLinkDelete.go @@ -2,6 +2,7 @@ package iprange import ( "context" + cloudcontrolv1beta1 "github.com/kyma-project/cloud-manager/api/cloud-control/v1beta1" "github.com/kyma-project/cloud-manager/pkg/composed" azuremeta "github.com/kyma-project/cloud-manager/pkg/kcp/provider/azure/meta" @@ -35,7 +36,7 @@ func virtualNetworkLinkDelete(ctx context.Context, st composed.State) (error, co if err != nil { logger.Error(err, "Error deleting Azure KCP IpRange virtualNetworkLink") - state.ObjAsIpRange().Status.State = cloudcontrolv1beta1.ErrorState + state.ObjAsIpRange().Status.State = cloudcontrolv1beta1.StateError return composed.PatchStatus(state.ObjAsIpRange()). SetExclusiveConditions(metav1.Condition{ diff --git a/pkg/kcp/provider/azure/network/statusReady.go b/pkg/kcp/provider/azure/network/statusReady.go index 1bec31998..1c6268641 100644 --- a/pkg/kcp/provider/azure/network/statusReady.go +++ b/pkg/kcp/provider/azure/network/statusReady.go @@ -2,6 +2,7 @@ package network import ( "context" + cloudcontrolv1beta1 "github.com/kyma-project/cloud-manager/api/cloud-control/v1beta1" "github.com/kyma-project/cloud-manager/pkg/composed" "k8s.io/apimachinery/pkg/api/meta" @@ -20,8 +21,8 @@ func statusReady(ctx context.Context, st composed.State) (error, context.Context } // status.state - if state.ObjAsNetwork().Status.State != string(cloudcontrolv1beta1.ReadyState) { - state.ObjAsNetwork().Status.State = string(cloudcontrolv1beta1.ReadyState) + if state.ObjAsNetwork().Status.State != string(cloudcontrolv1beta1.StateReady) { + state.ObjAsNetwork().Status.State = string(cloudcontrolv1beta1.StateReady) changed = true } diff --git a/pkg/kcp/provider/azure/redisinstance/updateStatus.go b/pkg/kcp/provider/azure/redisinstance/updateStatus.go index ebb2b26d4..311d609ff 100644 --- a/pkg/kcp/provider/azure/redisinstance/updateStatus.go +++ b/pkg/kcp/provider/azure/redisinstance/updateStatus.go @@ -33,12 +33,12 @@ func updateStatus(ctx context.Context, st composed.State) (error, context.Contex } hasReadyCondition := meta.FindStatusCondition(redisInstance.Status.Conditions, cloudcontrolv1beta1.ConditionTypeReady) != nil - if hasReadyCondition && redisInstance.Status.State != cloudcontrolv1beta1.ReadyState { + if hasReadyCondition && redisInstance.Status.State != cloudcontrolv1beta1.StateReady { composed.LoggerFromCtx(ctx).Info("Ready condition already present, StopAndForget-ing") return composed.StopAndForget, nil } - redisInstance.Status.State = cloudcontrolv1beta1.ReadyState + redisInstance.Status.State = cloudcontrolv1beta1.StateReady return composed.UpdateStatus(redisInstance). SetExclusiveConditions(metav1.Condition{ diff --git a/pkg/kcp/provider/azure/vpcpeering/kcpNetworkLocalLoad.go b/pkg/kcp/provider/azure/vpcpeering/kcpNetworkLocalLoad.go index 30efb4644..9dadafbe0 100644 --- a/pkg/kcp/provider/azure/vpcpeering/kcpNetworkLocalLoad.go +++ b/pkg/kcp/provider/azure/vpcpeering/kcpNetworkLocalLoad.go @@ -3,6 +3,7 @@ package vpcpeering import ( "context" "fmt" + cloudcontrolv1beta1 "github.com/kyma-project/cloud-manager/api/cloud-control/v1beta1" "github.com/kyma-project/cloud-manager/pkg/composed" azureutil "github.com/kyma-project/cloud-manager/pkg/kcp/provider/azure/util" @@ -36,7 +37,7 @@ 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) } - state.ObjAsVpcPeering().Status.State = string(cloudcontrolv1beta1.ErrorState) + state.ObjAsVpcPeering().Status.State = string(cloudcontrolv1beta1.StateError) return composed.PatchStatus(state.ObjAsVpcPeering()). SetExclusiveConditions(metav1.Condition{ Type: cloudcontrolv1beta1.ConditionTypeError, @@ -51,7 +52,7 @@ func kcpNetworkLocalLoad(ctx context.Context, st composed.State) (error, context } if net.Status.Network == nil { - state.ObjAsVpcPeering().Status.State = string(cloudcontrolv1beta1.ErrorState) + state.ObjAsVpcPeering().Status.State = string(cloudcontrolv1beta1.StateError) return composed.PatchStatus(state.ObjAsVpcPeering()). SetExclusiveConditions(metav1.Condition{ Type: cloudcontrolv1beta1.ConditionTypeError, diff --git a/pkg/kcp/provider/azure/vpcpeering/kcpNetworkRemoteLoad.go b/pkg/kcp/provider/azure/vpcpeering/kcpNetworkRemoteLoad.go index 8b619910a..8ed625905 100644 --- a/pkg/kcp/provider/azure/vpcpeering/kcpNetworkRemoteLoad.go +++ b/pkg/kcp/provider/azure/vpcpeering/kcpNetworkRemoteLoad.go @@ -2,6 +2,7 @@ package vpcpeering import ( "context" + cloudcontrolv1beta1 "github.com/kyma-project/cloud-manager/api/cloud-control/v1beta1" "github.com/kyma-project/cloud-manager/pkg/composed" azureutil "github.com/kyma-project/cloud-manager/pkg/kcp/provider/azure/util" @@ -34,7 +35,7 @@ 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) } - state.ObjAsVpcPeering().Status.State = string(cloudcontrolv1beta1.ErrorState) + state.ObjAsVpcPeering().Status.State = string(cloudcontrolv1beta1.StateError) return composed.PatchStatus(state.ObjAsVpcPeering()). SetExclusiveConditions(metav1.Condition{ Type: cloudcontrolv1beta1.ConditionTypeError, @@ -49,7 +50,7 @@ func kcpNetworkRemoteLoad(ctx context.Context, st composed.State) (error, contex } if net.Status.Network == nil { - state.ObjAsVpcPeering().Status.State = string(cloudcontrolv1beta1.ErrorState) + state.ObjAsVpcPeering().Status.State = string(cloudcontrolv1beta1.StateError) return composed.PatchStatus(state.ObjAsVpcPeering()). SetExclusiveConditions(metav1.Condition{ Type: cloudcontrolv1beta1.ConditionTypeError, diff --git a/pkg/kcp/provider/azure/vpcpeering/peeringLocalCreate.go b/pkg/kcp/provider/azure/vpcpeering/peeringLocalCreate.go index 8f264e858..5747b26b0 100644 --- a/pkg/kcp/provider/azure/vpcpeering/peeringLocalCreate.go +++ b/pkg/kcp/provider/azure/vpcpeering/peeringLocalCreate.go @@ -2,6 +2,7 @@ package vpcpeering import ( "context" + cloudcontrolv1beta1 "github.com/kyma-project/cloud-manager/api/cloud-control/v1beta1" "github.com/kyma-project/cloud-manager/pkg/composed" azuremeta "github.com/kyma-project/cloud-manager/pkg/kcp/provider/azure/meta" @@ -42,13 +43,13 @@ func peeringLocalCreate(ctx context.Context, st composed.State) (error, context. changed := false if isWarning { - if state.ObjAsVpcPeering().Status.State != string(cloudcontrolv1beta1.WarningState) { - state.ObjAsVpcPeering().Status.State = string(cloudcontrolv1beta1.WarningState) + if state.ObjAsVpcPeering().Status.State != string(cloudcontrolv1beta1.StateWarning) { + state.ObjAsVpcPeering().Status.State = string(cloudcontrolv1beta1.StateWarning) changed = true } } else { - if state.ObjAsVpcPeering().Status.State != string(cloudcontrolv1beta1.ErrorState) { - state.ObjAsVpcPeering().Status.State = string(cloudcontrolv1beta1.ErrorState) + if state.ObjAsVpcPeering().Status.State != string(cloudcontrolv1beta1.StateError) { + state.ObjAsVpcPeering().Status.State = string(cloudcontrolv1beta1.StateError) changed = true } } diff --git a/pkg/kcp/provider/azure/vpcpeering/peeringRemoteCreate.go b/pkg/kcp/provider/azure/vpcpeering/peeringRemoteCreate.go index d97eca371..e2d59efce 100644 --- a/pkg/kcp/provider/azure/vpcpeering/peeringRemoteCreate.go +++ b/pkg/kcp/provider/azure/vpcpeering/peeringRemoteCreate.go @@ -2,6 +2,7 @@ package vpcpeering import ( "context" + cloudcontrolv1beta1 "github.com/kyma-project/cloud-manager/api/cloud-control/v1beta1" "github.com/kyma-project/cloud-manager/pkg/composed" azuremeta "github.com/kyma-project/cloud-manager/pkg/kcp/provider/azure/meta" @@ -41,9 +42,9 @@ func peeringRemoteCreate(ctx context.Context, st composed.State) (error, context message, isWarning := azuremeta.GetErrorMessage(err) if isWarning { - state.ObjAsVpcPeering().Status.State = string(cloudcontrolv1beta1.WarningState) + state.ObjAsVpcPeering().Status.State = string(cloudcontrolv1beta1.StateWarning) } else { - state.ObjAsVpcPeering().Status.State = string(cloudcontrolv1beta1.ErrorState) + state.ObjAsVpcPeering().Status.State = string(cloudcontrolv1beta1.StateError) } return composed.PatchStatus(state.ObjAsVpcPeering()). diff --git a/pkg/kcp/provider/azure/vpcpeering/peeringRemoteLoad.go b/pkg/kcp/provider/azure/vpcpeering/peeringRemoteLoad.go index c974ac117..87fb92a80 100644 --- a/pkg/kcp/provider/azure/vpcpeering/peeringRemoteLoad.go +++ b/pkg/kcp/provider/azure/vpcpeering/peeringRemoteLoad.go @@ -2,6 +2,7 @@ package vpcpeering import ( "context" + cloudcontrolv1beta1 "github.com/kyma-project/cloud-manager/api/cloud-control/v1beta1" "github.com/kyma-project/cloud-manager/pkg/composed" azuremeta "github.com/kyma-project/cloud-manager/pkg/kcp/provider/azure/meta" @@ -74,9 +75,9 @@ func peeringRemoteLoad(ctx context.Context, st composed.State) (error, context.C message, isWarning := azuremeta.GetErrorMessage(err) if isWarning { - state.ObjAsVpcPeering().Status.State = string(cloudcontrolv1beta1.WarningState) + state.ObjAsVpcPeering().Status.State = string(cloudcontrolv1beta1.StateWarning) } else { - state.ObjAsVpcPeering().Status.State = string(cloudcontrolv1beta1.ErrorState) + state.ObjAsVpcPeering().Status.State = string(cloudcontrolv1beta1.StateError) } reason := cloudcontrolv1beta1.ReasonFailedLoadingRemoteVpcPeeringConnection diff --git a/pkg/kcp/provider/azure/vpcpeering/peeringRemoteRequireSpecifiedName.go b/pkg/kcp/provider/azure/vpcpeering/peeringRemoteRequireSpecifiedName.go index 3e349abbb..7d50dc0c6 100644 --- a/pkg/kcp/provider/azure/vpcpeering/peeringRemoteRequireSpecifiedName.go +++ b/pkg/kcp/provider/azure/vpcpeering/peeringRemoteRequireSpecifiedName.go @@ -3,6 +3,7 @@ package vpcpeering import ( "context" "errors" + cloudcontrolv1beta1 "github.com/kyma-project/cloud-manager/api/cloud-control/v1beta1" "github.com/kyma-project/cloud-manager/pkg/composed" "k8s.io/apimachinery/pkg/api/meta" @@ -20,8 +21,8 @@ func peeringRemoteRequireSpecifiedName(ctx context.Context, st composed.State) ( logger.Error(errors.New("peering name not specified"), "Invalid KCP VpcPeering") changed := false - if state.ObjAsVpcPeering().Status.State != string(cloudcontrolv1beta1.ErrorState) { - state.ObjAsVpcPeering().Status.State = string(cloudcontrolv1beta1.ErrorState) + if state.ObjAsVpcPeering().Status.State != string(cloudcontrolv1beta1.StateError) { + state.ObjAsVpcPeering().Status.State = string(cloudcontrolv1beta1.StateError) changed = true } diff --git a/pkg/kcp/provider/azure/vpcpeering/remoteClientCreate.go b/pkg/kcp/provider/azure/vpcpeering/remoteClientCreate.go index 3784817bb..bcd0afcb5 100644 --- a/pkg/kcp/provider/azure/vpcpeering/remoteClientCreate.go +++ b/pkg/kcp/provider/azure/vpcpeering/remoteClientCreate.go @@ -3,6 +3,7 @@ package vpcpeering import ( "context" "fmt" + cloudcontrolv1beta1 "github.com/kyma-project/cloud-manager/api/cloud-control/v1beta1" "github.com/kyma-project/cloud-manager/pkg/composed" azureconfig "github.com/kyma-project/cloud-manager/pkg/kcp/provider/azure/config" @@ -39,7 +40,7 @@ func remoteClientCreate(ctx context.Context, st composed.State) (error, context. ). Error(err, "Error creating remote Azure client for KCP VpcPeering") - state.ObjAsVpcPeering().Status.State = string(cloudcontrolv1beta1.ErrorState) + state.ObjAsVpcPeering().Status.State = string(cloudcontrolv1beta1.StateError) return composed.PatchStatus(state.ObjAsVpcPeering()). SetExclusiveConditions(metav1.Condition{ diff --git a/pkg/kcp/provider/azure/vpcpeering/vpcRemoteLoad.go b/pkg/kcp/provider/azure/vpcpeering/vpcRemoteLoad.go index d3425e840..884b61784 100644 --- a/pkg/kcp/provider/azure/vpcpeering/vpcRemoteLoad.go +++ b/pkg/kcp/provider/azure/vpcpeering/vpcRemoteLoad.go @@ -2,6 +2,7 @@ package vpcpeering import ( "context" + cloudcontrolv1beta1 "github.com/kyma-project/cloud-manager/api/cloud-control/v1beta1" "github.com/kyma-project/cloud-manager/pkg/composed" azuremeta "github.com/kyma-project/cloud-manager/pkg/kcp/provider/azure/meta" @@ -35,9 +36,9 @@ func vpcRemoteLoad(ctx context.Context, st composed.State) (error, context.Conte } if isWarning { - state.ObjAsVpcPeering().Status.State = string(cloudcontrolv1beta1.WarningState) + state.ObjAsVpcPeering().Status.State = string(cloudcontrolv1beta1.StateWarning) } else { - state.ObjAsVpcPeering().Status.State = string(cloudcontrolv1beta1.ErrorState) + state.ObjAsVpcPeering().Status.State = string(cloudcontrolv1beta1.StateError) } reason := cloudcontrolv1beta1.ReasonFailedLoadingRemoteVpcNetwork diff --git a/pkg/kcp/provider/ccee/nfsinstance/accessGrant.go b/pkg/kcp/provider/ccee/nfsinstance/accessGrant.go index d98d0d82f..616e8e7b5 100644 --- a/pkg/kcp/provider/ccee/nfsinstance/accessGrant.go +++ b/pkg/kcp/provider/ccee/nfsinstance/accessGrant.go @@ -2,6 +2,7 @@ package nfsinstance import ( "context" + cloudcontrolv1beta1 "github.com/kyma-project/cloud-manager/api/cloud-control/v1beta1" "github.com/kyma-project/cloud-manager/pkg/composed" "github.com/kyma-project/cloud-manager/pkg/util" @@ -22,7 +23,7 @@ func accessGrant(ctx context.Context, st composed.State) (error, context.Context ar, err := state.cceeClient.GrantShareAccess(ctx, state.share.ID, state.Scope().Spec.Scope.OpenStack.Network.Nodes) if err != nil { logger.Error(err, "Error granting CCEE share access") - state.ObjAsNfsInstance().Status.State = cloudcontrolv1beta1.ErrorState + state.ObjAsNfsInstance().Status.State = cloudcontrolv1beta1.StateError return composed.PatchStatus(state.ObjAsNfsInstance()). SetExclusiveConditions(metav1.Condition{ Type: cloudcontrolv1beta1.ConditionTypeError, diff --git a/pkg/kcp/provider/ccee/nfsinstance/accessRevoke.go b/pkg/kcp/provider/ccee/nfsinstance/accessRevoke.go index a603dfcbb..058bbe90c 100644 --- a/pkg/kcp/provider/ccee/nfsinstance/accessRevoke.go +++ b/pkg/kcp/provider/ccee/nfsinstance/accessRevoke.go @@ -2,12 +2,13 @@ package nfsinstance import ( "context" + "net/http" + "github.com/gophercloud/gophercloud/v2" cloudcontrolv1beta1 "github.com/kyma-project/cloud-manager/api/cloud-control/v1beta1" "github.com/kyma-project/cloud-manager/pkg/composed" "github.com/kyma-project/cloud-manager/pkg/util" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "net/http" ) func accessRevoke(ctx context.Context, st composed.State) (error, context.Context) { @@ -22,7 +23,7 @@ func accessRevoke(ctx context.Context, st composed.State) (error, context.Contex err := state.cceeClient.RevokeShareAccess(ctx, state.share.ID, state.accessRight.ID) if err != nil && !gophercloud.ResponseCodeIs(err, http.StatusNotFound) { - state.ObjAsNfsInstance().Status.State = cloudcontrolv1beta1.ErrorState + state.ObjAsNfsInstance().Status.State = cloudcontrolv1beta1.StateError return composed.PatchStatus(state.ObjAsNfsInstance()). SetExclusiveConditions(metav1.Condition{ Type: cloudcontrolv1beta1.ConditionTypeError, diff --git a/pkg/kcp/provider/ccee/nfsinstance/conditionsInit.go b/pkg/kcp/provider/ccee/nfsinstance/conditionsInit.go index c95ff0af1..8d9ebc947 100644 --- a/pkg/kcp/provider/ccee/nfsinstance/conditionsInit.go +++ b/pkg/kcp/provider/ccee/nfsinstance/conditionsInit.go @@ -2,6 +2,7 @@ package nfsinstance import ( "context" + cloudcontrol1beta1 "github.com/kyma-project/cloud-manager/api/cloud-control/v1beta1" "github.com/kyma-project/cloud-manager/pkg/composed" ) @@ -12,7 +13,7 @@ func conditionsInit(ctx context.Context, st composed.State) (error, context.Cont changed := false if state.ObjAsNfsInstance().Status.State == "" { changed = true - state.ObjAsNfsInstance().Status.State = cloudcontrol1beta1.ProcessingState + state.ObjAsNfsInstance().Status.State = cloudcontrol1beta1.StateProcessing } if changed { diff --git a/pkg/kcp/provider/ccee/nfsinstance/networkStopWhenNotFound.go b/pkg/kcp/provider/ccee/nfsinstance/networkStopWhenNotFound.go index 70f64a823..1821f12ba 100644 --- a/pkg/kcp/provider/ccee/nfsinstance/networkStopWhenNotFound.go +++ b/pkg/kcp/provider/ccee/nfsinstance/networkStopWhenNotFound.go @@ -2,6 +2,7 @@ package nfsinstance import ( "context" + cloudcontrolv1beta1 "github.com/kyma-project/cloud-manager/api/cloud-control/v1beta1" "github.com/kyma-project/cloud-manager/pkg/composed" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -23,7 +24,7 @@ func networkStopWhenNotFound(ctx context.Context, st composed.State) (error, con ). Info("CCEE network not found") - state.ObjAsNfsInstance().Status.State = cloudcontrolv1beta1.ErrorState + state.ObjAsNfsInstance().Status.State = cloudcontrolv1beta1.StateError return composed.PatchStatus(state.ObjAsNfsInstance()). SetCondition(metav1.Condition{ diff --git a/pkg/kcp/provider/ccee/nfsinstance/shareCreate.go b/pkg/kcp/provider/ccee/nfsinstance/shareCreate.go index b0a3f497a..5ad003440 100644 --- a/pkg/kcp/provider/ccee/nfsinstance/shareCreate.go +++ b/pkg/kcp/provider/ccee/nfsinstance/shareCreate.go @@ -2,6 +2,7 @@ package nfsinstance import ( "context" + cloudcontrolv1beta1 "github.com/kyma-project/cloud-manager/api/cloud-control/v1beta1" "github.com/kyma-project/cloud-manager/pkg/common" "github.com/kyma-project/cloud-manager/pkg/composed" @@ -36,7 +37,7 @@ func shareCreate(ctx context.Context, st composed.State) (error, context.Context ) if err != nil { logger.Error(err, "Error creating CCEE share") - state.ObjAsNfsInstance().Status.State = cloudcontrolv1beta1.ErrorState + state.ObjAsNfsInstance().Status.State = cloudcontrolv1beta1.StateError return composed.PatchStatus(state.ObjAsNfsInstance()). SetExclusiveConditions(metav1.Condition{ Type: cloudcontrolv1beta1.ConditionTypeError, diff --git a/pkg/kcp/provider/ccee/nfsinstance/shareDelete.go b/pkg/kcp/provider/ccee/nfsinstance/shareDelete.go index 7fac44827..f7ef4e1fe 100644 --- a/pkg/kcp/provider/ccee/nfsinstance/shareDelete.go +++ b/pkg/kcp/provider/ccee/nfsinstance/shareDelete.go @@ -2,12 +2,13 @@ package nfsinstance import ( "context" + "net/http" + "github.com/gophercloud/gophercloud/v2" cloudcontrolv1beta1 "github.com/kyma-project/cloud-manager/api/cloud-control/v1beta1" "github.com/kyma-project/cloud-manager/pkg/composed" "github.com/kyma-project/cloud-manager/pkg/util" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "net/http" ) func shareDelete(ctx context.Context, st composed.State) (error, context.Context) { @@ -23,7 +24,7 @@ func shareDelete(ctx context.Context, st composed.State) (error, context.Context err := state.cceeClient.DeleteShare(ctx, state.share.ID) if err != nil && !gophercloud.ResponseCodeIs(err, http.StatusNotFound) { - state.ObjAsNfsInstance().Status.State = cloudcontrolv1beta1.ErrorState + state.ObjAsNfsInstance().Status.State = cloudcontrolv1beta1.StateError return composed.PatchStatus(state.ObjAsNfsInstance()). SetExclusiveConditions(metav1.Condition{ Type: cloudcontrolv1beta1.ConditionTypeError, diff --git a/pkg/kcp/provider/ccee/nfsinstance/shareExpandShrink.go b/pkg/kcp/provider/ccee/nfsinstance/shareExpandShrink.go index b632fb8c8..8e1c974c9 100644 --- a/pkg/kcp/provider/ccee/nfsinstance/shareExpandShrink.go +++ b/pkg/kcp/provider/ccee/nfsinstance/shareExpandShrink.go @@ -2,6 +2,7 @@ package nfsinstance import ( "context" + cloudcontrolv1beta1 "github.com/kyma-project/cloud-manager/api/cloud-control/v1beta1" "github.com/kyma-project/cloud-manager/pkg/composed" "github.com/kyma-project/cloud-manager/pkg/util" @@ -30,7 +31,7 @@ func shareExpandShrink(ctx context.Context, st composed.State) (error, context.C if err != nil { logger.Error(err, "Failed to change size of CCEE NfsInstance") - state.ObjAsNfsInstance().Status.State = cloudcontrolv1beta1.ErrorState + state.ObjAsNfsInstance().Status.State = cloudcontrolv1beta1.StateError return composed.PatchStatus(state.ObjAsNfsInstance()). SetExclusiveConditions(metav1.Condition{ Type: cloudcontrolv1beta1.ConditionTypeError, diff --git a/pkg/kcp/provider/ccee/nfsinstance/shareExportRead.go b/pkg/kcp/provider/ccee/nfsinstance/shareExportRead.go index fa8b8a361..415cea7ff 100644 --- a/pkg/kcp/provider/ccee/nfsinstance/shareExportRead.go +++ b/pkg/kcp/provider/ccee/nfsinstance/shareExportRead.go @@ -3,12 +3,13 @@ package nfsinstance import ( "context" "fmt" + "strings" + "github.com/gophercloud/gophercloud/v2/openstack/sharedfilesystems/v2/shares" cloudcontrolv1beta1 "github.com/kyma-project/cloud-manager/api/cloud-control/v1beta1" "github.com/kyma-project/cloud-manager/pkg/composed" "github.com/kyma-project/cloud-manager/pkg/util" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "strings" ) func shareExportRead(ctx context.Context, st composed.State) (error, context.Context) { @@ -18,7 +19,7 @@ func shareExportRead(ctx context.Context, st composed.State) (error, context.Con list, err := state.cceeClient.ListShareExportLocations(ctx, state.share.ID) if err != nil { logger.Error(err, "error listing CCEE share export locations") - state.ObjAsNfsInstance().Status.State = cloudcontrolv1beta1.ErrorState + state.ObjAsNfsInstance().Status.State = cloudcontrolv1beta1.StateError return composed.PatchStatus(state.ObjAsNfsInstance()). SetExclusiveConditions(metav1.Condition{ Type: cloudcontrolv1beta1.ConditionTypeError, @@ -33,7 +34,7 @@ func shareExportRead(ctx context.Context, st composed.State) (error, context.Con if len(list) == 0 { logger.Info("CCEE share with no export locations") - state.ObjAsNfsInstance().Status.State = cloudcontrolv1beta1.ErrorState + state.ObjAsNfsInstance().Status.State = cloudcontrolv1beta1.StateError return composed.PatchStatus(state.ObjAsNfsInstance()). SetExclusiveConditions(metav1.Condition{ Type: cloudcontrolv1beta1.ConditionTypeError, @@ -64,7 +65,7 @@ func shareExportRead(ctx context.Context, st composed.State) (error, context.Con h, p, err := parseExportUrl(el.Path) if err != nil { logger.Error(err, "error parsing CCEE share export path") - state.ObjAsNfsInstance().Status.State = cloudcontrolv1beta1.ErrorState + state.ObjAsNfsInstance().Status.State = cloudcontrolv1beta1.StateError return composed.PatchStatus(state.ObjAsNfsInstance()). SetExclusiveConditions(metav1.Condition{ Type: cloudcontrolv1beta1.ConditionTypeError, diff --git a/pkg/kcp/provider/ccee/nfsinstance/shareNetworkCreate.go b/pkg/kcp/provider/ccee/nfsinstance/shareNetworkCreate.go index 3f68e2dec..f3d85e86b 100644 --- a/pkg/kcp/provider/ccee/nfsinstance/shareNetworkCreate.go +++ b/pkg/kcp/provider/ccee/nfsinstance/shareNetworkCreate.go @@ -2,6 +2,7 @@ package nfsinstance import ( "context" + cloudcontrolv1beta1 "github.com/kyma-project/cloud-manager/api/cloud-control/v1beta1" "github.com/kyma-project/cloud-manager/pkg/composed" "github.com/kyma-project/cloud-manager/pkg/util" @@ -22,7 +23,7 @@ func shareNetworkCreate(ctx context.Context, st composed.State) (error, context. shareNetwork, err := state.cceeClient.CreateShareNetwork(ctx, state.network.ID, state.subnet.ID, state.ShareNetworkName()) if err != nil { logger.Error(err, "Error creating CCEE shareNetwork") - state.ObjAsNfsInstance().Status.State = cloudcontrolv1beta1.ErrorState + state.ObjAsNfsInstance().Status.State = cloudcontrolv1beta1.StateError return composed.PatchStatus(state.ObjAsNfsInstance()). SetExclusiveConditions(metav1.Condition{ Type: cloudcontrolv1beta1.ConditionTypeError, diff --git a/pkg/kcp/provider/ccee/nfsinstance/shareNetworkDelete.go b/pkg/kcp/provider/ccee/nfsinstance/shareNetworkDelete.go index 63e88b240..a292d8a45 100644 --- a/pkg/kcp/provider/ccee/nfsinstance/shareNetworkDelete.go +++ b/pkg/kcp/provider/ccee/nfsinstance/shareNetworkDelete.go @@ -3,6 +3,8 @@ package nfsinstance import ( "context" "fmt" + "net/http" + "github.com/elliotchance/pie/v2" "github.com/gophercloud/gophercloud/v2" "github.com/gophercloud/gophercloud/v2/openstack/sharedfilesystems/v2/shares" @@ -10,7 +12,6 @@ import ( "github.com/kyma-project/cloud-manager/pkg/composed" "github.com/kyma-project/cloud-manager/pkg/util" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "net/http" ) func shareNetworkDelete(ctx context.Context, st composed.State) (error, context.Context) { @@ -42,7 +43,7 @@ func shareNetworkDelete(ctx context.Context, st composed.State) (error, context. err = state.cceeClient.DeleteShareNetwork(ctx, state.shareNetwork.ID) if err != nil && !gophercloud.ResponseCodeIs(err, http.StatusNotFound) { - state.ObjAsNfsInstance().Status.State = cloudcontrolv1beta1.ErrorState + state.ObjAsNfsInstance().Status.State = cloudcontrolv1beta1.StateError return composed.PatchStatus(state.ObjAsNfsInstance()). SetExclusiveConditions(metav1.Condition{ Type: cloudcontrolv1beta1.ConditionTypeError, diff --git a/pkg/kcp/provider/ccee/nfsinstance/shareWaitAvailable.go b/pkg/kcp/provider/ccee/nfsinstance/shareWaitAvailable.go index 58015acb4..aeb70eee2 100644 --- a/pkg/kcp/provider/ccee/nfsinstance/shareWaitAvailable.go +++ b/pkg/kcp/provider/ccee/nfsinstance/shareWaitAvailable.go @@ -3,6 +3,7 @@ package nfsinstance import ( "context" "errors" + cloudcontrolv1beta1 "github.com/kyma-project/cloud-manager/api/cloud-control/v1beta1" "github.com/kyma-project/cloud-manager/pkg/composed" "github.com/kyma-project/cloud-manager/pkg/util" @@ -26,7 +27,7 @@ func shareWaitAvailable(ctx context.Context, st composed.State) (error, context. // share is in error state logger.Error(errors.New("ccee share in error state"), "CCEE share error") - state.ObjAsNfsInstance().Status.State = cloudcontrolv1beta1.ErrorState + state.ObjAsNfsInstance().Status.State = cloudcontrolv1beta1.StateError return composed.PatchStatus(state.ObjAsNfsInstance()). SetExclusiveConditions(metav1.Condition{ diff --git a/pkg/kcp/provider/ccee/nfsinstance/statusReady.go b/pkg/kcp/provider/ccee/nfsinstance/statusReady.go index 048b47e45..0de52ea0d 100644 --- a/pkg/kcp/provider/ccee/nfsinstance/statusReady.go +++ b/pkg/kcp/provider/ccee/nfsinstance/statusReady.go @@ -2,6 +2,7 @@ package nfsinstance import ( "context" + cloudcontrolv1beta1 "github.com/kyma-project/cloud-manager/api/cloud-control/v1beta1" "github.com/kyma-project/cloud-manager/pkg/composed" "k8s.io/apimachinery/pkg/api/meta" @@ -13,8 +14,8 @@ func statusReady(ctx context.Context, st composed.State) (error, context.Context changed := false - if state.ObjAsNfsInstance().Status.State != cloudcontrolv1beta1.ReadyState { - state.ObjAsNfsInstance().Status.State = cloudcontrolv1beta1.ReadyState + if state.ObjAsNfsInstance().Status.State != cloudcontrolv1beta1.StateReady { + state.ObjAsNfsInstance().Status.State = cloudcontrolv1beta1.StateReady changed = true } diff --git a/pkg/kcp/provider/ccee/nfsinstance/subnetStopWhenNoFound.go b/pkg/kcp/provider/ccee/nfsinstance/subnetStopWhenNoFound.go index 0959c6bb7..a3bd8de2f 100644 --- a/pkg/kcp/provider/ccee/nfsinstance/subnetStopWhenNoFound.go +++ b/pkg/kcp/provider/ccee/nfsinstance/subnetStopWhenNoFound.go @@ -2,6 +2,7 @@ package nfsinstance import ( "context" + cloudcontrolv1beta1 "github.com/kyma-project/cloud-manager/api/cloud-control/v1beta1" "github.com/kyma-project/cloud-manager/pkg/composed" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -25,7 +26,7 @@ func subnetStopWhenNoFound(ctx context.Context, st composed.State) (error, conte ). Info("CCEE subnet not found") - state.ObjAsNfsInstance().Status.State = cloudcontrolv1beta1.ErrorState + state.ObjAsNfsInstance().Status.State = cloudcontrolv1beta1.StateError return composed.PatchStatus(state.ObjAsNfsInstance()). SetCondition(metav1.Condition{ diff --git a/pkg/kcp/provider/gcp/iprange/v2/allocateIpRange.go b/pkg/kcp/provider/gcp/iprange/v2/allocateIpRange.go index a1c4fdbf9..8c37aebd9 100644 --- a/pkg/kcp/provider/gcp/iprange/v2/allocateIpRange.go +++ b/pkg/kcp/provider/gcp/iprange/v2/allocateIpRange.go @@ -2,6 +2,7 @@ package v2 import ( "context" + cloudcontrolv1beta1 "github.com/kyma-project/cloud-manager/api/cloud-control/v1beta1" "github.com/kyma-project/cloud-manager/pkg/composed" iprangetypes "github.com/kyma-project/cloud-manager/pkg/kcp/iprange/types" @@ -17,7 +18,7 @@ func NewAllocateIpRangeAction(_ StateFactory) composed.Action { state := st.(iprangetypes.State) if len(state.Scope().Spec.Scope.Gcp.Network.Nodes) == 0 { - state.ObjAsIpRange().Status.State = cloudcontrolv1beta1.ErrorState + state.ObjAsIpRange().Status.State = cloudcontrolv1beta1.StateError return composed.PatchStatus(state.ObjAsIpRange()). SetExclusiveConditions(metav1.Condition{ Type: cloudcontrolv1beta1.ConditionTypeError, diff --git a/pkg/kcp/provider/gcp/iprange/v2/compareStates.go b/pkg/kcp/provider/gcp/iprange/v2/compareStates.go index b7f8e3da0..914d0f6b0 100644 --- a/pkg/kcp/provider/gcp/iprange/v2/compareStates.go +++ b/pkg/kcp/provider/gcp/iprange/v2/compareStates.go @@ -2,6 +2,7 @@ package v2 import ( "context" + "github.com/kyma-project/cloud-manager/pkg/kcp/provider/gcp/client" "github.com/kyma-project/cloud-manager/api/cloud-control/v1beta1" @@ -71,7 +72,7 @@ func compareStates(ctx context.Context, st composed.State) (error, context.Conte } else if state.connectionOp != client.NONE { state.curState = client.SyncPsaConnection } else { - state.curState = v1beta1.ReadyState + state.curState = v1beta1.StateReady } } state.inSync = state.addressOp == client.NONE && state.connectionOp == client.NONE diff --git a/pkg/kcp/provider/gcp/iprange/v2/compareStates_test.go b/pkg/kcp/provider/gcp/iprange/v2/compareStates_test.go index f120d099e..34b167f2e 100644 --- a/pkg/kcp/provider/gcp/iprange/v2/compareStates_test.go +++ b/pkg/kcp/provider/gcp/iprange/v2/compareStates_test.go @@ -2,6 +2,10 @@ package v2 import ( "context" + "net/http" + "net/http/httptest" + "testing" + "github.com/go-logr/logr" cloudcontrolv1beta1 "github.com/kyma-project/cloud-manager/api/cloud-control/v1beta1" "github.com/kyma-project/cloud-manager/pkg/kcp/provider/gcp/client" @@ -9,10 +13,7 @@ import ( "github.com/stretchr/testify/suite" "google.golang.org/api/compute/v1" "google.golang.org/api/servicenetworking/v1" - "net/http" - "net/http/httptest" "sigs.k8s.io/controller-runtime/pkg/log" - "testing" ) type compareStatesSuite struct { @@ -415,7 +416,7 @@ func (suite *compareStatesSuite) TestWhenNotDeleting_BothAddressAndConnectionExi assert.Nil(suite.T(), resCtx) //Validate state attributes - assert.Equal(suite.T(), cloudcontrolv1beta1.ReadyState, state.curState) + assert.Equal(suite.T(), cloudcontrolv1beta1.StateReady, state.curState) assert.Equal(suite.T(), client.NONE, state.connectionOp) assert.Equal(suite.T(), client.NONE, state.addressOp) assert.True(suite.T(), state.inSync) diff --git a/pkg/kcp/provider/gcp/iprange/v2/updateState.go b/pkg/kcp/provider/gcp/iprange/v2/updateState.go index 0292aa3d3..30642d3bb 100644 --- a/pkg/kcp/provider/gcp/iprange/v2/updateState.go +++ b/pkg/kcp/provider/gcp/iprange/v2/updateState.go @@ -2,6 +2,7 @@ package v2 import ( "context" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "github.com/kyma-project/cloud-manager/api/cloud-control/v1beta1" @@ -14,7 +15,7 @@ func updateState(ctx context.Context, st composed.State) (error, context.Context prevState := ipRange.Status.State ipRange.Status.State = state.curState - if state.curState == v1beta1.ReadyState { + if state.curState == v1beta1.StateReady { return composed.PatchStatus(ipRange). SetExclusiveConditions(metav1.Condition{ Type: v1beta1.ConditionTypeReady, diff --git a/pkg/kcp/provider/gcp/nfsinstance/checkNUpdateState.go b/pkg/kcp/provider/gcp/nfsinstance/checkNUpdateState.go index 12e1f71eb..6c7f9e772 100644 --- a/pkg/kcp/provider/gcp/nfsinstance/checkNUpdateState.go +++ b/pkg/kcp/provider/gcp/nfsinstance/checkNUpdateState.go @@ -37,13 +37,13 @@ func checkNUpdateState(ctx context.Context, st composed.State) (error, context.C state.operation = client.ADD state.curState = client.Creating } else if state.fsInstance.State == string(client.ERROR) { - state.curState = v1beta1.ErrorState + state.curState = v1beta1.StateError } else if !state.doesFilestoreMatch() { //If the filestore exists, but does not match, update it. state.operation = client.MODIFY state.curState = client.Updating } else if state.fsInstance.State == string(client.READY) { - state.curState = v1beta1.ReadyState + state.curState = v1beta1.StateReady } else { //If the filestore exists but is not READY or in ERROR, it is in a transient state. return composed.StopWithRequeueDelay(client.GcpConfig.GcpRetryWaitTime), ctx @@ -55,7 +55,7 @@ func checkNUpdateState(ctx context.Context, st composed.State) (error, context.C nfsInstance.Status.State = state.curState logger.Info("State Info", "curState", state.curState, "Operation", state.operation) - if state.curState == v1beta1.ReadyState { + if state.curState == v1beta1.StateReady { nfsInstance.Status.Hosts = state.fsInstance.Networks[0].IpAddresses nfsInstance.Status.Host = pie.First(state.fsInstance.Networks[0].IpAddresses) nfsInstance.Status.Path = state.ObjAsNfsInstance().Spec.Instance.Gcp.FileShareName @@ -70,7 +70,7 @@ func checkNUpdateState(ctx context.Context, st composed.State) (error, context.C SuccessError(composed.StopAndForget). Run(ctx, state) } else if prevState != state.curState { - if state.curState == v1beta1.ErrorState { + if state.curState == v1beta1.StateError { return composed.UpdateStatus(nfsInstance). SetExclusiveConditions(metav1.Condition{ Type: v1beta1.ConditionTypeError, diff --git a/pkg/kcp/provider/gcp/nfsinstance/checkNUpdateState_test.go b/pkg/kcp/provider/gcp/nfsinstance/checkNUpdateState_test.go index acd5b6452..f472b5302 100644 --- a/pkg/kcp/provider/gcp/nfsinstance/checkNUpdateState_test.go +++ b/pkg/kcp/provider/gcp/nfsinstance/checkNUpdateState_test.go @@ -2,6 +2,10 @@ package nfsinstance import ( "context" + "net/http" + "net/http/httptest" + "testing" + "github.com/go-logr/logr" "github.com/kyma-project/cloud-manager/api/cloud-control/v1beta1" "github.com/kyma-project/cloud-manager/pkg/composed" @@ -11,10 +15,7 @@ import ( "google.golang.org/api/file/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - "net/http" - "net/http/httptest" "sigs.k8s.io/controller-runtime/pkg/log" - "testing" ) type checkNUpdateStateSuite struct { @@ -214,13 +215,13 @@ func (suite *checkNUpdateStateSuite) TestCheckNUpdateStateReady() { err, _ = checkNUpdateState(ctx, testState.State) assert.NotNil(suite.T(), err) assert.Equal(suite.T(), composed.StopAndForget, err) - assert.Equal(suite.T(), v1beta1.ReadyState, testState.State.curState) - assert.Equal(suite.T(), v1beta1.ReadyState, testState.State.ObjAsNfsInstance().Status.State) + assert.Equal(suite.T(), v1beta1.StateReady, testState.State.curState) + assert.Equal(suite.T(), v1beta1.StateReady, testState.State.ObjAsNfsInstance().Status.State) updatedObject := &v1beta1.NfsInstance{} err = factory.kcpCluster.K8sClient().Get(ctx, types.NamespacedName{Name: gcpNfsInstance.Name, Namespace: gcpNfsInstance.Namespace}, updatedObject) assert.Nil(suite.T(), err) - assert.Equal(suite.T(), v1beta1.ReadyState, updatedObject.Status.State) + assert.Equal(suite.T(), v1beta1.StateReady, updatedObject.Status.State) // validate status conditions assert.Equal(suite.T(), v1beta1.ConditionTypeReady, updatedObject.Status.Conditions[0].Type) assert.Equal(suite.T(), metav1.ConditionTrue, updatedObject.Status.Conditions[0].Status) @@ -252,13 +253,13 @@ func (suite *checkNUpdateStateSuite) TestCheckNUpdateStateError() { err, _ = checkNUpdateState(ctx, testState.State) assert.NotNil(suite.T(), err) assert.Equal(suite.T(), composed.StopWithRequeueDelay(client.GcpConfig.GcpRetryWaitTime), err) - assert.Equal(suite.T(), v1beta1.ErrorState, testState.State.curState) - assert.Equal(suite.T(), v1beta1.ErrorState, testState.State.ObjAsNfsInstance().Status.State) + assert.Equal(suite.T(), v1beta1.StateError, testState.State.curState) + assert.Equal(suite.T(), v1beta1.StateError, testState.State.ObjAsNfsInstance().Status.State) updatedObject := &v1beta1.NfsInstance{} err = factory.kcpCluster.K8sClient().Get(ctx, types.NamespacedName{Name: gcpNfsInstance.Name, Namespace: gcpNfsInstance.Namespace}, updatedObject) assert.Nil(suite.T(), err) - assert.Equal(suite.T(), v1beta1.ErrorState, updatedObject.Status.State) + assert.Equal(suite.T(), v1beta1.StateError, updatedObject.Status.State) // validate status conditions assert.Equal(suite.T(), v1beta1.ConditionTypeError, updatedObject.Status.Conditions[0].Type) assert.Equal(suite.T(), metav1.ConditionTrue, updatedObject.Status.Conditions[0].Status) diff --git a/pkg/kcp/provider/gcp/nuke/loadNfsBackups.go b/pkg/kcp/provider/gcp/nuke/loadNfsBackups.go index 24a5c8c16..3add4d92d 100644 --- a/pkg/kcp/provider/gcp/nuke/loadNfsBackups.go +++ b/pkg/kcp/provider/gcp/nuke/loadNfsBackups.go @@ -2,6 +2,7 @@ package nuke import ( "context" + cloudcontrolv1beta1 "github.com/kyma-project/cloud-manager/api/cloud-control/v1beta1" "github.com/kyma-project/cloud-manager/pkg/composed" nuketypes "github.com/kyma-project/cloud-manager/pkg/kcp/nuke/types" @@ -18,7 +19,7 @@ func loadNfsBackups(ctx context.Context, st composed.State) (error, context.Cont if err != nil { logger.Error(err, "Error listing Gcp Filestore Backups") - state.ObjAsNuke().Status.State = string(cloudcontrolv1beta1.ErrorState) + state.ObjAsNuke().Status.State = string(cloudcontrolv1beta1.StateError) return composed.PatchStatus(state.ObjAsNuke()). SetExclusiveConditions(metav1.Condition{ diff --git a/pkg/kcp/provider/gcp/redisinstance/createRedis.go b/pkg/kcp/provider/gcp/redisinstance/createRedis.go index 7583c43df..4d496c178 100644 --- a/pkg/kcp/provider/gcp/redisinstance/createRedis.go +++ b/pkg/kcp/provider/gcp/redisinstance/createRedis.go @@ -58,7 +58,7 @@ func createRedis(ctx context.Context, st composed.State) (error, context.Context Reason: v1beta1.ReasonCloudProviderError, Message: "Failed to create RedisInstance", }) - redisInstance.Status.State = cloudcontrolv1beta1.ErrorState + redisInstance.Status.State = cloudcontrolv1beta1.StateError err = state.UpdateObjStatus(ctx) if err != nil { diff --git a/pkg/kcp/provider/gcp/redisinstance/deleteRedis.go b/pkg/kcp/provider/gcp/redisinstance/deleteRedis.go index 2998be3b8..87658f0e0 100644 --- a/pkg/kcp/provider/gcp/redisinstance/deleteRedis.go +++ b/pkg/kcp/provider/gcp/redisinstance/deleteRedis.go @@ -45,7 +45,7 @@ func deleteRedis(ctx context.Context, st composed.State) (error, context.Context Reason: v1beta1.ReasonCloudProviderError, Message: "Failed to delete RedisInstance", }) - redisInstance.Status.State = cloudcontrolv1beta1.ErrorState + redisInstance.Status.State = cloudcontrolv1beta1.StateError err = state.UpdateObjStatus(ctx) if err != nil { diff --git a/pkg/kcp/provider/gcp/redisinstance/loadRedis.go b/pkg/kcp/provider/gcp/redisinstance/loadRedis.go index 1246bdd21..2a97dc79c 100644 --- a/pkg/kcp/provider/gcp/redisinstance/loadRedis.go +++ b/pkg/kcp/provider/gcp/redisinstance/loadRedis.go @@ -42,7 +42,7 @@ func loadRedis(ctx context.Context, st composed.State) (error, context.Context) Reason: v1beta1.ReasonCloudProviderError, Message: "Failed to load RedisInstance", }) - redisInstance.Status.State = cloudcontrolv1beta1.ErrorState + redisInstance.Status.State = cloudcontrolv1beta1.StateError err = state.UpdateObjStatus(ctx) if err != nil { diff --git a/pkg/kcp/provider/gcp/redisinstance/new.go b/pkg/kcp/provider/gcp/redisinstance/new.go index 250d7d563..d101e44c6 100644 --- a/pkg/kcp/provider/gcp/redisinstance/new.go +++ b/pkg/kcp/provider/gcp/redisinstance/new.go @@ -20,7 +20,7 @@ func New(stateFactory StateFactory) composed.Action { if err != nil { composed.LoggerFromCtx(ctx).Error(err, "Failed to bootstrap GCP RedisInstance state") redisInstance := st.Obj().(*v1beta1.RedisInstance) - redisInstance.Status.State = cloudcontrolv1beta1.ErrorState + redisInstance.Status.State = cloudcontrolv1beta1.StateError return composed.UpdateStatus(redisInstance). SetExclusiveConditions(metav1.Condition{ Type: v1beta1.ConditionTypeError, diff --git a/pkg/kcp/provider/gcp/redisinstance/removeReadyCondition.go b/pkg/kcp/provider/gcp/redisinstance/removeReadyCondition.go index d0d5ef544..d82a41382 100644 --- a/pkg/kcp/provider/gcp/redisinstance/removeReadyCondition.go +++ b/pkg/kcp/provider/gcp/redisinstance/removeReadyCondition.go @@ -22,7 +22,7 @@ func removeReadyCondition(ctx context.Context, st composed.State) (error, contex logger.Info("Removing Ready condition") meta.RemoveStatusCondition(redisInstance.Conditions(), cloudcontrolv1beta1.ConditionTypeReady) - redisInstance.Status.State = cloudcontrolv1beta1.DeletingState + redisInstance.Status.State = cloudcontrolv1beta1.StateDeleting err := state.UpdateObjStatus(ctx) if err != nil { return composed.LogErrorAndReturn(err, "Error updating RedisInstance status after removing Ready condition", composed.StopWithRequeue, ctx) diff --git a/pkg/kcp/provider/gcp/redisinstance/updateStatus.go b/pkg/kcp/provider/gcp/redisinstance/updateStatus.go index 88cccad6d..09d0c8935 100644 --- a/pkg/kcp/provider/gcp/redisinstance/updateStatus.go +++ b/pkg/kcp/provider/gcp/redisinstance/updateStatus.go @@ -47,14 +47,14 @@ func updateStatus(ctx context.Context, st composed.State) (error, context.Contex } hasReadyCondition := meta.FindStatusCondition(redisInstance.Status.Conditions, cloudcontrolv1beta1.ConditionTypeReady) != nil - hasReadyStatusState := redisInstance.Status.State == cloudcontrolv1beta1.ReadyState + hasReadyStatusState := redisInstance.Status.State == cloudcontrolv1beta1.StateReady if !hasChanged && hasReadyCondition && hasReadyStatusState { composed.LoggerFromCtx(ctx).Info("RedisInstance status fields are already up-to-date, StopAndForget-ing") return composed.StopAndForget, nil } - redisInstance.Status.State = cloudcontrolv1beta1.ReadyState + redisInstance.Status.State = cloudcontrolv1beta1.StateReady return composed.UpdateStatus(redisInstance). SetExclusiveConditions(metav1.Condition{ Type: cloudcontrolv1beta1.ConditionTypeReady, diff --git a/pkg/kcp/provider/gcp/redisinstance/waitRedisAvailable.go b/pkg/kcp/provider/gcp/redisinstance/waitRedisAvailable.go index 4fd115ccb..53ec70de2 100644 --- a/pkg/kcp/provider/gcp/redisinstance/waitRedisAvailable.go +++ b/pkg/kcp/provider/gcp/redisinstance/waitRedisAvailable.go @@ -20,7 +20,7 @@ func waitRedisAvailable(ctx context.Context, st composed.State) (error, context. errorMsg := "Error: redis instance is not loaded" logger.Error(errors.New(errorMsg), errorMsg) redisInstance := st.Obj().(*v1beta1.RedisInstance) - redisInstance.Status.State = cloudcontrolv1beta1.ErrorState + redisInstance.Status.State = cloudcontrolv1beta1.StateError return composed.UpdateStatus(redisInstance). SetExclusiveConditions(metav1.Condition{ Type: v1beta1.ConditionTypeError, diff --git a/pkg/kcp/provider/gcp/redisinstance/waitRedisDeleted.go b/pkg/kcp/provider/gcp/redisinstance/waitRedisDeleted.go index f929bd41d..86da8a273 100644 --- a/pkg/kcp/provider/gcp/redisinstance/waitRedisDeleted.go +++ b/pkg/kcp/provider/gcp/redisinstance/waitRedisDeleted.go @@ -24,7 +24,7 @@ func waitRedisDeleted(ctx context.Context, st composed.State) (error, context.Co errorMsg := "Error: unexpected gcp redis state" logger.Error(errors.New(errorMsg), errorMsg) redisInstance := st.Obj().(*v1beta1.RedisInstance) - redisInstance.Status.State = cloudcontrolv1beta1.ErrorState + redisInstance.Status.State = cloudcontrolv1beta1.StateError return composed.UpdateStatus(redisInstance). SetExclusiveConditions(metav1.Condition{ Type: v1beta1.ConditionTypeError, diff --git a/pkg/kcp/provider/gcp/vpcpeering/loadKymaNetwork.go b/pkg/kcp/provider/gcp/vpcpeering/loadKymaNetwork.go index 9358c72ec..5b20ad4fd 100644 --- a/pkg/kcp/provider/gcp/vpcpeering/loadKymaNetwork.go +++ b/pkg/kcp/provider/gcp/vpcpeering/loadKymaNetwork.go @@ -37,7 +37,7 @@ func loadKymaNetwork(ctx context.Context, st composed.State) (error, context.Con } if apierrors.IsNotFound(err) { - state.ObjAsVpcPeering().Status.State = string(cloudcontrolv1beta1.ErrorState) + state.ObjAsVpcPeering().Status.State = string(cloudcontrolv1beta1.StateError) return composed.PatchStatus(state.ObjAsVpcPeering()). SetExclusiveConditions(metav1.Condition{ Type: cloudcontrolv1beta1.ConditionTypeError, @@ -54,7 +54,7 @@ func loadKymaNetwork(ctx context.Context, st composed.State) (error, context.Con isNetworkReady := meta.IsStatusConditionTrue(ptr.Deref(network.Conditions(), []metav1.Condition{}), cloudcontrolv1beta1.ConditionTypeReady) isNetworkDefined := network.Status.Network != nil if !isNetworkDefined || !isNetworkReady && !composed.IsMarkedForDeletion(state.ObjAsVpcPeering()) { - state.ObjAsVpcPeering().Status.State = string(cloudcontrolv1beta1.ErrorState) + state.ObjAsVpcPeering().Status.State = string(cloudcontrolv1beta1.StateError) return composed.PatchStatus(state.ObjAsVpcPeering()). SetExclusiveConditions(metav1.Condition{ Type: cloudcontrolv1beta1.ConditionTypeError, diff --git a/pkg/kcp/provider/gcp/vpcpeering/loadRemoteNetwork.go b/pkg/kcp/provider/gcp/vpcpeering/loadRemoteNetwork.go index 184013354..007d1ae6d 100644 --- a/pkg/kcp/provider/gcp/vpcpeering/loadRemoteNetwork.go +++ b/pkg/kcp/provider/gcp/vpcpeering/loadRemoteNetwork.go @@ -39,7 +39,7 @@ func loadRemoteNetwork(ctx context.Context, st composed.State) (error, context.C return nil, nil } - state.ObjAsVpcPeering().Status.State = string(cloudcontrolv1beta1.ErrorState) + state.ObjAsVpcPeering().Status.State = string(cloudcontrolv1beta1.StateError) return composed.PatchStatus(state.ObjAsVpcPeering()). SetExclusiveConditions(metav1.Condition{ Type: cloudcontrolv1beta1.ConditionTypeError, @@ -61,7 +61,7 @@ func loadRemoteNetwork(ctx context.Context, st composed.State) (error, context.C } logger.Info("[KCP GCP VPCPeering loadRemoteNetwork] GCP KCP VpcPeering Remote Network didn't reach ready state after 10 minutes, setting error state") - state.ObjAsVpcPeering().Status.State = string(cloudcontrolv1beta1.ErrorState) + state.ObjAsVpcPeering().Status.State = string(cloudcontrolv1beta1.StateError) return composed.PatchStatus(state.ObjAsVpcPeering()). SetExclusiveConditions(metav1.Condition{ Type: cloudcontrolv1beta1.ConditionTypeError, diff --git a/pkg/kcp/scope/addReadyCondition.go b/pkg/kcp/scope/addReadyCondition.go index 763572202..405ebea23 100644 --- a/pkg/kcp/scope/addReadyCondition.go +++ b/pkg/kcp/scope/addReadyCondition.go @@ -2,6 +2,7 @@ package scope import ( "context" + cloudcontrolv1beta1 "github.com/kyma-project/cloud-manager/api/cloud-control/v1beta1" "github.com/kyma-project/cloud-manager/pkg/composed" "k8s.io/apimachinery/pkg/api/meta" @@ -13,8 +14,8 @@ func addReadyCondition(ctx context.Context, st composed.State) (error, context.C changed := false - if state.ObjAsScope().Status.State != cloudcontrolv1beta1.ReadyState { - state.ObjAsScope().Status.State = cloudcontrolv1beta1.ReadyState + if state.ObjAsScope().Status.State != cloudcontrolv1beta1.StateReady { + state.ObjAsScope().Status.State = cloudcontrolv1beta1.StateReady changed = true } From 4152b37e240025f58704cd69bda161186d5999a3 Mon Sep 17 00:00:00 2001 From: Vladimir Andjelkoski Date: Fri, 13 Dec 2024 15:03:50 +0100 Subject: [PATCH 5/5] docs(AzureVpcPeering): updating documentation --- docs/user/resources/04-30-30-azure-vpc-peering.md | 4 ++-- docs/user/tutorials/01-30-30-azure-vpc-peering.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/user/resources/04-30-30-azure-vpc-peering.md b/docs/user/resources/04-30-30-azure-vpc-peering.md index 8c9fdeb48..58d7e39dc 100644 --- a/docs/user/resources/04-30-30-azure-vpc-peering.md +++ b/docs/user/resources/04-30-30-azure-vpc-peering.md @@ -1,8 +1,8 @@ # AzureVpcPeering Custom Resource The `azurevpcpeering.cloud-resources.kyma-project.io` custom resource (CR) specifies the virtual network peering between -Kyma and the remote Azure Virtual Private Cloud (VPC) network. Virtual network peering is only possible within the networks -of the same cloud provider. +Kyma and the remote Azure Virtual Private Cloud (VPC) network. Virtual network peering is only possible within Azure +networks whose subscriptions are sharing the same tenant determined by the Kyma underlying cloud provider subscription. Once an `AzureVpcPeering` CR is created and reconciled, the Cloud Manager controller creates a VPC peering connection in the VPC network of the Kyma cluster in the underlying cloud provider subscription, and accepts a VPC peering connection in diff --git a/docs/user/tutorials/01-30-30-azure-vpc-peering.md b/docs/user/tutorials/01-30-30-azure-vpc-peering.md index 9d497a663..d3a58a164 100644 --- a/docs/user/tutorials/01-30-30-azure-vpc-peering.md +++ b/docs/user/tutorials/01-30-30-azure-vpc-peering.md @@ -20,7 +20,7 @@ This tutorial explains how to create a Virtual Private Cloud (VPC) peering conne ```shell export SUBSCRIPTION_ID=$(az account show --query id -o tsv) - export PRINCIPAL_NAME=kyma-cloud-manager-peering-dev + export PRINCIPAL_NAME=kyma-cloud-manager-peering-stage export OBJECT_ID=$(az ad sp list --display-name $PRINCIPAL_NAME --query "[].id" -o tsv) az role assignment create --assignee $OBJECT_ID \