Refactor: Move kustomize set image to it's own script (#1475)

* Refactor: Move kustomize set image to it's own script This aids development by breaking the scripts into separate steps that can be run individually
google · Feb 26, 2020 · ba1c7e0 · ba1c7e0
1 parent 843f369
commit ba1c7e0
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 14 deletions.
diff --git a/scripts/deploy.sh b/scripts/deploy.sh
@@ -54,11 +54,5 @@ echo "Pushing docker images..."
 docker-compose push
 
 echo "Updating jobs..."
-cd deploy/kubernetes/base
-kustomize edit set image gcr.io/key-transparency/keytransparency-monitor:${TRAVIS_COMMIT}
-kustomize edit set image gcr.io/key-transparency/keytransparency-sequencer:${TRAVIS_COMMIT}
-kustomize edit set image gcr.io/key-transparency/keytransparency-server:${TRAVIS_COMMIT}
-kustomize edit set image gcr.io/key-transparency/prometheus:${TRAVIS_COMMIT}
-kustomize edit set image gcr.io/key-transparency/init:${TRAVIS_COMMIT}
-cd -
+./scripts/kustomize_image_tag.sh $TRAVIS_COMMIT
 kubectl apply -k deploy/kubernetes/overlays/gke
diff --git a/scripts/kubernetes_test.sh b/scripts/kubernetes_test.sh
@@ -16,13 +16,7 @@ kind load docker-image gcr.io/key-transparency/keytransparency-server:${TRAVIS_C
 kind load docker-image gcr.io/key-transparency/prometheus:${TRAVIS_COMMIT}
 kind load docker-image gcr.io/key-transparency/init:${TRAVIS_COMMIT}
 
-cd deploy/kubernetes/base
-kustomize edit set image gcr.io/key-transparency/keytransparency-monitor:${TRAVIS_COMMIT}
-kustomize edit set image gcr.io/key-transparency/keytransparency-sequencer:${TRAVIS_COMMIT}
-kustomize edit set image gcr.io/key-transparency/keytransparency-server:${TRAVIS_COMMIT}
-kustomize edit set image gcr.io/key-transparency/prometheus:${TRAVIS_COMMIT}
-kustomize edit set image gcr.io/key-transparency/init:${TRAVIS_COMMIT}
-cd -
+./scripts/kustomize_image_tag.sh $TRAVIS_COMMIT
 
 # kubectl exits with 1 if kt-secret does not exist
 if ! kubectl get secret kt-tls; then

diff --git a/scripts/kustomize_image_tag.sh b/scripts/kustomize_image_tag.sh
@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+set -ex
+
+# This script sets the image tag used by kustomize.
+# It takes an optional argument specifying the image tag.
+# If the argument is omitted, the script will use the current git commit as the tag.
+TRAVIS_COMMIT=${1:-$(git rev-parse HEAD)}
+cd deploy/kubernetes/base
+kustomize edit set image gcr.io/key-transparency/keytransparency-monitor:${TRAVIS_COMMIT}
+kustomize edit set image gcr.io/key-transparency/keytransparency-sequencer:${TRAVIS_COMMIT}
+kustomize edit set image gcr.io/key-transparency/keytransparency-server:${TRAVIS_COMMIT}
+kustomize edit set image gcr.io/key-transparency/prometheus:${TRAVIS_COMMIT}
+kustomize edit set image gcr.io/key-transparency/init:${TRAVIS_COMMIT}
+cd -
+