From af5e829e1008d73d4fac3f2e7a4089d594f9d51e Mon Sep 17 00:00:00 2001
From: John Schnake <jschnake@vmware.com>
Date: Tue, 13 Aug 2019 14:18:59 -0500
Subject: [PATCH] Add image building/pushing back to Travis

Got authorization to re-add credentials for image pushing to
Travis via their recommended approach outlined here:
https://docs.travis-ci.com/user/encrypting-files/

Fixes #808

Signed-off-by: John Schnake <jschnake@vmware.com>
---
 .gitignore                          |   2 +-
 .travis.yml                         |  51 ++++++++++++----------------
 heptio-images-c14f11347d8b.json.enc | Bin 0 -> 2336 bytes
 heptio-images-ee4b0474b93e.json.enc | Bin 2336 -> 0 bytes
 travis-deploy.sh                    |  14 +++++++-
 5 files changed, 36 insertions(+), 31 deletions(-)
 create mode 100644 heptio-images-c14f11347d8b.json.enc
 delete mode 100644 heptio-images-ee4b0474b93e.json.enc

diff --git a/.gitignore b/.gitignore
index a1a6b99ef..889e4bff8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,7 +11,7 @@ build/
 examples/dev.yaml
 
 # Unencrypted credentials
-heptio-images-ee4b0474b93e.json
+heptio-images-c14f11347d8b.json
 
 # Dynamic Dockerfiles
 Dockerfile-amd64
diff --git a/.travis.yml b/.travis.yml
index ee83d97d4..eeabf67f0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,40 +1,33 @@
 sudo: required
 language: go
 go:
-    - "1.12"
-
+- '1.12'
 services:
-  - docker
-
+- docker
 install: true
-
-script: 
-  - VERBOSE=true make test int 
-  - ./travis-ci.sh 
-
+script:
+- export BRANCH=$(if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then echo $TRAVIS_BRANCH; else echo $TRAVIS_PULL_REQUEST_BRANCH; fi)
+- echo "TRAVIS_BRANCH=$TRAVIS_BRANCH, PR=$TRAVIS_PULL_REQUEST, BRANCH=$BRANCH"
+- VERBOSE=true make test int
+- ./travis-ci.sh
 before_install:
-  # Download and install Kind
-  - curl -L https://github.com/kubernetes-sigs/kind/releases/download/v0.4.0/kind-linux-amd64 --output kind && chmod +x kind
-  - ./kind create cluster --config kind-config.yaml
-  - export KUBECONFIG="$(./kind get kubeconfig-path --name="kind")"
-  - curl -L https://github.com/golang/dep/releases/download/v0.5.3/dep-linux-amd64 --output dep && chmod +x dep
-
+- curl -L https://github.com/kubernetes-sigs/kind/releases/download/v0.4.0/kind-linux-amd64
+  --output kind && chmod +x kind
+- ./kind create cluster --config kind-config.yaml
+- export KUBECONFIG="$(./kind get kubeconfig-path --name="kind")"
+- curl -L https://github.com/golang/dep/releases/download/v0.5.3/dep-linux-amd64 --output
+  dep && chmod +x dep
 before_deploy:
-  # Install gcloud cli here so it gets cached
-  - if [ ! -d ${HOME}/google-cloud-sdk ]; then
-      curl https://sdk.cloud.google.com | bash /dev/stdin --disable-prompts;
-    fi 
-
+- if [ ! -d ${HOME}/google-cloud-sdk ]; then curl https://sdk.cloud.google.com | bash
+  /dev/stdin --disable-prompts; fi
 deploy:
