Merge pull request #17240 from minikube-bot/auto_bump_crictl_version-…

…476fa0a Kicbase/ISO: Update crictl from v1.21.0 to v1.28.0
kubernetes · Sep 20, 2023 · 0a1036b · 0a1036b
2 parents 1d313e5 + ca8bf15
commit 0a1036b
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 7 deletions.
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
@@ -520,7 +520,7 @@ jobs:
           sudo curl -L "${CRI_DOCKERD_BASE_URL}/cri-docker.socket" -o /usr/lib/systemd/system/cri-docker.socket
           sudo curl -L "${CRI_DOCKERD_BASE_URL}/cri-docker.service" -o /usr/lib/systemd/system/cri-docker.service
           sudo chmod +x /usr/bin/cri-dockerd
-          CRICTL_VERSION="v1.17.0"
+          CRICTL_VERSION="v1.28.0"
           curl -L https://github.com/kubernetes-sigs/cri-tools/releases/download/$CRICTL_VERSION/crictl-${CRICTL_VERSION}-linux-amd64.tar.gz --output crictl-${CRICTL_VERSION}-linux-amd64.tar.gz
           sudo tar zxvf crictl-$CRICTL_VERSION-linux-amd64.tar.gz -C /usr/local/bin
       - name: Install gopogh

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -639,7 +639,7 @@ jobs:
           sudo curl -L "${CRI_DOCKERD_BASE_URL}/cri-docker.socket" -o /usr/lib/systemd/system/cri-docker.socket
           sudo curl -L "${CRI_DOCKERD_BASE_URL}/cri-docker.service" -o /usr/lib/systemd/system/cri-docker.service
           sudo chmod +x /usr/bin/cri-dockerd
-          CRICTL_VERSION="v1.17.0"
+          CRICTL_VERSION="v1.28.0"
           curl -L https://github.com/kubernetes-sigs/cri-tools/releases/download/$CRICTL_VERSION/crictl-${CRICTL_VERSION}-linux-amd64.tar.gz --output crictl-${CRICTL_VERSION}-linux-amd64.tar.gz
           sudo tar zxvf crictl-$CRICTL_VERSION-linux-amd64.tar.gz -C /usr/local/bin
       - name: Install gopogh

