refactor: change device to nx.device.power.ibm.com

Signed-off-by: Paul Bastide <[email protected]>

Author: prb112

api/powervs-openshift-ipi.cis.ibm.net/resource/gpu/v1alpha1/api.go renamed to api/nx.device.power.ibm.com/resource/nx/v1alpha1/api.go

@@ -24,9 +24,9 @@ import (
 )
 
 const (
-	GroupName     = "gpu.powervs-openshift-ipi.cis.ibm.net"
-	Version       = "v1alpha1"
-	GpuConfigKind = "GpuConfig"
+	GroupName    = "device.power.ibm.com"
+	Version      = "v1alpha1"
+	NxConfigKind = "NxConfig"
 )
 
 // Decoder implements a decoder for objects in this API group.
@@ -43,7 +43,7 @@ func init() {
 		Version: Version,
 	}
 	scheme.AddKnownTypes(schemeGroupVersion,
-		&GpuConfig{},
+		&NxConfig{},
 	)
 	metav1.AddToGroupVersion(scheme, schemeGroupVersion)
 

api/powervs-openshift-ipi.cis.ibm.net/resource/gpu/v1alpha1/doc.go renamed to api/nx.device.power.ibm.com/resource/nx/v1alpha1/doc.go

@@ -15,6 +15,6 @@ limitations under the License.
 */
 
 // +k8s:deepcopy-gen=packages
-// +groupName=gpu.powervs-openshift-ipi.cis.ibm.net
+// +groupName=nx.device.power.ibm.com
 
 package v1alpha1

api/powervs-openshift-ipi.cis.ibm.net/resource/gpu/v1alpha1/gpuconfig.go renamed to api/nx.device.power.ibm.com/resource/nx/v1alpha1/nxconfig.go

