Skip to content

Commit c80751e

Browse files
KaiPilotBotgshaibi
andauthored
chore(deps): drop github.com/NVIDIA/gpu-operator dependency (#1710)
Signed-off-by: gshaibi <gshaibi@nvidia.com> Signed-off-by: Guy Shaibi <gshaibi@gmail.com> Co-authored-by: Guy Shaibi <39763067+gshaibi@users.noreply.github.com>
1 parent fbaacd5 commit c80751e

12 files changed

Lines changed: 230 additions & 26 deletions

File tree

cmd/operator/app/app.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ package app
66
import (
77
"os"
88

9-
nvidiav1 "github.com/NVIDIA/gpu-operator/api/nvidia/v1"
9+
nvidiav1 "github.com/kai-scheduler/KAI-scheduler/third_party/nvidia/gpu-operator/api/nvidia/v1"
1010
monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
1111
vpav1 "k8s.io/autoscaler/vertical-pod-autoscaler/pkg/apis/autoscaling.k8s.io/v1"
1212

go.mod

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ go 1.26.3
44

55
require (
66
github.com/NVIDIA/go-nvml v0.13.0-1
7-
github.com/NVIDIA/gpu-operator v1.8.3-0.20250724212111-616690d88d86
87
github.com/aptible/supercronic v0.2.44
98
github.com/argoproj/argo-workflows/v3 v3.7.11
109
github.com/dustin/go-humanize v1.0.1
@@ -83,8 +82,6 @@ require (
8382
cyphar.com/go-pathrs v0.2.1 // indirect
8483
github.com/Masterminds/semver/v3 v3.4.0 // indirect
8584
github.com/Microsoft/go-winio v0.6.2 // indirect
86-
github.com/NVIDIA/k8s-kata-manager v0.2.3 // indirect
87-
github.com/NVIDIA/k8s-operator-libs v0.0.0-20250311214045-7d667fbaa7ac // indirect
8885
github.com/antlr4-go/antlr/v4 v4.13.1 // indirect
8986
github.com/awslabs/operatorpkg v0.0.0-20241205163410-0fff9f28d115 // indirect
9087
github.com/beorn7/perks v1.0.1 // indirect

go.sum

Lines changed: 0 additions & 6 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.13.0-1 h1:OLX8Jq3dONuPOQPC7rndB6+iDmDakw0XTYgzMxObkEw=
1313
github.com/NVIDIA/go-nvml v0.13.0-1/go.mod h1:+KNA7c7gIBH7SKSJ1ntlwkfN80zdx8ovl4hrK3LmPt4=
14-
github.com/NVIDIA/gpu-operator v1.8.3-0.20250724212111-616690d88d86 h1:KcEKuIVSUY5XJZTzLjbpD3DRPcQTLwkX1DyzuCZHYKU=
15-
github.com/NVIDIA/gpu-operator v1.8.3-0.20250724212111-616690d88d86/go.mod h1:EkmCOAWVMphjgnRpbqXhpArJQrOJjbKsoHcrklnisfU=
16-
github.com/NVIDIA/k8s-kata-manager v0.2.3 h1:d5+gRFqU5el/fKMXhHUaPY7haj+dbHL4nDsO/q05LBo=
17-
github.com/NVIDIA/k8s-kata-manager v0.2.3/go.mod h1:xx5OUiMsHyKbyX0JjKHqAftvqS8vx00LFn/5EaMdtB4=
18-
github.com/NVIDIA/k8s-operator-libs v0.0.0-20250311214045-7d667fbaa7ac h1:zY0RHvLzhlZlRV8XZ30foz3cGpflVZTwMpegq+nVePA=
19-
github.com/NVIDIA/k8s-operator-libs v0.0.0-20250311214045-7d667fbaa7ac/go.mod h1:2d+9jpnO7PxsuFJg3Mt/SHmsauD80USc00zRMYba++E=
2014
github.com/Pallinder/go-randomdata v1.2.0 h1:DZ41wBchNRb/0GfsePLiSwb0PHZmT67XY00lCDlaYPg=
2115
github.com/Pallinder/go-randomdata v1.2.0/go.mod h1:yHmJgulpD2Nfrm0cR9tI/+oAgRqCQQixsA8HyRZfV9Y=
2216
github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=

pkg/operator/controller/config_controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import (
2929
"sigs.k8s.io/controller-runtime/pkg/handler"
3030
"sigs.k8s.io/controller-runtime/pkg/log"
3131

32-
nvidiav1 "github.com/NVIDIA/gpu-operator/api/nvidia/v1"
32+
nvidiav1 "github.com/kai-scheduler/KAI-scheduler/third_party/nvidia/gpu-operator/api/nvidia/v1"
3333

3434
kaiv1 "github.com/kai-scheduler/KAI-scheduler/pkg/apis/kai/v1"
3535

pkg/operator/controller/integration_tests/config_controller_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313
. "github.com/onsi/ginkgo/v2"
1414
. "github.com/onsi/gomega"
1515

16-
nvidiav1 "github.com/NVIDIA/gpu-operator/api/nvidia/v1"
16+
nvidiav1 "github.com/kai-scheduler/KAI-scheduler/third_party/nvidia/gpu-operator/api/nvidia/v1"
1717

1818
appsv1 "k8s.io/api/apps/v1"
1919
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

pkg/operator/controller/integration_tests/suite_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import (
2929
"github.com/kai-scheduler/KAI-scheduler/pkg/common/constants"
3030
"github.com/kai-scheduler/KAI-scheduler/pkg/operator/controller"
3131

32-
nvidiav1 "github.com/NVIDIA/gpu-operator/api/nvidia/v1"
32+
nvidiav1 "github.com/kai-scheduler/KAI-scheduler/third_party/nvidia/gpu-operator/api/nvidia/v1"
3333
monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
3434
admissionv1 "k8s.io/api/admissionregistration/v1"
3535
appsv1 "k8s.io/api/apps/v1"

pkg/operator/controller/integration_tests/third_party_crds/nvidia.com_clusterpolicies.yaml

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2319,16 +2319,12 @@ spec:
23192319
description: NVIDIA vGPU Manager image tag
23202320
type: string
23212321
type: object
2322-
required:
2323-
- daemonsets
2324-
- dcgm
2325-
- dcgmExporter
2326-
- devicePlugin
2327-
- driver
2328-
- gfd
2329-
- nodeStatusExporter
2330-
- operator
2331-
- toolkit
2322+
# The operands below are required by the upstream gpu-operator CRD
2323+
# but are intentionally not modeled by the local ClusterPolicy mirror
2324+
# (third_party/nvidia/gpu-operator/api/nvidia/v1) — the operator only
2325+
# ever reads this resource in production, where gpu-operator owns and
2326+
# populates it. The list is relaxed here so the integration test can
2327+
# create a minimal ClusterPolicy.
23322328
type: object
23332329
status:
23342330
description: ClusterPolicyStatus defines the observed state of ClusterPolicy

pkg/operator/operands/binder/binder_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"strconv"
1010
"testing"
1111

12-
nvidiav1 "github.com/NVIDIA/gpu-operator/api/nvidia/v1"
12+
nvidiav1 "github.com/kai-scheduler/KAI-scheduler/third_party/nvidia/gpu-operator/api/nvidia/v1"
1313
"golang.org/x/exp/maps"
1414
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
1515
"k8s.io/client-go/kubernetes/scheme"

pkg/operator/operands/binder/resources.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"sigs.k8s.io/controller-runtime/pkg/client"
2121
"sigs.k8s.io/controller-runtime/pkg/log"
2222

23-
nvidiav1 "github.com/NVIDIA/gpu-operator/api/nvidia/v1"
23+
nvidiav1 "github.com/kai-scheduler/KAI-scheduler/third_party/nvidia/gpu-operator/api/nvidia/v1"
2424

2525
kaiv1 "github.com/kai-scheduler/KAI-scheduler/pkg/apis/kai/v1"
2626
kaiv1binder "github.com/kai-scheduler/KAI-scheduler/pkg/apis/kai/v1/binder"

pkg/operator/operands/common/common_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"context"
88
"testing"
99

10-
nvidiav1 "github.com/NVIDIA/gpu-operator/api/nvidia/v1"
10+
nvidiav1 "github.com/kai-scheduler/KAI-scheduler/third_party/nvidia/gpu-operator/api/nvidia/v1"
1111
. "github.com/onsi/ginkgo/v2"
1212
. "github.com/onsi/gomega"
1313
monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"

0 commit comments

Comments
 (0)