cri-tools: update to 1.21

Updating cri-tools. We refresh a patch, and change the recipe
to capture the binary from build/bin versus _output dir.

The following commits are part of this bump:

   e0b90a7f Increase image build timeout
   8f0434e8 Add image-test builds to main cloudbuild script
   b796452d Add windows images to build script
   e1e9f853 Bump github.com/docker/docker
   0cd06f41 Add hostnet-nginx image build to main script
   74ccfeaf Bump k8s.io/api from 0.0.0 to 0.21.0
   c98b734a Bump k8s.io/kubernetes from 0.0.0 to 0.21.4
   109fb62d Bump k8s.io/kubectl from 0.0.0 to 0.21.0
   534d9f03 Bump k8s.io/apimachinery from 0.0.0 to 0.21.0
   8c5599a6 Bump k8s.io/cri-api from 0.0.0 to 0.21.0
   8694106a Bump README versions to v1.21.0
   b953f776 Update dependencies
   ef872c25 Add dependabot config file
   eaf18dae Simplify test image build process for user images
   afb5b62c Move from gcr.io/cri-tools to gcr.io/k8s-staging-cri-tools
   1b32fe8d Fix UID/GID and username values for test images
   f749fc76 Bump gcb-docker-gcloud image to v20210331-c732583
   916fae03 add docker.io/ prefix to image:busybox in docs/examples/
   a0d17c4a Fix CRI-O master installation in GitHub actions
   791ddab1 fix StartedAt and FinishedAt of the container status
   2d5c2872 Fix CRI-O master installation in GitHub actions
   44fd67ce Makefile: avoid rebuilding binaries
   14485a8c support mips64le architecture.
   c8c1ebae Modify hack/release.sh script to include sha256 sum files
   ec31d9a2 Trigger prow job
   3e939cf7 Update CRI-O to v1.20.0

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>

2 files changed, 12 insertions, 15 deletions

diff --git a/recipes-containers/cri-tools/cri-tools/0001-build-allow-environmental-CGO-settings-and-pass-dont.patch b/recipes-containers/cri-tools/cri-tools/0001-build-allow-environmental-CGO-settings-and-pass-dont.patch
index 5772c1ae..afd7c4bf 100644
--- a/recipes-containers/cri-tools/cri-tools/0001-build-allow-environmental-CGO-settings-and-pass-dont.patch
+++ b/recipes-containers/cri-tools/cri-tools/0001-build-allow-environmental-CGO-settings-and-pass-dont.patch
@@ -33,20 +33,17 @@ Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
  src/import/Makefile | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
-diff --git a/Makefile b/Makefile
-index acf0fc0..130988c 100644
---- a/src/import/Makefile
-+++ b/src/import/Makefile
-@@ -63,7 +63,8 @@ critest:
-             $(PROJECT)/cmd/critest
+Index: cri-tools-1.21.0+gitfa50f4af0f6beba20264bfb3fd4d1d34e42f7b54/src/import/Makefile
+===================================================================
+--- cri-tools-1.21.0+gitfa50f4af0f6beba20264bfb3fd4d1d34e42f7b54.orig/src/import/Makefile
++++ cri-tools-1.21.0+gitfa50f4af0f6beba20264bfb3fd4d1d34e42f7b54/src/import/Makefile
+@@ -73,7 +73,8 @@
+        @$(MAKE) -B $(CRICTL)
  
- crictl:
--       CGO_ENABLED=0 $(GO_BUILD) -o $(CURDIR)/_output/crictl$(BIN_EXT) \
-+       $(GO_BUILD) -o $(CURDIR)/_output/crictl$(BIN_EXT) \
+ $(CRICTL):
+-       CGO_ENABLED=0 $(GO_BUILD) -o $@ \
++       $(GO_BUILD) -o $@ \
 +               -a -pkgdir dontusecurrentpkgs \
                 -ldflags '$(GO_LDFLAGS)' \
                 -tags '$(BUILDTAGS)' \
                 $(PROJECT)/cmd/crictl
--- 
-2.19.1
-
diff --git a/recipes-containers/cri-tools/cri-tools_git.bb b/recipes-containers/cri-tools/cri-tools_git.bb
index 17ddbd02..ad054e1c 100644
--- a/recipes-containers/cri-tools/cri-tools_git.bb
+++ b/recipes-containers/cri-tools/cri-tools_git.bb
@@ -16,7 +16,7 @@ What is not in scope for this project? \
     non-exist on the kube-apiserver. \
  "
 
-SRCREV_cri-tools = "ec9e336fd8c21c4bab89a6aed2c4a138c8cfae75"
+SRCREV_cri-tools = "fa50f4af0f6beba20264bfb3fd4d1d34e42f7b54"
 SRC_URI = "\
         git://github.com/kubernetes-sigs/cri-tools.git;branch=master;name=cri-tools \
         file://0001-build-allow-environmental-CGO-settings-and-pass-dont.patch \
@@ -27,7 +27,7 @@ LIC_FILES_CHKSUM = "file://src/import/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c2
 
 GO_IMPORT = "import"
 
-PV = "1.20.0+git${SRCREV_cri-tools}"
+PV = "1.21.0+git${SRCREV_cri-tools}"
 
 RPROVIDES_${PN} += "crictl"
 PACKAGES =+ "${PN}-critest"
@@ -63,7 +63,7 @@ do_compile() {
 
 do_install() {
     install -d ${D}${bindir}
-    install -m 755 -D ${S}/src/import/_output/* ${D}/${bindir}
+    install -m 755 -D ${S}/src/import/build/bin/* ${D}/${bindir}
 }
 
 FILES_${PN}-critest = "${bindir}/critest"