diff --git a/cli/cli/commands/service/update/update.go b/cli/cli/commands/service/update/update.go index 98611577c4..6ff3979dfb 100644 --- a/cli/cli/commands/service/update/update.go +++ b/cli/cli/commands/service/update/update.go @@ -268,6 +268,7 @@ func run( ) addServiceStarlarkStr := service_helpers.GetAddServiceStarlarkScript(serviceName, serviceConfigStr) + logrus.Debugf("Update service starlark:\n%v", addServiceStarlarkStr) logrus.Infof("Running update service starlark for service '%v' in enclave '%v'...", serviceName, enclaveIdentifier) starlarkRunResult, err := service_helpers.RunAddServiceStarlarkScript(ctx, serviceName, enclaveIdentifier, addServiceStarlarkStr, enclaveCtx) diff --git a/container-engine-lib/lib/backend_impls/kubernetes/kubernetes_kurtosis_backend/user_services_functions/stop_user_services.go b/container-engine-lib/lib/backend_impls/kubernetes/kubernetes_kurtosis_backend/user_services_functions/stop_user_services.go index 15434f5ece..786331ab30 100644 --- a/container-engine-lib/lib/backend_impls/kubernetes/kubernetes_kurtosis_backend/user_services_functions/stop_user_services.go +++ b/container-engine-lib/lib/backend_impls/kubernetes/kubernetes_kurtosis_backend/user_services_functions/stop_user_services.go @@ -45,6 +45,19 @@ func StopUserServices( } } + ingress := resources.Ingress + if ingress != nil { + if err := kubernetesManager.RemoveIngress(ctx, ingress); err != nil { + erroredUuids[serviceUuid] = stacktrace.Propagate( + err, + "An error occurred removing Kubernetes ingress '%v' in namespace '%v'", + ingress.Name, + namespaceName, + ) + continue + } + } + successfulUuids[serviceUuid] = true } return successfulUuids, erroredUuids, nil diff --git a/container-engine-lib/lib/backend_interface/kurtosis_backend.go b/container-engine-lib/lib/backend_interface/kurtosis_backend.go index 34aef47abc..f0f62ac1c8 100644 --- a/container-engine-lib/lib/backend_interface/kurtosis_backend.go +++ b/container-engine-lib/lib/backend_interface/kurtosis_backend.go @@ -243,8 +243,6 @@ type KurtosisBackend interface { ) // RemoveRegisteredUserServiceProcesses removes the running user service process but keeps the service registration - // TODO: As we don't persist user service logs anywhere, removing the container/pod will also remove all its - // logs. We need a persistent log storage to address this issue. RemoveRegisteredUserServiceProcesses( ctx context.Context, enclaveUuid enclave.EnclaveUUID,