OpenShiftP-281: cleanup for bad version management

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

Author: prb112

Makefile

@@ -7,7 +7,16 @@ TAG ?= v0.1.0
 
 CONTAINER_RUNTIME ?= $(shell command -v podman 2> /dev/null || echo docker)
 
-include $(CURDIR)/versions.mk
+GOLANG_VERSION ?= 1.23.1
+
+DRIVER_NAME := power-dra-driver
+MODULE := github.com/IBM/$(DRIVER_NAME)
+
+REGISTRY ?= quay.io/powercloud/power-dra-driver
+
+VERSION ?= v0.1.0
+
+GIT_COMMIT ?= $(shell git describe --match="" --dirty --long --always --abbrev=40 2> /dev/null || echo "")
 
 ########################################################################
 # Go Targets

README.md

@@ -1,24 +1,28 @@
 # Power Dynamic Resource Allocation Driver
-This repository contains a Power Architecture resource driver for use with the Dynamic Resource Allocation (DRA) feature of Kubernetes.
+
+This repository contains a Power Architecture resource driver for use with the *Dynamic Resource Allocation (DRA)* feature of Kubernetes.
 
 The driver facilitates access to:
-1. Nest Accelerator unit (NX) are non-core components of the POWER processor chip including compression and encryption co-processors. One feature is nx-gzip, which is a DEFLATE compliant (RFC1950, 1951, 1952) compression accelerator in NX. This feature is a device driver in userspace `/dev/crypto/nx-gzip` which is shared among many LPARs and many containers. 
 
-As additional features are made available, the driver will be expanded.
+1. *Nest Accelerator unit (NX) compression and decompression co-processors*: NX is a non-core part of the Power processor, which provides a DEFLATE compliant (RFC1950, 1951, 1952) compression accelerator. This feature has a device driver in userspace `/dev/crypto/nx-gzip` which is shared among logical-partitions on the same systems, and by proxy containers in the logical partition. 
+
+As additional features are made available, the driver is to be expanded.
 
