Merge pull request #69326 from feiskyer/automated-cherry-pick-of-#690…

…33-upstream-release-1.12

Automated cherry pick of #69033: Update crictl to v1.12.0

build/root/WORKSPACE

@@ -61,7 +61,7 @@ http_file(
 
 http_file(
     name = "cri_tools",
-    sha256 = "ccf83574556793ceb01717dc91c66b70f183c60c2bbec70283939aae8fdef768",
+    sha256 = "e7d913bcce40bf54e37ab1d4b75013c823d0551e6bc088b217bc1893207b4844",
     urls = mirror("https://github.com/kubernetes-incubator/cri-tools/releases/download/v%s/crictl-v%s-linux-amd64.tar.gz" % (CRI_TOOLS_VERSION, CRI_TOOLS_VERSION)),
 )
 

build/rpms/cri-tools.spec

@@ -11,7 +11,7 @@ Binaries to interface with the container runtime.
 
 %prep
 # This has to be hard coded because bazel does a path substitution before rpm's %{version} is substituted.
-tar -xzf {crictl-v1.11.1-linux-amd64.tar.gz}
+tar -xzf {crictl-v1.12.0-linux-amd64.tar.gz}
 
 %install
 install -m 755 -d %{buildroot}%{_bindir}

build/workspace.bzl

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-CRI_TOOLS_VERSION = "1.11.1"
+CRI_TOOLS_VERSION = "1.12.0"

cluster/gce/gci/configure.sh

@@ -28,8 +28,8 @@ DEFAULT_CNI_VERSION="v0.6.0"
 DEFAULT_CNI_SHA1="d595d3ded6499a64e8dac02466e2f5f2ce257c9f"
 DEFAULT_NPD_VERSION="v0.5.0"
 DEFAULT_NPD_SHA1="650ecfb2ae495175ee43706d0bd862a1ea7f1395"
-DEFAULT_CRICTL_VERSION="v1.11.1"
-DEFAULT_CRICTL_SHA1="527fca5a0ecef6a8e6433e2af9cf83f63aff5694"
+DEFAULT_CRICTL_VERSION="v1.12.0"
+DEFAULT_CRICTL_SHA1="82ef8b44849f9da0589c87e9865d4716573eec7f"
 DEFAULT_MOUNTER_TAR_SHA="8003b798cf33c7f91320cd6ee5cec4fa22244571"
 ###