Skip to content

Commit b1a646e

Browse files
authored
CLOUDP-353168: Use CRD2Go off its own repo (#2892)
* CLOUDP-353168: Use CRD2Go off its own repo Signed-off-by: jose.vazquez <[email protected]> * Rename imports --------- Signed-off-by: jose.vazquez <[email protected]>
1 parent abac61d commit b1a646e

File tree

117 files changed

+160
-24486
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

117 files changed

+160
-24486
lines changed

.github/workflows/crd2go.yml

Lines changed: 0 additions & 28 deletions
This file was deleted.

Makefile

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,9 @@ else
204204
BUILD_DEPENDENCY :=
205205
endif
206206

207+
# GO TOOLS
208+
CRD2GO := go tool -modfile=tools/toolbox/go.mod crd2go
209+
207210
.DEFAULT_GOAL := help
208211
.PHONY: help
209212
help: ## Show this help screen
@@ -861,7 +864,9 @@ gen-crds:
861864
BINARY_DIR=$(realpath .)/bin CRD_FILE=$(realpath .)/config/generated/crd/bases/crds.yaml $(MAKE) -C tools/openapi2crd crds
862865

863866
gen-go-types:
864-
BINARY_DIR=$(realpath .)/bin CRD_FILE=$(realpath .)/config/generated/crd/bases/crds.yaml OUTPUT_DIR=$(realpath .)/internal/nextapi/generated/v1 $(MAKE) -C tools/crd2go generate
867+
@echo "==> Generating Go models from CRDs..."
868+
$(CRD2GO) --input $(realpath .)/config/generated/crd/bases/crds.yaml \
869+
--output $(realpath .)/internal/nextapi/generated/v1
865870

866871
run-scaffolder:
867872
BINARY_DIR=$(realpath .)/bin CRD_FILE=$(realpath .)/config/generated/crd/bases/crds.yaml $(MAKE) -C tools/scaffolder generate-all
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@ renames:
3636
imports:
3737
- name: LocalReference
3838
alias: k8s
39-
path: github.com/mongodb/mongodb-atlas-kubernetes/tools/crd2go/k8s
39+
path: github.com/crd2go/crd2go/k8s
4040
- name: Reference
4141
alias: k8s
42-
path: github.com/mongodb/mongodb-atlas-kubernetes/tools/crd2go/k8s
42+
path: github.com/crd2go/crd2go/k8s
4343

4444
# deepCopy controls the integration with controller-gen to generate deep copy code
4545
deepCopy:
4646
generate: auto
47-
# controllerGenPath: path/to/controller-gen ## customize as needed
47+
# controllerGenPath: path/to/controller-gen ## customize as needed

go.mod

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
module github.com/mongodb/mongodb-atlas-kubernetes/v2
22

3-
go 1.25.1
4-
5-
toolchain go1.25.3
3+
go 1.25.3
64

75
require (
86
cloud.google.com/go/kms v1.23.2
@@ -23,12 +21,12 @@ require (
2321
github.com/aws/aws-sdk-go-v2/service/s3 v1.90.0
2422
github.com/aws/aws-sdk-go-v2/service/sts v1.38.9
2523
github.com/aws/smithy-go v1.23.2
24+
github.com/crd2go/crd2go v0.0.0-20251111142436-d5d083fc9afb
2625
github.com/go-logr/zapr v1.3.0
2726
github.com/go-test/deep v1.1.1
2827
github.com/google/go-cmp v0.7.0
2928
github.com/google/uuid v1.6.0
3029
github.com/mongodb-forks/digest v1.1.0
31-
github.com/mongodb/mongodb-atlas-kubernetes/tools/crd2go v0.0.0-20251023081430-afe130f9138e
3230
github.com/nsf/jsondiff v0.0.0-20230430225905-43f6cf3098c1
3331
github.com/onsi/ginkgo/v2 v2.27.2
3432
github.com/onsi/gomega v1.38.2
@@ -84,7 +82,7 @@ require (
8482
github.com/google/btree v1.1.3 // indirect
8583
github.com/google/cel-go v0.26.0 // indirect
8684
github.com/google/gnostic-models v0.7.0 // indirect
87-
github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 // indirect
85+
github.com/google/pprof v0.0.0-20250820193118-f64d9cf942d6 // indirect
8886
github.com/google/s2a-go v0.1.9 // indirect
8987
github.com/inconshreveable/mousetrap v1.1.0 // indirect
9088
github.com/kylelemons/godebug v1.1.0 // indirect

go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,8 @@ github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XL
122122
github.com/cncf/xds/go v0.0.0-20250501225837-2ac532fd4443 h1:aQ3y1lwWyqYPiWZThqv1aFbZMiM9vblcSArJRf2Irls=
123123
github.com/cncf/xds/go v0.0.0-20250501225837-2ac532fd4443/go.mod h1:W+zGtBO5Y1IgJhy4+A9GOqVhqLpfZi+vwmdNXUehLA8=
124124
github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
125+
github.com/crd2go/crd2go v0.0.0-20251111142436-d5d083fc9afb h1:fUVPP2Pkk5wxSqlLDFdWX4vMzl6VC6qLNVLW22hIqEc=
126+
github.com/crd2go/crd2go v0.0.0-20251111142436-d5d083fc9afb/go.mod h1:OsulE5Bst55vp5aTkcNZvCCzfdLY5eYgHzVje+F4G/M=
125127
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
126128
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
127129
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -210,8 +212,8 @@ github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX
210212
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
211213
github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
212214
github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
213-
github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 h1:BHT72Gu3keYf3ZEu2J0b1vyeLSOYI8bm5wbJM/8yDe8=
214-
github.com/google/pprof v0.0.0-20250403155104-27863c87afa6/go.mod h1:boTsfXsheKC2y+lKOCMpSfarhxDeIzfZG1jqGcPl3cA=
215+
github.com/google/pprof v0.0.0-20250820193118-f64d9cf942d6 h1:EEHtgt9IwisQ2AZ4pIsMjahcegHh6rmhqxzIRQIyepY=
216+
github.com/google/pprof v0.0.0-20250820193118-f64d9cf942d6/go.mod h1:I6V7YzU0XDpsHqbsyrghnFZLO1gwK6NPTNvmetQIk9U=
215217
github.com/google/s2a-go v0.1.9 h1:LGD7gtMgezd8a/Xak7mEWL0PjoTQFvpRudN895yqKW0=
216218
github.com/google/s2a-go v0.1.9/go.mod h1:YA0Ei2ZQL3acow2O62kdp9UlnvMmU7kA6Eutn0dXayM=
217219
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
@@ -265,8 +267,6 @@ github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee h1:W5t00kpgFd
265267
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
266268
github.com/mongodb-forks/digest v1.1.0 h1:7eUdsR1BtqLv0mdNm4OXs6ddWvR4X2/OsLwdKksrOoc=
267269
github.com/mongodb-forks/digest v1.1.0/go.mod h1:rb+EX8zotClD5Dj4NdgxnJXG9nwrlx3NWKJ8xttz1Dg=
268-
github.com/mongodb/mongodb-atlas-kubernetes/tools/crd2go v0.0.0-20251023081430-afe130f9138e h1:IDF5AmTwyxnjyb+HO5BPNwn8tbIIN3d60/vY90Ppfu8=
269-
github.com/mongodb/mongodb-atlas-kubernetes/tools/crd2go v0.0.0-20251023081430-afe130f9138e/go.mod h1:16AvHza5d0digrWj6AgOCUbFrKwKhWrnASCGpXQrX3Y=
270270
github.com/montanaflynn/stats v0.7.1 h1:etflOAAHORrCC44V+aR6Ftzort912ZU+YLiSTuV8eaE=
271271
github.com/montanaflynn/stats v0.7.1/go.mod h1:etXPPgVO6n31NxCd9KQUMvCM+ve0ruNzt6R8Bnaayow=
272272
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=

internal/nextapi/generated/v1/backupcompliancepolicy.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/nextapi/generated/v1/backupschedule.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/nextapi/generated/v1/cluster.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/nextapi/generated/v1/customrole.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/nextapi/generated/v1/databaseuser.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)