From 8d32faad2964d18b95ccc12bba7840eead60878f Mon Sep 17 00:00:00 2001 From: Maxwell Forbes Date: Tue, 11 Nov 2014 23:16:04 +0000 Subject: [PATCH] Make slashes always appended to buckets to avoid forgetting them. --- build/README.md | 4 ++-- build/common.sh | 4 ++-- build/push-official-release.sh | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build/README.md b/build/README.md index 8a2430437e..ff53168a37 100644 --- a/build/README.md +++ b/build/README.md @@ -52,11 +52,11 @@ Env Variable | Default | Description `KUBE_SKIP_CONFIRMATIONS` | `n` | If `y` then no questions are asked and the scripts just continue. `KUBE_GCS_UPLOAD_RELEASE` | `n` | Upload release artifacts to GCS `KUBE_GCS_RELEASE_BUCKET` | `kubernetes-releases-${project_hash}` | The bucket to upload releases to -`KUBE_GCS_RELEASE_PREFIX` | `devel/` | The path under the release bucket to put releases +`KUBE_GCS_RELEASE_PREFIX` | `devel` | The path under the release bucket to put releases `KUBE_GCS_MAKE_PUBLIC` | `y` | Make GCS links readable from anywhere `KUBE_GCS_NO_CACHING` | `y` | Disable HTTP caching of GCS release artifacts. By default GCS will cache public objects for up to an hour. When doing "devel" releases this can cause problems. `KUBE_BUILD_RUN_IMAGES` | `n` | *Experimental* Build Docker images for running most server components. -`KUBE_GCS_DOCKER_REG_PREFIX` | `docker-reg/` | *Experimental* When uploading docker images, the bucket that backs the registry. +`KUBE_GCS_DOCKER_REG_PREFIX` | `docker-reg` | *Experimental* When uploading docker images, the bucket that backs the registry. ## Basic Flow diff --git a/build/common.sh b/build/common.sh index 6d59cbf2a3..06ca611c72 100644 --- a/build/common.sh +++ b/build/common.sh @@ -35,8 +35,8 @@ readonly KUBE_GCS_UPLOAD_RELEASE="${KUBE_GCS_UPLOAD_RELEASE:-n}" readonly KUBE_GCS_NO_CACHING="${KUBE_GCS_NO_CACHING:-y}" readonly KUBE_GCS_MAKE_PUBLIC="${KUBE_GCS_MAKE_PUBLIC:-y}" # KUBE_GCS_RELEASE_BUCKET default: kubernetes-releases-${project_hash} -readonly KUBE_GCS_RELEASE_PREFIX=${KUBE_GCS_RELEASE_PREFIX-devel/} -readonly KUBE_GCS_DOCKER_REG_PREFIX=${KUBE_GCS_DOCKER_REG_PREFIX-docker-reg/} +readonly KUBE_GCS_RELEASE_PREFIX=${KUBE_GCS_RELEASE_PREFIX-devel}/ +readonly KUBE_GCS_DOCKER_REG_PREFIX=${KUBE_GCS_DOCKER_REG_PREFIX-docker-reg}/ # Constants diff --git a/build/push-official-release.sh b/build/push-official-release.sh index bf078941ed..55b62be157 100755 --- a/build/push-official-release.sh +++ b/build/push-official-release.sh @@ -32,7 +32,7 @@ KUBE_GCS_MAKE_PUBLIC=y KUBE_GCS_UPLOAD_RELEASE=y KUBE_GCS_RELEASE_BUCKET=kubernetes-release KUBE_GCS_PROJECT=google-containers -KUBE_GCS_RELEASE_PREFIX=release/${KUBE_RELEASE_VERSION}/ +KUBE_GCS_RELEASE_PREFIX=release/${KUBE_RELEASE_VERSION} KUBE_ROOT=$(dirname "${BASH_SOURCE}")/.. source "$KUBE_ROOT/build/common.sh"