@@ -25,20 +25,20 @@ import (
 // +genclient
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 
-// GpuConfig holds the set of parameters for configuring a GPU.
-type GpuConfig struct {
+// NxConfig holds the set of parameters for configuring a Nest Accelerator.
+type NxConfig struct {
 	metav1.TypeMeta `json:",inline"`
-	Sharing         *GpuSharing `json:"sharing,omitempty"`
+	Sharing         *NxSharing `json:"sharing,omitempty"`
 }
 
-// DefaultGpuConfig provides the default GPU configuration.
-func DefaultGpuConfig() *GpuConfig {
-	return &GpuConfig{
+// DefaultNxConfig provides the default NX configuration.
+func DefaultNxConfig() *NxConfig {
+	return &NxConfig{
 		TypeMeta: metav1.TypeMeta{
 			APIVersion: GroupName + "/" + Version,
-			Kind:       GpuConfigKind,
+			Kind:       NxConfigKind,
 		},
-		Sharing: &GpuSharing{
+		Sharing: &NxSharing{
 			Strategy: TimeSlicingStrategy,
 			TimeSlicingConfig: &TimeSlicingConfig{
 				Interval: "Default",
@@ -47,13 +47,13 @@ func DefaultGpuConfig() *GpuConfig {
 	}
 }
 
-// Normalize updates a GpuConfig config with implied default values based on other settings.
-func (c *GpuConfig) Normalize() error {
+// Normalize updates a NxConfig config with implied default values based on other settings.
+func (c *NxConfig) Normalize() error {
 	if c == nil {
 		return fmt.Errorf("config is 'nil'")
 	}
 	if c.Sharing == nil {
-		c.Sharing = &GpuSharing{
+		c.Sharing = &NxSharing{
 			Strategy: TimeSlicingStrategy,
 		}
 	}

api/powervs-openshift-ipi.cis.ibm.net/resource/gpu/v1alpha1/sharing.go renamed to api/nx.device.power.ibm.com/resource/nx/v1alpha1/sharing.go

@@ -22,8 +22,8 @@ import (
 
 // These constants represent the different Sharing strategies.
 const (
-	TimeSlicingStrategy       GpuSharingStrategy = "TimeSlicing"
-	SpacePartitioningStrategy GpuSharingStrategy = "SpacePartitioning"
+	TimeSlicingStrategy       NxSharingStrategy = "TimeSlicing"
+	SpacePartitioningStrategy NxSharingStrategy = "SpacePartitioning"
 )
 
 // These constants represent the different TimeSlicing configurations.
@@ -34,17 +34,17 @@ const (
 	LongTimeSlice    TimeSliceInterval = "Long"
 )
 
-// GpuSharingStrategy defines the valid Sharing strategies as a string.
-type GpuSharingStrategy string
+// NxSharingStrategy defines the valid Sharing strategies as a string.
+type NxSharingStrategy string
 
 // TimeSliceInterval defines the valid timeslice interval as a string.
 type TimeSliceInterval string
 
-// GpuSharing holds the current sharing strategy for GPUs and its settings.
+// NxSharing holds the current sharing strategy for Nxs and its settings.
 // If DeviceClass and ResourceClaim set this, then the strategy from the claim
 // is used. If multiple configurations set this, then the last one is used.
-type GpuSharing struct {
-	Strategy                GpuSharingStrategy       `json:"strategy"`
+type NxSharing struct {
+	Strategy                NxSharingStrategy        `json:"strategy"`
 	TimeSlicingConfig       *TimeSlicingConfig       `json:"timeSlicingConfig,omitempty"`
 	SpacePartitioningConfig *SpacePartitioningConfig `json:"spacePartitioningConfig,omitempty"`
 }
@@ -57,29 +57,29 @@ type TimeSlicingConfig struct {
 // SpacePartitioningConfig provides the configuring for the SpacePartitioning strategy.
 type SpacePartitioningConfig struct {
 	// SliceCount indicates how many equally sized (memory and compute) slices
-	// the GPU should be divided into. Each client that attaches will get
+	// the Nx should be divided into. Each client that attaches will get
 	// access to exactly one of these slices.
 	PartitionCount int `json:"partitionCount,omitempty"`
 }
 
 // IsTimeSlicing checks if the TimeSlicing strategy is applied.
-func (s *GpuSharing) IsTimeSlicing() bool {
+func (s *NxSharing) IsTimeSlicing() bool {
 	if s == nil {
 		return false
 	}
 	return s.Strategy == TimeSlicingStrategy
 }
 
 // IsSpacePartitioning checks if the SpacePartitioning strategy is applied.
-func (s *GpuSharing) IsSpacePartitioning() bool {
+func (s *NxSharing) IsSpacePartitioning() bool {
 	if s == nil {
 		return false
 	}
 	return s.Strategy == SpacePartitioningStrategy
 }
 
 // GetTimeSlicingConfig returns the timeslicing config that applies to the given strategy.
-func (s *GpuSharing) GetTimeSlicingConfig() (*TimeSlicingConfig, error) {
+func (s *NxSharing) GetTimeSlicingConfig() (*TimeSlicingConfig, error) {
 	if s == nil {
 		return nil, fmt.Errorf("no sharing set to get config from")
 	}
@@ -93,7 +93,7 @@ func (s *GpuSharing) GetTimeSlicingConfig() (*TimeSlicingConfig, error) {
 }
 
 // GetSpacePartitioningConfig returns the SpacePartitioning config that applies to the given strategy.
-func (s *GpuSharing) GetSpacePartitioningConfig() (*SpacePartitioningConfig, error) {
+func (s *NxSharing) GetSpacePartitioningConfig() (*SpacePartitioningConfig, error) {
 	if s == nil {
 		return nil, fmt.Errorf("no sharing set to get config from")
 	}

api/powervs-openshift-ipi.cis.ibm.net/resource/gpu/v1alpha1/validate.go renamed to api/nx.device.power.ibm.com/resource/nx/v1alpha1/validate.go

@@ -20,13 +20,13 @@ import (
 	"fmt"
 )
 
-// Validate ensures that GpuSharingStrategy has a valid set of values.
-func (s GpuSharingStrategy) Validate() error {
+// Validate ensures that NxSharingStrategy has a valid set of values.
+func (s NxSharingStrategy) Validate() error {
 	switch s {
 	case TimeSlicingStrategy, SpacePartitioningStrategy:
 		return nil
 	}
-	return fmt.Errorf("unknown GPU sharing strategy: %v", s)
+	return fmt.Errorf("unknown Nx sharing strategy: %v", s)
 }
 
 // Validate ensures that TimeSliceInterval has a valid set of values.
@@ -51,8 +51,8 @@ func (c *SpacePartitioningConfig) Validate() error {
 	return nil
 }
 
-// Validate ensures that GpuSharing has a valid set of values.
-func (s *GpuSharing) Validate() error {
+// Validate ensures that NxSharing has a valid set of values.
+func (s *NxSharing) Validate() error {
 	if err := s.Strategy.Validate(); err != nil {
 		return err
 	}
@@ -62,11 +62,11 @@ func (s *GpuSharing) Validate() error {
 	case s.IsSpacePartitioning():
 		return s.SpacePartitioningConfig.Validate()
 	}
-	return fmt.Errorf("invalid GPU sharing settings: %v", s)
+	return fmt.Errorf("invalid Nx sharing settings: %v", s)
 }
 
-// Validate ensures that GpuConfig has a valid set of values.
-func (c *GpuConfig) Validate() error {
+// Validate ensures that NxConfig has a valid set of values.
+func (c *NxConfig) Validate() error {
 	if c.Sharing == nil {
 		return fmt.Errorf("no sharing strategy set")
 	}

api/powervs-openshift-ipi.cis.ibm.net/resource/gpu/v1alpha1/zz_generated.deepcopy.go renamed to api/nx.device.power.ibm.com/resource/nx/v1alpha1/zz_generated.deepcopy.go

@@ -27,7 +27,7 @@ import (
 
 const (
 	cdiVendor = "k8s." + DriverName
-	cdiClass  = "gpu"
+	cdiClass  = "nx"
 	cdiKind   = cdiVendor + "/" + cdiClass
 
 	cdiCommonDeviceName = "common"
@@ -93,7 +93,7 @@ func (cdi *CDIHandler) CreateClaimSpecFile(claimUID string, devices PreparedDevi
 		claimEdits := cdiapi.ContainerEdits{
 			ContainerEdits: &cdispec.ContainerEdits{
 				Env: []string{
-					fmt.Sprintf("GPU_DEVICE_%s_RESOURCE_CLAIM=%s", device.DeviceName[4:], claimUID),
+					fmt.Sprintf("Nx_DEVICE_%s_RESOURCE_CLAIM=%s", device.DeviceName[4:], claimUID),
 				},
 			},
 		}

cmd/power-dra-kubeletplugin/cdi.go

@@ -28,14 +28,14 @@ import (
 	"github.com/google/uuid"
 )
 
-func enumerateAllPossibleDevices(numGPUs int) (AllocatableDevices, error) {
+func enumerateAllPossibleDevices(numNx int) (AllocatableDevices, error) {
 	seed := os.Getenv("NODE_NAME")
-	uuids := generateUUIDs(seed, numGPUs)
+	uuids := generateUUIDs(seed, numNx)
 
 	alldevices := make(AllocatableDevices)
 	for i, uuid := range uuids {
 		device := resourceapi.Device{
-			Name: fmt.Sprintf("gpu-%d", i),
+			Name: fmt.Sprintf("nx-%d", i),
 			Basic: &resourceapi.BasicDevice{
 				Attributes: map[resourceapi.QualifiedName]resourceapi.DeviceAttribute{
 					"index": {
@@ -45,7 +45,7 @@ func enumerateAllPossibleDevices(numGPUs int) (AllocatableDevices, error) {
 						StringValue: ptr.To(uuid),
 					},
 					"model": {
-						StringValue: ptr.To("LATEST-GPU-MODEL"),
+						StringValue: ptr.To("LATEST-NX-MODEL"),
 					},
 					"driverVersion": {
 						VersionValue: ptr.To("0.1.0"),
@@ -71,7 +71,7 @@ func generateUUIDs(seed string, count int) []string {
 		charset := make([]byte, 16)
 		rand.Read(charset)
 		uuid, _ := uuid.FromBytes(charset)
-		uuids[i] = "gpu-" + uuid.String()
+		uuids[i] = "nx-" + uuid.String()
 	}
 
 	return uuids

cmd/power-dra-kubeletplugin/discovery.go

@@ -32,7 +32,7 @@ import (
 )
 
 const (
-	DriverName = "gpu.powervs-openshift-ipi.cis.ibm.net"
+	DriverName = "nx.device.power.ibm.com"
 
 	PluginRegistrationPath     = "/var/lib/kubelet/plugins/" + DriverName + ".sock"
 	DriverPluginPath           = "/var/lib/kubelet/plugins/" + DriverName