From f7f335e0703ed0715b38f704eda887b658e6fbb5 Mon Sep 17 00:00:00 2001 From: Tommy Xiao Date: Mon, 21 Oct 2024 16:53:45 +0800 Subject: [PATCH] fix: update version.sh --- hack/version.sh | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/hack/version.sh b/hack/version.sh index e99299b0..8bb7e74b 100644 --- a/hack/version.sh +++ b/hack/version.sh @@ -31,12 +31,10 @@ get-module-path(){ go list -m -f '{{if .Replace}}{{.Replace.Path}}{{else}}{{.Path}}{{end}}' $1 } -# We're building k8e against containerd 1.5 in go.mod because newer releases have -# dependency conflicts with Kubernetes, but we still need to bundle containerd 1.7 -VERSION_CONTAINERD="v1.7.7-k3s1" PKG_CONTAINERD_K8E=$(get-module-path github.com/containerd/containerd) +VERSION_CONTAINERD=$(get-module-version github.com/containerd/containerd) -VERSION_CRICTL=$(get-module-version github.com/kubernetes-sigs/cri-tools) +VERSION_CRICTL=$(get-module-version sigs.k8s.io/cri-tools) if [ -z "$VERSION_CRICTL" ]; then VERSION_CRICTL="v0.0.0" fi @@ -62,7 +60,7 @@ if [ -z "$VERSION_CRI_DOCKERD" ]; then VERSION_CRI_DOCKERD="v0.0.0" fi -VERSION_CNIPLUGINS="v1.3.0-k3s1" +VERSION_CNIPLUGINS="v1.5.1-k3s1" if [[ -n "$GIT_TAG" ]]; then if [[ ! "$GIT_TAG" =~ ^"$VERSION_K8S"[+-] ]]; then