fix: r

Signed-off-by: Ashing Zheng <[email protected]>

Author: ronething

test/e2e/framework/manifests/webhook.yaml

@@ -146,8 +146,6 @@ webhooks:
         - gatewayproxies
   failurePolicy: Fail
   sideEffects: None
-<<<<<<< HEAD
-=======
 - name: vgrpcroute-v1.kb.io
   clientConfig:
     service:
@@ -190,7 +188,6 @@ webhooks:
         - httproutes
   failurePolicy: Fail
   sideEffects: None
->>>>>>> 501b4e89 (test: add e2e test case for webhook (#2585))
 - name: vingress-v1.kb.io
   clientConfig:
     service:
@@ -233,8 +230,6 @@ webhooks:
         - ingressclasses
   failurePolicy: Fail
   sideEffects: None
-<<<<<<< HEAD
-=======
 - name: vtcproute-v1alpha2.kb.io
   clientConfig:
     service:
@@ -256,4 +251,3 @@ webhooks:
         - tcproutes
   failurePolicy: Fail
   sideEffects: None
->>>>>>> 501b4e89 (test: add e2e test case for webhook (#2585))

test/e2e/webhook/gateway.go

@@ -93,188 +93,4 @@ spec:
 			Expect(err).ShouldNot(HaveOccurred())
 		})
 	})
