modify cgroup2 path from /mnt/cgroup2 to /mnt/kmesh_cgroup2

README.md

@@ -49,8 +49,8 @@ make install
 config
 
 ```sh
-mkdir /mnt/cgroup2
-mount -t cgroup2 none /mnt/cgroup2/
+mkdir /mnt/kmesh_cgroup2
+mount -t cgroup2 none /mnt/kmesh_cgroup2/
 
 vim /etc/kmesh/kmesh.json
 ---
@@ -86,7 +86,7 @@ Usage of kmesh-daemon:
   -bpf-fs-path string
     	bpf fs path (default "/sys/fs/bpf")
   -cgroup2-path string
-    	cgroup2 path (default "/mnt/cgroup2")
+	cgroup2 path (default "/mnt/kmesh_cgroup2")
   -config-file string
     	[if -enable-kmesh] deploy in kube cluster (default "/etc/kmesh/kmesh.json")
   -enable-ads

build/docker/kmesh.dockerfile

@@ -3,7 +3,7 @@
 # 
 # Usage:
 # docker build -f kmesh.dockerfile -t kmesh:1.0.1 .
-# docker run -itd --privileged=true -v /mnt/cgroup2:/mnt/cgroup2 -v /sys/fs/bpf:/sys/fs/bpf -v /lib/modules:/lib/modules --name kmesh kmesh:1.0.1
+# docker run -itd --privileged=true -v /mnt:/mnt -v /sys/fs/bpf:/sys/fs/bpf -v /lib/modules:/lib/modules --name kmesh kmesh:1.0.1
 #
 
 # base image

build/docker/kmesh.yaml

@@ -14,9 +14,9 @@ spec:
          app: kmesh
      spec:
        volumes:
-         - name: mnt-cgroup2
+         - name: mnt
            hostPath:
-             path: /mnt/cgroup2
+             path: /mnt
          - name: sys-fs-bpf
            hostPath:
              path: /sys/fs/bpf
@@ -35,8 +35,8 @@ spec:
            - containerPort: 6789
              hostPort: 6789
            volumeMounts:
-           - name: mnt-cgroup2
-             mountPath: /mnt/cgroup2
+           - name: mnt
+             mountPath: /mnt
              readOnly: false
            - name: sys-fs-bpf
              mountPath: /sys/fs/bpf

build/docker/start_kmesh.sh

@@ -7,10 +7,10 @@ if [ $? -ne 0 ]; then
         modprobe kmesh
 fi
 
-mount | grep /mnt/cgroup2
+mount | grep /mnt/kmesh_cgroup2
 if [ $? -ne 0 ]; then
-        mkdir /mnt/cgroup2
-        mount -t cgroup2 none /mnt/cgroup2/
+        mkdir /mnt/kmesh_cgroup2
+        mount -t cgroup2 none /mnt/kmesh_cgroup2/
         if [ $? -ne 0 ]; then
                 echo "mount cgroup2 failed"
         fi
@@ -26,8 +26,8 @@ function stop_kmesh() {
                 rmmod kmesh
         fi
 
-        umount -t cgroup2 /mnt/cgroup2/
-        rm -rf /mnt/cgroup2
+        umount -t cgroup2 /mnt/kmesh_cgroup2/
+        rm -rf /mnt/kmesh_cgroup2
         rm -rf /sys/fs/bpf/bpf_kmesh
 }
 

build/kmesh-start-pre.sh

@@ -9,8 +9,8 @@ else
 	modprobe kmesh
 fi
 
-mount | grep /mnt/cgroup2
+mount | grep /mnt/kmesh_cgroup2
 if [ $? -ne 0 ]; then
-	mkdir /mnt/cgroup2
-	mount -t cgroup2 none /mnt/cgroup2/
-fi
+	mkdir /mnt/kmesh_cgroup2
+	mount -t cgroup2 none /mnt/kmesh_cgroup2/
+fi

build/kmesh-stop-post.sh

@@ -4,6 +4,6 @@ if [ $? == 0 ]; then
 	rmmod kmesh
 fi
 
-umount -t cgroup2 /mnt/cgroup2/
-rm -rf /mnt/cgroup2 > /dev/null
-rm -rf /sys/fs/bpf/bpf_kmesh
+umount -t cgroup2 /mnt/kmesh_cgroup2/
+rm -rf /mnt/kmesh_cgroup2 > /dev/null
+rm -rf /sys/fs/bpf/bpf_kmesh

pkg/bpf/config.go

@@ -39,7 +39,7 @@ type Config struct {
 
 func (c *Config) SetArgs() error {
 	flag.StringVar(&c.BpfFsPath, "bpf-fs-path", "/sys/fs/bpf", "bpf fs path")
-	flag.StringVar(&c.Cgroup2Path, "cgroup2-path", "/mnt/cgroup2", "cgroup2 path")
+	flag.StringVar(&c.Cgroup2Path, "cgroup2-path", "/mnt/kmesh_cgroup2", "cgroup2 path")
 
 	flag.BoolVar(&c.EnableKmesh, "enable-kmesh", false, "enable bpf kmesh")
 

test/testcases/kmesh/libs/common.sh

@@ -4,8 +4,8 @@ source ${OET_PATH}/libs/locallibs/common_lib.sh
 # environment preparation
 function env_init()
 {
-    mkdir /mnt/cgroup2
-    mount -t cgroup2 none /mnt/cgroup2/
+    mkdir /mnt/kmesh_cgroup2
+    mount -t cgroup2 none /mnt/kmesh_cgroup2/
 
     cd $CURRENT_PATH
     cd ../pkg