Skip to content

Commit 1e46c6b

Browse files
NO-JIRA: Remove dependency on k8s.io/kubernetes (#1356)
* fix: stop referencing non existing git references in go.mod (#1332) Go projects that reference github.com/openshift/cluster-node-tuning-operator as a library cannot use it because parts of the Go tooling fail due to go.mod containing references to git tags that do not exist. This causes errors in Go tooling like for example when running "go list -m -json all" where it ends up failing indicating that the non existing revisions do not exist. This errors occur even when the dependencies have a corresponding replace statement replacing to an existing reference. This commit updates the go.mod to remove any dependencies references to non existing git tags. Specifically, the non existing references have been updating pointing to the same existing references as the ones specified in their corresponding replace statement in the go.mod file. * k8s: pseudo-vendor eviction defaults we need only the default definitions, which are conveniently placed in a platform-specific file. We can just fetch the related file and consume the default, avoiding the full and problematic dependency to `k8s.io/kubernetes`. The alternative is just to copy/paste defaults, as the defaults are part of API definition, thus unlikely to change (note: I lack a quotable source, but this was confirmed again during the k8s 1.34 review cycle) Signed-off-by: Francesco Romani <[email protected]> --------- Signed-off-by: Francesco Romani <[email protected]> Co-authored-by: Miguel Soriano <[email protected]>
1 parent cb834ae commit 1e46c6b

File tree

2,928 files changed

+48
-635019
lines changed

Some content is hidden

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

2,928 files changed

+48
-635019
lines changed

go.mod

Lines changed: 0 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ require (
4040
k8s.io/klog v1.0.0
4141
k8s.io/klog/v2 v2.130.1
4242
k8s.io/kubelet v0.32.6
43-
k8s.io/kubernetes v1.32.3
4443
k8s.io/utils v0.0.0-20250321185631-1f6e0b77f77e
4544
kubevirt.io/qe-tools v0.1.8
4645
sigs.k8s.io/cluster-api v1.8.11
@@ -50,35 +49,19 @@ require (
5049
)
5150

5251
require (
53-
cel.dev/expr v0.19.0 // indirect
54-
github.com/JeffAshton/win_pdh v0.0.0-20161109143554-76bb4ee9f0ab // indirect
55-
github.com/Microsoft/go-winio v0.6.2 // indirect
56-
github.com/NYTimes/gziphandler v1.1.1 // indirect
5752
github.com/StackExchange/wmi v1.2.1 // indirect
58-
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
5953
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
6054
github.com/beorn7/perks v1.0.1 // indirect
6155
github.com/blang/semver/v4 v4.0.0 // indirect
62-
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
6356
github.com/cespare/xxhash/v2 v2.3.0 // indirect
64-
github.com/containerd/containerd/api v1.8.0 // indirect
65-
github.com/containerd/errdefs v1.0.0 // indirect
66-
github.com/containerd/errdefs/pkg v0.3.0 // indirect
67-
github.com/containerd/log v0.1.0 // indirect
68-
github.com/containerd/ttrpc v1.2.6 // indirect
69-
github.com/containerd/typeurl/v2 v2.2.2 // indirect
7057
github.com/coreos/go-semver v0.3.1 // indirect
7158
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
7259
github.com/coreos/vcontext v0.0.0-20231102161604-685dc7299dc5 // indirect
73-
github.com/cyphar/filepath-securejoin v0.4.1 // indirect
7460
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
75-
github.com/distribution/reference v0.6.0 // indirect
7661
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
77-
github.com/euank/go-kmsg-parser v2.0.0+incompatible // indirect
7862
github.com/evanphx/json-patch v5.9.0+incompatible // indirect
7963
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
8064
github.com/fatih/color v1.18.0 // indirect
81-
github.com/felixge/httpsnoop v1.0.4 // indirect
8265
github.com/fsnotify/fsnotify v1.7.0 // indirect
8366
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
8467
github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32 // indirect
@@ -96,27 +79,20 @@ require (
9679
github.com/go-openapi/validate v0.22.0 // indirect
9780
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
9881
github.com/gobuffalo/flect v1.0.3 // indirect
99-
github.com/godbus/dbus/v5 v5.1.0 // indirect
10082
github.com/gogo/protobuf v1.3.2 // indirect
10183
github.com/golang/protobuf v1.5.4 // indirect
102-
github.com/google/btree v1.1.3 // indirect
10384
github.com/google/cadvisor v0.52.1 // indirect
104-
github.com/google/cel-go v0.22.0 // indirect
10585
github.com/google/gnostic-models v0.6.8 // indirect
10686
github.com/google/gofuzz v1.2.0 // indirect
10787
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect
10888
github.com/google/uuid v1.6.0 // indirect
10989
github.com/gorilla/websocket v1.5.1 // indirect
110-
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
111-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
11290
github.com/imdario/mergo v0.3.16 // indirect
11391
github.com/inconshreveable/mousetrap v1.1.0 // indirect
11492
github.com/jaypipes/pcidb v1.0.1 // indirect
11593
github.com/josharian/intern v1.0.0 // indirect
11694
github.com/json-iterator/go v1.1.12 // indirect
117-
github.com/karrick/godirwalk v1.17.0 // indirect
11895
github.com/klauspost/compress v1.17.11 // indirect
119-
github.com/kylelemons/godebug v1.1.0 // indirect
12096
github.com/mailru/easyjson v0.7.7 // indirect
12197
github.com/mattn/go-colorable v0.1.13 // indirect
12298
github.com/mattn/go-isatty v0.0.20 // indirect
@@ -125,43 +101,23 @@ require (
125101
github.com/mitchellh/mapstructure v1.5.0 // indirect
126102
github.com/moby/spdystream v0.5.0 // indirect
127103
github.com/moby/sys/mountinfo v0.7.2 // indirect
128-
github.com/moby/sys/userns v0.1.0 // indirect
129104
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
130105
github.com/modern-go/reflect2 v1.0.2 // indirect
131106
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
132107
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
133108
github.com/oklog/ulid v1.3.1 // indirect
134-
github.com/opencontainers/cgroups v0.0.1 // indirect
135-
github.com/opencontainers/go-digest v1.0.0 // indirect
136-
github.com/opencontainers/image-spec v1.1.1 // indirect
137-
github.com/opencontainers/runc v1.2.5 // indirect
138-
github.com/opencontainers/runtime-spec v1.2.0 // indirect
139-
github.com/opencontainers/selinux v1.11.1 // indirect
140109
github.com/prometheus/client_model v0.6.1 // indirect
141110
github.com/prometheus/common v0.62.0 // indirect
142111
github.com/prometheus/procfs v0.15.1 // indirect
143112
github.com/robfig/cron v1.2.0 // indirect
144-
github.com/stoewer/go-strcase v1.3.0 // indirect
145113
github.com/vincent-petithory/dataurl v1.0.0 // indirect
146114
github.com/x448/float16 v0.8.4 // indirect
147-
go.etcd.io/etcd/api/v3 v3.5.17 // indirect
148-
go.etcd.io/etcd/client/pkg/v3 v3.5.17 // indirect
149-
go.etcd.io/etcd/client/v3 v3.5.17 // indirect
150115
go.mongodb.org/mongo-driver v1.11.1 // indirect
151-
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
152-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.59.0 // indirect
153-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0 // indirect
154116
go.opentelemetry.io/otel v1.34.0 // indirect
155-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 // indirect
156-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 // indirect
157-
go.opentelemetry.io/otel/metric v1.34.0 // indirect
158-
go.opentelemetry.io/otel/sdk v1.34.0 // indirect
159117
go.opentelemetry.io/otel/trace v1.34.0 // indirect
160-
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
161118
go.uber.org/multierr v1.11.0 // indirect
162119
go.uber.org/zap v1.27.0 // indirect
163120
go4.org v0.0.0-20230225012048-214862532bf5 // indirect
164-
golang.org/x/crypto v0.36.0 // indirect
165121
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
166122
golang.org/x/mod v0.23.0 // indirect
167123
golang.org/x/net v0.37.0 // indirect
@@ -173,31 +129,18 @@ require (
173129
golang.org/x/time v0.10.0 // indirect
174130
golang.org/x/tools v0.30.0 // indirect
175131
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
176-
google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 // indirect
177132
google.golang.org/genproto/googleapis/rpc v0.0.0-20250227231956-55c901821b1e // indirect
178133
google.golang.org/grpc v1.70.0 // indirect
179134
google.golang.org/protobuf v1.36.5 // indirect
180135
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
181136
gopkg.in/inf.v0 v0.9.1 // indirect
182-
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
183137
gopkg.in/yaml.v3 v3.0.1 // indirect
184138
howett.net/plist v1.0.1 // indirect
185139
k8s.io/apiserver v0.32.3 // indirect
186-
k8s.io/cloud-provider v0.32.3 // indirect
187140
k8s.io/component-base v0.32.3 // indirect
188-
k8s.io/component-helpers v0.32.3 // indirect
189-
k8s.io/controller-manager v0.32.3 // indirect
190-
k8s.io/cri-api v0.32.3 // indirect
191-
k8s.io/cri-client v0.32.3 // indirect
192-
k8s.io/csi-translation-lib v0.32.3 // indirect
193-
k8s.io/dynamic-resource-allocation v0.26.2 // indirect
194141
k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9 // indirect
195-
k8s.io/kms v0.32.3 // indirect
196142
k8s.io/kube-aggregator v0.32.3 // indirect
197143
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
198-
k8s.io/kube-scheduler v0.32.3 // indirect
199-
k8s.io/mount-utils v0.32.3 // indirect
200-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 // indirect
201144
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
202145
sigs.k8s.io/kube-storage-version-migrator v0.0.6-0.20230721195810-5c8923c5ff96 // indirect
203146
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
@@ -227,7 +170,6 @@ replace (
227170
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.32.3
228171
k8s.io/kubectl => k8s.io/kubectl v0.32.3
229172
k8s.io/kubelet => k8s.io/kubelet v0.32.3
230-
k8s.io/kubernetes => k8s.io/kubernetes v1.32.3
231173
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.32.3
232174
k8s.io/metrics => k8s.io/metrics v0.32.3
233175
k8s.io/mount-utils => k8s.io/mount-utils v0.32.3

0 commit comments

Comments
 (0)