fix: image download mode always applies to k8s as well

container-engine-lib/lib/backend_impls/kubernetes/kubernetes_kurtosis_backend/user_services_functions/start_user_services.go

@@ -3,6 +3,7 @@ package user_services_functions
 import (
 	"context"
 	"fmt"
+	"github.com/kurtosis-tech/kurtosis/container-engine-lib/lib/backend_interface/objects/image_download_mode"
 	"strings"
 
 	"github.com/kurtosis-tech/kurtosis/container-engine-lib/lib/backend_interface/objects/service_user"
@@ -311,6 +312,7 @@ func createStartServiceOperation(
 		user := serviceConfig.GetUser()
 		tolerations := serviceConfig.GetTolerations()
 		nodeSelectors := serviceConfig.GetNodeSelectors()
+		imageDownloadMode := serviceConfig.GetImageDownloadMode()
 
 		matchingObjectAndResources, found := servicesObjectsAndResources[serviceUuid]
 		if !found {
@@ -401,6 +403,7 @@ func createStartServiceOperation(
 			minCpuAllocationMilliCpus,
 			minMemoryAllocationMegabytes,
 			user,
+			imageDownloadMode,
 		)
 		if err != nil {
 			return nil, stacktrace.Propagate(err, "An error occurred creating the container specs for the user service pod with image '%v'", containerImageName)
@@ -640,6 +643,7 @@ func getUserServicePodContainerSpecs(
 	minCpuAllocationMilliCpus uint64,
 	minMemoryAllocationMegabytes uint64,
 	user *service_user.ServiceUser,
+	imageDownloadMode image_download_mode.ImageDownloadMode,
 ) ([]apiv1.Container, error) {
 
 	var containerEnvVars []apiv1.EnvVar
@@ -682,18 +686,25 @@ func getUserServicePodContainerSpecs(
 		Limits:   resourceLimitsList,
 		Requests: resourceRequestsList,
 	}
+
+	imagePullPolicy := apiv1.PullIfNotPresent
+	if imageDownloadMode == image_download_mode.ImageDownloadMode_Always {
+		imagePullPolicy = apiv1.PullAlways
+	}
+
 	// nolint: exhaustruct
 	containers := []apiv1.Container{
 		{
 			Name:  userServiceContainerName,
 			Image: image,
 			// Yes, even though this is called "command" it actually corresponds to the Docker ENTRYPOINT
-			Command:      entrypointArgs,
-			Args:         cmdArgs,
-			Ports:        kubernetesContainerPorts,
-			Env:          containerEnvVars,
-			VolumeMounts: containerMounts,
-			Resources:    resourceRequirements,
+			Command:         entrypointArgs,
+			Args:            cmdArgs,
+			Ports:           kubernetesContainerPorts,
+			Env:             containerEnvVars,
+			VolumeMounts:    containerMounts,
+			Resources:       resourceRequirements,
+			ImagePullPolicy: imagePullPolicy,
 
 			// NOTE: There are a bunch of other interesting Container options that we omitted for now but might
 			// want to specify in the future

container-engine-lib/lib/backend_interface/objects/service/service_config.go

@@ -2,6 +2,7 @@ package service
 
 import (
 	"encoding/json"
+	"github.com/kurtosis-tech/kurtosis/container-engine-lib/lib/backend_interface/objects/image_download_mode"
 
 	"github.com/kurtosis-tech/kurtosis/container-engine-lib/lib/backend_interface/objects/image_build_spec"
 	"github.com/kurtosis-tech/kurtosis/container-engine-lib/lib/backend_interface/objects/image_registry_spec"
@@ -67,6 +68,8 @@ type privateServiceConfig struct {
 	Tolerations []v1.Toleration
 
 	NodeSelectors map[string]string
+
+	ImageDownloadMode image_download_mode.ImageDownloadMode
 }
 
 func CreateServiceConfig(
@@ -90,6 +93,7 @@ func CreateServiceConfig(
 	user *service_user.ServiceUser,
 	tolerations []v1.Toleration,
 	nodeSelectors map[string]string,
+	imageDownloadMode image_download_mode.ImageDownloadMode,
 ) (*ServiceConfig, error) {
 
 	if err := ValidateServiceConfigLabels(labels); err != nil {
@@ -118,6 +122,7 @@ func CreateServiceConfig(
 		User:                         user,
 		Tolerations:                  tolerations,
 		NodeSelectors:                nodeSelectors,
+		ImageDownloadMode:            imageDownloadMode,
 	}
 	return &ServiceConfig{internalServiceConfig}, nil
 }
@@ -200,6 +205,10 @@ func (serviceConfig *ServiceConfig) GetTolerations() []v1.Toleration {
 	return serviceConfig.privateServiceConfig.Tolerations
 }
 
+func (serviceConfig *ServiceConfig) GetImageDownloadMode() image_download_mode.ImageDownloadMode {
+	return serviceConfig.privateServiceConfig.ImageDownloadMode
+}
+
 func (serviceConfig *ServiceConfig) MarshalJSON() ([]byte, error) {
 	return json.Marshal(serviceConfig.privateServiceConfig)
 }

container-engine-lib/lib/backend_interface/objects/service/service_config_test.go

@@ -2,6 +2,7 @@ package service
 
 import (
 	"encoding/json"
+	"github.com/kurtosis-tech/kurtosis/container-engine-lib/lib/backend_interface/objects/image_download_mode"
 	"github.com/kurtosis-tech/kurtosis/container-engine-lib/lib/backend_interface/objects/image_registry_spec"
 	"testing"
 	"time"
@@ -88,6 +89,7 @@ func getServiceConfigForTest(t *testing.T, imageName string) *ServiceConfig {
 		testServiceUser(),
 		testToleration(),
 		testNodeSelectors(),
+		testImageDownloadMode(),
 	)
 	require.NoError(t, err)
 	return serviceConfig
@@ -216,3 +218,7 @@ func testNodeSelectors() map[string]string {
 		"disktype": "ssd",
 	}
 }
+
+func testImageDownloadMode() image_download_mode.ImageDownloadMode {
+	return image_download_mode.ImageDownloadMode_Missing
+}

container-engine-lib/lib/database_accessors/enclave_db/service_registration/repository_test.go

@@ -2,6 +2,7 @@ package service_registration
 
 import (
 	"fmt"
+	"github.com/kurtosis-tech/kurtosis/container-engine-lib/lib/backend_interface/objects/image_download_mode"
 	"math/rand"
 	"net"
 	"os"
@@ -329,6 +330,7 @@ func getServiceConfigForTest(t *testing.T, imageName string) *service.ServiceCon
 		map[string]string{
 			"disktype": "ssd",
 		},
+		image_download_mode.ImageDownloadMode_Missing,
 	)
 	require.NoError(t, err)
 	return serviceConfig

core/server/api_container/server/service_network/default_service_network_test.go

@@ -8,6 +8,7 @@ package service_network
 import (
 	"context"
 	"fmt"
+	"github.com/kurtosis-tech/kurtosis/container-engine-lib/lib/backend_interface/objects/image_download_mode"
 	"net"
 	"net/netip"
 	"os"
@@ -1225,6 +1226,7 @@ func testServiceConfig(t *testing.T, imageName string) *service.ServiceConfig {
 		nil,
 		nil,
 		map[string]string{},
+		image_download_mode.ImageDownloadMode_Missing,
 	)
 	require.NoError(t, err)
 	return serviceConfig

core/server/api_container/server/startosis_engine/kurtosis_builtins.go

@@ -1,6 +1,7 @@
 package startosis_engine
 
 import (
+	"github.com/kurtosis-tech/kurtosis/container-engine-lib/lib/backend_interface/objects/image_download_mode"
 	"github.com/kurtosis-tech/kurtosis/core/server/api_container/server/service_network"
 	"github.com/kurtosis-tech/kurtosis/core/server/api_container/server/startosis_engine/builtins"
 	"github.com/kurtosis-tech/kurtosis/core/server/api_container/server/startosis_engine/builtins/import_module"
@@ -63,10 +64,11 @@ func KurtosisPlanInstructions(
 	packageReplaceOptions map[string]string,
 	nonBlockingMode bool,
 	interpretationTimeValueStore *interpretation_time_value_store.InterpretationTimeValueStore,
+	imageDownloadMode image_download_mode.ImageDownloadMode,
 ) []*kurtosis_plan_instruction.KurtosisPlanInstruction {
 	return []*kurtosis_plan_instruction.KurtosisPlanInstruction{
-		add_service.NewAddService(serviceNetwork, runtimeValueStore, packageId, packageContentProvider, packageReplaceOptions, interpretationTimeValueStore),
-		add_service.NewAddServices(serviceNetwork, runtimeValueStore, packageId, packageContentProvider, packageReplaceOptions, interpretationTimeValueStore),
+		add_service.NewAddService(serviceNetwork, runtimeValueStore, packageId, packageContentProvider, packageReplaceOptions, interpretationTimeValueStore, imageDownloadMode),
+		add_service.NewAddServices(serviceNetwork, runtimeValueStore, packageId, packageContentProvider, packageReplaceOptions, interpretationTimeValueStore, imageDownloadMode),
 		get_service.NewGetService(interpretationTimeValueStore),
 		verify.NewVerify(runtimeValueStore),
 		exec.NewExec(serviceNetwork, runtimeValueStore),

core/server/api_container/server/startosis_engine/kurtosis_instruction/add_service/add_service.go

@@ -3,6 +3,7 @@ package add_service
 import (
 	"context"
 	"fmt"
+	"github.com/kurtosis-tech/kurtosis/container-engine-lib/lib/backend_interface/objects/image_download_mode"
 	"github.com/kurtosis-tech/kurtosis/container-engine-lib/lib/backend_interface/objects/service"
 	"github.com/kurtosis-tech/kurtosis/core/server/api_container/server/service_network"
 	"github.com/kurtosis-tech/kurtosis/core/server/api_container/server/startosis_engine/enclave_plan_persistence"
@@ -36,7 +37,8 @@ func NewAddService(
 	packageId string,
 	packageContentProvider startosis_packages.PackageContentProvider,
 	packageReplaceOptions map[string]string,
-	interpretationTimeValueStore *interpretation_time_value_store.InterpretationTimeValueStore) *kurtosis_plan_instruction.KurtosisPlanInstruction {
+	interpretationTimeValueStore *interpretation_time_value_store.InterpretationTimeValueStore,
+	imageDownloadMode image_download_mode.ImageDownloadMode) *kurtosis_plan_instruction.KurtosisPlanInstruction {
 	return &kurtosis_plan_instruction.KurtosisPlanInstruction{
 		KurtosisBaseBuiltin: &kurtosis_starlark_framework.KurtosisBaseBuiltin{
 			Name: AddServiceBuiltinName,
@@ -81,6 +83,8 @@ func NewAddService(
 
 				interpretationTimeValueStore: interpretationTimeValueStore,
 				description:                  "", // populated at interpretation time
+
+				imageDownloadMode: imageDownloadMode,
 			}
 		},
 
@@ -108,6 +112,8 @@ type AddServiceCapabilities struct {
 
 	resultUuid  string
 	description string
+
+	imageDownloadMode image_download_mode.ImageDownloadMode
 }
 
 func (builtin *AddServiceCapabilities) Interpret(locatorOfModuleInWhichThisBuiltInIsBeingCalled string, arguments *builtin_argument.ArgumentValuesSet) (starlark.Value, *startosis_errors.InterpretationError) {
@@ -127,6 +133,7 @@ func (builtin *AddServiceCapabilities) Interpret(locatorOfModuleInWhichThisBuilt
 		builtin.packageId,
 		builtin.packageContentProvider,
 		builtin.packageReplaceOptions,
+		builtin.imageDownloadMode,
 	)
 	if interpretationErr != nil {
 		return nil, interpretationErr
@@ -259,6 +266,7 @@ func validateAndConvertConfigAndReadyCondition(
 	packageId string,
 	packageContentProvider startosis_packages.PackageContentProvider,
 	packageReplaceOptions map[string]string,
+	imageDownloadMode image_download_mode.ImageDownloadMode,
 ) (*service.ServiceConfig, *service_config.ReadyCondition, *startosis_errors.InterpretationError) {
 	config, ok := rawConfig.(*service_config.ServiceConfig)
 	if !ok {
@@ -269,7 +277,7 @@ func validateAndConvertConfigAndReadyCondition(
 		locatorOfModuleInWhichThisBuiltInIsBeingCalled,
 		packageId,
 		packageContentProvider,
-		packageReplaceOptions)
+		packageReplaceOptions, imageDownloadMode)
 	if interpretationErr != nil {
 		return nil, nil, interpretationErr
 	}

core/server/api_container/server/startosis_engine/kurtosis_instruction/add_service/add_service_shared.go

@@ -217,6 +217,7 @@ func replaceMagicStrings(
 		serviceConfig.GetUser(),
 		serviceConfig.GetTolerations(),
 		serviceConfig.GetNodeSelectors(),
+		serviceConfig.GetImageDownloadMode(),
 	)
 	if err != nil {
 		return "", nil, stacktrace.Propagate(err, "An error occurred creating a service config")

core/server/api_container/server/startosis_engine/kurtosis_instruction/add_service/add_service_shared_test.go

@@ -2,6 +2,7 @@ package add_service
 
 import (
 	"fmt"
+	"github.com/kurtosis-tech/kurtosis/container-engine-lib/lib/backend_interface/objects/image_download_mode"
 	"os"
 	"testing"
 
@@ -58,6 +59,7 @@ func TestAddServiceShared_EntryPointArgsRuntimeValueAreReplaced(t *testing.T) {
 		nil,
 		nil,
 		map[string]string{},
+		image_download_mode.ImageDownloadMode_Missing,
 	)
 	require.NoError(t, err)
 
@@ -105,6 +107,7 @@ func TestAddServiceShared_CmdArgsRuntimeValueAreReplaced(t *testing.T) {
 		nil,
 		nil,
 		map[string]string{},
+		image_download_mode.ImageDownloadMode_Missing,
 	)
 	require.NoError(t, err)
 
@@ -154,6 +157,7 @@ func TestAddServiceShared_EnvVarsWithRuntimeValueAreReplaced(t *testing.T) {
 		nil,
 		nil,
 		map[string]string{},
+		image_download_mode.ImageDownloadMode_Missing,
 	)
 	require.NoError(t, err)
 
@@ -204,6 +208,7 @@ func TestAddServiceShared_ServiceNameWithRuntimeValuesAreReplaced(t *testing.T)
 		nil,
 		nil,
 		map[string]string{},
+		image_download_mode.ImageDownloadMode_Missing,
 	)
 	require.NoError(t, err)
 

core/server/api_container/server/startosis_engine/kurtosis_instruction/add_service/add_services.go

@@ -3,6 +3,7 @@ package add_service
 import (
 	"context"
 	"fmt"
+	"github.com/kurtosis-tech/kurtosis/container-engine-lib/lib/backend_interface/objects/image_download_mode"
 	"github.com/kurtosis-tech/kurtosis/container-engine-lib/lib/backend_interface/objects/service"
 	"github.com/kurtosis-tech/kurtosis/core/server/api_container/server/service_network"
 	"github.com/kurtosis-tech/kurtosis/core/server/api_container/server/startosis_engine/enclave_plan_persistence"
@@ -39,7 +40,8 @@ func NewAddServices(
 	packageId string,
 	packageContentProvider startosis_packages.PackageContentProvider,
 	packageReplaceOptions map[string]string,
-	interpretationTimeValueStore *interpretation_time_value_store.InterpretationTimeValueStore) *kurtosis_plan_instruction.KurtosisPlanInstruction {
+	interpretationTimeValueStore *interpretation_time_value_store.InterpretationTimeValueStore,
+	imageDownloadMode image_download_mode.ImageDownloadMode) *kurtosis_plan_instruction.KurtosisPlanInstruction {
 	return &kurtosis_plan_instruction.KurtosisPlanInstruction{
 		KurtosisBaseBuiltin: &kurtosis_starlark_framework.KurtosisBaseBuiltin{
 			Name: AddServicesBuiltinName,
@@ -71,9 +73,10 @@ func NewAddServices(
 				serviceConfigs:               nil, // populated at interpretation time
 				interpretationTimeValueStore: interpretationTimeValueStore,
 
-				resultUuids:     map[service.ServiceName]string{}, // populated at interpretation time
-				readyConditions: nil,                              // populated at interpretation time
-				description:     "",                               // populated at interpretation time
+				resultUuids:       map[service.ServiceName]string{}, // populated at interpretation time
+				readyConditions:   nil,                              // populated at interpretation time
+				description:       "",                               // populated at interpretation time
+				imageDownloadMode: imageDownloadMode,
 			}
 		},
 
@@ -99,6 +102,8 @@ type AddServicesCapabilities struct {
 
 	resultUuids map[service.ServiceName]string
 	description string
+
+	imageDownloadMode image_download_mode.ImageDownloadMode
 }
 
 func (builtin *AddServicesCapabilities) Interpret(locatorOfModuleInWhichThisBuiltInIsBeingCalled string, arguments *builtin_argument.ArgumentValuesSet) (starlark.Value, *startosis_errors.InterpretationError) {
@@ -113,6 +118,7 @@ func (builtin *AddServicesCapabilities) Interpret(locatorOfModuleInWhichThisBuil
 		builtin.packageId,
 		builtin.packageContentProvider,
 		builtin.packageReplaceOptions,
+		builtin.imageDownloadMode,
 	)
 	if interpretationErr != nil {
 		return nil, interpretationErr
@@ -416,6 +422,7 @@ func validateAndConvertConfigsAndReadyConditions(
 	packageId string,
 	packageContentProvider startosis_packages.PackageContentProvider,
 	packageReplaceOptions map[string]string,
+	imageDownloadMode image_download_mode.ImageDownloadMode,
 ) (
 	map[service.ServiceName]*service.ServiceConfig,
 	map[service.ServiceName]*service_config.ReadyCondition,
@@ -444,7 +451,7 @@ func validateAndConvertConfigsAndReadyConditions(
 		if !isDictValueAServiceConfig {
 			return nil, nil, startosis_errors.NewInterpretationError("One value of the '%s' dictionary is not a ServiceConfig (was '%s'). Values of this argument should correspond to the config of the service to be added", ConfigsArgName, reflect.TypeOf(dictValue))
 		}
-		apiServiceConfig, interpretationErr := serviceConfig.ToKurtosisType(serviceNetwork, locatorOfModuleInWhichThisBuiltInIsBeingCalled, packageId, packageContentProvider, packageReplaceOptions)
+		apiServiceConfig, interpretationErr := serviceConfig.ToKurtosisType(serviceNetwork, locatorOfModuleInWhichThisBuiltInIsBeingCalled, packageId, packageContentProvider, packageReplaceOptions, imageDownloadMode)
 		if interpretationErr != nil {
 			return nil, nil, interpretationErr
 		}

core/server/api_container/server/startosis_engine/kurtosis_instruction/tasks/run_sh.go

@@ -338,6 +338,7 @@ func repacaeMagicStringsInEnvVars(runtimeValueStore *runtime_value_store.Runtime
 		serviceConfig.GetUser(),
 		serviceConfig.GetTolerations(),
 		serviceConfig.GetNodeSelectors(),
+		serviceConfig.GetImageDownloadMode(),
 	)
 	if err != nil {
 		return nil, stacktrace.Propagate(err, "An error occurred creating a service config with env var magric strings replaced.")

core/server/api_container/server/startosis_engine/kurtosis_instruction/tasks/tasks_shared.go

@@ -3,6 +3,7 @@ package tasks
 import (
 	"context"
 	"fmt"
+	"github.com/kurtosis-tech/kurtosis/container-engine-lib/lib/backend_interface/objects/image_download_mode"
 	"reflect"
 	"strings"
 	"time"
@@ -281,6 +282,7 @@ func getServiceConfig(
 		nil,
 		nil,
 		map[string]string{},
+		image_download_mode.ImageDownloadMode_Missing,
 	)
 	if err != nil {
 		return nil, stacktrace.Propagate(err, "An error occurred creating service config")