changed to BuildMetadata

pull/3781/head
Ryan Hartje 8 years ago
parent 2c390a845e
commit a7a190ee1f

@ -20,7 +20,6 @@ import (
"os" "os"
"path/filepath" "path/filepath"
"reflect" "reflect"
"strings"
"testing" "testing"
"github.com/ghodss/yaml" "github.com/ghodss/yaml"
@ -59,7 +58,7 @@ func TestDeploymentManifest(t *testing.T) {
} }
// Unreleased versions of helm don't have a release image. See issue 3370 // Unreleased versions of helm don't have a release image. See issue 3370
if tt.name == "default" && !(len(strings.Split(version.Version, ".")) > 2) { if tt.name == "default" && version.BuildMetadata == "unreleased" {
tt.expect = "gcr.io/kubernetes-helm/tiller:canary" tt.expect = "gcr.io/kubernetes-helm/tiller:canary"
} }
if got := dep.Spec.Template.Spec.Containers[0].Image; got != tt.expect { if got := dep.Spec.Template.Spec.Containers[0].Image; got != tt.expect {

@ -18,7 +18,6 @@ package installer // import "k8s.io/helm/cmd/helm/installer"
import ( import (
"fmt" "fmt"
"strings"
"k8s.io/api/core/v1" "k8s.io/api/core/v1"
"k8s.io/helm/pkg/strvals" "k8s.io/helm/pkg/strvals"
@ -102,7 +101,7 @@ func (opts *Options) selectImage() string {
case opts.UseCanary: case opts.UseCanary:
return defaultImage + ":canary" return defaultImage + ":canary"
case opts.ImageSpec == "": case opts.ImageSpec == "":
if !(len(strings.Split(version.Version, ".")) > 2) { if version.BuildMetadata == "unreleased" {
return defaultImage + ":canary" return defaultImage + ":canary"
} }
return fmt.Sprintf("%s:%s", defaultImage, version.Version) return fmt.Sprintf("%s:%s", defaultImage, version.Version)

Loading…
Cancel
Save