diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cd0502e2f..2acbb0baa 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,7 +22,7 @@ jobs: build: strategy: matrix: - go: ['1.18', '1.19'] + go: ['1.21', '1.22'] # Build all variants regardless of failures fail-fast: false diff --git a/.github/workflows/build_setup.yml b/.github/workflows/build_setup.yml index 0d113be06..26c8fa135 100644 --- a/.github/workflows/build_setup.yml +++ b/.github/workflows/build_setup.yml @@ -22,10 +22,10 @@ jobs: name: Build setup scripts runs-on: ubuntu-20.04 steps: - - name: Set up Go 1.19 + - name: Set up Go 1.22 uses: actions/setup-go@v5 with: - go-version: '1.19' + go-version: '1.22' - name: Check out the code uses: actions/checkout@v4 diff --git a/.github/workflows/cri_minio_test.yml b/.github/workflows/cri_minio_test.yml index 24e9f7530..0e83cb598 100644 --- a/.github/workflows/cri_minio_test.yml +++ b/.github/workflows/cri_minio_test.yml @@ -34,10 +34,10 @@ jobs: - name: Setup TMPDIR run: mkdir -p $TMPDIR - - name: Set up Go 1.19 + - name: Set up Go 1.22 uses: actions/setup-go@v5 with: - go-version: '1.19' + go-version: '1.22' - name: Check out code into the Go module directory uses: actions/checkout@v4 diff --git a/.github/workflows/cri_stock_containerd_test.yml b/.github/workflows/cri_stock_containerd_test.yml index 3111ce1c7..d849dcfc8 100644 --- a/.github/workflows/cri_stock_containerd_test.yml +++ b/.github/workflows/cri_stock_containerd_test.yml @@ -26,7 +26,7 @@ jobs: - name: Set up golang uses: actions/setup-go@v5 with: - go-version: '1.19' + go-version: '1.22' - name: Build setup scripts run: pushd scripts && go build -o setup_tool && popd diff --git a/.github/workflows/cri_tests.yml b/.github/workflows/cri_tests.yml index 29e1d0ad3..60f791a0e 100644 --- a/.github/workflows/cri_tests.yml +++ b/.github/workflows/cri_tests.yml @@ -31,7 +31,7 @@ jobs: - name: Set up golang uses: actions/setup-go@v5 with: - go-version: '1.19' + go-version: '1.22' - name: Add rsync run: | diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index 8440b1ca8..dbd839e1f 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -31,10 +31,10 @@ jobs: test-name: [test, test-man-bench] steps: - - name: Set up Go 1.19 + - name: Set up Go 1.22 uses: actions/setup-go@v5 with: - go-version: '1.19' + go-version: '1.22' - name: Set up Python 3.x uses: actions/setup-python@v5 diff --git a/.github/workflows/nightly_tests.yml b/.github/workflows/nightly_tests.yml index d88d5a922..9d851a60f 100644 --- a/.github/workflows/nightly_tests.yml +++ b/.github/workflows/nightly_tests.yml @@ -20,10 +20,10 @@ jobs: - name: Setup TMPDIR run: mkdir -p $TMPDIR - - name: Set up Go 1.19 + - name: Set up Go 1.22 uses: actions/setup-go@v5 with: - go-version: '1.19' + go-version: '1.22' - name: Upgrade git run: | @@ -77,10 +77,10 @@ jobs: - name: Setup TMPDIR run: mkdir -p $TMPDIR - - name: Set up Go 1.19 + - name: Set up Go 1.22 uses: actions/setup-go@v5 with: - go-version: '1.19' + go-version: '1.22' - name: Check out code into the Go module directory uses: actions/checkout@v4 diff --git a/.github/workflows/openyurt-unit-test.yml b/.github/workflows/openyurt-unit-test.yml index 8cf3f8433..a61e477d2 100644 --- a/.github/workflows/openyurt-unit-test.yml +++ b/.github/workflows/openyurt-unit-test.yml @@ -22,10 +22,10 @@ jobs: runs-on: ubuntu-latest steps: - - name: Set up Go 1.19 + - name: Set up Go 1.22 uses: actions/setup-go@v5 with: - go-version: '1.19' + go-version: '1.22' - name: Check out the code uses: actions/checkout@v4 diff --git a/.github/workflows/stargz_tests.yml b/.github/workflows/stargz_tests.yml index b2173783a..624d18f69 100644 --- a/.github/workflows/stargz_tests.yml +++ b/.github/workflows/stargz_tests.yml @@ -23,8 +23,8 @@ jobs: stargz-container-test: name: Test running stargz-based image using kn env: - KIND_VERSION: v0.14.0 - K8S_VERSION: v1.23 + KIND_VERSION: v0.22.0 + K8S_VERSION: v1.29 YAML_DIR: workloads/container runs-on: ubuntu-20.04 strategy: @@ -42,10 +42,10 @@ jobs: - name: Checkout LFS objects run: git lfs checkout - - name: Set up Go 1.19 + - name: Set up Go 1.22 uses: actions/setup-go@v5 with: - go-version: '1.19' + go-version: '1.22' - name: Build setup scripts run: pushd scripts && go build -o setup_tool && popd diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml index a81e8843e..1cba446df 100644 --- a/.github/workflows/unit_tests.yml +++ b/.github/workflows/unit_tests.yml @@ -29,10 +29,10 @@ jobs: module: [misc, networking, snapshotting] steps: - - name: Set up Go 1.19 + - name: Set up Go 1.22 uses: actions/setup-go@v5 with: - go-version: '1.19' + go-version: '1.22' - name: Set up Python 3.x uses: actions/setup-python@v5 @@ -74,10 +74,10 @@ jobs: module: [profile] steps: - - name: Set up Go 1.19 + - name: Set up Go 1.22 uses: actions/setup-go@v5 with: - go-version: '1.19' + go-version: '1.22' - name: Set up Python 3.x uses: actions/setup-python@v5 @@ -122,10 +122,10 @@ jobs: module: [ ctriface, ctriface/image, devmapper ] steps: - - name: Set up Go 1.19 + - name: Set up Go 1.22 uses: actions/setup-go@v5 with: - go-version: '1.19' + go-version: '1.22' - name: Upgrade git run: | diff --git a/scripts/cloudlab/setup_node.sh b/scripts/cloudlab/setup_node.sh index ee01cf744..9843838e9 100755 --- a/scripts/cloudlab/setup_node.sh +++ b/scripts/cloudlab/setup_node.sh @@ -61,4 +61,6 @@ fi if [ "$USE_STARGZ" == "use-stargz" ]; then $SCRIPTS/stargz/setup_stargz.sh -fi \ No newline at end of file +fi + +sudo wget https://github.com/mikefarah/yq/releases/latest/download/yq_linux_amd64 -O /usr/bin/yq && sudo chmod +x /usr/bin/yq \ No newline at end of file diff --git a/scripts/github_runner/setup_integ_runners_host.sh b/scripts/github_runner/setup_integ_runners_host.sh index 36801aa56..3e204e6fc 100755 --- a/scripts/github_runner/setup_integ_runners_host.sh +++ b/scripts/github_runner/setup_integ_runners_host.sh @@ -54,7 +54,7 @@ $PWD/../install_go.sh # install kind from ease-lab/kind rm -rf /tmp/kind/ -git clone -b custom_docker_params_for_vHive_v0.12.0 https://github.com/ease-lab/kind /tmp/kind/ +git clone -b custom_docker_params_for_vHive_v0.17.0 https://github.com/ease-lab/kind /tmp/kind/ cd /tmp/kind source /etc/profile && go build sudo mv kind /usr/local/bin/ diff --git a/scripts/stargz/01-kind.sh b/scripts/stargz/01-kind.sh index 7843212a9..507c25557 100644 --- a/scripts/stargz/01-kind.sh +++ b/scripts/stargz/01-kind.sh @@ -3,7 +3,7 @@ set -eo pipefail kindVersion=$(kind version); -K8S_VERSION=${k8sVersion:-v1.23.4@sha256:0e34f0d0fd448aa2f2819cfd74e99fe5793a6e4938b328f657c8e3f81ee0dfb9} +K8S_VERSION=${k8sVersion:-v1.29.1} KIND_BASE=${KIND_BASE:-kindest/node} CLUSTER_NAME=${KIND_CLUSTER_NAME:-knative} diff --git a/scripts/stargz/02-kourier.sh b/scripts/stargz/02-kourier.sh index e57f3df91..9f032d4d1 100644 --- a/scripts/stargz/02-kourier.sh +++ b/scripts/stargz/02-kourier.sh @@ -3,7 +3,7 @@ set -eo pipefail set -u -KNATIVE_NET_KOURIER_VERSION=${KNATIVE_NET_KOURIER_VERSION:-1.4.0} +KNATIVE_NET_KOURIER_VERSION=${KNATIVE_NET_KOURIER_VERSION:-1.13.0} ## INSTALL KOURIER n=0 diff --git a/scripts/stargz/02-serving.sh b/scripts/stargz/02-serving.sh index 15ed76885..0b037ddce 100644 --- a/scripts/stargz/02-serving.sh +++ b/scripts/stargz/02-serving.sh @@ -3,7 +3,7 @@ set -eo pipefail set -u -KNATIVE_VERSION=${KNATIVE_VERSION:-1.4.0} +KNATIVE_VERSION=${KNATIVE_VERSION:-1.13.0} wget -q https://github.com/knative/client/releases/download/knative-v${KNATIVE_VERSION}/kn-linux-amd64 mv kn-linux-amd64 kn && chmod +x kn diff --git a/scripts/stargz/setup_stargz.sh b/scripts/stargz/setup_stargz.sh index 5a1a64db3..5b7734cf2 100755 --- a/scripts/stargz/setup_stargz.sh +++ b/scripts/stargz/setup_stargz.sh @@ -4,7 +4,7 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" ROOT="$( cd $DIR && cd ../.. && pwd)" BINS=$ROOT/bin CONFIGS=$ROOT/configs/stargz -STARGZ_VERSION=v0.13.0 +STARGZ_VERSION=v0.15.1 # Get stargz snapshotter tar wget --continue --quiet https://github.com/containerd/stargz-snapshotter/releases/download/${STARGZ_VERSION}/stargz-snapshotter-${STARGZ_VERSION}-linux-amd64.tar.gz