diff --git a/Makefile b/Makefile
@@ -23,7 +23,7 @@ KUBERNETES_VERSION ?= $(shell egrep "DefaultKubernetesVersion =" pkg/minikube/co
 KIC_VERSION ?= $(shell egrep "Version =" pkg/drivers/kic/types.go | cut -d \" -f2)
 
 # Default to .0 for higher cache hit rates, as build increments typically don't require new ISO versions
-ISO_VERSION ?= v1.31.0-1694798110-17250
+ISO_VERSION ?= v1.31.0-1695060926-17240
 
 # Dashes are valid in semver, but not Linux packaging. Use ~ to delimit alpha/beta
 DEB_VERSION ?= $(subst -,~,$(RAW_VERSION))

diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/crictl-bin-aarch64/crictl-bin.hash b/deploy/iso/minikube-iso/arch/aarch64/package/crictl-bin-aarch64/crictl-bin.hash
@@ -1 +1,2 @@
 sha256 454eecd29fe636282339af5b73c60234a7d10e4b11b9e18937e33056763d72cf crictl-v1.21.0-linux-arm64.tar.gz
+sha256 06e9224e42bc5e23085751e93cccdac89f7930ba6f7a45b8f8fc70ef663c37c4  crictl-v1.28.0-linux-arm64.tar.gz
diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/crictl-bin-aarch64/crictl-bin.mk b/deploy/iso/minikube-iso/arch/aarch64/package/crictl-bin-aarch64/crictl-bin.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-CRICTL_BIN_AARCH64_VERSION = v1.21.0
+CRICTL_BIN_AARCH64_VERSION = v1.28.0
 CRICTL_BIN_AARCH64_SITE = https://github.com/kubernetes-sigs/cri-tools/releases/download/$(CRICTL_BIN_AARCH64_VERSION)
 CRICTL_BIN_AARCH64_SOURCE = crictl-$(CRICTL_BIN_AARCH64_VERSION)-linux-arm64.tar.gz
 CRICTL_BIN_AARCH64_STRIP_COMPONENTS = 0

diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/crictl-bin/crictl-bin.hash b/deploy/iso/minikube-iso/arch/x86_64/package/crictl-bin/crictl-bin.hash
@@ -7,3 +7,4 @@ sha256 876dd2b3d0d1c2590371f940fb1bf1fbd5f15aebfbe456703ee465d959700f4a  crictl-
 sha256 87d8ef70b61f2fe3d8b4a48f6f712fd798c6e293ed3723c1e4bbb5052098f0ae  crictl-v1.19.0-linux-amd64.tar.gz
 sha256 44d5f550ef3f41f9b53155906e0229ffdbee4b19452b4df540265e29572b899c  crictl-v1.20.0-linux-amd64.tar.gz
 sha256 85c78a35584971625bf1c3bcd46e5404a90396f979d7586f18b11119cb623e24  crictl-v1.21.0-linux-amd64.tar.gz
+sha256 8dc78774f7cbeaf787994d386eec663f0a3cf24de1ea4893598096cb39ef2508  crictl-v1.28.0-linux-amd64.tar.gz
diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/crictl-bin/crictl-bin.mk b/deploy/iso/minikube-iso/arch/x86_64/package/crictl-bin/crictl-bin.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-CRICTL_BIN_VERSION = v1.21.0
+CRICTL_BIN_VERSION = v1.28.0
 CRICTL_BIN_SITE = https://github.com/kubernetes-sigs/cri-tools/releases/download/$(CRICTL_BIN_VERSION)
 CRICTL_BIN_SOURCE = crictl-$(CRICTL_BIN_VERSION)-linux-amd64.tar.gz
 CRICTL_BIN_STRIP_COMPONENTS = 0

diff --git a/hack/jenkins/linux_integration_tests_none.sh b/hack/jenkins/linux_integration_tests_none.sh
@@ -87,7 +87,7 @@ if [[ $(cri-dockerd --version 2>&1) != *"$CRI_DOCKERD_VERSION"* ]]; then
 fi
 
 # crictl is required for Kubernetes v1.24+ with none driver
-CRICTL_VERSION="v1.17.0"
+CRICTL_VERSION="v1.28.0"
 if [[ $(crictl --version) != *"$CRICTL_VERSION"* ]]; then
   echo "WARNING: expected version of crictl is not installed. will try to install."
   curl -L https://github.com/kubernetes-sigs/cri-tools/releases/download/$CRICTL_VERSION/crictl-${CRICTL_VERSION}-linux-amd64.tar.gz --output crictl-${CRICTL_VERSION}-linux-amd64.tar.gz

diff --git a/pkg/minikube/download/iso.go b/pkg/minikube/download/iso.go
@@ -41,7 +41,7 @@ const fileScheme = "file"
 // DefaultISOURLs returns a list of ISO URL's to consult by default, in priority order
 func DefaultISOURLs() []string {
 	v := version.GetISOVersion()
-	isoBucket := "minikube-builds/iso/17250"
+	isoBucket := "minikube-builds/iso/17240"
 
 	return []string{
 		fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s-%s.iso", isoBucket, v, runtime.GOARCH),
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		sha256 454eecd29fe636282339af5b73c60234a7d10e4b11b9e18937e33056763d72cf crictl-v1.21.0-linux-arm64.tar.gz
		sha256 06e9224e42bc5e23085751e93cccdac89f7930ba6f7a45b8f8fc70ef663c37c4 crictl-v1.28.0-linux-arm64.tar.gz