fix: change the offline client from seed peer to peer

Signed-off-by: BruceAko <chongzhi@hust.edu.cn>

Author: BruceAko

.github/workflows/e2e-v2-nydus.yml

@@ -18,7 +18,7 @@ env:
   KIND_VERSION: v0.12.0
   CONTAINERD_VERSION: v1.5.2
   NERDCTL_VER: 0.22.2
-  KIND_CONFIG_PATH: test/testdata/kind/config-v2.yaml
+  KIND_CONFIG_PATH: test/testdata/kind/config-v2-nydus.yaml
   DRAGONFLY_CHARTS_PATH: deploy/helm-charts/charts/dragonfly
   NYDUS_SNAPSHOTTER_CHARTS_PATH: deploy/helm-charts/charts/nydus-snapshotter
 

.github/workflows/e2e-v2.yml

@@ -31,7 +31,7 @@ jobs:
         include:
           - module: normal
             charts-config: test/testdata/charts/config-v2.yaml
-            skip: ""
+            skip: "Clients go offline normally and abnormally"
 
     steps:
       - name: Free Disk Space (Ubuntu)
@@ -113,12 +113,9 @@ jobs:
           config: ${{ env.KIND_CONFIG_PATH }}
           cluster_name: kind
 
-      - name: Kind load images
+      - name: Add taint to node
         run: |
-          kind load docker-image dragonflyoss/manager:latest
-          kind load docker-image dragonflyoss/scheduler:latest
-          kind load docker-image dragonflyoss/client:latest
-          kind load docker-image dragonflyoss/dfinit:latest
+          kubectl taint nodes kind-worker2 key=value:NoSchedule
 
       - name: Setup dragonfly
         run: |

test/e2e/v2/leave_host_test.go

@@ -36,6 +36,7 @@ var _ = Describe("Clients go offline normally and abnormally", func() {
 		It("number of hosts should be ok", Label("host", "leave"), func() {
 			getHostCountFromScheduler := func(schedulerClient schedulerclient.V2) (hostCount int) {
 				response, err := schedulerClient.ListHosts(context.Background())
+				fmt.Println("response:")
 				fmt.Println(response, err)
 				Expect(err).NotTo(HaveOccurred())
 
@@ -58,15 +59,15 @@ var _ = Describe("Clients go offline normally and abnormally", func() {
 			hostCount := util.Servers[util.SeedClientServerName].Replicas + util.Servers[util.ClientServerName].Replicas
 			Expect(getHostCountFromScheduler(schedulerClient)).To(Equal(hostCount))
 
-			podName, err := util.GetClientPodName()
+			podName, err := util.GetClientPodName(1)
 			Expect(err).NotTo(HaveOccurred())
 
 			out, err := util.KubeCtlCommand("-n", util.DragonflyNamespace, "delete", "pod", podName).CombinedOutput()
 			fmt.Println(string(out))
 			Expect(err).NotTo(HaveOccurred())
 			Expect(getHostCountFromScheduler(schedulerClient)).To(Equal(hostCount))
 
-			podName, err = util.GetClientPodName()
+			podName, err = util.GetClientPodName(1)
 			Expect(err).NotTo(HaveOccurred())
 
 			out, err = util.KubeCtlCommand("-n", util.DragonflyNamespace, "delete", "pod", podName, "--force", "--grace-period=0").CombinedOutput()

test/e2e/v2/util/constants.go

@@ -57,6 +57,6 @@ var Servers = map[string]server{
 		Name:       ClientServerName,
 		Namespace:  DragonflyNamespace,
 		LogDirName: "dfdaemon",
-		Replicas:   1,
+		Replicas:   2,
 	},
 }

test/e2e/v2/util/exec.go

@@ -103,7 +103,7 @@ func KubeCtlCopyCommand(ns, pod, source, target string) *exec.Cmd {
 }
 
 func ClientExec() (*PodExec, error) {
-	podName, err := GetClientPodName()
+	podName, err := GetClientPodName(0)
 	if err != nil {
 		return nil, err
 	}
@@ -126,9 +126,9 @@ func ManagerExec(n int) (*PodExec, error) {
 	return NewPodExec(DragonflyNamespace, podName, "manager"), nil
 }
 
-func GetClientPodName() (string, error) {
+func GetClientPodName(n int) (string, error) {
 	out, err := KubeCtlCommand("-n", DragonflyNamespace, "get", "pod", "-l", "component=client",
-		"-o", fmt.Sprintf("jsonpath='{range .items[0]}{.metadata.name}{end}'")).CombinedOutput()
+		"-o", fmt.Sprintf("jsonpath='{range .items[%d]}{.metadata.name}{end}'", n)).CombinedOutput()
 	if err != nil {
 		return "", err
 	}

test/testdata/charts/config-v2.yaml

@@ -114,6 +114,11 @@ client:
     limits:
       cpu: "2"
       memory: "4Gi"
+  tolerations:
+    - key: "key"
+      operator: "Equal"
+      value: "value"
+      effect: "NoSchedule"
   extraVolumeMounts:
   - name: logs
     mountPath: "/var/log/"

test/testdata/kind/config-v2-nydus.yaml

@@ -0,0 +1,24 @@
+kind: Cluster
+apiVersion: kind.x-k8s.io/v1alpha4
+networking:
+  ipFamily: dual
+nodes:
+  - role: control-plane
+    image: kindest/node:v1.23.4
+    extraPortMappings:
+      - containerPort: 4001
+        hostPort: 4001
+        protocol: TCP
+      - containerPort: 4003
+        hostPort: 4003
+        protocol: TCP
+      - containerPort: 30802
+        hostPort: 8002
+        protocol: TCP
+    extraMounts:
+      - hostPath: ./test/testdata/containerd/config-v2.toml
+        containerPath: /etc/containerd/config.toml
+      - hostPath: /tmp/artifact
+        containerPath: /tmp/artifact
+      - hostPath: /dev/fuse
+        containerPath: /dev/fuse

test/testdata/kind/config-v2.yaml

@@ -4,6 +4,15 @@ networking:
   ipFamily: dual
 nodes:
   - role: control-plane
+    image: kindest/node:v1.23.4
+    extraMounts:
+      - hostPath: ./test/testdata/containerd/config-v2.toml
+        containerPath: /etc/containerd/config.toml
+      - hostPath: /tmp/artifact
+        containerPath: /tmp/artifact
+      - hostPath: /dev/fuse
+        containerPath: /dev/fuse
+  - role: worker
     image: kindest/node:v1.23.4
     extraPortMappings:
       - containerPort: 4001
@@ -22,3 +31,12 @@ nodes:
         containerPath: /tmp/artifact
       - hostPath: /dev/fuse
         containerPath: /dev/fuse
+  - role: worker
+    image: kindest/node:v1.23.4
+    extraMounts:
+      - hostPath: ./test/testdata/containerd/config-v2.toml
+        containerPath: /etc/containerd/config.toml
+      - hostPath: /tmp/artifact
+        containerPath: /tmp/artifact
+      - hostPath: /dev/fuse
+        containerPath: /dev/fuse