From 9acc85fdac10fad0ef7fbb0f50b90dfc057a6af9 Mon Sep 17 00:00:00 2001 From: Chun Lin Yang Date: Thu, 15 Nov 2018 16:46:31 +0800 Subject: [PATCH 1/5] Add isito.io repo Signed-off-by: Chun Lin Yang --- install/kubernetes/helm/istio/README.md | 5 +++++ release/create_release_archives.sh | 26 ++++++++++++++++++++----- 2 files changed, 26 insertions(+), 5 deletions(-) diff --git a/install/kubernetes/helm/istio/README.md b/install/kubernetes/helm/istio/README.md index 3f684105dc5a..3ade745639d1 100644 --- a/install/kubernetes/helm/istio/README.md +++ b/install/kubernetes/helm/istio/README.md @@ -116,6 +116,11 @@ The chart deploys pods that consume minimum resources as specified in the resour EOF ``` +1. Add `istio.io` chart repository and point to the release: + ``` + $ helm repo add istio.io https://storage.googleapis.com/istio-prerelease/daily-build/master-latest-daily/charts + ``` + 1. Build the Helm dependencies: ``` $ helm dep update install/kubernetes/helm/istio diff --git a/release/create_release_archives.sh b/release/create_release_archives.sh index deceb60dda34..4fb2a88d3c57 100755 --- a/release/create_release_archives.sh +++ b/release/create_release_archives.sh @@ -15,16 +15,12 @@ # ################################################################################ -set -o errexit -set -o pipefail -set -x - # This script primarily exists for Cloud Builder. This script # reads artifacts from a specified directory, generates tar files # based on those artifacts, and then stores the tar files # back to the directory. -TEMP_DIR="$(mktemp -d /tmp/istio.version.XXXX)" +TEMP_DIR="/tmp/istio.version.XXXX" BASE_DIR="$TEMP_DIR" ISTIOCTL_SUBDIR=istioctl OUTPUT_PATH="" @@ -45,6 +41,11 @@ function error_exit() { exit "${2:-1}" } +# since there are 2 required options, should show usage and exit with no args specified +if (($# == 0)); then + usage +fi + while getopts d:i:o:v: arg ; do case "${arg}" in d) BASE_DIR="${OPTARG}";; @@ -55,10 +56,17 @@ while getopts d:i:o:v: arg ; do esac done +set -o errexit +set -o pipefail +set -x + [[ -z "${BASE_DIR}" ]] && usage [[ -z "${OUTPUT_PATH}" ]] && usage [[ -z "${VER_STRING}" ]] && usage +if ("${BASE_DIR}" = "${TEMP_DIR}"); then + mktemp -d "${TEMP_DIR}" +fi COMMON_FILES_DIR="${BASE_DIR}/istio/istio-${VER_STRING}" BIN_DIR="${COMMON_FILES_DIR}/bin" mkdir -p "${BIN_DIR}" @@ -69,6 +77,13 @@ mkdir -p "${BIN_DIR}" CP=${CP:-"cp"} TAR=${TAR:-"tar"} +function replace_with_release_charts_url() { + local origin_url="istio-prerelease/daily-build/master-latest-daily/charts" + local target_url="istio-release/releases/${VER_STRING}/charts" + sed -i.bak "s:${origin_url}:${target_url}:g" "${COMMON_FILES_DIR}/install/kubernetes/helm/istio/README.md" + rm -rf "${COMMON_FILES_DIR}/install/kubernetes/helm/istio/README.md.bak" +} + function create_linux_archive() { local istioctl_path="${BIN_DIR}/istioctl" @@ -154,6 +169,7 @@ ls -l "${COMMON_FILES_DIR}/install/kubernetes/helm/istio" # Changing dir such that tar and zip files are # created with right hiereachy pushd "${COMMON_FILES_DIR}/.." +replace_with_release_charts_url create_linux_archive create_osx_archive create_windows_archive From 84ff5bf6094690df37ac4e4a6ddb0b9602fbff4d Mon Sep 17 00:00:00 2001 From: Chun Lin Yang Date: Wed, 21 Nov 2018 10:13:26 +0800 Subject: [PATCH 2/5] Add monthly flag to replace Signed-off-by: Chun Lin Yang --- prow/release-test.sh | 1 + release/create_release_archives.sh | 12 +++++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/prow/release-test.sh b/prow/release-test.sh index c8fda4ef5c85..00d30ed7dd52 100755 --- a/prow/release-test.sh +++ b/prow/release-test.sh @@ -45,6 +45,7 @@ cat << EOF > "/workspace/gcb_env.sh" export CB_BRANCH="${GIT_SHA}" export CB_VERSION="${GIT_SHA}" export CB_ISTIOCTL_DOCKER_HUB="docker.io/istio" +export CB_PIPELINE_TYPE=daily EOF } diff --git a/release/create_release_archives.sh b/release/create_release_archives.sh index 4fb2a88d3c57..2d34c6238f15 100755 --- a/release/create_release_archives.sh +++ b/release/create_release_archives.sh @@ -64,7 +64,7 @@ set -x [[ -z "${OUTPUT_PATH}" ]] && usage [[ -z "${VER_STRING}" ]] && usage -if ("${BASE_DIR}" = "${TEMP_DIR}"); then +if [ "${BASE_DIR}" = "${TEMP_DIR}" ]; then mktemp -d "${TEMP_DIR}" fi COMMON_FILES_DIR="${BASE_DIR}/istio/istio-${VER_STRING}" @@ -78,10 +78,12 @@ CP=${CP:-"cp"} TAR=${TAR:-"tar"} function replace_with_release_charts_url() { - local origin_url="istio-prerelease/daily-build/master-latest-daily/charts" - local target_url="istio-release/releases/${VER_STRING}/charts" - sed -i.bak "s:${origin_url}:${target_url}:g" "${COMMON_FILES_DIR}/install/kubernetes/helm/istio/README.md" - rm -rf "${COMMON_FILES_DIR}/install/kubernetes/helm/istio/README.md.bak" + if [ "${CB_PIPELINE_TYPE}" = "monthly" ]; then + local origin_url="istio-prerelease/daily-build/master-latest-daily/charts" + local target_url="istio-release/releases/${VER_STRING}/charts" + sed -i.bak "s:${origin_url}:${target_url}:g" "${COMMON_FILES_DIR}/install/kubernetes/helm/istio/README.md" + rm -rf "${COMMON_FILES_DIR}/install/kubernetes/helm/istio/README.md.bak" + fi } function create_linux_archive() { From 7317c116be43ea48674ac6ce605559eab05746f4 Mon Sep 17 00:00:00 2001 From: Chun Lin Yang Date: Wed, 28 Nov 2018 10:35:39 +0800 Subject: [PATCH 3/5] address review comments Signed-off-by: Chun Lin Yang --- install/kubernetes/helm/istio/README.md | 2 +- release/create_release_archives.sh | 13 ++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/install/kubernetes/helm/istio/README.md b/install/kubernetes/helm/istio/README.md index 3ade745639d1..bc405d5b73e5 100644 --- a/install/kubernetes/helm/istio/README.md +++ b/install/kubernetes/helm/istio/README.md @@ -118,7 +118,7 @@ The chart deploys pods that consume minimum resources as specified in the resour 1. Add `istio.io` chart repository and point to the release: ``` - $ helm repo add istio.io https://storage.googleapis.com/istio-prerelease/daily-build/master-latest-daily/charts + $ helm repo add istio.io https://storage.googleapis.com/istio-prerelease/daily-build/release-1.1-latest-daily/charts ``` 1. Build the Helm dependencies: diff --git a/release/create_release_archives.sh b/release/create_release_archives.sh index 2d34c6238f15..48c8ec0f29e2 100755 --- a/release/create_release_archives.sh +++ b/release/create_release_archives.sh @@ -20,12 +20,19 @@ # based on those artifacts, and then stores the tar files # back to the directory. -TEMP_DIR="/tmp/istio.version.XXXX" +TEMP_DIR="$(mktemp -d /tmp/istio.version.XXXX)" BASE_DIR="$TEMP_DIR" ISTIOCTL_SUBDIR=istioctl OUTPUT_PATH="" VER_STRING="" +function cleanup() { + rm -rf "$TEMP_DIR" +} + +# do cleanup before the script exits +trap cleanup EXIT + function usage() { echo "$0 -d path to use for temp directory (optional, randomized default is ${BASE_DIR} ) @@ -64,9 +71,6 @@ set -x [[ -z "${OUTPUT_PATH}" ]] && usage [[ -z "${VER_STRING}" ]] && usage -if [ "${BASE_DIR}" = "${TEMP_DIR}" ]; then - mktemp -d "${TEMP_DIR}" -fi COMMON_FILES_DIR="${BASE_DIR}/istio/istio-${VER_STRING}" BIN_DIR="${COMMON_FILES_DIR}/bin" mkdir -p "${BIN_DIR}" @@ -177,4 +181,3 @@ create_osx_archive create_windows_archive popd -rm -rf "$TEMP_DIR" From 1fa6beff4c41a60c7889e0867638098bf5f8351b Mon Sep 17 00:00:00 2001 From: Chun Lin Yang Date: Fri, 30 Nov 2018 10:33:23 +0800 Subject: [PATCH 4/5] move modify helm values into modify_values.sh Signed-off-by: Chun Lin Yang --- release/create_release_archives.sh | 10 ---------- release/gcb/helm_values.sh | 2 +- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/release/create_release_archives.sh b/release/create_release_archives.sh index 48c8ec0f29e2..a401100cfa45 100755 --- a/release/create_release_archives.sh +++ b/release/create_release_archives.sh @@ -81,15 +81,6 @@ mkdir -p "${BIN_DIR}" CP=${CP:-"cp"} TAR=${TAR:-"tar"} -function replace_with_release_charts_url() { - if [ "${CB_PIPELINE_TYPE}" = "monthly" ]; then - local origin_url="istio-prerelease/daily-build/master-latest-daily/charts" - local target_url="istio-release/releases/${VER_STRING}/charts" - sed -i.bak "s:${origin_url}:${target_url}:g" "${COMMON_FILES_DIR}/install/kubernetes/helm/istio/README.md" - rm -rf "${COMMON_FILES_DIR}/install/kubernetes/helm/istio/README.md.bak" - fi -} - function create_linux_archive() { local istioctl_path="${BIN_DIR}/istioctl" @@ -175,7 +166,6 @@ ls -l "${COMMON_FILES_DIR}/install/kubernetes/helm/istio" # Changing dir such that tar and zip files are # created with right hiereachy pushd "${COMMON_FILES_DIR}/.." -replace_with_release_charts_url create_linux_archive create_osx_archive create_windows_archive diff --git a/release/gcb/helm_values.sh b/release/gcb/helm_values.sh index 2499dddffe73..768f7cdd4c89 100755 --- a/release/gcb/helm_values.sh +++ b/release/gcb/helm_values.sh @@ -44,7 +44,7 @@ function fix_values_yaml() { gsutil -q cp "${tarball_name}" "gs://${CB_GCS_BUILD_PATH}/${tarball_name}" gsutil -q cp "${tarball_name}.sha256" "gs://${CB_GCS_BUILD_PATH}/${tarball_name}.sha256" - echo "DONE fixing gs://${CB_GCS_BUILD_PATH}/${tarball_name} with hub: ${CB_DOCKER_HUB} tag: ${CB_VERSION}" + echo "DONE fixing gs://${CB_GCS_BUILD_PATH}/${tarball_name} with hub: ${CB_DOCKER_HUB} tag: ${CB_VERSION}" } mkdir -p modification-tmp From ee90930827088707a4bd7725a0ec2f25e3cf65dc Mon Sep 17 00:00:00 2001 From: Chun Lin Yang Date: Fri, 30 Nov 2018 12:49:33 +0800 Subject: [PATCH 5/5] add back missed changes Signed-off-by: Chun Lin Yang --- release/gcb/helm_values.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/release/gcb/helm_values.sh b/release/gcb/helm_values.sh index 768f7cdd4c89..6b3754c1ff12 100755 --- a/release/gcb/helm_values.sh +++ b/release/gcb/helm_values.sh @@ -37,6 +37,13 @@ function fix_values_yaml() { # Copy helm charts (build by helm_charts.sh) to be packaged in the tarball. mkdir -vp ./"istio-${CB_VERSION}"/install/kubernetes/helm/charts cp /workspace/charts/* ./"istio-${CB_VERSION}"/install/kubernetes/helm/charts + + # replace prerelease with release location for istio.io repo + if [ "${CB_PIPELINE_TYPE}" = "monthly" ]; then + sed -i.bak "s:istio-prerelease/daily-build.*$:istio-release/releases/${CB_VERSION}/charts:g" ./"istio-${CB_VERSION}"/install/kubernetes/helm/istio/README.md + rm -rf ./"istio-${CB_VERSION}"/install/kubernetes/helm/istio/README.md.bak + echo "Done replacing pre-released charts with released charts for istio.io repo" + fi eval "$zip_cmd" "${tarball_name}" "istio-${CB_VERSION}" sha256sum "${tarball_name}" > "${tarball_name}.sha256"