feat(GCPVpcPeering) Delete VPC Peering

kyma-project · Aug 2, 2024 · d52c95b · d52c95b
1 parent b394223
commit d52c95b
Show file tree

Hide file tree

Showing 37 changed files with 663 additions and 312 deletions.
diff --git a/api/cloud-control/v1beta1/vpcpeering_types.go b/api/cloud-control/v1beta1/vpcpeering_types.go
@@ -55,7 +55,7 @@ type VpcPeeringInfo struct {
 }
 
 type GcpVpcPeering struct {
-	PeeringName        string `json:"peeringName,omitempty"`
+	RemotePeeringName  string `json:"remotePeeringName,omitempty"`
 	RemoteProject      string `json:"remoteProject,omitempty"`
 	RemoteVpc          string `json:"remoteVpc,omitempty"`
 	ImportCustomRoutes bool   `json:"importCustomRoutes,omitempty"`

diff --git a/api/cloud-resources/v1beta1/gcpvpcpeering_types.go b/api/cloud-resources/v1beta1/gcpvpcpeering_types.go
@@ -9,10 +9,18 @@ import (
 // Important: Run "make" to regenerate code after modifying this file
 
 type GcpVpcPeeringSpec struct {
-	ImportCustomRoutes bool   `json:"importCustomRoutes,omitempty"`
-	PeeringName        string `json:"peeringName,omitempty"`
-	RemoteVpc          string `json:"remoteVpc,omitempty"`
-	RemoteProject      string `json:"remoteProject,omitempty"`
+	// +kubebuilder:validation:Required
+	// +kubebuilder:validation:XValidation:rule=(self == oldSelf), message="ImportCustomRoutes is immutable."
+	ImportCustomRoutes bool `json:"importCustomRoutes,omitempty"`
+	// +kubebuilder:validation:Required
+	// +kubebuilder:validation:XValidation:rule=(self == oldSelf), message="RemotePeeringName is immutable."
+	RemotePeeringName string `json:"remotePeeringName,omitempty"`
+	// +kubebuilder:validation:Required
+	// +kubebuilder:validation:XValidation:rule=(self == oldSelf), message="RemoteVpc is immutable."
+	RemoteVpc string `json:"remoteVpc,omitempty"`
+	// +kubebuilder:validation:Required
+	// +kubebuilder:validation:XValidation:rule=(self == oldSelf), message="RemoteNetwork is immutable."
+	RemoteProject string `json:"remoteProject,omitempty"`
 }
 
 type GcpVpcPeeringStatus struct {

diff --git a/config/crd/bases/cloud-control.kyma-project.io_vpcpeerings.yaml b/config/crd/bases/cloud-control.kyma-project.io_vpcpeerings.yaml
@@ -80,7 +80,7 @@ spec:
                     properties:
                       importCustomRoutes:
                         type: boolean
-                      peeringName:
+                      remotePeeringName:
                         type: string
                       remoteProject:
                         type: string

diff --git a/config/crd/bases/cloud-resources.kyma-project.io_gcpvpcpeerings.yaml b/config/crd/bases/cloud-resources.kyma-project.io_gcpvpcpeerings.yaml
@@ -34,12 +34,24 @@ spec:
             properties:
               importCustomRoutes:
                 type: boolean
-              peeringName:
+                x-kubernetes-validations:
+                - message: ImportCustomRoutes is immutable.
+                  rule: (self == oldSelf)
+              remotePeeringName:
                 type: string
+                x-kubernetes-validations:
+                - message: RemotePeeringName is immutable.
+                  rule: (self == oldSelf)
               remoteProject:
                 type: string
+                x-kubernetes-validations:
+                - message: RemoteNetwork is immutable.
+                  rule: (self == oldSelf)
               remoteVpc:
                 type: string
+                x-kubernetes-validations:
+                - message: RemoteVpc is immutable.
+                  rule: (self == oldSelf)
             type: object
           status:
             properties:

diff --git a/config/dist/kcp/crd/bases/cloud-control.kyma-project.io_vpcpeerings.yaml b/config/dist/kcp/crd/bases/cloud-control.kyma-project.io_vpcpeerings.yaml
@@ -80,7 +80,7 @@ spec:
                     properties:
                       importCustomRoutes:
                         type: boolean
-                      peeringName:
+                      remotePeeringName:
                         type: string
                       remoteProject:
                         type: string

diff --git a/config/dist/skr/crd/bases/providers/gcp/cloud-resources.kyma-project.io_gcpvpcpeerings.yaml b/config/dist/skr/crd/bases/providers/gcp/cloud-resources.kyma-project.io_gcpvpcpeerings.yaml
@@ -34,12 +34,24 @@ spec:
             properties:
               importCustomRoutes:
                 type: boolean
-              peeringName:
+                x-kubernetes-validations:
+                - message: ImportCustomRoutes is immutable.
+                  rule: (self == oldSelf)
+              remotePeeringName:
                 type: string
+                x-kubernetes-validations:
+                - message: RemotePeeringName is immutable.
+                  rule: (self == oldSelf)
               remoteProject:
                 type: string
+                x-kubernetes-validations:
+                - message: RemoteNetwork is immutable.
+                  rule: (self == oldSelf)
               remoteVpc:
                 type: string
+                x-kubernetes-validations:
+                - message: RemoteVpc is immutable.
+                  rule: (self == oldSelf)
             type: object
           status:
             properties:

diff --git a/...g/dist/skr/crd/bases/providers/gcp/cloud-resources.kyma-project.io_gcpvpcpeerings_ui.yaml b/...g/dist/skr/crd/bases/providers/gcp/cloud-resources.kyma-project.io_gcpvpcpeerings_ui.yaml
@@ -10,8 +10,8 @@ data:
               source: importCustomRoutes
               name: spec.importCustomRoutes
             - widget: Labels
-              source: peeringName
-              name: spec.peeringName
+              source: remotePeeringName
+              name: spec.remotePeeringName
             - widget: Labels
               source: remoteProject
               name: spec.remoteProject
@@ -29,9 +29,9 @@ data:
     - path: spec.importCustomRoutes
       simple: true
       name: spec.importCustomRoutes
-    - path: spec.peeringName
+    - path: spec.remotePeeringName
       simple: true
-      name: spec.peeringName
+      name: spec.remotePeeringName
       widget: Text
     - path: spec.remoteProject
       simple: true
@@ -57,8 +57,8 @@ data:
     - source: spec.importCustomRoutes
       name: spec.importCustomRoutes
       sort: true
-    - source: spec.peeringName
-      name: spec.peeringName
+    - source: spec.remotePeeringName
+      name: spec.remotePeeringName
       sort: true
     - source: spec.remoteProject
       name: spec.remoteProject
@@ -71,7 +71,7 @@ data:
       configuration: Configuration
       status: Status
       spec.importCustomRoutes: Import Custom Routes
-      spec.peeringName: Peering Name
+      spec.remotePeeringName: Remote Peering Name
       spec.remoteProject: Remote Project
       spec.remoteVpc: Remote VPC
       status.id: ID

diff --git a/config/samples/cloud-resources_v1beta1_gcpvpcpeering.yaml b/config/samples/cloud-resources_v1beta1_gcpvpcpeering.yaml
@@ -9,7 +9,7 @@ metadata:
     app.kubernetes.io/created-by: cloud-manager
   name: gcpvpcpeering-sample
 spec:
-  name: "vpcpeering-sap-gcp-skr-dev-cust-00002-sap-sc-learn"
+  remotePeeringame: "vpcpeering-sap-gcp-skr-dev-cust-00002-sap-sc-learn"
   remoteProject: "sap-sc-learn"
   remoteVpc: "default"
   importCustomRoutes: false
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
@@ -10,8 +10,8 @@ data:
               source: importCustomRoutes
               name: spec.importCustomRoutes
             - widget: Labels
-              source: peeringName
-              name: spec.peeringName
+              source: remotePeeringName
+              name: spec.remotePeeringName
             - widget: Labels
               source: remoteProject
               name: spec.remoteProject
@@ -29,9 +29,9 @@ data:
     - path: spec.importCustomRoutes
       simple: true
       name: spec.importCustomRoutes
-    - path: spec.peeringName
+    - path: spec.remotePeeringName
       simple: true
-      name: spec.peeringName
+      name: spec.remotePeeringName
       widget: Text
     - path: spec.remoteProject
       simple: true
@@ -57,8 +57,8 @@ data:
     - source: spec.importCustomRoutes
       name: spec.importCustomRoutes
       sort: true
-    - source: spec.peeringName
-      name: spec.peeringName
+    - source: spec.remotePeeringName
+      name: spec.remotePeeringName
       sort: true
     - source: spec.remoteProject
       name: spec.remoteProject
@@ -71,7 +71,7 @@ data:
       configuration: Configuration
       status: Status
       spec.importCustomRoutes: Import Custom Routes
-      spec.peeringName: Peering Name
+      spec.remotePeeringName: Remote Peering Name
       spec.remoteProject: Remote Project
       spec.remoteVpc: Remote VPC
       status.id: ID

diff --git a/config/ui-extensions/gcpvpcpeerings/details b/config/ui-extensions/gcpvpcpeerings/details
@@ -7,8 +7,8 @@ body:
           source: importCustomRoutes
           name: spec.importCustomRoutes
         - widget: Labels
-          source: peeringName
-          name: spec.peeringName
+          source: remotePeeringName
+          name: spec.remotePeeringName
         - widget: Labels
           source: remoteProject
           name: spec.remoteProject

diff --git a/config/ui-extensions/gcpvpcpeerings/form b/config/ui-extensions/gcpvpcpeerings/form
@@ -1,9 +1,9 @@
 - path: spec.importCustomRoutes
   simple: true
   name: spec.importCustomRoutes
-- path: spec.peeringName
+- path: spec.remotePeeringName
   simple: true
-  name: spec.peeringName
+  name: spec.remotePeeringName
   widget: Text
 - path: spec.remoteProject
   simple: true

diff --git a/config/ui-extensions/gcpvpcpeerings/list b/config/ui-extensions/gcpvpcpeerings/list
@@ -1,8 +1,8 @@
 - source: spec.importCustomRoutes
   name: spec.importCustomRoutes
   sort: true
-- source: spec.peeringName
-  name: spec.peeringName
+- source: spec.remotePeeringName
+  name: spec.remotePeeringName
   sort: true
 - source: spec.remoteProject
   name: spec.remoteProject

diff --git a/config/ui-extensions/gcpvpcpeerings/translations b/config/ui-extensions/gcpvpcpeerings/translations
@@ -2,7 +2,7 @@ en:
   configuration: Configuration
   status: Status
   spec.importCustomRoutes: Import Custom Routes
-  spec.peeringName: Peering Name
+  spec.remotePeeringName: Remote Peering Name
   spec.remoteProject: Remote Project
   spec.remoteVpc: Remote VPC
   status.id: ID
diff --git a/internal/controller/cloud-control/vpcpeering_gcp_test.go b/internal/controller/cloud-control/vpcpeering_gcp_test.go
@@ -6,14 +6,13 @@ import (
 	. "github.com/kyma-project/cloud-manager/pkg/testinfra/dsl"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
-	"time"
 )
 
 var _ = Describe("Feature: KCP VpcPeering", func() {
 	It("Scenario: KCP GCP VpcPeering is created", func() {
 		const (
 			kymaName           = "57bc9639-d752-4f67-8b9e-7cd12514575f"
-			peeringName        = "peering-sap-gcp-skr-dev-cust-00002-to-sap-sc-learn"
+			remotePeeringName  = "peering-sap-gcp-skr-dev-cust-00002-to-sap-sc-learn"
 			remoteVpc          = "default"
 			remoteProject      = "sap-sc-learn"
 			remoteRefNamespace = "kcp-system"
@@ -37,10 +36,10 @@ var _ = Describe("Feature: KCP VpcPeering", func() {
 		By("When KCP VpcPeering is created", func() {
 			Eventually(CreateKcpVpcPeering).
 				WithArguments(infra.Ctx(), infra.KCP().Client(), vpcpeering,
-					WithName(peeringName),
+					WithName(remotePeeringName),
 					WithKcpVpcPeeringRemoteRef(remoteRefNamespace, remoteRefName),
 					WithKcpVpcPeeringSpecScope(kymaName),
-					WithKcpVpcPeeringSpecGCP(remoteVpc, remoteProject, peeringName, importCustomRoutes),
+					WithKcpVpcPeeringSpecGCP(remoteVpc, remoteProject, remotePeeringName, importCustomRoutes),
 				).
 				Should(Succeed())
 		})
@@ -59,13 +58,13 @@ var _ = Describe("Feature: KCP VpcPeering", func() {
 		By("When KCP VpcPeering is deleted", func() {
 			Eventually(Delete).
 				WithArguments(infra.Ctx(), infra.KCP().Client(), vpcpeering).
-				Should(Succeed(), "deleting VpcPeering failed")
+				Should(Succeed(), "Error deleting VPC Peering")
 		})
 
 		By("Then VpcPeering does not exist", func() {
-			Eventually(IsDeleted, 5*time.Second).
+			Eventually(IsDeleted).
 				WithArguments(infra.Ctx(), infra.KCP().Client(), vpcpeering).
-				Should(Succeed(), "expected VpcPeering does not to exist (being deleted), but it still exists")
+				Should(Succeed(), "VPC Peering was not deleted")
 		})
 
 	})