-  - provider: script
-    skip_cleanup: true
-    script: ./travis-deploy.sh
-    on:
-      repo: heptio/sonobuoy
-      all_branches: true
-  
+- provider: script
+  skip_cleanup: true
+  script: ./travis-deploy.sh
+  on:
+    repo: heptio/sonobuoy
+    all_branches: true
 env:
   secure: AsGb+4LLxBE9fo8eJMfuwUK3QTt61TC+HDP+GbzRaYPB27usaSouAvqeLJI2jxDU/oNaDlNarb3A43gZIqbZe+0uT8jdrqnv5pGmX4CooNm52zF4QEQrFpERvfFAdbUKkZ11NLXav3S0iLVb8/iWopF0/yvt7h0ohBzNX/tMs7vYeZ5KbKUF8v7Uwg3VmjIHsvfSmtaEvWPi3302O/lo5J1tB6TH8b/bAXWweU8GKmQnQKES/+tUern+zOT0S47/fyRbvG6KbLdttol9k7KbzWZxG2iHcC65ogmdHD2azZmLyL8s5khDkA2rO4ovnOqse2kxmxn7da7y8k93vWaN1y98RpXw4H6brsH15BzoGoYBaMLg/Kn/JbTkSxPkPr/+6WGJ6lFeGgvArkwCXVyRPpecSH55+kvKmD8wxGnXaQp086cNKBiZYgN4C+T/8XXO011CxgjzLCsyyqr2KGI7c1VXvdiDt+fjVUeE/ftbHFdHH8Oc809U+6sa+6UWFxDcg3fsyIDKqUAh+cOYdjL+8+OpNWiV8p7/Yu+QntbfMuRmkyQz9boYZU58uzFGe0B87nu0Y9O6nIKJWu07nPiPP11CU3iv2aYDfg2y1wvyvk5rWSgnBnD82nHf7ip2/bykbsajK2fcX1sIA/3c7NzWtKauxnfTXLxxqBRbZFkOuoE=
-
 after_success:
-  - bash <(curl -s https://codecov.io/bash)
+- bash <(curl -s https://codecov.io/bash)
diff --git a/heptio-images-c14f11347d8b.json.enc b/heptio-images-c14f11347d8b.json.enc
new file mode 100644
index 0000000000000000000000000000000000000000..4e501433e460773f3759b94af8bf64b153a96a6e
GIT binary patch
literal 2336
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
G9j?p;)_lwW

literal 0
HcmV?d00001

diff --git a/heptio-images-ee4b0474b93e.json.enc b/heptio-images-ee4b0474b93e.json.enc
deleted file mode 100644
index f05461fb2fdd3313e1d6d6165691a944a02c9f9b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2336
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
G{Tyb&5syUx

diff --git a/travis-deploy.sh b/travis-deploy.sh
index bc5f90dc5..7ef150547 100755
--- a/travis-deploy.sh
+++ b/travis-deploy.sh
@@ -12,8 +12,15 @@ function goreleaser() {
     curl -sL https://git.io/goreleaser | bash
 }
 
-if [ ! -z "$TRAVIS_TAG" ]; then
+function gcr_push() {
+    openssl aes-256-cbc -K $encrypted_222a2009ef6d_key -iv $encrypted_222a2009ef6d_iv -in heptio-images-c14f11347d8b.json.enc -out heptio-images-c14f11347d8b.json -d
+    gcloud auth activate-service-account --key-file heptio-images-c14f11347d8b.json
+    # https://github.com/travis-ci/travis-ci/issues/9905
+    unset GIT_HTTP_USER_AGENT
+    IMAGE_BRANCH="$BRANCH" DOCKER="gcloud docker -- " make container push
+}
 
+if [ ! -z "$TRAVIS_TAG" ]; then
     if [ "$(./sonobuoy version --short)" != "$TRAVIS_TAG" ]; then
         echo "sonobuoy version does not match tagged version!" >&2
         echo "sonobuoy short version is $(./sonobuoy version --short)" >&2
@@ -23,4 +30,9 @@ if [ ! -z "$TRAVIS_TAG" ]; then
     fi
 
     goreleaser --skip-validate
+    gcr_push
 fi
+
+if [ "$BRANCH" == "master" ]; then
+    gcr_push
+fi
\ No newline at end of file