small out fixes, changed hello-world env names for clarity

Makefile

@@ -1,6 +1,3 @@
-GIT_COMMIT = $(shell git log -n 1 --format="%h" -- ./)
-GIT_REF := $(shell git symbolic-ref -q --short HEAD || git describe --tags --exact-match)
-
 BUILD_DIR = bin
 REL_DIR = release
 
@@ -18,9 +15,9 @@ docs:
 
 .PHONY: release
 release: clean
-	GIT_COMMIT=$(GIT_COMMIT) GIT_REF=$(GIT_REF) ./build.sh darwin $(BUILD_DIR) $(REL_DIR)
-	GIT_COMMIT=$(GIT_COMMIT) GIT_REF=$(GIT_REF) ./build.sh linux $(BUILD_DIR) $(REL_DIR)
-	GIT_COMMIT=$(GIT_COMMIT) GIT_REF=$(GIT_REF) ./build.sh windows $(BUILD_DIR) $(REL_DIR)
+	./build.sh darwin $(BUILD_DIR) $(REL_DIR)
+	./build.sh linux $(BUILD_DIR) $(REL_DIR)
+	./build.sh windows $(BUILD_DIR) $(REL_DIR)
 
 .PHONY: clean
 clean:

build.sh

@@ -2,14 +2,23 @@
 
 set -e
 
-export CGO_ENABLED=0
-export GOARCH=amd64
+git_commit=$(git log -n 1 --format="%h" -- ./)
+git_ref=$(git symbolic-ref -q --short HEAD || git describe --tags --exact-match)
 
 export GOOS=${1:-"linux"}
 build_dir=${2:-"bin"}
 rel_dir=${3:-"release"}
-GIT_REF=${4:-"$GIT_REF"}
 
+GIT_COMMIT=${GIT_COMMIT:-"$git_commit"}
+GIT_REF=${GIT_REF:-"$git_ref"}
+
+export CGO_ENABLED=0
+export GOARCH=amd64
+
+if [ -z "${GIT_COMMIT}" ]; then
+    echo "Environment variable GIT_COMMIT must be set for release target"
+    exit 1
+fi
 if [ -z "${GIT_REF}" ]; then
     echo "Environment variable GIT_REF must be set for release target"
     exit 1
@@ -22,6 +31,9 @@ if [ "$GOOS" == "windows" ]; then
     bin="fox.exe"
 fi
 
+echo "Creating Fox release package..."
+echo "Git Commit: $GIT_COMMIT, Git Ref: $GIT_REF, Package: ${rel_dir}/${tar}"
+
 go build \
     -o "${build_dir}/${bin}" \
     -ldflags " \
@@ -35,3 +47,5 @@ tar -czvf "${rel_dir}/${tar}" --transform='s,.*/,,' "${build_dir}/${bin}" LICENS
     cd "${rel_dir}"
     sha256sum "${tar}" >"${tar}.sha256sum"
 )
+
+echo "Fin."

cmd/deploy.go

@@ -43,5 +43,6 @@ func runDeploy(cmd *cobra.Command, args []string) {
 	d := r.Deploy(name)
 	// Makes output less cluttered.
 	d.ManagedFields = nil
+	log.InfoNewline()
 	log.Marshal(d)
 }

cmd/publish.go

@@ -50,6 +50,7 @@ func runPublish(cmd *cobra.Command, args []string) error {
 		d := r.Deploy(args[0])
 		// Makes output less cluttered.
 		d.ManagedFields = nil
+		log.InfoNewline()
 		log.Marshal(d)
 	}
 

cmd/root.go

@@ -32,7 +32,7 @@ deploy, and release your KubeFox components.
 func init() {
 	rootCmd.PersistentFlags().StringVarP(&cfg.Flags.RepoPath, "repo", "r", pwd(), "path of git repo")
 	rootCmd.PersistentFlags().StringVarP(&cfg.Flags.OutFormat, "output", "o", "yaml", `output format. One of: "json", "yaml"`)
-	rootCmd.PersistentFlags().BoolVarP(&cfg.Flags.Info, "info", "i", true, "enable info output")
+	rootCmd.PersistentFlags().BoolVarP(&cfg.Flags.Info, "info", "i", false, "enable info output")
 	rootCmd.PersistentFlags().BoolVarP(&cfg.Flags.Verbose, "verbose", "v", false, "enable verbose output")
 }
 

efs/hello-world/hack/env-dev-john.yaml → efs/hello-world/hack/env-universe.yaml

@@ -1,7 +1,7 @@
 apiVersion: kubefox.xigxog.io/v1alpha1
 kind: Environment
 metadata:
-  name: dev-john
+  name: universe
 spec:
   vars:
-    who: John
+    who: Universe

efs/hello-world/hack/env-dev.yaml → efs/hello-world/hack/env-world.yaml

@@ -1,7 +1,7 @@
 apiVersion: kubefox.xigxog.io/v1alpha1
 kind: Environment
 metadata:
-  name: dev
+  name: world
 spec:
   vars:
     who: World

internal/config/config.go

@@ -117,7 +117,7 @@ func (cfg *Config) Setup() {
 	if kindOnly {
 		cfg.ContainerRegistry.Address = LocalRegistry
 		cfg.ContainerRegistry.Token = ""
-		cfg.Kind.ClusterName = utils.NamePrompt("Kind cluster", "kubefox", true)
+		cfg.Kind.ClusterName = utils.NamePrompt("Kind cluster", "kind", true)
 		cfg.Kind.AlwaysLoad = true
 		cfg.done()
 		return

internal/repo/build.go

@@ -17,6 +17,7 @@ import (
 
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/filters"
+	"github.com/docker/docker/api/types/registry"
 	"github.com/docker/docker/pkg/archive"
 	"github.com/moby/patternmatcher/ignorefile"
 	"github.com/xigxog/kubefox-cli/efs"
@@ -142,8 +143,12 @@ func (r *repo) KindLoad(img string) {
 	}
 
 	cmd := exec.Command("kind", "load", "docker-image", "--name="+kind, img)
-	if err := cmd.Run(); err != nil {
+
+	if out, err := cmd.CombinedOutput(); err != nil {
+		log.Error("%s", strings.TrimSpace(string(out)))
 		log.Error("Error loading component image into Kind: %v", err)
+	} else {
+		log.Verbose("%s", strings.TrimSpace(string(out)))
 	}
 }
 
@@ -152,7 +157,7 @@ func (r *repo) GetRegAuth() string {
 	if r.cfg.GitHub.Token != "" {
 		token = r.cfg.GitHub.Token
 	}
-	authCfg, _ := json.Marshal(types.AuthConfig{
+	authCfg, _ := json.Marshal(registry.AuthConfig{
 		Username: "kubefox",
 		Password: token,
 	})

internal/repo/repo.go

@@ -133,7 +133,7 @@ func (r *repo) GetRefName() string {
 	}
 
 	if gitRef.Name().IsBranch() {
-		return "branch/" + gitRef.Name().Short()
+		return gitRef.Name().String()
 	}
 
 	// find tag
@@ -144,7 +144,7 @@ func (r *repo) GetRefName() string {
 	}
 	tags.ForEach(func(tag *plumbing.Reference) error {
 		if gitRef.Hash() == tag.Hash() {
-			refName = "tag/" + tag.Name().Short()
+			refName = tag.Name().String()
 		}
 		return nil
 	})