cmd/k8s-operator, net/netutil: revert 4via6 changes (#19990)

Reverts support 4via6 in egress proxy and connector (#19863)

Updates #19334

Signed-off-by: Becky Pauley <becky@tailscale.com>
This commit is contained in:
BeckyPauley
2026-06-03 20:20:36 +01:00
committed by GitHub
parent cdcb1cb07b
commit 98f1ac0880
4 changed files with 3 additions and 79 deletions
+2 -2
View File
@@ -17,7 +17,7 @@ import (
// It verifies that the prefix is in the Tailscale via range, has a prefix
// length between /96 and /128, and that the embedded site ID is in the
// range 065535.
func ValidateViaPrefix(ipp netip.Prefix) error {
func validateViaPrefix(ipp netip.Prefix) error {
if !tsaddr.IsViaPrefix(ipp) {
return fmt.Errorf("%v is not a 4-in-6 prefix", ipp)
}
@@ -55,7 +55,7 @@ func CalcAdvertiseRoutes(advertiseRoutes string, advertiseDefaultRoute bool) ([]
return nil, fmt.Errorf("%s has non-address bits set; expected %s", ipp, ipp.Masked())
}
if tsaddr.IsViaPrefix(ipp) {
if err := ValidateViaPrefix(ipp); err != nil {
if err := validateViaPrefix(ipp); err != nil {
return nil, err
}
}