Skip to content

Commit 7cb2c4b

Browse files
itsomriitsomri
committed
Remove unused code that requires gpu-operator import
1 parent a0b9637 commit 7cb2c4b

File tree

5 files changed

+19
-92
lines changed

5 files changed

+19
-92
lines changed

‎go.mod‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
module github.com/NVIDIA/KAI-scheduler
22

3-
go 1.23.4
3+
go 1.24.0
4+
5+
toolchain go1.24.6
46

57
require (
68
github.com/NVIDIA/go-nvml v0.12.4-1
7-
github.com/NVIDIA/gpu-operator v1.8.3-0.20240812232433-87286e93f2c9
89
github.com/argoproj/argo-workflows/v3 v3.6.4
910
github.com/dustin/go-humanize v1.0.1
1011
github.com/gin-contrib/pprof v1.5.2
@@ -18,7 +19,7 @@ require (
1819
github.com/onsi/ginkgo/v2 v2.23.3
1920
github.com/onsi/gomega v1.37.0
2021
github.com/pkg/errors v0.9.1
21-
github.com/prometheus/client_golang v1.20.5
22+
github.com/prometheus/client_golang v1.21.1
2223
github.com/ray-project/kuberay/ray-operator v1.3.1
2324
github.com/run-ai/kwok-operator v0.0.0-20240926063032-05b6364bc7c7
2425
github.com/spf13/pflag v1.0.6
@@ -61,16 +62,14 @@ require (
6162
k8s.io/utils v0.0.0-20241210054802-24370beab758
6263
knative.dev/pkg v0.0.0-20250117084104-c43477f0052b
6364
knative.dev/serving v0.44.0
64-
sigs.k8s.io/controller-runtime v0.20.0
65+
sigs.k8s.io/controller-runtime v0.20.3
6566
sigs.k8s.io/karpenter v1.2.0
6667
sigs.k8s.io/lws v0.5.1
6768
)
6869

6970
require (
7071
cel.dev/expr v0.18.0 // indirect
7172
github.com/Microsoft/go-winio v0.6.2 // indirect
72-
github.com/NVIDIA/k8s-kata-manager v0.2.0 // indirect
73-
github.com/NVIDIA/k8s-operator-libs v0.0.0-20240627150410-078e3039ecf7 // indirect
7473
github.com/NYTimes/gziphandler v1.1.1 // indirect
7574
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
7675
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
@@ -143,14 +142,13 @@ require (
143142
github.com/opencontainers/selinux v1.11.1 // indirect
144143
github.com/pelletier/go-toml/v2 v2.2.3 // indirect
145144
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
146-
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.73.2 // indirect
147145
github.com/prometheus/client_model v0.6.1 // indirect
148146
github.com/prometheus/common v0.62.0 // indirect
149147
github.com/prometheus/procfs v0.15.1 // indirect
150148
github.com/robfig/cron/v3 v3.0.1 // indirect
151149
github.com/samber/lo v1.47.0 // indirect
152150
github.com/sirupsen/logrus v1.9.3 // indirect
153-
github.com/spf13/cobra v1.8.1 // indirect
151+
github.com/spf13/cobra v1.9.1 // indirect
154152
github.com/stoewer/go-strcase v1.3.0 // indirect
155153
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
156154
github.com/ugorji/go/codec v1.2.12 // indirect
@@ -169,7 +167,7 @@ require (
169167
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
170168
golang.org/x/arch v0.12.0 // indirect
171169
golang.org/x/crypto v0.36.0 // indirect
172-
golang.org/x/mod v0.23.0 // indirect
170+
golang.org/x/mod v0.24.0 // indirect
173171
golang.org/x/net v0.38.0 // indirect
174172
golang.org/x/oauth2 v0.28.0 // indirect
175173
golang.org/x/sync v0.12.0 // indirect
@@ -181,7 +179,7 @@ require (
181179
google.golang.org/api v0.215.0 // indirect
182180
google.golang.org/genproto v0.0.0-20241118233622-e639e219e697 // indirect
183181
google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 // indirect
184-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241223144023-3abc09e42ca8 // indirect
182+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250227231956-55c901821b1e // indirect
185183
google.golang.org/protobuf v1.36.5 // indirect
186184
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
187185
gopkg.in/inf.v0 v0.9.1 // indirect

‎go.sum‎

Lines changed: 11 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,6 @@ github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERo
1111
github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU=
1212
github.com/NVIDIA/go-nvml v0.12.4-1 h1:WKUvqshhWSNTfm47ETRhv0A0zJyr1ncCuHiXwoTrBEc=
1313
github.com/NVIDIA/go-nvml v0.12.4-1/go.mod h1:8Llmj+1Rr+9VGGwZuRer5N/aCjxGuR5nPb/9ebBiIEQ=
14-
github.com/NVIDIA/gpu-operator v1.8.3-0.20240812232433-87286e93f2c9 h1:9yw3Jkto9ZqtNwlnOzxAlKufMNplaWPRfkXhCUFHXgI=
15-
github.com/NVIDIA/gpu-operator v1.8.3-0.20240812232433-87286e93f2c9/go.mod h1:lOgoRYbt1dtCVGX+EhxuZgPonfcIs41BXrnIPk3fE3I=
16-
github.com/NVIDIA/k8s-kata-manager v0.2.0 h1:K+BFkXTOvXXj/kmbNfxFCXM+GkdOVZj2WTHQ7b2uQA0=
17-
github.com/NVIDIA/k8s-kata-manager v0.2.0/go.mod h1:fVUz0DLzwW9RQBE59cLNTi3LrzVwSXWIogr9y5FocPM=
18-
github.com/NVIDIA/k8s-operator-libs v0.0.0-20240627150410-078e3039ecf7 h1:NaClubDuTKoXy4Ev4ZkmpVy3u6xdwd3I1XFJdoI1r+M=
19-
github.com/NVIDIA/k8s-operator-libs v0.0.0-20240627150410-078e3039ecf7/go.mod h1:d8YV6Am03Z9VS4fh6virN/ltOSasCZtAhkwMRU1X6Vs=
2014
github.com/NYTimes/gziphandler v1.1.1 h1:ZUDjpQae29j0ryrS0u/B8HZfJBtBQHjqw2rQ2cqUQ3I=
2115
github.com/NYTimes/gziphandler v1.1.1/go.mod h1:n/CVRwUEOgIxrgPvAQhUUr9oeUtvrhMomdKFjzJNB0c=
2216
github.com/Pallinder/go-randomdata v1.2.0 h1:DZ41wBchNRb/0GfsePLiSwb0PHZmT67XY00lCDlaYPg=
@@ -62,7 +56,7 @@ github.com/coreos/go-semver v0.3.1 h1:yi21YpKnrx1gt5R+la8n5WgS0kCrsPp33dmEyHReZr
6256
github.com/coreos/go-semver v0.3.1/go.mod h1:irMmmIw/7yzSRPWryHsK7EYSg09caPQL03VsM8rvUec=
6357
github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs=
6458
github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
65-
github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
59+
github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
6660
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
6761
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
6862
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
@@ -270,10 +264,8 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE
270264
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
271265
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
272266
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
273-
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.73.2 h1:GwlGJPK6vf1UIohpc72KJVkKYlzki1UgE3xC4bWbf20=
274-
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.73.2/go.mod h1:yJ3CawR/A5qEYFEeCOUVYLTwYxmacfHQhJS+b/2QiaM=
275-
github.com/prometheus/client_golang v1.20.5 h1:cxppBPuYhUnsO6yo/aoRol4L7q7UFfdm+bR9r+8l63Y=
276-
github.com/prometheus/client_golang v1.20.5/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE=
267+
github.com/prometheus/client_golang v1.21.1 h1:DOvXXTqVzvkIewV/CDPFdejpMCGeMcbGCQ8YOmu+Ibk=
268+
github.com/prometheus/client_golang v1.21.1/go.mod h1:U9NM32ykUErtVBxdvD3zfi+EuFkkaBvMb09mIfe0Zgg=
277269
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
278270
github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E=
279271
github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY=
@@ -299,9 +291,8 @@ github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ
299291
github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
300292
github.com/soheilhy/cmux v0.1.5 h1:jjzc5WVemNEDTLwv9tlmemhC73tI08BNOIGwBOo10Js=
301293
github.com/soheilhy/cmux v0.1.5/go.mod h1:T7TcVDs9LWfQgPlPsdngu6I6QIoyIFZDDC6sNE1GqG0=
302-
github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM=
303-
github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y=
304-
github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
294+
github.com/spf13/cobra v1.9.1 h1:CXSaggrXdbHK9CF+8ywj8Amf7PBRmPCOJugH954Nnlo=
295+
github.com/spf13/cobra v1.9.1/go.mod h1:nDyEzZ8ogv936Cinf6g1RU9MRY64Ir93oCnqb9wxYW0=
305296
github.com/spf13/pflag v1.0.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o=
306297
github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
307298
github.com/stoewer/go-strcase v1.3.0 h1:g0eASXYtp+yvN9fK8sH94oCIk0fau9uV1/ZdJ0AVEzs=
@@ -399,8 +390,8 @@ golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvx
399390
golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
400391
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
401392
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
402-
golang.org/x/mod v0.23.0 h1:Zb7khfcRGKk+kqfxFaP5tZqCnDZMjC5VtUBs87Hr6QM=
403-
golang.org/x/mod v0.23.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
393+
golang.org/x/mod v0.24.0 h1:ZfthKaKaT4NrhGVZHO1/WDTwGES4De8KtWO0SIbNJMU=
394+
golang.org/x/mod v0.24.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww=
404395
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
405396
golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
406397
golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -477,8 +468,8 @@ google.golang.org/genproto v0.0.0-20241118233622-e639e219e697 h1:ToEetK57OidYuqD
477468
google.golang.org/genproto v0.0.0-20241118233622-e639e219e697/go.mod h1:JJrvXBWRZaFMxBufik1a4RpFw4HhgVtBBWQeQgUj2cc=
478469
google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 h1:CkkIfIt50+lT6NHAVoRYEyAvQGFM7xEwXUUywFvEb3Q=
479470
google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576/go.mod h1:1R3kvZ1dtP3+4p4d3G8uJ8rFk/fWlScl38vanWACI08=
480-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241223144023-3abc09e42ca8 h1:TqExAhdPaB60Ux47Cn0oLV07rGnxZzIsaRhQaqS666A=
481-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241223144023-3abc09e42ca8/go.mod h1:lcTa1sDdWEIHMWlITnIczmw5w60CF9ffkb8Z+DVmmjA=
471+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250227231956-55c901821b1e h1:YA5lmSs3zc/5w+xsRcHqpETkaYyK63ivEPzNTcUUlSA=
472+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250227231956-55c901821b1e/go.mod h1:LuRYeWDFV6WOn90g357N17oMCaxpgCnbi/44qJvDn2I=
482473
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
483474
google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
484475
google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
@@ -594,8 +585,8 @@ knative.dev/serving v0.44.0/go.mod h1:9bFONngDZtkdYZkP5ko9LDS9ZelnFY9SaPoHKG0vFx
594585
nullprogram.com/x/optparse v1.0.0/go.mod h1:KdyPE+Igbe0jQUrVfMqDMeJQIJZEuyV7pjYmp6pbG50=
595586
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 h1:CPT0ExVicCzcpeN4baWEV2ko2Z/AsiZgEdwgcfwLgMo=
596587
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw=
597-
sigs.k8s.io/controller-runtime v0.20.0 h1:jjkMo29xEXH+02Md9qaVXfEIaMESSpy3TBWPrsfQkQs=
598-
sigs.k8s.io/controller-runtime v0.20.0/go.mod h1:BrP3w158MwvB3ZbNpaAcIKkHQ7YGpYnzpoSTZ8E14WU=
588+
sigs.k8s.io/controller-runtime v0.20.3 h1:I6Ln8JfQjHH7JbtCD2HCYHoIzajoRxPNuvhvcDbZgkI=
589+
sigs.k8s.io/controller-runtime v0.20.3/go.mod h1:xg2XB0K5ShQzAgsoujxuKN4LNXR2LfwwHsPj7Iaw+XY=
599590
sigs.k8s.io/jobset v0.5.2 h1:276q5Pi/ErLYj+GQ0ydEXR6tx3LwBhEzHLQv+k8bYF4=
600591
sigs.k8s.io/jobset v0.5.2/go.mod h1:Vg99rj/6OoGvy1uvywGEHOcVLCWWJYkJtisKqdWzcFw=
601592
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 h1:gBQPwqORJ8d8/YNZWEjoZs7npUVDpVXUUOFfW6CgAqE=

‎pkg/common/gpu_operator_discovery/cdi.go‎

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

‎test/e2e/modules/context/connectivity.go‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import (
1111

1212
lws "sigs.k8s.io/lws/api/leaderworkerset/v1"
1313

14-
nvidiav1 "github.com/NVIDIA/gpu-operator/api/nvidia/v1"
1514
"k8s.io/api/node/v1alpha1"
1615
"k8s.io/client-go/kubernetes"
1716
"k8s.io/client-go/rest"
@@ -66,9 +65,6 @@ func initConnectivity() error {
6665
if err = kwokopv1beta1.AddToScheme(controllerClient.Scheme()); err != nil {
6766
return fmt.Errorf("failed to add scheduling v1beta1 to scheme: %w", err)
6867
}
69-
if err = nvidiav1.AddToScheme(controllerClient.Scheme()); err != nil {
70-
return fmt.Errorf("failed to add nvidiav1 to scheme: %w", err)
71-
}
7268
if err = lws.AddToScheme(controllerClient.Scheme()); err != nil {
7369
return fmt.Errorf("failed to add lws to scheme: %w", err)
7470
}

‎test/e2e/modules/resources/capacity/validators.go‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,6 @@ import (
1414
"k8s.io/apimachinery/pkg/api/errors"
1515
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1616
"k8s.io/client-go/kubernetes"
17-
"sigs.k8s.io/controller-runtime/pkg/client"
18-
19-
gpuoperatordiscovery "github.com/NVIDIA/KAI-scheduler/pkg/common/gpu_operator_discovery"
2017
)
2118

2219
func SkipIfInsufficientClusterResources(clientset kubernetes.Interface, resourceRequest *ResourceList) {
@@ -74,15 +71,6 @@ func SkipIfNonHomogeneousGpuCounts(clientset kubernetes.Interface) int {
7471
return maps.Keys(gpuCounts)[0]
7572
}
7673

77-
func SkipIfCDIEnabled(ctx context.Context, client client.Client) {
78-
cdiEnabled, err := gpuoperatordiscovery.IsCdiEnabled(ctx, client)
79-
gomega.Expect(err).NotTo(gomega.HaveOccurred(), "Failed to check if CDI is enabled")
80-
81-
if cdiEnabled {
82-
ginkgo.Skip("CDI is enabled")
83-
}
84-
}
85-
8674
func SkipIfCSIDriverIsMissing(ctx context.Context, client kubernetes.Interface, name string) {
8775
_, err := client.StorageV1().CSIDrivers().Get(ctx, name, metav1.GetOptions{})
8876
if err != nil && errors.IsNotFound(err) {

0 commit comments

Comments
 (0)