fix: use default when namespace is unset (envoyproxy#7612)

* fix: use default when namespace is unset

Signed-off-by: zirain <[email protected]>

* fix

Signed-off-by: zirain <[email protected]>

* fix test

Signed-off-by: zirain <[email protected]>

---------

Signed-off-by: zirain <[email protected]>
Signed-off-by: jukie <[email protected]>

Author: zirain

internal/provider/kubernetes/controller.go

@@ -2444,8 +2444,10 @@ func (r *gatewayAPIReconciler) processGatewayClassParamsRef(ctx context.Context,
 	}
 
 	ep := new(egv1a1.EnvoyProxy)
-	if err := r.client.Get(ctx, types.NamespacedName{Namespace: string(*gc.Spec.ParametersRef.Namespace), Name: gc.Spec.ParametersRef.Name}, ep); err != nil {
-		return fmt.Errorf("failed to find envoyproxy %s/%s: %w", r.namespace, gc.Spec.ParametersRef.Name, err)
+	ns := ptr.Deref(gc.Spec.ParametersRef.Namespace, "default")
+	nn := types.NamespacedName{Namespace: string(ns), Name: gc.Spec.ParametersRef.Name}
+	if err := r.client.Get(ctx, nn, ep); err != nil {
+		return fmt.Errorf("failed to find envoyproxy %s/%s for GatewayClass %s: %w", nn.Namespace, nn.Name, gc.Name, err)
 	}
 
 	// Check for incompatible configuration: both MergeGateways and GatewayNamespaceMode enabled

internal/provider/kubernetes/helpers.go

@@ -12,6 +12,7 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
+	"k8s.io/utils/ptr"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	gwapiv1 "sigs.k8s.io/gateway-api/apis/v1"
 	mcsapiv1a1 "sigs.k8s.io/mcs-api/pkg/apis/v1alpha1"
@@ -170,8 +171,9 @@ func classRefsEnvoyProxy(gc *gwapiv1.GatewayClass, ep *egv1a1.EnvoyProxy) bool {
 		return false
 	}
 
+	ns := ptr.Deref(gc.Spec.ParametersRef.Namespace, "default")
 	return refsEnvoyProxy(gc) &&
-		string(*gc.Spec.ParametersRef.Namespace) == ep.Namespace &&
+		string(ns) == ep.Namespace &&
 		gc.Spec.ParametersRef.Name == ep.Name
 }
 
@@ -184,7 +186,6 @@ func refsEnvoyProxy(gc *gwapiv1.GatewayClass) bool {
 	return gc.Spec.ParametersRef != nil &&
 		string(gc.Spec.ParametersRef.Group) == egv1a1.GroupVersion.Group &&
 		gc.Spec.ParametersRef.Kind == egv1a1.KindEnvoyProxy &&
-		gc.Spec.ParametersRef.Namespace != nil &&
 		len(gc.Spec.ParametersRef.Name) > 0
 }
 

internal/provider/kubernetes/helpers_test.go

@@ -326,7 +326,7 @@ func TestRefsEnvoyProxy(t *testing.T) {
 					},
 				},
 			},
-			expect: false,
+			expect: true,
 		},
 	}