remove podIP patch

podIP is only need if user use calico network policy

Signed-off-by: l1b0k <[email protected]>

daemon/builder.go

@@ -23,6 +23,7 @@ import (
 	"github.com/AliyunContainerService/terway/pkg/storage"
 	"github.com/AliyunContainerService/terway/pkg/tracing"
 	"github.com/AliyunContainerService/terway/pkg/utils"
+	"github.com/AliyunContainerService/terway/pkg/utils/nodecap"
 	vswpool "github.com/AliyunContainerService/terway/pkg/vswitch"
 	"github.com/AliyunContainerService/terway/types"
 	"github.com/AliyunContainerService/terway/types/daemon"
@@ -100,6 +101,27 @@ func (b *NetworkServiceBuilder) LoadGlobalConfig() *NetworkServiceBuilder {
 
 	b.service.ipamType = globalConfig.IPAMType
 
+	if nodecap.GetNodeCapabilities(nodecap.NodeCapabilityNetworkPolicyProvider) != "ebpf" &&
+		(nodecap.GetNodeCapabilities(nodecap.NodeCapabilityDataPath) == "veth" || nodecap.GetNodeCapabilities(nodecap.NodeCapabilityDataPath) == "") {
+		var np bool
+		out, err := os.ReadFile("/etc/eni/disable_network_policy")
+		if err != nil {
+			if !os.IsNotExist(err) {
+				b.err = err
+				return b
+			}
+		}
+		switch string(out) {
+		case "false", "0", "":
+			np = false
+		default:
+			np = true
+		}
+		if np {
+			b.service.enablePatchPodIPs = true
+		}
+	}
+
 	return b
 }
 

daemon/daemon.go

@@ -78,6 +78,8 @@ type networkService struct {
 
 	gcRulesOnce sync.Once
 
+	enablePatchPodIPs bool
+
 	rpc.UnimplementedTerwayBackendServer
 }
 
@@ -267,9 +269,11 @@ func (n *networkService) AllocIP(ctx context.Context, r *rpc.AllocIPRequest) (*r
 		}
 	}
 
-	ips := getPodIPs(netConf)
-	if len(ips) > 0 {
-		_ = n.k8s.PatchPodIPInfo(pod, strings.Join(ips, ","))
+	if n.enablePatchPodIPs {
+		ips := getPodIPs(netConf)
+		if len(ips) > 0 {
+			_ = n.k8s.PatchPodIPInfo(pod, strings.Join(ips, ","))
+		}
 	}
 
 	// 4. Record resource info