Skip to content

Commit d6566e9

Browse files
thunderboltsidthunderboltsid
committed
feat(deps): reduce go dependencies for importing api
add three new modules with their own go.mod: - api - templates - test/e2e
1 parent fecc2f9 commit d6566e9

File tree

11 files changed

+1743
-257
lines changed

11 files changed

+1743
-257
lines changed

‎api/go.mod‎

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
module github.com/nutanix-cloud-native/cluster-api-provider-nutanix/api
2+
3+
// we keep the go version in API module to the oldest supported Go version
4+
go 1.23.0
5+
6+
toolchain go1.23.8
7+
8+
require (
9+
github.com/nutanix-cloud-native/prism-go-client v0.5.2
10+
github.com/onsi/gomega v1.36.3
11+
github.com/stretchr/testify v1.10.0
12+
k8s.io/api v0.32.3
13+
k8s.io/apiextensions-apiserver v0.32.3
14+
k8s.io/apimachinery v0.32.3
15+
k8s.io/client-go v0.32.3
16+
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738
17+
sigs.k8s.io/cluster-api v1.10.3
18+
sigs.k8s.io/controller-runtime v0.20.4
19+
sigs.k8s.io/kustomize/api v0.20.0
20+
sigs.k8s.io/kustomize/kyaml v0.20.0
21+
)
22+
23+
require (
24+
cel.dev/expr v0.18.0 // indirect
25+
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
26+
github.com/beorn7/perks v1.0.1 // indirect
27+
github.com/blang/semver/v4 v4.0.0 // indirect
28+
github.com/carapace-sh/carapace-shlex v1.0.1 // indirect
29+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
30+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
31+
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
32+
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
33+
github.com/go-errors/errors v1.4.2 // indirect
34+
github.com/go-logr/logr v1.4.2 // indirect
35+
github.com/go-openapi/jsonpointer v0.21.0 // indirect
36+
github.com/go-openapi/jsonreference v0.21.0 // indirect
37+
github.com/go-openapi/swag v0.23.0 // indirect
38+
github.com/gogo/protobuf v1.3.2 // indirect
39+
github.com/google/cel-go v0.22.0 // indirect
40+
github.com/google/gnostic-models v0.6.9 // indirect
41+
github.com/google/go-cmp v0.7.0 // indirect
42+
github.com/google/gofuzz v1.2.0 // indirect
43+
github.com/inconshreveable/mousetrap v1.1.0 // indirect
44+
github.com/josharian/intern v1.0.0 // indirect
45+
github.com/json-iterator/go v1.1.12 // indirect
46+
github.com/mailru/easyjson v0.7.7 // indirect
47+
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
48+
github.com/modern-go/reflect2 v1.0.2 // indirect
49+
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
50+
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
51+
github.com/pkg/errors v0.9.1 // indirect
52+
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
53+
github.com/prometheus/client_golang v1.19.1 // indirect
54+
github.com/prometheus/client_model v0.6.1 // indirect
55+
github.com/prometheus/common v0.55.0 // indirect
56+
github.com/prometheus/procfs v0.15.1 // indirect
57+
github.com/spf13/cobra v1.9.1 // indirect
58+
github.com/spf13/pflag v1.0.6 // indirect
59+
github.com/stoewer/go-strcase v1.3.0 // indirect
60+
github.com/x448/float16 v0.8.4 // indirect
61+
github.com/xlab/treeprint v1.2.0 // indirect
62+
go.opentelemetry.io/otel v1.29.0 // indirect
63+
go.opentelemetry.io/otel/trace v1.29.0 // indirect
64+
go.yaml.in/yaml/v2 v2.4.2 // indirect
65+
go.yaml.in/yaml/v3 v3.0.3 // indirect
66+
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
67+
golang.org/x/net v0.38.0 // indirect
68+
golang.org/x/sys v0.31.0 // indirect
69+
golang.org/x/text v0.23.0 // indirect
70+
google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 // indirect
71+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241223144023-3abc09e42ca8 // indirect
72+
google.golang.org/protobuf v1.36.5 // indirect
73+
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
74+
gopkg.in/inf.v0 v0.9.1 // indirect
75+
gopkg.in/yaml.v3 v3.0.1 // indirect
76+
k8s.io/apiserver v0.32.3 // indirect
77+
k8s.io/component-base v0.32.3 // indirect
78+
k8s.io/klog/v2 v2.130.1 // indirect
79+
k8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7 // indirect
80+
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
81+
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
82+
sigs.k8s.io/yaml v1.5.0 // indirect
83+
)
84+
85+
// CVE fixes for https://avd.aquasec.com/nvd/2024/cve-2024-45338
86+
replace golang.org/x/net => golang.org/x/net v0.33.0

