DRA: Fix code format

Signed-off-by: cyclinder <[email protected]>
spidernet-io · Mar 28, 2024 · d75b9c1 · d75b9c1
1 parent 7ac5d1e
commit d75b9c1
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 7 deletions.
diff --git a/.github/codespell-ignorewords b/.github/codespell-ignorewords
@@ -5,3 +5,4 @@ cyclinder
 shouldnot
 Requestor
 passt
+ro
diff --git a/charts/spiderpool/README.md b/charts/spiderpool/README.md
@@ -210,6 +210,14 @@ helm install spiderpool spiderpool/spiderpool --wait --namespace kube-system \
 | `multus.multusCNI.log.logLevel`               | the multus-CNI daemonset pod log level                                                                                                                                                                                                                                                                                                                                                           | `debug`                           |
 | `multus.multusCNI.log.logFile`                | the multus-CNI daemonset pod log file                                                                                                                                                                                                                                                                                                                                                            | `/var/log/multus.log`             |
 
+### dra parameters
+
+| Name              | Description           | Value          |
+| ----------------- | --------------------- | -------------- |
+| `dra.enabled`     | to enable dra feature | `false`        |
+| `dra.cdiRoot`     | the dir of cdi root   | `/var/run/cdi` |
+| `dra.libraryPath` |                       | `""`           |
+
 ### plugins parameters
 
 | Name                             | Description                                                | Value                                        |

diff --git a/pkg/dra/dra-controller/controller.go b/pkg/dra/dra-controller/controller.go
@@ -1,3 +1,6 @@
+// Copyright 2024 Authors of spidernet-io
+// SPDX-License-Identifier: Apache-2.0
+
 package draController
 
 import (

diff --git a/pkg/dra/dra-controller/driver.go b/pkg/dra/dra-controller/driver.go
@@ -1,3 +1,6 @@
+// Copyright 2024 Authors of spidernet-io
+// SPDX-License-Identifier: Apache-2.0
+
 package draController
 
 import (
@@ -27,7 +30,7 @@ func (d driver) GetClassParameters(ctx context.Context, class *resourcev1alpha2.
 
 func (d driver) GetClaimParameters(ctx context.Context, claim *resourcev1alpha2.ResourceClaim, class *resourcev1alpha2.ResourceClass, classParameters interface{}) (interface{}, error) {
 	if claim.Spec.ParametersRef == nil {
-		// TODO: we can
+		// TODO(@cyclinder): we can give it a default ClaimParameterSpec?
 		return &v2beta1.ClaimParameterSpec{}, nil
 	}
 

diff --git a/pkg/dra/dra-plugin/cdi.go b/pkg/dra/dra-plugin/cdi.go
@@ -1,3 +1,6 @@
+// Copyright 2024 Authors of spidernet-io
+// SPDX-License-Identifier: Apache-2.0
+
 package draPlugin
 
 import (
@@ -80,7 +83,7 @@ func (cdi *CDIHandler) GetClaimDevices(claimUID string) []string {
 
 func (cdi *CDIHandler) CreateClaimSpecFile(claimUID string, scp *v2beta1.SpiderClaimParameter) error {
 	cdiSpec := cdispec.Spec{
-		// TODO(@cyclinder): should be make it to configureable?
+		// TODO(@cyclinder): should be make it to configurable?
 		Version: cdiapi.CurrentVersion,
 		Kind:    cdi.cdiKind(),
 		Devices: []cdispec.Device{{
@@ -118,6 +121,7 @@ func (cdi *CDIHandler) DeleteClaimSpecFile(claimUID string) error {
 	return cdi.registry.SpecDB().RemoveSpec(specName + ".yaml")
 }
 
+// nolint: all
 func (cdi *CDIHandler) getContaineEdits(claim string, rdma bool) cdispec.ContainerEdits {
 	soName := path.Base(cdi.so)
 	ce := cdispec.ContainerEdits{

diff --git a/pkg/dra/dra-plugin/device_state.go b/pkg/dra/dra-plugin/device_state.go
@@ -1,18 +1,21 @@
+// Copyright 2024 Authors of spidernet-io
+// SPDX-License-Identifier: Apache-2.0
+
 package draPlugin
 
 import (
 	"context"
 	"fmt"
 	"os"
-	"sync"
 
 	"github.com/spidernet-io/spiderpool/pkg/constant"
 	v2beta1 "github.com/spidernet-io/spiderpool/pkg/k8s/apis/spiderpool.spidernet.io/v2beta1"
+	"github.com/spidernet-io/spiderpool/pkg/lock"
 	"go.uber.org/zap"
 )
 
 type NodeDeviceState struct {
-	sync.Mutex
+	lock.RWMutex
 	cdi            *CDIHandler
 	preparedClaims map[string]struct{}
 }
@@ -63,7 +66,8 @@ func (nds *NodeDeviceState) UnPrepare(ctx context.Context, claimUID string) erro
 	nds.Lock()
 	defer nds.Unlock()
 
-	if _, ok := nds.preparedClaims[claimUID]; ok {
+	_, ok := nds.preparedClaims[claimUID]
+	if ok {
 		delete(nds.preparedClaims, claimUID)
 	}
 

diff --git a/pkg/dra/dra-plugin/driver.go b/pkg/dra/dra-plugin/driver.go
@@ -1,11 +1,13 @@
+// Copyright 2024 Authors of spidernet-io
+// SPDX-License-Identifier: Apache-2.0
 package draPlugin
 
 import (
 	"context"
 	"fmt"
-	"sync"
 
 	clientset "github.com/spidernet-io/spiderpool/pkg/k8s/client/clientset/versioned"
+	"github.com/spidernet-io/spiderpool/pkg/lock"
 	"go.uber.org/zap"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes"
@@ -15,7 +17,7 @@ import (
 )
 
 type driver struct {
-	sync.Mutex
+	lock.RWMutex
 	logger          *zap.Logger
 	State           *NodeDeviceState
 	K8sClientSet    kubernetes.Interface

diff --git a/pkg/dra/dra-plugin/plugin.go b/pkg/dra/dra-plugin/plugin.go
@@ -1,3 +1,5 @@
+// Copyright 2024 Authors of spidernet-io
+// SPDX-License-Identifier: Apache-2.0
 package draPlugin
 
 import (
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,3 +5,4 @@ cyclinder @@
     shouldnot
     Requestor
     passt
+    ro