chore: reduce the size of Init Process

kubeshop · Jul 25, 2024 · bc0eb69 · bc0eb69
1 parent 96aacdf
commit bc0eb69
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 43 deletions.
diff --git a/cmd/testworkflow-init/commands/setup.go b/cmd/testworkflow-init/commands/setup.go
@@ -8,7 +8,6 @@ import (
 	"github.com/kubeshop/testkube/cmd/testworkflow-init/constants"
 	"github.com/kubeshop/testkube/cmd/testworkflow-init/data"
 	"github.com/kubeshop/testkube/cmd/testworkflow-init/output"
-	"github.com/kubeshop/testkube/cmd/testworkflow-toolkit/env"
 	"github.com/kubeshop/testkube/pkg/testworkflows/testworkflowprocessor/action/actiontypes/lite"
 	"github.com/kubeshop/testkube/pkg/version"
 )
@@ -52,8 +51,8 @@ func Setup(config lite.ActionSetup) {
 		"namespace":          os.Getenv(constants.EnvNamespaceName),
 		"serviceAccountName": os.Getenv(constants.EnvServiceAccountName),
 		"agent":              version.Version,
-		"toolkit":            stripCommonImagePrefix(env.Config().Images.Toolkit, "testkube-tw-toolkit"),
-		"init":               stripCommonImagePrefix(env.Config().Images.Init, "testkube-tw-init"),
+		"toolkit":            stripCommonImagePrefix(os.Getenv("TESTKUBE_TW_TOOLKIT_IMAGE"), "testkube-tw-toolkit"),
+		"init":               stripCommonImagePrefix(os.Getenv("TESTKUBE_TW_INIT_IMAGE"), "testkube-tw-init"),
 	})
 }
 

diff --git a/pkg/testworkflows/testworkflowprocessor/action/actiontypes/lite/utils.go b/pkg/testworkflows/testworkflowprocessor/action/actiontypes/lite/utils.go
@@ -1,36 +1,5 @@
 package lite
 
