diff --git a/cmd/containerboot/kube.go b/cmd/containerboot/kube.go index 251256293..ec2d3ef12 100644 --- a/cmd/containerboot/kube.go +++ b/cmd/containerboot/kube.go @@ -15,8 +15,8 @@ "net/netip" "os" - kubeapi "tailscale.com/kube/api" - kubeclient "tailscale.com/kube/client" + "tailscale.com/kube/kubeapi" + "tailscale.com/kube/kubeclient" "tailscale.com/tailcfg" ) diff --git a/cmd/containerboot/kube_test.go b/cmd/containerboot/kube_test.go index 1b9f9b3c8..1a5730548 100644 --- a/cmd/containerboot/kube_test.go +++ b/cmd/containerboot/kube_test.go @@ -11,8 +11,8 @@ "testing" "github.com/google/go-cmp/cmp" - kubeapi "tailscale.com/kube/api" - kubeclient "tailscale.com/kube/client" + "tailscale.com/kube/kubeapi" + "tailscale.com/kube/kubeclient" ) func TestSetupKube(t *testing.T) { diff --git a/cmd/derper/depaware.txt b/cmd/derper/depaware.txt index 184e2a373..2f6f160c8 100644 --- a/cmd/derper/depaware.txt +++ b/cmd/derper/depaware.txt @@ -99,7 +99,7 @@ tailscale.com/cmd/derper dependencies: (generated by github.com/tailscale/depawa tailscale.com/hostinfo from tailscale.com/net/netmon+ tailscale.com/ipn from tailscale.com/client/tailscale tailscale.com/ipn/ipnstate from tailscale.com/client/tailscale+ - tailscale.com/kube/types from tailscale.com/envknob + tailscale.com/kube/kubetypes from tailscale.com/envknob tailscale.com/metrics from tailscale.com/cmd/derper+ tailscale.com/net/dnscache from tailscale.com/derp/derphttp tailscale.com/net/ktimeout from tailscale.com/cmd/derper diff --git a/cmd/k8s-operator/connector.go b/cmd/k8s-operator/connector.go index 44136a8c4..016166b4c 100644 --- a/cmd/k8s-operator/connector.go +++ b/cmd/k8s-operator/connector.go @@ -26,7 +26,7 @@ "sigs.k8s.io/controller-runtime/pkg/reconcile" tsoperator "tailscale.com/k8s-operator" tsapi "tailscale.com/k8s-operator/apis/v1alpha1" - kubetypes "tailscale.com/kube/types" + "tailscale.com/kube/kubetypes" "tailscale.com/tstime" "tailscale.com/util/clientmetric" "tailscale.com/util/set" diff --git a/cmd/k8s-operator/connector_test.go b/cmd/k8s-operator/connector_test.go index 8143f25ac..01c60bc9e 100644 --- a/cmd/k8s-operator/connector_test.go +++ b/cmd/k8s-operator/connector_test.go @@ -16,7 +16,7 @@ "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client/fake" tsapi "tailscale.com/k8s-operator/apis/v1alpha1" - kubetypes "tailscale.com/kube/types" + "tailscale.com/kube/kubetypes" "tailscale.com/tstest" "tailscale.com/util/mak" ) diff --git a/cmd/k8s-operator/depaware.txt b/cmd/k8s-operator/depaware.txt index fde31f2af..9c0e8dd0e 100644 --- a/cmd/k8s-operator/depaware.txt +++ b/cmd/k8s-operator/depaware.txt @@ -690,9 +690,9 @@ tailscale.com/cmd/k8s-operator dependencies: (generated by github.com/tailscale/ tailscale.com/k8s-operator/sessionrecording/spdy from tailscale.com/k8s-operator/sessionrecording tailscale.com/k8s-operator/sessionrecording/tsrecorder from tailscale.com/k8s-operator/sessionrecording+ tailscale.com/k8s-operator/sessionrecording/ws from tailscale.com/k8s-operator/sessionrecording - tailscale.com/kube/api from tailscale.com/ipn/store/kubestore+ - tailscale.com/kube/client from tailscale.com/ipn/store/kubestore - tailscale.com/kube/types from tailscale.com/cmd/k8s-operator+ + tailscale.com/kube/kubeapi from tailscale.com/ipn/store/kubestore+ + tailscale.com/kube/kubeclient from tailscale.com/ipn/store/kubestore + tailscale.com/kube/kubetypes from tailscale.com/cmd/k8s-operator+ tailscale.com/licenses from tailscale.com/client/web tailscale.com/log/filelogger from tailscale.com/logpolicy tailscale.com/log/sockstatlog from tailscale.com/ipn/ipnlocal diff --git a/cmd/k8s-operator/ingress.go b/cmd/k8s-operator/ingress.go index 590509348..700cf4be8 100644 --- a/cmd/k8s-operator/ingress.go +++ b/cmd/k8s-operator/ingress.go @@ -23,7 +23,7 @@ "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/reconcile" "tailscale.com/ipn" - kubetypes "tailscale.com/kube/types" + "tailscale.com/kube/kubetypes" "tailscale.com/types/opt" "tailscale.com/util/clientmetric" "tailscale.com/util/set" diff --git a/cmd/k8s-operator/ingress_test.go b/cmd/k8s-operator/ingress_test.go index b4524b6f6..8b18776b4 100644 --- a/cmd/k8s-operator/ingress_test.go +++ b/cmd/k8s-operator/ingress_test.go @@ -17,7 +17,7 @@ "sigs.k8s.io/controller-runtime/pkg/client/fake" "tailscale.com/ipn" tsapi "tailscale.com/k8s-operator/apis/v1alpha1" - kubetypes "tailscale.com/kube/types" + "tailscale.com/kube/kubetypes" "tailscale.com/types/ptr" "tailscale.com/util/mak" ) diff --git a/cmd/k8s-operator/nameserver.go b/cmd/k8s-operator/nameserver.go index 769291381..52577c929 100644 --- a/cmd/k8s-operator/nameserver.go +++ b/cmd/k8s-operator/nameserver.go @@ -28,7 +28,7 @@ "sigs.k8s.io/yaml" tsoperator "tailscale.com/k8s-operator" tsapi "tailscale.com/k8s-operator/apis/v1alpha1" - kubetypes "tailscale.com/kube/types" + "tailscale.com/kube/kubetypes" "tailscale.com/tstime" "tailscale.com/util/clientmetric" "tailscale.com/util/set" diff --git a/cmd/k8s-operator/operator.go b/cmd/k8s-operator/operator.go index 72ccf4cf6..d0e43ca85 100644 --- a/cmd/k8s-operator/operator.go +++ b/cmd/k8s-operator/operator.go @@ -39,7 +39,7 @@ "tailscale.com/ipn" "tailscale.com/ipn/store/kubestore" tsapi "tailscale.com/k8s-operator/apis/v1alpha1" - kubetypes "tailscale.com/kube/types" + "tailscale.com/kube/kubetypes" "tailscale.com/tsnet" "tailscale.com/tstime" "tailscale.com/types/logger" diff --git a/cmd/k8s-operator/operator_test.go b/cmd/k8s-operator/operator_test.go index 0df29b5e7..8b08e9ffa 100644 --- a/cmd/k8s-operator/operator_test.go +++ b/cmd/k8s-operator/operator_test.go @@ -22,7 +22,7 @@ "sigs.k8s.io/controller-runtime/pkg/client/fake" "sigs.k8s.io/controller-runtime/pkg/reconcile" tsapi "tailscale.com/k8s-operator/apis/v1alpha1" - kubetypes "tailscale.com/kube/types" + "tailscale.com/kube/kubetypes" "tailscale.com/net/dns/resolvconffile" "tailscale.com/tstest" "tailscale.com/tstime" diff --git a/cmd/k8s-operator/proxy.go b/cmd/k8s-operator/proxy.go index 66b0786eb..672f07b1f 100644 --- a/cmd/k8s-operator/proxy.go +++ b/cmd/k8s-operator/proxy.go @@ -23,7 +23,7 @@ "tailscale.com/client/tailscale" "tailscale.com/client/tailscale/apitype" ksr "tailscale.com/k8s-operator/sessionrecording" - kubetypes "tailscale.com/kube/types" + "tailscale.com/kube/kubetypes" "tailscale.com/tailcfg" "tailscale.com/tsnet" "tailscale.com/util/clientmetric" diff --git a/cmd/k8s-operator/sts.go b/cmd/k8s-operator/sts.go index 0b792e6f2..d2569bd7b 100644 --- a/cmd/k8s-operator/sts.go +++ b/cmd/k8s-operator/sts.go @@ -31,7 +31,7 @@ "tailscale.com/ipn" tsoperator "tailscale.com/k8s-operator" tsapi "tailscale.com/k8s-operator/apis/v1alpha1" - kubetypes "tailscale.com/kube/types" + "tailscale.com/kube/kubetypes" "tailscale.com/net/netutil" "tailscale.com/tailcfg" "tailscale.com/types/opt" diff --git a/cmd/k8s-operator/svc.go b/cmd/k8s-operator/svc.go index 75ccff2f7..6b2ca3514 100644 --- a/cmd/k8s-operator/svc.go +++ b/cmd/k8s-operator/svc.go @@ -25,7 +25,7 @@ "sigs.k8s.io/controller-runtime/pkg/reconcile" tsoperator "tailscale.com/k8s-operator" tsapi "tailscale.com/k8s-operator/apis/v1alpha1" - kubetypes "tailscale.com/kube/types" + "tailscale.com/kube/kubetypes" "tailscale.com/net/dns/resolvconffile" "tailscale.com/tstime" "tailscale.com/util/clientmetric" diff --git a/cmd/stund/depaware.txt b/cmd/stund/depaware.txt index 8a0a6dcd7..09540c833 100644 --- a/cmd/stund/depaware.txt +++ b/cmd/stund/depaware.txt @@ -50,7 +50,7 @@ tailscale.com/cmd/stund dependencies: (generated by github.com/tailscale/depawar google.golang.org/protobuf/types/known/timestamppb from github.com/prometheus/client_golang/prometheus+ tailscale.com from tailscale.com/version tailscale.com/envknob from tailscale.com/tsweb+ - tailscale.com/kube/types from tailscale.com/envknob + tailscale.com/kube/kubetypes from tailscale.com/envknob tailscale.com/metrics from tailscale.com/net/stunserver+ tailscale.com/net/netaddr from tailscale.com/net/tsaddr tailscale.com/net/stun from tailscale.com/net/stunserver diff --git a/cmd/tailscale/depaware.txt b/cmd/tailscale/depaware.txt index 22dc30fbf..d9432614f 100644 --- a/cmd/tailscale/depaware.txt +++ b/cmd/tailscale/depaware.txt @@ -98,7 +98,7 @@ tailscale.com/cmd/tailscale dependencies: (generated by github.com/tailscale/dep tailscale.com/internal/noiseconn from tailscale.com/cmd/tailscale/cli tailscale.com/ipn from tailscale.com/client/tailscale+ tailscale.com/ipn/ipnstate from tailscale.com/client/tailscale+ - tailscale.com/kube/types from tailscale.com/envknob + tailscale.com/kube/kubetypes from tailscale.com/envknob tailscale.com/licenses from tailscale.com/client/web+ tailscale.com/metrics from tailscale.com/derp+ tailscale.com/net/captivedetection from tailscale.com/net/netcheck diff --git a/cmd/tailscaled/depaware.txt b/cmd/tailscaled/depaware.txt index 2ec6cf4bf..018e74fac 100644 --- a/cmd/tailscaled/depaware.txt +++ b/cmd/tailscaled/depaware.txt @@ -279,9 +279,9 @@ tailscale.com/cmd/tailscaled dependencies: (generated by github.com/tailscale/de L tailscale.com/ipn/store/awsstore from tailscale.com/ipn/store L tailscale.com/ipn/store/kubestore from tailscale.com/ipn/store tailscale.com/ipn/store/mem from tailscale.com/ipn/ipnlocal+ - L tailscale.com/kube/api from tailscale.com/ipn/store/kubestore+ - L tailscale.com/kube/client from tailscale.com/ipn/store/kubestore - tailscale.com/kube/types from tailscale.com/envknob + L tailscale.com/kube/kubeapi from tailscale.com/ipn/store/kubestore+ + L tailscale.com/kube/kubeclient from tailscale.com/ipn/store/kubestore + tailscale.com/kube/kubetypes from tailscale.com/envknob tailscale.com/licenses from tailscale.com/client/web tailscale.com/log/filelogger from tailscale.com/logpolicy tailscale.com/log/sockstatlog from tailscale.com/ipn/ipnlocal diff --git a/envknob/envknob.go b/envknob/envknob.go index 350519c8c..f1925ccf4 100644 --- a/envknob/envknob.go +++ b/envknob/envknob.go @@ -31,7 +31,7 @@ "sync/atomic" "time" - kubetypes "tailscale.com/kube/types" + "tailscale.com/kube/kubetypes" "tailscale.com/types/opt" "tailscale.com/version" "tailscale.com/version/distro" diff --git a/ipn/store/kubestore/store_kube.go b/ipn/store/kubestore/store_kube.go index 4b96bd89e..00950bd3b 100644 --- a/ipn/store/kubestore/store_kube.go +++ b/ipn/store/kubestore/store_kube.go @@ -13,8 +13,8 @@ "time" "tailscale.com/ipn" - kubeapi "tailscale.com/kube/api" - kubeclient "tailscale.com/kube/client" + "tailscale.com/kube/kubeapi" + "tailscale.com/kube/kubeclient" "tailscale.com/types/logger" ) diff --git a/kube/api/api.go b/kube/kubeapi/api.go similarity index 98% rename from kube/api/api.go rename to kube/kubeapi/api.go index 661fbbba8..0e42437a6 100644 --- a/kube/api/api.go +++ b/kube/kubeapi/api.go @@ -1,11 +1,11 @@ // Copyright (c) Tailscale Inc & AUTHORS // SPDX-License-Identifier: BSD-3-Clause -// Package api contains Kubernetes API types for internal consumption. +// Package kubeapi contains Kubernetes API types for internal consumption. // These types are split into a separate package for consumption of // non-Kubernetes shared libraries and binaries. Be mindful of not increasing // dependency size for those consumers when adding anything new here. -package api +package kubeapi import "time" diff --git a/kube/client/client.go b/kube/kubeclient/client.go similarity index 98% rename from kube/client/client.go rename to kube/kubeclient/client.go index a70a9dbd3..35cb4f713 100644 --- a/kube/client/client.go +++ b/kube/kubeclient/client.go @@ -1,13 +1,13 @@ // Copyright (c) Tailscale Inc & AUTHORS // SPDX-License-Identifier: BSD-3-Clause -// Package client provides a client to interact with Kubernetes. +// Package kubeclient provides a client to interact with Kubernetes. // This package is Tailscale-internal and not meant for external consumption. // Further, the API should not be considered stable. // Client is split into a separate package for consumption of // non-Kubernetes shared libraries and binaries. Be mindful of not increasing // dependency size for those consumers when adding anything new here. -package client +package kubeclient import ( "bytes" @@ -26,7 +26,7 @@ "sync" "time" - kubeapi "tailscale.com/kube/api" + "tailscale.com/kube/kubeapi" "tailscale.com/util/multierr" ) diff --git a/kube/client/fake_client.go b/kube/kubeclient/fake_client.go similarity index 96% rename from kube/client/fake_client.go rename to kube/kubeclient/fake_client.go index f57bb0226..3cef3d27e 100644 --- a/kube/client/fake_client.go +++ b/kube/kubeclient/fake_client.go @@ -1,13 +1,13 @@ // Copyright (c) Tailscale Inc & AUTHORS // SPDX-License-Identifier: BSD-3-Clause -package client +package kubeclient import ( "context" "net" - kubeapi "tailscale.com/kube/api" + "tailscale.com/kube/kubeapi" ) var _ Client = &FakeClient{} diff --git a/kube/types/grants.go b/kube/kubetypes/grants.go similarity index 96% rename from kube/types/grants.go rename to kube/kubetypes/grants.go index ce7f205b9..4dc278ff1 100644 --- a/kube/types/grants.go +++ b/kube/kubetypes/grants.go @@ -1,12 +1,12 @@ // Copyright (c) Tailscale Inc & AUTHORS // SPDX-License-Identifier: BSD-3-Clause -// Package types contains types and constants related to the Tailscale +// Package kubetypes contains types and constants related to the Tailscale // Kubernetes Operator. // These are split into a separate package for consumption of // non-Kubernetes shared libraries and binaries. Be mindful of not increasing // dependency size for those consumers when adding anything new here. -package types +package kubetypes import "net/netip" diff --git a/kube/types/metrics.go b/kube/kubetypes/metrics.go similarity index 98% rename from kube/types/metrics.go rename to kube/kubetypes/metrics.go index e348a6479..eb7ada36d 100644 --- a/kube/types/metrics.go +++ b/kube/kubetypes/metrics.go @@ -1,7 +1,7 @@ // Copyright (c) Tailscale Inc & AUTHORS // SPDX-License-Identifier: BSD-3-Clause -package types +package kubetypes const ( // Hostinfo App values for the Tailscale Kubernetes Operator components.