Detect IPConflicting and gatewayReachable in ipam without coordinator

Signed-off-by: Cyclinder Kuo <[email protected]>

Makefile

@@ -330,12 +330,12 @@ e2e_init_cilium_ebpfservice:
 .PHONY: e2e_init_calico
 e2e_init_calico:
 	$(QUIET)  make e2e_init -e INSTALL_OVERLAY_CNI=true -e INSTALL_CALICO=true -e INSTALL_CILIUM=false -e E2E_SPIDERPOOL_ENABLE_SUBNET=false \
-	-e E2E_SPIDERPOOL_ENABLE_DRA=true -e INSTALL_OVS=false
+	-e E2E_SPIDERPOOL_ENABLE_DRA=true -e INSTALL_OVS=false -e E2E_SPIDERPOOL_ENABLE_IPAM_DETECTION=true
 
 .PHONY: e2e_init_cilium_legacyservice
 e2e_init_cilium_legacyservice:
 	$(QUIET)  make e2e_init -e INSTALL_OVERLAY_CNI=true -e INSTALL_CALICO=false -e INSTALL_CILIUM=true -e DISABLE_KUBE_PROXY=false \
-	-e E2E_SPIDERPOOL_ENABLE_SUBNET=false -e INSTALL_OVS=false
+	-e E2E_SPIDERPOOL_ENABLE_SUBNET=false -e INSTALL_OVS=false -e -e E2E_SPIDERPOOL_ENABLE_IPAM_DETECTION=true
 
 .PHONY: e2e_test
 e2e_test:

api/v1/agent/openapi.yaml

@@ -306,6 +306,10 @@ definitions:
         type: string
       vlan:
         type: integer
+      enableGatewayDetection:
+        type: boolean
+      enableIPConflictDetection:
+        type: boolean
     required:
       - version
       - address
@@ -340,10 +344,6 @@ definitions:
         type: integer
       txQueueLen:
         type: integer
-      detectIPConflict:
-        type: boolean
-      detectGateway:
-        type: boolean
       vethLinkAddress:
         type: string
     required:

charts/spiderpool/templates/configmap.yaml

@@ -22,6 +22,8 @@ data:
     enableKubevirtStaticIP: {{ .Values.ipam.enableKubevirtStaticIP }}
     enableSpiderSubnet: {{ .Values.ipam.spiderSubnet.enable }}
     enableAutoPoolForApplication: {{ .Values.ipam.spiderSubnet.autoPool.enable }}
+    enableIPConflictDetection: {{ .Values.ipam.enableIPConflictDetection }}
+    enableGatewayDetection: {{ .Values.ipam.enableGatewayDetection }}
     {{- if and .Values.ipam.spiderSubnet.enable .Values.ipam.spiderSubnet.autoPool.enable }}
     clusterSubnetDefaultFlexibleIPNumber: {{ .Values.ipam.spiderSubnet.autoPool.defaultRedundantIPNumber }}
     {{- else}}

charts/spiderpool/values.yaml

@@ -53,6 +53,12 @@ ipam:
   ## @param ipam.enableKubevirtStaticIP the feature to keep kubevirt vm pod static IP
   enableKubevirtStaticIP: true
 
+  ## @param ipam.enableIPConflictDetection enable IP conflict detection 
+  enableIPConflictDetection: false
+
+  ## @param ipam.enableGatewayDetection enable gateway detection
+  enableGatewayDetection: false
+
   spiderSubnet:
     ## @param ipam.spiderSubnet.enable SpiderSubnet feature.
     enable: true

cmd/coordinator/cmd/cni_types.go

