From a0303efe22d7f6ab18dc1413fd9133880f11c86d Mon Sep 17 00:00:00 2001 From: Tyler Stapler Date: Fri, 3 Dec 2021 19:24:24 +0000 Subject: [PATCH] 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. https://github.com/kubernetes/kubernetes/pull/104430 Signed-off-by: Sascha Grunert Change-Id: I08d49b2de569a859bbd80d10e693dce98bb6a960 --- gke/cluster/gce/gci/configure.sh | 6 +++--- gke/cluster/gce/windows/k8s-node-setup.psm1 | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gke/cluster/gce/gci/configure.sh b/gke/cluster/gce/gci/configure.sh index b3ce088d161a3..09210d88aefe4 100644 --- a/gke/cluster/gce/gci/configure.sh +++ b/gke/cluster/gce/gci/configure.sh @@ -30,8 +30,8 @@ DEFAULT_CNI_HASH_LINUX_ARM64='a8cfa6f88b2a8f19cabfd182c2fe26593bbed9228ef35e6010 DEFAULT_NPD_VERSION='v0.8.13-57-gc3c5389' DEFAULT_NPD_HASH_AMD64='2cb0f1610adb5d8d3c077d8ce7a65fb4066f419e82c3ed4ce72a7c4b337bcef7ab9e53d006d97bea70acd980565e2df80466858e6b5291cb1d10587bf0fb9d6c' DEFAULT_NPD_HASH_ARM64='e049d37298cbcb3479b3fdc2927ca169fdbe7661dc5c6b1f7cd8f9fb66634eb1c12858155b40f32f86262ebca1171061ce92a520668ce898f89936c668214207' -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' ### @@ -398,7 +398,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 index ba1f5cf631ed4..97af7cf301bef 100644 --- 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