Skip to content

Commit 4540952

Browse files
vcarluervcarluer
committed
Revert "argo client to 3.3.8 official version"
This reverts commit a021deb.
1 parent d3fbef3 commit 4540952

File tree

6 files changed

+64
-88
lines changed

6 files changed

+64
-88
lines changed

‎build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ allprojects {
5252
repositories {
5353
maven {
5454
name = "Argo Client Java GitHub Packages"
55-
url = uri("https://maven.pkg.github.com/argoproj/argo-client-java")
55+
url = uri("https://maven.pkg.github.com/argoproj-labs/argo-client-java")
5656
credentials {
5757
username = project.findProperty("gpr.user")?.toString() ?: System.getenv("GITHUB_ACTOR")
5858
password = project.findProperty("gpr.key")?.toString() ?: System.getenv("GITHUB_TOKEN")

‎scenariorun/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import org.openapitools.generator.gradle.plugin.tasks.GenerateTask
55

66
dependencies {
7-
implementation("io.argoproj.workflow:argo-client-java:v3.3.8")
7+
implementation("io.argoproj.workflow:argo-client-java:v3.0.1")
88
implementation("com.squareup.retrofit2:retrofit:2.9.0")
99
implementation("com.squareup.retrofit2:converter-scalars:2.9.0")
1010

‎scenariorun/src/main/kotlin/com/cosmotech/scenariorun/workflow/argo/ArgoWorkflowService.kt‎

Lines changed: 17 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ import io.argoproj.workflow.Configuration
1919
import io.argoproj.workflow.apis.ArchivedWorkflowServiceApi
2020
import io.argoproj.workflow.apis.InfoServiceApi
2121
import io.argoproj.workflow.apis.WorkflowServiceApi
22-
import io.argoproj.workflow.models.IoArgoprojWorkflowV1alpha1NodeStatus
23-
import io.argoproj.workflow.models.IoArgoprojWorkflowV1alpha1Workflow
24-
import io.argoproj.workflow.models.IoArgoprojWorkflowV1alpha1WorkflowCreateRequest
25-
import io.argoproj.workflow.models.IoArgoprojWorkflowV1alpha1WorkflowList
26-
import io.argoproj.workflow.models.IoArgoprojWorkflowV1alpha1WorkflowStatus
27-
import io.argoproj.workflow.models.IoArgoprojWorkflowV1alpha1WorkflowStopRequest
22+
import io.argoproj.workflow.models.NodeStatus
23+
import io.argoproj.workflow.models.Workflow
24+
import io.argoproj.workflow.models.WorkflowCreateRequest
25+
import io.argoproj.workflow.models.WorkflowList
26+
import io.argoproj.workflow.models.WorkflowStatus
27+
import io.argoproj.workflow.models.WorkflowStopRequest
2828
import io.kubernetes.client.util.ObjectAccessor.namespace
2929
import java.lang.StringBuilder
3030
import java.security.cert.X509Certificate
@@ -97,10 +97,7 @@ internal class ArgoWorkflowService(
9797
}
9898
}
9999

100-
private fun getWorkflowStatus(
101-
workflowId: String,
102-
workflowName: String
103-
): IoArgoprojWorkflowV1alpha1WorkflowStatus? {
100+
private fun getWorkflowStatus(workflowId: String, workflowName: String): WorkflowStatus? {
104101
return try {
105102
this.getActiveWorkflow(workflowId, workflowName).status
106103
} catch (apiException: ApiException) {
@@ -114,11 +111,8 @@ internal class ArgoWorkflowService(
114111
}
115112
}
116113

117-
private fun getActiveWorkflow(
118-
workflowId: String,
119-
workflowName: String
120-
): IoArgoprojWorkflowV1alpha1Workflow {
121-
var workflow: IoArgoprojWorkflowV1alpha1Workflow? = null
114+
private fun getActiveWorkflow(workflowId: String, workflowName: String): Workflow {
115+
var workflow: Workflow? = null
122116
try {
123117
// Workflows are auto-archived and auto-deleted more frequently
124118
// (as soon as they succeed or after a TTL).
@@ -145,7 +139,7 @@ internal class ArgoWorkflowService(
145139
return workflow
146140
}
147141

148-
private fun getWorkflowLogs(workflow: IoArgoprojWorkflowV1alpha1Workflow): Map<String, String> {
142+
private fun getWorkflowLogs(workflow: Workflow): Map<String, String> {
149143
val workflowId = workflow.metadata.uid
150144
val logsMap: MutableMap<String, String> = mutableMapOf()
151145
if (workflowId != null) {
@@ -168,7 +162,7 @@ internal class ArgoWorkflowService(
168162
}
169163

170164
private fun getCumulatedSortedLogs(
171-
nodes: Map<String, IoArgoprojWorkflowV1alpha1NodeStatus>,
165+
nodes: Map<String, NodeStatus>,
172166
logsMap: Map<String, String>,
173167
child: String? = null
174168
): String {
@@ -191,7 +185,7 @@ internal class ArgoWorkflowService(
191185
executionTimeout: Int?
192186
): ScenarioRun {
193187
val body =
194-
IoArgoprojWorkflowV1alpha1WorkflowCreateRequest()
188+
WorkflowCreateRequest()
195189
.workflow(
196190
buildWorkflow(csmPlatformProperties, scenarioRunStartContainers, executionTimeout))
197191

@@ -232,7 +226,7 @@ internal class ArgoWorkflowService(
232226
labelSelector: String,
233227
artifactNameFilter: String
234228
): List<WorkflowStatusAndArtifact> {
235-
var workflowList: IoArgoprojWorkflowV1alpha1WorkflowList? = null
229+
var workflowList: WorkflowList? = null
236230
try {
237231
// Workflows are auto-archived and auto-deleted more frequently
238232
// (as soon as they succeed or after a TTL).
@@ -242,7 +236,7 @@ internal class ArgoWorkflowService(
242236
workflowList =
243237
newServiceApiInstance<ArchivedWorkflowServiceApi>(this.apiClient)
244238
.archivedWorkflowServiceListArchivedWorkflows(
245-
labelSelector, null, null, null, null, null, null, null, null, null)
239+
labelSelector, null, null, null, null, null, null, null, null)
246240
logger.trace("workflowList: {}", workflowList)
247241
} catch (e: ApiException) {
248242
val logMessage =
@@ -362,14 +356,14 @@ internal class ArgoWorkflowService(
362356
}
363357

364358
override fun stopWorkflow(scenarioRun: ScenarioRun): ScenarioRunStatus {
365-
var workflow = IoArgoprojWorkflowV1alpha1Workflow()
359+
var workflow = Workflow()
366360
try {
367361
workflow =
368362
newServiceApiInstance<WorkflowServiceApi>(this.apiClient)
369363
.workflowServiceStopWorkflow(
370364
csmPlatformProperties.argo.workflows.namespace,
371365
scenarioRun.workflowName,
372-
IoArgoprojWorkflowV1alpha1WorkflowStopRequest())
366+
WorkflowStopRequest())
373367
} catch (e: ApiException) {
374368
System.err.println("Exception when calling WorkflowServiceApi#workflowServiceStopWorkflow")
375369
System.err.println("Status code: " + e.code)
@@ -382,7 +376,7 @@ internal class ArgoWorkflowService(
382376

383377
private fun buildScenarioRunStatusFromWorkflowStatus(
384378
scenarioRun: ScenarioRun,
385-
workflowStatus: IoArgoprojWorkflowV1alpha1WorkflowStatus?
379+
workflowStatus: WorkflowStatus?
386380
): ScenarioRunStatus {
387381
return ScenarioRunStatus(
388382
id = scenarioRun.id,

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

Lines changed: 23 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ import com.cosmotech.api.config.CsmPlatformProperties
66
import com.cosmotech.scenariorun.CSM_DAG_ROOT
77
import com.cosmotech.scenariorun.domain.ScenarioRunContainer
88
import com.cosmotech.scenariorun.domain.ScenarioRunStartContainers
9-
import io.argoproj.workflow.models.IoArgoprojWorkflowV1alpha1ArchiveStrategy
10-
import io.argoproj.workflow.models.IoArgoprojWorkflowV1alpha1Artifact
11-
import io.argoproj.workflow.models.IoArgoprojWorkflowV1alpha1DAGTask
12-
import io.argoproj.workflow.models.IoArgoprojWorkflowV1alpha1DAGTemplate
13-
import io.argoproj.workflow.models.IoArgoprojWorkflowV1alpha1Metadata
14-
import io.argoproj.workflow.models.IoArgoprojWorkflowV1alpha1Outputs
15-
import io.argoproj.workflow.models.IoArgoprojWorkflowV1alpha1Template
16-
import io.argoproj.workflow.models.IoArgoprojWorkflowV1alpha1Workflow
17-
import io.argoproj.workflow.models.IoArgoprojWorkflowV1alpha1WorkflowSpec
9+
import io.argoproj.workflow.models.ArchiveStrategy
10+
import io.argoproj.workflow.models.Artifact
11+
import io.argoproj.workflow.models.DAGTask
12+
import io.argoproj.workflow.models.DAGTemplate
13+
import io.argoproj.workflow.models.Metadata
14+
import io.argoproj.workflow.models.Outputs
15+
import io.argoproj.workflow.models.Template
16+
import io.argoproj.workflow.models.Workflow
17+
import io.argoproj.workflow.models.WorkflowSpec
1818
import io.kubernetes.client.custom.Quantity
1919
import io.kubernetes.client.openapi.models.V1Container
2020
import io.kubernetes.client.openapi.models.V1EmptyDirVolumeSource
@@ -36,9 +36,7 @@ private const val VOLUME_DATASETS_PATH = "/mnt/scenariorun-data"
3636
private const val VOLUME_PARAMETERS_PATH = "/mnt/scenariorun-parameters"
3737
private const val CSM_ARGO_WORKFLOWS_TIMEOUT = 28800
3838

39-
internal fun buildTemplate(
40-
scenarioRunContainer: ScenarioRunContainer
41-
): IoArgoprojWorkflowV1alpha1Template {
39+
internal fun buildTemplate(scenarioRunContainer: ScenarioRunContainer): Template {
4240
var envVars: MutableList<V1EnvVar>? = null
4341
if (scenarioRunContainer.envVars != null) {
4442
envVars = mutableListOf()
@@ -71,21 +69,21 @@ internal fun buildTemplate(
7169
}
7270

7371
val template =
74-
IoArgoprojWorkflowV1alpha1Template()
72+
Template()
7573
.name(scenarioRunContainer.name)
76-
.metadata(IoArgoprojWorkflowV1alpha1Metadata().labels(scenarioRunContainer.labels))
74+
.metadata(Metadata().labels(scenarioRunContainer.labels))
7775
.container(container)
7876
.addVolumesItem(V1Volume().emptyDir(V1EmptyDirVolumeSource()).name("out"))
7977

8078
val artifacts =
8179
scenarioRunContainer.artifacts?.map {
82-
IoArgoprojWorkflowV1alpha1Artifact()
80+
Artifact()
8381
.name(it.name)
8482
.path("/var/csmoutput/${it.path}")
85-
.archive(IoArgoprojWorkflowV1alpha1ArchiveStrategy().none(Object()))
83+
.archive(ArchiveStrategy().none(Object()))
8684
}
8785
if (!artifacts.isNullOrEmpty()) {
88-
template.outputs(IoArgoprojWorkflowV1alpha1Outputs().artifacts(artifacts))
86+
template.outputs(Outputs().artifacts(artifacts))
8987
}
9088

9189
return template
@@ -95,7 +93,7 @@ internal fun buildWorkflowSpec(
9593
csmPlatformProperties: CsmPlatformProperties,
9694
startContainers: ScenarioRunStartContainers,
9795
executionTimeout: Int?
98-
): IoArgoprojWorkflowV1alpha1WorkflowSpec {
96+
): WorkflowSpec {
9997
val nodeSelector = mutableMapOf("kubernetes.io/os" to "linux")
10098
if (startContainers.nodeLabel != null) {
10199
nodeSelector[csmPlatformProperties.argo.workflows.nodePoolLabel] = startContainers.nodeLabel
@@ -106,7 +104,7 @@ internal fun buildWorkflowSpec(
106104
templates.add(entrypointTemplate)
107105

108106
var workflowSpec =
109-
IoArgoprojWorkflowV1alpha1WorkflowSpec()
107+
WorkflowSpec()
110108
.imagePullSecrets(
111109
csmPlatformProperties
112110
.argo
@@ -130,18 +128,16 @@ internal fun buildWorkflow(
130128
startContainers: ScenarioRunStartContainers,
131129
executionTimeout: Int?
132130
) =
133-
IoArgoprojWorkflowV1alpha1Workflow()
131+
Workflow()
134132
.metadata(
135133
V1ObjectMeta()
136134
.generateName(startContainers.generateName ?: CSM_DEFAULT_WORKFLOW_NAME)
137135
.labels(startContainers.labels))
138136
.spec(buildWorkflowSpec(csmPlatformProperties, startContainers, executionTimeout))
139137

140-
private fun buildEntrypointTemplate(
141-
startContainers: ScenarioRunStartContainers
142-
): IoArgoprojWorkflowV1alpha1Template {
143-
val dagTemplate = IoArgoprojWorkflowV1alpha1Template().name(CSM_DAG_ENTRYPOINT)
144-
val dagTasks: MutableList<IoArgoprojWorkflowV1alpha1DAGTask> = mutableListOf()
138+
private fun buildEntrypointTemplate(startContainers: ScenarioRunStartContainers): Template {
139+
val dagTemplate = Template().name(CSM_DAG_ENTRYPOINT)
140+
val dagTasks: MutableList<DAGTask> = mutableListOf()
145141
var previousContainer: ScenarioRunContainer? = null
146142
for (container in startContainers.containers) {
147143
var dependencies: List<String>? = null
@@ -152,16 +148,12 @@ private fun buildEntrypointTemplate(
152148
} else {
153149
if (previousContainer != null) dependencies = listOf(previousContainer.name)
154150
}
155-
val task =
156-
IoArgoprojWorkflowV1alpha1DAGTask()
157-
.name(container.name)
158-
.template(container.name)
159-
.dependencies(dependencies)
151+
val task = DAGTask().name(container.name).template(container.name).dependencies(dependencies)
160152
dagTasks.add(task)
161153
previousContainer = container
162154
}
163155

164-
dagTemplate.dag(IoArgoprojWorkflowV1alpha1DAGTemplate().tasks(dagTasks))
156+
dagTemplate.dag(DAGTemplate().tasks(dagTasks))
165157

166158
return dagTemplate
167159
}

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

Lines changed: 21 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ package com.cosmotech.scenariorun.workflow.argo
55
import com.cosmotech.api.config.CsmPlatformProperties
66
import com.cosmotech.scenariorun.domain.ScenarioRunContainer
77
import com.cosmotech.scenariorun.domain.ScenarioRunStartContainers
8-
import io.argoproj.workflow.models.IoArgoprojWorkflowV1alpha1DAGTask
8+
import io.argoproj.workflow.models.DAGTask
99
import io.kubernetes.client.custom.Quantity
1010
import io.kubernetes.client.openapi.models.V1EnvVar
1111
import io.kubernetes.client.openapi.models.V1ObjectMeta
@@ -226,34 +226,32 @@ class WorkflowBuildersTests {
226226
workflowSpec.templates?.find { template -> template.name.equals("entrypoint") }
227227
val expected =
228228
listOf(
229-
IoArgoprojWorkflowV1alpha1DAGTask()
230-
.name("fetchDatasetContainer-1")
231-
.template("fetchDatasetContainer-1"),
232-
IoArgoprojWorkflowV1alpha1DAGTask()
229+
DAGTask().name("fetchDatasetContainer-1").template("fetchDatasetContainer-1"),
230+
DAGTask()
233231
.name("fetchScenarioParametersContainer")
234232
.template("fetchScenarioParametersContainer"),
235-
IoArgoprojWorkflowV1alpha1DAGTask()
233+
DAGTask()
236234
.name("applyParametersContainer")
237235
.template("applyParametersContainer")
238236
.dependencies(
239237
listOf("fetchDatasetContainer-1", "fetchScenarioParametersContainer")),
240-
IoArgoprojWorkflowV1alpha1DAGTask()
238+
DAGTask()
241239
.name("validateDataContainer")
242240
.template("validateDataContainer")
243241
.dependencies(listOf("applyParametersContainer")),
244-
IoArgoprojWorkflowV1alpha1DAGTask()
242+
DAGTask()
245243
.name("sendDataWarehouseContainer")
246244
.template("sendDataWarehouseContainer")
247245
.dependencies(listOf("validateDataContainer")),
248-
IoArgoprojWorkflowV1alpha1DAGTask()
246+
DAGTask()
249247
.name("preRunContainer")
250248
.template("preRunContainer")
251249
.dependencies(listOf("validateDataContainer")),
252-
IoArgoprojWorkflowV1alpha1DAGTask()
250+
DAGTask()
253251
.name("runContainer")
254252
.template("runContainer")
255253
.dependencies(listOf("preRunContainer")),
256-
IoArgoprojWorkflowV1alpha1DAGTask()
254+
DAGTask()
257255
.name("postRunContainer")
258256
.template("postRunContainer")
259257
.dependencies(listOf("runContainer")),
@@ -271,34 +269,32 @@ class WorkflowBuildersTests {
271269
workflowSpec.templates?.find { template -> template.name.equals("entrypoint") }
272270
val expected =
273271
listOf(
274-
IoArgoprojWorkflowV1alpha1DAGTask()
275-
.name("fetchDatasetContainer-1")
276-
.template("fetchDatasetContainer-1"),
277-
IoArgoprojWorkflowV1alpha1DAGTask()
272+
DAGTask().name("fetchDatasetContainer-1").template("fetchDatasetContainer-1"),
273+
DAGTask()
278274
.name("fetchScenarioParametersContainer")
279275
.template("fetchScenarioParametersContainer")
280276
.dependencies(listOf("fetchDatasetContainer-1")),
281-
IoArgoprojWorkflowV1alpha1DAGTask()
277+
DAGTask()
282278
.name("applyParametersContainer")
283279
.template("applyParametersContainer")
284280
.dependencies(listOf("fetchScenarioParametersContainer")),
285-
IoArgoprojWorkflowV1alpha1DAGTask()
281+
DAGTask()
286282
.name("validateDataContainer")
287283
.template("validateDataContainer")
288284
.dependencies(listOf("applyParametersContainer")),
289-
IoArgoprojWorkflowV1alpha1DAGTask()
285+
DAGTask()
290286
.name("sendDataWarehouseContainer")
291287
.template("sendDataWarehouseContainer")
292288
.dependencies(listOf("validateDataContainer")),
293-
IoArgoprojWorkflowV1alpha1DAGTask()
289+
DAGTask()
294290
.name("preRunContainer")
295291
.template("preRunContainer")
296292
.dependencies(listOf("sendDataWarehouseContainer")),
297-
IoArgoprojWorkflowV1alpha1DAGTask()
293+
DAGTask()
298294
.name("runContainer")
299295
.template("runContainer")
300296
.dependencies(listOf("preRunContainer")),
301-
IoArgoprojWorkflowV1alpha1DAGTask()
297+
DAGTask()
302298
.name("postRunContainer")
303299
.template("postRunContainer")
304300
.dependencies(listOf("runContainer")),
@@ -341,16 +337,10 @@ class WorkflowBuildersTests {
341337
workflowSpec.templates?.find { template -> template.name.equals("entrypoint") }
342338
val expected =
343339
listOf(
344-
IoArgoprojWorkflowV1alpha1DAGTask().name("Diamond-A").template("Diamond-A"),
345-
IoArgoprojWorkflowV1alpha1DAGTask()
346-
.name("Diamond-B")
347-
.template("Diamond-B")
348-
.dependencies(listOf("Diamond-A")),
349-
IoArgoprojWorkflowV1alpha1DAGTask()
350-
.name("Diamond-C")
351-
.template("Diamond-C")
352-
.dependencies(listOf("Diamond-A")),
353-
IoArgoprojWorkflowV1alpha1DAGTask()
340+
DAGTask().name("Diamond-A").template("Diamond-A"),
341+
DAGTask().name("Diamond-B").template("Diamond-B").dependencies(listOf("Diamond-A")),
342+
DAGTask().name("Diamond-C").template("Diamond-C").dependencies(listOf("Diamond-A")),
343+
DAGTask()
354344
.name("Diamond-D")
355345
.template("Diamond-D")
356346
.dependencies(listOf("Diamond-B", "Diamond-C")),

‎scripts/argo/port_binding_argo.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
kubectl -n phoenix port-forward deployment/argo-argo-workflows-server 2746:2746
1+
kubectl -n phoenix port-forward deployment/argo-server 2746:2746

0 commit comments

Comments
 (0)