‎api/go.sum‎

Lines changed: 291 additions & 0 deletions
Large diffs are not rendered by default.

‎devbox.lock‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -381,50 +381,50 @@
381381
}
382382
},
383383
"go@latest": {
384-
"last_modified": "2024-07-20T09:11:00Z",
385-
"resolved": "github:NixOS/nixpkgs/6e14bbce7bea6c4efd7adfa88a40dac750d80100#go",
384+
"last_modified": "2025-06-20T02:24:11Z",
385+
"resolved": "github:NixOS/nixpkgs/076e8c6678d8c54204abcb4b1b14c366835a58bb#go",
386386
"source": "devbox-search",
387-
"version": "1.22.5",
387+
"version": "1.24.4",
388388
"systems": {
389389
"aarch64-darwin": {
390390
"outputs": [
391391
{
392392
"name": "out",
393-
"path": "/nix/store/05saqcgidraqmn4z82prsp7rbj9hjmwm-go-1.22.5",
393+
"path": "/nix/store/rq7irijkj3nhapmjcv9d96xgkisj55x2-go-1.24.4",
394394
"default": true
395395
}
396396
],
397-
"store_path": "/nix/store/05saqcgidraqmn4z82prsp7rbj9hjmwm-go-1.22.5"
397+
"store_path": "/nix/store/rq7irijkj3nhapmjcv9d96xgkisj55x2-go-1.24.4"
398398
},
399399
"aarch64-linux": {
400400
"outputs": [
401401
{
402402
"name": "out",
403-
"path": "/nix/store/b97bbxn6kpysysxb8nxn4k39ffxmp4p6-go-1.22.5",
403+
"path": "/nix/store/9f64p4ip4iz2nba4wyhn1baq6b6pb6ss-go-1.24.4",
404404
"default": true
405405
}
406406
],
407-
"store_path": "/nix/store/b97bbxn6kpysysxb8nxn4k39ffxmp4p6-go-1.22.5"
407+
"store_path": "/nix/store/9f64p4ip4iz2nba4wyhn1baq6b6pb6ss-go-1.24.4"
408408
},
409409
"x86_64-darwin": {
410410
"outputs": [
411411
{
412412
"name": "out",
413-
"path": "/nix/store/gdyii59c48s4a8q6w584ccgm95qls3lh-go-1.22.5",
413+
"path": "/nix/store/n0gqcdpdk0ap2ikasi36r0szwpk2g35q-go-1.24.4",
414414
"default": true
415415
}
416416
],
417-
"store_path": "/nix/store/gdyii59c48s4a8q6w584ccgm95qls3lh-go-1.22.5"
417+
"store_path": "/nix/store/n0gqcdpdk0ap2ikasi36r0szwpk2g35q-go-1.24.4"
418418
},
419419
"x86_64-linux": {
420420
"outputs": [
421421
{
422422
"name": "out",
423-
"path": "/nix/store/3v17dij8rvg7q99009swxg52995r7s22-go-1.22.5",
423+
"path": "/nix/store/mdn9hnvf0qmxywbrpbywmxww2adxdn5v-go-1.24.4",
424424
"default": true
425425
}
426426
],
427-
"store_path": "/nix/store/3v17dij8rvg7q99009swxg52995r7s22-go-1.22.5"
427+
"store_path": "/nix/store/mdn9hnvf0qmxywbrpbywmxww2adxdn5v-go-1.24.4"
428428
}
429429
}
430430
},

