Merge pull request alibaba#244 from BSWANG/main

Fix flannel plugin pod -> svc diagnose
River-sh · Apr 9, 2024 · c7b6aec · c7b6aec
2 parents 7e6d731 + 6b5edb3
commit c7b6aec
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 15 deletions.
diff --git a/pkg/controller/diagnose/diagnose.go b/pkg/controller/diagnose/diagnose.go
@@ -6,17 +6,17 @@ import (
 	"os"
 	"os/exec"
 	"strconv"
-	"strings"
 
 	skoopContext "github.com/alibaba/kubeskoop/pkg/skoop/context"
 )
 
 type Config struct {
-	KubeConfig    string `yaml:"kubeConfig"`
-	CloudProvider string `yaml:"cloudProvider"`
-	NetworkPlugin string `yaml:"networkPlugin"`
-	ProxyModel    string `yaml:"proxyModel"`
-	ClusterCidr   string `yaml:"clusterCidr"`
+	KubeConfig    string   `yaml:"kubeConfig"`
+	CloudProvider string   `yaml:"cloudProvider"`
+	NetworkPlugin string   `yaml:"networkPlugin"`
+	ProxyModel    string   `yaml:"proxyModel"`
+	ClusterCidr   string   `yaml:"clusterCidr"`
+	ExtraArgs     []string `yaml:"extraArgs"`
 }
 
 type Controller interface {
@@ -52,7 +52,7 @@ func (d *Diagnostor) Diagnose(ctx context.Context, taskConfig *skoopContext.Task
 		"--collector-namespace", d.namespace,
 	}
 	if d.config != nil {
-		args = append(args, buildArgsFromConfig(d.config))
+		args = append(args, buildArgsFromConfig(d.config)...)
 	}
 	cmd := exec.CommandContext(ctx, "skoop", args...)
 	output, err := cmd.CombinedOutput()
@@ -66,7 +66,7 @@ func (d *Diagnostor) Diagnose(ctx context.Context, taskConfig *skoopContext.Task
 	return string(diagnoseResult), nil
 }
 
-func buildArgsFromConfig(config *Config) string {
+func buildArgsFromConfig(config *Config) []string {
 	var args []string
 	m := map[string]string{
 		"--cloud-provider": config.CloudProvider,
@@ -80,6 +80,5 @@ func buildArgsFromConfig(config *Config) string {
 			args = append(args, k, v)
 		}
 	}
-
-	return strings.Join(args, " ")
+	return append(args, config.ExtraArgs...)
 }
diff --git a/pkg/skoop/network/aliyun/assertion.go b/pkg/skoop/network/aliyun/assertion.go
@@ -797,10 +797,6 @@ func sortSecurityGroupRules(sgs []*ecs.DescribeSecurityGroupAttributeResponseBod
 			return *a.Priority < *b.Priority
 		}
 
-		if *a.Policy != *b.Policy {
-			return *a.Policy == string(securityPolicyVerdictAccept)
-		}
-
 		if (a.SourceCidrIp != nil && *a.SourceCidrIp != "") || (b.SourceCidrIp != nil && *b.SourceCidrIp != "") {
 			if (a.SourceCidrIp == nil || *a.SourceCidrIp == "") || (b.SourceCidrIp == nil || *b.SourceCidrIp == "") {
 				return a.SourceCidrIp != nil && *a.SourceCidrIp != ""
@@ -833,6 +829,10 @@ func sortSecurityGroupRules(sgs []*ecs.DescribeSecurityGroupAttributeResponseBod
 			}
 		}
 
+		if *a.Policy != *b.Policy {
+			return *a.Policy == string(securityPolicyVerdictDrop)
+		}
+
 		return (pEndA - pStartA) < (pEndB - pStartB)
 	})
 }

diff --git a/pkg/skoop/service/service.go b/pkg/skoop/service/service.go
@@ -142,7 +142,7 @@ func (k *KubeProxyServiceProcessor) shouldMasquerade(packet model.Packet, svc *v
 	if targetPort != 0 && slices.Contains(serviceLBIPs(svc), dst) {
 		masquerade = !isTrafficLocalService(svc)
 	} else if targetPort != 0 && dst == svc.Spec.ClusterIP && k.clusterCIDR != nil {
-		masquerade = !k.clusterCIDR.Contains(packet.Dst)
+		masquerade = !k.clusterCIDR.Contains(packet.Src)
 	} else {
 		targetPortByNodePort := serviceTargetPortByNodePort(svc, packet.Dport, packet.Protocol)
 		if targetPortByNodePort != 0 {