diff --git a/cmd/k8s-operator/sts.go b/cmd/k8s-operator/sts.go index 4d9417ac0..d2527da6f 100644 --- a/cmd/k8s-operator/sts.go +++ b/cmd/k8s-operator/sts.go @@ -29,7 +29,6 @@ "sigs.k8s.io/yaml" "tailscale.com/client/tailscale" "tailscale.com/ipn" - kubeutils "tailscale.com/k8s-operator" tsoperator "tailscale.com/k8s-operator" tsapi "tailscale.com/k8s-operator/apis/v1alpha1" "tailscale.com/net/netutil" @@ -346,7 +345,7 @@ func (a *tailscaleSTSReconciler) createOrGetSecret(ctx context.Context, logger * latest := tailcfg.CapabilityVersion(-1) var latestConfig ipn.ConfigVAlpha for key, val := range configs { - fn := kubeutils.TailscaledConfigFileNameForCap(key) + fn := tsoperator.TailscaledConfigFileNameForCap(key) b, err := json.Marshal(val) if err != nil { return "", "", nil, fmt.Errorf("error marshalling tailscaled config: %w", err) @@ -776,7 +775,7 @@ func tailscaledConfig(stsC *tailscaleSTSConfig, newAuthkey string, oldSecret *co if len(data) == 0 { continue } - v, err := kubeutils.CapVerFromFileName(k) + v, err := tsoperator.CapVerFromFileName(k) if err != nil { continue } diff --git a/ipn/ipnlocal/local.go b/ipn/ipnlocal/local.go index 8f13f79d0..6483e5a60 100644 --- a/ipn/ipnlocal/local.go +++ b/ipn/ipnlocal/local.go @@ -404,10 +404,6 @@ func NewLocalBackend(logf logger.Logf, logID logid.PublicID, sys *tsd.System, lo } envknob.LogCurrent(logf) - if dialer == nil { - dialer = &tsdial.Dialer{Logf: logf} - } - osshare.SetFileSharingEnabled(false, logf) ctx, cancel := context.WithCancel(context.Background()) diff --git a/wgengine/netstack/netstack_userping_apple.go b/wgengine/netstack/netstack_userping_apple.go index 047cb72ba..52fb7a24a 100644 --- a/wgengine/netstack/netstack_userping_apple.go +++ b/wgengine/netstack/netstack_userping_apple.go @@ -9,7 +9,7 @@ "net/netip" "time" - "github.com/prometheus-community/pro-bing" + probing "github.com/prometheus-community/pro-bing" ) // sendOutboundUserPing sends a non-privileged ICMP (or ICMPv6) ping to dstIP with the given timeout.