Fix test to use listen_path field for FUSE manager

Signed-off-by: Kohei Tokunaga <[email protected]>

Author: ktock

script/cri-containerd/test-legacy.sh

@@ -19,7 +19,10 @@ set -euo pipefail
 CONTEXT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )/"
 REPO="${CONTEXT}../../"
 CONTAINERD_SOCK=unix:///run/containerd/containerd.sock
-SNAPSHOTTER_SOCK=unix:///run/containerd-stargz-grpc/containerd-stargz-grpc.sock
+IMAGE_ENDPOINT_SOCK=unix:///run/containerd-stargz-grpc/containerd-stargz-grpc.sock
+if [ "${FUSE_MANAGER:-}" == "true" ] ; then
+    IMAGE_ENDPOINT_SOCK=unix:///run/containerd-stargz-grpc/cri.sock
+fi
 
 source "${CONTEXT}/const.sh"
 source "${REPO}/script/util/utils.sh"
@@ -65,7 +68,7 @@ if [ "${FAIL}" == "" ] ; then
                 # FIXME: remove the skip flag once kind adds support for the user namespace
                 # See also https://github.com/kubernetes-sigs/kind/issues/3436
                 docker exec -i "${TEST_NODE_ID}" /go/bin/critest \
-                       --runtime-endpoint=${CONTAINERD_SOCK} --image-endpoint=${SNAPSHOTTER_SOCK} \
+                       --runtime-endpoint=${CONTAINERD_SOCK} --image-endpoint=${IMAGE_ENDPOINT_SOCK} \
                        --ginkgo.skip 'runtime should support NamespaceMode_POD'
         ) ; then
         FAIL=true

script/cri-containerd/test-stargz.sh

@@ -22,7 +22,10 @@ REPO="${CONTEXT}../../"
 REGISTRY_HOST="cri-registry"
 TEST_NODE_NAME="cri-testenv-container"
 CONTAINERD_SOCK=unix:///run/containerd/containerd.sock
-SNAPSHOTTER_SOCK=unix:///run/containerd-stargz-grpc/containerd-stargz-grpc.sock
+IMAGE_ENDPOINT_SOCK=unix:///run/containerd-stargz-grpc/containerd-stargz-grpc.sock
+if [ "${FUSE_MANAGER:-}" == "true" ] ; then
+    IMAGE_ENDPOINT_SOCK=unix:///run/containerd-stargz-grpc/cri.sock
+fi
 PREPARE_NODE_NAME="cri-prepare-node"
 
 source "${CONTEXT}/const.sh"
@@ -191,7 +194,7 @@ echo "==============================="
 # FIXME: remove the skip flag once kind adds support for the user namespace
 # See also https://github.com/kubernetes-sigs/kind/issues/3436
 docker exec "${TEST_NODE_NAME}" /go/bin/critest \
-       --runtime-endpoint=${CONTAINERD_SOCK} --image-endpoint=${SNAPSHOTTER_SOCK} \
+       --runtime-endpoint=${CONTAINERD_SOCK} --image-endpoint=${IMAGE_ENDPOINT_SOCK} \
        --ginkgo.skip 'runtime should support NamespaceMode_POD'
 
 echo "Check if stargz snapshotter is working"

script/cri-containerd/test.sh

@@ -116,7 +116,8 @@ fi
 
 FUSE_MANAGER_CONFIG=""
 if [ "${FUSE_MANAGER:-}" == "true" ] ; then
-    FUSE_MANAGER_CONFIG='[fuse_manager]
+    FUSE_MANAGER_CONFIG='listen_path = "/run/containerd-stargz-grpc/cri.sock"
+[fuse_manager]
 enable = true'
 fi
 
@@ -166,18 +167,18 @@ COPY ./test.conflist /etc/cni/net.d/test.conflist
 
 ${ADDITIONAL_INST}
 
-RUN if [ "${BUILTIN_SNAPSHOTTER:-}" != "true" ] ; then \
-      sed -i '1imetadata_store = "${USE_METADATA_STORE}"' "${SNAPSHOTTER_CONFIG_FILE}" && \
-      echo '[fuse]' >> "${SNAPSHOTTER_CONFIG_FILE}" && \
-      echo "passthrough = ${USE_FUSE_PASSTHROUGH}" >> "${SNAPSHOTTER_CONFIG_FILE}" ; \
-    fi
-
 RUN <<EEE
 cat <<EOT >> "${SNAPSHOTTER_CONFIG_FILE}"
 ${FUSE_MANAGER_CONFIG}
 EOT
 EEE
 
+RUN if [ "${BUILTIN_SNAPSHOTTER:-}" != "true" ] ; then \
+      sed -i '1imetadata_store = "${USE_METADATA_STORE}"' "${SNAPSHOTTER_CONFIG_FILE}" && \
+      echo '[fuse]' >> "${SNAPSHOTTER_CONFIG_FILE}" && \
+      echo "passthrough = ${USE_FUSE_PASSTHROUGH}" >> "${SNAPSHOTTER_CONFIG_FILE}" ; \
+    fi
+
 ENTRYPOINT [ "/usr/local/bin/entrypoint", "/sbin/init" ]
 EOF
 docker build -t "${NODE_TEST_IMAGE_NAME}" ${DOCKER_BUILD_ARGS:-} "${TMP_CONTEXT}"