Rename gpu.nvidia.com/v1alpha1 API to resource.nvidia.com/v1beta1

Signed-off-by: Kevin Klues <[email protected]>
NVIDIA · Jan 22, 2025 · fa8bce2 · fa8bce2
1 parent ea143c3
commit fa8bce2
Show file tree

Hide file tree

Showing 50 changed files with 180 additions and 180 deletions.
diff --git a/Makefile b/Makefile
@@ -79,7 +79,7 @@ goimports:
 	find . -name \*.go \
 			-not -name "zz_generated.deepcopy.go" \
 			-not -path "./vendor/*" \
-			-not -path "./pkg/nvidia.com/resource/clientset/versioned/*" \
+			-not -path "./$(PKG_BASE)/clientset/versioned/*" \
 		-exec goimports -local $(MODULE) -w {} \;
 
 golangci-lint:
@@ -101,9 +101,9 @@ coverage: test
 	cat $(COVERAGE_FILE) | grep -v "_mock.go" > $(COVERAGE_FILE).no-mocks
 	go tool cover -func=$(COVERAGE_FILE).no-mocks
 
-generate: generate-crds fmt
+generate: generate-crds generate-informers fmt
 
-generate-crds: generate-deepcopy
+generate-crds: generate-deepcopy .remove-crds
 	for dir in $(CLIENT_SOURCES); do \
 		controller-gen crd:crdVersions=v1 \
 			paths=$(CURDIR)/$${dir} \
@@ -118,15 +118,15 @@ generate-crds: generate-deepcopy
 	rm -rf $(CURDIR)/deployments/helm/tmp_crds
 
 
-generate-deepcopy: generate-informers
+generate-deepcopy: .remove-deepcopy
 	for dir in $(DEEPCOPY_SOURCES); do \
 		controller-gen \
 			object:headerFile=$(CURDIR)/hack/boilerplate.go.txt,year=$(shell date +"%Y") \
 			paths=$(CURDIR)/$${dir}/ \
 			output:object:dir=$(CURDIR)/$${dir}; \
 	done
 
-generate-informers: generate-listers
+generate-informers: .remove-informers generate-listers
 	informer-gen \
 		--go-header-file=$(CURDIR)/hack/boilerplate.go.txt \
 		--output-package "$(MODULE)/$(PKG_BASE)/informers" \
@@ -139,7 +139,7 @@ generate-informers: generate-listers
 	   $(CURDIR)/$(PKG_BASE)/informers
 	rm -rf $(CURDIR)/pkg/tmp_informers
 
-generate-listers: generate-clientset
+generate-listers: .remove-listers generate-clientset
 	lister-gen \
 		--go-header-file=$(CURDIR)/hack/boilerplate.go.txt \
 		--output-package "$(MODULE)/$(PKG_BASE)/listers" \
@@ -150,7 +150,7 @@ generate-listers: generate-clientset
 	   $(CURDIR)/$(PKG_BASE)/listers
 	rm -rf $(CURDIR)/pkg/tmp_listers
 
-generate-clientset: .remove-informers .remove-listers .remove-clientset .remove-deepcopy .remove-crds
+generate-clientset: .remove-clientset
 	client-gen \
 		--go-header-file=$(CURDIR)/hack/boilerplate.go.txt \
 		--clientset-name "versioned" \

diff --git a/api/nvidia.com/resource/gpu/v1alpha1/api.go → api/nvidia.com/resource/v1beta1/api.go b/api/nvidia.com/resource/gpu/v1alpha1/api.go → api/nvidia.com/resource/v1beta1/api.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package v1alpha1
+package v1beta1
 
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -24,8 +24,8 @@ import (
 )
 
 const (
-	GroupName = "gpu.nvidia.com"
-	Version   = "v1alpha1"
+	GroupName = "resource.nvidia.com"
+	Version   = "v1beta1"
 
 	GpuConfigKind         = "GpuConfig"
 	MigDeviceConfigKind   = "MigDeviceConfig"

diff --git a/...om/resource/gpu/v1alpha1/computedomain.go → ...dia.com/resource/v1beta1/computedomain.go b/...om/resource/gpu/v1alpha1/computedomain.go → ...dia.com/resource/v1beta1/computedomain.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package v1alpha1
+package v1beta1
 
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

diff --git a/api/nvidia.com/resource/gpu/v1alpha1/doc.go → api/nvidia.com/resource/v1beta1/doc.go b/api/nvidia.com/resource/gpu/v1alpha1/doc.go → api/nvidia.com/resource/v1beta1/doc.go
@@ -15,6 +15,6 @@
  */
 
 // +k8s:deepcopy-gen=package
-// +groupName=gpu.nvidia.com
+// +groupName=resource.nvidia.com
 
-package v1alpha1
+package v1beta1
diff --git a/...ia.com/resource/gpu/v1alpha1/gpuconfig.go → api/nvidia.com/resource/v1beta1/gpuconfig.go b/...ia.com/resource/gpu/v1alpha1/gpuconfig.go → api/nvidia.com/resource/v1beta1/gpuconfig.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package v1alpha1
+package v1beta1
 
 import (
 	"fmt"

diff --git a/...esource/gpu/v1alpha1/imexchannelconfig.go → ...com/resource/v1beta1/imexchannelconfig.go b/...esource/gpu/v1alpha1/imexchannelconfig.go → ...com/resource/v1beta1/imexchannelconfig.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package v1alpha1
+package v1beta1
 
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

diff --git a/...resource/gpu/v1alpha1/imexdaemonconfig.go → ....com/resource/v1beta1/imexdaemonconfig.go b/...resource/gpu/v1alpha1/imexdaemonconfig.go → ....com/resource/v1beta1/imexdaemonconfig.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package v1alpha1
+package v1beta1
 
 import (
 	"fmt"

diff --git a/...ia.com/resource/gpu/v1alpha1/migconfig.go → api/nvidia.com/resource/v1beta1/migconfig.go b/...ia.com/resource/gpu/v1alpha1/migconfig.go → api/nvidia.com/resource/v1beta1/migconfig.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package v1alpha1
+package v1beta1
 
 import (
 	"fmt"

diff --git a/...dia.com/resource/gpu/v1alpha1/register.go → api/nvidia.com/resource/v1beta1/register.go b/...dia.com/resource/gpu/v1alpha1/register.go → api/nvidia.com/resource/v1beta1/register.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package v1alpha1
+package v1beta1
 
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

diff --git a/...idia.com/resource/gpu/v1alpha1/sharing.go → api/nvidia.com/resource/v1beta1/sharing.go b/...idia.com/resource/gpu/v1alpha1/sharing.go → api/nvidia.com/resource/v1beta1/sharing.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package v1alpha1
+package v1beta1
 
 import (
 	"errors"

diff --git a/...com/resource/gpu/v1alpha1/sharing_test.go → ...idia.com/resource/v1beta1/sharing_test.go b/...com/resource/gpu/v1alpha1/sharing_test.go → ...idia.com/resource/v1beta1/sharing_test.go
@@ -14,15 +14,15 @@
 # limitations under the License.
 **/
 
-package v1alpha1_test
+package v1beta1_test
 
 import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
 	"k8s.io/apimachinery/pkg/api/resource"
 
-	configapi "github.com/NVIDIA/k8s-dra-driver/api/nvidia.com/resource/gpu/v1alpha1"
+	configapi "github.com/NVIDIA/k8s-dra-driver/api/nvidia.com/resource/v1beta1"
 )
 
 func TestMpsPerDevicePinnedMemoryLimitNormalize(t *testing.T) {

diff --git a/...dia.com/resource/gpu/v1alpha1/validate.go → api/nvidia.com/resource/v1beta1/validate.go b/...dia.com/resource/gpu/v1alpha1/validate.go → api/nvidia.com/resource/v1beta1/validate.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package v1alpha1
+package v1beta1
 
 import (
 	"fmt"

diff --git a/...rce/gpu/v1alpha1/zz_generated.deepcopy.go → ...resource/v1beta1/zz_generated.deepcopy.go b/...rce/gpu/v1alpha1/zz_generated.deepcopy.go → ...resource/v1beta1/zz_generated.deepcopy.go
diff --git a/cmd/nvidia-dra-gpu-plugin/device_state.go b/cmd/nvidia-dra-gpu-plugin/device_state.go
@@ -29,7 +29,7 @@ import (
 	"k8s.io/kubernetes/pkg/kubelet/checkpointmanager"
 	cdiapi "tags.cncf.io/container-device-interface/pkg/cdi"
 
-	configapi "github.com/NVIDIA/k8s-dra-driver/api/nvidia.com/resource/gpu/v1alpha1"
+	configapi "github.com/NVIDIA/k8s-dra-driver/api/nvidia.com/resource/v1beta1"
 )
 
 type OpaqueDeviceConfig struct {

diff --git a/cmd/nvidia-dra-gpu-plugin/sharing.go b/cmd/nvidia-dra-gpu-plugin/sharing.go
@@ -46,7 +46,7 @@ import (
 	cdiapi "tags.cncf.io/container-device-interface/pkg/cdi"
 	cdispec "tags.cncf.io/container-device-interface/specs-go"
 
-	configapi "github.com/NVIDIA/k8s-dra-driver/api/nvidia.com/resource/gpu/v1alpha1"
+	configapi "github.com/NVIDIA/k8s-dra-driver/api/nvidia.com/resource/v1beta1"
 )
 
 const (

diff --git a/cmd/nvidia-dra-imex-controller/computedomain.go b/cmd/nvidia-dra-imex-controller/computedomain.go
@@ -25,17 +25,17 @@ import (
 	"k8s.io/client-go/tools/cache"
 	"k8s.io/klog/v2"
 
-	nvapi "github.com/NVIDIA/k8s-dra-driver/api/nvidia.com/resource/gpu/v1alpha1"
-	nvinformers "github.com/NVIDIA/k8s-dra-driver/pkg/nvidia.com/resource/informers/externalversions"
-	nvlisters "github.com/NVIDIA/k8s-dra-driver/pkg/nvidia.com/resource/listers/gpu/v1alpha1"
+	nvapi "github.com/NVIDIA/k8s-dra-driver/api/nvidia.com/resource/v1beta1"
+	nvinformers "github.com/NVIDIA/k8s-dra-driver/pkg/nvidia.com/informers/externalversions"
+	nvlisters "github.com/NVIDIA/k8s-dra-driver/pkg/nvidia.com/listers/resource/v1beta1"
 )
 
 type ComputeDomainExistsFunc func(uid string) (bool, error)
 
 const (
 	informerResyncPeriod = 10 * time.Minute
 
-	computeDomainLabelKey  = "gpu.nvidia.com/computeDomain"
+	computeDomainLabelKey  = "resource.nvidia.com/computeDomain"
 	computeDomainFinalizer = computeDomainLabelKey
 )
 
@@ -56,7 +56,7 @@ type ComputeDomainManager struct {
 // NewComputeDomainManager creates a new ComputeDomainManager.
 func NewComputeDomainManager(config *ManagerConfig) *ComputeDomainManager {
 	factory := nvinformers.NewSharedInformerFactory(config.clientsets.Nvidia, informerResyncPeriod)
-	informer := factory.Gpu().V1alpha1().ComputeDomains().Informer()
+	informer := factory.Resource().V1beta1().ComputeDomains().Informer()
 	lister := nvlisters.NewComputeDomainLister(informer.GetIndexer())
 
 	m := &ComputeDomainManager{

diff --git a/cmd/nvidia-dra-imex-controller/deployment.go b/cmd/nvidia-dra-imex-controller/deployment.go
@@ -35,7 +35,7 @@ import (
 	"k8s.io/client-go/tools/cache"
 	"k8s.io/klog/v2"
 
-	nvapi "github.com/NVIDIA/k8s-dra-driver/api/nvidia.com/resource/gpu/v1alpha1"
+	nvapi "github.com/NVIDIA/k8s-dra-driver/api/nvidia.com/resource/v1beta1"
 )
 
 const (

diff --git a/cmd/nvidia-dra-imex-controller/deviceclass.go b/cmd/nvidia-dra-imex-controller/deviceclass.go
@@ -29,7 +29,7 @@ import (
 	"k8s.io/client-go/tools/cache"
 	"k8s.io/klog/v2"
 
-	nvapi "github.com/NVIDIA/k8s-dra-driver/api/nvidia.com/resource/gpu/v1alpha1"
+	nvapi "github.com/NVIDIA/k8s-dra-driver/api/nvidia.com/resource/v1beta1"
 )
 
 type DeviceClassManager struct {

diff --git a/cmd/nvidia-dra-imex-controller/resourceclaim.go b/cmd/nvidia-dra-imex-controller/resourceclaim.go
@@ -29,7 +29,7 @@ import (
 	"k8s.io/client-go/tools/cache"
 	"k8s.io/klog/v2"
 
-	nvapi "github.com/NVIDIA/k8s-dra-driver/api/nvidia.com/resource/gpu/v1alpha1"
+	nvapi "github.com/NVIDIA/k8s-dra-driver/api/nvidia.com/resource/v1beta1"
 )
 
 type ResourceClaimManager struct {

diff --git a/cmd/nvidia-dra-imex-controller/resourceclaimtemplate.go b/cmd/nvidia-dra-imex-controller/resourceclaimtemplate.go
@@ -35,7 +35,7 @@ import (
 	"k8s.io/client-go/tools/cache"
 	"k8s.io/klog/v2"
 
-	nvapi "github.com/NVIDIA/k8s-dra-driver/api/nvidia.com/resource/gpu/v1alpha1"
+	nvapi "github.com/NVIDIA/k8s-dra-driver/api/nvidia.com/resource/v1beta1"
 )
 
 const (

diff --git a/cmd/nvidia-dra-imex-plugin/device_state.go b/cmd/nvidia-dra-imex-plugin/device_state.go
@@ -29,7 +29,7 @@ import (
 	"k8s.io/kubernetes/pkg/kubelet/checkpointmanager"
 	cdiapi "tags.cncf.io/container-device-interface/pkg/cdi"
 
-	configapi "github.com/NVIDIA/k8s-dra-driver/api/nvidia.com/resource/gpu/v1alpha1"
+	configapi "github.com/NVIDIA/k8s-dra-driver/api/nvidia.com/resource/v1beta1"
 )
 
 type OpaqueDeviceConfig struct {

diff --git a/common.mk b/common.mk
@@ -14,10 +14,10 @@
 
 VENDOR := nvidia.com
 
-API_BASE := api/$(VENDOR)/resource
-PKG_BASE := pkg/$(VENDOR)/resource
+API_BASE := api/$(VENDOR)
+PKG_BASE := pkg/$(VENDOR)
 
-CLIENT_APIS := gpu/v1alpha1
+CLIENT_APIS := resource/v1beta1
 CLIENT_SOURCES += $(patsubst %, $(API_BASE)/%, $(CLIENT_APIS))
 
 DEEPCOPY_SOURCES = $(CLIENT_SOURCES)

diff --git a/demo/specs/quickstart/gpu-test-mps.yaml b/demo/specs/quickstart/gpu-test-mps.yaml
@@ -21,7 +21,7 @@ spec:
         opaque:
           driver: gpu.nvidia.com
           parameters:
-            apiVersion: gpu.nvidia.com/v1alpha1
+            apiVersion: resource.nvidia.com/v1beta1
             kind: GpuConfig
             sharing:
               strategy: MPS

diff --git a/demo/specs/quickstart/gpu-test5.yaml b/demo/specs/quickstart/gpu-test5.yaml
@@ -26,7 +26,7 @@ spec:
         opaque:
           driver: gpu.nvidia.com
           parameters:
-            apiVersion: gpu.nvidia.com/v1alpha1
+            apiVersion: resource.nvidia.com/v1beta1
             kind: GpuConfig
             sharing:
               strategy: TimeSlicing
@@ -36,7 +36,7 @@ spec:
         opaque:
           driver: gpu.nvidia.com
           parameters:
-            apiVersion: gpu.nvidia.com/v1alpha1
+            apiVersion: resource.nvidia.com/v1beta1
             kind: GpuConfig
             sharing:
               strategy: MPS

diff --git a/demo/specs/quickstart/gpu-test6.yaml b/demo/specs/quickstart/gpu-test6.yaml
@@ -34,7 +34,7 @@ spec:
         opaque:
           driver: gpu.nvidia.com
           parameters:
-            apiVersion: gpu.nvidia.com/v1alpha1
+            apiVersion: resource.nvidia.com/v1beta1
             kind: GpuConfig
             sharing:
               strategy: TimeSlicing

diff --git a/...r/crds/gpu.nvidia.com_computedomains.yaml → ...s/resource.nvidia.com_computedomains.yaml b/...r/crds/gpu.nvidia.com_computedomains.yaml → ...s/resource.nvidia.com_computedomains.yaml
@@ -4,17 +4,17 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.14.0
-  name: computedomains.gpu.nvidia.com
+  name: computedomains.resource.nvidia.com
 spec:
-  group: gpu.nvidia.com
+  group: resource.nvidia.com
   names:
     kind: ComputeDomain
     listKind: ComputeDomainList
     plural: computedomains
     singular: computedomain
   scope: Namespaced
   versions:
-  - name: v1alpha1
+  - name: v1beta1
     schema:
       openAPIV3Schema:
         description: ComputeDomain prepares a set of nodes to run a multi-node workload

diff --git a/...r/crds/gpu.nvidia.com_computedomains.yaml → ...s/resource.nvidia.com_computedomains.yaml b/...r/crds/gpu.nvidia.com_computedomains.yaml → ...s/resource.nvidia.com_computedomains.yaml
@@ -4,17 +4,17 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.14.0
-  name: computedomains.gpu.nvidia.com
+  name: computedomains.resource.nvidia.com
 spec:
-  group: gpu.nvidia.com
+  group: resource.nvidia.com
   names:
     kind: ComputeDomain
     listKind: ComputeDomainList
     plural: computedomains
     singular: computedomain
   scope: Namespaced
   versions:
-  - name: v1alpha1
+  - name: v1beta1
     schema:
       openAPIV3Schema:
         description: ComputeDomain prepares a set of nodes to run a multi-node workload

diff --git a/deployments/helm/k8s-dra-imex-driver/templates/clusterrole.yaml b/deployments/helm/k8s-dra-imex-driver/templates/clusterrole.yaml
@@ -5,7 +5,7 @@ metadata:
   name: {{ include "k8s-dra-driver.fullname" . }}-role
   namespace: {{ include "k8s-dra-driver.namespace" . }}
 rules:
-- apiGroups: ["gpu.nvidia.com"]
+- apiGroups: ["resource.nvidia.com"]
   resources: ["computedomains"]
   verbs: ["get", "list", "watch", "create", "update", "patch", "delete"]
 - apiGroups: ["resource.k8s.io"]

diff --git a/pkg/flags/kubeclient.go b/pkg/flags/kubeclient.go
@@ -26,7 +26,7 @@ import (
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/clientcmd"
 
-	nvclientset "github.com/NVIDIA/k8s-dra-driver/pkg/nvidia.com/resource/clientset/versioned"
+	nvclientset "github.com/NVIDIA/k8s-dra-driver/pkg/nvidia.com/clientset/versioned"
 )
 
 type KubeClientConfig struct {