Skip to content

Commit bb2ad8f

Browse files
josvazgjosvazg
authored
CLOUDP-358677: Clear local Go tools usage (#2940)
* Remove local tools usage as go tools * Replace override rules by GEN_OVERRIDE flag
1 parent 2b5ba0d commit bb2ad8f

File tree

5 files changed

+19
-235
lines changed

5 files changed

+19
-235
lines changed

‎Makefile‎

Lines changed: 16 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -206,17 +206,19 @@ endif
206206

207207
# GO TOOLS
208208
CRD2GO := go tool -modfile=tools/toolbox/go.mod crd2go
209-
ifdef LOCALTOOLS
210-
BUILD_OPENAPI2CRD := tools/openapi2crd/bin/openapi2crd
211-
OPENAPI2CRD := tools/openapi2crd/bin/openapi2crd
212-
BUILD_SCAFFOLDER := tools/scaffolder/bin/scaffolder
213-
SCAFFOLDER := tools/scaffolder/bin/scaffolder
209+
210+
# LOCAL TOOLS
211+
OPENAPI2CRD := tools/openapi2crd/bin/openapi2crd
212+
SCAFFOLDER := tools/scaffolder/bin/scaffolder
213+
214+
ifdef GEN_OVERRIDE
215+
OPENAPI2CRD_OVERRIDE := --force
216+
SCAFFOLDER_OVERRIDE := --override
214217
else
215-
OPENAPI2CRD ?= go tool -modfile=tools/toolbox/go.mod openapi2crd
216-
SCAFFOLDER ?= go tool -modfile=tools/toolbox/go.mod scaffolder
218+
OPENAPI2CRD_OVERRIDE :=
219+
SCAFFOLDER_OVERRIDE :=
217220
endif
218221

219-
220222
.DEFAULT_GOAL := help
221223
.PHONY: help
222224
help: ## Show this help screen
@@ -878,37 +880,24 @@ tools/openapi2crd/bin/openapi2crd:
878880
tools/scaffolder/bin/scaffolder:
879881
make -C tools/scaffolder build
880882

881-
gen-crds: $(BUILD_OPENAPI2CRD)
883+
gen-crds: tools/openapi2crd/bin/openapi2crd
882884
@echo "==> Generating CRDs..."
883885
$(OPENAPI2CRD) --config config/openapi2crd.yaml \
884-
--output $(realpath .)/config/generated/crd/bases/crds.yaml
885-
886-
gen-crds-override: $(BUILD_OPENAPI2CRD)
887-
@echo "==> Generating CRDs..."
888-
$(MAKE) -C ./tools/openapi2crd build
889-
$(OPENAPI2CRD) --config tools/openapi2crd/config.yaml \
890-
--output $(realpath .)/config/generated/crd/bases/crds.yaml --force
886+
--output $(realpath .)/config/generated/crd/bases/crds.yaml $(OPENAPI2CRD_OVERRIDE)
891887

892888
gen-go-types:
893889
@echo "==> Generating Go models from CRDs..."
894890
$(CRD2GO) --input $(realpath .)/config/generated/crd/bases/crds.yaml \
895891
--output $(realpath .)/internal/nextapi/generated/v1
896892

897-
run-scaffolder: $(BUILD_SCAFFOLDER)
893+
run-scaffolder: tools/scaffolder/bin/scaffolder
898894
@echo "==> Generating Go controller scaffolding and indexers..."
899895
$(SCAFFOLDER) --input $(realpath .)/config/generated/crd/bases/crds.yaml \
900-
--all --indexer-out $(realpath .)/internal/generated/indexers \
901-
--controller-out $(realpath .)/internal/generated/controller
902-
903-
run-scaffolder-override: $(BUILD_SCAFFOLDER)
904-
@echo "==> Generating Go controller scaffolding and indexers..."
905-
$(SCAFFOLDER) --input $(realpath .)/config/generated/crd/bases/crds.yaml \
906-
--all --override --indexer-out $(realpath .)/internal/generated/indexer \
896+
--all $(SCAFFOLDER_OVERRIDE) \
897+
--indexer-out $(realpath .)/internal/generated/indexer \
907898
--controller-out $(realpath .)/internal/generated/controller
908899

909900
gen-all: gen-crds gen-go-types run-scaffolder
910901

911-
gen-all-override: gen-crds-override gen-go-types run-scaffolder-override
912-
913902
build-autogen: gen-all $(ALL_IN_ONE_AUTOGENERATED_CONFIG)
914-
EXPERIMENTAL=1 VERSION=$(shell $(JQ) -r .next $(VERSION_FILE))-EXPERIMENTAL-${GITCOMMIT} $(MAKE) image
903+
EXPERIMENTAL=1 VERSION=$(shell $(JQ) -r .next $(VERSION_FILE))-EXPERIMENTAL-${GITCOMMIT} $(MAKE) image

‎go.mod‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ require (
102102
github.com/x448/float16 v0.8.4 // indirect
103103
github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82 // indirect
104104
github.com/yudai/pp v2.0.1+incompatible // indirect
105+
go.mongodb.org/atlas-sdk/v20250312008 v20250312008.0.0 // indirect
105106
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
106107
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.61.0 // indirect
107108
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect

‎go.sum‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -377,6 +377,8 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec
377377
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
378378
go.mongodb.org/atlas-sdk/v20250312006 v20250312006.1.0 h1:PcVxslw4G7/I9SbUi5y81i4YZnL1dKRnGpeHVyNSTh4=
379379
go.mongodb.org/atlas-sdk/v20250312006 v20250312006.1.0/go.mod h1:UZYSaCimjGs3j+wMwgHSKUSIvoJXzmy/xrer0t5TLgo=
380+
go.mongodb.org/atlas-sdk/v20250312008 v20250312008.0.0 h1:Pzrb2bPXtkw1vDTiFxovZyYD4BIA4l0o6c2/HBqxe0I=
381+
go.mongodb.org/atlas-sdk/v20250312008 v20250312008.0.0/go.mod h1:o1ExR4zmunAhRHXF5hlkVUNoJNkmyQ9vRScDGahstyQ=
380382
go.mongodb.org/mongo-driver v1.17.6 h1:87JUG1wZfWsr6rIz3ZmpH90rL5tea7O3IHuSwHUpsss=
381383
go.mongodb.org/mongo-driver v1.17.6/go.mod h1:Hy04i7O2kC4RS06ZrhPRqj/u4DTYkFDAAccj+rVKqgQ=
382384
go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA=

‎tools/toolbox/go.mod‎

Lines changed: 0 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -6,52 +6,31 @@ tool (
66
fybrik.io/crdoc
77
github.com/crd2go/crd2go/cmd/crd2go
88
github.com/daixiang0/gci
9-
github.com/mongodb/mongodb-atlas-kubernetes/tools/openapi2crd
10-
github.com/mongodb/mongodb-atlas-kubernetes/tools/scaffolder/cmd/scaffolder
119
github.com/vektra/mockery/v2
1210
)
1311

1412
require (
15-
cel.dev/expr v0.24.0 // indirect
1613
dario.cat/mergo v1.0.1 // indirect
1714
fybrik.io/crdoc v0.6.4 // indirect
1815
github.com/Masterminds/goutils v1.1.1 // indirect
1916
github.com/Masterminds/semver/v3 v3.4.0 // indirect
2017
github.com/Masterminds/sprig/v3 v3.3.0 // indirect
21-
github.com/antlr4-go/antlr/v4 v4.13.1 // indirect
22-
github.com/beorn7/perks v1.0.1 // indirect
23-
github.com/blang/semver/v4 v4.0.0 // indirect
24-
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
25-
github.com/cespare/xxhash/v2 v2.3.0 // indirect
2618
github.com/chigopher/pathlib v0.19.1 // indirect
2719
github.com/crd2go/crd2go v0.0.0-20251111142436-d5d083fc9afb // indirect
2820
github.com/daixiang0/gci v0.13.7 // indirect
2921
github.com/dave/jennifer v1.7.1 // indirect
30-
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
31-
github.com/felixge/httpsnoop v1.0.4 // indirect
3222
github.com/fsnotify/fsnotify v1.9.0 // indirect
3323
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
34-
github.com/getkin/kin-openapi v0.131.0 // indirect
3524
github.com/go-logr/logr v1.4.3 // indirect
36-
github.com/go-logr/stdr v1.2.2 // indirect
37-
github.com/go-openapi/jsonpointer v0.21.2 // indirect
38-
github.com/go-openapi/jsonreference v0.20.5 // indirect
39-
github.com/go-openapi/swag v0.23.1 // indirect
4025
github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
41-
github.com/goccy/go-yaml v1.18.0 // indirect
4226
github.com/gogo/protobuf v1.3.2 // indirect
43-
github.com/google/cel-go v0.26.0 // indirect
44-
github.com/google/gnostic-models v0.7.0 // indirect
4527
github.com/google/uuid v1.6.0 // indirect
46-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 // indirect
4728
github.com/hexops/gotextdiff v1.0.3 // indirect
4829
github.com/huandu/xstrings v1.5.0 // indirect
4930
github.com/iancoleman/strcase v0.3.0 // indirect
5031
github.com/inconshreveable/mousetrap v1.1.0 // indirect
5132
github.com/jinzhu/copier v0.4.0 // indirect
52-
github.com/josharian/intern v1.0.0 // indirect
5333
github.com/json-iterator/go v1.1.12 // indirect
54-
github.com/mailru/easyjson v0.9.1 // indirect
5534
github.com/mattn/go-colorable v0.1.14 // indirect
5635
github.com/mattn/go-isatty v0.0.20 // indirect
5736
github.com/mitchellh/copystructure v1.2.0 // indirect
@@ -60,21 +39,7 @@ require (
6039
github.com/mitchellh/reflectwalk v1.0.2 // indirect
6140
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
6241
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
63-
github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
64-
github.com/mongodb-forks/digest v1.1.0 // indirect
65-
github.com/mongodb/mongodb-atlas-kubernetes/tools/openapi2crd v0.0.0-20251112134736-16000f7c00ae // indirect
66-
github.com/mongodb/mongodb-atlas-kubernetes/tools/scaffolder v0.0.0-20251112145103-f895a2491477 // indirect
67-
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
68-
github.com/oasdiff/yaml v0.0.0-20250309154309-f31be36b4037 // indirect
69-
github.com/oasdiff/yaml3 v0.0.0-20250309153720-d2182401db90 // indirect
7042
github.com/pelletier/go-toml/v2 v2.2.4 // indirect
71-
github.com/perimeterx/marshmallow v1.1.5 // indirect
72-
github.com/pkg/errors v0.9.1 // indirect
73-
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
74-
github.com/prometheus/client_golang v1.22.0 // indirect
75-
github.com/prometheus/client_model v0.6.2 // indirect
76-
github.com/prometheus/common v0.62.0 // indirect
77-
github.com/prometheus/procfs v0.15.1 // indirect
7843
github.com/rs/zerolog v1.33.0 // indirect
7944
github.com/sagikazarmark/locafero v0.7.0 // indirect
8045
github.com/shopspring/decimal v1.4.0 // indirect
@@ -85,56 +50,29 @@ require (
8550
github.com/spf13/cobra v1.10.1 // indirect
8651
github.com/spf13/pflag v1.0.10 // indirect
8752
github.com/spf13/viper v1.20.1 // indirect
88-
github.com/stoewer/go-strcase v1.3.1 // indirect
89-
github.com/stretchr/objx v0.5.2 // indirect
90-
github.com/stretchr/testify v1.11.1 // indirect
9153
github.com/subosito/gotenv v1.6.0 // indirect
9254
github.com/vektra/mockery/v2 v2.53.5 // indirect
9355
github.com/x448/float16 v0.8.4 // indirect
94-
go.mongodb.org/atlas-sdk/v20250312005 v20250312005.0.0 // indirect
95-
go.mongodb.org/atlas-sdk/v20250312006 v20250312006.1.0 // indirect
96-
go.mongodb.org/atlas-sdk/v20250312008 v20250312008.0.0 // indirect
97-
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
98-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 // indirect
99-
go.opentelemetry.io/otel v1.35.0 // indirect
100-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.34.0 // indirect
101-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.34.0 // indirect
102-
go.opentelemetry.io/otel/metric v1.35.0 // indirect
103-
go.opentelemetry.io/otel/sdk v1.34.0 // indirect
104-
go.opentelemetry.io/otel/trace v1.35.0 // indirect
105-
go.opentelemetry.io/proto/otlp v1.5.0 // indirect
10656
go.uber.org/multierr v1.11.0 // indirect
10757
go.uber.org/zap v1.27.0 // indirect
10858
go.yaml.in/yaml/v2 v2.4.3 // indirect
109-
go.yaml.in/yaml/v3 v3.0.4 // indirect
11059
golang.org/x/crypto v0.45.0 // indirect
111-
golang.org/x/exp v0.0.0-20251023183803-a4bb9ffd2546 // indirect
11260
golang.org/x/mod v0.29.0 // indirect
11361
golang.org/x/net v0.47.0 // indirect
114-
golang.org/x/oauth2 v0.31.0 // indirect
11562
golang.org/x/sync v0.18.0 // indirect
11663
golang.org/x/sys v0.38.0 // indirect
11764
golang.org/x/term v0.37.0 // indirect
11865
golang.org/x/text v0.31.0 // indirect
119-
golang.org/x/time v0.9.0 // indirect
12066
golang.org/x/tools v0.38.0 // indirect
121-
google.golang.org/genproto/googleapis/api v0.0.0-20251022142026-3a174f9686a8 // indirect
122-
google.golang.org/genproto/googleapis/rpc v0.0.0-20251022142026-3a174f9686a8 // indirect
123-
google.golang.org/grpc v1.72.1 // indirect
124-
google.golang.org/protobuf v1.36.10 // indirect
12567
gopkg.in/inf.v0 v0.9.1 // indirect
12668
gopkg.in/yaml.v2 v2.4.0 // indirect
12769
gopkg.in/yaml.v3 v3.0.1 // indirect
12870
k8s.io/api v0.34.1 // indirect
12971
k8s.io/apiextensions-apiserver v0.34.1 // indirect
13072
k8s.io/apimachinery v0.34.1 // indirect
131-
k8s.io/apiserver v0.34.1 // indirect
13273
k8s.io/client-go v0.34.1 // indirect
133-
k8s.io/component-base v0.34.1 // indirect
13474
k8s.io/klog/v2 v2.130.1 // indirect
135-
k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 // indirect
13675
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4 // indirect
137-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.3 // indirect
13876
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
13977
sigs.k8s.io/randfill v1.0.0 // indirect
14078
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect

0 commit comments

Comments
 (0)