From 2f3215b71a725727d86af57c926e0bb3532ca5e0 Mon Sep 17 00:00:00 2001
From: gadotroee <55343099+gadotroee@users.noreply.github.com>
Date: Sun, 23 May 2021 13:34:32 +0300
Subject: [PATCH] Fix mizu image parameter (#53)

---
 cli/Makefile       | 3 ++-
 cli/cmd/tap.go     | 4 ++--
 cli/mizu/consts.go | 1 +
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/cli/Makefile b/cli/Makefile
index 38df0082b..a7af9999c 100644
--- a/cli/Makefile
+++ b/cli/Makefile
@@ -1,5 +1,6 @@
 FOLDER=$(GOOS).$(GOARCH)
 COMMIT_HASH=$(shell git rev-parse HEAD)
+GIT_BRANCH=$(shell git branch --show-current)
 
 .PHONY: help
 .DEFAULT_GOAL := help
@@ -11,7 +12,7 @@ install:
 	go install mizu.go
 
 build:	## build mizu CLI binary (select platform via GOOS / GOARCH env variables)
-	go build -ldflags="-X 'github.com/up9inc/mizu/cli/mizu.GitCommitHash=$(COMMIT_HASH)'" -o bin/$(FOLDER)/mizu mizu.go
+	go build -ldflags="-X 'github.com/up9inc/mizu/cli/mizu.GitCommitHash=$(COMMIT_HASH)' -X 'github.com/up9inc/mizu/cli/mizu.Branch=$(GIT_BRANCH)'" -o bin/$(FOLDER)/mizu mizu.go
 
 build-all:  ## build for all supported platforms
 	@echo "Compiling for every OS and Platform"
diff --git a/cli/cmd/tap.go b/cli/cmd/tap.go
index 6985d9422..77570d254 100644
--- a/cli/cmd/tap.go
+++ b/cli/cmd/tap.go
@@ -2,7 +2,7 @@ package cmd
 
 import (
 	"errors"
-
+	"fmt"
 	"github.com/spf13/cobra"
 
 	"github.com/up9inc/mizu/cli/config"
@@ -34,6 +34,6 @@ func init() {
 	tapCmd.Flags().Uint16VarP(&config.Configuration.GuiPort, "gui-port", "p", 8899, "Provide a custom port for the web interface webserver")
 	tapCmd.Flags().StringVarP(&config.Configuration.Namespace, "namespace", "n", "", "Namespace selector")
 	tapCmd.Flags().StringVarP(&config.Configuration.KubeConfigPath, "kubeconfig", "k", "", "Path to kubeconfig file")
-	tapCmd.Flags().StringVarP(&config.Configuration.MizuImage, "mizu-image", "", "gcr.io/up9-docker-hub/mizu/develop:latest", "Custom image for mizu collector")
+	tapCmd.Flags().StringVarP(&config.Configuration.MizuImage, "mizu-image", "", fmt.Sprintf("gcr.io/up9-docker-hub/mizu/%s:latest", mizu.Branch), "Custom image for mizu collector")
 	tapCmd.Flags().Uint16VarP(&config.Configuration.MizuPodPort, "mizu-port", "", 8899, "Port which mizu cli will attempt to forward from the mizu collector pod")
 }
diff --git a/cli/mizu/consts.go b/cli/mizu/consts.go
index 356da23ab..48b998a0b 100644
--- a/cli/mizu/consts.go
+++ b/cli/mizu/consts.go
@@ -2,6 +2,7 @@ package mizu
 
 var (
 	Version = "v0.0.1"
+	Branch = "develop"
 	GitCommitHash = "" // this var is overridden using ldflags in makefile when building
 )