Skip to content

Commit be2cc73

Browse files
authored
fix: use default when namespace is unset (#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]>
1 parent da539ba commit be2cc73

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

internal/provider/kubernetes/controller.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2490,7 +2490,8 @@ func (r *gatewayAPIReconciler) processGatewayClassParamsRef(ctx context.Context,
24902490
}
24912491

24922492
ep := new(egv1a1.EnvoyProxy)
2493-
nn := types.NamespacedName{Namespace: string(*gc.Spec.ParametersRef.Namespace), Name: gc.Spec.ParametersRef.Name}
2493+
ns := ptr.Deref(gc.Spec.ParametersRef.Namespace, "default")
2494+
nn := types.NamespacedName{Namespace: string(ns), Name: gc.Spec.ParametersRef.Name}
24942495
if err := r.client.Get(ctx, nn, ep); err != nil {
24952496
return fmt.Errorf("failed to find envoyproxy %s/%s for GatewayClass %s: %w", nn.Namespace, nn.Name, gc.Name, err)
24962497
}

internal/provider/kubernetes/helpers.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import (
1212
corev1 "k8s.io/api/core/v1"
1313
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1414
"k8s.io/apimachinery/pkg/types"
15+
"k8s.io/utils/ptr"
1516
"sigs.k8s.io/controller-runtime/pkg/client"
1617
gwapiv1 "sigs.k8s.io/gateway-api/apis/v1"
1718
mcsapiv1a1 "sigs.k8s.io/mcs-api/pkg/apis/v1alpha1"
@@ -141,8 +142,9 @@ func classRefsEnvoyProxy(gc *gwapiv1.GatewayClass, ep *egv1a1.EnvoyProxy) bool {
141142
return false
142143
}
143144

145+
ns := ptr.Deref(gc.Spec.ParametersRef.Namespace, "default")
144146
return refsEnvoyProxy(gc) &&
145-
string(*gc.Spec.ParametersRef.Namespace) == ep.Namespace &&
147+
string(ns) == ep.Namespace &&
146148
gc.Spec.ParametersRef.Name == ep.Name
147149
}
148150

@@ -155,7 +157,6 @@ func refsEnvoyProxy(gc *gwapiv1.GatewayClass) bool {
155157
return gc.Spec.ParametersRef != nil &&
156158
string(gc.Spec.ParametersRef.Group) == egv1a1.GroupVersion.Group &&
157159
gc.Spec.ParametersRef.Kind == egv1a1.KindEnvoyProxy &&
158-
gc.Spec.ParametersRef.Namespace != nil &&
159160
len(gc.Spec.ParametersRef.Name) > 0
160161
}
161162

internal/provider/kubernetes/helpers_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ func TestRefsEnvoyProxy(t *testing.T) {
355355
},
356356
},
357357
},
358-
expect: false,
358+
expect: true,
359359
},
360360
}
361361

0 commit comments

Comments
 (0)