‎go.mod‎

Lines changed: 16 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
11
module github.com/nutanix-cloud-native/cluster-api-provider-nutanix
22

3-
go 1.23.0
4-
5-
toolchain go1.23.8
3+
go 1.24.0
64

75
require (
8-
github.com/blang/semver v3.5.1+incompatible
9-
github.com/blang/semver/v4 v4.0.0
6+
github.com/blang/semver/v4 v4.0.0 // indirect
107
github.com/go-logr/logr v1.4.2
118
github.com/google/go-cmp v0.7.0
129
github.com/google/uuid v1.6.0
13-
github.com/nutanix-cloud-native/prism-go-client v0.5.0
10+
github.com/nutanix-cloud-native/cluster-api-provider-nutanix/api v0.0.0-20250705022157-0000000000000
11+
github.com/nutanix-cloud-native/prism-go-client v0.5.2
1412
github.com/nutanix/ntnx-api-golang-clients/volumes-go-client/v4 v4.0.1-beta.1
1513
github.com/onsi/ginkgo/v2 v2.23.4
1614
github.com/onsi/gomega v1.36.3
@@ -19,57 +17,33 @@ require (
1917
github.com/stretchr/testify v1.10.0
2018
go.uber.org/mock v0.4.0
2119
go.uber.org/zap v1.27.0
22-
golang.org/x/crypto v0.36.0 // indirect; CVE fixes for https://avd.aquasec.com/nvd/cve-2025-22869
2320
golang.org/x/time v0.8.0
2421
k8s.io/api v0.32.3
25-
k8s.io/apiextensions-apiserver v0.32.3
22+
k8s.io/apiextensions-apiserver v0.32.3 // indirect
2623
k8s.io/apimachinery v0.32.3
2724
k8s.io/client-go v0.32.3
28-
k8s.io/klog/v2 v2.130.1
25+
k8s.io/klog/v2 v2.130.1 // indirect
2926
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738
3027
sigs.k8s.io/cluster-api v1.10.3
31-
sigs.k8s.io/cluster-api/test v1.10.3
3228
sigs.k8s.io/controller-runtime v0.20.4
33-
sigs.k8s.io/kind v0.27.0
34-
sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3
35-
sigs.k8s.io/kustomize/kyaml v0.14.3-0.20230601165947-6ce0bf390ce3
3629
)
3730

3831
require (
39-
al.essio.dev/pkg/shellescape v1.5.1 // indirect
4032
cel.dev/expr v0.18.0 // indirect
41-
dario.cat/mergo v1.0.1 // indirect
42-
github.com/BurntSushi/toml v1.4.0 // indirect
43-
github.com/MakeNowJust/heredoc v1.0.0 // indirect
44-
github.com/Masterminds/goutils v1.1.1 // indirect
45-
github.com/Masterminds/semver/v3 v3.3.0 // indirect
46-
github.com/Masterminds/sprig/v3 v3.3.0 // indirect
47-
github.com/Microsoft/go-winio v0.5.0 // indirect
4833
github.com/NYTimes/gziphandler v1.1.1 // indirect
4934
github.com/PaesslerAG/gval v1.0.0 // indirect
5035
github.com/PaesslerAG/jsonpath v0.1.1 // indirect
51-
github.com/ProtonMail/go-crypto v0.0.0-20230217124315-7d5c6f04bbb8 // indirect
52-
github.com/adrg/xdg v0.5.3 // indirect
5336
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
5437
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
5538
github.com/beorn7/perks v1.0.1 // indirect
5639
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
5740
github.com/cespare/xxhash/v2 v2.3.0 // indirect
58-
github.com/cloudflare/circl v1.6.1 // indirect
5941
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
60-
github.com/distribution/reference v0.6.0 // indirect
61-
github.com/docker/docker v28.0.2+incompatible // indirect
62-
github.com/docker/go-connections v0.5.0 // indirect
63-
github.com/docker/go-units v0.4.0 // indirect
64-
github.com/drone/envsubst/v2 v2.0.0-20210730161058-179042472c46 // indirect
6542
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
66-
github.com/evanphx/json-patch v5.7.0+incompatible // indirect
6743
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
68-
github.com/fatih/color v1.18.0 // indirect
6944
github.com/felixge/httpsnoop v1.0.4 // indirect
7045
github.com/fsnotify/fsnotify v1.8.0 // indirect
7146
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
72-
github.com/go-errors/errors v1.4.2 // indirect
7347
github.com/go-logr/stdr v1.2.2 // indirect
7448
github.com/go-logr/zapr v1.3.0 // indirect
7549
github.com/go-openapi/analysis v0.23.0 // indirect
@@ -82,70 +56,41 @@ require (
8256
github.com/go-openapi/swag v0.23.0 // indirect
8357
github.com/go-openapi/validate v0.24.0 // indirect
8458
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
85-
github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
8659
github.com/gobuffalo/flect v1.0.3 // indirect
8760
github.com/gogo/protobuf v1.3.2 // indirect
8861
github.com/golang/protobuf v1.5.4 // indirect
8962
github.com/google/btree v1.1.3 // indirect
9063
github.com/google/cel-go v0.22.0 // indirect
91-
github.com/google/gnostic-models v0.6.8 // indirect
92-
github.com/google/go-github/v53 v53.2.0 // indirect
93-
github.com/google/go-querystring v1.1.0 // indirect
64+
github.com/google/gnostic-models v0.6.9 // indirect
9465
github.com/google/gofuzz v1.2.0 // indirect
9566
github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 // indirect
96-
github.com/google/safetext v0.0.0-20220905092116-b49f7bc46da2 // indirect
97-
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
9867
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
9968
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
100-
github.com/hashicorp/go-retryablehttp v0.7.1 // indirect
101-
github.com/huandu/xstrings v1.5.0 // indirect
102-
github.com/imdario/mergo v0.3.13 // indirect
69+
github.com/hashicorp/go-retryablehttp v0.7.7 // indirect
10370
github.com/inconshreveable/mousetrap v1.1.0 // indirect
10471
github.com/josharian/intern v1.0.0 // indirect
10572
github.com/json-iterator/go v1.1.12 // indirect
10673
github.com/mailru/easyjson v0.7.7 // indirect
107-
github.com/mattn/go-colorable v0.1.13 // indirect
108-
github.com/mattn/go-isatty v0.0.20 // indirect
109-
github.com/mattn/go-runewidth v0.0.14 // indirect
110-
github.com/mitchellh/copystructure v1.2.0 // indirect
11174
github.com/mitchellh/mapstructure v1.5.0 // indirect
112-
github.com/mitchellh/reflectwalk v1.0.2 // indirect
113-
github.com/moby/docker-image-spec v1.3.1 // indirect
11475
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
11576
github.com/modern-go/reflect2 v1.0.2 // indirect
116-
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
11777
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
11878
github.com/nutanix/ntnx-api-golang-clients/clustermgmt-go-client/v4 v4.0.1-beta.2 // indirect
11979
github.com/nutanix/ntnx-api-golang-clients/networking-go-client/v4 v4.0.2-beta.1 // indirect
12080
github.com/nutanix/ntnx-api-golang-clients/prism-go-client/v4 v4.0.1-beta.1 // indirect
121-
github.com/nutanix/ntnx-api-golang-clients/storage-go-client/v4 v4.0.2-alpha.3 // indirect
12281
github.com/nutanix/ntnx-api-golang-clients/vmm-go-client/v4 v4.0.1-beta.1 // indirect
12382
github.com/oklog/ulid v1.3.1 // indirect
124-
github.com/olekukonko/tablewriter v0.0.5 // indirect
125-
github.com/opencontainers/go-digest v1.0.0 // indirect
126-
github.com/opencontainers/image-spec v1.0.2 // indirect
127-
github.com/pelletier/go-toml v1.9.5 // indirect
128-
github.com/pelletier/go-toml/v2 v2.2.3 // indirect
12983
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
13084
github.com/prometheus/client_golang v1.19.1 // indirect
13185
github.com/prometheus/client_model v0.6.1 // indirect
13286
github.com/prometheus/common v0.55.0 // indirect
13387
github.com/prometheus/procfs v0.15.1 // indirect
134-
github.com/rivo/uniseg v0.4.2 // indirect
135-
github.com/sagikazarmark/locafero v0.7.0 // indirect
136-
github.com/shopspring/decimal v1.4.0 // indirect
13788
github.com/sirupsen/logrus v1.9.3 // indirect
138-
github.com/sourcegraph/conc v0.3.0 // indirect
139-
github.com/spf13/afero v1.12.0 // indirect
140-
github.com/spf13/cast v1.7.1 // indirect
14189
github.com/spf13/cobra v1.9.1 // indirect
142-
github.com/spf13/viper v1.20.0 // indirect
14390
github.com/stoewer/go-strcase v1.3.0 // indirect
144-
github.com/subosito/gotenv v1.6.0 // indirect
145-
github.com/valyala/fastjson v1.6.4 // indirect
14691
github.com/x448/float16 v0.8.4 // indirect
147-
github.com/xlab/treeprint v1.2.0 // indirect
14892
go.mongodb.org/mongo-driver v1.14.0 // indirect
93+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.54.0 // indirect
14994
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 // indirect
15095
go.opentelemetry.io/otel v1.29.0 // indirect
15196
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 // indirect
@@ -154,8 +99,9 @@ require (
15499
go.opentelemetry.io/otel/sdk v1.29.0 // indirect
155100
go.opentelemetry.io/otel/trace v1.29.0 // indirect
156101
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
157-
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
102+
go.uber.org/automaxprocs v1.6.0 // indirect
158103
go.uber.org/multierr v1.11.0 // indirect
104+
go.yaml.in/yaml/v2 v2.4.2 // indirect
159105
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
160106
golang.org/x/net v0.38.0 // indirect
161107
golang.org/x/oauth2 v0.28.0 // indirect
@@ -165,25 +111,27 @@ require (
165111
golang.org/x/text v0.23.0 // indirect
166112
golang.org/x/tools v0.31.0 // indirect
167113
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
114+
google.golang.org/genproto v0.0.0-20241118233622-e639e219e697 // indirect
168115
google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 // indirect
169116
google.golang.org/genproto/googleapis/rpc v0.0.0-20241223144023-3abc09e42ca8 // indirect
170117
google.golang.org/grpc v1.67.3 // indirect
171118
google.golang.org/protobuf v1.36.5 // indirect
172119
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
173120
gopkg.in/inf.v0 v0.9.1 // indirect
174-
gopkg.in/yaml.v2 v2.4.0 // indirect
175121
gopkg.in/yaml.v3 v3.0.1 // indirect
176122
k8s.io/apiserver v0.32.3 // indirect
177123
k8s.io/cluster-bootstrap v0.32.3 // indirect
178124
k8s.io/component-base v0.32.3 // indirect
179-
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
125+
k8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7 // indirect
180126
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 // indirect
181127
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
182128
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
183-
sigs.k8s.io/yaml v1.4.0 // indirect
129+
sigs.k8s.io/yaml v1.5.0 // indirect
184130
)
185131

186132
replace (
133+
// Local API module
134+
github.com/nutanix-cloud-native/cluster-api-provider-nutanix/api => ./api
187135
// CVE fixes for https://avd.aquasec.com/nvd/2024/cve-2024-45338
188136
golang.org/x/net => golang.org/x/net v0.33.0
189137
sigs.k8s.io/kind v0.20.0 => sigs.k8s.io/kind v0.22.0

0 commit comments

Comments
 (0)