Merge branch origin/release-v2-dev

Author: dspo

internal/controller/gateway_controller.go

@@ -277,20 +277,22 @@ func (r *GatewayReconciler) listGatewaysForHTTPRoute(_ context.Context, obj clie
 
 func (r *GatewayReconciler) processInfrastructure(tctx *provider.TranslateContext, gateway *gatewayv1.Gateway, ns string) error {
 	infra := gateway.Spec.Infrastructure
-	if infra != nil && infra.ParametersRef != nil {
-		paramRef := infra.ParametersRef
-		if string(paramRef.Group) == v1alpha1.GroupVersion.Group && string(paramRef.Kind) == "GatewayProxy" {
-			gatewayProxy := &v1alpha1.GatewayProxy{}
-			if err := r.Get(context.Background(), client.ObjectKey{
-				Namespace: ns,
-				Name:      paramRef.Name,
-			}, gatewayProxy); err != nil {
-				log.Error(err, "failed to get GatewayProxy", "namespace", ns, "name", paramRef.Name)
-				return err
-			} else {
-				log.Info("found GatewayProxy for Gateway", "gateway", gateway.Name, "gatewayproxy", gatewayProxy.Name)
-				tctx.GatewayProxy = gatewayProxy
-			}
+	if infra == nil || infra.ParametersRef == nil {
+		return nil
+	}
+
+	paramRef := infra.ParametersRef
+	if string(paramRef.Group) == v1alpha1.GroupVersion.Group && string(paramRef.Kind) == "GatewayProxy" {
+		gatewayProxy := &v1alpha1.GatewayProxy{}
+		if err := r.Get(context.Background(), client.ObjectKey{
+			Namespace: ns,
+			Name:      paramRef.Name,
+		}, gatewayProxy); err != nil {
+			log.Error(err, "failed to get GatewayProxy", "namespace", ns, "name", paramRef.Name)
+			return err
+		} else {
+			log.Info("found GatewayProxy for Gateway", "gateway", gateway.Name, "gatewayproxy", gatewayProxy.Name)
+			tctx.GatewayProxy = gatewayProxy
 		}
 	}
 

internal/provider/adc/adc.go

@@ -131,10 +131,7 @@ func (d *adcClient) sync(task Task, extraArgs ...string) error {
 		"-f", tmpFile.Name(),
 		"--tls-skip-verify",
 	}
-
-	if len(extraArgs) > 0 {
-		args = append(args, extraArgs...)
-	}
+	args = append(args, extraArgs...)
 
 	for k, v := range task.Labels {
 		args = append(args, "--label-selector", k+"="+v)

test/e2e/gatewayapi/gatewayproxy.go

@@ -181,7 +181,7 @@ spec:
 	})
 
 	Context("Test Gateway with enabled GatewayProxy plugin", func() {
-		FIt("Should apply plugin configuration when enabled", func() {
+		It("Should apply plugin configuration when enabled", func() {
 			By("Create HTTPRoute for Gateway with GatewayProxy")
 			ResourceApplied("HTTPRoute", "test-route", fmt.Sprintf(httpRouteForTest, "api7"), 1)
 
@@ -193,11 +193,7 @@ spec:
 				Status(200)
 
 			resp.Header("X-Proxy-Test").IsEqual("enabled")
-		})
-	})
 
-	Context("Test Gateway with disabled GatewayProxy plugin", func() {
-		It("Should not apply plugin configuration when disabled", func() {
 			By("Update GatewayProxy with disabled plugin")
 			err := s.CreateResourceFromString(gatewayProxyWithDisabledPlugin)
 			Expect(err).NotTo(HaveOccurred(), "updating GatewayProxy with disabled plugin")
@@ -207,18 +203,28 @@ spec:
 			ResourceApplied("HTTPRoute", "test-route", fmt.Sprintf(httpRouteForTest, "api7"), 1)
 
 			By("Check if the plugin is not applied")
-			resp := s.NewAPISIXClient().
+			resp = s.NewAPISIXClient().
 				GET("/get").
 				WithHost("example.com").
 				Expect().
 				Status(200)
 
 			resp.Header("X-Proxy-Test").IsEmpty()
 		})
-	})
 
-	Context("Test Gateway without GatewayProxy", func() {
 		It("Should work normally without GatewayProxy", func() {
+			By("Create HTTPRoute for Gateway with GatewayProxy")
+			ResourceApplied("HTTPRoute", "test-route", fmt.Sprintf(httpRouteForTest, "api7"), 1)
+
+			By("Check if the plugin is applied")
+			resp := s.NewAPISIXClient().
+				GET("/get").
+				WithHost("example.com").
+				Expect().
+				Status(200)
+
+			resp.Header("X-Proxy-Test").IsEqual("enabled")
+
 			By("Update Gateway without GatewayProxy")
 			err := s.CreateResourceFromString(fmt.Sprintf(gatewayWithoutProxy, gatewayClassName))
 			Expect(err).NotTo(HaveOccurred(), "updating Gateway without GatewayProxy")
@@ -228,7 +234,7 @@ spec:
 			ResourceApplied("HTTPRoute", "test-route", fmt.Sprintf(httpRouteForTest, "api7"), 1)
 
 			By("Check if the route works without plugin")
-			resp := s.NewAPISIXClient().
+			resp = s.NewAPISIXClient().
 				GET("/get").
 				WithHost("example.com").
 				Expect().
@@ -243,7 +249,7 @@ spec:
 			err error
 		)
 
-		FIt("Should work OK with error-page", func() {
+		It("Should work OK with error-page", func() {
 			By("Update GatewayProxy with PluginMetadata")
 			err = s.CreateResourceFromString(gatewayProxyWithPluginMetadata)
 			Ω(err).ShouldNot(HaveOccurred())