Update common files (#634)

* Update common files

* Use same image as CI so generators work correctly

Author: Steven Dake

Makefile

@@ -33,6 +33,8 @@ ifeq ($(LOCAL_ARCH),x86_64)
     TARGET_ARCH ?= amd64
 else ifeq ($(shell echo $(LOCAL_ARCH) | head -c 5),armv8)
     TARGET_ARCH ?= arm64
+else ifeq ($(LOCAL_ARCH),aarch64)
+    TARGET_ARCH ?= arm64
 else ifeq ($(shell echo $(LOCAL_ARCH) | head -c 4),armv)
     TARGET_ARCH ?= arm
 else
@@ -56,7 +58,7 @@ ifeq ($(BUILD_WITH_CONTAINER),1)
 export TARGET_OUT = /work/out/$(TARGET_OS)_$(TARGET_ARCH)
 CONTAINER_CLI ?= docker
 DOCKER_SOCKET_MOUNT ?= -v /var/run/docker.sock:/var/run/docker.sock
-IMG ?= gcr.io/istio-testing/build-tools:master-2019-11-08T17-21-18
+IMG ?= gcr.io/istio-testing/build-tools:master-2019-11-26T07-29-27
 UID = $(shell id -u)
 GID = `grep docker /etc/group | cut -f3 -d:`
 PWD = $(shell pwd)
@@ -95,6 +97,7 @@ RUN = $(CONTAINER_CLI) run -t -i --sig-proxy=true -u $(UID):$(GID) --rm \
 	-e TARGET_ARCH="$(TARGET_ARCH)" \
 	-e TARGET_OS="$(TARGET_OS)" \
 	-e TARGET_OUT="$(TARGET_OUT)" \
+	-e USER="${USER}" \
 	$(ENV_VARS) \
 	-v /etc/passwd:/etc/passwd:ro \
 	$(DOCKER_SOCKET_MOUNT) \

common/.commonfiles.sha

@@ -1 +1 @@
-c90e42b760dbccddf56c75c7f0194988cf57f2be
+8d9d2756a8345265a58f1239598ad65c5e019ba4

common/Makefile.common.mk

@@ -96,15 +96,15 @@ update-common:
 	@git clone -q --depth 1 --single-branch --branch $(UPDATE_BRANCH) https://github.com/istio/common-files $(TMP)/common-files
 	@cd $(TMP)/common-files ; git rev-parse HEAD >files/common/.commonfiles.sha
 	@rm -fr common
-	@cp -ar $(TMP)/common-files/files/* $(shell pwd)
+	@cp -a $(TMP)/common-files/files/* $(shell pwd)
 	@rm -fr $(TMP)/common-files
 
 update-common-protos:
 	@mkdir -p $(TMP)
 	@git clone -q --depth 1 --single-branch --branch $(UPDATE_BRANCH) https://github.com/istio/common-files $(TMP)/common-files
 	@cd $(TMP)/common-files ; git rev-parse HEAD > common-protos/.commonfiles.sha
 	@rm -fr common-protos
-	@cp -ar $(TMP)/common-files/common-protos/* $(shell pwd)/common-protos
+	@cp -a $(TMP)/common-files/common-protos $(shell pwd)
 	@rm -fr $(TMP)/common-files
 
 check-clean-repo:

common/config/license-lint.yml

@@ -71,7 +71,6 @@ whitelisted_modules:
   - github.com/daviddengcn/go-colortext
   - github.com/dchest/siphash
   - github.com/dnaeon/go-vcr
-  - github.com/docker/docker
   - github.com/duosecurity/duo_api_golang
   - github.com/dustin/go-humanize
   - github.com/facebookgo/stack
@@ -92,9 +91,6 @@ whitelisted_modules:
   - github.com/JeffAshton/win_pdh
   - github.com/jmespath/go-jmespath
   - github.com/jteeuwen/go-bindata
-  - github.com/juju/errors
-  - github.com/juju/loggo
-  - github.com/juju/testing
   - github.com/julienschmidt/httprouter
   - github.com/koneu/natend
   - github.com/kr/logfmt
@@ -118,7 +114,6 @@ whitelisted_modules:
   - github.com/russross/blackfriday
   - github.com/russross/blackfriday/v2
   - github.com/sean-/seed
-  - github.com/signalfx/com_signalfx_metrics_protobuf
   - github.com/smartystreets/assertions
   - github.com/smartystreets/goconvey
   - github.com/storageos/go-api

common/scripts/check_clean_repo.sh

@@ -15,7 +15,8 @@
 #   limitations under the License.
 
 if [[ -n $(git status --porcelain) ]]; then
-    git status
-  	echo "ERROR: Some files need to be updated, please run 'make gen' and include any changed files in your PR"
-  	exit 1
+  git status
+  git diff
+  echo "ERROR: Some files need to be updated, please run 'make gen' and include any changed files in your PR"
+  exit 1
 fi

common/scripts/report_build_info.sh

@@ -43,7 +43,7 @@ if [[ -n ${ISTIO_VERSION} ]]; then
 fi
 
 GIT_DESCRIBE_TAG=$(git describe --tags)
-HUB=${HUB:-""}
+HUB=${HUB:-"docker.io/istio"}
 
 # used by common/scripts/gobuild.sh
 echo "istio.io/pkg/version.buildVersion=${VERSION}"