@@ -11,7 +11,6 @@ import (
 	"path/filepath"
 	"regexp"
 	"strings"
-	"time"
 
 	"github.com/containernetworking/cni/pkg/types"
 	"github.com/containernetworking/cni/pkg/version"
@@ -44,24 +43,21 @@ const (
 
 type Config struct {
 	types.NetConf
-	DetectGateway      *bool          `json:"detectGateway,omitempty"`
-	VethLinkAddress    string         `json:"vethLinkAddress,omitempty"`
-	MacPrefix          string         `json:"podMACPrefix,omitempty"`
-	MultusNicPrefix    string         `json:"multusNicPrefix,omitempty"`
-	PodDefaultCniNic   string         `json:"podDefaultCniNic,omitempty"`
-	OverlayPodCIDR     []string       `json:"overlayPodCIDR,omitempty"`
-	ServiceCIDR        []string       `json:"serviceCIDR,omitempty"`
-	HijackCIDR         []string       `json:"hijackCIDR,omitempty"`
-	TunePodRoutes      *bool          `json:"tunePodRoutes,omitempty"`
-	PodDefaultRouteNIC string         `json:"podDefaultRouteNic,omitempty"`
-	Mode               Mode           `json:"mode,omitempty"`
-	HostRuleTable      *int64         `json:"hostRuleTable,omitempty"`
-	HostRPFilter       *int32         `json:"hostRPFilter,omitempty" `
-	PodRPFilter        *int32         `json:"podRPFilter,omitempty" `
-	TxQueueLen         *int64         `json:"txQueueLen,omitempty"`
-	IPConflict         *bool          `json:"detectIPConflict,omitempty"`
-	DetectOptions      *DetectOptions `json:"detectOptions,omitempty"`
-	LogOptions         *LogOptions    `json:"logOptions,omitempty"`
+	VethLinkAddress    string      `json:"vethLinkAddress,omitempty"`
+	MacPrefix          string      `json:"podMACPrefix,omitempty"`
+	MultusNicPrefix    string      `json:"multusNicPrefix,omitempty"`
+	PodDefaultCniNic   string      `json:"podDefaultCniNic,omitempty"`
+	OverlayPodCIDR     []string    `json:"overlayPodCIDR,omitempty"`
+	ServiceCIDR        []string    `json:"serviceCIDR,omitempty"`
+	HijackCIDR         []string    `json:"hijackCIDR,omitempty"`
+	TunePodRoutes      *bool       `json:"tunePodRoutes,omitempty"`
+	PodDefaultRouteNIC string      `json:"podDefaultRouteNic,omitempty"`
+	Mode               Mode        `json:"mode,omitempty"`
+	HostRuleTable      *int64      `json:"hostRuleTable,omitempty"`
+	HostRPFilter       *int32      `json:"hostRPFilter,omitempty" `
+	PodRPFilter        *int32      `json:"podRPFilter,omitempty" `
+	TxQueueLen         *int64      `json:"txQueueLen,omitempty"`
+	LogOptions         *LogOptions `json:"logOptions,omitempty"`
 }
 
 // DetectOptions enable ip conflicting check for pod's ip
@@ -142,15 +138,6 @@ func ParseConfig(stdin []byte, coordinatorConfig *models.CoordinatorConfig) (*Co
 		return nil, err
 	}
 
-	if conf.IPConflict == nil && coordinatorConfig.DetectIPConflict {
-		conf.IPConflict = ptr.To(true)
-	}
-
-	conf.DetectOptions, err = ValidateDelectOptions(conf.DetectOptions)
-	if err != nil {
-		return nil, err
-	}
-
 	if conf.HostRuleTable == nil && coordinatorConfig.HostRuleTable > 0 {
 		conf.HostRuleTable = ptr.To(coordinatorConfig.HostRuleTable)
 	}
@@ -163,10 +150,6 @@ func ParseConfig(stdin []byte, coordinatorConfig *models.CoordinatorConfig) (*Co
 		conf.HostRuleTable = ptr.To(int64(500))
 	}
 
-	if conf.DetectGateway == nil {
-		conf.DetectGateway = ptr.To(coordinatorConfig.DetectGateway)
-	}
-
 	if conf.TunePodRoutes == nil {
 		conf.TunePodRoutes = coordinatorConfig.TunePodRoutes
 	}
@@ -270,37 +253,3 @@ func validateRPFilterConfig(rpfilter *int32, coordinatorConfig int64) (*int32, e
 	}
 	return rpfilter, nil
 }
-
-func ValidateDelectOptions(config *DetectOptions) (*DetectOptions, error) {
-	if config == nil {
-		return &DetectOptions{
-			Interval: "10ms",
-			TimeOut:  "100ms",
-			Retry:    3,
-		}, nil
-	}
-
-	if config.Retry == 0 {
-		config.Retry = 3
-	}
-
-	if config.Interval == "" {
-		config.Interval = "10ms"
-	}
-
-	if config.TimeOut == "" {
-		config.TimeOut = "500ms"
-	}
-
-	_, err := time.ParseDuration(config.Interval)
-	if err != nil {
-		return nil, fmt.Errorf("invalid detectOptions.interval %s: %v, input like: 1s or 1m", config.Interval, err)
-	}
-
-	_, err = time.ParseDuration(config.TimeOut)
-	if err != nil {
-		return nil, fmt.Errorf("invalid detectOptions.timeout %s: %v, input like: 1s or 1m", config.TimeOut, err)
-	}
-
-	return config, nil
-}