use IfNotPresent strategy for argo images and main simulator images

Author: vcarluer

api/kubernetes/deploy_via_helm-dev.sh

@@ -109,25 +109,31 @@ metadata:
     app: postgres
   name: ${ARGO_POSTGRESQL_SECRET_NAME}
 stringData:
-  password: ${ARGO_POSTGRESQL_PASSWORD}
-  username: ${ARGO_POSTGRESQL_USER}
+  password: "${ARGO_POSTGRESQL_PASSWORD}"
+  username: "${ARGO_POSTGRESQL_USER}"
 type: Opaque
 
 EOF
 kubectl apply -n ${NAMESPACE} -f postgres-secret.yaml
 
 # Argo
 cat <<EOF > values-argo.yaml
+images:
+  pullPolicy: IfNotPresent
 workflow:
   serviceAccount:
     create: true
-    name: workflow
+    name: workflowcsmv2
   rbac:
     create: true
 executor:
   env:
   - name: RESOURCE_STATE_CHECK_INTERVAL
     value: 1s
+  - name: WAIT_CONTAINER_STATUS_CHECK_INTERVAL
+    value: 1s
+  - name: RECENTLY_STARTED_POD_DURATION
+    value: 1s
 artifactRepository:
   archiveLogs: true
   s3:
@@ -187,6 +193,8 @@ controller:
       passwordSecret:
         name: "${ARGO_POSTGRESQL_SECRET_NAME}"
         key: password
+mainContainer:
+  imagePullPolicy: IfNotPresent
 
 EOF
 

api/kubernetes/deploy_via_helm.sh

@@ -287,7 +287,7 @@ kubectl apply -n ${NAMESPACE} -f postgres-secret.yaml
 # Argo
 cat <<EOF > values-argo.yaml
 images:
-  imagePullPolicy: "IfNotPresent"
+  pullPolicy: IfNotPresent
 workflow:
   serviceAccount:
     create: true
@@ -360,7 +360,7 @@ controller:
         name: "${ARGO_POSTGRESQL_SECRET_NAME}"
         key: password
 mainContainer:
-  imagePullPolicy: "IfNotPresent"
+  imagePullPolicy: IfNotPresent
 
 EOF
 

build.gradle.kts

@@ -40,7 +40,7 @@ group = "com.cosmotech"
 version = scmVersion.version
 
 val kotlinJvmTarget = 17
-val cosmotechApiCommonVersion = "0.1.6-SNAPSHOT"
+val cosmotechApiCommonVersion = "0.1.7-SNAPSHOT"
 val cosmotechApiAzureVersion = "0.1.5-SNAPSHOT"
 val azureSpringBootBomVersion = "3.14.0"
 

scenariorun/src/main/kotlin/com/cosmotech/scenariorun/workflow/argo/WorkflowBuilders.kt

@@ -36,7 +36,10 @@ private const val VOLUME_DATASETS_PATH = "/mnt/scenariorun-data"
 private const val VOLUME_PARAMETERS_PATH = "/mnt/scenariorun-parameters"
 private const val CSM_ARGO_WORKFLOWS_TIMEOUT = 28800
 
