TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-08-11 21:27:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

cmd/k8s-operator: add matching family addresses to status

Browse Source 
This was added in 3451b89e5f, but
resulted in the v6 Tailscale address being added to status when
when the forwarding only happened on the v4 address.

Updates #502

Signed-off-by: Maisem Ali <maisem@tailscale.com>
This commit is contained in:
Maisem Ali
2023-08-28 12:56:44 -07:00
committed by Maisem Ali
parent f92e6a1be8
commit 0c6fe94cf4
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cmd/k8s-operator/operator_test.go
View File

@@ -108,9 +108,6 @@ func TestLoadBalancerClass(t *testing.T) {
{ {
IP: "100.99.98.97", IP: "100.99.98.97",
}, },
{
IP: "2c0a:8083:94d4:2012:3165:34a5:3616:5fdf",
},
}, },
}, },
}, },
@@ -375,9 +372,6 @@ func TestAnnotationIntoLB(t *testing.T) {
{ {
IP: "100.99.98.97", IP: "100.99.98.97",
}, },
{
IP: "2c0a:8083:94d4:2012:3165:34a5:3616:5fdf",
},
}, },
}, },
}, },
@@ -467,9 +461,6 @@ func TestLBIntoAnnotation(t *testing.T) {
{ {
IP: "100.99.98.97", IP: "100.99.98.97",
}, },
{
IP: "2c0a:8083:94d4:2012:3165:34a5:3616:5fdf",
},
}, },
}, },
}, },

14
cmd/k8s-operator/svc.go
View File

@@ -8,6 +8,7 @@ package main
import ( import (
"context" "context"
"fmt" "fmt"
"net/netip"
"strings" "strings"
"go.uber.org/zap" "go.uber.org/zap"
@@ -121,6 +122,11 @@ func (a *ServiceReconciler) maybeProvision(ctx context.Context, logger *zap.Suga
tags = strings.Split(tstr, ",") tags = strings.Split(tstr, ",")
} }
clusterIPAddr, err := netip.ParseAddr(svc.Spec.ClusterIP)
if err != nil {
return fmt.Errorf("failed to parse cluster IP: %w", err)
}
sts := &tailscaleSTSConfig{ sts := &tailscaleSTSConfig{
ParentResourceName: svc.Name, ParentResourceName: svc.Name,
ParentResourceUID: string(svc.UID), ParentResourceUID: string(svc.UID),
@@ -158,7 +164,13 @@ func (a *ServiceReconciler) maybeProvision(ctx context.Context, logger *zap.Suga
{Hostname: tsHost}, {Hostname: tsHost},
} }
for _, ip := range tsIPs { for _, ip := range tsIPs {
ingress = append(ingress, corev1.LoadBalancerIngress{IP: ip}) addr, err := netip.ParseAddr(ip)
if err != nil {
continue
}
if addr.Is4() == clusterIPAddr.Is4() { // only add addresses of the same family
ingress = append(ingress, corev1.LoadBalancerIngress{IP: ip})
}
} }
svc.Status.LoadBalancer.Ingress = ingress svc.Status.LoadBalancer.Ingress = ingress
if err := a.Status().Update(ctx, svc); err != nil { if err := a.Status().Update(ctx, svc); err != nil {