Move the release-1.6 branch to use release-1.6 common files. (#7491)

README.md

@@ -110,6 +110,8 @@ such branch for every release.
 1. Edit the file `data/args.yml`. Set the `preliminary` field to `false`
 and the the `doc_branch_name` field to the name of the release branch (in this case `release-1.4`).
 
+1. Manually update the common/Makefile.common.mk UPDATE_BRANCH to point to the new release and then run 'make update-common'.
+
 1. Commit the previous edits to your local git repo and push your **release** branch to GitHub.
 
 #### Updating istio.io

common/.commonfiles.sha

@@ -1 +1 @@
-d1c990b8e308d92fe3a76db64f2c9ad11714b0ba
+20a849f2370f3118628fd5352b994042adce3ce6

common/Makefile.common.mk

@@ -92,7 +92,7 @@ mirror-licenses:
 	@license-lint --mirror
 
 TMP := $(shell mktemp -d -u)
-UPDATE_BRANCH ?= "master"
+UPDATE_BRANCH ?= "release-1.6"
 
 update-common:
 	@mkdir -p $(TMP)

common/config/license-lint.yml

@@ -199,12 +199,3 @@ whitelisted_modules:
 
   # Apache 2.0: https://github.com/garyburd/redigo/blob/master/LICENSE
   - github.com/gomodule/redigo
-
-  # Apache 2.0: https://github.com/xdg/scram/blob/master/LICENSE
-  - github.com/xdg/scram
-
-  # Apache 2.0: https://github.com/xdg/stringprep/blob/master/LICENSE
-  - github.com/xdg/stringprep
-
-  # BSD-3: https://github.com/golang/tools/blob/master/LICENSE
-  - golang.org/x/tools

common/scripts/setup_env.sh

@@ -59,7 +59,7 @@ fi
 
 # Build image to use
 if [[ "${IMAGE_VERSION:-}" == "" ]]; then
-  export IMAGE_VERSION=master-2020-05-20T22-13-03
+  export IMAGE_VERSION=release-1.6-2020-05-08T22-06-04
 fi
 if [[ "${IMAGE_NAME:-}" == "" ]]; then
   export IMAGE_NAME=build-tools
@@ -90,25 +90,16 @@ do
   unset -f "${f}"
 done
 
-# Set conditional host mounts
+# Set up conditional host mounts for docker and kubernetes config
 export CONDITIONAL_HOST_MOUNTS=${CONDITIONAL_HOST_MOUNTS:-}
-
-# docker conditional host mount (needed for make docker push)
 if [[ -d "${HOME}/.docker" ]]; then
   CONDITIONAL_HOST_MOUNTS+="--mount type=bind,source=${HOME}/.docker,destination=/config/.docker,readonly "
 fi
-
-# gcloud conditional host mount (needed for docker push with the gcloud auth configure-docker)
 if [[ -d "${HOME}/.config/gcloud" ]]; then
   CONDITIONAL_HOST_MOUNTS+="--mount type=bind,source=${HOME}/.config/gcloud,destination=/config/.config/gcloud,readonly "
 fi
-
-# Conditional host mount if KUBECONFIG is set
-if [[ -n "${KUBECONFIG}" ]]; then
-  CONDITIONAL_HOST_MOUNTS+="--mount type=bind,source=$(dirname "${KUBECONFIG}"),destination=/home/.kube,readonly "
-elif [[ -f "${HOME}/.kube/config" ]]; then
-  # otherwise execute a conditional host mount if $HOME/.kube/config is set
-  CONDITIONAL_HOST_MOUNTS+="--mount type=bind,source=${HOME}/.kube,destination=/home/.kube,readonly "
+if [[ -d "${HOME}/.kube" ]]; then
+  CONDITIONAL_HOST_MOUNTS+="--mount type=bind,source=${HOME}/.kube,destination=/home/.kube "
 fi
 
 # Avoid recursive calls to make from attempting to start an additional container