-internal fun buildTemplate(scenarioRunContainer: ScenarioRunContainer): Template {
+internal fun buildTemplate(
+    scenarioRunContainer: ScenarioRunContainer,
+    csmPlatformProperties: CsmPlatformProperties
+): Template {
   var envVars: MutableList<V1EnvVar>? = null
   if (scenarioRunContainer.envVars != null) {
     envVars = mutableListOf()
@@ -60,7 +63,7 @@ internal fun buildTemplate(scenarioRunContainer: ScenarioRunContainer): Template
   val container =
       V1Container()
           .image(scenarioRunContainer.image)
-          .imagePullPolicy("Always")
+          .imagePullPolicy(csmPlatformProperties.argo.imagePullPolicy)
           .env(envVars)
           .args(scenarioRunContainer.runArgs)
           .volumeMounts(volumeMounts)
@@ -99,7 +102,10 @@ internal fun buildWorkflowSpec(
     nodeSelector[csmPlatformProperties.argo.workflows.nodePoolLabel] = startContainers.nodeLabel
   }
   val templates =
-      startContainers.containers.map { container -> buildTemplate(container) }.toMutableList()
+      startContainers
+          .containers
+          .map { container -> buildTemplate(container, csmPlatformProperties) }
+          .toMutableList()
   val entrypointTemplate = buildEntrypointTemplate(startContainers)
   templates.add(entrypointTemplate)
 

scenariorun/src/test/kotlin/com/cosmotech/scenariorun/workflow/argo/WorkflowBuildersTests.kt

@@ -36,21 +36,31 @@ class WorkflowBuildersTests {
   @Test
   fun `Template not null`() {
     val src = getScenarioRunContainer()
-    val template = buildTemplate(src)
+    val template = buildTemplate(src, csmPlatformProperties)
     assertNotNull(template)
   }
 
   @Test
   fun `Template has image`() {
     val src = getScenarioRunContainer()
-    val template = buildTemplate(src)
+    val template = buildTemplate(src, csmPlatformProperties)
     assertEquals(src.image, template.container?.image)
   }
 
+  @Test
+  fun `Template has image pull policy set to IfNotPresent`() {
+    every { csmPlatformProperties.argo.imagePullPolicy } returns "IfNotPresent"
+    val src = getScenarioRunContainer()
+    val template = buildTemplate(src, csmPlatformProperties)
+    assertNotNull(template.container)
+    assertEquals("IfNotPresent", template.container!!.imagePullPolicy)
+  }
+
   @Test
   fun `Template has image pull policy set to Always`() {
+    every { csmPlatformProperties.argo.imagePullPolicy } returns "Always"
     val src = getScenarioRunContainer()
-    val template = buildTemplate(src)
+    val template = buildTemplate(src, csmPlatformProperties)
     assertNotNull(template.container)
     assertEquals("Always", template.container!!.imagePullPolicy)
   }
@@ -59,57 +69,57 @@ class WorkflowBuildersTests {
   fun `Template has name`() {
     val name = "template name"
     val src = getScenarioRunContainer(name)
-    val template = buildTemplate(src)
+    val template = buildTemplate(src, csmPlatformProperties)
     assertEquals(name, template.name)
   }
 
   @Test
   fun `Template has args`() {
     val src = getScenarioRunContainerArgs()
-    val template = buildTemplate(src)
+    val template = buildTemplate(src, csmPlatformProperties)
     assertEquals(src.runArgs, template.container?.args)
   }
 
   @Test
   fun `Template has no args`() {
     val src = getScenarioRunContainer()
-    val template = buildTemplate(src)
+    val template = buildTemplate(src, csmPlatformProperties)
     assertEquals(src.runArgs, template.container?.args)
   }
 
   @Test
   fun `Template has simulator default entrypoint`() {
     val src = getScenarioRunContainerEntrypoint()
-    val template = buildTemplate(src)
+    val template = buildTemplate(src, csmPlatformProperties)
     assertEquals(listOf(DEFAULT_ENTRY_POINT), template.container?.command)
   }
 
   @Test
   fun `Template has simulator no entrypoint`() {
     val src = getScenarioRunContainer()
-    val template = buildTemplate(src)
+    val template = buildTemplate(src, csmPlatformProperties)
     assertNull(template.container?.command)
   }
 
   @Test
   fun `Template has default entrypoint if not defined`() {
     val src = getScenarioRunContainer()
-    val template = buildTemplate(src)
+    val template = buildTemplate(src, csmPlatformProperties)
     val expected: String? = null
     assertEquals(expected, template.container?.command)
   }
 
   @Test
   fun `Template has default env var`() {
     val src = getScenarioRunContainer()
-    val template = buildTemplate(src)
+    val template = buildTemplate(src, csmPlatformProperties)
     assertNull(template.container?.env)
   }
 
   @Test
   fun `Template has env var`() {
     val src = getScenarioRunContainerEnv()
-    val template = buildTemplate(src)
+    val template = buildTemplate(src, csmPlatformProperties)
     val expected =
         listOf(
             V1EnvVar().name("env1").value("envvar1"),
@@ -411,7 +421,7 @@ class WorkflowBuildersTests {
   @Test
   fun `Create Template with StartContainers volume mount`() {
     val src = getScenarioRunContainer()
-    val template = buildTemplate(src)
+    val template = buildTemplate(src, csmPlatformProperties)
     val expected =
         listOf(
             V1VolumeMount()