diff --git a/hack/gcr-push.sh b/hack/gcr-push.sh deleted file mode 100755 index 8001b24b3..000000000 --- a/hack/gcr-push.sh +++ /dev/null @@ -1,85 +0,0 @@ -#!/bin/bash - -# Copyright 2019 the Velero contributors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# gcr-push is invoked by the CI/CD system to deploy docker images to Google Container Registry. -# It will build images for all commits to master and all git tags. -# The highest, non-prerelease semantic version will also be given the `latest` tag. - -set +x - -if [[ -z "$TRAVIS" ]]; then - echo "This script is intended to be run only on Travis." >&2 - exit 1 -fi - -# Return value is written into HIGHEST -HIGHEST="" -function highest_release() { - # Loop through the tags since pre-release versions come before the actual versions. - # Iterate til we find the first non-pre-release - - # This is not necessarily the most recently made tag; instead, we want it to be the highest semantic version. - # The most recent tag could potentially be a lower semantic version, made as a point release for a previous series. - # As an example, if v1.3.0 exists and we create v1.2.2, v1.3.0 should still be `latest`. - # `git describe --tags $(git rev-list --tags --max-count=1)` would return the most recently made tag. - - for t in $(git tag -l --sort=-v:refname); - do - # If the tag has alpha, beta or rc in it, it's not "latest" - if [[ "$t" == *"beta"* || "$t" == *"alpha"* || "$t" == *"rc"* ]]; then - continue - fi - HIGHEST="$t" - break - done -} - -if [[ "$BRANCH" == "master" ]]; then - VERSION="$BRANCH" -elif [[ ! -z "$TRAVIS_TAG" ]]; then - # Tags aren't fetched by Travis on checkout, and we don't need them for master - git fetch --tags - # Calculate the latest release if there's a tag. - highest_release - VERSION="$TRAVIS_TAG" -else - # If we're not on master and we're not building a tag, exit early. - exit 0 -fi - - -# Assume we're not tagging `latest` by default, and never on master. -TAG_LATEST=false -if [[ "$BRANCH" == "master" ]]; then - echo "Building master, not tagging latest." -elif [[ "$TRAVIS_TAG" == "$HIGHEST" ]]; then - TAG_LATEST=true -fi - -# Debugging info -echo "Highest tag found: $HIGHEST" -echo "BRANCH: $BRANCH" -echo "TRAVIS_TAG: $TRAVIS_TAG" -echo "TAG_LATEST: $TAG_LATEST" - -openssl aes-256-cbc -K $encrypted_f58ab4413c21_key -iv $encrypted_f58ab4413c21_iv -in heptio-images-fac92d2303ac.json.enc -out heptio-images-fac92d2303ac.json -d -gcloud auth activate-service-account --key-file heptio-images-fac92d2303ac.json -gcloud auth configure-docker -q -unset GIT_HTTP_USER_AGENT - -echo "Building and pushing container images." - -VERSION="$VERSION" TAG_LATEST="$TAG_LATEST" make all-containers all-push diff --git a/heptio-images-fac92d2303ac.json.enc b/heptio-images-fac92d2303ac.json.enc deleted file mode 100644 index 78a4f9c46..000000000 Binary files a/heptio-images-fac92d2303ac.json.enc and /dev/null differ diff --git a/site/docs/master/build-from-source.md b/site/docs/master/build-from-source.md index 28b9ca4c1..f2e204be3 100644 --- a/site/docs/master/build-from-source.md +++ b/site/docs/master/build-from-source.md @@ -75,7 +75,7 @@ If after installing Velero you would like to change the image used by its deploy kubectl -n velero set image deploy/velero velero=myimagerepo/velero:$VERSION ``` -To build a Velero container image, first set the `$REGISTRY` environment variable. For example, if you want to build the `gcr.io/my-registry/velero:master` image, set `$REGISTRY` to `gcr.io/my-registry`. If this variable is not set, the default is `gcr.io/heptio-images`. +To build a Velero container image, first set the `$REGISTRY` environment variable. For example, if you want to build the `gcr.io/my-registry/velero:master` image, set `$REGISTRY` to `gcr.io/my-registry`. If this variable is not set, the default is `velero`. Optionally, set the `$VERSION` environment variable to change the image tag. Then, run: diff --git a/site/docs/v1.2.0/build-from-source.md b/site/docs/v1.2.0/build-from-source.md index 28b9ca4c1..f2e204be3 100644 --- a/site/docs/v1.2.0/build-from-source.md +++ b/site/docs/v1.2.0/build-from-source.md @@ -75,7 +75,7 @@ If after installing Velero you would like to change the image used by its deploy kubectl -n velero set image deploy/velero velero=myimagerepo/velero:$VERSION ``` -To build a Velero container image, first set the `$REGISTRY` environment variable. For example, if you want to build the `gcr.io/my-registry/velero:master` image, set `$REGISTRY` to `gcr.io/my-registry`. If this variable is not set, the default is `gcr.io/heptio-images`. +To build a Velero container image, first set the `$REGISTRY` environment variable. For example, if you want to build the `gcr.io/my-registry/velero:master` image, set `$REGISTRY` to `gcr.io/my-registry`. If this variable is not set, the default is `velero`. Optionally, set the `$VERSION` environment variable to change the image tag. Then, run: