Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Lal/argo with mounted secret #803

Merged
merged 4 commits into from
Sep 16, 2024
Merged

Lal/argo with mounted secret #803

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ad1e805
add k8s secret volume mount for argo
lalepee Sep 3, 2024
0681260
use secret property emptiness as condition to add secrets
lalepee Sep 16, 2024
2ebd0a6
apply spotless
lalepee Sep 16, 2024
2a24d05
add constant for secrets mount path
lalepee Sep 16, 2024
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
31 changes: 30 additions & 1 deletion run/src/main/kotlin/com/cosmotech/run/workflow/argo/WorkflowBuilders.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,22 @@ import io.kubernetes.client.custom.Quantity
import io.kubernetes.client.openapi.models.V1Container
import io.kubernetes.client.openapi.models.V1EnvFromSource
import io.kubernetes.client.openapi.models.V1EnvVar
import io.kubernetes.client.openapi.models.V1KeyToPath
import io.kubernetes.client.openapi.models.V1LocalObjectReference
import io.kubernetes.client.openapi.models.V1ObjectMeta
import io.kubernetes.client.openapi.models.V1PersistentVolumeClaim
import io.kubernetes.client.openapi.models.V1PersistentVolumeClaimSpec
import io.kubernetes.client.openapi.models.V1ResourceRequirements
import io.kubernetes.client.openapi.models.V1SecretEnvSource
import io.kubernetes.client.openapi.models.V1SecretVolumeSource
import io.kubernetes.client.openapi.models.V1Toleration
import io.kubernetes.client.openapi.models.V1Volume
import io.kubernetes.client.openapi.models.V1VolumeMount
import io.kubernetes.client.openapi.models.V1VolumeResourceRequirements

private const val CSM_DAG_ENTRYPOINT = "entrypoint"
private const val CSM_DEFAULT_WORKFLOW_NAME = "default-workflow-"
internal const val VOLUME_SECRET_NAME = "secrets"
internal const val VOLUME_CLAIM = "datadir"
internal const val VOLUME_CLAIM_DATASETS_SUBPATH = "datasetsdir"
internal const val VOLUME_CLAIM_PARAMETERS_SUBPATH = "parametersdir"
Expand All @@ -42,6 +46,7 @@ internal const val VOLUME_CLAIM_TEMP_SUBPATH = "tempdir"
private const val VOLUME_DATASETS_PATH = "/mnt/scenariorun-data"
private const val VOLUME_PARAMETERS_PATH = "/mnt/scenariorun-parameters"
private const val VOLUME_OUTPUT_PATH = "/pkg/share/Simulation/Output"
private const val VOLUME_SECRETS_PATH = "/mnt/cosmotech/secrets"
private const val VOLUME_TEMP_PATH = "/usr/tmp"
internal const val CSM_ARGO_WORKFLOWS_TIMEOUT = 28800
internal const val ALWAYS_PULL_POLICY = "Always"
Expand All @@ -61,7 +66,12 @@ internal fun buildTemplate(
envVars.add(envVar)
}
}
val volumeMounts =

val secretVolumeMount =
csmPlatformProperties.argo.workflows.secrets.map { secret ->
V1VolumeMount().name(secret.name).mountPath(VOLUME_SECRETS_PATH + "/" + secret.name)
}
val normalVolumeMount =
listOf(
V1VolumeMount()
.name(VOLUME_CLAIM)
Expand All @@ -80,6 +90,8 @@ internal fun buildTemplate(
.mountPath(VOLUME_TEMP_PATH)
.subPath(VOLUME_CLAIM_TEMP_SUBPATH))

val volumeMounts = normalVolumeMount + secretVolumeMount

val sizingInfo = runContainer.runSizing ?: BASIC_SIZING.toContainerResourceSizing()

val imagePullPolicy =
Expand Down Expand Up @@ -175,6 +187,23 @@ internal fun buildWorkflowSpec(
.templates(templates)
.volumeClaimTemplates(buildVolumeClaims(csmPlatformProperties))

if (csmPlatformProperties.argo.workflows.secrets.isNotEmpty()) {
val argoSecrets = csmPlatformProperties.argo.workflows.secrets
workflowSpec =
workflowSpec.volumes(
argoSecrets.map { secret ->
V1Volume()
.name(secret.name)
.secret(
V1SecretVolumeSource()
.secretName(secret.name)
.items(
secret.keyPath.map { secretKeyPath ->
V1KeyToPath().key(secretKeyPath.key).path(secretKeyPath.path)
}))
})
}

if (csmPlatformProperties.argo.workflows.ignoreNodeSelector == false) {
workflowSpec =
workflowSpec.nodeSelector(
Expand Down
Loading