Skip to content

Commit 5fd541d

Browse files
committed
cni: ignore link if not present
Signed-off-by: l1b0k <[email protected]>
1 parent 48f7f1e commit 5fd541d

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

plugin/driver/utils/utils_linux.go

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import (
44
"errors"
55
"fmt"
66
"net"
7+
"os"
78

89
terwayIP "github.com/AliyunContainerService/terway/pkg/ip"
910
terwaySysctl "github.com/AliyunContainerService/terway/pkg/sysctl"
@@ -354,15 +355,19 @@ func EnsureNetConfSet(ipv4, ipv6 bool) error {
354355
for _, cfg := range ipv4NetConfig {
355356
innerErr := terwaySysctl.EnsureConf(fmt.Sprintf(cfg[0], link.Attrs().Name), cfg[1])
356357
if innerErr != nil {
357-
err = fmt.Errorf("%v, %w", err, innerErr)
358+
if !os.IsNotExist(innerErr) {
359+
err = fmt.Errorf("%v, %w", err, innerErr)
360+
}
358361
}
359362
}
360363
}
361364
if ipv6 {
362365
for _, cfg := range ipv6NetConfig {
363366
innerErr := terwaySysctl.EnsureConf(fmt.Sprintf(cfg[0], link.Attrs().Name), cfg[1])
364367
if innerErr != nil {
365-
err = fmt.Errorf("%v, %w", err, innerErr)
368+
if !os.IsNotExist(innerErr) {
369+
err = fmt.Errorf("%v, %w", err, innerErr)
370+
}
366371
}
367372
}
368373
}

0 commit comments

Comments
 (0)