Skip to content
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import (
"github.com/kurtosis-tech/kurtosis/container-engine-lib/lib/backend_interface/objects/enclave"
"github.com/kurtosis-tech/kurtosis/container-engine-lib/lib/backend_interface/objects/port_spec"
"github.com/kurtosis-tech/kurtosis/container-engine-lib/lib/backend_interface/objects/service"
"github.com/kurtosis-tech/kurtosis/core/server/api_container/server/startosis_engine/kurtosis_types/service_config"
"github.com/kurtosis-tech/kurtosis/container-engine-lib/lib/operation_parallelizer"
"github.com/kurtosis-tech/kurtosis/container-engine-lib/lib/uuid_generator"
"github.com/kurtosis-tech/stacktrace"
Expand Down Expand Up @@ -324,12 +325,18 @@ func createStartServiceOperation(
privateIPAddr := matchingObjectAndResources.ServiceRegistration.GetPrivateIP().String()
for index := range entrypointArgs {
entrypointArgs[index] = strings.Replace(entrypointArgs[index], privateIPAddrPlaceholder, privateIPAddr, unlimitedReplacements)
// Replace pod IP placeholder with environment variable reference
entrypointArgs[index] = strings.Replace(entrypointArgs[index], service_config.K8sPodIPAddrPlaceholder, "${K8S_POD_IP}", unlimitedReplacements)
}
for index := range cmdArgs {
cmdArgs[index] = strings.Replace(cmdArgs[index], privateIPAddrPlaceholder, privateIPAddr, unlimitedReplacements)
// Replace pod IP placeholder with environment variable reference
cmdArgs[index] = strings.Replace(cmdArgs[index], service_config.K8sPodIPAddrPlaceholder, "${K8S_POD_IP}", unlimitedReplacements)
}
for key := range envVars {
envVars[key] = strings.Replace(envVars[key], privateIPAddrPlaceholder, privateIPAddr, unlimitedReplacements)
// Replace pod IP placeholder with environment variable reference
envVars[key] = strings.Replace(envVars[key], service_config.K8sPodIPAddrPlaceholder, "${K8S_POD_IP}", unlimitedReplacements)
}

namespaceName := kubernetesService.GetNamespace()
Expand Down Expand Up @@ -654,6 +661,18 @@ func getUserServicePodContainerSpecs(
containerEnvVars = append(containerEnvVars, envVar)
}

// Add K8S_POD_IP environment variable using Kubernetes Downward API
podIPEnvVar := apiv1.EnvVar{
Name: "K8S_POD_IP",
Value: "",
ValueFrom: &apiv1.EnvVarSource{
FieldRef: &apiv1.ObjectFieldSelector{
FieldPath: "status.podIP",
},
},
}
containerEnvVars = append(containerEnvVars, podIPEnvVar)

kubernetesContainerPorts, err := getKubernetesContainerPortsFromPrivatePortSpecs(privatePorts)
if err != nil {
return nil, stacktrace.Propagate(err, "An error occurred getting Kubernetes container ports from the private port specs map")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ const (
TtyEnabledAttr = "tty_enabled"

DefaultPrivateIPAddrPlaceholder = "KURTOSIS_IP_ADDR_PLACEHOLDER"
K8sPodIPAddrPlaceholder = "K8S_POD_IP_ADDR_PLACEHOLDER"

filesArtifactExpansionDirsParentDirpath string = "/files-artifacts"
// TODO This should be populated from the build flow that builds the files-artifacts-expander Docker image
Expand Down
Loading