refactor: move kubernetes-specific functions into pkg/be/kubernetes out of pkg/fe/transformer

pkg/fe/transformer/api/code.go → pkg/be/kubernetes/shell/code.go

@@ -1,4 +1,4 @@
-package api
+package shell
 
 import (
 	"fmt"
@@ -35,7 +35,7 @@ func code(application hlir.Application, namespace string) (data, string, error)
 	}
 }
 
-func CodeB64(application hlir.Application, namespace string) (string, string, error) {
+func codeB64(application hlir.Application, namespace string) (string, string, error) {
 	data, mountPath, err := code(application, namespace)
 	if err != nil {
 		return "", "", err

pkg/fe/transformer/api/datasets.go → pkg/be/kubernetes/shell/datasets.go

@@ -1,4 +1,4 @@
-package api
+package shell
 
 import (
 	"fmt"
@@ -133,7 +133,7 @@ rclone --retries 50 --config $config copyto -v s3:/%s /workdir/%s/%s
 	return volumes, volumeMounts, envFroms, initContainers, secrets, nil
 }
 
-func DatasetsB64(app hlir.Application, runname string, queueSpec queue.Spec) (string, string, string, string, []string, error) {
+func datasetsB64(app hlir.Application, runname string, queueSpec queue.Spec) (string, string, string, string, []string, error) {
 	secretsB64 := []string{}
 
 	volumes, volumeMounts, envFroms, initContainers, secrets, err := datasets(app, runname, queueSpec)
@@ -171,3 +171,11 @@ func DatasetsB64(app hlir.Application, runname string, queueSpec queue.Spec) (st
 
 	return volumesB64, volumeMountsB64, envFromsB64, initContainersB64, secretsB64, nil
 }
+
+// Inject queue secrets
+func envForQueue(queueSpec queue.Spec) envFrom {
+	return envFrom{
+		Prefix:    "lunchpail_queue_",
+		SecretRef: secretRef{queueSpec.Name},
+	}
+}

pkg/be/kubernetes/shell/template.go

@@ -9,7 +9,6 @@ import (
 
 	"lunchpail.io/pkg/be/kubernetes/common"
 	templater "lunchpail.io/pkg/fe/template"
-	"lunchpail.io/pkg/fe/transformer/api"
 	"lunchpail.io/pkg/ir/llir"
 	"lunchpail.io/pkg/util"
 )
@@ -40,12 +39,12 @@ func Template(ir llir.LLIR, c llir.ShellComponent, opts common.Options, verbose
 		return "", err
 	}
 
-	volumes, volumeMounts, envFroms, initContainers, secrets, err := api.DatasetsB64(c.Application, ir.RunName, ir.Queue)
+	volumes, volumeMounts, envFroms, initContainers, secrets, err := datasetsB64(c.Application, ir.RunName, ir.Queue)
 	if err != nil {
 		return "", err
 	}
 
-	workdirCmData, workdirCmMountPath, err := api.CodeB64(c.Application, ir.Namespace)
+	workdirCmData, workdirCmMountPath, err := codeB64(c.Application, ir.Namespace)
 	if err != nil {
 		return "", err
 	}

pkg/fe/transformer/api/queue.go

@@ -41,11 +41,3 @@ func QueuePrefixPathForWorker(queueSpec queue.Spec, runname, poolName string) st
 		QueueSubPathForWorker(poolName, "$LUNCHPAIL_WORKER_NAME"),
 	)
 }
-
-// Inject queue secrets
-func envForQueue(queueSpec queue.Spec) envFrom {
-	return envFrom{
-		Prefix:    "lunchpail_queue_",
-		SecretRef: secretRef{queueSpec.Name},
-	}
-}