fix: harness image name generation (#195)

* fix: harness image generation

* update logic

* fix job stack ctrl unit test

Author: floreks

pkg/controller/stacks/job.go

@@ -7,7 +7,6 @@ import (
 	"strings"
 
 	console "github.com/pluralsh/console-client-go"
-	consoleclient "github.com/pluralsh/deployment-operator/pkg/client"
 	"github.com/pluralsh/polly/algorithms"
 	"github.com/samber/lo"
 	batchv1 "k8s.io/api/batch/v1"
@@ -16,6 +15,8 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 	"sigs.k8s.io/controller-runtime/pkg/log"
+
+	consoleclient "github.com/pluralsh/deployment-operator/pkg/client"
 )
 
 const (
@@ -33,11 +34,11 @@ var (
 	}
 
 	defaultContainerVersions = map[console.StackType]string{
-		console.StackTypeTerraform: "latest",
+		console.StackTypeTerraform: "1.8.2",
 		console.StackTypeAnsible:   "latest",
 	}
 
-	defaultImageTag = "0.4.28"
+	defaultImageTag = "0.4.29"
 )
 
 func init() {
@@ -191,15 +192,16 @@ func (r *StackReconciler) getDefaultContainer(run *console.StackRunFragment) cor
 
 func (r *StackReconciler) getDefaultContainerImage(run *console.StackRunFragment) string {
 	image := defaultContainerImages[run.Type]
-	if run.Configuration != nil && run.Configuration.Image != nil && *run.Configuration.Image != "" {
-		image = *run.Configuration.Image
-	}
-
 	version := defaultContainerVersions[run.Type]
 	if run.Configuration != nil && run.Configuration.Version != "" {
 		version = run.Configuration.Version
 	}
 
+	if run.Configuration != nil && run.Configuration.Image != nil && *run.Configuration.Image != "" {
+		image = *run.Configuration.Image
+		return fmt.Sprintf("%s:%s", image, version)
+	}
+
 	return fmt.Sprintf("%s:%s-%s-%s", image, defaultImageTag, strings.ToLower(string(run.Type)), version)
 }
 

pkg/controller/stacks/job_test.go

@@ -5,9 +5,10 @@ import (
 	"time"
 
 	console "github.com/pluralsh/console-client-go"
-	"github.com/pluralsh/deployment-operator/pkg/test/mocks"
 	"github.com/stretchr/testify/assert"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+
+	"github.com/pluralsh/deployment-operator/pkg/test/mocks"
 )
 
 func TestGetDefaultContainerImage(t *testing.T) {
@@ -23,5 +24,5 @@ func TestGetDefaultContainerImage(t *testing.T) {
 	}
 
 	img := reconciler.getDefaultContainerImage(run)
-	assert.Equal(t, img, "ghcr.io/pluralsh/harness:0.4.28-terraform-1.8.4")
+	assert.Equal(t, img, "ghcr.io/pluralsh/harness:0.4.29-terraform-1.8.4")
 }