Merge pull request #638 from l1b0k/fix/set_sysctl_err

cni: ignore link if not present
AliyunContainerService · May 29, 2024 · b099995 · b099995
2 parents 879ee02 + aab435d
commit b099995
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/plugin/driver/utils/utils_linux.go b/plugin/driver/utils/utils_linux.go
@@ -4,6 +4,7 @@ import (
 	"errors"
 	"fmt"
 	"net"
+	"os"
 
 	terwayIP "github.com/AliyunContainerService/terway/pkg/ip"
 	terwaySysctl "github.com/AliyunContainerService/terway/pkg/sysctl"
@@ -354,15 +355,19 @@ func EnsureNetConfSet(ipv4, ipv6 bool) error {
 			for _, cfg := range ipv4NetConfig {
 				innerErr := terwaySysctl.EnsureConf(fmt.Sprintf(cfg[0], link.Attrs().Name), cfg[1])
 				if innerErr != nil {
-					err = fmt.Errorf("%v, %w", err, innerErr)
+					if !os.IsNotExist(innerErr) {
+						err = fmt.Errorf("%v, %w", err, innerErr)
+					}
 				}
 			}
 		}
 		if ipv6 {
 			for _, cfg := range ipv6NetConfig {
 				innerErr := terwaySysctl.EnsureConf(fmt.Sprintf(cfg[0], link.Attrs().Name), cfg[1])
 				if innerErr != nil {
-					err = fmt.Errorf("%v, %w", err, innerErr)
+					if !os.IsNotExist(innerErr) {
+						err = fmt.Errorf("%v, %w", err, innerErr)
+					}
 				}
 			}
 		}