webnet/tailscale
1
0
Fork 0
Code Issues Pull Requests 4 Packages Projects Releases Wiki Activity

cmd/k8s-operator: remove early return in ingress matching (#17841)

Browse Source 
Fixes #17834

Signed-off-by: Sachin Iyer <siyer@detail.dev>
This commit is contained in:
Sachin Iyer
2025-11-12 02:46:40 -08:00
committed by GitHub
parent 85cb64c4ff
commit d37884c734
2 changed files with 37 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/k8s-operator/operator_test.go
+36
View File
@@ -1698,6 +1698,42 @@ func Test_serviceHandlerForIngress(t *testing.T) {
}
}
func Test_serviceHandlerForIngress_multipleIngressClasses(t *testing.T) {
fc := fake.NewFakeClient()
zl, err := zap.NewDevelopment()
if err != nil {
t.Fatal(err)
}
svc := &corev1.Service{
ObjectMeta: metav1.ObjectMeta{Name: "backend", Namespace: "default"},
}
mustCreate(t, fc, svc)
mustCreate(t, fc, &networkingv1.Ingress{
ObjectMeta: metav1.ObjectMeta{Name: "nginx-ing", Namespace: "default"},
Spec: networkingv1.IngressSpec{
IngressClassName: ptr.To("nginx"),
DefaultBackend: &networkingv1.IngressBackend{Service: &networkingv1.IngressServiceBackend{Name: "backend"}},
},
})
mustCreate(t, fc, &networkingv1.Ingress{
ObjectMeta: metav1.ObjectMeta{Name: "ts-ing", Namespace: "default"},
Spec: networkingv1.IngressSpec{
IngressClassName: ptr.To("tailscale"),
DefaultBackend: &networkingv1.IngressBackend{Service: &networkingv1.IngressServiceBackend{Name: "backend"}},
},
})
got := serviceHandlerForIngress(fc, zl.Sugar(), "tailscale")(context.Background(), svc)
want := []reconcile.Request{{NamespacedName: types.NamespacedName{Namespace: "default", Name: "ts-ing"}}}
if diff := cmp.Diff(got, want); diff != "" {
t.Fatalf("unexpected reconcile requests (-got +want):\n%s", diff)
}
}
func Test_clusterDomainFromResolverConf(t *testing.T) {
zl, err := zap.NewDevelopment()
if err != nil {