-This project is licensed under the Apache 2.0 License.
+This project is based on [dra-example-driver](https://github.com/kubernetes-sigs/dra-example-driver). This project is licensed under the Apache 2.0 License.
 
 ## Pre-Requisites
 
-This feature uses DynamicResourceAllocation. To setup, go into the Cluster UI, `Administration` -> `CustomResourceDefinitions` -> `FeatureGate` -> `Instances` -> `cluster` add `spec.featureSet: TechPreviewNoUpgrade`
+On an OpenShift Container Platform cluster, one must enable the `DynamicResourceAllocation` `FeatureGate`. To setup, go into the Cluster UI, `Administration` -> `CustomResourceDefinitions` -> `FeatureGate` -> `Instances` -> `cluster` add `spec.featureSet: TechPreviewNoUpgrade`
 
-You must have Power10+ nodes to take advantage of the power-dra-driver. It will not allocate nx-gzip access if you are not on a Power10, or if the nx-gzip is some how disabled on the Operating System.
+You must have Power10 or higher logical partitions that are part of your cluster. It will not allocate `/dev/crypto/nx-gzip` access. The system must have licensed the Power system feature `active_mem_expansion_capable`.
 
 You should also be using an OpenShift Container Platform 4.19+.
 
 ## Install
 
-```
+To install the code, use:
+
+``` shell
 helm upgrade \
   --create-namespace \
   --namespace power-dra-driver \
@@ -28,7 +32,9 @@ helm upgrade \
 
 ## Uninstall
 
-```
+To uninstall the code, use:
+
+``` shell
 helm uninstall power-dra-driver -n power-dra-driver
 ```
 
@@ -39,21 +45,24 @@ preferred because it can be easily scanned.
 
 If you would like to see the detailed LICENSE click [here](LICENSE).
 
-```text
+``` text
 /*
  * Copyright 2025 - IBM Corporation. All rights reserved
  * SPDX-License-Identifier: Apache-2.0
  */
 ```
 
 ## References
+
 1. [Kubernetes: Dynamic Resource Allocation](https://kubernetes.io/docs/concepts/scheduling-eviction/dynamic-resource-allocation/)
 2. [Kubernetes: Dynamic Resource Allocation example](https://github.com/kubernetes-sigs/dra-example-driver/blob/main/README.md)
 3. [OpenShift Feature Gate: DynamicResourceAllocation](https://docs.openshift.com/container-platform/4.17/nodes/clusters/nodes-cluster-enabling-features.html)
+
 > Enables a new API for requesting and sharing resources between pods and containers. This is an internal feature that most users do not need to interact with. (DynamicResourceAllocation)
+
 OpenShift Docs are specific to a use-case
 
-This code repository is based on [kubernetes-sigs/dra-example-driver](https://github.com/kubernetes-sigs/dra-example-driver) and extends apis used in the example driver.
+This code repository is based on [kubernetes-sigs/dra-example-driver](https://github.com/kubernetes-sigs/dra-example-driver) and extends APIs used in the example driver.
 
 # Support
 

cmd/power-dra-kubeletplugin/cdi.go

@@ -1,17 +1,6 @@
 /*
- * Copyright 2023 The Kubernetes Authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright 2025 - IBM Corporation. All rights reserved
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 package main

cmd/power-dra-kubeletplugin/checkpoint.go

@@ -1,3 +1,8 @@
+/*
+ * Copyright 2025 - IBM Corporation. All rights reserved
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 package main
 
 import (

cmd/power-dra-kubeletplugin/discovery.go

@@ -1,17 +1,6 @@
 /*
- * Copyright 2023 The Kubernetes Authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright 2025 - IBM Corporation. All rights reserved
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 package main

cmd/power-dra-kubeletplugin/driver.go

@@ -8,19 +8,19 @@ package main
 import (
 	"context"
 	"fmt"
+	"maps"
 
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	resourceapi "k8s.io/api/resource/v1beta1"
+	"k8s.io/apimachinery/pkg/types"
 	coreclientset "k8s.io/client-go/kubernetes"
 	"k8s.io/dynamic-resource-allocation/kubeletplugin"
+	"k8s.io/dynamic-resource-allocation/resourceslice"
 	"k8s.io/klog/v2"
-	drapbv1 "k8s.io/kubelet/pkg/apis/dra/v1beta1"
 )
 
-var _ drapbv1.DRAPluginServer = &driver{}
-
 type driver struct {
 	client coreclientset.Interface
-	plugin kubeletplugin.DRAPlugin
+	helper *kubeletplugin.Helper
 	state  *DeviceState
 }
 
@@ -35,87 +35,94 @@ func NewDriver(ctx context.Context, config *Config) (*driver, error) {
 	}
 	driver.state = state
 
-	plugin, err := kubeletplugin.Start(
+	helper, err := kubeletplugin.Start(
 		ctx,
-		[]any{driver},
+		driver,
 		kubeletplugin.KubeClient(config.coreclient),
 		kubeletplugin.NodeName(config.flags.nodeName),
 		kubeletplugin.DriverName(DriverName),
-		kubeletplugin.RegistrarSocketPath(PluginRegistrationPath),
-		kubeletplugin.PluginSocketPath(DriverPluginSocketPath),
-		kubeletplugin.KubeletPluginSocketPath(DriverPluginSocketPath))
+		kubeletplugin.RegistrarDirectoryPath(PluginRegistrationPath),
+		kubeletplugin.PluginDataDirectoryPath(DriverPluginSocketPath))
 	if err != nil {
 		return nil, err
 	}
-	driver.plugin = plugin
+	driver.helper = helper
 
-	var resources kubeletplugin.Resources
-	for _, device := range state.allocatable {
-		resources.Devices = append(resources.Devices, device)
+	devices := make([]resourceapi.Device, 0, len(state.allocatable))
+	for device := range maps.Values(state.allocatable) {
+		devices = append(devices, device)
+	}
+	resources := resourceslice.DriverResources{
+		Pools: map[string]resourceslice.Pool{
+			config.flags.nodeName: {
+				Slices: []resourceslice.Slice{
+					{
+						Devices: devices,
+					},
+				},
+			},
+		},
 	}
 
-	if err := plugin.PublishResources(ctx, resources); err != nil {
+	if err := helper.PublishResources(ctx, resources); err != nil {
 		return nil, err
 	}
 
 	return driver, nil
 }
 
 func (d *driver) Shutdown(ctx context.Context) error {
-	d.plugin.Stop()
+	d.helper.Stop()
 	return nil
 }
 
-func (d *driver) NodePrepareResources(ctx context.Context, req *drapbv1.NodePrepareResourcesRequest) (*drapbv1.NodePrepareResourcesResponse, error) {
-	klog.Infof("NodePrepareResource is called: number of claims: %d", len(req.Claims))
-	preparedResources := &drapbv1.NodePrepareResourcesResponse{Claims: map[string]*drapbv1.NodePrepareResourceResponse{}}
+func (d *driver) PrepareResourceClaims(ctx context.Context, claims []*resourceapi.ResourceClaim) (map[types.UID]kubeletplugin.PrepareResult, error) {
+	klog.Infof("PrepareResourceClaims is called: number of claims: %d", len(claims))
+	result := make(map[types.UID]kubeletplugin.PrepareResult)
 
-	for _, claim := range req.Claims {
-		preparedResources.Claims[claim.UID] = d.nodePrepareResource(ctx, claim)
+	for _, claim := range claims {
+		result[claim.UID] = d.prepareResourceClaim(ctx, claim)
 	}
 
-	return preparedResources, nil
+	return result, nil
 }
 
-func (d *driver) nodePrepareResource(ctx context.Context, claim *drapbv1.Claim) *drapbv1.NodePrepareResourceResponse {
-	resourceClaim, err := d.client.ResourceV1beta1().ResourceClaims(claim.Namespace).Get(
-		ctx,
-		claim.Name,
-		metav1.GetOptions{})
+func (d *driver) prepareResourceClaim(_ context.Context, claim *resourceapi.ResourceClaim) kubeletplugin.PrepareResult {
+	preparedPBs, err := d.state.Prepare(claim)
 	if err != nil {
-		return &drapbv1.NodePrepareResourceResponse{
-			Error: fmt.Sprintf("failed to fetch ResourceClaim %s in namespace %s", claim.Name, claim.Namespace),
+		return kubeletplugin.PrepareResult{
+			Err: fmt.Errorf("error preparing devices for claim %v: %w", claim.UID, err),
 		}
 	}
-
-	prepared, err := d.state.Prepare(resourceClaim)
-	if err != nil {
-		return &drapbv1.NodePrepareResourceResponse{
-			Error: fmt.Sprintf("error preparing devices for claim %v: %v", claim.UID, err),
-		}
+	var prepared []kubeletplugin.Device
+	for _, preparedPB := range preparedPBs {
+		prepared = append(prepared, kubeletplugin.Device{
+			Requests:     preparedPB.GetRequestNames(),
+			PoolName:     preparedPB.GetPoolName(),
+			DeviceName:   preparedPB.GetDeviceName(),
+			CDIDeviceIDs: preparedPB.GetCDIDeviceIDs(),
+		})
 	}
 
 	klog.Infof("Returning newly prepared devices for claim '%v': %v", claim.UID, prepared)
-	return &drapbv1.NodePrepareResourceResponse{Devices: prepared}
+	return kubeletplugin.PrepareResult{Devices: prepared}
 }
 
-func (d *driver) NodeUnprepareResources(ctx context.Context, req *drapbv1.NodeUnprepareResourcesRequest) (*drapbv1.NodeUnprepareResourcesResponse, error) {
-	klog.Infof("NodeUnPrepareResource is called: number of claims: %d", len(req.Claims))
-	unpreparedResources := &drapbv1.NodeUnprepareResourcesResponse{Claims: map[string]*drapbv1.NodeUnprepareResourceResponse{}}
+func (d *driver) UnprepareResourceClaims(ctx context.Context, claims []kubeletplugin.NamespacedObject) (map[types.UID]error, error) {
+	klog.Infof("UnprepareResourceClaims is called: number of claims: %d", len(claims))
+	result := make(map[types.UID]error)
 
-	for _, claim := range req.Claims {
-		unpreparedResources.Claims[claim.UID] = d.nodeUnprepareResource(ctx, claim)
+	for _, claim := range claims {
+		result[claim.UID] = d.unprepareResourceClaim(ctx, claim)
 	}
 
-	return unpreparedResources, nil
+	return result, nil
 }
 
-func (d *driver) nodeUnprepareResource(ctx context.Context, claim *drapbv1.Claim) *drapbv1.NodeUnprepareResourceResponse {
-	if err := d.state.Unprepare(claim.UID); err != nil {
-		return &drapbv1.NodeUnprepareResourceResponse{
-			Error: fmt.Sprintf("error unpreparing devices for claim %v: %v", claim.UID, err),
-		}
+func (d *driver) unprepareResourceClaim(_ context.Context, claim kubeletplugin.NamespacedObject) error {
+	if err := d.state.Unprepare(string(claim.UID)); err != nil {
+		return fmt.Errorf("error unpreparing devices for claim %v: %w", claim.UID, err)
 	}
 
-	return &drapbv1.NodeUnprepareResourceResponse{}
+	return nil
 }

cmd/power-dra-kubeletplugin/main.go

@@ -1,18 +1,7 @@
 /*
-Copyright 2025.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
+ * Copyright 2025 - IBM Corporation. All rights reserved
+ * SPDX-License-Identifier: Apache-2.0
+ */
 
 package main
 
@@ -80,10 +69,11 @@ func newApp() *cli.App {
 			Destination: &flags.cdiRoot,
 			EnvVars:     []string{"CDI_ROOT"},
 		},
+		// TODO: The default number of devices from the ConfigMap
 		&cli.IntFlag{
 			Name:        "num-devices",
 			Usage:       "The number of devices to be generated.",
-			Value:       8,
+			Value:       1000,
 			Destination: &flags.numDevices,
 			EnvVars:     []string{"NUM_DEVICES"},
 		},

cmd/power-dra-kubeletplugin/state.go

@@ -1,17 +1,6 @@
 /*
- * Copyright 2023 The Kubernetes Authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright 2025 - IBM Corporation. All rights reserved
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 package main

pkg/flags/kubeclient.go

@@ -1,17 +1,6 @@
 /*
- * Copyright 2023 The Kubernetes Authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright 2025 - IBM Corporation. All rights reserved
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 package flags

pkg/flags/logging.go

@@ -1,17 +1,6 @@
 /*
- * Copyright 2023 The Kubernetes Authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright 2025 - IBM Corporation. All rights reserved
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 package flags