remove resource limit on ds

add lock for macvtapLister.deviceListLock

Author: hujun-open

config/daemonset/daemonset.yaml

@@ -46,9 +46,6 @@ spec:
           runAsGroup: 0    
           privileged: true 
         resources:
-          limits:
-            cpu: 500m
-            memory: 128Mi
           requests:
             cpu: 10m
             memory: 64Mi

go.mod

@@ -11,7 +11,6 @@ require (
 	github.com/onsi/gomega v1.38.3
 	github.com/safchain/ethtool v0.6.2
 	github.com/vishvananda/netlink v1.3.1
-	golang.org/x/net v0.48.0
 	golang.org/x/sys v0.39.0
 	k8s.io/apimachinery v0.35.0
 	k8s.io/client-go v0.35.0
@@ -85,6 +84,7 @@ require (
 	go.yaml.in/yaml/v3 v3.0.4 // indirect
 	golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
 	golang.org/x/mod v0.31.0 // indirect
+	golang.org/x/net v0.48.0 // indirect
 	golang.org/x/oauth2 v0.30.0 // indirect
 	golang.org/x/sync v0.19.0 // indirect
 	golang.org/x/term v0.38.0 // indirect

pkg/deviceplugin/lister.go

@@ -11,17 +11,18 @@ import (
 )
 
 type macvtapLister struct {
-	DeviceList map[string]*v1beta1.LAN //key is the res name in the LAN
-	// lock   *sync.RWMutex
-	// NetNsPath is the path to the network namespace the lister operates in.
+	DeviceList         map[string]*v1beta1.LAN //key is the res name in the LAN
+	deviceListLock     *sync.RWMutex
 	AddChan            chan v1beta1.AddRequest
 	RemovChan          chan *v1beta1.LAN
 	ExistingNSList     []string
-	ExistingNSListLock *sync.RWMutex
+	existingNSListLock *sync.RWMutex
 }
 
 func (ml *macvtapLister) getCurrentPlugins() dpm.PluginNameList {
 	r := make(dpm.PluginNameList, 0)
+	ml.deviceListLock.RLock()
+	defer ml.deviceListLock.RUnlock()
 	for name := range ml.DeviceList {
 		r = append(r, name)
 	}
@@ -33,7 +34,8 @@ func NewMacvtapLister(netNsPath string, add chan v1beta1.AddRequest, remove chan
 		AddChan:            add,
 		RemovChan:          remove,
 		DeviceList:         make(map[string]*v1beta1.LAN),
-		ExistingNSListLock: new(sync.RWMutex),
+		deviceListLock:     new(sync.RWMutex),
+		existingNSListLock: new(sync.RWMutex),
 	}
 }
 
@@ -55,22 +57,26 @@ func (ml *macvtapLister) Discover(pluginListCh chan dpm.PluginNameList) {
 
 			lan := req.NewLan
 			log.Info("got a new lan", "name", lan.Name)
-			ml.ExistingNSListLock.Lock()
+			ml.existingNSListLock.Lock()
 			ml.ExistingNSList = req.ExistingNSNames
-			ml.ExistingNSListLock.Unlock()
+			ml.existingNSListLock.Unlock()
+			ml.deviceListLock.Lock()
 			for _, spokeName := range lan.Spec.SpokeList {
 				ml.DeviceList[v1beta1.GetDPResouceName(lan.Name, spokeName, true)] = lan
 				ml.DeviceList[v1beta1.GetDPResouceName(lan.Name, spokeName, false)] = lan
 			}
+			ml.deviceListLock.Unlock()
 			ml.report(pluginListCh)
 			log.Info("report the new lan", "name", lan.Name)
 
 		case lan := <-ml.RemovChan:
 			log.Info("got a  lan to remove", "name", lan.Name)
+			ml.deviceListLock.Lock()
 			for _, spokeName := range lan.Spec.SpokeList {
 				delete(ml.DeviceList, v1beta1.GetDPResouceName(lan.Name, spokeName, true))
 				delete(ml.DeviceList, v1beta1.GetDPResouceName(lan.Name, spokeName, false))
 			}
+			ml.deviceListLock.Unlock()
 			ml.report(pluginListCh)
 			log.Info("report new dev list after removal", "name", lan.Name)
 
@@ -82,7 +88,9 @@ func (ml *macvtapLister) Discover(pluginListCh chan dpm.PluginNameList) {
 // also vlanName in k8slan case
 func (ml *macvtapLister) NewPlugin(name string) dpm.PluginInterface {
 	log := ctrl.Log.WithName("deviceplugin")
+	ml.deviceListLock.RLock()
 	lan, ok := ml.DeviceList[name]
+	ml.deviceListLock.RUnlock()
 	if !ok {
 		return nil
 	}

pkg/deviceplugin/plugin.go

@@ -1,6 +1,7 @@
 package deviceplugin
 
 import (
+	"context"
 	"fmt"
 	"os"
 	"slices"
@@ -9,7 +10,6 @@ import (
 
 	"github.com/hujun-open/k8slan/api/v1beta1"
 	"github.com/hujun-open/k8slan/pkg/interfaces"
-	"golang.org/x/net/context"
 	pluginapi "k8s.io/kubelet/pkg/apis/deviceplugin/v1beta1"
 	ctrl "sigs.k8s.io/controller-runtime"
 )
@@ -84,9 +84,9 @@ func (mdp *macvtapDevicePlugin) ListAndWatch(e *pluginapi.Empty, s pluginapi.Dev
 }
 
 func (mdp *macvtapDevicePlugin) clearUnused() error {
-	mdp.lister.ExistingNSListLock.RLock()
+	mdp.lister.existingNSListLock.RLock()
 	crNSList := slices.Clone(mdp.lister.ExistingNSList)
-	mdp.lister.ExistingNSListLock.RUnlock()
+	mdp.lister.existingNSListLock.RUnlock()
 	existList, err := interfaces.GetExistingNSPaths()
 	if err != nil {
 		return fmt.Errorf("failed to list existing NS path, %w", err)