Merge pull request #1438 from Flying-Tom/dual-engine-dns

Feat: Add Workload DnsController

Author: hzxuzhonghu

.githooks/pre-commit

@@ -0,0 +1,33 @@
+#!/bin/bash
+#
+# Kmesh pre-commit hook
+# This hook runs 'make clean' and 'make gen-check' before each commit
+# to ensure generated files are up-to-date and temporary files are cleaned up.
+#
+
+set -e
+
+echo "Running pre-commit checks..."
+
+# Change to repository root
+REPO_ROOT=$(git rev-parse --show-toplevel)
+cd "$REPO_ROOT"
+
+# Run make clean to restore auto-generated files
+echo "→ Running 'make clean'..."
+if ! make clean; then
+	echo "❌ 'make clean' failed"
+	exit 1
+fi
+
+# Run make gen-check to verify generated files are up-to-date
+echo "→ Running 'make gen-check'..."
+if ! make gen-check; then
+	echo "❌ 'make gen-check' failed"
+	echo ""
+	echo "Generated files are out of date. Please run 'make gen' and commit the changes."
+	exit 1
+fi
+
+echo "✅ Pre-commit checks passed"
+exit 0

.gitignore

@@ -54,3 +54,4 @@ oncn-mda/build/
 oncn-mda/deploy/
 test/mugen-master/
 
+.github/copilot-instructions.md

README-zh.md

@@ -115,8 +115,8 @@ Kmesh创新性的提出将流量治理下沉OS，在数据路径上无需经过
     time="2024-02-19T10:16:53Z" level=info msg="bpf Start successful" subsys=manager
     time="2024-02-19T10:16:53Z" level=info msg="controller Start successful" subsys=manager
     time="2024-02-19T10:16:53Z" level=info msg="command StartServer successful" subsys=manager
-    time="2024-02-19T10:16:53Z" level=info msg="start write CNI config\n" subsys="cni installer"
-    time="2024-02-19T10:16:53Z" level=info msg="kmesh cni use chained\n" subsys="cni installer"
+    time="2024-02-19T10:16:53Z" level=info msg="start write CNI config" subsys="cni installer"
+    time="2024-02-19T10:16:53Z" level=info msg="kmesh cni use chained" subsys="cni installer"
     time="2024-02-19T10:16:54Z" level=info msg="Copied /usr/bin/kmesh-cni to /opt/cni/bin." subsys="cni installer"
     time="2024-02-19T10:16:54Z" level=info msg="kubeconfig either does not exist or is out of date, writing a new one" subsys="cni installer"
     time="2024-02-19T10:16:54Z" level=info msg="wrote kubeconfig file /etc/cni/net.d/kmesh-cni-kubeconfig" subsys="cni installer"

pkg/cni/install.go

@@ -35,13 +35,13 @@ func (i *Installer) addCniConfig() error {
 	if i.CniConfigChained {
 		// "chained" is an cni type
 		// information: www.cni.dev/docs/spec/#overview-1
-		log.Infof("kmesh cni use chained\n")
+		log.Infof("kmesh cni use chained")
 		err = i.chainedKmeshCniPlugin(i.Mode, i.CniMountNetEtcDIR)
 		if err != nil {
 			return err
 		}
 	} else {
-		log.Error("currently kmesh only support chained cni mode\n")
+		log.Error("currently kmesh only support chained cni mode")
 	}
 	return nil
 }

pkg/controller/client.go

@@ -50,21 +50,26 @@ type XdsClient struct {
 	xdsConfig          *config.XdsConfig
 }
 
