Add version as unknown if version.Get().Version is empty (#2097)

GoogleContainerTools · May 9, 2019 · 3e21e73 · 3e21e73
1 parent fdc0d37
commit 3e21e73
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/pkg/skaffold/runner/labeller.go b/pkg/skaffold/runner/labeller.go
@@ -24,6 +24,8 @@ import (
 
 const (
 	K8ManagedByLabel = "app.kubernetes.io/managed-by"
+	UnknownVersion   = "unknown"
+	Empty            = ""
 )
 
 // DefaultLabeller adds K9 style managed-by label
@@ -32,7 +34,7 @@ type DefaultLabeller struct {
 }
 
 func NewLabeller(verStr string) *DefaultLabeller {
-	if verStr == "" {
+	if verStr == Empty {
 		verStr = version.Get().Version
 	}
 	return &DefaultLabeller{
@@ -41,7 +43,11 @@ func NewLabeller(verStr string) *DefaultLabeller {
 }
 
 func (d *DefaultLabeller) Labels() map[string]string {
+	version := d.version
+	if version == Empty {
+		version = UnknownVersion
+	}
 	return map[string]string{
-		K8ManagedByLabel: fmt.Sprintf("skaffold-%s", d.version),
+		K8ManagedByLabel: fmt.Sprintf("skaffold-%s", version),
 	}
 }
diff --git a/pkg/skaffold/runner/labeller_test.go b/pkg/skaffold/runner/labeller_test.go
@@ -20,11 +20,10 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/version"
 	"github.com/GoogleContainerTools/skaffold/testutil"
 )
 
-func TestDEfaultLabeller(t *testing.T) {
+func TestDefaultLabeller(t *testing.T) {
 	var tests = []struct {
 		description string
 		version     string
@@ -36,8 +35,8 @@ func TestDEfaultLabeller(t *testing.T) {
 			expected:    "skaffold-1.0",
 		},
 		{
-			description: "no version",
-			expected:    fmt.Sprintf("skaffold-%s", version.Get().Version),
+			description: "empty version should add postfix unknown",
+			expected:    fmt.Sprintf("skaffold-unknown"),
 		},
 	}