|
|
@ -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)
|
|
|
|