Use latest container image when version is empty

Signed-off-by: Nolan Brubaker <brubakern@vmware.com>
vmware-tanzu · May 3, 2019 · 134740b · 134740b
1 parent 6ebedf6
commit 134740b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/pkg/install/deployment.go b/pkg/install/deployment.go
@@ -70,7 +70,7 @@ func WithRestoreOnly() podTemplateOption {
 func Deployment(namespace string, opts ...podTemplateOption) *appsv1beta1.Deployment {
 	// TODO: Add support for server args
 	c := &podTemplateConfig{
-		image: "gcr.io/heptio-images/velero:latest",
+		image: DefaultImage,
 	}
 
 	for _, opt := range opts {

diff --git a/pkg/install/resources.go b/pkg/install/resources.go
@@ -28,8 +28,16 @@ import (
 	"github.com/heptio/velero/pkg/buildinfo"
 )
 
+// Use "latest" if the build process didn't support a version
+func imageVersion() string {
+	if buildinfo.Version == "" {
+		return "latest"
+	}
+	return buildinfo.Version
+}
+
 // DefaultImage is the default image to use for the Velero deployment and restic daemonset containers.
-var DefaultImage = "gcr.io/heptio-images/velero:" + buildinfo.Version
+var DefaultImage = "gcr.io/heptio-images/velero:" + imageVersion()
 
 func labels() map[string]string {
 	return map[string]string{