Merge pull request #2207 from wswsmao/ci

fix ci k3s error

Author: ktock

.github/workflows/tests.yml

@@ -324,6 +324,7 @@ jobs:
       - uses: containerd/project-checks@v1.2.2
         with:
           working-directory: src/github.com/containerd/stargz-snapshotter
+          repo-access-token: ${{ secrets.GITHUB_TOKEN }}
           # go-licenses-ignore is set because go-licenses cannot correctly detect the license of the following packages:
           # * estargz packages: Apache-2.0 and BSD-3-Clause dual license
           #   (https://github.com/containerd/stargz-snapshotter/blob/main/NOTICE.md)

script/k3s-argo-workflow/run.sh

@@ -26,13 +26,12 @@ ARGO_VERSION=v3.6.4
 
 K3S_NODE_REPO=ghcr.io/stargz-containers
 K3S_NODE_IMAGE_NAME=k3s
-K3S_NODE_TAG=v1.34.2-k3s1
+K3S_NODE_TAG=v1.35.0-k3s1
 K3S_NODE_IMAGE="${K3S_NODE_REPO}/${K3S_NODE_IMAGE_NAME}:${K3S_NODE_TAG}"
 K3S_CLUSTER_NAME="k3s-demo-cluster-$(date +%s%N | shasum | base64 | fold -w 10 | head -1)"
 
 ORG_ARGOYAML=$(mktemp)
 TMP_K3S_REPO=$(mktemp -d)
-TMP_GOLANGCI=$(mktemp)
 TMP_K3S_CONTAINERD_REPO=$(mktemp -d)
 function cleanup {
     ORG_EXIT_CODE="${1}"
@@ -166,15 +165,15 @@ sed -i -E 's|DAPPER_RUN_ARGS="([^"]*)"|DAPPER_RUN_ARGS="\1 -v '"$(realpath ${REP
 sed -i -E 's|DAPPER_ENV="([^"]*)"|DAPPER_ENV="\1 DOCKER_BUILDKIT"|g' "${TMP_K3S_REPO}/Dockerfile.dapper"
 (
     cd "${TMP_K3S_REPO}" && \
+        export GOTOOLCHAIN=auto && \
         git config user.email "dummy@example.com" && \
         git config user.name "dummy" && \
-        cat ./.golangci.json | jq '.run.deadline|="10m"' > "${TMP_GOLANGCI}" && \
-        cp "${TMP_GOLANGCI}" ./.golangci.json &&  \
+        sed -i 's/timeout:.*$/timeout: 10m/' ./.golangci.yml && \
         go mod tidy && \
         make deps && \
         git add . && \
         git commit -m tmp && \
-        REPO="${K3S_NODE_REPO}" IMAGE_NAME="${K3S_NODE_IMAGE_NAME}" TAG="${K3S_NODE_TAG}" SKIP_VALIDATE=1 make
+        SKIP_AIRGAP=1 REPO="${K3S_NODE_REPO}" IMAGE_NAME="${K3S_NODE_IMAGE_NAME}" TAG="${K3S_NODE_TAG}" SKIP_VALIDATE=1 make
 )
 
 #1

script/k3s/run-k3s.sh

@@ -23,7 +23,7 @@ K3S_CONTAINERD_REPO=https://github.com/k3s-io/containerd
 REGISTRY_HOST=k3s-private-registry
 K3S_NODE_REPO=ghcr.io/stargz-containers
 K3S_NODE_IMAGE_NAME=k3s
-K3S_NODE_TAG=v1.34.2-k3s1
+K3S_NODE_TAG=v1.35.0-k3s1
 K3S_NODE_IMAGE="${K3S_NODE_REPO}/${K3S_NODE_IMAGE_NAME}:${K3S_NODE_TAG}"
 
 # Arguments
@@ -39,15 +39,13 @@ TMP_CONTEXT=$(mktemp -d)
 SN_KUBECONFIG=$(mktemp)
 TMP_K3S_REPO=$(mktemp -d)
 TMP_K3S_CONTAINERD_REPO=$(mktemp -d)
-TMP_GOLANGCI=$(mktemp)
 function cleanup {
     local ORG_EXIT_CODE="${1}"
     rm "${SN_KUBECONFIG}"
     rm -rf "${TMP_CONTEXT}"
     rm -rf "${TMP_BUILTIN_CONF}"
     rm -rf "${TMP_K3S_REPO}"
     rm -rf "${TMP_K3S_CONTAINERD_REPO}"
-    rm "${TMP_GOLANGCI}"
     exit "${ORG_EXIT_CODE}"
 }
 trap 'cleanup "$?"' EXIT SIGHUP SIGINT SIGQUIT SIGTERM
@@ -68,15 +66,15 @@ sed -i -E 's|DAPPER_RUN_ARGS="([^"]*)"|DAPPER_RUN_ARGS="\1 -v '"$(realpath ${REP
 sed -i -E 's|DAPPER_ENV="([^"]*)"|DAPPER_ENV="\1 DOCKER_BUILDKIT"|g' "${TMP_K3S_REPO}/Dockerfile.dapper"
 (
     cd "${TMP_K3S_REPO}" && \
+        export GOTOOLCHAIN=auto && \
         git config user.email "dummy@example.com" && \
         git config user.name "dummy" && \
-        cat ./.golangci.json | jq '.run.deadline|="10m"' > "${TMP_GOLANGCI}" && \
-        cp "${TMP_GOLANGCI}" ./.golangci.json &&  \
+        sed -i 's/timeout:.*$/timeout: 10m/' ./.golangci.yml && \
         go mod tidy && \
         make deps && \
         git add . && \
         git commit -m tmp && \
-        REPO="${K3S_NODE_REPO}" IMAGE_NAME="${K3S_NODE_IMAGE_NAME}" TAG="${K3S_NODE_TAG}" SKIP_VALIDATE=1 make
+        SKIP_AIRGAP=1 REPO="${K3S_NODE_REPO}" IMAGE_NAME="${K3S_NODE_IMAGE_NAME}" TAG="${K3S_NODE_TAG}" SKIP_VALIDATE=1 make
 )
 cat <<EOF > "${TMP_BUILTIN_CONF}"
 mirrors: