From f3cc62d870fa05c2a710dbc6182afd0df857ff8c Mon Sep 17 00:00:00 2001
From: Shyam Jeedigunta <shyamjvs@google.com>
Date: Thu, 8 Feb 2018 14:30:16 +0100
Subject: [PATCH] Unify image registry value in kubemark setup scripts

---
 test/kubemark/cloud-provider-config.sh            |  1 +
 test/kubemark/resources/hollow-node_template.yaml |  4 ++--
 test/kubemark/start-kubemark.sh                   | 12 +-----------
 3 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/test/kubemark/cloud-provider-config.sh b/test/kubemark/cloud-provider-config.sh
index a3aab1088e..79d760ef42 100755
--- a/test/kubemark/cloud-provider-config.sh
+++ b/test/kubemark/cloud-provider-config.sh
@@ -17,4 +17,5 @@
 CLOUD_PROVIDER="${CLOUD_PROVIDER:-gce}"
 CONTAINER_REGISTRY="${CONTAINER_REGISTRY:-gcr.io}"
 PROJECT="${PROJECT:-}"
+FULL_REGISTRY="${CONTAINER_REGISTRY}/${PROJECT}"
 KUBEMARK_IMAGE_MAKE_TARGET="${KUBEMARK_IMAGE_MAKE_TARGET:-gcloudpush}"
diff --git a/test/kubemark/resources/hollow-node_template.yaml b/test/kubemark/resources/hollow-node_template.yaml
index 3a16f1f353..836a4a574d 100644
--- a/test/kubemark/resources/hollow-node_template.yaml
+++ b/test/kubemark/resources/hollow-node_template.yaml
@@ -35,7 +35,7 @@ spec:
         emptyDir: {}
       containers:
       - name: hollow-kubelet
-        image: {{registry}}/{{project}}/kubemark:latest
+        image: {{full_registry}}/kubemark:latest
         ports:
         - containerPort: 4194
         - containerPort: 10250
@@ -67,7 +67,7 @@ spec:
         securityContext:
           privileged: true
       - name: hollow-proxy
-        image: {{registry}}/{{project}}/kubemark:latest
+        image: {{full_registry}}/kubemark:latest
         env:
         - name: CONTENT_TYPE
           valueFrom:
diff --git a/test/kubemark/start-kubemark.sh b/test/kubemark/start-kubemark.sh
index 6d8ed41afb..25170dd7fe 100755
--- a/test/kubemark/start-kubemark.sh
+++ b/test/kubemark/start-kubemark.sh
@@ -395,8 +395,7 @@ current-context: kubemark-context")
   proxy_mem=$((100 * 1024 + ${proxy_mem_per_node}*${NUM_NODES}))
   sed -i'' -e "s/{{HOLLOW_PROXY_CPU}}/${proxy_cpu}/g" "${RESOURCE_DIRECTORY}/hollow-node.yaml"
   sed -i'' -e "s/{{HOLLOW_PROXY_MEM}}/${proxy_mem}/g" "${RESOURCE_DIRECTORY}/hollow-node.yaml"
-  sed -i'' -e "s/{{registry}}/${CONTAINER_REGISTRY}/g" "${RESOURCE_DIRECTORY}/hollow-node.yaml"
-  sed -i'' -e "s/{{project}}/${PROJECT}/g" "${RESOURCE_DIRECTORY}/hollow-node.yaml"
+  sed -i'' -e "s'{{full_registry}}'${FULL_REGISTRY}'g" "${RESOURCE_DIRECTORY}/hollow-node.yaml"
   sed -i'' -e "s/{{master_ip}}/${MASTER_IP}/g" "${RESOURCE_DIRECTORY}/hollow-node.yaml"
   sed -i'' -e "s/{{kubelet_verbosity_level}}/${KUBELET_TEST_LOG_LEVEL}/g" "${RESOURCE_DIRECTORY}/hollow-node.yaml"
   sed -i'' -e "s/{{kubeproxy_verbosity_level}}/${KUBEPROXY_TEST_LOG_LEVEL}/g" "${RESOURCE_DIRECTORY}/hollow-node.yaml"
@@ -457,15 +456,6 @@ write-local-kubeconfig
 copy-resource-files-to-master
 start-master-components
 
-# TODO: Simplify. The caller should have to pass a full registry or nothing.
-if [[ -n "${CONTAINER_REGISTRY}" && -n "${PROJECT}" ]]; then
-  FULL_REGISTRY="${CONTAINER_REGISTRY}/${PROJECT}"
-elif [[ -n "${CONTAINER_REGISTRY}" ]]; then
-  FULL_REGISTRY="${CONTAINER_REGISTRY}"
-else
-  FULL_REGISTRY=staging-k8s.gcr.io
-fi
-
 # Setup for hollow-nodes.
 echo ""
 echo -e "${color_yellow}STARTING SETUP FOR HOLLOW-NODES${color_norm}"