Parameterise the image repo and tag of the ES pilot

jetstack · Dec 15, 2017 · 25d4624 · 25d4624
1 parent 4abb2d8
commit 25d4624
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/hack/e2e.sh b/hack/e2e.sh
@@ -1,8 +1,18 @@
 #!/bin/bash
 set -eux
 
+
 : ${TEST_PREFIX:=""}
 
+: ${NAVIGATOR_IMAGE_REPOSITORY:="jetstackexperimental"}
+: ${NAVIGATOR_IMAGE_TAG:="build"}
+: ${NAVIGATOR_IMAGE_PULLPOLICY:="Never"}
+
+export \
+    NAVIGATOR_IMAGE_REPOSITORY \
+    NAVIGATOR_IMAGE_TAG \
+    NAVIGATOR_IMAGE_PULLPOLICY
+
 NAVIGATOR_NAMESPACE="navigator"
 RELEASE_NAME="nav-e2e"
 
@@ -104,7 +114,11 @@ function test_elasticsearchcluster() {
     # Create and delete an ElasticSearchCluster
     if ! kubectl create \
             --namespace "${namespace}" \
-            --filename "${SCRIPT_DIR}/testdata/es-cluster-test.yaml"; then
+            --filename \
+            <(envsubst \
+                  '$NAVIGATOR_IMAGE_REPOSITORY:$NAVIGATOR_IMAGE_TAG:$NAVIGATOR_IMAGE_PULLPOLICY' \
+                  < "${SCRIPT_DIR}/testdata/es-cluster-test.template.yaml")
+    then
         fail_test "Failed to create elasticsearchcluster"
     fi
     if ! kubectl get \

diff --git a/hack/testdata/es-cluster-test.yaml → hack/testdata/es-cluster-test.template.yaml b/hack/testdata/es-cluster-test.yaml → hack/testdata/es-cluster-test.template.yaml
@@ -7,9 +7,9 @@ spec:
   - vm.max_map_count=262144
 
   pilot:
-    repository: jetstackexperimental/navigator-pilot-elasticsearch
-    tag: build
-    pullPolicy: Never
+    repository: ${NAVIGATOR_IMAGE_REPOSITORY}/navigator-pilot-elasticsearch
+    tag: ${NAVIGATOR_IMAGE_TAG}
+    pullPolicy: ${NAVIGATOR_IMAGE_PULLPOLICY}
 
   image:
     repository: docker.elastic.co/elasticsearch/elasticsearch