-
-	Context("GatewayProxy configuration conflicts", func() {
-		It("should reject GatewayProxy that reuses the same Service and AdminKey Secret as an existing one on create and update", func() {
-			serviceTemplate := `
-apiVersion: v1
-kind: Service
-metadata:
-  name: %s
-spec:
-  selector:
-    app: dummy-control-plane
-  ports:
-  - name: admin
-    port: 9180
-    targetPort: 9180
-`
-			secretTemplate := `
-apiVersion: v1
-kind: Secret
-metadata:
-  name: %s
-type: Opaque
-stringData:
-  %s: %s
-`
-			gatewayProxyTemplate := `
-apiVersion: apisix.apache.org/v1alpha1
-kind: GatewayProxy
-metadata:
-  name: %s
-spec:
-  provider:
-    type: ControlPlane
-    controlPlane:
-      service:
-        name: %s
-        port: 9180
-      auth:
-        type: AdminKey
-        adminKey:
-          valueFrom:
-            secretKeyRef:
-              name: %s
-              key: token
-`
-
-			serviceName := "gatewayproxy-shared-service"
-			secretName := "gatewayproxy-shared-secret"
-			initialProxy := "gatewayproxy-shared-primary"
-			conflictingProxy := "gatewayproxy-shared-conflict"
-
-			Expect(s.CreateResourceFromString(fmt.Sprintf(serviceTemplate, serviceName))).ShouldNot(HaveOccurred(), "creating shared Service")
-			Expect(s.CreateResourceFromString(fmt.Sprintf(secretTemplate, secretName, "token", "value"))).ShouldNot(HaveOccurred(), "creating shared Secret")
-
-			err := s.CreateResourceFromString(fmt.Sprintf(gatewayProxyTemplate, initialProxy, serviceName, secretName))
-			Expect(err).ShouldNot(HaveOccurred(), "creating initial GatewayProxy")
-
-			time.Sleep(2 * time.Second)
-
-			err = s.CreateResourceFromString(fmt.Sprintf(gatewayProxyTemplate, conflictingProxy, serviceName, secretName))
-			Expect(err).Should(HaveOccurred(), "expecting conflict for duplicated GatewayProxy")
-			Expect(err.Error()).To(ContainSubstring("gateway proxy configuration conflict"))
-			Expect(err.Error()).To(ContainSubstring(fmt.Sprintf("%s/%s", s.Namespace(), conflictingProxy)))
-			Expect(err.Error()).To(ContainSubstring(fmt.Sprintf("%s/%s", s.Namespace(), initialProxy)))
-			Expect(err.Error()).To(ContainSubstring("Service"))
-			Expect(err.Error()).To(ContainSubstring("AdminKey secret"))
-
-			Expect(s.DeleteResource("GatewayProxy", initialProxy)).ShouldNot(HaveOccurred())
-			Expect(s.DeleteResource("Service", serviceName)).ShouldNot(HaveOccurred())
-			Expect(s.DeleteResource("Secret", secretName)).ShouldNot(HaveOccurred())
-		})
-
-		It("should reject GatewayProxy that overlaps endpoints when sharing inline AdminKey value", func() {
-			gatewayProxyTemplate := `
-apiVersion: apisix.apache.org/v1alpha1
-kind: GatewayProxy
-metadata:
-  name: %s
-spec:
-  provider:
-    type: ControlPlane
-    controlPlane:
-      endpoints:
-      - %s
-      - %s
-      auth:
-        type: AdminKey
-        adminKey:
-          value: "%s"
-`
-
-			existingProxy := "gatewayproxy-inline-primary"
-			conflictingProxy := "gatewayproxy-inline-conflict"
-			endpointA := "https://127.0.0.1:9443"
-			endpointB := "https://10.0.0.1:9443"
-			endpointC := "https://192.168.0.1:9443"
-			inlineKey := "inline-credential"
-
-			err := s.CreateResourceFromString(fmt.Sprintf(gatewayProxyTemplate, existingProxy, endpointA, endpointB, inlineKey))
-			Expect(err).ShouldNot(HaveOccurred(), "creating GatewayProxy with inline AdminKey")
-
-			time.Sleep(2 * time.Second)
-
-			err = s.CreateResourceFromString(fmt.Sprintf(gatewayProxyTemplate, conflictingProxy, endpointB, endpointC, inlineKey))
-			Expect(err).Should(HaveOccurred(), "expecting conflict for overlapping endpoints with shared AdminKey")
-			Expect(err.Error()).To(ContainSubstring("gateway proxy configuration conflict"))
-			Expect(err.Error()).To(ContainSubstring(fmt.Sprintf("%s/%s", s.Namespace(), conflictingProxy)))
-			Expect(err.Error()).To(ContainSubstring(fmt.Sprintf("%s/%s", s.Namespace(), existingProxy)))
-			Expect(err.Error()).To(ContainSubstring("control plane endpoints"))
-			Expect(err.Error()).To(ContainSubstring("inline AdminKey value"))
-		})
-
-		It("should reject GatewayProxy update that creates conflict with another GatewayProxy", func() {
-			serviceTemplate := `
-apiVersion: v1
-kind: Service
-metadata:
-  name: %s
-spec:
-  selector:
-    app: dummy-control-plane
-  ports:
-  - name: admin
-    port: 9180
-    targetPort: 9180
-`
-			secretTemplate := `
-apiVersion: v1
-kind: Secret
-metadata:
-  name: %s
-type: Opaque
-stringData:
-  %s: %s
-`
-			gatewayProxyTemplate := `
-apiVersion: apisix.apache.org/v1alpha1
-kind: GatewayProxy
-metadata:
-  name: %s
-spec:
-  provider:
-    type: ControlPlane
-    controlPlane:
-      service:
-        name: %s
-        port: 9180
-      auth:
-        type: AdminKey
-        adminKey:
-          valueFrom:
-            secretKeyRef:
-              name: %s
-              key: token
-`
-
-			sharedServiceName := "gatewayproxy-update-shared-service"
-			sharedSecretName := "gatewayproxy-update-shared-secret"
-			uniqueServiceName := "gatewayproxy-update-unique-service"
-			proxyA := "gatewayproxy-update-a"
-			proxyB := "gatewayproxy-update-b"
-
-			Expect(s.CreateResourceFromString(fmt.Sprintf(serviceTemplate, sharedServiceName))).ShouldNot(HaveOccurred(), "creating shared Service")
-			Expect(s.CreateResourceFromString(fmt.Sprintf(serviceTemplate, uniqueServiceName))).ShouldNot(HaveOccurred(), "creating unique Service")
-			Expect(s.CreateResourceFromString(fmt.Sprintf(secretTemplate, sharedSecretName, "token", "value"))).ShouldNot(HaveOccurred(), "creating shared Secret")
-
-			err := s.CreateResourceFromString(fmt.Sprintf(gatewayProxyTemplate, proxyA, sharedServiceName, sharedSecretName))
-			Expect(err).ShouldNot(HaveOccurred(), "creating GatewayProxy A with shared Service and Secret")
-
-			time.Sleep(2 * time.Second)
-
-			err = s.CreateResourceFromString(fmt.Sprintf(gatewayProxyTemplate, proxyB, uniqueServiceName, sharedSecretName))
-			Expect(err).ShouldNot(HaveOccurred(), "creating GatewayProxy B with unique Service but same Secret")
-
-			time.Sleep(2 * time.Second)
-
-			By("updating GatewayProxy B to use the same Service as GatewayProxy A, causing conflict")
-			err = s.CreateResourceFromString(fmt.Sprintf(gatewayProxyTemplate, proxyB, sharedServiceName, sharedSecretName))
-			Expect(err).Should(HaveOccurred(), "expecting conflict when updating to same Service")
-			Expect(err.Error()).To(ContainSubstring("gateway proxy configuration conflict"))
-			Expect(err.Error()).To(ContainSubstring(fmt.Sprintf("%s/%s", s.Namespace(), proxyA)))
-			Expect(err.Error()).To(ContainSubstring(fmt.Sprintf("%s/%s", s.Namespace(), proxyB)))
-		})
-	})
 })