chore(GCP Vpc Peering) setting "Deleting" state to the peering object (#712)

bru-jer-work · web-flow · commit ba6a5cecdfb7 · 2024-10-14T11:17:06.000+02:00
diff --git a/api/cloud-control/v1beta1/vpcpeering_types.go b/api/cloud-control/v1beta1/vpcpeering_types.go
@@ -34,6 +34,7 @@ const (
 	VirtualNetworkPeeringStateConnected    = "Connected"
 	VirtualNetworkPeeringStateDisconnected = "Disconnected"
 	VirtualNetworkPeeringStateInitiated    = "Initiated"
+	VirtualNetworkPeeringStateDeleting     = "Deleting"
 )
 
 // VpcPeeringSpec defines the desired state of VpcPeering
diff --git a/config/dist/skr/crd/bases/providers/gcp/cloud-resources.kyma-project.io_gcpvpcpeerings_ui.yaml b/config/dist/skr/crd/bases/providers/gcp/cloud-resources.kyma-project.io_gcpvpcpeerings_ui.yaml
@@ -81,6 +81,8 @@ data:
          - Initiated
         critical:
          - Disconnected
+        warning:
+         - Deleting
   translations: |-
     en:
       configuration: Configuration
diff --git a/config/ui-extensions/gcpvpcpeerings/cloud-resources.kyma-project.io_gcpvpcpeerings_ui.yaml b/config/ui-extensions/gcpvpcpeerings/cloud-resources.kyma-project.io_gcpvpcpeerings_ui.yaml
@@ -81,6 +81,8 @@ data:
          - Initiated
         critical:
          - Disconnected
+        warning:
+         - Deleting
   translations: |-
     en:
       configuration: Configuration
diff --git a/config/ui-extensions/gcpvpcpeerings/list b/config/ui-extensions/gcpvpcpeerings/list
@@ -20,4 +20,6 @@
     warning:
      - Initiated
     critical:
-     - Disconnected
+     - Disconnected
+    warning:
+     - Deleting
diff --git a/pkg/skr/gcpvpcpeering/deleteKcpVpcPeering.go b/pkg/skr/gcpvpcpeering/deleteKcpVpcPeering.go
@@ -2,6 +2,7 @@ package gcpvpcpeering
 
 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"
 )
@@ -31,6 +32,10 @@ func deleteKcpVpcPeering(ctx context.Context, st composed.State) (error, context
 		return composed.LogErrorAndReturn(err, "Error deleting KCP VpcPeering", composed.StopWithRequeue, ctx)
 	}
 
-	// waiting for the VpcPeering to be deleted
-	return composed.StopWithRequeueDelay(util.Timing.T10000ms()), nil
+	state.ObjAsGcpVpcPeering().Status.State = cloudcontrolv1beta1.VirtualNetworkPeeringStateDeleting
+	return composed.PatchStatus(state.ObjAsGcpVpcPeering()).
+		ErrorLogMessage("[SKR GCP VPCPeering deleteKcpVpcPeering] Error patching status").
+		FailedError(composed.StopWithRequeue).
+		SuccessError(composed.StopWithRequeueDelay(util.Timing.T10000ms())).
+		Run(ctx, state)
 }

Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,7 @@ const (`
`34`	`34`	`VirtualNetworkPeeringStateConnected = "Connected"`
`35`	`35`	`VirtualNetworkPeeringStateDisconnected = "Disconnected"`
`36`	`36`	`VirtualNetworkPeeringStateInitiated = "Initiated"`
	`37`	`+ VirtualNetworkPeeringStateDeleting = "Deleting"`
`37`	`38`	`)`
`38`	`39`
`39`	`40`	`// VpcPeeringSpec defines the desired state of VpcPeering`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@ package gcpvpcpeering`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"context"`
	`5`	`+ cloudcontrolv1beta1 "github.com/kyma-project/cloud-manager/api/cloud-control/v1beta1"`
`5`	`6`	`"github.com/kyma-project/cloud-manager/pkg/composed"`
`6`	`7`	`"github.com/kyma-project/cloud-manager/pkg/util"`
`7`	`8`	`)`
`@@ -31,6 +32,10 @@ func deleteKcpVpcPeering(ctx context.Context, st composed.State) (error, context`
`31`	`32`	`return composed.LogErrorAndReturn(err, "Error deleting KCP VpcPeering", composed.StopWithRequeue, ctx)`
`32`	`33`	`}`
`33`	`34`
`34`		`- // waiting for the VpcPeering to be deleted`
`35`		`- return composed.StopWithRequeueDelay(util.Timing.T10000ms()), nil`
	`35`	`+ state.ObjAsGcpVpcPeering().Status.State = cloudcontrolv1beta1.VirtualNetworkPeeringStateDeleting`
	`36`	`+ return composed.PatchStatus(state.ObjAsGcpVpcPeering()).`
	`37`	`+ ErrorLogMessage("[SKR GCP VPCPeering deleteKcpVpcPeering] Error patching status").`
	`38`	`+ FailedError(composed.StopWithRequeue).`
	`39`	`+ SuccessError(composed.StopWithRequeueDelay(util.Timing.T10000ms())).`
	`40`	`+ Run(ctx, state)`
`36`	`41`	`}`