From ba2ba99beb6dc71ef7a083e04086df65486c2d2e Mon Sep 17 00:00:00 2001
From: Eric Van Norman <ericvn@us.ibm.com>
Date: Thu, 20 Oct 2022 16:32:30 -0500
Subject: [PATCH] Manual make update-common

---
 common/.commonfiles.sha             | 2 +-
 common/Makefile.common.mk           | 2 +-
 common/scripts/report_build_info.sh | 2 --
 common/scripts/run.sh               | 1 -
 common/scripts/setup_env.sh         | 2 +-
 5 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
index 7b79c5b9..3760d1a3 100644
--- a/common/.commonfiles.sha
+++ b/common/.commonfiles.sha
@@ -1 +1 @@
-b4c0f8fee8f5366d371b068cff43b3c5ef4de193
+7f261f522e3240e3aac48291a881da31ffcb847f
diff --git a/common/Makefile.common.mk b/common/Makefile.common.mk
index 1ec9a810..f0209977 100644
--- a/common/Makefile.common.mk
+++ b/common/Makefile.common.mk
@@ -91,7 +91,7 @@ mirror-licenses: mod-download-go
 	@license-lint --mirror
 
 TMP := $(shell mktemp -d -u)
-UPDATE_BRANCH ?= "master"
+UPDATE_BRANCH ?= "release-1.16"
 
 update-common:
 	@mkdir -p $(TMP)
diff --git a/common/scripts/report_build_info.sh b/common/scripts/report_build_info.sh
index d05c02da..d5fa2ced 100755
--- a/common/scripts/report_build_info.sh
+++ b/common/scripts/report_build_info.sh
@@ -44,5 +44,3 @@ echo "istio.io/pkg/version.buildGitRevision=${BUILD_GIT_REVISION}"
 echo "istio.io/pkg/version.buildStatus=${tree_status}"
 echo "istio.io/pkg/version.buildTag=${GIT_DESCRIBE_TAG}"
 echo "istio.io/pkg/version.buildHub=${HUB}"
-echo "istio.io/pkg/version.buildOS=${BUILD_GOOS}"
-echo "istio.io/pkg/version.buildArch=${BUILD_GOARCH}"
diff --git a/common/scripts/run.sh b/common/scripts/run.sh
index dc519628..274ab52c 100755
--- a/common/scripts/run.sh
+++ b/common/scripts/run.sh
@@ -56,6 +56,5 @@ read -ra DOCKER_RUN_OPTIONS <<< "${DOCKER_RUN_OPTIONS:-}"
     --mount "type=volume,source=go,destination=/go" \
     --mount "type=volume,source=gocache,destination=/gocache" \
     --mount "type=volume,source=cache,destination=/home/.cache" \
-    --mount "type=volume,source=crates,destination=/home/.cargo/registry" \
     ${CONDITIONAL_HOST_MOUNTS} \
     -w "${MOUNT_DEST}" "${IMG}" "$@"
diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh
index 2bbab971..af57e75f 100755
--- a/common/scripts/setup_env.sh
+++ b/common/scripts/setup_env.sh
@@ -73,7 +73,7 @@ fi
 
 # Build image to use
 if [[ "${IMAGE_VERSION:-}" == "" ]]; then
-  IMAGE_VERSION=master-6363b97c6bc60b7a3a8d52c5e08322d8394149e2
+  IMAGE_VERSION=release-1.16-dea5a1a3719b9ef5963569304e2210e0c92a5ce4
 fi
 if [[ "${IMAGE_NAME:-}" == "" ]]; then
   IMAGE_NAME=build-tools