-import (
-	"fmt"
-
-	corev1 "k8s.io/api/core/v1"
-)
-
-func EnvName(group string, computed bool, sensitive bool, name string) string {
-	suffix := ""
-	if computed {
-		suffix = "C"
-	}
-	if sensitive {
-		suffix += "S"
-	}
-	return fmt.Sprintf("_%s%s_%s", group, suffix, name)
-}
-
-func EnvVar(group string, computed, sensitive bool, name, value string) corev1.EnvVar {
-	return corev1.EnvVar{
-		Name:  EnvName(group, computed, sensitive, name),
-		Value: value,
-	}
-}
-
-func EnvVarFrom(group string, computed, sensitive bool, name string, value corev1.EnvVarSource) corev1.EnvVar {
-	return corev1.EnvVar{
-		Name:      EnvName(group, computed, sensitive, name),
-		ValueFrom: &value,
-	}
-}
-
 type LiteActionList []LiteAction
 
 func NewLiteActionList() LiteActionList {

diff --git a/pkg/testworkflows/testworkflowprocessor/action/actiontypes/utils.go b/pkg/testworkflows/testworkflowprocessor/action/actiontypes/utils.go
@@ -1,11 +1,40 @@
 package actiontypes
 
 import (
+	"fmt"
+
+	corev1 "k8s.io/api/core/v1"
+
 	testworkflowsv1 "github.com/kubeshop/testkube-operator/api/testworkflows/v1"
 	"github.com/kubeshop/testkube/cmd/testworkflow-init/data"
 	"github.com/kubeshop/testkube/pkg/testworkflows/testworkflowprocessor/action/actiontypes/lite"
 )
 
+func EnvName(group string, computed bool, sensitive bool, name string) string {
+	suffix := ""
+	if computed {
+		suffix = "C"
+	}
+	if sensitive {
+		suffix += "S"
+	}
+	return fmt.Sprintf("_%s%s_%s", group, suffix, name)
+}
+
+func EnvVar(group string, computed, sensitive bool, name, value string) corev1.EnvVar {
+	return corev1.EnvVar{
+		Name:  EnvName(group, computed, sensitive, name),
+		Value: value,
+	}
+}
+
+func EnvVarFrom(group string, computed, sensitive bool, name string, value corev1.EnvVarSource) corev1.EnvVar {
+	return corev1.EnvVar{
+		Name:      EnvName(group, computed, sensitive, name),
+		ValueFrom: &value,
+	}
+}
+
 type ActionList []Action
 
 func NewActionList() ActionList {

diff --git a/pkg/testworkflows/testworkflowprocessor/action/containerize.go b/pkg/testworkflows/testworkflowprocessor/action/containerize.go
@@ -10,7 +10,6 @@ import (
 	testworkflowsv1 "github.com/kubeshop/testkube-operator/api/testworkflows/v1"
 	constants2 "github.com/kubeshop/testkube/cmd/testworkflow-init/constants"
 	"github.com/kubeshop/testkube/pkg/testworkflows/testworkflowprocessor/action/actiontypes"
-	"github.com/kubeshop/testkube/pkg/testworkflows/testworkflowprocessor/action/actiontypes/lite"
 	"github.com/kubeshop/testkube/pkg/testworkflows/testworkflowprocessor/constants"
 	stage2 "github.com/kubeshop/testkube/pkg/testworkflows/testworkflowprocessor/stage"
 )
@@ -67,13 +66,13 @@ func CreateContainer(groupId int, defaultContainer stage2.Container, actions []a
 				newEnv := *e.DeepCopy()
 				computed := strings.Contains(newEnv.Value, "{{")
 				sensitive := newEnv.ValueFrom != nil && newEnv.ValueFrom.SecretKeyRef != nil
-				newEnv.Name = lite.EnvName(fmt.Sprintf("%d", i), computed, sensitive, e.Name)
+				newEnv.Name = actiontypes.EnvName(fmt.Sprintf("%d", i), computed, sensitive, e.Name)
 				cr.Env = append(cr.Env, newEnv)
 			}
 			for _, e := range containerConfigs[i].Container.Config.EnvFrom {
 				newEnvFrom := *e.DeepCopy()
 				sensitive := newEnvFrom.SecretRef != nil
-				newEnvFrom.Prefix = lite.EnvName(fmt.Sprintf("%d", i), false, sensitive, e.Prefix)
+				newEnvFrom.Prefix = actiontypes.EnvName(fmt.Sprintf("%d", i), false, sensitive, e.Prefix)
 				cr.EnvFrom = append(cr.EnvFrom, newEnvFrom)
 			}
 		}

diff --git a/pkg/testworkflows/testworkflowprocessor/presets/processor_test.go b/pkg/testworkflows/testworkflowprocessor/presets/processor_test.go
@@ -53,25 +53,25 @@ var (
 	execMachine = expressions.NewMachine().
 			Register("resource.root", "dummy-id").
 			Register("resource.id", "dummy-id-abc")
-	envInstructions = lite.EnvVarFrom("01", false, false, constants2.EnvActions, corev1.EnvVarSource{
+	envInstructions = actiontypes.EnvVarFrom("01", false, false, constants2.EnvActions, corev1.EnvVarSource{
 		FieldRef: &corev1.ObjectFieldSelector{FieldPath: constants.SpecAnnotationFieldPath},
 	})
-	envDebugNode = lite.EnvVarFrom("00", false, false, constants2.EnvNodeName, corev1.EnvVarSource{
+	envDebugNode = actiontypes.EnvVarFrom("00", false, false, constants2.EnvNodeName, corev1.EnvVarSource{
 		FieldRef: &corev1.ObjectFieldSelector{FieldPath: "spec.nodeName"},
 	})
-	envDebugPod = lite.EnvVarFrom("00", false, false, constants2.EnvPodName, corev1.EnvVarSource{
+	envDebugPod = actiontypes.EnvVarFrom("00", false, false, constants2.EnvPodName, corev1.EnvVarSource{
 		FieldRef: &corev1.ObjectFieldSelector{FieldPath: "metadata.name"},
 	})
-	envDebugNamespace = lite.EnvVarFrom("00", false, false, constants2.EnvNamespaceName, corev1.EnvVarSource{
+	envDebugNamespace = actiontypes.EnvVarFrom("00", false, false, constants2.EnvNamespaceName, corev1.EnvVarSource{
 		FieldRef: &corev1.ObjectFieldSelector{FieldPath: "metadata.namespace"},
 	})
-	envDebugServiceAccount = lite.EnvVarFrom("00", false, false, constants2.EnvServiceAccountName, corev1.EnvVarSource{
+	envDebugServiceAccount = actiontypes.EnvVarFrom("00", false, false, constants2.EnvServiceAccountName, corev1.EnvVarSource{
 		FieldRef: &corev1.ObjectFieldSelector{FieldPath: "spec.serviceAccountName"},
 	})
 )
 
 func env(index int, computed bool, name, value string) corev1.EnvVar {
-	return lite.EnvVar(fmt.Sprintf("%d", index), computed, false, name, value)
+	return actiontypes.EnvVar(fmt.Sprintf("%d", index), computed, false, name, value)
 }
 
 func cmd(values ...string) *[]string {