Backporting cri-tools per https://b.corp.google.com/issues/197139632

Update cri-tools to v1.22.0 This patch updates crictl to the latest available release. kubernetes#104430 Signed-off-by: Sascha Grunert <[email protected]> Change-Id: I08d49b2de569a859bbd80d10e693dce98bb6a960
aojea · Jun 14, 2023 · 8b38ada · 8b38ada
1 parent b4018bb
commit 8b38ada
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/gke/cluster/gce/gci/configure.sh b/gke/cluster/gce/gci/configure.sh
@@ -30,8 +30,8 @@ DEFAULT_NPD_VERSION='v0.8.8'
 DEFAULT_NPD_HASH_AMD64='ba8315a29368bfc33bdc602eb02d325b0b80e295c8739da35616de5b562c372bd297a2553f3ccd4daaecd67698b659b2c7068a2d2a0b9418ad29233fb75ff3f2'
 # TODO (SergeyKanzhelev): fill up for npd 0.8.9+
 DEFAULT_NPD_HASH_ARM64='N/A'
-DEFAULT_CRICTL_VERSION='v1.21.0'
-DEFAULT_CRICTL_HASH='e4fb9822cb5f71ab8f85021c66170613aae972f4b32030e42868fb36a3bc3ea8642613df8542bf716fad903ed4d7528021ecb28b20c6330448cd2bd2b76bd776'
+DEFAULT_CRICTL_VERSION='v1.22.0'
+DEFAULT_CRICTL_SHA512='9ff93e9c15942c39c85dd4e8182b3e9cd47fcb15b1315b0fdfd0d73442a84111e6cf8bb74b586e34b1f382a71107eb7e7820544a98d2224ca6b6dee3ee576222'
 DEFAULT_MOUNTER_TAR_SHA='7956fd42523de6b3107ddc3ce0e75233d2fcb78436ff07a1389b6eaac91fb2b1b72a08f7a219eaf96ba1ca4da8d45271002e0d60e0644e796c665f99bb356516'
 ###
 
@@ -391,7 +391,7 @@ function install-crictl {
     local -r crictl_hash="${CRICTL_TAR_HASH}"
   else
     local -r crictl_version="${DEFAULT_CRICTL_VERSION}"
-    local -r crictl_hash="${DEFAULT_CRICTL_HASH}"
+    local -r crictl_hash="${DEFAULT_CRICTL_SHA512}"
   fi
   local -r crictl="crictl-${crictl_version}-${HOST_PLATFORM}-${HOST_ARCH}.tar.gz"
 

diff --git a/gke/cluster/gce/windows/k8s-node-setup.psm1 b/gke/cluster/gce/windows/k8s-node-setup.psm1
@@ -57,8 +57,8 @@ $GCE_METADATA_SERVER = "169.254.169.254"
 # exist until an initial HNS network has been created on the Windows node - see
 # Add_InitialHnsNetwork().
 $MGMT_ADAPTER_NAME = "vEthernet (Ethernet*"
-$CRICTL_VERSION = 'v1.21.0'
-$CRICTL_SHA256 = '437d5301f6f5b9848ef057cee98474ce11a6679c91b4d4e83677a8c1f2415143'
+$CRICTL_VERSION = 'v1.22.0'
+$CRICTL_SHA256 = '8f32d09d56716ab47ede3410c0aa91921668510a457b878f4442edcd2ef7bc10'
 
 Import-Module -Force C:\common.psm1