Skip to content

Commit 4e6d4da

Browse files
thardeckthardeck
authored
[v0.12] Consolidate Go modules into root go.mod (#5331)
* [v0.12] Consolidate Go modules into root go.mod Remove go.work and integrationtests module files. Keep pkg/apis as a separate module and tidy dependencies in root go.mod so production and integration test packages resolve from one module. * Run go generate
1 parent 7e38ea4 commit 4e6d4da

6 files changed

Lines changed: 132 additions & 1043 deletions

File tree

‎charts/fleet-crd/templates/crds.yaml‎

Lines changed: 32 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4360,7 +4360,10 @@ spec:
43604360
and labelSelector.
43614361
43624362
Also, matchLabelKeys cannot be set when labelSelector
4363-
isn''t set.'
4363+
isn''t set.
4364+
4365+
This is a beta field and requires enabling MatchLabelKeysInPodAffinity
4366+
feature gate (enabled by default).'
43644367
items:
43654368
type: string
43664369
type: array
@@ -4389,7 +4392,10 @@ spec:
43894392
and labelSelector.
43904393
43914394
Also, mismatchLabelKeys cannot be set when labelSelector
4392-
isn''t set.'
4395+
isn''t set.
4396+
4397+
This is a beta field and requires enabling MatchLabelKeysInPodAffinity
4398+
feature gate (enabled by default).'
43934399
items:
43944400
type: string
43954401
type: array
@@ -4639,7 +4645,10 @@ spec:
46394645
and labelSelector.
46404646
46414647
Also, matchLabelKeys cannot be set when labelSelector
4642-
isn''t set.'
4648+
isn''t set.
4649+
4650+
This is a beta field and requires enabling MatchLabelKeysInPodAffinity
4651+
feature gate (enabled by default).'
46434652
items:
46444653
type: string
46454654
type: array
@@ -4667,7 +4676,10 @@ spec:
46674676
and labelSelector.
46684677
46694678
Also, mismatchLabelKeys cannot be set when labelSelector
4670-
isn''t set.'
4679+
isn''t set.
4680+
4681+
This is a beta field and requires enabling MatchLabelKeysInPodAffinity
4682+
feature gate (enabled by default).'
46714683
items:
46724684
type: string
46734685
type: array
@@ -4907,7 +4919,10 @@ spec:
49074919
and labelSelector.
49084920
49094921
Also, matchLabelKeys cannot be set when labelSelector
4910-
isn''t set.'
4922+
isn''t set.
4923+
4924+
This is a beta field and requires enabling MatchLabelKeysInPodAffinity
4925+
feature gate (enabled by default).'
49114926
items:
49124927
type: string
49134928
type: array
@@ -4936,7 +4951,10 @@ spec:
49364951
and labelSelector.
49374952
49384953
Also, mismatchLabelKeys cannot be set when labelSelector
4939-
isn''t set.'
4954+
isn''t set.
4955+
4956+
This is a beta field and requires enabling MatchLabelKeysInPodAffinity
4957+
feature gate (enabled by default).'
49404958
items:
49414959
type: string
49424960
type: array
@@ -5186,7 +5204,10 @@ spec:
51865204
and labelSelector.
51875205
51885206
Also, matchLabelKeys cannot be set when labelSelector
5189-
isn''t set.'
5207+
isn''t set.
5208+
5209+
This is a beta field and requires enabling MatchLabelKeysInPodAffinity
5210+
feature gate (enabled by default).'
51905211
items:
51915212
type: string
51925213
type: array
@@ -5214,7 +5235,10 @@ spec:
52145235
and labelSelector.
52155236
52165237
Also, mismatchLabelKeys cannot be set when labelSelector
5217-
isn''t set.'
5238+
isn''t set.
5239+
5240+
This is a beta field and requires enabling MatchLabelKeysInPodAffinity
5241+
feature gate (enabled by default).'
52185242
items:
52195243
type: string
52205244
type: array

‎go.mod‎

Lines changed: 31 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ require (
2727
github.com/gorilla/mux v1.8.1
2828
github.com/hashicorp/go-getter v1.8.6
2929
github.com/jpillora/backoff v1.0.0
30+
github.com/moby/moby/api v1.55.0
3031
github.com/onsi/ginkgo/v2 v2.23.0
3132
github.com/onsi/gomega v1.36.2
3233
github.com/opencontainers/go-digest v1.0.0
@@ -40,12 +41,13 @@ require (
4041
github.com/rancher/lasso v0.2.1
4142
github.com/rancher/wrangler/v3 v3.2.0
4243
github.com/reugn/go-quartz v0.13.0
43-
github.com/sirupsen/logrus v1.9.3
44+
github.com/sirupsen/logrus v1.9.4
4445
github.com/spf13/cobra v1.9.1
4546
github.com/stretchr/testify v1.11.1
47+
github.com/testcontainers/testcontainers-go v0.43.0
4648
go.uber.org/mock v0.5.2
4749
go.uber.org/zap v1.27.0
48-
golang.org/x/crypto v0.50.0
50+
golang.org/x/crypto v0.51.0
4951
golang.org/x/sync v0.20.0
5052
gonum.org/v1/gonum v0.16.0
5153
gopkg.in/go-playground/webhooks.v5 v5.17.0
@@ -80,8 +82,7 @@ require (
8082
cloud.google.com/go/iam v1.5.3 // indirect
8183
cloud.google.com/go/monitoring v1.24.3 // indirect
8284
cloud.google.com/go/storage v1.61.3 // indirect
83-
dario.cat/mergo v1.0.1 // indirect
84-
github.com/AdaLogics/go-fuzz-headers v0.0.0-20240806141605-e8a1dd7889d6 // indirect
85+
dario.cat/mergo v1.0.2 // indirect
8586
github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
8687
github.com/BurntSushi/toml v1.5.0 // indirect
8788
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.30.0 // indirect
@@ -115,21 +116,27 @@ require (
115116
github.com/beorn7/perks v1.0.1 // indirect
116117
github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect
117118
github.com/blang/semver/v4 v4.0.0 // indirect
119+
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
118120
github.com/cespare/xxhash/v2 v2.3.0 // indirect
119121
github.com/chai2010/gettext-go v1.0.2 // indirect
120122
github.com/cloudflare/circl v1.6.3 // indirect
121123
github.com/cncf/xds/go v0.0.0-20251210132809-ee656c7534f5 // indirect
122124
github.com/containerd/containerd v1.7.32 // indirect
123125
github.com/containerd/errdefs v1.0.0 // indirect
126+
github.com/containerd/errdefs/pkg v0.3.0 // indirect
124127
github.com/containerd/log v0.1.0 // indirect
125128
github.com/containerd/platforms v0.2.1 // indirect
126129
github.com/containerd/stargz-snapshotter/estargz v0.16.3 // indirect
130+
github.com/cpuguy83/dockercfg v0.3.2 // indirect
127131
github.com/cpuguy83/go-md2man/v2 v2.0.6 // indirect
128132
github.com/cyphar/filepath-securejoin v0.6.1 // indirect
129133
github.com/distribution/reference v0.6.0 // indirect
130134
github.com/docker/cli v29.2.0+incompatible // indirect
131135
github.com/docker/distribution v2.8.3+incompatible // indirect
132136
github.com/docker/docker-credential-helpers v0.8.2 // indirect
137+
github.com/docker/go-connections v0.6.0 // indirect
138+
github.com/docker/go-units v0.5.0 // indirect
139+
github.com/ebitengine/purego v0.10.0 // indirect
133140
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
134141
github.com/emirpasic/gods v1.18.1 // indirect
135142
github.com/envoyproxy/go-control-plane/envoy v1.36.0 // indirect
@@ -147,6 +154,7 @@ require (
147154
github.com/go-jose/go-jose/v4 v4.1.4 // indirect
148155
github.com/go-logr/stdr v1.2.2 // indirect
149156
github.com/go-logr/zapr v1.3.0 // indirect
157+
github.com/go-ole/go-ole v1.2.6 // indirect
150158
github.com/go-openapi/jsonpointer v0.21.0 // indirect
151159
github.com/go-openapi/jsonreference v0.21.0 // indirect
152160
github.com/go-openapi/swag v0.23.0 // indirect
@@ -183,6 +191,8 @@ require (
183191
github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect
184192
github.com/lib/pq v1.10.9 // indirect
185193
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
194+
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
195+
github.com/magiconair/properties v1.8.10 // indirect
186196
github.com/mailru/easyjson v0.7.7 // indirect
187197
github.com/mattn/go-colorable v0.1.14 // indirect
188198
github.com/mattn/go-isatty v0.0.20 // indirect
@@ -191,7 +201,14 @@ require (
191201
github.com/mitchellh/go-homedir v1.1.0 // indirect
192202
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
193203
github.com/mitchellh/reflectwalk v1.0.2 // indirect
204+
github.com/moby/docker-image-spec v1.3.1 // indirect
205+
github.com/moby/go-archive v0.2.0 // indirect
206+
github.com/moby/moby/client v0.4.0 // indirect
207+
github.com/moby/patternmatcher v0.6.1 // indirect
194208
github.com/moby/spdystream v0.5.1 // indirect
209+
github.com/moby/sys/sequential v0.6.0 // indirect
210+
github.com/moby/sys/user v0.4.0 // indirect
211+
github.com/moby/sys/userns v0.1.0 // indirect
195212
github.com/moby/term v0.5.2 // indirect
196213
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
197214
github.com/modern-go/reflect2 v1.0.2 // indirect
@@ -203,22 +220,27 @@ require (
203220
github.com/pjbgf/sha1cd v0.6.0 // indirect
204221
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
205222
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
223+
github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
206224
github.com/prometheus/procfs v0.15.1 // indirect
207225
github.com/rivo/uniseg v0.2.0 // indirect
208226
github.com/rubenv/sql-migrate v1.8.0 // indirect
209227
github.com/russross/blackfriday/v2 v2.1.0 // indirect
210228
github.com/santhosh-tekuri/jsonschema/v6 v6.0.2 // indirect
211229
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
230+
github.com/shirou/gopsutil/v4 v4.26.5 // indirect
212231
github.com/shopspring/decimal v1.4.0 // indirect
213232
github.com/skeema/knownhosts v1.3.1 // indirect
214233
github.com/spf13/cast v1.7.0 // indirect
215234
github.com/spf13/pflag v1.0.7 // indirect
216235
github.com/spiffe/go-spiffe/v2 v2.6.0 // indirect
236+
github.com/tklauser/go-sysconf v0.3.16 // indirect
237+
github.com/tklauser/numcpus v0.11.0 // indirect
217238
github.com/ulikunitz/xz v0.5.15 // indirect
218239
github.com/vbatts/tar-split v0.11.6 // indirect
219240
github.com/x448/float16 v0.8.4 // indirect
220241
github.com/xanzy/ssh-agent v0.3.3 // indirect
221242
github.com/xlab/treeprint v1.2.0 // indirect
243+
github.com/yusufpapurcu/wmi v1.2.4 // indirect
222244
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
223245
go.opentelemetry.io/contrib/detectors/gcp v1.39.0 // indirect
224246
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.63.0 // indirect
@@ -231,14 +253,14 @@ require (
231253
go.uber.org/multierr v1.11.0 // indirect
232254
go.yaml.in/yaml/v2 v2.4.2 // indirect
233255
go.yaml.in/yaml/v3 v3.0.3 // indirect
234-
golang.org/x/mod v0.34.0 // indirect
256+
golang.org/x/mod v0.35.0 // indirect
235257
golang.org/x/net v0.53.0 // indirect
236258
golang.org/x/oauth2 v0.36.0 // indirect
237-
golang.org/x/sys v0.43.0 // indirect
238-
golang.org/x/term v0.42.0 // indirect
239-
golang.org/x/text v0.36.0 // indirect
259+
golang.org/x/sys v0.45.0 // indirect
260+
golang.org/x/term v0.43.0 // indirect
261+
golang.org/x/text v0.37.0 // indirect
240262
golang.org/x/time v0.15.0 // indirect
241-
golang.org/x/tools v0.43.0 // indirect
263+
golang.org/x/tools v0.44.0 // indirect
242264
golang.org/x/tools/go/packages/packagestest v0.1.1-deprecated // indirect
243265
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
244266
google.golang.org/api v0.271.0 // indirect
@@ -251,7 +273,6 @@ require (
251273
gopkg.in/inf.v0 v0.9.1 // indirect
252274
gopkg.in/warnings.v0 v0.1.2 // indirect
253275
gopkg.in/yaml.v3 v3.0.1 // indirect
254-
gotest.tools/v3 v3.5.2 // indirect
255276
k8s.io/apiserver v0.33.8 // indirect
256277
k8s.io/code-generator v0.33.8 // indirect
257278
k8s.io/component-base v0.33.8 // indirect

0 commit comments

Comments
 (0)