Replaced hard coded image tags in kotsadm

cmd/imagedeps/main.go

@@ -4,6 +4,7 @@ import (
 	"bufio"
 	"bytes"
 	"fmt"
+	"go/format"
 	"io/ioutil"
 	"log"
 	"os"
@@ -85,24 +86,39 @@ func generateTaggedImageFiles(ctx generationContext) error {
 		return fmt.Errorf("no references to images found")
 	}
 
-	if err := generateOutput(ctx.outputConstantFilename, constantFileTemplate, references); err != nil {
+	if err := generateOutput(ctx.outputConstantFilename, constantFileTemplate, references, goFmt); err != nil {
 		return fmt.Errorf("failed to generate output file %q %w", ctx.outputConstantFilename, err)
 	}
 
-	if err := generateOutput(ctx.outputEnvFilename, environmentFileTemplate, references); err != nil {
+	if err := generateOutput(ctx.outputEnvFilename, environmentFileTemplate, references, noopPostProcessor); err != nil {
 		return fmt.Errorf("failed to generate file %q %w", ctx.outputEnvFilename, err)
 	}
 
 	return nil
 }
 
-func generateOutput(filename, fileTemplate string, refs []*ImageRef) error {
+type templatePostProcessorFn func(buff []byte)([]byte, error)
+
+func goFmt(buff []byte)([]byte, error){
+	return format.Source(buff)
+}
+
+func noopPostProcessor(buff []byte)([]byte, error) {
+	return buff, nil
+}
+
+func generateOutput(filename, fileTemplate string, refs []*ImageRef, fn templatePostProcessorFn) error {
 	var out bytes.Buffer
 	if err := template.Must(template.New("constants").Parse(fileTemplate)).Execute(&out, refs); err != nil {
 		return err
 	}
 
-	if err := ioutil.WriteFile(filename, out.Bytes(), 0644); err != nil {
+	buff, err := fn(out.Bytes())
+	if err != nil {
+		return err
+	}
+
+	if err := ioutil.WriteFile(filename, buff, 0644); err != nil {
 		return err
 	}
 

cmd/imagedeps/testdata/basic/constants.go

@@ -6,4 +6,4 @@ package image
 
 const (
 	Minio = "minio/minio:RELEASE.2021-09-09T21-37-07Z.fips"
-)
+)

cmd/imagedeps/testdata/filter-github/constants.go

@@ -6,4 +6,4 @@ package image
 
 const (
 	Minio = "minio/minio:RELEASE.2021-09-09T21-37-06Z.xxx"
-)
+)

cmd/imagedeps/testdata/postgres/constants.go

@@ -7,4 +7,4 @@ package image
 const (
 	PostgresAlpine = "postgres:10.18-alpine"
 	PostgresDebian = "postgres:10.18"
-)
+)

cmd/imagedeps/testdata/with-overrides/constants.go

@@ -5,7 +5,7 @@ package image
 // image name.
 
 const (
-	Minio = "minio/minio:RELEASE.2021-09-09T21-37-07Z.fips"
+	Minio          = "minio/minio:RELEASE.2021-09-09T21-37-07Z.fips"
 	PostgresAlpine = "postgres:10.18-alpine"
 	PostgresDebian = "postgres:10.18"
-)
+)

pkg/image/image.go

@@ -10,6 +10,19 @@ import (
 	kustomizetypes "sigs.k8s.io/kustomize/api/types"
 )
 
+// GetTag extracts the image tag from an image reference
+func GetTag(imageRef string) (string, error) {
+	parts := strings.Split(imageRef, ":")
+	if len(parts) < 2 {
+		return "", fmt.Errorf("malformed image reference %q could not find tag", imageRef)
+	}
+	tag := parts[len(parts)-1]
+	if len(tag) == 0 {
+		return "", fmt.Errorf("empty tag")
+	}
+	return parts[len(parts)-1], nil
+}
+
 func ImageInfoFromFile(registry registry.RegistryOptions, nameParts []string) (kustomizetypes.Image, error) {
 	// imageNameParts looks like this:
 	// ["quay.io", "someorg", "imagename", "imagetag"]

pkg/image/image_test.go

@@ -543,3 +543,51 @@ func Test_stripImageTag(t *testing.T) {
 		})
 	}
 }
+
+func TestGetTag(t *testing.T) {
+	tt := []struct{
+		name string
+		imageRef string
+		expectedTag string
+		wantErr bool
+	}{
+		{
+			name:"happy path",
+			imageRef: "some/image:v1.2.3",
+			expectedTag: "v1.2.3",
+		},
+		{
+			name: "failed case",
+			imageRef: "",
+			wantErr: true,
+		},
+		{
+			name: "no tag",
+			imageRef: "foo/bar",
+			wantErr: true,
+		},
+		{
+			name: "fat fingered",
+			imageRef: "some/image:",
+			wantErr: true,
+		},
+		{
+			name: "long image",
+			imageRef: "some/image/image2:v1.2.3",
+			expectedTag: "v1.2.3",
+
+		},
+	}
+
+	for _, tc := range tt {
+		t.Run(tc.name, func(t *testing.T){
+			actual, err := GetTag(tc.imageRef)
+			if tc.wantErr {
+				require.NotNil(t, err)
+				return
+			}
+			require.Nil(t, err)
+			require.Equal(t, tc.expectedTag, actual )
+		})
+	}
+}

pkg/kotsadm/objects/images.go

@@ -3,6 +3,7 @@ package kotsadm
 import (
 	"fmt"
 
+	"github.com/replicatedhq/kots/pkg/image"
 	"github.com/replicatedhq/kots/pkg/kotsadm/types"
 	kotsadmversion "github.com/replicatedhq/kots/pkg/kotsadm/version"
 )
@@ -12,9 +13,10 @@ func GetAdminConsoleImage(deployOptions types.DeployOptions, imageKey string) st
 }
 
 func GetAdminConsoleImages(deployOptions types.DeployOptions) map[string]string {
-	minioTag := "RELEASE.2021-08-05T22-01-19Z"
+	// TODO: Add error handling to this function
+	minioTag, _  := image.GetTag(image.Minio)
 	postgresTag := getPostgresTag(deployOptions)
-	dexTag := "v2.28.1"
+	dexTag, _ := image.GetTag(image.Dex)
 
 	if deployOptions.KotsadmOptions.OverrideVersion != "" {
 		minioTag = deployOptions.KotsadmOptions.OverrideVersion

pkg/kotsadm/objects/postgres_objects.go

@@ -2,6 +2,7 @@ package kotsadm
 
 import (
 	"fmt"
+	"github.com/replicatedhq/kots/pkg/image"
 
 	"github.com/blang/semver"
 	"github.com/pkg/errors"
@@ -251,8 +252,9 @@ func PostgresService(namespace string) *corev1.Service {
 func getPostgresTag(deployOptions types.DeployOptions) string {
 	// use the debian stretch based image for openshift because of this issue in alpine https://github.com/docker-library/postgres/issues/359
 	// TODO: This breaks when the hidden kotsadm-tag CLI flag is used to push images.  There will be only one postgres image.
-	alpineTag := "10.17-alpine"
-	debianTag := "10.17" // use this when version cannot be determined because this tag always works
+	// TODO: Add error handling getPostgres tag should return error
+	alpineTag, _ := image.GetTag(image.PostgresAlpine)
+	debianTag, _ :=  image.GetTag(image.PostgresDebian) // use this when version cannot be determined because this tag always works
 
 	if !deployOptions.IsOpenShift {
 		return alpineTag