From 43f1163efbc0e9f97567e411f31df9fd0f769c80 Mon Sep 17 00:00:00 2001 From: "Nelo-T. Wallus" Date: Thu, 18 Sep 2025 10:37:55 +0200 Subject: [PATCH 01/13] Handle many modules Signed-off-by: Nelo-T. Wallus Signed-off-by: Nelo-T. Wallus --- Makefile | 44 ++++++++++++++++++++++++++++---------------- 1 file changed, 28 insertions(+), 16 deletions(-) diff --git a/Makefile b/Makefile index aca208cbf..061440046 100644 --- a/Makefile +++ b/Makefile @@ -115,6 +115,8 @@ LDFLAGS := \ all: build .PHONY: all +GOMODS := $(shell find . -name 'go.mod' -exec dirname {} \; | grep -v hack/tools) + ldflags: @echo $(LDFLAGS) @@ -151,7 +153,13 @@ $(CODE_GENERATOR): GOBIN=$(TOOLS_GOBIN_DIR) $(GO_INSTALL) github.com/kcp-dev/code-generator/v2 $(CODE_GENERATOR_BIN) $(CODE_GENERATOR_VER) lint: $(GOLANGCI_LINT) $(LOGCHECK) ## Run linters - $(GOLANGCI_LINT) run $(GOLANGCI_LINT_FLAGS) -c $(ROOT_DIR)/.golangci.yaml --timeout 20m + @if [ -n "$(WHAT)" ]; then \ + $(GOLANGCI_LINT) run $(GOLANGCI_LINT_FLAGS) -c $(ROOT_DIR)/.golangci.yaml --timeout 20m $(WHAT); \ + else \ + for MOD in $(GOMODS); do \ + (cd $$MOD; echo "Linting $$MOD"; $(GOLANGCI_LINT) run $(GOLANGCI_LINT_FLAGS) -c $(ROOT_DIR)/.golangci.yaml --timeout 20m); \ + done; \ + fi .PHONY: lint fix-lint: $(GOLANGCI_LINT) @@ -211,14 +219,13 @@ verify-codegen: .PHONY: imports imports: $(GOLANGCI_LINT) $(GOIMPORTS) verify-go-versions - if [ -n "$(WHAT)" ]; then \ - $(GOLANGCI_LINT) fmt --enable gci -c $(ROOT_DIR)/.golangci.yaml $(WHAT); \ - $(GOIMPORTS) -local github.com/kube-bind/kube-bind -w $(WHAT); \ + @if [ -n "$(WHAT)" ]; then \ + $(GOLANGCI_LINT) fmt --enable gci -c $(ROOT_DIR)/.golangci.yaml $(WHAT); \ + $(GOIMPORTS) -local github.com/kube-bind/kube-bind -w $(WHAT); \ else \ - for MOD in . $$(git ls-files '**/go.mod' | sed 's,/go.mod,,'); do \ - (set -x; cd $$MOD; $(GOLANGCI_LINT) fmt --enable gci -c $(ROOT_DIR)/.golangci.yaml); \ - $(GOIMPORTS) -local github.com/kube-bind/kube-bind -w .; \ - done; \ + for MOD in $(GOMODS); do \ + ( cd $$MOD; $(GOLANGCI_LINT) fmt --enable gci -c $(ROOT_DIR)/.golangci.yaml; $(GOIMPORTS) -local github.com/kube-bind/kube-bind -w $$(go list -f '{{.Dir}}' ./...); ) \ + done; \ fi $(TOOLS_DIR)/verify_boilerplate.py: @@ -284,8 +291,13 @@ endif test: WHAT ?= ./... # We will need to move into the sub package, of pkg/apis to run those tests. test: ## run unit tests - $(GO_TEST) -race -count $(COUNT) -coverprofile=coverage.txt -covermode=atomic $(TEST_ARGS) $$(go list "$(WHAT)" | grep -v ./test/e2e/ | grep -v ./kcp) - cd sdk/apis && $(GO_TEST) -race -count $(COUNT) -coverprofile=coverage.txt -covermode=atomic $(TEST_ARGS) $(WHAT) + @if [ -n "$(WHAT)" ]; then \ + $(GO_TEST) -race -count $(COUNT) -coverprofile=coverage.txt -covermode=atomic $(TEST_ARGS) $$(go list "$(WHAT)" | grep -v ./test/e2e/); \ + else \ + for MOD in $(GOMODS); do \ + ( cd $$MOD; $(GO_TEST) -race -count $(COUNT) -coverprofile=coverage.txt -covermode=atomic $(TEST_ARGS) ) \ + done; \ + fi .PHONY: verify-imports verify-imports: @@ -297,15 +309,15 @@ verify-go-versions: .PHONY: modules modules: ## Run go mod tidy to ensure modules are up to date - go mod tidy - cd sdk/apis; go mod tidy + for MOD in $(GOMODS); do \ + (cd $$MOD; echo "Tidying $$MOD"; go mod tidy); \ + done .PHONY: verify-modules verify-modules: modules # Verify go modules are up to date - @if !(git diff --quiet HEAD -- go.sum go.mod pkg/apis/go.mod pkg/apis/go.sum); then \ - git diff; \ - echo "go module files are out of date"; exit 1; \ - fi + @for MOD in $(GOMODS); do \ + (cd $$MOD; echo "Verifying $$MOD"; if ! git diff --quiet HEAD -- go.mod go.sum; then echo "[$$MOD] go modules are out of date, please run 'make modules'"; exit 1; fi; ) \ + done .PHONY: verify verify: verify-modules verify-go-versions verify-imports verify-codegen verify-boilerplate ## verify formal properties of the code From 0c179f0338c0b1067d9589653f3a59611fa49ac2 Mon Sep 17 00:00:00 2001 From: "Nelo-T. Wallus" Date: Thu, 18 Sep 2025 10:38:23 +0200 Subject: [PATCH 02/13] Fix `make help` and add more help comments Signed-off-by: Nelo-T. Wallus Signed-off-by: Nelo-T. Wallus --- Makefile | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 061440046..29328a8eb 100644 --- a/Makefile +++ b/Makefile @@ -152,7 +152,7 @@ $(LOGCHECK): $(CODE_GENERATOR): GOBIN=$(TOOLS_GOBIN_DIR) $(GO_INSTALL) github.com/kcp-dev/code-generator/v2 $(CODE_GENERATOR_BIN) $(CODE_GENERATOR_VER) -lint: $(GOLANGCI_LINT) $(LOGCHECK) ## Run linters +lint: $(GOLANGCI_LINT) $(LOGCHECK) ## Run golangci-lint @if [ -n "$(WHAT)" ]; then \ $(GOLANGCI_LINT) run $(GOLANGCI_LINT_FLAGS) -c $(ROOT_DIR)/.golangci.yaml --timeout 20m $(WHAT); \ else \ @@ -162,7 +162,7 @@ lint: $(GOLANGCI_LINT) $(LOGCHECK) ## Run linters fi .PHONY: lint -fix-lint: $(GOLANGCI_LINT) +fix-lint: $(GOLANGCI_LINT) ## Run golangci-lint with --fix GOLANGCI_LINT_FLAGS="--fix" $(MAKE) lint .PHONY: fix-lint @@ -171,7 +171,7 @@ vendor: ## Vendor the dependencies go mod vendor .PHONY: vendor -tools: $(GOLANGCI_LINT) $(CONTROLLER_GEN) $(YAML_PATCH) $(GOTESTSUM) $(CODE_GENERATOR) +tools: $(GOLANGCI_LINT) $(CONTROLLER_GEN) $(YAML_PATCH) $(GOTESTSUM) $(CODE_GENERATOR) ## Install tools .PHONY: tools $(CONTROLLER_GEN): @@ -194,7 +194,7 @@ $(KUBE_APPLYCONFIGURATION_GEN): codegen: WHAT ?= ./sdk/client -codegen: $(CONTROLLER_GEN) $(YAML_PATCH) $(CODE_GENERATOR) $(KUBE_CLIENT_GEN) $(KUBE_LISTER_GEN) $(KUBE_INFORMER_GEN) $(KUBE_APPLYCONFIGURATION_GEN) +codegen: $(CONTROLLER_GEN) $(YAML_PATCH) $(CODE_GENERATOR) $(KUBE_CLIENT_GEN) $(KUBE_LISTER_GEN) $(KUBE_INFORMER_GEN) $(KUBE_APPLYCONFIGURATION_GEN) ## Generate code go mod download ./hack/update-codegen.sh $(MAKE) imports @@ -218,7 +218,7 @@ verify-codegen: fi .PHONY: imports -imports: $(GOLANGCI_LINT) $(GOIMPORTS) verify-go-versions +imports: $(GOLANGCI_LINT) $(GOIMPORTS) verify-go-versions ## Fix imports and format code @if [ -n "$(WHAT)" ]; then \ $(GOLANGCI_LINT) fmt --enable gci -c $(ROOT_DIR)/.golangci.yaml $(WHAT); \ $(GOIMPORTS) -local github.com/kube-bind/kube-bind -w $(WHAT); \ @@ -276,7 +276,7 @@ endif test-e2e: TEST_ARGS ?= test-e2e: WORK_DIR ?= . test-e2e: WHAT ?= ./test/e2e... -test-e2e: $(KCP) $(DEX) build +test-e2e: $(KCP) $(DEX) build ## Run e2e tests mkdir .kcp $(DEX) serve hack/dex-config-dev.yaml 2>&1 & DEX_PID=$$!; \ $(KCP) start &>.kcp/kcp.log & KCP_PID=$$!; \ @@ -290,7 +290,7 @@ test: $(GOTESTSUM) endif test: WHAT ?= ./... # We will need to move into the sub package, of pkg/apis to run those tests. -test: ## run unit tests +test: ## Run unit tests @if [ -n "$(WHAT)" ]; then \ $(GO_TEST) -race -count $(COUNT) -coverprofile=coverage.txt -covermode=atomic $(TEST_ARGS) $$(go list "$(WHAT)" | grep -v ./test/e2e/); \ else \ @@ -323,8 +323,8 @@ verify-modules: modules # Verify go modules are up to date verify: verify-modules verify-go-versions verify-imports verify-codegen verify-boilerplate ## verify formal properties of the code .PHONY: help -help: ## Show this help. - @grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}' +help: ## Show this help + @awk 'BEGIN { fs="## " } { FS=fs } /:.*##/ { doc=$$2; FS=":"; $$0=$$0; printf "\033[36m%-30s\033[0m %s\n", $$1, doc; }' $(MAKEFILE_LIST) | sort | grep -v fs= .PHONY: generate-cli-docs generate-cli-docs: ## Generate cli docs From e6036dd1fcf65bb3c61462c158f5dcea7b811072 Mon Sep 17 00:00:00 2001 From: "Nelo-T. Wallus" Date: Thu, 18 Sep 2025 11:11:56 +0200 Subject: [PATCH 03/13] make modules Signed-off-by: Nelo-T. Wallus Signed-off-by: Nelo-T. Wallus --- kcp/go.mod | 45 ++----------------------- kcp/go.sum | 96 ------------------------------------------------------ 2 files changed, 2 insertions(+), 139 deletions(-) diff --git a/kcp/go.mod b/kcp/go.mod index f42500e17..f9251ebc5 100644 --- a/kcp/go.mod +++ b/kcp/go.mod @@ -11,47 +11,34 @@ replace github.com/kube-bind/kube-bind/sdk/client => ../sdk/client replace github.com/kube-bind/kube-bind/cli => ../cli require ( - github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc github.com/kcp-dev/client-go v0.0.0-20250728134101-0355faa9361b github.com/kcp-dev/kcp v0.28.0 github.com/kcp-dev/kcp/sdk v0.28.0 github.com/kcp-dev/logicalcluster/v3 v3.0.5 - github.com/kube-bind/kube-bind v0.4.6 github.com/spf13/pflag v1.0.7 - github.com/stretchr/testify v1.10.0 - gopkg.in/headzoo/surf.v1 v1.0.1 k8s.io/apiextensions-apiserver v0.33.3 k8s.io/apimachinery v0.33.3 k8s.io/apiserver v0.33.3 - k8s.io/cli-runtime v0.32.0 k8s.io/client-go v0.33.3 k8s.io/component-base v0.33.3 k8s.io/klog/v2 v2.130.1 - sigs.k8s.io/yaml v1.4.0 ) require ( cel.dev/expr v0.19.1 // indirect - github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect github.com/NYTimes/gziphandler v1.1.1 // indirect - github.com/PuerkitoBio/goquery v1.8.0 // indirect - github.com/andybalholm/cascadia v1.3.1 // indirect github.com/antlr4-go/antlr/v4 v4.13.1 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/blang/semver/v4 v4.0.0 // indirect github.com/cenkalti/backoff/v4 v4.3.0 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect - github.com/coreos/go-oidc v2.3.0+incompatible // indirect github.com/coreos/go-semver v0.3.1 // indirect github.com/coreos/go-systemd/v22 v22.5.0 // indirect - github.com/dexidp/dex/api/v2 v2.1.0 // indirect + github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/emicklei/go-restful/v3 v3.12.1 // indirect - github.com/evanphx/json-patch v5.6.0+incompatible // indirect - github.com/evanphx/json-patch/v5 v5.9.11 // indirect github.com/felixge/httpsnoop v1.0.4 // indirect github.com/fsnotify/fsnotify v1.7.0 // indirect github.com/fxamacker/cbor/v2 v2.7.0 // indirect - github.com/go-errors/errors v1.4.2 // indirect github.com/go-logr/logr v1.4.2 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/go-openapi/jsonpointer v0.21.0 // indirect @@ -63,48 +50,27 @@ require ( github.com/google/cel-go v0.23.2 // indirect github.com/google/gnostic-models v0.6.9 // indirect github.com/google/go-cmp v0.7.0 // indirect - github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect github.com/google/uuid v1.6.0 // indirect - github.com/gorilla/mux v1.8.0 // indirect - github.com/gorilla/securecookie v1.1.1 // indirect - github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.25.1 // indirect - github.com/headzoo/surf v1.0.1 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/kcp-dev/apimachinery/v2 v2.0.1-0.20250728122101-adbf20db3e51 // indirect - github.com/kcp-dev/kcp/pkg/apis v0.11.0 // indirect - github.com/kcp-dev/multicluster-provider v0.1.0 // indirect - github.com/kube-bind/kube-bind/cli v0.0.0-20250515145715-d9f20e7c840d // indirect - github.com/kube-bind/kube-bind/sdk/apis v0.4.8 // indirect - github.com/kube-bind/kube-bind/sdk/client v0.4.6 // indirect github.com/kylelemons/godebug v1.1.0 // indirect - github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect github.com/mailru/easyjson v0.9.0 // indirect - github.com/martinlindhe/base36 v1.1.1 // indirect - github.com/mdp/qrterminal/v3 v3.2.0 // indirect - github.com/moby/term v0.5.0 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect - github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/onsi/gomega v1.36.2 // indirect - github.com/peterbourgon/diskv v2.0.1+incompatible // indirect github.com/pkg/errors v0.9.1 // indirect - github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect - github.com/pquerna/cachecontrol v0.1.0 // indirect github.com/prometheus/client_golang v1.22.0 // indirect github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.62.0 // indirect github.com/prometheus/procfs v0.15.1 // indirect github.com/spf13/cobra v1.9.1 // indirect github.com/stoewer/go-strcase v1.3.0 // indirect - github.com/vmihailenco/msgpack/v4 v4.3.12 // indirect - github.com/vmihailenco/tagparser v0.1.1 // indirect github.com/x448/float16 v0.8.4 // indirect - github.com/xlab/treeprint v1.2.0 // indirect go.etcd.io/etcd/api/v3 v3.5.21 // indirect go.etcd.io/etcd/client/pkg/v3 v3.5.21 // indirect go.etcd.io/etcd/client/v3 v3.5.21 // indirect @@ -129,28 +95,21 @@ require ( golang.org/x/term v0.32.0 // indirect golang.org/x/text v0.25.0 // indirect golang.org/x/time v0.11.0 // indirect - gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect - google.golang.org/appengine v1.6.7 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20250106144421-5f5ef82da422 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20250106144421-5f5ef82da422 // indirect google.golang.org/grpc v1.69.2 // indirect google.golang.org/protobuf v1.36.5 // indirect gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect - gopkg.in/go-jose/go-jose.v2 v2.6.3 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect k8s.io/api v0.33.3 // indirect k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 // indirect - rsc.io/qr v0.2.0 // indirect sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 // indirect - sigs.k8s.io/controller-runtime v0.21.0 // indirect sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect - sigs.k8s.io/kustomize/api v0.19.0 // indirect - sigs.k8s.io/kustomize/kyaml v0.19.0 // indirect - sigs.k8s.io/multicluster-runtime v0.21.0-alpha.8 // indirect sigs.k8s.io/randfill v1.0.0 // indirect sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect + sigs.k8s.io/yaml v1.4.0 // indirect ) replace ( diff --git a/kcp/go.sum b/kcp/go.sum index 7f722d970..72a6d12a7 100644 --- a/kcp/go.sum +++ b/kcp/go.sum @@ -1,13 +1,7 @@ cel.dev/expr v0.19.1 h1:NciYrtDRIR0lNCnH1LFJegdjspNx9fI59O7TWcua/W4= cel.dev/expr v0.19.1/go.mod h1:MrpN08Q+lEBs+bGYdLxxHkZoUSsCp0nSKTs0nTymJgw= -github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 h1:L/gRVlceqvL25UVaW/CKtUDjefjrs0SPonmDGUVOYP0= -github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= github.com/NYTimes/gziphandler v1.1.1 h1:ZUDjpQae29j0ryrS0u/B8HZfJBtBQHjqw2rQ2cqUQ3I= github.com/NYTimes/gziphandler v1.1.1/go.mod h1:n/CVRwUEOgIxrgPvAQhUUr9oeUtvrhMomdKFjzJNB0c= -github.com/PuerkitoBio/goquery v1.8.0 h1:PJTF7AmFCFKk1N6V6jmKfrNH9tV5pNE6lZMkG0gta/U= -github.com/PuerkitoBio/goquery v1.8.0/go.mod h1:ypIiRMtY7COPGk+I/YbZLbxsxn9g5ejnI2HSMtkjZvI= -github.com/andybalholm/cascadia v1.3.1 h1:nhxRkql1kdYCc8Snf7D5/D3spOX+dBgjA6u8x004T2c= -github.com/andybalholm/cascadia v1.3.1/go.mod h1:R4bJ1UQfqADjvDa4P6HZHLh/3OxWWEqc0Sk8XGwHqvA= github.com/antlr4-go/antlr/v4 v4.13.1 h1:SqQKkuVZ+zWkMMNkjy5FZe5mr5WURWnlpmOuzYWrPrQ= github.com/antlr4-go/antlr/v4 v4.13.1/go.mod h1:GKmUxMtwp6ZgGwZSva4eWPC5mS6vUAmOABFgjdkM7Nw= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= @@ -18,37 +12,25 @@ github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK3 github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/coreos/go-oidc v2.3.0+incompatible h1:+5vEsrgprdLjjQ9FzIKAzQz1wwPD+83hQRfUIPh7rO0= -github.com/coreos/go-oidc v2.3.0+incompatible/go.mod h1:CgnwVTmzoESiwO9qyAFEMiHoZ1nMCKZlZ9V6mm3/LKc= github.com/coreos/go-semver v0.3.1 h1:yi21YpKnrx1gt5R+la8n5WgS0kCrsPp33dmEyHReZr4= github.com/coreos/go-semver v0.3.1/go.mod h1:irMmmIw/7yzSRPWryHsK7EYSg09caPQL03VsM8rvUec= github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs= github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g= -github.com/creack/pty v1.1.18 h1:n56/Zwd5o6whRC5PMGretI4IdRLlmBXYNjScPaBgsbY= -github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/dexidp/dex/api/v2 v2.1.0 h1:V7XTnG2HM2bqWZMABDQpf4EA6F+0jWPsv9pGaUIDo+k= -github.com/dexidp/dex/api/v2 v2.1.0/go.mod h1:s91/6CI290JhYN1F8aiRifLF71qRGLVZvzq68uC6Ln4= github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY= github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= github.com/emicklei/go-restful/v3 v3.12.1 h1:PJMDIM/ak7btuL8Ex0iYET9hxM3CI2sjZtzpL63nKAU= github.com/emicklei/go-restful/v3 v3.12.1/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= -github.com/evanphx/json-patch v5.6.0+incompatible h1:jBYDEEiFBPxA0v50tFdvOzQQTCvpL6mnFh5mB2/l16U= -github.com/evanphx/json-patch v5.6.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= -github.com/evanphx/json-patch/v5 v5.9.11 h1:/8HVnzMq13/3x9TPvjG08wUGqBTmZBsCWzjTM0wiaDU= -github.com/evanphx/json-patch/v5 v5.9.11/go.mod h1:3j+LviiESTElxA4p3EMKAB9HXj3/XEtnUf6OZxqIQTM= github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg= github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= github.com/fxamacker/cbor/v2 v2.7.0 h1:iM5WgngdRBanHcxugY4JySA0nk1wZorNOpTgCMedv5E= github.com/fxamacker/cbor/v2 v2.7.0/go.mod h1:pxXPTn3joSm21Gbwsv0w9OSA2y1HFR9qXEeXQVeNoDQ= -github.com/go-errors/errors v1.4.2 h1:J6MZopCL4uSllY1OfXM374weqZFFItUbrImctkmUxIA= -github.com/go-errors/errors v1.4.2/go.mod h1:sIVyrIiJhuEF+Pj9Ebtd6P/rEYROXFi3BopGUQ5a5Og= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= @@ -69,8 +51,6 @@ github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang-jwt/jwt/v4 v4.5.2 h1:YtQM7lnr8iZ+j5q71MGKkNw9Mn7AjHM68uc9g5fXeUI= github.com/golang-jwt/jwt/v4 v4.5.2/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= -github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/google/btree v1.1.3 h1:CVpQJjYgC4VbzxeGVHfvZrv1ctoYCAI8vbl07Fcxlyg= @@ -83,22 +63,12 @@ github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= -github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad h1:a6HEuzUHeKH6hwfN/ZoQgRgVIWFJljSWa/zetS2WTvg= github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144= -github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4= -github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI= -github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= -github.com/gorilla/securecookie v1.1.1 h1:miw7JPhV+b/lAHSXz4qd/nN9jRiAFV5FwjeKyCS8BvQ= -github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4= github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 h1:JeSE6pjso5THxAzdVpqr6/geYxZytqFMBCOtn/ujyeo= github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674/go.mod h1:r4w70xmWCQKmi1ONH4KIaBptdivuRPyosB9RmPlGEwA= -github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 h1:+ngKgrYPPJrOjhax5N+uePQ0Fh1Z7PheYoUI/0nzkPA= -github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 h1:+9834+KizmvFV7pXQGSXQTsaWhq2GjuNUt0aUU0YBYw= github.com/grpc-ecosystem/go-grpc-middleware v1.3.0/go.mod h1:z0ButlSOZa5vEBq9m2m2hlwIgKw+rp3sdCBRoJY+30Y= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 h1:Ovs26xHkKqVztRpIrF/92BcuyuQ/YW4NSIpoGtfXNho= @@ -107,10 +77,6 @@ github.com/grpc-ecosystem/grpc-gateway v1.16.0 h1:gmcG1KaJ57LophUzW0Hy8NmPhnMZb4 github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/grpc-ecosystem/grpc-gateway/v2 v2.25.1 h1:VNqngBF40hVlDloBruUehVYC3ArSgIyScOAyMRqBxRg= github.com/grpc-ecosystem/grpc-gateway/v2 v2.25.1/go.mod h1:RBRO7fro65R6tjKzYgLAFo0t1QEXY1Dp+i/bvpRiqiQ= -github.com/headzoo/surf v1.0.1 h1:wk3+LT8gjnCxEwfBJl6MhaNg154En5KjgmgzAG9uMS0= -github.com/headzoo/surf v1.0.1/go.mod h1:/bct0m/iMNEqpn520y01yoaWxsAEigGFPnvyR1ewR5M= -github.com/headzoo/ut v0.0.0-20181013193318-a13b5a7a02ca h1:utFgFwgxaqx5OthzE3DSGrtOq7rox5r2sxZ2wbfTuK0= -github.com/headzoo/ut v0.0.0-20181013193318-a13b5a7a02ca/go.mod h1:8926sG02TCOX4RFRzIMFIzRw4xuc/TwO2gtN7teMJZ4= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/jonboulle/clockwork v0.4.0 h1:p4Cf1aMWXnXAUh8lVfewRBx1zaTSYKrKMF2g3ST4RZ4= @@ -125,8 +91,6 @@ github.com/kcp-dev/client-go v0.0.0-20250728134101-0355faa9361b h1:2LGrXvY9sc4l5 github.com/kcp-dev/client-go v0.0.0-20250728134101-0355faa9361b/go.mod h1:QdO8AaGAZPr/rIZ1iVanCM3tUOiiuX897GWv7WTByLE= github.com/kcp-dev/kcp v0.28.0 h1:J3oaOPqc4A2Q+wZveL0iVElAuOLivFmKTCpaKVx8iXA= github.com/kcp-dev/kcp v0.28.0/go.mod h1:q28Fx8sU/KA8kz8HGwtaqA7Iom8oR90ydoPK39jMaxo= -github.com/kcp-dev/kcp/pkg/apis v0.11.0 h1:K6p+tNHNcvfACCPLcHgY0EMLeaIwR1jS491FyLfXMII= -github.com/kcp-dev/kcp/pkg/apis v0.11.0/go.mod h1:8cUAmfMJcksauz53UtsLYG8Phhx62rvuCnd/5t/Zihk= github.com/kcp-dev/kcp/sdk v0.28.0 h1:AOgGrgpqhrplbXMSbcvjFwCqwg4UlysTwIFZ0LvFxlk= github.com/kcp-dev/kcp/sdk v0.28.0/go.mod h1:8oZpWxkoMu2TDpx5DgdIGDigByKHKkeqVMA4GiWneoI= github.com/kcp-dev/kubernetes/staging/src/k8s.io/api v0.0.0-20250816165010-ffe1d7c8649b h1:CyQuxPfhWg8KdwfmY5aE6KABsh/QhkDXTH2msezxCFY= @@ -137,8 +101,6 @@ github.com/kcp-dev/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250816165 github.com/kcp-dev/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250816165010-ffe1d7c8649b/go.mod h1:6XMZJoNYwuMArBvS2acFkTR1KqyHSp2QXRLRx9eTk5w= github.com/kcp-dev/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250816165010-ffe1d7c8649b h1:C21pLvKT2MUE38+ZNDXeucEbRdb7rewRpBp4C5lzz6M= github.com/kcp-dev/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250816165010-ffe1d7c8649b/go.mod h1:STCgTiD+xCCHsfLOPHn5sNVsyktakX/ctW3dMv3erh0= -github.com/kcp-dev/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250816165010-ffe1d7c8649b h1:sQ7otAwO/YMn5cFt4Fftzt6P0cz2gmW7OnTx2i1Qfis= -github.com/kcp-dev/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250816165010-ffe1d7c8649b/go.mod h1:m/w/xSuYRnkX3ocgdBKM/TX7B8aNzScl6qCp1Z3XIGw= github.com/kcp-dev/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250816165010-ffe1d7c8649b h1:kEieYK/XCUycPf5DCEUZNPvDVHr4ao+rxZvdOQXlMQk= github.com/kcp-dev/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250816165010-ffe1d7c8649b/go.mod h1:omt22adyHpxAelVTfG1bssg+xoAUc+Cg+0CXn0Oaim0= github.com/kcp-dev/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250816165010-ffe1d7c8649b h1:OazHpbyl1+WvViAUEZw2PxMZNrd5LOPDD+bhnfL5cQM= @@ -151,51 +113,30 @@ github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo= github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ= -github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= -github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= -github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= -github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de h1:9TO3cAIGXtEhnIaL+V+BEER86oLrvS+kWobKpbJuye0= -github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de/go.mod h1:zAbeS9B/r2mtpb6U+EI2rYA5OAXxsYw6wTamcNW+zcE= github.com/mailru/easyjson v0.9.0 h1:PrnmzHw7262yW8sTBwxi1PdJA3Iw/EKBa8psRf7d9a4= github.com/mailru/easyjson v0.9.0/go.mod h1:1+xMtQp2MRNVL/V1bOzuP3aP8VNwRW55fQUto+XFtTU= -github.com/martinlindhe/base36 v1.1.1 h1:1F1MZ5MGghBXDZ2KJ3QfxmiydlWOGB8HCEtkap5NkVg= -github.com/martinlindhe/base36 v1.1.1/go.mod h1:vMS8PaZ5e/jV9LwFKlm0YLnXl/hpOihiBxKkIoc3g08= -github.com/mdp/qrterminal/v3 v3.2.0 h1:qteQMXO3oyTK4IHwj2mWsKYYRBOp1Pj2WRYFYYNTCdk= -github.com/mdp/qrterminal/v3 v3.2.0/go.mod h1:XGGuua4Lefrl7TLEsSONiD+UEjQXJZ4mPzF+gWYIJkk= -github.com/mjudeikis/kcp-multicluster-provider v0.0.0-20250818102159-3d31cbb06ebe h1:rSMxNO43EhRCu49OxJrcueT3x8QJdtDgg9QNsjj8UCI= -github.com/mjudeikis/kcp-multicluster-provider v0.0.0-20250818102159-3d31cbb06ebe/go.mod h1:AQbVcrm76lpSFQ/8Gkbf0ev1eTqbk+dynDw6IW8oprA= -github.com/mjudeikis/sigs-multicluster-runtime v0.0.0-20250818101434-d8ebc45e169b h1:rWXhKkj+BFmR08VYCRVW1/5n+PgKAzcrueYVPjN3K/g= -github.com/mjudeikis/sigs-multicluster-runtime v0.0.0-20250818101434-d8ebc45e169b/go.mod h1:CpBzLMLQKdm+UCchd2FiGPiDdCxM5dgCCPKuaQ6Fsv0= -github.com/moby/term v0.5.0 h1:xt8Q1nalod/v7BqbG21f8mQPqH+xAaC9C3N3wfWbVP0= -github.com/moby/term v0.5.0/go.mod h1:8FzsFHVUBGZdbDsJw/ot+X+d5HLUbvklYLJ9uGfcI3Y= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= -github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 h1:n6/2gBQ3RWajuToeY6ZtZTIKv2v7ThUy5KKusIT0yc0= -github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00/go.mod h1:Pm3mSP3c5uWn86xMLZ5Sa7JB9GsEZySvHYXCTK4E9q4= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/onsi/ginkgo/v2 v2.22.1 h1:QW7tbJAUDyVDVOM5dFa7qaybo+CRfR7bemlQUN6Z8aM= github.com/onsi/ginkgo/v2 v2.22.1/go.mod h1:S6aTpoRsSq2cZOd+pssHAlKW/Q/jZt6cPrPlnj4a1xM= github.com/onsi/gomega v1.36.2 h1:koNYke6TVk6ZmnyHrCXba/T/MoLBXFjeC1PtvYgw0A8= github.com/onsi/gomega v1.36.2/go.mod h1:DdwyADRjrc825LhMEkD76cHR5+pUnjhUN8GlHlRPHzY= -github.com/peterbourgon/diskv v2.0.1+incompatible h1:UBdAOUP5p4RWqPBg048CAvpKN+vxiaj6gdUUzhl4XmI= -github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/pquerna/cachecontrol v0.1.0 h1:yJMy84ti9h/+OEWa752kBTKv4XC30OtVVHYv/8cTqKc= -github.com/pquerna/cachecontrol v0.1.0/go.mod h1:NrUG3Z7Rdu85UNR3vm7SOsl1nFIeSiQnrHV5K9mBcUI= github.com/prometheus/client_golang v1.22.0 h1:rb93p9lokFEsctTys46VnV1kLCDpVZ0a/Y92Vm0Zc6Q= github.com/prometheus/client_golang v1.22.0/go.mod h1:R7ljNsLXhuQXYZYtw6GAE9AZg8Y7vEW5scdCXrWRXC0= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= @@ -207,8 +148,6 @@ github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoG github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII= github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/sergi/go-diff v1.2.0 h1:XU+rvMAioB0UC3q1MFrIQy4Vo5/4VsRDQQXHsEya6xQ= -github.com/sergi/go-diff v1.2.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/soheilhy/cmux v0.1.5 h1:jjzc5WVemNEDTLwv9tlmemhC73tI08BNOIGwBOo10Js= @@ -226,8 +165,6 @@ github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpE github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY= github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= @@ -235,16 +172,10 @@ github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOf github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/tmc/grpc-websocket-proxy v0.0.0-20220101234140-673ab2c3ae75 h1:6fotK7otjonDflCTK0BCfls4SPy3NcCVb5dqqmbRknE= github.com/tmc/grpc-websocket-proxy v0.0.0-20220101234140-673ab2c3ae75/go.mod h1:KO6IkyS8Y3j8OdNO85qEYBsRPuteD+YciPomcXdrMnk= -github.com/vmihailenco/msgpack/v4 v4.3.12 h1:07s4sz9IReOgdikxLTKNbBdqDMLsjPKXwvCazn8G65U= -github.com/vmihailenco/msgpack/v4 v4.3.12/go.mod h1:gborTTJjAo/GWTqqRjrLCn9pgNN+NXzzngzBKDPIqw4= -github.com/vmihailenco/tagparser v0.1.1 h1:quXMXlA39OCbd2wAdTsGDlK9RkOk6Wuw+x37wVyIuWY= -github.com/vmihailenco/tagparser v0.1.1/go.mod h1:OeAg3pn3UbLjkWt+rN9oFYB6u/cQgqMEUPoW2WPyhdI= github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM= github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg= github.com/xiang90/probing v0.0.0-20221125231312-a49e3df8f510 h1:S2dVYn90KE98chqDkyE9Z4N61UnQd+KOfgp5Iu53llk= github.com/xiang90/probing v0.0.0-20221125231312-a49e3df8f510/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= -github.com/xlab/treeprint v1.2.0 h1:HzHnuAF1plUN2zGlAFHbSQP2qJ0ZAD3XF5XD7OesXRQ= -github.com/xlab/treeprint v1.2.0/go.mod h1:gj5Gd3gPdKtR1ikdDK6fnFLdmIS0X30kTTuNd/WEJu0= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.etcd.io/bbolt v1.3.11 h1:yGEzV1wPz2yVCLsD8ZAiGHhHVlczyC9d1rP43/VCRJ0= @@ -301,12 +232,9 @@ golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0/go.mod h1:S9Xr4PYopiDyqSyp5N golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20210916014120-12bc252f5db8/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.40.0 h1:79Xs7wF06Gbdcg4kdCCIQArK11Z1hr5POQ6+fIYHNuY= golang.org/x/net v0.40.0/go.mod h1:y0hY0exeL2Pku80/zKK7tpntoX23cqL3Oa6njdgRtds= golang.org/x/oauth2 v0.29.0 h1:WdYw2tdTK1S8olAzWHdgeqfy+Mtm9XNhv/xJsY65d98= @@ -319,18 +247,12 @@ golang.org/x/sync v0.14.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw= golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= -golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.32.0 h1:DR4lr0TjUs3epypdhTOkMmuF5CDFJ/8pOnbzMZPQ7bg= golang.org/x/term v0.32.0/go.mod h1:uZG1FhGx848Sqfsq4/DlJr3xGGsYMu/L5GW4abiaEPQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.25.0 h1:qVyWApTSYLk/drJRO5mDlNYskwQznZmkpV2c8q9zls4= golang.org/x/text v0.25.0/go.mod h1:WEdwpYrmk1qmdHvhkSTNPm3app7v4rsT8F2UD6+VHIA= golang.org/x/time v0.11.0 h1:/bpjEDfN9tkoN/ryeYHnv5hcMlc8ncjMcM4XBk5NWV0= @@ -345,11 +267,6 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -gomodules.xyz/jsonpatch/v2 v2.4.0 h1:Ci3iUJyx9UeRx7CeFN8ARgGbkESwJK+KB9lLcWxY/Zw= -gomodules.xyz/jsonpatch/v2 v2.4.0/go.mod h1:AH3dM2RI6uoBZxn3LVrfvJ3E0/9dG4cSrbuBJT4moAY= -google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= -google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 h1:9+tzLLstTlPTRyJTh+ah5wIMsBW5c4tQwGTN3thOW9Y= google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9/go.mod h1:mqHbVIp48Muh7Ywss/AD6I5kNVKZMmAa/QEW58Gxp2s= google.golang.org/genproto/googleapis/api v0.0.0-20250106144421-5f5ef82da422 h1:GVIKPyP/kLIyVOgOnTwFOrvQaQUzOzGMCxgFUOEmm24= @@ -361,15 +278,10 @@ google.golang.org/grpc v1.69.2/go.mod h1:vyjdE6jLBI76dgpDojsFGNaHlxdjXN9ghpnd2o7 google.golang.org/protobuf v1.36.5 h1:tPhr+woSbjfYvY6/GPufUoYizxw1cF/yFoxJ2fmpwlM= google.golang.org/protobuf v1.36.5/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/evanphx/json-patch.v4 v4.12.0 h1:n6jtcsulIzXPJaxegRbvFNNrZDjbij7ny3gmSPG+6V4= gopkg.in/evanphx/json-patch.v4 v4.12.0/go.mod h1:p8EYWUEYMpynmqDbY58zCKCFZw8pRWMG4EsWvDvM72M= -gopkg.in/go-jose/go-jose.v2 v2.6.3 h1:nt80fvSDlhKWQgSWyHyy5CfmlQr+asih51R8PTWNKKs= -gopkg.in/go-jose/go-jose.v2 v2.6.3/go.mod h1:zzZDPkNNw/c9IE7Z9jr11mBZQhKQTMzoEEIoEdZlFBI= -gopkg.in/headzoo/surf.v1 v1.0.1 h1:oDBy9b5NlTb2Hvl3hF8NN+Qy7ypC9/g5YDP85pPh13k= -gopkg.in/headzoo/surf.v1 v1.0.1/go.mod h1:T0BH8276y+OPL0E4tisxCFjBVIAKGbwdYU7AS7/EpQQ= gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= gopkg.in/natefinch/lumberjack.v2 v2.2.1 h1:bBRl1b0OH9s/DuPhuXpNl+VtCaJXFZ5/uEFST95x9zc= @@ -383,18 +295,10 @@ k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff h1:/usPimJzUKKu+m+TE36gUy k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff/go.mod h1:5jIi+8yX4RIb8wk3XwBo5Pq2ccx4FP10ohkbSKCZoK8= k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 h1:hwvWFiBzdWw1FhfY1FooPn3kzWuJ8tmbZBHi4zVsl1Y= k8s.io/utils v0.0.0-20250604170112-4c0f3b243397/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= -rsc.io/qr v0.2.0 h1:6vBLea5/NRMVTz8V66gipeLycZMl/+UlFmk8DvqQ6WY= -rsc.io/qr v0.2.0/go.mod h1:IF+uZjkb9fqyeF/4tlBoynqmQxUoPfWEKh921coOuXs= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 h1:jpcvIRr3GLoUoEKRkHKSmGjxb6lWwrBlJsXc+eUYQHM= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw= -sigs.k8s.io/controller-runtime v0.21.0 h1:CYfjpEuicjUecRk+KAeyYh+ouUBn4llGyDYytIGcJS8= -sigs.k8s.io/controller-runtime v0.21.0/go.mod h1:OSg14+F65eWqIu4DceX7k/+QRAbTTvxeQSNSOQpukWM= sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 h1:gBQPwqORJ8d8/YNZWEjoZs7npUVDpVXUUOFfW6CgAqE= sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8/go.mod h1:mdzfpAEoE6DHQEN0uh9ZbOCuHbLK5wOm7dK4ctXE9Tg= -sigs.k8s.io/kustomize/api v0.19.0 h1:F+2HB2mU1MSiR9Hp1NEgoU2q9ItNOaBJl0I4Dlus5SQ= -sigs.k8s.io/kustomize/api v0.19.0/go.mod h1:/BbwnivGVcBh1r+8m3tH1VNxJmHSk1PzP5fkP6lbL1o= -sigs.k8s.io/kustomize/kyaml v0.19.0 h1:RFge5qsO1uHhwJsu3ipV7RNolC7Uozc0jUBC/61XSlA= -sigs.k8s.io/kustomize/kyaml v0.19.0/go.mod h1:FeKD5jEOH+FbZPpqUghBP8mrLjJ3+zD3/rf9NNu1cwY= sigs.k8s.io/randfill v0.0.0-20250304075658-069ef1bbf016/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY= sigs.k8s.io/randfill v1.0.0 h1:JfjMILfT8A6RbawdsK2JXGBR5AQVfd+9TbzrlneTyrU= sigs.k8s.io/randfill v1.0.0/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY= From 41484ca9197aba08a70921a0c84026f53bfa1598 Mon Sep 17 00:00:00 2001 From: "Nelo-T. Wallus" Date: Thu, 18 Sep 2025 11:13:25 +0200 Subject: [PATCH 04/13] make fix-lint Signed-off-by: Nelo-T. Wallus Signed-off-by: Nelo-T. Wallus --- cli/pkg/kubectl/base/options.go | 2 +- cli/pkg/kubectl/bind-apiservice/cmd/cmd.go | 2 +- cli/pkg/kubectl/bind-apiservice/plugin/bind.go | 6 +++--- .../kubectl/bind-apiservice/plugin/konnector.go | 17 ++++++++--------- .../kubectl/bind-apiservice/plugin/secret.go | 4 ++-- .../bind-apiservice/plugin/servicebindings.go | 10 +++++----- cli/pkg/kubectl/bind/cmd/cmd.go | 2 +- cli/pkg/kubectl/bind/plugin/authenticate.go | 7 ++++--- cli/pkg/kubectl/bind/plugin/bind.go | 6 +++--- kcp/bootstrap/options/options.go | 1 - kcp/cmd/kcp-init/main.go | 2 +- .../kubebind/v1alpha1/apiserviceexport_types.go | 2 ++ sdk/apis/kubebind/v1alpha1/register.go | 8 ++++---- sdk/apis/kubebind/v1alpha2/boundchema_types.go | 2 +- sdk/apis/kubebind/v1alpha2/register.go | 8 ++++---- .../apis/conditions/v1alpha1/constants.go | 2 +- .../apis/conditions/v1alpha1/register.go | 2 +- .../conditions/util/conditions/getter.go | 4 ++-- .../conditions/util/conditions/merge.go | 12 ++++++------ .../conditions/util/conditions/setter.go | 4 ++-- 20 files changed, 52 insertions(+), 51 deletions(-) diff --git a/cli/pkg/kubectl/base/options.go b/cli/pkg/kubectl/base/options.go index a3643eac6..9e4ef0046 100644 --- a/cli/pkg/kubectl/base/options.go +++ b/cli/pkg/kubectl/base/options.go @@ -56,7 +56,7 @@ func (o *Options) BindFlags(cmd *cobra.Command) { cmd.Flags().StringVar(&o.Kubeconfig, "kubeconfig", o.Kubeconfig, "path to the kubeconfig file") // We add only a subset of kubeconfig-related flags to the plugin. - // All those with with LongName == "" will be ignored. + // All those with LongName == "" will be ignored. kubectlConfigOverrideFlags := clientcmd.RecommendedConfigOverrideFlags("") kubectlConfigOverrideFlags.AuthOverrideFlags.ClientCertificate.LongName = "" kubectlConfigOverrideFlags.AuthOverrideFlags.ClientKey.LongName = "" diff --git a/cli/pkg/kubectl/bind-apiservice/cmd/cmd.go b/cli/pkg/kubectl/bind-apiservice/cmd/cmd.go index ea0b3a64a..97eaa99f6 100644 --- a/cli/pkg/kubectl/bind-apiservice/cmd/cmd.go +++ b/cli/pkg/kubectl/bind-apiservice/cmd/cmd.go @@ -67,7 +67,7 @@ func New(streams genericclioptions.IOStreams) (*cobra.Command, error) { if !opts.NoBanner { yellow := color.New(color.BgRed, color.FgBlack).SprintFunc() - fmt.Fprintf(streams.ErrOut, "%s\n\n", yellow("DISCLAIMER: This is a prototype. It will change in incompatible ways at any time.")) //nolint:errcheck + fmt.Fprintf(streams.ErrOut, "%s\n\n", yellow("DISCLAIMER: This is a prototype. It will change in incompatible ways at any time.")) } return opts.Run(cmd.Context()) diff --git a/cli/pkg/kubectl/bind-apiservice/plugin/bind.go b/cli/pkg/kubectl/bind-apiservice/plugin/bind.go index e303e2fcc..64670d11a 100644 --- a/cli/pkg/kubectl/bind-apiservice/plugin/bind.go +++ b/cli/pkg/kubectl/bind-apiservice/plugin/bind.go @@ -143,7 +143,7 @@ func (b *BindAPIServiceOptions) Validate() error { // Run starts the binding process. func (b *BindAPIServiceOptions) Run(ctx context.Context) error { - //nolint:staticcheck + config, err := b.Options.ClientConfig.ClientConfig() if err != nil { return err @@ -177,7 +177,7 @@ func (b *BindAPIServiceOptions) Run(ctx context.Context) error { return err } - fmt.Fprintln(b.Options.ErrOut) //nolint:errcheck + fmt.Fprintln(b.Options.ErrOut) return b.printTable(ctx, config, bindings) } @@ -235,7 +235,7 @@ func (b *BindAPIServiceOptions) getRequestManifest() ([]byte, error) { if err != nil { return nil, fmt.Errorf("failed to get %s: %w", b.url, err) } - defer resp.Body.Close() //nolint:errcheck + defer resp.Body.Close() body, err := io.ReadAll(resp.Body) if err != nil { return nil, fmt.Errorf("failed to read response body: %w", err) diff --git a/cli/pkg/kubectl/bind-apiservice/plugin/konnector.go b/cli/pkg/kubectl/bind-apiservice/plugin/konnector.go index 27e2d3cf2..169fc6675 100644 --- a/cli/pkg/kubectl/bind-apiservice/plugin/konnector.go +++ b/cli/pkg/kubectl/bind-apiservice/plugin/konnector.go @@ -42,7 +42,6 @@ const ( konnectorImage = "ghcr.io/kube-bind/konnector" ) -//nolint:unused func (b *BindAPIServiceOptions) deployKonnector(ctx context.Context, config *rest.Config) error { logger := klog.FromContext(ctx) @@ -69,7 +68,7 @@ func (b *BindAPIServiceOptions) deployKonnector(ctx context.Context, config *res } if b.KonnectorImageOverride != "" { - fmt.Fprintf(b.Options.ErrOut, "🚀 Deploying konnector %s to namespace kube-bind with custom image %q.\n", bindVersion, b.KonnectorImageOverride) //nolint:errcheck + fmt.Fprintf(b.Options.ErrOut, "🚀 Deploying konnector %s to namespace kube-bind with custom image %q.\n", bindVersion, b.KonnectorImageOverride) if err := konnector.Bootstrap(ctx, discoveryClient, dynamicClient, b.KonnectorImageOverride); err != nil { return err } @@ -82,7 +81,7 @@ func (b *BindAPIServiceOptions) deployKonnector(ctx context.Context, config *res konnectorImage := fmt.Sprintf("%s:%s", konnectorImage, bindVersion) if installed && (konnectorVersion == "unknown" || konnectorVersion == "latest") { - fmt.Fprintf(b.Options.ErrOut, "ℹī¸ konnector of %s version already installed, skipping\n", konnectorVersion) //nolint:errcheck + fmt.Fprintf(b.Options.ErrOut, "ℹī¸ konnector of %s version already installed, skipping\n", konnectorVersion) // fall through to CRD test } else if installed { konnectorSemVer, err := semver.Parse(strings.TrimLeft(konnectorVersion, "v")) @@ -94,15 +93,15 @@ func (b *BindAPIServiceOptions) deployKonnector(ctx context.Context, config *res return fmt.Errorf("failed to parse kubectl-bind SemVer version %q: %w", bindVersion, err) } if bindSemVer.GT(konnectorSemVer) { - fmt.Fprintf(b.Options.ErrOut, "🚀 Updating konnector from %s to %s.\n", konnectorVersion, bindVersion) //nolint:errcheck + fmt.Fprintf(b.Options.ErrOut, "🚀 Updating konnector from %s to %s.\n", konnectorVersion, bindVersion) if err := konnector.Bootstrap(ctx, discoveryClient, dynamicClient, konnectorImage); err != nil { return err } } else if bindSemVer.LT(konnectorSemVer) { - fmt.Fprintf(b.Options.ErrOut, "⚠ī¸ Newer konnector %s installed. To downgrade to %s use --downgrade-konnector.\n", konnectorVersion, bindVersion) //nolint:errcheck + fmt.Fprintf(b.Options.ErrOut, "⚠ī¸ Newer konnector %s installed. To downgrade to %s use --downgrade-konnector.\n", konnectorVersion, bindVersion) } } else { - fmt.Fprintf(b.Options.ErrOut, "🚀 Deploying konnector %s to namespace kube-bind.\n", bindVersion) //nolint:errcheck + fmt.Fprintf(b.Options.ErrOut, "🚀 Deploying konnector %s to namespace kube-bind.\n", bindVersion) if err := konnector.Bootstrap(ctx, discoveryClient, dynamicClient, konnectorImage); err != nil { return err } @@ -113,17 +112,17 @@ func (b *BindAPIServiceOptions) deployKonnector(ctx context.Context, config *res _, err := bindClient.KubeBindV1alpha2().APIServiceBindings().List(ctx, metav1.ListOptions{}) if err == nil { if !first { - fmt.Fprintln(b.Options.IOStreams.ErrOut) //nolint:errcheck + fmt.Fprintln(b.Options.IOStreams.ErrOut) } return true, nil } logger.V(2).Info("Waiting for APIServiceBindings to be served", "error", err, "host", bindClient.RESTClient()) if first { - fmt.Fprint(b.Options.IOStreams.ErrOut, " Waiting for the konnector to be ready") //nolint:errcheck + fmt.Fprint(b.Options.IOStreams.ErrOut, " Waiting for the konnector to be ready") first = false } else { - fmt.Fprint(b.Options.IOStreams.ErrOut, ".") //nolint:errcheck + fmt.Fprint(b.Options.IOStreams.ErrOut, ".") } return false, nil }) diff --git a/cli/pkg/kubectl/bind-apiservice/plugin/secret.go b/cli/pkg/kubectl/bind-apiservice/plugin/secret.go index d0cd77300..f10823cf1 100644 --- a/cli/pkg/kubectl/bind-apiservice/plugin/secret.go +++ b/cli/pkg/kubectl/bind-apiservice/plugin/secret.go @@ -43,7 +43,7 @@ func (b *BindAPIServiceOptions) createKubeconfigSecret(ctx context.Context, conf }, metav1.CreateOptions{}); err != nil && !apierrors.IsAlreadyExists(err) { return "", err } else if err == nil { - fmt.Fprintf(b.Options.IOStreams.ErrOut, "đŸ“Ļ Created kube-binding namespace.\n") //nolint:errcheck + fmt.Fprintf(b.Options.IOStreams.ErrOut, "đŸ“Ļ Created kube-binding namespace.\n") } // look for secret of the given identity @@ -54,7 +54,7 @@ func (b *BindAPIServiceOptions) createKubeconfigSecret(ctx context.Context, conf return secretName, nil } - fmt.Fprintf(b.Options.IOStreams.ErrOut, "🔒 Creating secret for host %s, namespace %s\n", remoteHost, remoteNamespace) //nolint:errcheck + fmt.Fprintf(b.Options.IOStreams.ErrOut, "🔒 Creating secret for host %s, namespace %s\n", remoteHost, remoteNamespace) secretName, err = b.ensureKubeconfigSecretWithLogging(ctx, kubeconfig, "", kubeClient) if err != nil { return "", err diff --git a/cli/pkg/kubectl/bind-apiservice/plugin/servicebindings.go b/cli/pkg/kubectl/bind-apiservice/plugin/servicebindings.go index e7825d408..f260abb1e 100644 --- a/cli/pkg/kubectl/bind-apiservice/plugin/servicebindings.go +++ b/cli/pkg/kubectl/bind-apiservice/plugin/servicebindings.go @@ -54,7 +54,7 @@ func (b *BindAPIServiceOptions) createAPIServiceBindings(ctx context.Context, co if existing.Spec.KubeconfigSecretRef.Namespace != "kube-bind" || existing.Spec.KubeconfigSecretRef.Name != secretName { return nil, fmt.Errorf("found existing APIServiceBinding %s not from this service provider", name) } - fmt.Fprintf(b.Options.IOStreams.ErrOut, "✅ Updating existing APIServiceBinding %s.\n", existing.Name) //nolint:errcheck + fmt.Fprintf(b.Options.IOStreams.ErrOut, "✅ Updating existing APIServiceBinding %s.\n", existing.Name) bindings = append(bindings, existing) // checking CRD to match the binding @@ -74,7 +74,7 @@ func (b *BindAPIServiceOptions) createAPIServiceBindings(ctx context.Context, co if err := wait.PollUntilContextCancel(ctx, 1*time.Second, false, func(ctx context.Context) (bool, error) { if !first { first = false - fmt.Fprint(b.Options.IOStreams.ErrOut, ".") //nolint:errcheck + fmt.Fprint(b.Options.IOStreams.ErrOut, ".") } created, err := bindClient.KubeBindV1alpha2().APIServiceBindings().Create(ctx, &kubebindv1alpha2.APIServiceBinding{ ObjectMeta: metav1.ObjectMeta{ @@ -102,13 +102,13 @@ func (b *BindAPIServiceOptions) createAPIServiceBindings(ctx context.Context, co conditionsapi.ConditionSeverityInfo, "Pending", ) - _, _ = bindClient.KubeBindV1alpha2().APIServiceBindings().UpdateStatus(ctx, created, metav1.UpdateOptions{}) //nolint:errcheck + _, _ = bindClient.KubeBindV1alpha2().APIServiceBindings().UpdateStatus(ctx, created, metav1.UpdateOptions{}) - fmt.Fprintf(b.Options.IOStreams.ErrOut, "✅ Created APIServiceBinding %s.%s\n", resource.Resource, resource.Group) //nolint:errcheck + fmt.Fprintf(b.Options.IOStreams.ErrOut, "✅ Created APIServiceBinding %s.%s\n", resource.Resource, resource.Group) bindings = append(bindings, created) return true, nil }); err != nil { - fmt.Fprintln(b.Options.IOStreams.ErrOut, "") //nolint:errcheck + fmt.Fprintln(b.Options.IOStreams.ErrOut, "") return nil, err } } diff --git a/cli/pkg/kubectl/bind/cmd/cmd.go b/cli/pkg/kubectl/bind/cmd/cmd.go index 0e3c88410..773972f0c 100644 --- a/cli/pkg/kubectl/bind/cmd/cmd.go +++ b/cli/pkg/kubectl/bind/cmd/cmd.go @@ -78,7 +78,7 @@ func New(streams genericclioptions.IOStreams) (*cobra.Command, error) { } yellow := color.New(color.BgRed, color.FgBlack).SprintFunc() - fmt.Fprintf(streams.ErrOut, "%s\n\n", yellow("DISCLAIMER: This is a prototype. It will change in incompatible ways at any time.")) //nolint:errcheck + fmt.Fprintf(streams.ErrOut, "%s\n\n", yellow("DISCLAIMER: This is a prototype. It will change in incompatible ways at any time.")) if len(args) == 0 { return cmd.Help() diff --git a/cli/pkg/kubectl/bind/plugin/authenticate.go b/cli/pkg/kubectl/bind/plugin/authenticate.go index 77762c7ba..e1af75072 100644 --- a/cli/pkg/kubectl/bind/plugin/authenticate.go +++ b/cli/pkg/kubectl/bind/plugin/authenticate.go @@ -83,9 +83,10 @@ func getProvider(url string, insecure bool) (*kubebindv1alpha2.BindingProvider, } func validateProviderVersion(providerVersion string) error { - if providerVersion == "" { + switch providerVersion { + case "": return fmt.Errorf("provider version %q is empty, please update the backend to v0.5.0+", providerVersion) - } else if providerVersion == "v0.0.0" || providerVersion == "v0.0.0-master+$Format:%H$" { + case "v0.0.0", "v0.0.0-master+$Format:%H$": // unversioned, development version return nil } @@ -134,7 +135,7 @@ func (b *BindOptions) authenticate(provider *kubebindv1alpha2.BindingProvider, c values.Add("c", clusterID) u.RawQuery = values.Encode() - fmt.Fprintf(b.Options.ErrOut, "\nTo authenticate, visit in your browser:\n\n\t%s\n", u.String()) //nolint:errcheck + fmt.Fprintf(b.Options.ErrOut, "\nTo authenticate, visit in your browser:\n\n\t%s\n", u.String()) // TODO(sttts): callback backend, not 127.0.0.1 if false { diff --git a/cli/pkg/kubectl/bind/plugin/bind.go b/cli/pkg/kubectl/bind/plugin/bind.go index 7cb34f8e8..3e6997bfe 100644 --- a/cli/pkg/kubectl/bind/plugin/bind.go +++ b/cli/pkg/kubectl/bind/plugin/bind.go @@ -174,7 +174,7 @@ func (b *BindOptions) Run(ctx context.Context, urlCh chan<- string) error { if ns, err = kubeClient.CoreV1().Namespaces().Create(ctx, ns, metav1.CreateOptions{}); err != nil { return err } else { - fmt.Fprintf(b.Options.IOStreams.ErrOut, "đŸ“Ļ Created kube-bind namespace.\n") //nolint:errcheck + fmt.Fprintf(b.Options.IOStreams.ErrOut, "đŸ“Ļ Created kube-bind namespace.\n") } } @@ -197,7 +197,7 @@ func (b *BindOptions) Run(ctx context.Context, urlCh chan<- string) error { return err } - fmt.Fprintf(b.IOStreams.ErrOut, "🔑 Successfully authenticated to %s\n", exportURL.String()) //nolint:errcheck + fmt.Fprintf(b.IOStreams.ErrOut, "🔑 Successfully authenticated to %s\n", exportURL.String()) // verify the response if gvk.GroupVersion() != kubebindv1alpha2.SchemeGroupVersion || gvk.Kind != "BindingResponse" { @@ -292,7 +292,7 @@ func (b *BindOptions) Run(ctx context.Context, urlCh chan<- string) error { // TODO: support passing through the base options - fmt.Fprintf(b.Options.ErrOut, "🚀 Executing: %s %s\n", "kubectl bind", strings.Join(args, " ")) //nolint:errcheck + fmt.Fprintf(b.Options.ErrOut, "🚀 Executing: %s %s\n", "kubectl bind", strings.Join(args, " ")) fmt.Fprintf(b.Options.ErrOut, "✨ Use \"-o yaml\" and \"--dry-run\" to get the APIServiceExportRequest.\n and pass it to \"kubectl bind apiservice\" directly. Great for automation.\n") command := exec.CommandContext(ctx, executable, append(args, "--no-banner")...) command.Stdin = bytes.NewReader(bs) diff --git a/kcp/bootstrap/options/options.go b/kcp/bootstrap/options/options.go index fbc4ef89b..95870c331 100644 --- a/kcp/bootstrap/options/options.go +++ b/kcp/bootstrap/options/options.go @@ -60,7 +60,6 @@ func (options *Options) AddFlags(fs *pflag.FlagSet) { fs.StringVar(&options.KCPKubeConfig, "kcp-kubeconfig", options.KCPKubeConfig, "path to a kcp kubeconfig. Required to bootstrap the server.") fs.StringVar(&options.KCPContext, "context", options.KCPContext, "Name of the context in the kcp kubeconfig file to use") - } func (options *Options) Complete() (*CompletedOptions, error) { diff --git a/kcp/cmd/kcp-init/main.go b/kcp/cmd/kcp-init/main.go index fc4cee8cd..e4791cb0d 100644 --- a/kcp/cmd/kcp-init/main.go +++ b/kcp/cmd/kcp-init/main.go @@ -33,7 +33,7 @@ import ( func main() { ctx := genericapiserver.SetupSignalContext() if err := run(ctx); err != nil { - fmt.Fprintf(os.Stderr, "Error: %v", err) // nolint: errcheck + fmt.Fprintf(os.Stderr, "Error: %v", err) os.Exit(1) } } diff --git a/sdk/apis/kubebind/v1alpha1/apiserviceexport_types.go b/sdk/apis/kubebind/v1alpha1/apiserviceexport_types.go index 48d4f7fb1..1a9a6a975 100644 --- a/sdk/apis/kubebind/v1alpha1/apiserviceexport_types.go +++ b/sdk/apis/kubebind/v1alpha1/apiserviceexport_types.go @@ -168,6 +168,8 @@ type APIServiceExportVersion struct { // +required // +kubebuilder:validation:Required Storage bool `json:"storage"` + + //nolint:gocritic // deprecatedComment: the proper format is // deprecated indicates this version of the custom resource API is deprecated. // When set to true, API requests to this version receive a warning header in the server response. // Defaults to false. diff --git a/sdk/apis/kubebind/v1alpha1/register.go b/sdk/apis/kubebind/v1alpha1/register.go index 40cc76723..bbfdf10af 100644 --- a/sdk/apis/kubebind/v1alpha1/register.go +++ b/sdk/apis/kubebind/v1alpha1/register.go @@ -28,17 +28,17 @@ var ( ) const ( - // GroupName is the group name used in this package + // GroupName is the group name used in this package. GroupName = "kube-bind.io" - // GroupVersion is the group version used in this package + // GroupVersion is the group version used in this package. GroupVersion = "v1alpha1" ) -// SchemeGroupVersion is group version used to register these objects +// SchemeGroupVersion is group version used to register these objects. var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: GroupVersion} -// Resource takes an unqualified resource and returns a Group qualified GroupResource +// Resource takes an unqualified resource and returns a Group qualified GroupResource. func Resource(resource string) schema.GroupResource { return SchemeGroupVersion.WithResource(resource).GroupResource() } diff --git a/sdk/apis/kubebind/v1alpha2/boundchema_types.go b/sdk/apis/kubebind/v1alpha2/boundchema_types.go index a1122d772..a3d2193d4 100644 --- a/sdk/apis/kubebind/v1alpha2/boundchema_types.go +++ b/sdk/apis/kubebind/v1alpha2/boundchema_types.go @@ -118,7 +118,7 @@ type CustomResourceConversion struct { Webhook *WebhookConversion `json:"webhook,omitempty"` } -// WebhookConversion describes how to call a conversion webhook +// WebhookConversion describes how to call a conversion webhook. type WebhookConversion struct { // clientConfig is the instructions for how to call the webhook if strategy is `Webhook`. // +optional diff --git a/sdk/apis/kubebind/v1alpha2/register.go b/sdk/apis/kubebind/v1alpha2/register.go index 990552c55..90f0e283e 100644 --- a/sdk/apis/kubebind/v1alpha2/register.go +++ b/sdk/apis/kubebind/v1alpha2/register.go @@ -28,17 +28,17 @@ var ( ) const ( - // GroupName is the group name used in this package + // GroupName is the group name used in this package. GroupName = "kube-bind.io" - // GroupVersion is the group version used in this package + // GroupVersion is the group version used in this package. GroupVersion = "v1alpha2" ) -// SchemeGroupVersion is group version used to register these objects +// SchemeGroupVersion is group version used to register these objects. var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: GroupVersion} -// Resource takes an unqualified resource and returns a Group qualified GroupResource +// Resource takes an unqualified resource and returns a Group qualified GroupResource. func Resource(resource string) schema.GroupResource { return SchemeGroupVersion.WithResource(resource).GroupResource() } diff --git a/sdk/apis/third_party/conditions/apis/conditions/v1alpha1/constants.go b/sdk/apis/third_party/conditions/apis/conditions/v1alpha1/constants.go index 58f3de812..a6657cd12 100644 --- a/sdk/apis/third_party/conditions/apis/conditions/v1alpha1/constants.go +++ b/sdk/apis/third_party/conditions/apis/conditions/v1alpha1/constants.go @@ -75,7 +75,7 @@ const ( // ControlPlaneReadyCondition reports the ready condition from the control plane object defined for this cluster. // This condition is mirrored from the Ready condition in the control plane ref object, and // the absence of this condition might signal problems in the reconcile external loops or the fact that - // the control plane provider does not not implements the Ready condition yet. + // the control plane provider does not implements the Ready condition yet. ControlPlaneReadyCondition ConditionType = "ControlPlaneReady" // WaitingForControlPlaneFallbackReason (Severity=Info) documents a cluster waiting for the control plane diff --git a/sdk/apis/third_party/conditions/apis/conditions/v1alpha1/register.go b/sdk/apis/third_party/conditions/apis/conditions/v1alpha1/register.go index 75c86f7ef..9b46683ff 100644 --- a/sdk/apis/third_party/conditions/apis/conditions/v1alpha1/register.go +++ b/sdk/apis/third_party/conditions/apis/conditions/v1alpha1/register.go @@ -20,5 +20,5 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" ) -// SchemeGroupVersion is group version used to register these objects +// SchemeGroupVersion is group version used to register these objects. var SchemeGroupVersion = schema.GroupVersion{Group: "conditions.kube-bind.io", Version: "v1alpha1"} diff --git a/sdk/apis/third_party/conditions/util/conditions/getter.go b/sdk/apis/third_party/conditions/util/conditions/getter.go index 58458cd4e..c869c1293 100644 --- a/sdk/apis/third_party/conditions/util/conditions/getter.go +++ b/sdk/apis/third_party/conditions/util/conditions/getter.go @@ -224,7 +224,7 @@ func mirror(from Getter, targetCondition conditionsapi.ConditionType, options .. case true: condition = TrueCondition(targetCondition) case false: - condition = FalseCondition(targetCondition, mirrorOpt.fallbackReason, mirrorOpt.fallbackSeverity, mirrorOpt.fallbackMessage) + condition = FalseCondition(targetCondition, mirrorOpt.fallbackReason, mirrorOpt.fallbackSeverity, "%s", mirrorOpt.fallbackMessage) } } @@ -235,7 +235,7 @@ func mirror(from Getter, targetCondition conditionsapi.ConditionType, options .. return condition } -// Aggregates all the the Ready condition from a list of dependent objects into the target object; +// Aggregates all the Ready condition from a list of dependent objects into the target object; // if the Ready condition does not exists in one of the source object, the object is excluded from // the aggregation; if none of the source object have ready condition, no target conditions is generated. func aggregate(from []Getter, targetCondition conditionsapi.ConditionType, options ...MergeOption) *conditionsapi.Condition { diff --git a/sdk/apis/third_party/conditions/util/conditions/merge.go b/sdk/apis/third_party/conditions/util/conditions/merge.go index c2282fb90..2adb58453 100644 --- a/sdk/apis/third_party/conditions/util/conditions/merge.go +++ b/sdk/apis/third_party/conditions/util/conditions/merge.go @@ -64,9 +64,9 @@ func merge(conditions []localizedCondition, targetCondition conditionsapi.Condit targetReason := getReason(g, options) targetMessage := getMessage(g, options) if g.TopGroup().status == corev1.ConditionFalse { - return FalseCondition(targetCondition, targetReason, g.TopGroup().severity, targetMessage) + return FalseCondition(targetCondition, targetReason, g.TopGroup().severity, "%s", targetMessage) } - return UnknownCondition(targetCondition, targetReason, targetMessage) + return UnknownCondition(targetCondition, targetReason, "%s", targetMessage) } // getConditionGroups groups a list of conditions according to status, severity values. @@ -132,7 +132,7 @@ func (g conditionGroups) Swap(i, j int) { g[i], g[j] = g[j], g[i] } -// TopGroup returns the the condition group with the highest mergePriority. +// TopGroup returns the condition group with the highest mergePriority. func (g conditionGroups) TopGroup() *conditionGroup { if len(g) == 0 { return nil @@ -140,17 +140,17 @@ func (g conditionGroups) TopGroup() *conditionGroup { return &g[0] } -// TrueGroup returns the the condition group with status True, if any. +// TrueGroup returns the condition group with status True, if any. func (g conditionGroups) TrueGroup() *conditionGroup { return g.getByStatusAndSeverity(corev1.ConditionTrue, conditionsapi.ConditionSeverityNone) } -// ErrorGroup returns the the condition group with status False and severity Error, if any. +// ErrorGroup returns the condition group with status False and severity Error, if any. func (g conditionGroups) ErrorGroup() *conditionGroup { return g.getByStatusAndSeverity(corev1.ConditionFalse, conditionsapi.ConditionSeverityError) } -// WarningGroup returns the the condition group with status False and severity Warning, if any. +// WarningGroup returns the condition group with status False and severity Warning, if any. func (g conditionGroups) WarningGroup() *conditionGroup { return g.getByStatusAndSeverity(corev1.ConditionFalse, conditionsapi.ConditionSeverityWarning) } diff --git a/sdk/apis/third_party/conditions/util/conditions/setter.go b/sdk/apis/third_party/conditions/util/conditions/setter.go index 132260bdd..af0ad1a61 100644 --- a/sdk/apis/third_party/conditions/util/conditions/setter.go +++ b/sdk/apis/third_party/conditions/util/conditions/setter.go @@ -127,13 +127,13 @@ func SetSummary(to Setter, options ...MergeOption) { Set(to, summary(to, options...)) } -// SetMirror creates a new condition by mirroring the the Ready condition from a dependent object; +// SetMirror creates a new condition by mirroring the Ready condition from a dependent object; // if the Ready condition does not exists in the source object, no target conditions is generated. func SetMirror(to Setter, targetCondition conditionsapi.ConditionType, from Getter, options ...MirrorOptions) { Set(to, mirror(from, targetCondition, options...)) } -// SetAggregate creates a new condition with the aggregation of all the the Ready condition +// SetAggregate creates a new condition with the aggregation of all the Ready condition // from a list of dependent objects; if the Ready condition does not exists in one of the source object, // the object is excluded from the aggregation; if none of the source object have ready condition, // no target conditions is generated. From 5489bf7268c34f30dd9f6cb7d258ab852e18800d Mon Sep 17 00:00:00 2001 From: "Nelo-T. Wallus" Date: Thu, 18 Sep 2025 11:24:22 +0200 Subject: [PATCH 05/13] Fix linter issues Signed-off-by: Nelo-T. Wallus Signed-off-by: Nelo-T. Wallus --- cli/pkg/kubectl/base/kubeconfig.go | 2 +- .../kubectl/bind-apiservice/plugin/bind.go | 7 ++-- .../bind-apiservice/plugin/konnector.go | 38 ++++++++++--------- .../plugin/serviceexportrequest.go | 12 +++--- .../bind/authenticator/authenticator.go | 5 ++- cli/pkg/kubectl/bind/plugin/authenticate.go | 4 +- cli/pkg/kubectl/bind/plugin/bind.go | 4 +- 7 files changed, 40 insertions(+), 32 deletions(-) diff --git a/cli/pkg/kubectl/base/kubeconfig.go b/cli/pkg/kubectl/base/kubeconfig.go index dffe5642d..5bef96ef6 100644 --- a/cli/pkg/kubectl/base/kubeconfig.go +++ b/cli/pkg/kubectl/base/kubeconfig.go @@ -32,7 +32,7 @@ import ( func ParseRemoteKubeconfig(kubeconfig []byte) (host string, ns string, err error) { config, err := clientcmd.Load(kubeconfig) if err != nil { - return "", "", nil + return "", "", err } if _, found := config.Contexts[config.CurrentContext]; !found { return "", "", fmt.Errorf("current context %q of remote kubeconfig not found", config.CurrentContext) diff --git a/cli/pkg/kubectl/bind-apiservice/plugin/bind.go b/cli/pkg/kubectl/bind-apiservice/plugin/bind.go index 64670d11a..691430e71 100644 --- a/cli/pkg/kubectl/bind-apiservice/plugin/bind.go +++ b/cli/pkg/kubectl/bind-apiservice/plugin/bind.go @@ -143,7 +143,6 @@ func (b *BindAPIServiceOptions) Validate() error { // Run starts the binding process. func (b *BindAPIServiceOptions) Run(ctx context.Context) error { - config, err := b.Options.ClientConfig.ClientConfig() if err != nil { return err @@ -231,7 +230,7 @@ func (b *BindAPIServiceOptions) getRemoteKubeconfig(ctx context.Context, config func (b *BindAPIServiceOptions) getRequestManifest() ([]byte, error) { if b.url != "" { - resp, err := http.Get(b.url) + resp, err := http.Get(b.url) //nolint:noctx if err != nil { return nil, fmt.Errorf("failed to get %s: %w", b.url, err) } @@ -241,7 +240,9 @@ func (b *BindAPIServiceOptions) getRequestManifest() ([]byte, error) { return nil, fmt.Errorf("failed to read response body: %w", err) } return body, nil - } else if b.file == "-" { + } + + if b.file == "-" { body, err := io.ReadAll(b.Options.IOStreams.In) if err != nil { return nil, fmt.Errorf("failed to read from stdin: %w", err) diff --git a/cli/pkg/kubectl/bind-apiservice/plugin/konnector.go b/cli/pkg/kubectl/bind-apiservice/plugin/konnector.go index 169fc6675..e55ab73d8 100644 --- a/cli/pkg/kubectl/bind-apiservice/plugin/konnector.go +++ b/cli/pkg/kubectl/bind-apiservice/plugin/konnector.go @@ -80,25 +80,27 @@ func (b *BindAPIServiceOptions) deployKonnector(ctx context.Context, config *res konnectorImage := fmt.Sprintf("%s:%s", konnectorImage, bindVersion) - if installed && (konnectorVersion == "unknown" || konnectorVersion == "latest") { - fmt.Fprintf(b.Options.ErrOut, "ℹī¸ konnector of %s version already installed, skipping\n", konnectorVersion) - // fall through to CRD test - } else if installed { - konnectorSemVer, err := semver.Parse(strings.TrimLeft(konnectorVersion, "v")) - if err != nil { - return fmt.Errorf("failed to parse konnector SemVer version %q: %w", konnectorVersion, err) - } - bindSemVer, err := semver.Parse(strings.TrimLeft(bindVersion, "v")) - if err != nil { - return fmt.Errorf("failed to parse kubectl-bind SemVer version %q: %w", bindVersion, err) - } - if bindSemVer.GT(konnectorSemVer) { - fmt.Fprintf(b.Options.ErrOut, "🚀 Updating konnector from %s to %s.\n", konnectorVersion, bindVersion) - if err := konnector.Bootstrap(ctx, discoveryClient, dynamicClient, konnectorImage); err != nil { - return err + if installed { + if konnectorVersion == "unknown" || konnectorVersion == "latest" { + fmt.Fprintf(b.Options.ErrOut, "ℹī¸ konnector of %s version already installed, skipping\n", konnectorVersion) + // fall through to CRD test + } else { + konnectorSemVer, err := semver.Parse(strings.TrimLeft(konnectorVersion, "v")) + if err != nil { + return fmt.Errorf("failed to parse konnector SemVer version %q: %w", konnectorVersion, err) + } + bindSemVer, err := semver.Parse(strings.TrimLeft(bindVersion, "v")) + if err != nil { + return fmt.Errorf("failed to parse kubectl-bind SemVer version %q: %w", bindVersion, err) + } + if bindSemVer.GT(konnectorSemVer) { + fmt.Fprintf(b.Options.ErrOut, "🚀 Updating konnector from %s to %s.\n", konnectorVersion, bindVersion) + if err := konnector.Bootstrap(ctx, discoveryClient, dynamicClient, konnectorImage); err != nil { + return err + } + } else if bindSemVer.LT(konnectorSemVer) { + fmt.Fprintf(b.Options.ErrOut, "⚠ī¸ Newer konnector %s installed. To downgrade to %s use --downgrade-konnector.\n", konnectorVersion, bindVersion) } - } else if bindSemVer.LT(konnectorSemVer) { - fmt.Fprintf(b.Options.ErrOut, "⚠ī¸ Newer konnector %s installed. To downgrade to %s use --downgrade-konnector.\n", konnectorVersion, bindVersion) } } else { fmt.Fprintf(b.Options.ErrOut, "🚀 Deploying konnector %s to namespace kube-bind.\n", bindVersion) diff --git a/cli/pkg/kubectl/bind-apiservice/plugin/serviceexportrequest.go b/cli/pkg/kubectl/bind-apiservice/plugin/serviceexportrequest.go index ec4bd173c..b28562e63 100644 --- a/cli/pkg/kubectl/bind-apiservice/plugin/serviceexportrequest.go +++ b/cli/pkg/kubectl/bind-apiservice/plugin/serviceexportrequest.go @@ -49,11 +49,13 @@ func (b *BindAPIServiceOptions) createServiceExportRequest( request.GenerateName = "export-" } created, err := bindRemoteClient.KubeBindV1alpha2().APIServiceExportRequests(ns).Create(ctx, request, metav1.CreateOptions{}) - if err != nil && !apierrors.IsAlreadyExists(err) { - return nil, err - } else if err != nil && request.Name == "" { - return nil, err - } else if err != nil { + if err != nil { + if !apierrors.IsAlreadyExists(err) { + return nil, err + } + if request.Name == "" { + return nil, err + } request.GenerateName = request.Name + "-" request.Name = "" created, err = bindRemoteClient.KubeBindV1alpha2().APIServiceExportRequests(ns).Create(ctx, request, metav1.CreateOptions{}) diff --git a/cli/pkg/kubectl/bind/authenticator/authenticator.go b/cli/pkg/kubectl/bind/authenticator/authenticator.go index 69a38d419..02a65e94c 100644 --- a/cli/pkg/kubectl/bind/authenticator/authenticator.go +++ b/cli/pkg/kubectl/bind/authenticator/authenticator.go @@ -73,7 +73,10 @@ func (d *LocalhostCallbackAuthenticator) Start() error { mux := http.NewServeMux() mux.HandleFunc("/callback", d.callback) - d.server = &http.Server{Handler: mux} + d.server = &http.Server{ + Handler: mux, + ReadTimeout: 30 * time.Second, + } listener, err := net.ListenTCP("tcp", address) if err != nil { diff --git a/cli/pkg/kubectl/bind/plugin/authenticate.go b/cli/pkg/kubectl/bind/plugin/authenticate.go index e1af75072..3b9ce644a 100644 --- a/cli/pkg/kubectl/bind/plugin/authenticate.go +++ b/cli/pkg/kubectl/bind/plugin/authenticate.go @@ -40,12 +40,12 @@ func getProvider(url string, insecure bool) (*kubebindv1alpha2.BindingProvider, if insecure { client.Transport = &http.Transport{ TLSClientConfig: &tls.Config{ - InsecureSkipVerify: insecure, + InsecureSkipVerify: insecure, //nolint:gosec }, } } - resp, err := client.Get(url) + resp, err := client.Get(url) //nolint:noctx if err != nil { return nil, err } diff --git a/cli/pkg/kubectl/bind/plugin/bind.go b/cli/pkg/kubectl/bind/plugin/bind.go index 3e6997bfe..3b7eacf7d 100644 --- a/cli/pkg/kubectl/bind/plugin/bind.go +++ b/cli/pkg/kubectl/bind/plugin/bind.go @@ -215,7 +215,7 @@ func (b *BindOptions) Run(ctx context.Context, urlCh chan<- string) error { } // extract the requests - var apiRequests []*kubebindv1alpha2.APIServiceExportRequestResponse + apiRequests := make([]*kubebindv1alpha2.APIServiceExportRequestResponse, len(bindingResponse.Requests)) for i, request := range bindingResponse.Requests { var meta metav1.TypeMeta if err := json.Unmarshal(request.Raw, &meta); err != nil { @@ -228,7 +228,7 @@ func (b *BindOptions) Run(ctx context.Context, urlCh chan<- string) error { if err := json.Unmarshal(request.Raw, &apiRequest); err != nil { return fmt.Errorf("failed to unmarshal api request #%d: %v", i+1, err) } - apiRequests = append(apiRequests, &apiRequest) + apiRequests[i] = &apiRequest } // copy kubeconfig into local cluster From b87e3831b568300224ee5e141b337e904f371c60 Mon Sep 17 00:00:00 2001 From: "Nelo-T. Wallus" Date: Thu, 18 Sep 2025 11:53:00 +0200 Subject: [PATCH 06/13] Merge sdk/client and sdk/apis into the sdk/ package Signed-off-by: Nelo-T. Wallus Signed-off-by: Nelo-T. Wallus --- cli/go.mod | 6 +- docs/generators/cli-doc/go.mod | 9 ++- docs/generators/cli-doc/go.sum | 2 - go.mod | 6 +- hack/update-codegen-clients.sh | 14 ++--- kcp/go.mod | 4 +- sdk/apis/go.mod | 37 ----------- sdk/apis/go.sum | 109 --------------------------------- sdk/{client => }/go.mod | 43 ++++++------- sdk/{client => }/go.sum | 73 +++++++++++----------- 10 files changed, 75 insertions(+), 228 deletions(-) delete mode 100644 sdk/apis/go.mod delete mode 100644 sdk/apis/go.sum rename sdk/{client => }/go.mod (56%) rename sdk/{client => }/go.sum (78%) diff --git a/cli/go.mod b/cli/go.mod index c051c70c6..fb7d802cc 100644 --- a/cli/go.mod +++ b/cli/go.mod @@ -4,8 +4,7 @@ go 1.24.0 replace ( github.com/kube-bind/kube-bind => ../ - github.com/kube-bind/kube-bind/sdk/apis => ../sdk/apis - github.com/kube-bind/kube-bind/sdk/client => ../sdk/client + github.com/kube-bind/kube-bind/sdk => ../sdk ) require ( @@ -13,8 +12,7 @@ require ( github.com/blang/semver/v4 v4.0.0 github.com/fatih/color v1.18.0 github.com/kube-bind/kube-bind v0.0.0-00010101000000-000000000000 - github.com/kube-bind/kube-bind/sdk/apis v0.4.8 - github.com/kube-bind/kube-bind/sdk/client v0.0.0-20250515145715-d9f20e7c840d + github.com/kube-bind/kube-bind/sdk v0.4.1 github.com/mdp/qrterminal/v3 v3.2.0 github.com/muesli/reflow v0.3.0 github.com/spf13/cobra v1.9.1 diff --git a/docs/generators/cli-doc/go.mod b/docs/generators/cli-doc/go.mod index 6f59b79f9..c8d673ddd 100644 --- a/docs/generators/cli-doc/go.mod +++ b/docs/generators/cli-doc/go.mod @@ -4,8 +4,8 @@ go 1.24.0 replace ( github.com/kube-bind/kube-bind => ../../../ - github.com/kube-bind/kube-bind/sdk/apis => ../../../sdk/apis - github.com/kube-bind/kube-bind/sdk/client => ../../../sdk/client + github.com/kube-bind/kube-bind/cli => ../../../cli + github.com/kube-bind/kube-bind/sdk => ../../../sdk ) require ( @@ -51,9 +51,8 @@ require ( github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect - github.com/kube-bind/kube-bind v0.4.8 // indirect - github.com/kube-bind/kube-bind/sdk/apis v0.4.8 // indirect - github.com/kube-bind/kube-bind/sdk/client v0.4.8 // indirect + github.com/kube-bind/kube-bind v0.0.0-00010101000000-000000000000 // indirect + github.com/kube-bind/kube-bind/sdk v0.4.1 // indirect github.com/kylelemons/godebug v1.1.0 // indirect github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect github.com/mailru/easyjson v0.9.0 // indirect diff --git a/docs/generators/cli-doc/go.sum b/docs/generators/cli-doc/go.sum index 95e48537c..a2a5dc282 100644 --- a/docs/generators/cli-doc/go.sum +++ b/docs/generators/cli-doc/go.sum @@ -109,8 +109,6 @@ github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/kube-bind/kube-bind/cli v0.0.0-20250515145715-d9f20e7c840d h1:XNKsPss6lwmEZdNIhiWxVB/dhT8apYwyBgtMAddAUrE= -github.com/kube-bind/kube-bind/cli v0.0.0-20250515145715-d9f20e7c840d/go.mod h1:+Si5+7jDEdgWGwZw0Pho2VGtkNnonEgDLVMThVN2LC4= github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de h1:9TO3cAIGXtEhnIaL+V+BEER86oLrvS+kWobKpbJuye0= diff --git a/go.mod b/go.mod index c9bccacd3..4d5523919 100644 --- a/go.mod +++ b/go.mod @@ -6,8 +6,7 @@ replace ( github.com/kube-bind/kube-bind => ./ github.com/kube-bind/kube-bind/cli => ./cli github.com/kube-bind/kube-bind/contrib => ./contrib - github.com/kube-bind/kube-bind/sdk/apis => ./sdk/apis - github.com/kube-bind/kube-bind/sdk/client => ./sdk/client + github.com/kube-bind/kube-bind/sdk => ./sdk ) // Matches multicluster-runtime v0.21.0-alpha.8 @@ -41,8 +40,7 @@ require ( github.com/kcp-dev/kcp/sdk v0.28.0 github.com/kcp-dev/multicluster-provider v0.1.0 github.com/kube-bind/kube-bind/cli v0.0.0-20250515145715-d9f20e7c840d - github.com/kube-bind/kube-bind/sdk/apis v0.4.8 - github.com/kube-bind/kube-bind/sdk/client v0.0.0-20250515145715-d9f20e7c840d + github.com/kube-bind/kube-bind/sdk v0.4.1 github.com/martinlindhe/base36 v1.1.1 github.com/spf13/cobra v1.9.1 github.com/spf13/pflag v1.0.6 diff --git a/hack/update-codegen-clients.sh b/hack/update-codegen-clients.sh index c6a035a81..0f3420e4c 100755 --- a/hack/update-codegen-clients.sh +++ b/hack/update-codegen-clients.sh @@ -26,17 +26,17 @@ CODEGEN_PKG=${CODEGEN_PKG:-$(cd "${SCRIPT_ROOT}"; go list -f '{{.Dir}}' -m k8s.i source "${CODEGEN_PKG}/kube_codegen.sh" -pushd ./sdk/apis +pushd sdk kube::codegen::gen_helpers \ - --boilerplate "../../hack/boilerplate/boilerplate.generatego.txt" \ - "." + --boilerplate "../hack/boilerplate/boilerplate.generatego.txt" \ + "./apis" +rm -rf ./client kube::codegen::gen_client \ --with-watch \ - --output-dir "../client" \ + --output-dir "./client" \ --output-pkg "github.com/kube-bind/kube-bind/sdk/client" \ - --boilerplate "../../hack/boilerplate/boilerplate.generatego.txt" \ - "." + --boilerplate "../hack/boilerplate/boilerplate.generatego.txt" \ + "./apis" popd - diff --git a/kcp/go.mod b/kcp/go.mod index f9251ebc5..871d027e4 100644 --- a/kcp/go.mod +++ b/kcp/go.mod @@ -4,9 +4,7 @@ go 1.24.0 replace github.com/kube-bind/kube-bind => ../ -replace github.com/kube-bind/kube-bind/sdk/apis => ../sdk/apis - -replace github.com/kube-bind/kube-bind/sdk/client => ../sdk/client +replace github.com/kube-bind/kube-bind/sdk => ../sdk replace github.com/kube-bind/kube-bind/cli => ../cli diff --git a/sdk/apis/go.mod b/sdk/apis/go.mod deleted file mode 100644 index 6c25b1391..000000000 --- a/sdk/apis/go.mod +++ /dev/null @@ -1,37 +0,0 @@ -module github.com/kube-bind/kube-bind/sdk/apis - -go 1.23.0 - -toolchain go1.23.4 - -require ( - github.com/google/go-cmp v0.6.0 - github.com/onsi/gomega v1.36.1 - github.com/stretchr/testify v1.10.0 - k8s.io/api v0.32.0 - k8s.io/apiextensions-apiserver v0.32.0 - k8s.io/apimachinery v0.32.0 - k8s.io/utils v0.0.0-20241210054802-24370beab758 - sigs.k8s.io/yaml v1.4.0 -) - -require ( - github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect - github.com/fxamacker/cbor/v2 v2.7.0 // indirect - github.com/go-logr/logr v1.4.2 // indirect - github.com/gogo/protobuf v1.3.2 // indirect - github.com/google/gofuzz v1.2.0 // indirect - github.com/json-iterator/go v1.1.12 // indirect - github.com/kr/text v0.2.0 // indirect - github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect - github.com/modern-go/reflect2 v1.0.2 // indirect - github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect - github.com/x448/float16 v0.8.4 // indirect - golang.org/x/net v0.30.0 // indirect - golang.org/x/text v0.19.0 // indirect - gopkg.in/inf.v0 v0.9.1 // indirect - gopkg.in/yaml.v3 v3.0.1 // indirect - k8s.io/klog/v2 v2.130.1 // indirect - sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect - sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect -) diff --git a/sdk/apis/go.sum b/sdk/apis/go.sum deleted file mode 100644 index 4699cad4d..000000000 --- a/sdk/apis/go.sum +++ /dev/null @@ -1,109 +0,0 @@ -github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= -github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= -github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/fxamacker/cbor/v2 v2.7.0 h1:iM5WgngdRBanHcxugY4JySA0nk1wZorNOpTgCMedv5E= -github.com/fxamacker/cbor/v2 v2.7.0/go.mod h1:pxXPTn3joSm21Gbwsv0w9OSA2y1HFR9qXEeXQVeNoDQ= -github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= -github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= -github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI= -github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8= -github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= -github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= -github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= -github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= -github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db h1:097atOisP2aRj7vFgYQBbFN4U4JNXUNYpxael3UzMyo= -github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144= -github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= -github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= -github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= -github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= -github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= -github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= -github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= -github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= -github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= -github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= -github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= -github.com/onsi/ginkgo/v2 v2.21.0 h1:7rg/4f3rB88pb5obDgNZrNHrQ4e6WpjonchcpuBRnZM= -github.com/onsi/ginkgo/v2 v2.21.0/go.mod h1:7Du3c42kxCUegi0IImZ1wUQzMBVecgIHjR1C+NkhLQo= -github.com/onsi/gomega v1.36.1 h1:bJDPBO7ibjxcbHMgSCoo4Yj18UWbKDlLwX1x9sybDcw= -github.com/onsi/gomega v1.36.1/go.mod h1:PvZbdDc8J6XJEpDK4HCuRBm8a6Fzp9/DmhC9C7yFlog= -github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= -github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= -github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= -github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= -github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= -github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= -github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= -github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM= -github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg= -github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4= -golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU= -golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo= -golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM= -golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= -golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.26.0 h1:v/60pFQmzmT9ExmjDv2gGIfi3OqfKoEP6I5+umXlbnQ= -golang.org/x/tools v0.26.0/go.mod h1:TPVVj70c7JJ3WCazhD8OdXcZg/og+b9+tH/KxylGwH0= -golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= -gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= -gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= -gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= -gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= -gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -k8s.io/api v0.32.0 h1:OL9JpbvAU5ny9ga2fb24X8H6xQlVp+aJMFlgtQjR9CE= -k8s.io/api v0.32.0/go.mod h1:4LEwHZEf6Q/cG96F3dqR965sYOfmPM7rq81BLgsE0p0= -k8s.io/apiextensions-apiserver v0.32.0 h1:S0Xlqt51qzzqjKPxfgX1xh4HBZE+p8KKBq+k2SWNOE0= -k8s.io/apiextensions-apiserver v0.32.0/go.mod h1:86hblMvN5yxMvZrZFX2OhIHAuFIMJIZ19bTvzkP+Fmw= -k8s.io/apimachinery v0.32.0 h1:cFSE7N3rmEEtv4ei5X6DaJPHHX0C+upp+v5lVPiEwpg= -k8s.io/apimachinery v0.32.0/go.mod h1:GpHVgxoKlTxClKcteaeuF1Ul/lDVb74KpZcxcmLDElE= -k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk= -k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= -k8s.io/utils v0.0.0-20241210054802-24370beab758 h1:sdbE21q2nlQtFh65saZY+rRM6x6aJJI8IUa1AmH/qa0= -k8s.io/utils v0.0.0-20241210054802-24370beab758/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= -sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 h1:/Rv+M11QRah1itp8VhT6HoVx1Ray9eB4DBr+K+/sCJ8= -sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3/go.mod h1:18nIHnGi6636UCz6m8i4DhaJ65T6EruyzmoQqI2BVDo= -sigs.k8s.io/structured-merge-diff/v4 v4.4.2 h1:MdmvkGuXi/8io6ixD5wud3vOLwc1rj0aNqRlpuvjmwA= -sigs.k8s.io/structured-merge-diff/v4 v4.4.2/go.mod h1:N8f93tFZh9U6vpxwRArLiikrE5/2tiu1w1AGfACIGE4= -sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E= -sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY= diff --git a/sdk/client/go.mod b/sdk/go.mod similarity index 56% rename from sdk/client/go.mod rename to sdk/go.mod index 78cdb510c..8fab528f1 100644 --- a/sdk/client/go.mod +++ b/sdk/go.mod @@ -1,11 +1,17 @@ -module github.com/kube-bind/kube-bind/sdk/client +module github.com/kube-bind/kube-bind/sdk -go 1.23.4 +go 1.24.0 require ( - github.com/kube-bind/kube-bind/sdk/apis v0.0.0-20250620125133-1a40ef5c5d27 - k8s.io/apimachinery v0.32.0 - k8s.io/client-go v0.32.0 + github.com/google/go-cmp v0.7.0 + github.com/onsi/gomega v1.36.1 + github.com/stretchr/testify v1.10.0 + k8s.io/api v0.33.0 + k8s.io/apiextensions-apiserver v0.33.0 + k8s.io/apimachinery v0.33.0 + k8s.io/client-go v0.33.0 + k8s.io/utils v0.0.0-20241210054802-24370beab758 + sigs.k8s.io/yaml v1.4.0 ) require ( @@ -17,10 +23,7 @@ require ( github.com/go-openapi/jsonreference v0.20.2 // indirect github.com/go-openapi/swag v0.23.0 // indirect github.com/gogo/protobuf v1.3.2 // indirect - github.com/golang/protobuf v1.5.4 // indirect - github.com/google/gnostic-models v0.6.8 // indirect - github.com/google/go-cmp v0.6.0 // indirect - github.com/google/gofuzz v1.2.0 // indirect + github.com/google/gnostic-models v0.6.9 // indirect github.com/google/uuid v1.6.0 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect @@ -29,23 +32,21 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/pkg/errors v0.9.1 // indirect + github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/x448/float16 v0.8.4 // indirect - golang.org/x/net v0.30.0 // indirect + golang.org/x/net v0.38.0 // indirect golang.org/x/oauth2 v0.27.0 // indirect - golang.org/x/sys v0.26.0 // indirect - golang.org/x/term v0.25.0 // indirect - golang.org/x/text v0.19.0 // indirect - golang.org/x/time v0.7.0 // indirect - google.golang.org/protobuf v1.35.1 // indirect + golang.org/x/sys v0.31.0 // indirect + golang.org/x/term v0.30.0 // indirect + golang.org/x/text v0.23.0 // indirect + golang.org/x/time v0.9.0 // indirect + google.golang.org/protobuf v1.36.5 // indirect gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - k8s.io/api v0.32.0 // indirect - k8s.io/apiextensions-apiserver v0.32.0 // indirect k8s.io/klog/v2 v2.130.1 // indirect - k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect - k8s.io/utils v0.0.0-20241210054802-24370beab758 // indirect + k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect - sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect - sigs.k8s.io/yaml v1.4.0 // indirect + sigs.k8s.io/randfill v1.0.0 // indirect + sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect ) diff --git a/sdk/client/go.sum b/sdk/go.sum similarity index 78% rename from sdk/client/go.sum rename to sdk/go.sum index daf49fe97..de39ec503 100644 --- a/sdk/client/go.sum +++ b/sdk/go.sum @@ -21,16 +21,12 @@ github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1v github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= -github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= -github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= -github.com/google/gnostic-models v0.6.8 h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvRgGre9I= -github.com/google/gnostic-models v0.6.8/go.mod h1:5n7qKqH0f5wFt+aWF8CW6pZLLNOfYuF5OpfBSENuI8U= +github.com/google/gnostic-models v0.6.9 h1:MU/8wDLif2qCXZmzncUQ/BOfxWfthHi63KqpoNbWqVw= +github.com/google/gnostic-models v0.6.9/go.mod h1:CiWsm0s6BSQd1hRn8/QmxqB6BesYcbSZxsz9b0KuDBw= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= -github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= +github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= -github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db h1:097atOisP2aRj7vFgYQBbFN4U4JNXUNYpxael3UzMyo= github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= @@ -48,8 +44,6 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/kube-bind/kube-bind/sdk/apis v0.0.0-20250620125133-1a40ef5c5d27 h1:8RDkGnYk8I9rEnJ28a95HWyScRYB3jDTyrWg8DeNCP4= -github.com/kube-bind/kube-bind/sdk/apis v0.0.0-20250620125133-1a40ef5c5d27/go.mod h1:COUBv76wlboisdscwddVH/L2hIG65RAAe1ZC7SG31VA= github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= @@ -68,13 +62,15 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= -github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= +github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII= +github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= +github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY= +github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= @@ -85,6 +81,8 @@ github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM= github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= +go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= @@ -94,8 +92,8 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4= -golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU= +golang.org/x/net v0.38.0 h1:vRMAPTMaeGqVhG5QyLJHqNDwecKTomGeqbnfZyKlBI8= +golang.org/x/net v0.38.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8= golang.org/x/oauth2 v0.27.0 h1:da9Vo7/tDv5RH/7nZDz1eMGS/q1Vv1N/7FCrBhI9I3M= golang.org/x/oauth2 v0.27.0/go.mod h1:onh5ek6nERTohokkhCD/y2cV4Do3fxFHFuAejCkRWT8= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -104,16 +102,16 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo= -golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/term v0.25.0 h1:WtHI/ltw4NvSUig5KARz9h521QvRC8RmF/cuYqifU24= -golang.org/x/term v0.25.0/go.mod h1:RPyXicDX+6vLxogjjRxjgD2TKtmAO6NZBsBRfrOLu7M= +golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik= +golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= +golang.org/x/term v0.30.0 h1:PQ39fJZ+mfadBm0y5WlL4vlM7Sx1Hgf13sMIY2+QS9Y= +golang.org/x/term v0.30.0/go.mod h1:NYYFdzHoI5wRh/h5tDMdMqCqPJZEuNqVR5xJLd/n67g= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM= -golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= -golang.org/x/time v0.7.0 h1:ntUhktv3OPE6TgYxXWv9vKvUSJyIFJlyohwbkEwPrKQ= -golang.org/x/time v0.7.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= +golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY= +golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4= +golang.org/x/time v0.9.0 h1:EsRrnYcQiGH+5FfbgvV4AP7qEZstoyrHB0DzarOQ4ZY= +golang.org/x/time v0.9.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= @@ -124,8 +122,8 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA= -google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= +google.golang.org/protobuf v1.36.5 h1:tPhr+woSbjfYvY6/GPufUoYizxw1cF/yFoxJ2fmpwlM= +google.golang.org/protobuf v1.36.5/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= @@ -136,23 +134,26 @@ gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -k8s.io/api v0.32.0 h1:OL9JpbvAU5ny9ga2fb24X8H6xQlVp+aJMFlgtQjR9CE= -k8s.io/api v0.32.0/go.mod h1:4LEwHZEf6Q/cG96F3dqR965sYOfmPM7rq81BLgsE0p0= -k8s.io/apiextensions-apiserver v0.32.0 h1:S0Xlqt51qzzqjKPxfgX1xh4HBZE+p8KKBq+k2SWNOE0= -k8s.io/apiextensions-apiserver v0.32.0/go.mod h1:86hblMvN5yxMvZrZFX2OhIHAuFIMJIZ19bTvzkP+Fmw= -k8s.io/apimachinery v0.32.0 h1:cFSE7N3rmEEtv4ei5X6DaJPHHX0C+upp+v5lVPiEwpg= -k8s.io/apimachinery v0.32.0/go.mod h1:GpHVgxoKlTxClKcteaeuF1Ul/lDVb74KpZcxcmLDElE= -k8s.io/client-go v0.32.0 h1:DimtMcnN/JIKZcrSrstiwvvZvLjG0aSxy8PxN8IChp8= -k8s.io/client-go v0.32.0/go.mod h1:boDWvdM1Drk4NJj/VddSLnx59X3OPgwrOo0vGbtq9+8= +k8s.io/api v0.33.0 h1:yTgZVn1XEe6opVpP1FylmNrIFWuDqe2H0V8CT5gxfIU= +k8s.io/api v0.33.0/go.mod h1:CTO61ECK/KU7haa3qq8sarQ0biLq2ju405IZAd9zsiM= +k8s.io/apiextensions-apiserver v0.33.0 h1:d2qpYL7Mngbsc1taA4IjJPRJ9ilnsXIrndH+r9IimOs= +k8s.io/apiextensions-apiserver v0.33.0/go.mod h1:VeJ8u9dEEN+tbETo+lFkwaaZPg6uFKLGj5vyNEwwSzc= +k8s.io/apimachinery v0.33.0 h1:1a6kHrJxb2hs4t8EE5wuR/WxKDwGN1FKH3JvDtA0CIQ= +k8s.io/apimachinery v0.33.0/go.mod h1:BHW0YOu7n22fFv/JkYOEfkUYNRN0fj0BlvMFWA7b+SM= +k8s.io/client-go v0.33.0 h1:UASR0sAYVUzs2kYuKn/ZakZlcs2bEHaizrrHUZg0G98= +k8s.io/client-go v0.33.0/go.mod h1:kGkd+l/gNGg8GYWAPr0xF1rRKvVWvzh9vmZAMXtaKOg= k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk= k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= -k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f h1:GA7//TjRY9yWGy1poLzYYJJ4JRdzg3+O6e8I+e+8T5Y= -k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f/go.mod h1:R/HEjbvWI0qdfb8viZUeVZm0X6IZnxAydC7YU42CMw4= +k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff h1:/usPimJzUKKu+m+TE36gUyGcf03XZEP0ZIKgKj35LS4= +k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff/go.mod h1:5jIi+8yX4RIb8wk3XwBo5Pq2ccx4FP10ohkbSKCZoK8= k8s.io/utils v0.0.0-20241210054802-24370beab758 h1:sdbE21q2nlQtFh65saZY+rRM6x6aJJI8IUa1AmH/qa0= k8s.io/utils v0.0.0-20241210054802-24370beab758/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 h1:/Rv+M11QRah1itp8VhT6HoVx1Ray9eB4DBr+K+/sCJ8= sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3/go.mod h1:18nIHnGi6636UCz6m8i4DhaJ65T6EruyzmoQqI2BVDo= -sigs.k8s.io/structured-merge-diff/v4 v4.4.2 h1:MdmvkGuXi/8io6ixD5wud3vOLwc1rj0aNqRlpuvjmwA= -sigs.k8s.io/structured-merge-diff/v4 v4.4.2/go.mod h1:N8f93tFZh9U6vpxwRArLiikrE5/2tiu1w1AGfACIGE4= +sigs.k8s.io/randfill v0.0.0-20250304075658-069ef1bbf016/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY= +sigs.k8s.io/randfill v1.0.0 h1:JfjMILfT8A6RbawdsK2JXGBR5AQVfd+9TbzrlneTyrU= +sigs.k8s.io/randfill v1.0.0/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY= +sigs.k8s.io/structured-merge-diff/v4 v4.6.0 h1:IUA9nvMmnKWcj5jl84xn+T5MnlZKThmUW1TdblaLVAc= +sigs.k8s.io/structured-merge-diff/v4 v4.6.0/go.mod h1:dDy58f92j70zLsuZVuUX5Wp9vtxXpaZnkPGWeqDfCps= sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E= sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY= From 70259a49841819bdd5cb99934608b31910826632 Mon Sep 17 00:00:00 2001 From: "Nelo-T. Wallus" Date: Thu, 18 Sep 2025 12:04:26 +0200 Subject: [PATCH 07/13] Update kcp-dev/code-generator to v2.4.0 Signed-off-by: Nelo-T. Wallus Signed-off-by: Nelo-T. Wallus --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 29328a8eb..4089a8c5f 100644 --- a/Makefile +++ b/Makefile @@ -76,7 +76,7 @@ LOGCHECK_BIN := logcheck LOGCHECK := $(TOOLS_GOBIN_DIR)/$(LOGCHECK_BIN)-$(LOGCHECK_VER) export LOGCHECK # so hack scripts can use it -CODE_GENERATOR_VER := v2.3.1 +CODE_GENERATOR_VER := v2.4.0 CODE_GENERATOR_BIN := code-generator CODE_GENERATOR := $(TOOLS_GOBIN_DIR)/$(CODE_GENERATOR_BIN)-$(CODE_GENERATOR_VER) export CODE_GENERATOR # so hack scripts can use it From d7ae85bcb7b1ae6b51b9ef9fa58747f5408b0940 Mon Sep 17 00:00:00 2001 From: "Nelo-T. Wallus" Date: Thu, 18 Sep 2025 12:04:57 +0200 Subject: [PATCH 08/13] cleanup Signed-off-by: Nelo-T. Wallus Signed-off-by: Nelo-T. Wallus --- Makefile | 1 - hack/update-codegen.sh | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 4089a8c5f..cadbb4721 100644 --- a/Makefile +++ b/Makefile @@ -193,7 +193,6 @@ $(KUBE_APPLYCONFIGURATION_GEN): GOBIN=$(GOBIN_DIR) $(GO_INSTALL) k8s.io/code-generator/cmd/$(KUBE_APPLYCONFIGURATION_GEN_BIN) $(KUBE_APPLYCONFIGURATION_GEN_BIN) $(KUBE_APPLYCONFIGURATION_GEN_VER) -codegen: WHAT ?= ./sdk/client codegen: $(CONTROLLER_GEN) $(YAML_PATCH) $(CODE_GENERATOR) $(KUBE_CLIENT_GEN) $(KUBE_LISTER_GEN) $(KUBE_INFORMER_GEN) $(KUBE_APPLYCONFIGURATION_GEN) ## Generate code go mod download ./hack/update-codegen.sh diff --git a/hack/update-codegen.sh b/hack/update-codegen.sh index 467c7fb69..4fe2fe356 100755 --- a/hack/update-codegen.sh +++ b/hack/update-codegen.sh @@ -17,7 +17,7 @@ set -o errexit set -o nounset set -o pipefail -set -o xtrace +set -o xtrace if [[ -z "${MAKELEVEL:-}" ]]; then echo 'You must invoke this script via make' From c8e36739b7c8c6fc286e720f19d20615443d305b Mon Sep 17 00:00:00 2001 From: "Nelo-T. Wallus" Date: Thu, 18 Sep 2025 13:30:00 +0200 Subject: [PATCH 09/13] Replace hack/verify-imports.sh with a single make recipe Signed-off-by: Nelo-T. Wallus Signed-off-by: Nelo-T. Wallus --- Makefile | 8 ++++++-- hack/verify-imports.sh | 35 ----------------------------------- 2 files changed, 6 insertions(+), 37 deletions(-) delete mode 100755 hack/verify-imports.sh diff --git a/Makefile b/Makefile index cadbb4721..7871393cb 100644 --- a/Makefile +++ b/Makefile @@ -299,8 +299,12 @@ test: ## Run unit tests fi .PHONY: verify-imports -verify-imports: - hack/verify-imports.sh +verify-imports: imports + if ! git diff --quiet HEAD; then \ + git diff; \ + echo "You need to run 'make imports' to update the immport statement ordering and commit them"; \ + exit 1; \ + fi .PHONY: verify-go-versions verify-go-versions: diff --git a/hack/verify-imports.sh b/hack/verify-imports.sh deleted file mode 100755 index c21394ace..000000000 --- a/hack/verify-imports.sh +++ /dev/null @@ -1,35 +0,0 @@ -#!/usr/bin/env bash - -# Copyright 2022 The Kube Bind Authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# This script ensures that the generated client code checked into git is up-to-date -# with the generator. If it is not, re-generate the configuration to update it. - -set -o errexit -set -o nounset -set -o pipefail - -make -C "$( dirname "${BASH_SOURCE[0]}")/../" imports -if ! git diff --quiet --exit-code ; then - cat << EOF -ERROR: This check enforces that import statements are ordered correctly. -ERROR: The import statements are out of order. Run the following command -ERROR: to regenerate the statements: -ERROR: $ make imports -ERROR: The following differences were found: -EOF - git diff - exit 1 -fi \ No newline at end of file From 5c2add2efbc46e77b3963d214a00ec067ecdd63c Mon Sep 17 00:00:00 2001 From: "Nelo-T. Wallus" Date: Thu, 18 Sep 2025 13:34:00 +0200 Subject: [PATCH 10/13] Replace goimports with gci Signed-off-by: Nelo-T. Wallus Signed-off-by: Nelo-T. Wallus --- .golangci.yaml | 11 +++++++++++ Makefile | 12 ++---------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/.golangci.yaml b/.golangci.yaml index d9f2cf39d..f04f3412b 100644 --- a/.golangci.yaml +++ b/.golangci.yaml @@ -82,6 +82,17 @@ issues: formatters: enable: - gofmt + - gci + settings: + gci: + sections: + - standard + - default + - prefix(github.com/kube-bind) + - prefix(github.com/kube-bind/sdk) + - blank + - dot + custom-order: true exclusions: generated: lax paths: diff --git a/Makefile b/Makefile index 7871393cb..0252e60df 100644 --- a/Makefile +++ b/Makefile @@ -63,10 +63,6 @@ GOLANGCI_LINT_VER := v2.1.6 GOLANGCI_LINT_BIN := golangci-lint GOLANGCI_LINT := $(TOOLS_GOBIN_DIR)/$(GOLANGCI_LINT_BIN)-$(GOLANGCI_LINT_VER) -GOIMPORTS_VER := v0.35.0 -GOIMPORTS_BIN := goimports -GOIMPORTS := $(TOOLS_GOBIN_DIR)/$(GOIMPORTS_BIN)-$(GOIMPORTS_VER) - GOTESTSUM_VER := v1.8.1 GOTESTSUM_BIN := gotestsum GOTESTSUM := $(abspath $(TOOLS_DIR))/$(GOTESTSUM_BIN)-$(GOTESTSUM_VER) @@ -143,9 +139,6 @@ install: ## install binaries to GOBIN $(GOLANGCI_LINT): GOBIN=$(TOOLS_GOBIN_DIR) $(GO_INSTALL) github.com/golangci/golangci-lint/v2/cmd/golangci-lint $(GOLANGCI_LINT_BIN) $(GOLANGCI_LINT_VER) -$(GOIMPORTS): - GOBIN=$(TOOLS_GOBIN_DIR) $(GO_INSTALL) golang.org/x/tools/cmd/goimports $(GOIMPORTS_BIN) $(GOIMPORTS_VER) - $(LOGCHECK): GOBIN=$(TOOLS_GOBIN_DIR) $(GO_INSTALL) sigs.k8s.io/logtools/logcheck $(LOGCHECK_BIN) $(LOGCHECK_VER) @@ -217,13 +210,12 @@ verify-codegen: fi .PHONY: imports -imports: $(GOLANGCI_LINT) $(GOIMPORTS) verify-go-versions ## Fix imports and format code +imports: $(GOLANGCI_LINT) verify-go-versions ## Fix imports and format code @if [ -n "$(WHAT)" ]; then \ $(GOLANGCI_LINT) fmt --enable gci -c $(ROOT_DIR)/.golangci.yaml $(WHAT); \ - $(GOIMPORTS) -local github.com/kube-bind/kube-bind -w $(WHAT); \ else \ for MOD in $(GOMODS); do \ - ( cd $$MOD; $(GOLANGCI_LINT) fmt --enable gci -c $(ROOT_DIR)/.golangci.yaml; $(GOIMPORTS) -local github.com/kube-bind/kube-bind -w $$(go list -f '{{.Dir}}' ./...); ) \ + ( cd $$MOD; $(GOLANGCI_LINT) fmt --enable gci -c $(ROOT_DIR)/.golangci.yaml; ) \ done; \ fi From 73a448da86f1fde71a2616386ca19ba25224d031 Mon Sep 17 00:00:00 2001 From: "Nelo-T. Wallus" Date: Thu, 18 Sep 2025 13:37:19 +0200 Subject: [PATCH 11/13] make imports Signed-off-by: Nelo-T. Wallus Signed-off-by: Nelo-T. Wallus --- cli/pkg/kubectl/bind-apiservice/cmd/cmd.go | 5 +++-- cli/pkg/kubectl/bind/cmd/cmd.go | 5 +++-- cmd/konnector/cmd/konnector.go | 3 ++- .../third_party/conditions/util/conditions/getter_test.go | 3 ++- .../third_party/conditions/util/conditions/matcher_test.go | 3 ++- .../conditions/util/conditions/merge_strategies_test.go | 3 ++- .../third_party/conditions/util/conditions/merge_test.go | 3 ++- .../third_party/conditions/util/conditions/patch_test.go | 3 ++- .../third_party/conditions/util/conditions/setter_test.go | 3 ++- 9 files changed, 20 insertions(+), 11 deletions(-) diff --git a/cli/pkg/kubectl/bind-apiservice/cmd/cmd.go b/cli/pkg/kubectl/bind-apiservice/cmd/cmd.go index 97eaa99f6..e6ec7ae37 100644 --- a/cli/pkg/kubectl/bind-apiservice/cmd/cmd.go +++ b/cli/pkg/kubectl/bind-apiservice/cmd/cmd.go @@ -22,11 +22,12 @@ import ( "github.com/fatih/color" "github.com/spf13/cobra" "k8s.io/cli-runtime/pkg/genericclioptions" - _ "k8s.io/client-go/plugin/pkg/client/auth/exec" - _ "k8s.io/client-go/plugin/pkg/client/auth/oidc" logsv1 "k8s.io/component-base/logs/api/v1" "github.com/kube-bind/kube-bind/cli/pkg/kubectl/bind-apiservice/plugin" + + _ "k8s.io/client-go/plugin/pkg/client/auth/exec" + _ "k8s.io/client-go/plugin/pkg/client/auth/oidc" ) var ( diff --git a/cli/pkg/kubectl/bind/cmd/cmd.go b/cli/pkg/kubectl/bind/cmd/cmd.go index 773972f0c..c86d2bdf0 100644 --- a/cli/pkg/kubectl/bind/cmd/cmd.go +++ b/cli/pkg/kubectl/bind/cmd/cmd.go @@ -23,12 +23,13 @@ import ( "github.com/fatih/color" "github.com/spf13/cobra" "k8s.io/cli-runtime/pkg/genericclioptions" - _ "k8s.io/client-go/plugin/pkg/client/auth/exec" - _ "k8s.io/client-go/plugin/pkg/client/auth/oidc" logsv1 "k8s.io/component-base/logs/api/v1" "github.com/kube-bind/kube-bind/cli/pkg/help" "github.com/kube-bind/kube-bind/cli/pkg/kubectl/bind/plugin" + + _ "k8s.io/client-go/plugin/pkg/client/auth/exec" + _ "k8s.io/client-go/plugin/pkg/client/auth/oidc" ) var ( diff --git a/cmd/konnector/cmd/konnector.go b/cmd/konnector/cmd/konnector.go index 4d2cb326e..c18e3882b 100644 --- a/cmd/konnector/cmd/konnector.go +++ b/cmd/konnector/cmd/konnector.go @@ -25,13 +25,14 @@ import ( "github.com/spf13/cobra" "k8s.io/client-go/tools/leaderelection" logsv1 "k8s.io/component-base/logs/api/v1" - _ "k8s.io/component-base/logs/json/register" componentbaseversion "k8s.io/component-base/version" "k8s.io/klog/v2" "github.com/kube-bind/kube-bind/pkg/konnector" konnectoroptions "github.com/kube-bind/kube-bind/pkg/konnector/options" bindversion "github.com/kube-bind/kube-bind/pkg/version" + + _ "k8s.io/component-base/logs/json/register" ) const LeaderElectionTimeout = 20 * time.Second diff --git a/sdk/apis/third_party/conditions/util/conditions/getter_test.go b/sdk/apis/third_party/conditions/util/conditions/getter_test.go index 279f2d22c..167cf2f6f 100644 --- a/sdk/apis/third_party/conditions/util/conditions/getter_test.go +++ b/sdk/apis/third_party/conditions/util/conditions/getter_test.go @@ -19,10 +19,11 @@ package conditions import ( "testing" - . "github.com/onsi/gomega" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" conditionsapi "github.com/kube-bind/kube-bind/sdk/apis/third_party/conditions/apis/conditions/v1alpha1" + + . "github.com/onsi/gomega" ) var ( diff --git a/sdk/apis/third_party/conditions/util/conditions/matcher_test.go b/sdk/apis/third_party/conditions/util/conditions/matcher_test.go index c535bd2eb..465686ce1 100644 --- a/sdk/apis/third_party/conditions/util/conditions/matcher_test.go +++ b/sdk/apis/third_party/conditions/util/conditions/matcher_test.go @@ -19,11 +19,12 @@ package conditions import ( "testing" - . "github.com/onsi/gomega" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" conditionsapi "github.com/kube-bind/kube-bind/sdk/apis/third_party/conditions/apis/conditions/v1alpha1" + + . "github.com/onsi/gomega" ) func TestMatchConditions(t *testing.T) { diff --git a/sdk/apis/third_party/conditions/util/conditions/merge_strategies_test.go b/sdk/apis/third_party/conditions/util/conditions/merge_strategies_test.go index 35035e020..91dc95370 100644 --- a/sdk/apis/third_party/conditions/util/conditions/merge_strategies_test.go +++ b/sdk/apis/third_party/conditions/util/conditions/merge_strategies_test.go @@ -19,10 +19,11 @@ package conditions import ( "testing" - . "github.com/onsi/gomega" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" conditionsapi "github.com/kube-bind/kube-bind/sdk/apis/third_party/conditions/apis/conditions/v1alpha1" + + . "github.com/onsi/gomega" ) func TestGetStepCounterMessage(t *testing.T) { diff --git a/sdk/apis/third_party/conditions/util/conditions/merge_test.go b/sdk/apis/third_party/conditions/util/conditions/merge_test.go index 8370db03e..a7ac147e1 100644 --- a/sdk/apis/third_party/conditions/util/conditions/merge_test.go +++ b/sdk/apis/third_party/conditions/util/conditions/merge_test.go @@ -19,10 +19,11 @@ package conditions import ( "testing" - . "github.com/onsi/gomega" corev1 "k8s.io/api/core/v1" conditionsapi "github.com/kube-bind/kube-bind/sdk/apis/third_party/conditions/apis/conditions/v1alpha1" + + . "github.com/onsi/gomega" ) func TestNewConditionsGroup(t *testing.T) { diff --git a/sdk/apis/third_party/conditions/util/conditions/patch_test.go b/sdk/apis/third_party/conditions/util/conditions/patch_test.go index e68323c1a..f1fcc2a66 100644 --- a/sdk/apis/third_party/conditions/util/conditions/patch_test.go +++ b/sdk/apis/third_party/conditions/util/conditions/patch_test.go @@ -20,12 +20,13 @@ import ( "testing" "time" - . "github.com/onsi/gomega" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" conditionsapi "github.com/kube-bind/kube-bind/sdk/apis/third_party/conditions/apis/conditions/v1alpha1" + + . "github.com/onsi/gomega" ) func TestNewPatch(t *testing.T) { diff --git a/sdk/apis/third_party/conditions/util/conditions/setter_test.go b/sdk/apis/third_party/conditions/util/conditions/setter_test.go index d12e4c782..688b85da0 100644 --- a/sdk/apis/third_party/conditions/util/conditions/setter_test.go +++ b/sdk/apis/third_party/conditions/util/conditions/setter_test.go @@ -21,13 +21,14 @@ import ( "testing" "time" - . "github.com/onsi/gomega" "github.com/onsi/gomega/format" "github.com/onsi/gomega/types" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" conditionsapi "github.com/kube-bind/kube-bind/sdk/apis/third_party/conditions/apis/conditions/v1alpha1" + + . "github.com/onsi/gomega" ) func TestHasSameState(t *testing.T) { From bc7646b396643d2b1cf2ddc75e23421436dffb61 Mon Sep 17 00:00:00 2001 From: "Nelo-T. Wallus" Date: Thu, 18 Sep 2025 14:04:22 +0200 Subject: [PATCH 12/13] codegen Signed-off-by: Nelo-T. Wallus Signed-off-by: Nelo-T. Wallus --- sdk/apis/kubebind/v1alpha1/zz_generated.deepcopy.go | 3 +-- sdk/apis/kubebind/v1alpha2/zz_generated.deepcopy.go | 3 +-- sdk/client/clientset/versioned/clientset.go | 5 ++--- .../clientset/versioned/fake/clientset_generated.go | 11 +++++------ sdk/client/clientset/versioned/fake/register.go | 5 ++--- sdk/client/clientset/versioned/scheme/register.go | 5 ++--- .../typed/kubebind/v1alpha1/apiservicebinding.go | 5 ++--- .../typed/kubebind/v1alpha1/apiserviceexport.go | 5 ++--- .../kubebind/v1alpha1/apiserviceexportrequest.go | 5 ++--- .../typed/kubebind/v1alpha1/apiservicenamespace.go | 5 ++--- .../typed/kubebind/v1alpha1/clusterbinding.go | 5 ++--- .../kubebind/v1alpha1/fake/fake_apiservicebinding.go | 3 +-- .../kubebind/v1alpha1/fake/fake_apiserviceexport.go | 3 +-- .../v1alpha1/fake/fake_apiserviceexportrequest.go | 3 +-- .../v1alpha1/fake/fake_apiservicenamespace.go | 3 +-- .../kubebind/v1alpha1/fake/fake_clusterbinding.go | 3 +-- .../kubebind/v1alpha1/fake/fake_kubebind_client.go | 3 +-- .../typed/kubebind/v1alpha1/kubebind_client.go | 3 +-- .../typed/kubebind/v1alpha2/apiservicebinding.go | 5 ++--- .../typed/kubebind/v1alpha2/apiserviceexport.go | 5 ++--- .../kubebind/v1alpha2/apiserviceexportrequest.go | 5 ++--- .../typed/kubebind/v1alpha2/apiservicenamespace.go | 5 ++--- .../versioned/typed/kubebind/v1alpha2/boundschema.go | 5 ++--- .../typed/kubebind/v1alpha2/clusterbinding.go | 5 ++--- .../kubebind/v1alpha2/fake/fake_apiservicebinding.go | 3 +-- .../kubebind/v1alpha2/fake/fake_apiserviceexport.go | 3 +-- .../v1alpha2/fake/fake_apiserviceexportrequest.go | 3 +-- .../v1alpha2/fake/fake_apiservicenamespace.go | 3 +-- .../typed/kubebind/v1alpha2/fake/fake_boundschema.go | 3 +-- .../kubebind/v1alpha2/fake/fake_clusterbinding.go | 3 +-- .../kubebind/v1alpha2/fake/fake_kubebind_client.go | 3 +-- .../typed/kubebind/v1alpha2/kubebind_client.go | 3 +-- sdk/client/informers/externalversions/factory.go | 7 +++---- sdk/client/informers/externalversions/generic.go | 5 ++--- .../internalinterfaces/factory_interfaces.go | 3 +-- .../kubebind/v1alpha1/apiservicebinding.go | 9 ++++----- .../kubebind/v1alpha1/apiserviceexport.go | 9 ++++----- .../kubebind/v1alpha1/apiserviceexportrequest.go | 9 ++++----- .../kubebind/v1alpha1/apiservicenamespace.go | 9 ++++----- .../kubebind/v1alpha1/clusterbinding.go | 9 ++++----- .../kubebind/v1alpha2/apiservicebinding.go | 9 ++++----- .../kubebind/v1alpha2/apiserviceexport.go | 9 ++++----- .../kubebind/v1alpha2/apiserviceexportrequest.go | 9 ++++----- .../kubebind/v1alpha2/apiservicenamespace.go | 9 ++++----- .../externalversions/kubebind/v1alpha2/boundschema.go | 9 ++++----- .../kubebind/v1alpha2/clusterbinding.go | 9 ++++----- .../listers/kubebind/v1alpha1/apiservicebinding.go | 3 +-- .../listers/kubebind/v1alpha1/apiserviceexport.go | 3 +-- .../kubebind/v1alpha1/apiserviceexportrequest.go | 3 +-- .../listers/kubebind/v1alpha1/apiservicenamespace.go | 3 +-- .../listers/kubebind/v1alpha1/clusterbinding.go | 3 +-- .../listers/kubebind/v1alpha2/apiservicebinding.go | 3 +-- .../listers/kubebind/v1alpha2/apiserviceexport.go | 3 +-- .../kubebind/v1alpha2/apiserviceexportrequest.go | 3 +-- .../listers/kubebind/v1alpha2/apiservicenamespace.go | 3 +-- sdk/client/listers/kubebind/v1alpha2/boundschema.go | 3 +-- .../listers/kubebind/v1alpha2/clusterbinding.go | 3 +-- 57 files changed, 111 insertions(+), 168 deletions(-) diff --git a/sdk/apis/kubebind/v1alpha1/zz_generated.deepcopy.go b/sdk/apis/kubebind/v1alpha1/zz_generated.deepcopy.go index 8be03f258..5b411966b 100644 --- a/sdk/apis/kubebind/v1alpha1/zz_generated.deepcopy.go +++ b/sdk/apis/kubebind/v1alpha1/zz_generated.deepcopy.go @@ -22,10 +22,9 @@ limitations under the License. package v1alpha1 import ( + conditionsv1alpha1 "github.com/kube-bind/kube-bind/sdk/apis/third_party/conditions/apis/conditions/v1alpha1" v1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" runtime "k8s.io/apimachinery/pkg/runtime" - - conditionsv1alpha1 "github.com/kube-bind/kube-bind/sdk/apis/third_party/conditions/apis/conditions/v1alpha1" ) // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. diff --git a/sdk/apis/kubebind/v1alpha2/zz_generated.deepcopy.go b/sdk/apis/kubebind/v1alpha2/zz_generated.deepcopy.go index 0e3600f5d..9792299d4 100644 --- a/sdk/apis/kubebind/v1alpha2/zz_generated.deepcopy.go +++ b/sdk/apis/kubebind/v1alpha2/zz_generated.deepcopy.go @@ -22,10 +22,9 @@ limitations under the License. package v1alpha2 import ( + v1alpha1 "github.com/kube-bind/kube-bind/sdk/apis/third_party/conditions/apis/conditions/v1alpha1" v1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" runtime "k8s.io/apimachinery/pkg/runtime" - - v1alpha1 "github.com/kube-bind/kube-bind/sdk/apis/third_party/conditions/apis/conditions/v1alpha1" ) // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. diff --git a/sdk/client/clientset/versioned/clientset.go b/sdk/client/clientset/versioned/clientset.go index a8ecfae67..18c5494c9 100644 --- a/sdk/client/clientset/versioned/clientset.go +++ b/sdk/client/clientset/versioned/clientset.go @@ -22,12 +22,11 @@ import ( fmt "fmt" http "net/http" + kubebindv1alpha1 "github.com/kube-bind/kube-bind/sdk/client/clientset/versioned/typed/kubebind/v1alpha1" + kubebindv1alpha2 "github.com/kube-bind/kube-bind/sdk/client/clientset/versioned/typed/kubebind/v1alpha2" discovery "k8s.io/client-go/discovery" rest "k8s.io/client-go/rest" flowcontrol "k8s.io/client-go/util/flowcontrol" - - kubebindv1alpha1 "github.com/kube-bind/kube-bind/sdk/client/clientset/versioned/typed/kubebind/v1alpha1" - kubebindv1alpha2 "github.com/kube-bind/kube-bind/sdk/client/clientset/versioned/typed/kubebind/v1alpha2" ) type Interface interface { diff --git a/sdk/client/clientset/versioned/fake/clientset_generated.go b/sdk/client/clientset/versioned/fake/clientset_generated.go index e4a69e9f6..153664b18 100644 --- a/sdk/client/clientset/versioned/fake/clientset_generated.go +++ b/sdk/client/clientset/versioned/fake/clientset_generated.go @@ -19,18 +19,17 @@ limitations under the License. package fake import ( + clientset "github.com/kube-bind/kube-bind/sdk/client/clientset/versioned" + kubebindv1alpha1 "github.com/kube-bind/kube-bind/sdk/client/clientset/versioned/typed/kubebind/v1alpha1" + fakekubebindv1alpha1 "github.com/kube-bind/kube-bind/sdk/client/clientset/versioned/typed/kubebind/v1alpha1/fake" + kubebindv1alpha2 "github.com/kube-bind/kube-bind/sdk/client/clientset/versioned/typed/kubebind/v1alpha2" + fakekubebindv1alpha2 "github.com/kube-bind/kube-bind/sdk/client/clientset/versioned/typed/kubebind/v1alpha2/fake" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/discovery" fakediscovery "k8s.io/client-go/discovery/fake" "k8s.io/client-go/testing" - - clientset "github.com/kube-bind/kube-bind/sdk/client/clientset/versioned" - kubebindv1alpha1 "github.com/kube-bind/kube-bind/sdk/client/clientset/versioned/typed/kubebind/v1alpha1" - fakekubebindv1alpha1 "github.com/kube-bind/kube-bind/sdk/client/clientset/versioned/typed/kubebind/v1alpha1/fake" - kubebindv1alpha2 "github.com/kube-bind/kube-bind/sdk/client/clientset/versioned/typed/kubebind/v1alpha2" - fakekubebindv1alpha2 "github.com/kube-bind/kube-bind/sdk/client/clientset/versioned/typed/kubebind/v1alpha2/fake" ) // NewSimpleClientset returns a clientset that will respond with the provided objects. diff --git a/sdk/client/clientset/versioned/fake/register.go b/sdk/client/clientset/versioned/fake/register.go index f361cafbd..12ccd7b59 100644 --- a/sdk/client/clientset/versioned/fake/register.go +++ b/sdk/client/clientset/versioned/fake/register.go @@ -19,14 +19,13 @@ limitations under the License. package fake import ( + kubebindv1alpha1 "github.com/kube-bind/kube-bind/sdk/apis/kubebind/v1alpha1" + kubebindv1alpha2 "github.com/kube-bind/kube-bind/sdk/apis/kubebind/v1alpha2" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" utilruntime "k8s.io/apimachinery/pkg/util/runtime" - - kubebindv1alpha1 "github.com/kube-bind/kube-bind/sdk/apis/kubebind/v1alpha1" - kubebindv1alpha2 "github.com/kube-bind/kube-bind/sdk/apis/kubebind/v1alpha2" ) var scheme = runtime.NewScheme() diff --git a/sdk/client/clientset/versioned/scheme/register.go b/sdk/client/clientset/versioned/scheme/register.go index 20fd57527..8dbf25157 100644 --- a/sdk/client/clientset/versioned/scheme/register.go +++ b/sdk/client/clientset/versioned/scheme/register.go @@ -19,14 +19,13 @@ limitations under the License. package scheme import ( + kubebindv1alpha1 "github.com/kube-bind/kube-bind/sdk/apis/kubebind/v1alpha1" + kubebindv1alpha2 "github.com/kube-bind/kube-bind/sdk/apis/kubebind/v1alpha2" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" utilruntime "k8s.io/apimachinery/pkg/util/runtime" - - kubebindv1alpha1 "github.com/kube-bind/kube-bind/sdk/apis/kubebind/v1alpha1" - kubebindv1alpha2 "github.com/kube-bind/kube-bind/sdk/apis/kubebind/v1alpha2" ) var Scheme = runtime.NewScheme() diff --git a/sdk/client/clientset/versioned/typed/kubebind/v1alpha1/apiservicebinding.go b/sdk/client/clientset/versioned/typed/kubebind/v1alpha1/apiservicebinding.go index 5e583e705..6d5452bfb 100644 --- a/sdk/client/clientset/versioned/typed/kubebind/v1alpha1/apiservicebinding.go +++ b/sdk/client/clientset/versioned/typed/kubebind/v1alpha1/apiservicebinding.go @@ -21,13 +21,12 @@ package v1alpha1 import ( context "context" + kubebindv1alpha1 "github.com/kube-bind/kube-bind/sdk/apis/kubebind/v1alpha1" + scheme "github.com/kube-bind/kube-bind/sdk/client/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" gentype "k8s.io/client-go/gentype" - - kubebindv1alpha1 "github.com/kube-bind/kube-bind/sdk/apis/kubebind/v1alpha1" - scheme "github.com/kube-bind/kube-bind/sdk/client/clientset/versioned/scheme" ) // APIServiceBindingsGetter has a method to return a APIServiceBindingInterface. diff --git a/sdk/client/clientset/versioned/typed/kubebind/v1alpha1/apiserviceexport.go b/sdk/client/clientset/versioned/typed/kubebind/v1alpha1/apiserviceexport.go index b9d632da5..71920e8d0 100644 --- a/sdk/client/clientset/versioned/typed/kubebind/v1alpha1/apiserviceexport.go +++ b/sdk/client/clientset/versioned/typed/kubebind/v1alpha1/apiserviceexport.go @@ -21,13 +21,12 @@ package v1alpha1 import ( context "context" + kubebindv1alpha1 "github.com/kube-bind/kube-bind/sdk/apis/kubebind/v1alpha1" + scheme "github.com/kube-bind/kube-bind/sdk/client/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" gentype "k8s.io/client-go/gentype" - - kubebindv1alpha1 "github.com/kube-bind/kube-bind/sdk/apis/kubebind/v1alpha1" - scheme "github.com/kube-bind/kube-bind/sdk/client/clientset/versioned/scheme" ) // APIServiceExportsGetter has a method to return a APIServiceExportInterface. diff --git a/sdk/client/clientset/versioned/typed/kubebind/v1alpha1/apiserviceexportrequest.go b/sdk/client/clientset/versioned/typed/kubebind/v1alpha1/apiserviceexportrequest.go index e68ee5338..c31a7c23c 100644 --- a/sdk/client/clientset/versioned/typed/kubebind/v1alpha1/apiserviceexportrequest.go +++ b/sdk/client/clientset/versioned/typed/kubebind/v1alpha1/apiserviceexportrequest.go @@ -21,13 +21,12 @@ package v1alpha1 import ( context "context" + kubebindv1alpha1 "github.com/kube-bind/kube-bind/sdk/apis/kubebind/v1alpha1" + scheme "github.com/kube-bind/kube-bind/sdk/client/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" gentype "k8s.io/client-go/gentype" - - kubebindv1alpha1 "github.com/kube-bind/kube-bind/sdk/apis/kubebind/v1alpha1" - scheme "github.com/kube-bind/kube-bind/sdk/client/clientset/versioned/scheme" ) // APIServiceExportRequestsGetter has a method to return a APIServiceExportRequestInterface. diff --git a/sdk/client/clientset/versioned/typed/kubebind/v1alpha1/apiservicenamespace.go b/sdk/client/clientset/versioned/typed/kubebind/v1alpha1/apiservicenamespace.go index 2e23d4477..a966be151 100644 --- a/sdk/client/clientset/versioned/typed/kubebind/v1alpha1/apiservicenamespace.go +++ b/sdk/client/clientset/versioned/typed/kubebind/v1alpha1/apiservicenamespace.go @@ -21,13 +21,12 @@ package v1alpha1 import ( context "context" + kubebindv1alpha1 "github.com/kube-bind/kube-bind/sdk/apis/kubebind/v1alpha1" + scheme "github.com/kube-bind/kube-bind/sdk/client/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" gentype "k8s.io/client-go/gentype" - - kubebindv1alpha1 "github.com/kube-bind/kube-bind/sdk/apis/kubebind/v1alpha1" - scheme "github.com/kube-bind/kube-bind/sdk/client/clientset/versioned/scheme" ) // APIServiceNamespacesGetter has a method to return a APIServiceNamespaceInterface. diff --git a/sdk/client/clientset/versioned/typed/kubebind/v1alpha1/clusterbinding.go b/sdk/client/clientset/versioned/typed/kubebind/v1alpha1/clusterbinding.go index 40b7f6c0d..22949e4c9 100644 --- a/sdk/client/clientset/versioned/typed/kubebind/v1alpha1/clusterbinding.go +++ b/sdk/client/clientset/versioned/typed/kubebind/v1alpha1/clusterbinding.go @@ -21,13 +21,12 @@ package v1alpha1 import ( context "context" + kubebindv1alpha1 "github.com/kube-bind/kube-bind/sdk/apis/kubebind/v1alpha1" + scheme "github.com/kube-bind/kube-bind/sdk/client/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" gentype "k8s.io/client-go/gentype" - - kubebindv1alpha1 "github.com/kube-bind/kube-bind/sdk/apis/kubebind/v1alpha1" - scheme "github.com/kube-bind/kube-bind/sdk/client/clientset/versioned/scheme" ) // ClusterBindingsGetter has a method to return a ClusterBindingInterface. diff --git a/sdk/client/clientset/versioned/typed/kubebind/v1alpha1/fake/fake_apiservicebinding.go b/sdk/client/clientset/versioned/typed/kubebind/v1alpha1/fake/fake_apiservicebinding.go index 7b23d1ba8..f03c5cf41 100644 --- a/sdk/client/clientset/versioned/typed/kubebind/v1alpha1/fake/fake_apiservicebinding.go +++ b/sdk/client/clientset/versioned/typed/kubebind/v1alpha1/fake/fake_apiservicebinding.go @@ -19,10 +19,9 @@ limitations under the License. package fake import ( - gentype "k8s.io/client-go/gentype" - v1alpha1 "github.com/kube-bind/kube-bind/sdk/apis/kubebind/v1alpha1" kubebindv1alpha1 "github.com/kube-bind/kube-bind/sdk/client/clientset/versioned/typed/kubebind/v1alpha1" + gentype "k8s.io/client-go/gentype" ) // fakeAPIServiceBindings implements APIServiceBindingInterface diff --git a/sdk/client/clientset/versioned/typed/kubebind/v1alpha1/fake/fake_apiserviceexport.go b/sdk/client/clientset/versioned/typed/kubebind/v1alpha1/fake/fake_apiserviceexport.go index efe9a3197..a5c13ea9e 100644 --- a/sdk/client/clientset/versioned/typed/kubebind/v1alpha1/fake/fake_apiserviceexport.go +++ b/sdk/client/clientset/versioned/typed/kubebind/v1alpha1/fake/fake_apiserviceexport.go @@ -19,10 +19,9 @@ limitations under the License. package fake import ( - gentype "k8s.io/client-go/gentype" - v1alpha1 "github.com/kube-bind/kube-bind/sdk/apis/kubebind/v1alpha1" kubebindv1alpha1 "github.com/kube-bind/kube-bind/sdk/client/clientset/versioned/typed/kubebind/v1alpha1" + gentype "k8s.io/client-go/gentype" ) // fakeAPIServiceExports implements APIServiceExportInterface diff --git a/sdk/client/clientset/versioned/typed/kubebind/v1alpha1/fake/fake_apiserviceexportrequest.go b/sdk/client/clientset/versioned/typed/kubebind/v1alpha1/fake/fake_apiserviceexportrequest.go index 1a247f610..26b5d8c65 100644 --- a/sdk/client/clientset/versioned/typed/kubebind/v1alpha1/fake/fake_apiserviceexportrequest.go +++ b/sdk/client/clientset/versioned/typed/kubebind/v1alpha1/fake/fake_apiserviceexportrequest.go @@ -19,10 +19,9 @@ limitations under the License. package fake import ( - gentype "k8s.io/client-go/gentype" - v1alpha1 "github.com/kube-bind/kube-bind/sdk/apis/kubebind/v1alpha1" kubebindv1alpha1 "github.com/kube-bind/kube-bind/sdk/client/clientset/versioned/typed/kubebind/v1alpha1" + gentype "k8s.io/client-go/gentype" ) // fakeAPIServiceExportRequests implements APIServiceExportRequestInterface diff --git a/sdk/client/clientset/versioned/typed/kubebind/v1alpha1/fake/fake_apiservicenamespace.go b/sdk/client/clientset/versioned/typed/kubebind/v1alpha1/fake/fake_apiservicenamespace.go index 6fa139bb8..37e8a2aa7 100644 --- a/sdk/client/clientset/versioned/typed/kubebind/v1alpha1/fake/fake_apiservicenamespace.go +++ b/sdk/client/clientset/versioned/typed/kubebind/v1alpha1/fake/fake_apiservicenamespace.go @@ -19,10 +19,9 @@ limitations under the License. package fake import ( - gentype "k8s.io/client-go/gentype" - v1alpha1 "github.com/kube-bind/kube-bind/sdk/apis/kubebind/v1alpha1" kubebindv1alpha1 "github.com/kube-bind/kube-bind/sdk/client/clientset/versioned/typed/kubebind/v1alpha1" + gentype "k8s.io/client-go/gentype" ) // fakeAPIServiceNamespaces implements APIServiceNamespaceInterface diff --git a/sdk/client/clientset/versioned/typed/kubebind/v1alpha1/fake/fake_clusterbinding.go b/sdk/client/clientset/versioned/typed/kubebind/v1alpha1/fake/fake_clusterbinding.go index ff62ee38f..d37540d9c 100644 --- a/sdk/client/clientset/versioned/typed/kubebind/v1alpha1/fake/fake_clusterbinding.go +++ b/sdk/client/clientset/versioned/typed/kubebind/v1alpha1/fake/fake_clusterbinding.go @@ -19,10 +19,9 @@ limitations under the License. package fake import ( - gentype "k8s.io/client-go/gentype" - v1alpha1 "github.com/kube-bind/kube-bind/sdk/apis/kubebind/v1alpha1" kubebindv1alpha1 "github.com/kube-bind/kube-bind/sdk/client/clientset/versioned/typed/kubebind/v1alpha1" + gentype "k8s.io/client-go/gentype" ) // fakeClusterBindings implements ClusterBindingInterface diff --git a/sdk/client/clientset/versioned/typed/kubebind/v1alpha1/fake/fake_kubebind_client.go b/sdk/client/clientset/versioned/typed/kubebind/v1alpha1/fake/fake_kubebind_client.go index 0a79be8c1..86ba5adc0 100644 --- a/sdk/client/clientset/versioned/typed/kubebind/v1alpha1/fake/fake_kubebind_client.go +++ b/sdk/client/clientset/versioned/typed/kubebind/v1alpha1/fake/fake_kubebind_client.go @@ -19,10 +19,9 @@ limitations under the License. package fake import ( + v1alpha1 "github.com/kube-bind/kube-bind/sdk/client/clientset/versioned/typed/kubebind/v1alpha1" rest "k8s.io/client-go/rest" testing "k8s.io/client-go/testing" - - v1alpha1 "github.com/kube-bind/kube-bind/sdk/client/clientset/versioned/typed/kubebind/v1alpha1" ) type FakeKubeBindV1alpha1 struct { diff --git a/sdk/client/clientset/versioned/typed/kubebind/v1alpha1/kubebind_client.go b/sdk/client/clientset/versioned/typed/kubebind/v1alpha1/kubebind_client.go index 66c01f849..ee181a374 100644 --- a/sdk/client/clientset/versioned/typed/kubebind/v1alpha1/kubebind_client.go +++ b/sdk/client/clientset/versioned/typed/kubebind/v1alpha1/kubebind_client.go @@ -21,10 +21,9 @@ package v1alpha1 import ( http "net/http" - rest "k8s.io/client-go/rest" - kubebindv1alpha1 "github.com/kube-bind/kube-bind/sdk/apis/kubebind/v1alpha1" scheme "github.com/kube-bind/kube-bind/sdk/client/clientset/versioned/scheme" + rest "k8s.io/client-go/rest" ) type KubeBindV1alpha1Interface interface { diff --git a/sdk/client/clientset/versioned/typed/kubebind/v1alpha2/apiservicebinding.go b/sdk/client/clientset/versioned/typed/kubebind/v1alpha2/apiservicebinding.go index 09733fe90..fca5cfb57 100644 --- a/sdk/client/clientset/versioned/typed/kubebind/v1alpha2/apiservicebinding.go +++ b/sdk/client/clientset/versioned/typed/kubebind/v1alpha2/apiservicebinding.go @@ -21,13 +21,12 @@ package v1alpha2 import ( context "context" + kubebindv1alpha2 "github.com/kube-bind/kube-bind/sdk/apis/kubebind/v1alpha2" + scheme "github.com/kube-bind/kube-bind/sdk/client/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" gentype "k8s.io/client-go/gentype" - - kubebindv1alpha2 "github.com/kube-bind/kube-bind/sdk/apis/kubebind/v1alpha2" - scheme "github.com/kube-bind/kube-bind/sdk/client/clientset/versioned/scheme" ) // APIServiceBindingsGetter has a method to return a APIServiceBindingInterface. diff --git a/sdk/client/clientset/versioned/typed/kubebind/v1alpha2/apiserviceexport.go b/sdk/client/clientset/versioned/typed/kubebind/v1alpha2/apiserviceexport.go index 2d6681ef3..fb6eaed42 100644 --- a/sdk/client/clientset/versioned/typed/kubebind/v1alpha2/apiserviceexport.go +++ b/sdk/client/clientset/versioned/typed/kubebind/v1alpha2/apiserviceexport.go @@ -21,13 +21,12 @@ package v1alpha2 import ( context "context" + kubebindv1alpha2 "github.com/kube-bind/kube-bind/sdk/apis/kubebind/v1alpha2" + scheme "github.com/kube-bind/kube-bind/sdk/client/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" gentype "k8s.io/client-go/gentype" - - kubebindv1alpha2 "github.com/kube-bind/kube-bind/sdk/apis/kubebind/v1alpha2" - scheme "github.com/kube-bind/kube-bind/sdk/client/clientset/versioned/scheme" ) // APIServiceExportsGetter has a method to return a APIServiceExportInterface. diff --git a/sdk/client/clientset/versioned/typed/kubebind/v1alpha2/apiserviceexportrequest.go b/sdk/client/clientset/versioned/typed/kubebind/v1alpha2/apiserviceexportrequest.go index c5da294c1..df400ff58 100644 --- a/sdk/client/clientset/versioned/typed/kubebind/v1alpha2/apiserviceexportrequest.go +++ b/sdk/client/clientset/versioned/typed/kubebind/v1alpha2/apiserviceexportrequest.go @@ -21,13 +21,12 @@ package v1alpha2 import ( context "context" + kubebindv1alpha2 "github.com/kube-bind/kube-bind/sdk/apis/kubebind/v1alpha2" + scheme "github.com/kube-bind/kube-bind/sdk/client/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" gentype "k8s.io/client-go/gentype" - - kubebindv1alpha2 "github.com/kube-bind/kube-bind/sdk/apis/kubebind/v1alpha2" - scheme "github.com/kube-bind/kube-bind/sdk/client/clientset/versioned/scheme" ) // APIServiceExportRequestsGetter has a method to return a APIServiceExportRequestInterface. diff --git a/sdk/client/clientset/versioned/typed/kubebind/v1alpha2/apiservicenamespace.go b/sdk/client/clientset/versioned/typed/kubebind/v1alpha2/apiservicenamespace.go index 23ea1205d..6dcf3f70a 100644 --- a/sdk/client/clientset/versioned/typed/kubebind/v1alpha2/apiservicenamespace.go +++ b/sdk/client/clientset/versioned/typed/kubebind/v1alpha2/apiservicenamespace.go @@ -21,13 +21,12 @@ package v1alpha2 import ( context "context" + kubebindv1alpha2 "github.com/kube-bind/kube-bind/sdk/apis/kubebind/v1alpha2" + scheme "github.com/kube-bind/kube-bind/sdk/client/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" gentype "k8s.io/client-go/gentype" - - kubebindv1alpha2 "github.com/kube-bind/kube-bind/sdk/apis/kubebind/v1alpha2" - scheme "github.com/kube-bind/kube-bind/sdk/client/clientset/versioned/scheme" ) // APIServiceNamespacesGetter has a method to return a APIServiceNamespaceInterface. diff --git a/sdk/client/clientset/versioned/typed/kubebind/v1alpha2/boundschema.go b/sdk/client/clientset/versioned/typed/kubebind/v1alpha2/boundschema.go index 2e73da6e4..b45c30d06 100644 --- a/sdk/client/clientset/versioned/typed/kubebind/v1alpha2/boundschema.go +++ b/sdk/client/clientset/versioned/typed/kubebind/v1alpha2/boundschema.go @@ -21,13 +21,12 @@ package v1alpha2 import ( context "context" + kubebindv1alpha2 "github.com/kube-bind/kube-bind/sdk/apis/kubebind/v1alpha2" + scheme "github.com/kube-bind/kube-bind/sdk/client/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" gentype "k8s.io/client-go/gentype" - - kubebindv1alpha2 "github.com/kube-bind/kube-bind/sdk/apis/kubebind/v1alpha2" - scheme "github.com/kube-bind/kube-bind/sdk/client/clientset/versioned/scheme" ) // BoundSchemasGetter has a method to return a BoundSchemaInterface. diff --git a/sdk/client/clientset/versioned/typed/kubebind/v1alpha2/clusterbinding.go b/sdk/client/clientset/versioned/typed/kubebind/v1alpha2/clusterbinding.go index 83d5300ff..081ba264d 100644 --- a/sdk/client/clientset/versioned/typed/kubebind/v1alpha2/clusterbinding.go +++ b/sdk/client/clientset/versioned/typed/kubebind/v1alpha2/clusterbinding.go @@ -21,13 +21,12 @@ package v1alpha2 import ( context "context" + kubebindv1alpha2 "github.com/kube-bind/kube-bind/sdk/apis/kubebind/v1alpha2" + scheme "github.com/kube-bind/kube-bind/sdk/client/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" gentype "k8s.io/client-go/gentype" - - kubebindv1alpha2 "github.com/kube-bind/kube-bind/sdk/apis/kubebind/v1alpha2" - scheme "github.com/kube-bind/kube-bind/sdk/client/clientset/versioned/scheme" ) // ClusterBindingsGetter has a method to return a ClusterBindingInterface. diff --git a/sdk/client/clientset/versioned/typed/kubebind/v1alpha2/fake/fake_apiservicebinding.go b/sdk/client/clientset/versioned/typed/kubebind/v1alpha2/fake/fake_apiservicebinding.go index 2d5951cf6..b66334e64 100644 --- a/sdk/client/clientset/versioned/typed/kubebind/v1alpha2/fake/fake_apiservicebinding.go +++ b/sdk/client/clientset/versioned/typed/kubebind/v1alpha2/fake/fake_apiservicebinding.go @@ -19,10 +19,9 @@ limitations under the License. package fake import ( - gentype "k8s.io/client-go/gentype" - v1alpha2 "github.com/kube-bind/kube-bind/sdk/apis/kubebind/v1alpha2" kubebindv1alpha2 "github.com/kube-bind/kube-bind/sdk/client/clientset/versioned/typed/kubebind/v1alpha2" + gentype "k8s.io/client-go/gentype" ) // fakeAPIServiceBindings implements APIServiceBindingInterface diff --git a/sdk/client/clientset/versioned/typed/kubebind/v1alpha2/fake/fake_apiserviceexport.go b/sdk/client/clientset/versioned/typed/kubebind/v1alpha2/fake/fake_apiserviceexport.go index c60c4b8e3..f05d6d20c 100644 --- a/sdk/client/clientset/versioned/typed/kubebind/v1alpha2/fake/fake_apiserviceexport.go +++ b/sdk/client/clientset/versioned/typed/kubebind/v1alpha2/fake/fake_apiserviceexport.go @@ -19,10 +19,9 @@ limitations under the License. package fake import ( - gentype "k8s.io/client-go/gentype" - v1alpha2 "github.com/kube-bind/kube-bind/sdk/apis/kubebind/v1alpha2" kubebindv1alpha2 "github.com/kube-bind/kube-bind/sdk/client/clientset/versioned/typed/kubebind/v1alpha2" + gentype "k8s.io/client-go/gentype" ) // fakeAPIServiceExports implements APIServiceExportInterface diff --git a/sdk/client/clientset/versioned/typed/kubebind/v1alpha2/fake/fake_apiserviceexportrequest.go b/sdk/client/clientset/versioned/typed/kubebind/v1alpha2/fake/fake_apiserviceexportrequest.go index 9c913d6e7..ae8930dd8 100644 --- a/sdk/client/clientset/versioned/typed/kubebind/v1alpha2/fake/fake_apiserviceexportrequest.go +++ b/sdk/client/clientset/versioned/typed/kubebind/v1alpha2/fake/fake_apiserviceexportrequest.go @@ -19,10 +19,9 @@ limitations under the License. package fake import ( - gentype "k8s.io/client-go/gentype" - v1alpha2 "github.com/kube-bind/kube-bind/sdk/apis/kubebind/v1alpha2" kubebindv1alpha2 "github.com/kube-bind/kube-bind/sdk/client/clientset/versioned/typed/kubebind/v1alpha2" + gentype "k8s.io/client-go/gentype" ) // fakeAPIServiceExportRequests implements APIServiceExportRequestInterface diff --git a/sdk/client/clientset/versioned/typed/kubebind/v1alpha2/fake/fake_apiservicenamespace.go b/sdk/client/clientset/versioned/typed/kubebind/v1alpha2/fake/fake_apiservicenamespace.go index 39115dffb..ea6ffa95f 100644 --- a/sdk/client/clientset/versioned/typed/kubebind/v1alpha2/fake/fake_apiservicenamespace.go +++ b/sdk/client/clientset/versioned/typed/kubebind/v1alpha2/fake/fake_apiservicenamespace.go @@ -19,10 +19,9 @@ limitations under the License. package fake import ( - gentype "k8s.io/client-go/gentype" - v1alpha2 "github.com/kube-bind/kube-bind/sdk/apis/kubebind/v1alpha2" kubebindv1alpha2 "github.com/kube-bind/kube-bind/sdk/client/clientset/versioned/typed/kubebind/v1alpha2" + gentype "k8s.io/client-go/gentype" ) // fakeAPIServiceNamespaces implements APIServiceNamespaceInterface diff --git a/sdk/client/clientset/versioned/typed/kubebind/v1alpha2/fake/fake_boundschema.go b/sdk/client/clientset/versioned/typed/kubebind/v1alpha2/fake/fake_boundschema.go index 19b73ab41..a50559ca6 100644 --- a/sdk/client/clientset/versioned/typed/kubebind/v1alpha2/fake/fake_boundschema.go +++ b/sdk/client/clientset/versioned/typed/kubebind/v1alpha2/fake/fake_boundschema.go @@ -19,10 +19,9 @@ limitations under the License. package fake import ( - gentype "k8s.io/client-go/gentype" - v1alpha2 "github.com/kube-bind/kube-bind/sdk/apis/kubebind/v1alpha2" kubebindv1alpha2 "github.com/kube-bind/kube-bind/sdk/client/clientset/versioned/typed/kubebind/v1alpha2" + gentype "k8s.io/client-go/gentype" ) // fakeBoundSchemas implements BoundSchemaInterface diff --git a/sdk/client/clientset/versioned/typed/kubebind/v1alpha2/fake/fake_clusterbinding.go b/sdk/client/clientset/versioned/typed/kubebind/v1alpha2/fake/fake_clusterbinding.go index 03642d0b8..d1f5a1fb8 100644 --- a/sdk/client/clientset/versioned/typed/kubebind/v1alpha2/fake/fake_clusterbinding.go +++ b/sdk/client/clientset/versioned/typed/kubebind/v1alpha2/fake/fake_clusterbinding.go @@ -19,10 +19,9 @@ limitations under the License. package fake import ( - gentype "k8s.io/client-go/gentype" - v1alpha2 "github.com/kube-bind/kube-bind/sdk/apis/kubebind/v1alpha2" kubebindv1alpha2 "github.com/kube-bind/kube-bind/sdk/client/clientset/versioned/typed/kubebind/v1alpha2" + gentype "k8s.io/client-go/gentype" ) // fakeClusterBindings implements ClusterBindingInterface diff --git a/sdk/client/clientset/versioned/typed/kubebind/v1alpha2/fake/fake_kubebind_client.go b/sdk/client/clientset/versioned/typed/kubebind/v1alpha2/fake/fake_kubebind_client.go index 3a48e9c60..d1661b376 100644 --- a/sdk/client/clientset/versioned/typed/kubebind/v1alpha2/fake/fake_kubebind_client.go +++ b/sdk/client/clientset/versioned/typed/kubebind/v1alpha2/fake/fake_kubebind_client.go @@ -19,10 +19,9 @@ limitations under the License. package fake import ( + v1alpha2 "github.com/kube-bind/kube-bind/sdk/client/clientset/versioned/typed/kubebind/v1alpha2" rest "k8s.io/client-go/rest" testing "k8s.io/client-go/testing" - - v1alpha2 "github.com/kube-bind/kube-bind/sdk/client/clientset/versioned/typed/kubebind/v1alpha2" ) type FakeKubeBindV1alpha2 struct { diff --git a/sdk/client/clientset/versioned/typed/kubebind/v1alpha2/kubebind_client.go b/sdk/client/clientset/versioned/typed/kubebind/v1alpha2/kubebind_client.go index f215f2faa..6d26561d6 100644 --- a/sdk/client/clientset/versioned/typed/kubebind/v1alpha2/kubebind_client.go +++ b/sdk/client/clientset/versioned/typed/kubebind/v1alpha2/kubebind_client.go @@ -21,10 +21,9 @@ package v1alpha2 import ( http "net/http" - rest "k8s.io/client-go/rest" - kubebindv1alpha2 "github.com/kube-bind/kube-bind/sdk/apis/kubebind/v1alpha2" scheme "github.com/kube-bind/kube-bind/sdk/client/clientset/versioned/scheme" + rest "k8s.io/client-go/rest" ) type KubeBindV1alpha2Interface interface { diff --git a/sdk/client/informers/externalversions/factory.go b/sdk/client/informers/externalversions/factory.go index 72830755c..ef43a16dd 100644 --- a/sdk/client/informers/externalversions/factory.go +++ b/sdk/client/informers/externalversions/factory.go @@ -23,14 +23,13 @@ import ( sync "sync" time "time" + versioned "github.com/kube-bind/kube-bind/sdk/client/clientset/versioned" + internalinterfaces "github.com/kube-bind/kube-bind/sdk/client/informers/externalversions/internalinterfaces" + kubebind "github.com/kube-bind/kube-bind/sdk/client/informers/externalversions/kubebind" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" cache "k8s.io/client-go/tools/cache" - - versioned "github.com/kube-bind/kube-bind/sdk/client/clientset/versioned" - internalinterfaces "github.com/kube-bind/kube-bind/sdk/client/informers/externalversions/internalinterfaces" - kubebind "github.com/kube-bind/kube-bind/sdk/client/informers/externalversions/kubebind" ) // SharedInformerOption defines the functional option type for SharedInformerFactory. diff --git a/sdk/client/informers/externalversions/generic.go b/sdk/client/informers/externalversions/generic.go index eb77273d5..27b112efb 100644 --- a/sdk/client/informers/externalversions/generic.go +++ b/sdk/client/informers/externalversions/generic.go @@ -21,11 +21,10 @@ package externalversions import ( fmt "fmt" - schema "k8s.io/apimachinery/pkg/runtime/schema" - cache "k8s.io/client-go/tools/cache" - v1alpha1 "github.com/kube-bind/kube-bind/sdk/apis/kubebind/v1alpha1" v1alpha2 "github.com/kube-bind/kube-bind/sdk/apis/kubebind/v1alpha2" + schema "k8s.io/apimachinery/pkg/runtime/schema" + cache "k8s.io/client-go/tools/cache" ) // GenericInformer is type of SharedIndexInformer which will locate and delegate to other diff --git a/sdk/client/informers/externalversions/internalinterfaces/factory_interfaces.go b/sdk/client/informers/externalversions/internalinterfaces/factory_interfaces.go index 3bda8fce6..d807af268 100644 --- a/sdk/client/informers/externalversions/internalinterfaces/factory_interfaces.go +++ b/sdk/client/informers/externalversions/internalinterfaces/factory_interfaces.go @@ -21,11 +21,10 @@ package internalinterfaces import ( time "time" + versioned "github.com/kube-bind/kube-bind/sdk/client/clientset/versioned" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" cache "k8s.io/client-go/tools/cache" - - versioned "github.com/kube-bind/kube-bind/sdk/client/clientset/versioned" ) // NewInformerFunc takes versioned.Interface and time.Duration to return a SharedIndexInformer. diff --git a/sdk/client/informers/externalversions/kubebind/v1alpha1/apiservicebinding.go b/sdk/client/informers/externalversions/kubebind/v1alpha1/apiservicebinding.go index a741f710e..b609661f7 100644 --- a/sdk/client/informers/externalversions/kubebind/v1alpha1/apiservicebinding.go +++ b/sdk/client/informers/externalversions/kubebind/v1alpha1/apiservicebinding.go @@ -22,15 +22,14 @@ import ( context "context" time "time" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - runtime "k8s.io/apimachinery/pkg/runtime" - watch "k8s.io/apimachinery/pkg/watch" - cache "k8s.io/client-go/tools/cache" - apiskubebindv1alpha1 "github.com/kube-bind/kube-bind/sdk/apis/kubebind/v1alpha1" versioned "github.com/kube-bind/kube-bind/sdk/client/clientset/versioned" internalinterfaces "github.com/kube-bind/kube-bind/sdk/client/informers/externalversions/internalinterfaces" kubebindv1alpha1 "github.com/kube-bind/kube-bind/sdk/client/listers/kubebind/v1alpha1" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + runtime "k8s.io/apimachinery/pkg/runtime" + watch "k8s.io/apimachinery/pkg/watch" + cache "k8s.io/client-go/tools/cache" ) // APIServiceBindingInformer provides access to a shared informer and lister for diff --git a/sdk/client/informers/externalversions/kubebind/v1alpha1/apiserviceexport.go b/sdk/client/informers/externalversions/kubebind/v1alpha1/apiserviceexport.go index a62c3bf89..b92cfb360 100644 --- a/sdk/client/informers/externalversions/kubebind/v1alpha1/apiserviceexport.go +++ b/sdk/client/informers/externalversions/kubebind/v1alpha1/apiserviceexport.go @@ -22,15 +22,14 @@ import ( context "context" time "time" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - runtime "k8s.io/apimachinery/pkg/runtime" - watch "k8s.io/apimachinery/pkg/watch" - cache "k8s.io/client-go/tools/cache" - apiskubebindv1alpha1 "github.com/kube-bind/kube-bind/sdk/apis/kubebind/v1alpha1" versioned "github.com/kube-bind/kube-bind/sdk/client/clientset/versioned" internalinterfaces "github.com/kube-bind/kube-bind/sdk/client/informers/externalversions/internalinterfaces" kubebindv1alpha1 "github.com/kube-bind/kube-bind/sdk/client/listers/kubebind/v1alpha1" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + runtime "k8s.io/apimachinery/pkg/runtime" + watch "k8s.io/apimachinery/pkg/watch" + cache "k8s.io/client-go/tools/cache" ) // APIServiceExportInformer provides access to a shared informer and lister for diff --git a/sdk/client/informers/externalversions/kubebind/v1alpha1/apiserviceexportrequest.go b/sdk/client/informers/externalversions/kubebind/v1alpha1/apiserviceexportrequest.go index e04b7cd64..39e688be3 100644 --- a/sdk/client/informers/externalversions/kubebind/v1alpha1/apiserviceexportrequest.go +++ b/sdk/client/informers/externalversions/kubebind/v1alpha1/apiserviceexportrequest.go @@ -22,15 +22,14 @@ import ( context "context" time "time" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - runtime "k8s.io/apimachinery/pkg/runtime" - watch "k8s.io/apimachinery/pkg/watch" - cache "k8s.io/client-go/tools/cache" - apiskubebindv1alpha1 "github.com/kube-bind/kube-bind/sdk/apis/kubebind/v1alpha1" versioned "github.com/kube-bind/kube-bind/sdk/client/clientset/versioned" internalinterfaces "github.com/kube-bind/kube-bind/sdk/client/informers/externalversions/internalinterfaces" kubebindv1alpha1 "github.com/kube-bind/kube-bind/sdk/client/listers/kubebind/v1alpha1" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + runtime "k8s.io/apimachinery/pkg/runtime" + watch "k8s.io/apimachinery/pkg/watch" + cache "k8s.io/client-go/tools/cache" ) // APIServiceExportRequestInformer provides access to a shared informer and lister for diff --git a/sdk/client/informers/externalversions/kubebind/v1alpha1/apiservicenamespace.go b/sdk/client/informers/externalversions/kubebind/v1alpha1/apiservicenamespace.go index 107774251..ef1e20937 100644 --- a/sdk/client/informers/externalversions/kubebind/v1alpha1/apiservicenamespace.go +++ b/sdk/client/informers/externalversions/kubebind/v1alpha1/apiservicenamespace.go @@ -22,15 +22,14 @@ import ( context "context" time "time" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - runtime "k8s.io/apimachinery/pkg/runtime" - watch "k8s.io/apimachinery/pkg/watch" - cache "k8s.io/client-go/tools/cache" - apiskubebindv1alpha1 "github.com/kube-bind/kube-bind/sdk/apis/kubebind/v1alpha1" versioned "github.com/kube-bind/kube-bind/sdk/client/clientset/versioned" internalinterfaces "github.com/kube-bind/kube-bind/sdk/client/informers/externalversions/internalinterfaces" kubebindv1alpha1 "github.com/kube-bind/kube-bind/sdk/client/listers/kubebind/v1alpha1" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + runtime "k8s.io/apimachinery/pkg/runtime" + watch "k8s.io/apimachinery/pkg/watch" + cache "k8s.io/client-go/tools/cache" ) // APIServiceNamespaceInformer provides access to a shared informer and lister for diff --git a/sdk/client/informers/externalversions/kubebind/v1alpha1/clusterbinding.go b/sdk/client/informers/externalversions/kubebind/v1alpha1/clusterbinding.go index 558ced766..370e4043d 100644 --- a/sdk/client/informers/externalversions/kubebind/v1alpha1/clusterbinding.go +++ b/sdk/client/informers/externalversions/kubebind/v1alpha1/clusterbinding.go @@ -22,15 +22,14 @@ import ( context "context" time "time" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - runtime "k8s.io/apimachinery/pkg/runtime" - watch "k8s.io/apimachinery/pkg/watch" - cache "k8s.io/client-go/tools/cache" - apiskubebindv1alpha1 "github.com/kube-bind/kube-bind/sdk/apis/kubebind/v1alpha1" versioned "github.com/kube-bind/kube-bind/sdk/client/clientset/versioned" internalinterfaces "github.com/kube-bind/kube-bind/sdk/client/informers/externalversions/internalinterfaces" kubebindv1alpha1 "github.com/kube-bind/kube-bind/sdk/client/listers/kubebind/v1alpha1" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + runtime "k8s.io/apimachinery/pkg/runtime" + watch "k8s.io/apimachinery/pkg/watch" + cache "k8s.io/client-go/tools/cache" ) // ClusterBindingInformer provides access to a shared informer and lister for diff --git a/sdk/client/informers/externalversions/kubebind/v1alpha2/apiservicebinding.go b/sdk/client/informers/externalversions/kubebind/v1alpha2/apiservicebinding.go index 434055c28..151a9b42c 100644 --- a/sdk/client/informers/externalversions/kubebind/v1alpha2/apiservicebinding.go +++ b/sdk/client/informers/externalversions/kubebind/v1alpha2/apiservicebinding.go @@ -22,15 +22,14 @@ import ( context "context" time "time" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - runtime "k8s.io/apimachinery/pkg/runtime" - watch "k8s.io/apimachinery/pkg/watch" - cache "k8s.io/client-go/tools/cache" - apiskubebindv1alpha2 "github.com/kube-bind/kube-bind/sdk/apis/kubebind/v1alpha2" versioned "github.com/kube-bind/kube-bind/sdk/client/clientset/versioned" internalinterfaces "github.com/kube-bind/kube-bind/sdk/client/informers/externalversions/internalinterfaces" kubebindv1alpha2 "github.com/kube-bind/kube-bind/sdk/client/listers/kubebind/v1alpha2" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + runtime "k8s.io/apimachinery/pkg/runtime" + watch "k8s.io/apimachinery/pkg/watch" + cache "k8s.io/client-go/tools/cache" ) // APIServiceBindingInformer provides access to a shared informer and lister for diff --git a/sdk/client/informers/externalversions/kubebind/v1alpha2/apiserviceexport.go b/sdk/client/informers/externalversions/kubebind/v1alpha2/apiserviceexport.go index f0da75aa3..670753b6e 100644 --- a/sdk/client/informers/externalversions/kubebind/v1alpha2/apiserviceexport.go +++ b/sdk/client/informers/externalversions/kubebind/v1alpha2/apiserviceexport.go @@ -22,15 +22,14 @@ import ( context "context" time "time" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - runtime "k8s.io/apimachinery/pkg/runtime" - watch "k8s.io/apimachinery/pkg/watch" - cache "k8s.io/client-go/tools/cache" - apiskubebindv1alpha2 "github.com/kube-bind/kube-bind/sdk/apis/kubebind/v1alpha2" versioned "github.com/kube-bind/kube-bind/sdk/client/clientset/versioned" internalinterfaces "github.com/kube-bind/kube-bind/sdk/client/informers/externalversions/internalinterfaces" kubebindv1alpha2 "github.com/kube-bind/kube-bind/sdk/client/listers/kubebind/v1alpha2" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + runtime "k8s.io/apimachinery/pkg/runtime" + watch "k8s.io/apimachinery/pkg/watch" + cache "k8s.io/client-go/tools/cache" ) // APIServiceExportInformer provides access to a shared informer and lister for diff --git a/sdk/client/informers/externalversions/kubebind/v1alpha2/apiserviceexportrequest.go b/sdk/client/informers/externalversions/kubebind/v1alpha2/apiserviceexportrequest.go index 90fa19f21..c2eb2b120 100644 --- a/sdk/client/informers/externalversions/kubebind/v1alpha2/apiserviceexportrequest.go +++ b/sdk/client/informers/externalversions/kubebind/v1alpha2/apiserviceexportrequest.go @@ -22,15 +22,14 @@ import ( context "context" time "time" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - runtime "k8s.io/apimachinery/pkg/runtime" - watch "k8s.io/apimachinery/pkg/watch" - cache "k8s.io/client-go/tools/cache" - apiskubebindv1alpha2 "github.com/kube-bind/kube-bind/sdk/apis/kubebind/v1alpha2" versioned "github.com/kube-bind/kube-bind/sdk/client/clientset/versioned" internalinterfaces "github.com/kube-bind/kube-bind/sdk/client/informers/externalversions/internalinterfaces" kubebindv1alpha2 "github.com/kube-bind/kube-bind/sdk/client/listers/kubebind/v1alpha2" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + runtime "k8s.io/apimachinery/pkg/runtime" + watch "k8s.io/apimachinery/pkg/watch" + cache "k8s.io/client-go/tools/cache" ) // APIServiceExportRequestInformer provides access to a shared informer and lister for diff --git a/sdk/client/informers/externalversions/kubebind/v1alpha2/apiservicenamespace.go b/sdk/client/informers/externalversions/kubebind/v1alpha2/apiservicenamespace.go index 317085fba..41922ece7 100644 --- a/sdk/client/informers/externalversions/kubebind/v1alpha2/apiservicenamespace.go +++ b/sdk/client/informers/externalversions/kubebind/v1alpha2/apiservicenamespace.go @@ -22,15 +22,14 @@ import ( context "context" time "time" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - runtime "k8s.io/apimachinery/pkg/runtime" - watch "k8s.io/apimachinery/pkg/watch" - cache "k8s.io/client-go/tools/cache" - apiskubebindv1alpha2 "github.com/kube-bind/kube-bind/sdk/apis/kubebind/v1alpha2" versioned "github.com/kube-bind/kube-bind/sdk/client/clientset/versioned" internalinterfaces "github.com/kube-bind/kube-bind/sdk/client/informers/externalversions/internalinterfaces" kubebindv1alpha2 "github.com/kube-bind/kube-bind/sdk/client/listers/kubebind/v1alpha2" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + runtime "k8s.io/apimachinery/pkg/runtime" + watch "k8s.io/apimachinery/pkg/watch" + cache "k8s.io/client-go/tools/cache" ) // APIServiceNamespaceInformer provides access to a shared informer and lister for diff --git a/sdk/client/informers/externalversions/kubebind/v1alpha2/boundschema.go b/sdk/client/informers/externalversions/kubebind/v1alpha2/boundschema.go index d56d2b0dd..565d9ec52 100644 --- a/sdk/client/informers/externalversions/kubebind/v1alpha2/boundschema.go +++ b/sdk/client/informers/externalversions/kubebind/v1alpha2/boundschema.go @@ -22,15 +22,14 @@ import ( context "context" time "time" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - runtime "k8s.io/apimachinery/pkg/runtime" - watch "k8s.io/apimachinery/pkg/watch" - cache "k8s.io/client-go/tools/cache" - apiskubebindv1alpha2 "github.com/kube-bind/kube-bind/sdk/apis/kubebind/v1alpha2" versioned "github.com/kube-bind/kube-bind/sdk/client/clientset/versioned" internalinterfaces "github.com/kube-bind/kube-bind/sdk/client/informers/externalversions/internalinterfaces" kubebindv1alpha2 "github.com/kube-bind/kube-bind/sdk/client/listers/kubebind/v1alpha2" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + runtime "k8s.io/apimachinery/pkg/runtime" + watch "k8s.io/apimachinery/pkg/watch" + cache "k8s.io/client-go/tools/cache" ) // BoundSchemaInformer provides access to a shared informer and lister for diff --git a/sdk/client/informers/externalversions/kubebind/v1alpha2/clusterbinding.go b/sdk/client/informers/externalversions/kubebind/v1alpha2/clusterbinding.go index 5bc237519..1d5070eee 100644 --- a/sdk/client/informers/externalversions/kubebind/v1alpha2/clusterbinding.go +++ b/sdk/client/informers/externalversions/kubebind/v1alpha2/clusterbinding.go @@ -22,15 +22,14 @@ import ( context "context" time "time" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - runtime "k8s.io/apimachinery/pkg/runtime" - watch "k8s.io/apimachinery/pkg/watch" - cache "k8s.io/client-go/tools/cache" - apiskubebindv1alpha2 "github.com/kube-bind/kube-bind/sdk/apis/kubebind/v1alpha2" versioned "github.com/kube-bind/kube-bind/sdk/client/clientset/versioned" internalinterfaces "github.com/kube-bind/kube-bind/sdk/client/informers/externalversions/internalinterfaces" kubebindv1alpha2 "github.com/kube-bind/kube-bind/sdk/client/listers/kubebind/v1alpha2" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + runtime "k8s.io/apimachinery/pkg/runtime" + watch "k8s.io/apimachinery/pkg/watch" + cache "k8s.io/client-go/tools/cache" ) // ClusterBindingInformer provides access to a shared informer and lister for diff --git a/sdk/client/listers/kubebind/v1alpha1/apiservicebinding.go b/sdk/client/listers/kubebind/v1alpha1/apiservicebinding.go index b32605cfe..c38dca7ea 100644 --- a/sdk/client/listers/kubebind/v1alpha1/apiservicebinding.go +++ b/sdk/client/listers/kubebind/v1alpha1/apiservicebinding.go @@ -19,11 +19,10 @@ limitations under the License. package v1alpha1 import ( + kubebindv1alpha1 "github.com/kube-bind/kube-bind/sdk/apis/kubebind/v1alpha1" labels "k8s.io/apimachinery/pkg/labels" listers "k8s.io/client-go/listers" cache "k8s.io/client-go/tools/cache" - - kubebindv1alpha1 "github.com/kube-bind/kube-bind/sdk/apis/kubebind/v1alpha1" ) // APIServiceBindingLister helps list APIServiceBindings. diff --git a/sdk/client/listers/kubebind/v1alpha1/apiserviceexport.go b/sdk/client/listers/kubebind/v1alpha1/apiserviceexport.go index 799c0f201..ab7330da2 100644 --- a/sdk/client/listers/kubebind/v1alpha1/apiserviceexport.go +++ b/sdk/client/listers/kubebind/v1alpha1/apiserviceexport.go @@ -19,11 +19,10 @@ limitations under the License. package v1alpha1 import ( + kubebindv1alpha1 "github.com/kube-bind/kube-bind/sdk/apis/kubebind/v1alpha1" labels "k8s.io/apimachinery/pkg/labels" listers "k8s.io/client-go/listers" cache "k8s.io/client-go/tools/cache" - - kubebindv1alpha1 "github.com/kube-bind/kube-bind/sdk/apis/kubebind/v1alpha1" ) // APIServiceExportLister helps list APIServiceExports. diff --git a/sdk/client/listers/kubebind/v1alpha1/apiserviceexportrequest.go b/sdk/client/listers/kubebind/v1alpha1/apiserviceexportrequest.go index 4f791eb11..b302c52ca 100644 --- a/sdk/client/listers/kubebind/v1alpha1/apiserviceexportrequest.go +++ b/sdk/client/listers/kubebind/v1alpha1/apiserviceexportrequest.go @@ -19,11 +19,10 @@ limitations under the License. package v1alpha1 import ( + kubebindv1alpha1 "github.com/kube-bind/kube-bind/sdk/apis/kubebind/v1alpha1" labels "k8s.io/apimachinery/pkg/labels" listers "k8s.io/client-go/listers" cache "k8s.io/client-go/tools/cache" - - kubebindv1alpha1 "github.com/kube-bind/kube-bind/sdk/apis/kubebind/v1alpha1" ) // APIServiceExportRequestLister helps list APIServiceExportRequests. diff --git a/sdk/client/listers/kubebind/v1alpha1/apiservicenamespace.go b/sdk/client/listers/kubebind/v1alpha1/apiservicenamespace.go index 63cd5e564..d0db5e300 100644 --- a/sdk/client/listers/kubebind/v1alpha1/apiservicenamespace.go +++ b/sdk/client/listers/kubebind/v1alpha1/apiservicenamespace.go @@ -19,11 +19,10 @@ limitations under the License. package v1alpha1 import ( + kubebindv1alpha1 "github.com/kube-bind/kube-bind/sdk/apis/kubebind/v1alpha1" labels "k8s.io/apimachinery/pkg/labels" listers "k8s.io/client-go/listers" cache "k8s.io/client-go/tools/cache" - - kubebindv1alpha1 "github.com/kube-bind/kube-bind/sdk/apis/kubebind/v1alpha1" ) // APIServiceNamespaceLister helps list APIServiceNamespaces. diff --git a/sdk/client/listers/kubebind/v1alpha1/clusterbinding.go b/sdk/client/listers/kubebind/v1alpha1/clusterbinding.go index 705f05f19..60f2f8630 100644 --- a/sdk/client/listers/kubebind/v1alpha1/clusterbinding.go +++ b/sdk/client/listers/kubebind/v1alpha1/clusterbinding.go @@ -19,11 +19,10 @@ limitations under the License. package v1alpha1 import ( + kubebindv1alpha1 "github.com/kube-bind/kube-bind/sdk/apis/kubebind/v1alpha1" labels "k8s.io/apimachinery/pkg/labels" listers "k8s.io/client-go/listers" cache "k8s.io/client-go/tools/cache" - - kubebindv1alpha1 "github.com/kube-bind/kube-bind/sdk/apis/kubebind/v1alpha1" ) // ClusterBindingLister helps list ClusterBindings. diff --git a/sdk/client/listers/kubebind/v1alpha2/apiservicebinding.go b/sdk/client/listers/kubebind/v1alpha2/apiservicebinding.go index bcd96b4c1..e8d20e756 100644 --- a/sdk/client/listers/kubebind/v1alpha2/apiservicebinding.go +++ b/sdk/client/listers/kubebind/v1alpha2/apiservicebinding.go @@ -19,11 +19,10 @@ limitations under the License. package v1alpha2 import ( + kubebindv1alpha2 "github.com/kube-bind/kube-bind/sdk/apis/kubebind/v1alpha2" labels "k8s.io/apimachinery/pkg/labels" listers "k8s.io/client-go/listers" cache "k8s.io/client-go/tools/cache" - - kubebindv1alpha2 "github.com/kube-bind/kube-bind/sdk/apis/kubebind/v1alpha2" ) // APIServiceBindingLister helps list APIServiceBindings. diff --git a/sdk/client/listers/kubebind/v1alpha2/apiserviceexport.go b/sdk/client/listers/kubebind/v1alpha2/apiserviceexport.go index ae6c53dc9..6dc873ec9 100644 --- a/sdk/client/listers/kubebind/v1alpha2/apiserviceexport.go +++ b/sdk/client/listers/kubebind/v1alpha2/apiserviceexport.go @@ -19,11 +19,10 @@ limitations under the License. package v1alpha2 import ( + kubebindv1alpha2 "github.com/kube-bind/kube-bind/sdk/apis/kubebind/v1alpha2" labels "k8s.io/apimachinery/pkg/labels" listers "k8s.io/client-go/listers" cache "k8s.io/client-go/tools/cache" - - kubebindv1alpha2 "github.com/kube-bind/kube-bind/sdk/apis/kubebind/v1alpha2" ) // APIServiceExportLister helps list APIServiceExports. diff --git a/sdk/client/listers/kubebind/v1alpha2/apiserviceexportrequest.go b/sdk/client/listers/kubebind/v1alpha2/apiserviceexportrequest.go index c9b6f907e..8788df35e 100644 --- a/sdk/client/listers/kubebind/v1alpha2/apiserviceexportrequest.go +++ b/sdk/client/listers/kubebind/v1alpha2/apiserviceexportrequest.go @@ -19,11 +19,10 @@ limitations under the License. package v1alpha2 import ( + kubebindv1alpha2 "github.com/kube-bind/kube-bind/sdk/apis/kubebind/v1alpha2" labels "k8s.io/apimachinery/pkg/labels" listers "k8s.io/client-go/listers" cache "k8s.io/client-go/tools/cache" - - kubebindv1alpha2 "github.com/kube-bind/kube-bind/sdk/apis/kubebind/v1alpha2" ) // APIServiceExportRequestLister helps list APIServiceExportRequests. diff --git a/sdk/client/listers/kubebind/v1alpha2/apiservicenamespace.go b/sdk/client/listers/kubebind/v1alpha2/apiservicenamespace.go index 50c485796..f90fadef1 100644 --- a/sdk/client/listers/kubebind/v1alpha2/apiservicenamespace.go +++ b/sdk/client/listers/kubebind/v1alpha2/apiservicenamespace.go @@ -19,11 +19,10 @@ limitations under the License. package v1alpha2 import ( + kubebindv1alpha2 "github.com/kube-bind/kube-bind/sdk/apis/kubebind/v1alpha2" labels "k8s.io/apimachinery/pkg/labels" listers "k8s.io/client-go/listers" cache "k8s.io/client-go/tools/cache" - - kubebindv1alpha2 "github.com/kube-bind/kube-bind/sdk/apis/kubebind/v1alpha2" ) // APIServiceNamespaceLister helps list APIServiceNamespaces. diff --git a/sdk/client/listers/kubebind/v1alpha2/boundschema.go b/sdk/client/listers/kubebind/v1alpha2/boundschema.go index 819029d4d..06bad3889 100644 --- a/sdk/client/listers/kubebind/v1alpha2/boundschema.go +++ b/sdk/client/listers/kubebind/v1alpha2/boundschema.go @@ -19,11 +19,10 @@ limitations under the License. package v1alpha2 import ( + kubebindv1alpha2 "github.com/kube-bind/kube-bind/sdk/apis/kubebind/v1alpha2" labels "k8s.io/apimachinery/pkg/labels" listers "k8s.io/client-go/listers" cache "k8s.io/client-go/tools/cache" - - kubebindv1alpha2 "github.com/kube-bind/kube-bind/sdk/apis/kubebind/v1alpha2" ) // BoundSchemaLister helps list BoundSchemas. diff --git a/sdk/client/listers/kubebind/v1alpha2/clusterbinding.go b/sdk/client/listers/kubebind/v1alpha2/clusterbinding.go index 6e83c3862..b735eade2 100644 --- a/sdk/client/listers/kubebind/v1alpha2/clusterbinding.go +++ b/sdk/client/listers/kubebind/v1alpha2/clusterbinding.go @@ -19,11 +19,10 @@ limitations under the License. package v1alpha2 import ( + kubebindv1alpha2 "github.com/kube-bind/kube-bind/sdk/apis/kubebind/v1alpha2" labels "k8s.io/apimachinery/pkg/labels" listers "k8s.io/client-go/listers" cache "k8s.io/client-go/tools/cache" - - kubebindv1alpha2 "github.com/kube-bind/kube-bind/sdk/apis/kubebind/v1alpha2" ) // ClusterBindingLister helps list ClusterBindings. From 7552436d695807222c4c45954c6fbab4190a49ea Mon Sep 17 00:00:00 2001 From: "Nelo-T. Wallus" Date: Thu, 18 Sep 2025 14:12:18 +0200 Subject: [PATCH 13/13] Add check recipe Signed-off-by: Nelo-T. Wallus Signed-off-by: Nelo-T. Wallus --- Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Makefile b/Makefile index 0252e60df..e6cbc227f 100644 --- a/Makefile +++ b/Makefile @@ -111,6 +111,9 @@ LDFLAGS := \ all: build .PHONY: all +check: verify lint test test-e2e +.PHONY: check + GOMODS := $(shell find . -name 'go.mod' -exec dirname {} \; | grep -v hack/tools) ldflags: