Merge pull request #147 from schemahero/use-right-image-tag

Use the schemahero image name from the env
schemahero · Apr 7, 2020 · 5de0014 · 5de0014
2 parents 1431f04 + df9ba67
commit 5de0014
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 1 deletion.
diff --git a/pkg/controller/migration/objects.go b/pkg/controller/migration/objects.go
@@ -2,6 +2,7 @@ package migration
 
 import (
 	"fmt"
+	"os"
 
 	databasesv1alpha3 "github.com/schemahero/schemahero/pkg/apis/databases/v1alpha3"
 	schemasv1alpha3 "github.com/schemahero/schemahero/pkg/apis/schemas/v1alpha3"
@@ -55,6 +56,10 @@ func podNameForMigrationApply(databaseName string, tableName string, migrationID
 
 func getApplyPod(migrationID string, namespace string, connectionURI string, database *databasesv1alpha3.Database, table *schemasv1alpha3.Table) (*corev1.Pod, error) {
 	imageName := "schemahero/schemahero:alpha"
+	if os.Getenv("SCHEMAHERO_IMAGE_NAME") != "" {
+		imageName = os.Getenv("SCHEMAHERO_IMAGE_NAME")
+	}
+
 	nodeSelector := make(map[string]string)
 
 	if database.Spec.SchemaHero != nil {

diff --git a/pkg/controller/table/objects.go b/pkg/controller/table/objects.go
@@ -3,6 +3,7 @@ package table
 import (
 	"crypto/sha256"
 	"fmt"
+	"os"
 
 	"github.com/pkg/errors"
 	databasesv1alpha3 "github.com/schemahero/schemahero/pkg/apis/databases/v1alpha3"
@@ -81,6 +82,10 @@ func getPlanConfigMap(database *databasesv1alpha3.Database, table *schemasv1alph
 
 func (r *ReconcileTable) getPlanPod(database *databasesv1alpha3.Database, table *schemasv1alpha3.Table) (*corev1.Pod, error) {
 	imageName := "schemahero/schemahero:alpha"
+	if os.Getenv("SCHEMAHERO_IMAGE_NAME") != "" {
+		imageName = os.Getenv("SCHEMAHERO_IMAGE_NAME")
+	}
+
 	nodeSelector := make(map[string]string)
 	driver := ""
 	connectionURI := ""

diff --git a/pkg/installer/manager.go b/pkg/installer/manager.go
@@ -3,9 +3,12 @@ package installer
 import (
 	"bytes"
 	"context"
+	"fmt"
+	"strings"
 
 	"github.com/pkg/errors"
 	"github.com/schemahero/schemahero/pkg/client/schemaheroclientset/scheme"
+	"github.com/schemahero/schemahero/pkg/version"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	kuberneteserrors "k8s.io/apimachinery/pkg/api/errors"
@@ -188,16 +191,27 @@ func manager(isEnterprise bool, namespace string) *appsv1.StatefulSet {
 		},
 	}
 
+	schemaheroTag := version.Version()
+	if strings.HasPrefix(schemaheroTag, "v") {
+		schemaheroTag = strings.TrimPrefix(schemaheroTag, "v")
+	}
+	schemaHeroImage := fmt.Sprintf("schemahero/schemahero:%s", schemaheroTag)
+
 	if isEnterprise {
 		env = append(env, corev1.EnvVar{
 			Name:  "SCHEMAHERO_IMAGE_NAME",
-			Value: `repl{{ LocalImageName "schemahero/schemahero:0.8.0"}}`,
+			Value: fmt.Sprintf(`repl{{ LocalImageName "%s"}}`, schemaHeroImage),
 		})
 
 		env = append(env, corev1.EnvVar{
 			Name:  "SCHEMAHERO_IMAGE_PULLSECRET",
 			Value: `repl{{ LocalRegistryImagePullSecret }}`,
 		})
+	} else {
+		env = append(env, corev1.EnvVar{
+			Name:  "SCHEMAHERO_IMAGE_NAME",
+			Value: schemaHeroImage,
+		})
 	}
 
 	return &appsv1.StatefulSet{