From 9e2f2d84192d0619cbe85985154b1108db325d3b Mon Sep 17 00:00:00 2001 From: Steve Kriss Date: Mon, 11 Nov 2019 15:04:55 -0700 Subject: [PATCH] remove obsolete gcr.io/heptio-images-related files and docs (#2055) Signed-off-by: Steve Kriss --- hack/gcr-push.sh | 85 -------------------------- heptio-images-fac92d2303ac.json.enc | Bin 2320 -> 0 bytes site/docs/master/build-from-source.md | 2 +- site/docs/v1.2.0/build-from-source.md | 2 +- 4 files changed, 2 insertions(+), 87 deletions(-) delete mode 100755 hack/gcr-push.sh delete mode 100644 heptio-images-fac92d2303ac.json.enc 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 78a4f9c4623d79653ff79ea4ee45f3a20d07bc16..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2320 zcmV+r3Gepbi=lEmXnU9JQq=SUgfUB8{un_#R-lY_?&V5)H!_9#)2 zZpvTq>X*vG>XMp*q7gzZHS?k3GpAKkCp;JEbEqS1CQAS8E(5WhLBwF0;NT&1W*-C} z!?_0rT+QOo_L?6}v!1wcm!}KVeYtdr0h!ffAI&Fp+ojT3no-~@(82EKg5Gah z$q1~6Gi2$+=v<*XU@T_N^~fUg9T1E-`5GMX#2D?3ouY^%vm(vBlxX4zhI&j}q(~Pl zfh2XWS>KYC?R-peClLijCevC55%m8of%R{YeNBF#$bNyd4{Kin>H}Y-qE-B;6)%AP zWyrl?Gd*zPegFAzItVqS{4<0u<0tgTPa;ViP`w$6F zS*naBASh#ZgmW~tvhTHJdOy>E_M6xh$ZKKdE9{;NrMluRR_ptqRoc25=%dhZ0Kyth zJkNZvp3~9WnaqcekB^~K)Oc!Y7;vB*oD90#6Sj-jlC@gC>L1iS7KD9cm;Pav!zKaX zGymbII+~vU=4`bmp6~nkeGG56MvVA(&WqP1FV_^xd3yLxB%vh6ebklBzUR|Nki~PM z15$*}35@E{4@k?xQj1bvTOVW=po;9x+%JZvET|kjW0KQb6L=fd6pJiE!BDIxlEZdb`1T7_v-vk1sPdC%C@2Xm zp~sxQ{7LK*r=Q zG)SB#FEuWzkItgx(5r>_$EuS4OFLP@l)l^)y*rJ`H+uB( z*O~SyorHOtXKa4_6txSM%x0Uej8NP*y&`rttn-Ekcj*v^qFvQ=Xaf6`3KIz0D)R6& zaY{C2r2t6*Cd`->6Nw*iM0h8-7xH%yp0L&8c`^fnXp`x_%e_=YfiE0mi79a!0WQ5e zJ$&xVnA^psa^<CtpGUx$-LAmRAM^8kZwTWiS{-YuWhwf}&v>GVX$4tGyi0P+?r+Uf}(Zh=#|*f0WP%diO#$%E#By z{d82`fO;|%QHEg}Ku*79p@pURS1dhHLIU7;_jNy@#5RlW&p}6Yf0~ejf^`wL6I9p= zS|~Qm4153}D#v8_V4{XpqVZX?gS&5SLX_%)DUjpL+vZG^Ch|Q^ zQfHQ|CT`*P3=KP#ldIG`5ljJj6mGW;{9kVOQL`X(wz#>B)AEpBf%=$rK#CxE3Wi}7E{40r&Iv1;VA6(IS+Gv&a~ zqeZ`mVW|}e!#q-}{+WFe19~>1^xus5?B4K%RMP(*TO$`^hzyuoD=y10 zO(!l~0&NA&3_hK1*P3is_5%PG>!Y+7D!iQ+?dqg6bldHNCzenF%x6skj~(Fj=QG5G zh_PA`KCgulDVjb|Z>#Yu3P6L9Zoq#^_o#Bg8(|dTNaDZZb z`DPl4LbHv)%L&pxr~q#ElH@GssC2@tAhs4jAcecyH+V zFZ&5rFS8a;>}R^JH;G@F+(niTr;M&7lWphrVyeS^ZLNxL;(7B1_I`j!1mf7pE!vzh z56RKz9JirAOlGL?`N}w#APR_?rBoH1(T1rK#W@kBnWC6}FJ*NO*mDmdy<#X5ePpCn3p7e0yCcO-Lgch*UT(GbyMGoN2M@#kEpQimMg0mcPWRM=)yJ9oNZK` zge4%XK^ki=_;GDY9TCo_TfkP6NP6N~U+J&ohJHJ<1eqnt`7$)1raW^IPV|F66V6@J zJy$^M6&`6ODqrK$2se4{5Mhv1jidW-5-hk%+$m9rho2Iffy5b2L zp4DJe>~+GJV9W3z>a;lqpxO`F0LFs;u=XtFy2oW8A_;lXw$&<^0328`$&4VTsizRE z$Pft$l^gE{Pr^s1+k)N24Sp1@n!)hLhKlPq9ykv$R00|9JEX5VZoUg!51C9H2<*-f q(FFv-8-NtQa