support exposing eris for unmatched instance

Signed-off-by: linhaiwei.lhw <[email protected]>

Author: honghai120135

deploy/helm/values.yaml

@@ -25,9 +25,12 @@ agent:
     tag: "latest"
   preferDriver: ""
   allocateAllDevices: false
-  # format: <instance_id> <eri-0>/<eri-1>/...
+  # format: 
+  # expose specific eris for matched node: - <instance_id> <eri-0>/<eri-1>/... 
+  # expose specific eris for unmatched node: - i-* <eri-0>/<eri-1>/...
+  # expose all eris for unmatched node: - i-* erdma_*
   exposedLocalERIs:
-    - i-xxx erdma_0/erdma_1
+    - i-XXX erdma_0/erdma_1
   imagePullSecrets: []
   nameOverride: ""
   fullnameOverride: ""

internal/drivers/utils_linux.go

@@ -22,24 +22,38 @@ import (
 )
 
 func checkExpose(instanceID string, exposedLocalERIs []string, rdmaDevice string) (bool, error) {
+	var unMatchExposeERIs []string
+	isMatched := false
 	if len(exposedLocalERIs) == 1 && exposedLocalERIs[0] == "" {
 		return true, nil
 	}
-	pattern := `^i-\w+\s+(\w+(?:/\w+)*)$`
+	pattern := `^(i-(?:\w+|\*))\s+((?:(?:\w+)(?:\/\w+)*))$`
 	re := regexp.MustCompile(pattern)
 	for _, exposeInfo := range exposedLocalERIs {
 		if !re.MatchString(exposeInfo) {
-			return false, fmt.Errorf("invalid format %s. Expected format: \"instanceID: interface1 interface2 ...\"", exposeInfo)
+			return false, fmt.Errorf("invalid format %s", exposeInfo)
 		}
 		id := strings.SplitN(exposeInfo, " ", 2)[0]
 		if instanceID == id {
+			isMatched = true
 			exposeERIs := strings.Split(strings.TrimSpace(strings.SplitN(exposeInfo, " ", 2)[1]), "/")
 			for _, dev := range exposeERIs {
 				if dev == rdmaDevice {
 					return true, nil
 				}
 			}
 		}
+		if id == "i-*" {
+			unMatchExposeERIs = strings.Split(strings.TrimSpace(strings.SplitN(exposeInfo, " ", 2)[1]), "/")
+		}
+	}
+	if !isMatched {
+		driverLog.Info("no matched instanceID found, using unMatchExposeERIs", "instanceID", instanceID)
+		for _, dev := range unMatchExposeERIs {
+			if dev == "erdma_*" || dev == rdmaDevice {
+				return true, nil
+			}
+		}
 	}
 	return false, nil
 }

internal/types/config.go

@@ -12,7 +12,6 @@ type Config struct {
 	SMCInitImage              string            `json:"smcInitImage"`
 	EnableInitContainerInject *bool             `json:"enableInitContainerInject"`
 	NodeSelector              map[string]string `json:"nodeSelector"`
-	LocalERIDiscovery         bool              `json:"localERIDiscovery"`
 }
 
 type Sensitive string