diff --git a/build/dependencies.yaml b/build/dependencies.yaml index 8fa3408c01f..90543d16280 100644 --- a/build/dependencies.yaml +++ b/build/dependencies.yaml @@ -56,7 +56,7 @@ dependencies: # CRI Tools - name: "crictl" - version: 1.18.0 + version: 1.19.0 refPaths: - path: build/workspace.bzl match: CRI_TOOLS_VERSION = diff --git a/build/workspace.bzl b/build/workspace.bzl index c865c329bb1..70ea0415139 100644 --- a/build/workspace.bzl +++ b/build/workspace.bzl @@ -26,16 +26,16 @@ _CNI_TARBALL_ARCH_SHA256 = { "s390x": "ca126a3bd2cd8dff1c7bbfc3c69933b284c4e77614391c7e1f74b0851fc3b289", } -CRI_TOOLS_VERSION = "1.18.0" +CRI_TOOLS_VERSION = "1.19.0" _CRI_TARBALL_ARCH_SHA256 = { - "linux-386": "a1aaf482928d0a19aabeb321e406333c5ddecf77a532f7ec8c0bd6ca7014101e", - "linux-amd64": "876dd2b3d0d1c2590371f940fb1bf1fbd5f15aebfbe456703ee465d959700f4a", - "linux-arm": "d420925d10b47a234b7e51e9cf1039c3c09f2703945a99435549fcdd7487ae3a", - "linux-arm64": "95ba32c47ad690b1e3e24f60255273dd7d176e62b1a0b482e5b44a7c31639979", - "linux-ppc64le": "53a1fedbcee37f5d6c9480d21a9bb17f1c0214ffe7b640e39231a59927a665ef", - "linux-s390x": "114c8885a7eeb43bbe19baaf23c04a5761d06330ba8e7aa39a3a15c2051221f1", - "windows-386": "f37e8b5c499fb5a2bd06668782a7dc34e5acf2fda6d1bfe8f0ea9c773359a378", - "windows-amd64": "5045bcc6d8b0e6004be123ab99ea06e5b1b2ae1e586c968fcdf85fccd4d67ae1", + "linux-386": "fd0247b81a46adeca69ef3b7bbcf7d0e776df63195918236887243773b98a0c0", + "linux-amd64": "87d8ef70b61f2fe3d8b4a48f6f712fd798c6e293ed3723c1e4bbb5052098f0ae", + "linux-arm": "b72fd3c4b35f60f5db2cfcd8e932f6000cf9c2978b54adfcf60ee5e2d452e92f", + "linux-arm64": "ec040d14ca03e8e4e504a85dae5353e04b5d9d8aea3df68699258992c0eb8d88", + "linux-ppc64le": "72107c58960ee9405829c3366dbfcd86f163a990ea2102f3ed63a709096bc7ba", + "linux-s390x": "20ec106c307c9d56c2ecae1560b244f8ac26450b9704682f24bfb5f468b06776", + "windows-386": "3b7a41b556e3eae1fb56d17edc990ccd4839c8ab554249a8991155ee266dac4b", + "windows-amd64": "df60ff65ab71c5cf1d8c38f51db6f05e3d60a45d3a3293c3248c925c25375921", } ETCD_VERSION = "3.4.9" @@ -68,7 +68,7 @@ def cri_tarballs(): name = "cri_tools_%s" % arch, downloaded_file_path = "cri_tools.tgz", sha256 = sha, - urls = mirror("https://github.com/kubernetes-incubator/cri-tools/releases/download/v%s/crictl-v%s-%s.tar.gz" % (CRI_TOOLS_VERSION, CRI_TOOLS_VERSION, arch)), + urls = mirror("https://github.com/kubernetes-sigs/cri-tools/releases/download/v%s/crictl-v%s-%s.tar.gz" % (CRI_TOOLS_VERSION, CRI_TOOLS_VERSION, arch)), ) # Use skopeo to find these values: https://github.com/containers/skopeo diff --git a/cluster/gce/gci/configure.sh b/cluster/gce/gci/configure.sh index 5368cc14835..58529f7d27e 100644 --- a/cluster/gce/gci/configure.sh +++ b/cluster/gce/gci/configure.sh @@ -28,8 +28,8 @@ DEFAULT_CNI_VERSION="v0.8.6" DEFAULT_CNI_SHA1="a31251105250279fe57b4474d91d2db1d4d48b5a" DEFAULT_NPD_VERSION="v0.8.0" DEFAULT_NPD_SHA1="9406c975b1b035995a137029a004622b905b4e7f" -DEFAULT_CRICTL_VERSION="v1.18.0" -DEFAULT_CRICTL_SHA1="f384f594bd0a7e558a827363f54f58b45e670075" +DEFAULT_CRICTL_VERSION="v1.19.0" +DEFAULT_CRICTL_SHA1="bc9d57377402c2cc36ca5e600d55de96b15953de" DEFAULT_MOUNTER_TAR_SHA="8003b798cf33c7f91320cd6ee5cec4fa22244571" ### diff --git a/cluster/gce/windows/k8s-node-setup.psm1 b/cluster/gce/windows/k8s-node-setup.psm1 index 0fdb2ed102b..4249df79f57 100644 --- a/cluster/gce/windows/k8s-node-setup.psm1 +++ b/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.18.0' -$CRICTL_SHA256 = '5045bcc6d8b0e6004be123ab99ea06e5b1b2ae1e586c968fcdf85fccd4d67ae1' +$CRICTL_VERSION = 'v1.19.0' +$CRICTL_SHA256 = 'df60ff65ab71c5cf1d8c38f51db6f05e3d60a45d3a3293c3248c925c25375921' Import-Module -Force C:\common.psm1