-func NewXdsClient(mode string, bpfAds *bpfads.BpfAds, bpfWorkload *bpfwl.BpfWorkload, enableMonitoring, enableProfiling bool) *XdsClient {
+func NewXdsClient(mode string, bpfAds *bpfads.BpfAds, bpfWorkload *bpfwl.BpfWorkload, enableMonitoring, enableProfiling bool) (*XdsClient, error) {
 	client := &XdsClient{
 		mode:      mode,
 		xdsConfig: config.GetConfig(mode),
 	}
 
-	if mode == constants.DualEngineMode {
-		client.WorkloadController = workload.NewController(bpfWorkload, enableMonitoring, enableProfiling)
-	} else if mode == constants.KernelNativeMode {
+	switch mode {
+	case constants.DualEngineMode:
+		var err error
+		client.WorkloadController, err = workload.NewController(bpfWorkload, enableMonitoring, enableProfiling)
+		if err != nil {
+			return nil, fmt.Errorf("failed to create workload controller: %w", err)
+		}
+	case constants.KernelNativeMode:
 		client.AdsController = ads.NewController(bpfAds)
 	}
 
 	client.ctx, client.cancel = context.WithCancel(context.Background())
 	client.ctx = metadata.AppendToOutgoingContext(client.ctx, "ClusterID", client.xdsConfig.Metadata.ClusterID.String())
-	return client
+	return client, nil
 }
 
 func (c *XdsClient) createGrpcStreamClient() error {

pkg/controller/client_test.go

@@ -38,7 +38,8 @@ import (
 
 func TestRecoverConnection(t *testing.T) {
 	t.Run("test reconnect success", func(t *testing.T) {
-		utClient := NewXdsClient(constants.KernelNativeMode, &bpfads.BpfAds{}, &bpfwl.BpfWorkload{}, false, false)
+		utClient, err := NewXdsClient(constants.KernelNativeMode, &bpfads.BpfAds{}, &bpfwl.BpfWorkload{}, false, false)
+		assert.NoError(t, err)
 		patches := gomonkey.NewPatches()
 		defer patches.Reset()
 		iteration := 0
@@ -79,8 +80,9 @@ func TestClientResponseProcess(t *testing.T) {
 				}))
 		})
 
-		utClient := NewXdsClient(constants.KernelNativeMode, &bpfads.BpfAds{}, &bpfwl.BpfWorkload{}, false, false)
-		err := utClient.createGrpcStreamClient()
+		utClient, err := NewXdsClient(constants.KernelNativeMode, &bpfads.BpfAds{}, &bpfwl.BpfWorkload{}, false, false)
+		assert.NoError(t, err)
+		err = utClient.createGrpcStreamClient()
 		assert.NoError(t, err)
 
 		reConnectPatches := gomonkey.NewPatches()
@@ -126,8 +128,9 @@ func TestClientResponseProcess(t *testing.T) {
 				}))
 		})
 
-		utClient := NewXdsClient(constants.DualEngineMode, &bpfads.BpfAds{}, &bpfwl.BpfWorkload{}, false, false)
-		err := utClient.createGrpcStreamClient()
+		utClient, err := NewXdsClient(constants.DualEngineMode, &bpfads.BpfAds{}, &bpfwl.BpfWorkload{}, false, false)
+		assert.NoError(t, err)
+		err = utClient.createGrpcStreamClient()
 		assert.NoError(t, err)
 
 		reConnectPatches := gomonkey.NewPatches()

pkg/controller/controller.go

@@ -159,10 +159,13 @@ func (c *Controller) Start(stopCh <-chan struct{}) error {
 		}
 	}
 
-	c.client = NewXdsClient(c.mode, c.bpfAdsObj, c.bpfWorkloadObj, c.bpfConfig.EnableMonitoring, c.bpfConfig.EnableProfiling)
+	c.client, err = NewXdsClient(c.mode, c.bpfAdsObj, c.bpfWorkloadObj, c.bpfConfig.EnableMonitoring, c.bpfConfig.EnableProfiling)
+	if err != nil {
+		return fmt.Errorf("failed to create XDS client: %w", err)
+	}
 
 	if c.client.WorkloadController != nil {
-		if err := c.client.WorkloadController.Run(ctx); err != nil {
+		if err := c.client.WorkloadController.Run(ctx, stopCh); err != nil {
 			return fmt.Errorf("failed to start workload controller: %+v", err)
 		}
 	} else {