From 0f57b9340b1449de811a9dacd098a769192c4344 Mon Sep 17 00:00:00 2001 From: Irbe Krumina Date: Fri, 19 Jul 2024 16:17:28 +0300 Subject: [PATCH] cmd/k8s-operator,tstest,go.{mod,sum}: remove fybrik.io/crdoc dependency (#12862) Remove fybrik.io/crdoc dependency as it is causing issues for folks attempting to vendor tailscale using GOPROXY=direct. This means that the CRD API docs in ./k8s-operator/api.md will no longer be generated- I am going to look at replacing it with another tool in a follow-up. Updates tailscale/tailscale#12859 Signed-off-by: Irbe Krumina --- cmd/k8s-operator/operator.go | 3 +-- go.mod | 1 - go.sum | 2 -- tstest/tools/tools.go | 1 - 4 files changed, 1 insertion(+), 6 deletions(-) diff --git a/cmd/k8s-operator/operator.go b/cmd/k8s-operator/operator.go index e48431cd9..7ccb806c1 100644 --- a/cmd/k8s-operator/operator.go +++ b/cmd/k8s-operator/operator.go @@ -51,8 +51,7 @@ // Generate static manifests for deploying Tailscale operator on Kubernetes from the operator's Helm chart. //go:generate go run tailscale.com/cmd/k8s-operator/generate staticmanifests -// Generate CRD docs from the yamls -//go:generate go run fybrik.io/crdoc --resources=./deploy/crds --output=../../k8s-operator/api.md +// TODO (irbekrm): generate CRD docs from the yamls func main() { // Required to use our client API. We're fine with the instability since the diff --git a/go.mod b/go.mod index a0ee81395..f7a004d86 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,6 @@ go 1.22.0 require ( filippo.io/mkcert v1.4.4 - fybrik.io/crdoc v0.6.3 github.com/akutz/memconn v0.1.0 github.com/alexbrainman/sspi v0.0.0-20231016080023-1a75b4708caa github.com/andybalholm/brotli v1.1.0 diff --git a/go.sum b/go.sum index 24cd10b7d..825ca9c0f 100644 --- a/go.sum +++ b/go.sum @@ -46,8 +46,6 @@ filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA= filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4= filippo.io/mkcert v1.4.4 h1:8eVbbwfVlaqUM7OwuftKc2nuYOoTDQWqsoXmzoXZdbc= filippo.io/mkcert v1.4.4/go.mod h1:VyvOchVuAye3BoUsPUOOofKygVwLV2KQMVFJNRq+1dA= -fybrik.io/crdoc v0.6.3 h1:jNNAVINu8up5vrLa0jrV7z7HSlyHF/6lNOrAtrXwYlI= -fybrik.io/crdoc v0.6.3/go.mod h1:kvZRt7VAzOyrmDpIqREtcKAVFSJYEBoAyniYebsJGtQ= github.com/Abirdcfly/dupword v0.0.11 h1:z6v8rMETchZXUIuHxYNmlUAuKuB21PeaSymTed16wgU= github.com/Abirdcfly/dupword v0.0.11/go.mod h1:wH8mVGuf3CP5fsBTkfWwwwKTjDnVVCxtU8d8rgeVYXA= github.com/AlekSi/pointer v1.2.0 h1:glcy/gc4h8HnG2Z3ZECSzZ1IX1x2JxRVuDzaJwQE0+w= diff --git a/tstest/tools/tools.go b/tstest/tools/tools.go index 6dac885cd..46060da26 100644 --- a/tstest/tools/tools.go +++ b/tstest/tools/tools.go @@ -8,7 +8,6 @@ package tools import ( - _ "fybrik.io/crdoc" _ "github.com/tailscale/mkctr" _ "honnef.co/go/tools/cmd/staticcheck" _ "sigs.k8s.io/controller-tools/cmd/controller-gen"