Merge 6af5f8f into 0fcc1da

flyteorg · Sep 29, 2023 · 1af296d · 1af296d
2 parents 0fcc1da + 6af5f8f
commit 1af296d
Show file tree

Hide file tree

Showing 56 changed files with 224 additions and 241 deletions.
diff --git a/go.mod b/go.mod
@@ -7,7 +7,7 @@ require (
 	github.com/benlaurie/objecthash v0.0.0-20180202135721-d1e3d6079fc1
 	github.com/fatih/color v1.13.0
 	github.com/flyteorg/flyteidl v1.5.21
-	github.com/flyteorg/flyteplugins v1.1.31
+	github.com/flyteorg/flyteplugins v1.1.32
 	github.com/flyteorg/flytestdlib v1.0.24
 	github.com/ghodss/yaml v1.0.0
 	github.com/go-redis/redis v6.15.7+incompatible

diff --git a/go.sum b/go.sum
@@ -244,8 +244,8 @@ github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYF
 github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
 github.com/flyteorg/flyteidl v1.5.21 h1:zP1byUlNFqstTe7Io1DiiNgNf+mZAVmGZM04oIUA5kU=
 github.com/flyteorg/flyteidl v1.5.21/go.mod h1:EtE/muM2lHHgBabjYcxqe9TWeJSL0kXwbI0RgVwI4Og=
-github.com/flyteorg/flyteplugins v1.1.31 h1:9LHEWq6I4/hh4BeSk7qKwgeaBSyedD8V5se54v77yYo=
-github.com/flyteorg/flyteplugins v1.1.31/go.mod h1:FujFQdL/f9r1HvFR81JCiNYusDy9F0lExhyoyMHXXbg=
+github.com/flyteorg/flyteplugins v1.1.32 h1:PimN4wIUw9nV40MiF/m6RtQ2zAycFExu6IU2HwU+ANY=
+github.com/flyteorg/flyteplugins v1.1.32/go.mod h1:FujFQdL/f9r1HvFR81JCiNYusDy9F0lExhyoyMHXXbg=
 github.com/flyteorg/flytestdlib v1.0.24 h1:jDvymcjlsTRCwOtxPapro0WZBe3isTz+T3Tiq+mZUuk=
 github.com/flyteorg/flytestdlib v1.0.24/go.mod h1:6nXa5g00qFIsgdvQ7jKQMJmDniqO0hG6Z5X5olfduqQ=
 github.com/flyteorg/stow v0.3.7 h1:Cx7j8/Ux6+toD5hp5fy++927V+yAcAttDeQAlUD/864=

diff --git a/...est/testdata/snacks-core/k8s/002_core.containerization.multi_images.my_workflow_2_wf.yaml b/...est/testdata/snacks-core/k8s/002_core.containerization.multi_images.my_workflow_2_wf.yaml
@@ -75,8 +75,6 @@ spec:
       kind: task
       name: svm_trainer
       resources: {}
-      retry:
-        minAttempts: 1
       task: 'resource_type:TASK name:"core.containerization.multi_images.svm_trainer" '
     n1:
       id: n1
@@ -104,8 +102,6 @@ spec:
       kind: task
       name: svm_predictor
       resources: {}
-      retry:
-        minAttempts: 1
       task: 'resource_type:TASK name:"core.containerization.multi_images.svm_predictor" '
     start-node:
       id: start-node

diff --git a/...mpiler/test/testdata/snacks-core/k8s/010_core.containerization.raw_container.wf_2_wf.yaml b/...mpiler/test/testdata/snacks-core/k8s/010_core.containerization.raw_container.wf_2_wf.yaml
@@ -125,8 +125,6 @@ spec:
       kind: task
       name: ellipse-area-metadata-shell
       resources: {}
-      retry:
-        minAttempts: 1
       task: 'resource_type:TASK name:"ellipse-area-metadata-shell" '
     n1:
       id: n1
@@ -144,8 +142,6 @@ spec:
       kind: task
       name: ellipse-area-metadata-python
       resources: {}
-      retry:
-        minAttempts: 1
       task: 'resource_type:TASK name:"ellipse-area-metadata-python" '
     n2:
       id: n2
@@ -163,8 +159,6 @@ spec:
       kind: task
       name: ellipse-area-metadata-r
       resources: {}
-      retry:
-        minAttempts: 1
       task: 'resource_type:TASK name:"ellipse-area-metadata-r" '
     n3:
       id: n3
@@ -182,8 +176,6 @@ spec:
       kind: task
       name: ellipse-area-metadata-haskell
       resources: {}
-      retry:
-        minAttempts: 1
       task: 'resource_type:TASK name:"ellipse-area-metadata-haskell" '
     n4:
       id: n4
@@ -201,8 +193,6 @@ spec:
       kind: task
       name: ellipse-area-metadata-julia
       resources: {}
-      retry:
-        minAttempts: 1
       task: 'resource_type:TASK name:"ellipse-area-metadata-julia" '
     n5:
       id: n5
@@ -260,8 +250,6 @@ spec:
       kind: task
       name: report_all_calculated_areas
       resources: {}
-      retry:
-        minAttempts: 1
       task: 'resource_type:TASK name:"core.containerization.raw_container.report_all_calculated_areas" '
     start-node:
       id: start-node

diff --git a/...stdata/snacks-core/k8s/015_core.containerization.use_secrets.my_secret_workflow_2_wf.yaml b/...stdata/snacks-core/k8s/015_core.containerization.use_secrets.my_secret_workflow_2_wf.yaml
@@ -107,24 +107,18 @@ spec:
       kind: task
       name: secret_task
       resources: {}
-      retry:
-        minAttempts: 1
       task: 'resource_type:TASK name:"core.containerization.use_secrets.secret_task" '
     n1:
       id: n1
       kind: task
       name: user_info_task
       resources: {}
-      retry:
-        minAttempts: 1
       task: 'resource_type:TASK name:"core.containerization.use_secrets.user_info_task" '
     n2:
       id: n2
       kind: task
       name: secret_file_task
       resources: {}
-      retry:
-        minAttempts: 1
       task: 'resource_type:TASK name:"core.containerization.use_secrets.secret_file_task" '
     start-node:
       id: start-node

diff --git a/.../test/testdata/snacks-core/k8s/019_core.control_flow.chain_tasks.chain_tasks_wf_2_wf.yaml b/.../test/testdata/snacks-core/k8s/019_core.control_flow.chain_tasks.chain_tasks_wf_2_wf.yaml
@@ -75,16 +75,12 @@ spec:
       kind: task
       name: write
       resources: {}
-      retry:
-        minAttempts: 1
       task: 'resource_type:TASK name:"core.control_flow.chain_tasks.write" '
     n1:
       id: n1
       kind: task
       name: read
       resources: {}
-      retry:
-        minAttempts: 1
       task: 'resource_type:TASK name:"core.control_flow.chain_tasks.read" '
     start-node:
       id: start-node

diff --git a/...piler/test/testdata/snacks-core/k8s/026_core.control_flow.conditions.multiplier_2_wf.yaml b/...piler/test/testdata/snacks-core/k8s/026_core.control_flow.conditions.multiplier_2_wf.yaml
@@ -106,8 +106,6 @@ spec:
       kind: branch
       name: fractions
       resources: {}
-      retry:
-        minAttempts: 1
     n0-n0:
       id: n0-n0
       inputBindings:
@@ -119,8 +117,6 @@ spec:
       kind: task
       name: double
       resources: {}
-      retry:
-        minAttempts: 1
       task: 'resource_type:TASK name:"core.control_flow.conditions.double" '
     n0-n1:
       id: n0-n1
@@ -133,8 +129,6 @@ spec:
       kind: task
       name: square
       resources: {}
-      retry:
-        minAttempts: 1
       task: 'resource_type:TASK name:"core.control_flow.conditions.square" '
     start-node:
       id: start-node

diff --git a/...ler/test/testdata/snacks-core/k8s/028_core.control_flow.conditions.multiplier_2_2_wf.yaml b/...ler/test/testdata/snacks-core/k8s/028_core.control_flow.conditions.multiplier_2_2_wf.yaml
@@ -128,8 +128,6 @@ spec:
       kind: branch
       name: fractions
       resources: {}
-      retry:
-        minAttempts: 1
     n0-n0:
       id: n0-n0
       inputBindings:
@@ -141,8 +139,6 @@ spec:
       kind: task
       name: double
       resources: {}
-      retry:
-        minAttempts: 1
       task: 'resource_type:TASK name:"core.control_flow.conditions.double" '
     n0-n1:
       id: n0-n1
@@ -155,8 +151,6 @@ spec:
       kind: task
       name: square
       resources: {}
-      retry:
-        minAttempts: 1
       task: 'resource_type:TASK name:"core.control_flow.conditions.square" '
     start-node:
       id: start-node

diff --git a/...ler/test/testdata/snacks-core/k8s/030_core.control_flow.conditions.multiplier_3_2_wf.yaml b/...ler/test/testdata/snacks-core/k8s/030_core.control_flow.conditions.multiplier_3_2_wf.yaml
@@ -134,8 +134,6 @@ spec:
       kind: branch
       name: fractions
       resources: {}
-      retry:
-        minAttempts: 1
     n0-n0:
       id: n0-n0
       inputBindings:
@@ -147,8 +145,6 @@ spec:
       kind: task
       name: double
       resources: {}
-      retry:
-        minAttempts: 1
       task: 'resource_type:TASK name:"core.control_flow.conditions.double" '
     n0-n1:
       id: n0-n1
@@ -161,8 +157,6 @@ spec:
       kind: task
       name: square
       resources: {}
-      retry:
-        minAttempts: 1
       task: 'resource_type:TASK name:"core.control_flow.conditions.square" '
     n1:
       id: n1
@@ -175,8 +169,6 @@ spec:
       kind: task
       name: double
       resources: {}
-      retry:
-        minAttempts: 1
       task: 'resource_type:TASK name:"core.control_flow.conditions.double" '
     start-node:
       id: start-node

diff --git a/...test/testdata/snacks-core/k8s/035_core.control_flow.conditions.basic_boolean_wf_2_wf.yaml b/...test/testdata/snacks-core/k8s/035_core.control_flow.conditions.basic_boolean_wf_2_wf.yaml
@@ -86,8 +86,6 @@ spec:
       kind: task
       name: coin_toss
       resources: {}
-      retry:
-        minAttempts: 1
       task: 'resource_type:TASK name:"core.control_flow.conditions.coin_toss" '
     n1:
       branch:
@@ -111,23 +109,17 @@ spec:
       kind: branch
       name: test
       resources: {}
-      retry:
-        minAttempts: 1
     n1-n0:
       id: n1-n0
       kind: task
       name: success
       resources: {}
-      retry:
-        minAttempts: 1
       task: 'resource_type:TASK name:"core.control_flow.conditions.success" '
     n1-n1:
       id: n1-n1
       kind: task
       name: failed
       resources: {}
-      retry:
-        minAttempts: 1
       task: 'resource_type:TASK name:"core.control_flow.conditions.failed" '
     start-node:
       id: start-node

diff --git a/...er/test/testdata/snacks-core/k8s/037_core.control_flow.conditions.bool_input_wf_2_wf.yaml b/...er/test/testdata/snacks-core/k8s/037_core.control_flow.conditions.bool_input_wf_2_wf.yaml
@@ -91,23 +91,17 @@ spec:
       kind: branch
       name: test
       resources: {}
-      retry:
-        minAttempts: 1
     n0-n0:
       id: n0-n0
       kind: task
       name: success
       resources: {}
-      retry:
-        minAttempts: 1
       task: 'resource_type:TASK name:"core.control_flow.conditions.success" '
     n0-n1:
       id: n0-n1
       kind: task
       name: failed
       resources: {}
-      retry:
-        minAttempts: 1
       task: 'resource_type:TASK name:"core.control_flow.conditions.failed" '
     start-node:
       id: start-node

diff --git a/...est/testdata/snacks-core/k8s/039_core.control_flow.conditions.nested_conditions_2_wf.yaml b/...est/testdata/snacks-core/k8s/039_core.control_flow.conditions.nested_conditions_2_wf.yaml
@@ -132,8 +132,6 @@ spec:
       kind: branch
       name: fractions
       resources: {}
-      retry:
-        minAttempts: 1
     n0-n0:
       branch:
         elseFail:
@@ -179,8 +177,6 @@ spec:
       kind: branch
       name: inner_fractions
       resources: {}
-      retry:
-        minAttempts: 1
     n0-n0-n0:
       id: n0-n0-n0
       inputBindings:
@@ -192,8 +188,6 @@ spec:
       kind: task
       name: double
       resources: {}
-      retry:
-        minAttempts: 1
       task: 'resource_type:TASK name:"core.control_flow.conditions.double" '
     n0-n0-n1:
       id: n0-n0-n1
@@ -206,8 +200,6 @@ spec:
       kind: task
       name: square
       resources: {}
-      retry:
-        minAttempts: 1
       task: 'resource_type:TASK name:"core.control_flow.conditions.square" '
     n0-n1:
       id: n0-n1
@@ -220,8 +212,6 @@ spec:
       kind: task
       name: square
       resources: {}
-      retry:
-        minAttempts: 1
       task: 'resource_type:TASK name:"core.control_flow.conditions.square" '
     n0-n2:
       id: n0-n2
@@ -234,8 +224,6 @@ spec:
       kind: task
       name: double
       resources: {}
-      retry:
-        minAttempts: 1
       task: 'resource_type:TASK name:"core.control_flow.conditions.double" '
     start-node:
       id: start-node

diff --git a/.../test/testdata/snacks-core/k8s/042_core.control_flow.conditions.consume_outputs_2_wf.yaml b/.../test/testdata/snacks-core/k8s/042_core.control_flow.conditions.consume_outputs_2_wf.yaml
@@ -100,8 +100,6 @@ spec:
       kind: task
       name: coin_toss
       resources: {}
-      retry:
-        minAttempts: 1
       task: 'resource_type:TASK name:"core.control_flow.conditions.coin_toss" '
     n1:
       branch:
@@ -125,8 +123,6 @@ spec:
       kind: branch
       name: double_or_square
       resources: {}
-      retry:
-        minAttempts: 1
     n1-n0:
       id: n1-n0
       inputBindings:
@@ -138,8 +134,6 @@ spec:
       kind: task
       name: square
       resources: {}
-      retry:
-        minAttempts: 1
       task: 'resource_type:TASK name:"core.control_flow.conditions.square" '
     n1-n1:
       id: n1-n1
@@ -157,8 +151,6 @@ spec:
       kind: task
       name: calc_sum
       resources: {}
-      retry:
-        minAttempts: 1
       task: 'resource_type:TASK name:"core.control_flow.conditions.calc_sum" '
     n2:
       id: n2
@@ -171,8 +163,6 @@ spec:
       kind: task
       name: double
       resources: {}
-      retry:
-        minAttempts: 1
       task: 'resource_type:TASK name:"core.control_flow.conditions.double" '
     start-node:
       id: start-node

diff --git a/pkg/compiler/test/testdata/snacks-core/k8s/048_core.control_flow.dynamics.wf_2_wf.yaml b/pkg/compiler/test/testdata/snacks-core/k8s/048_core.control_flow.dynamics.wf_2_wf.yaml
@@ -89,8 +89,6 @@ spec:
       kind: task
       name: count_characters
       resources: {}
-      retry:
-        minAttempts: 1
       task: 'resource_type:TASK name:"core.control_flow.dynamics.count_characters" '
     start-node:
       id: start-node

diff --git a/...er/test/testdata/snacks-core/k8s/053_core.control_flow.map_task.my_map_workflow_2_wf.yaml b/...er/test/testdata/snacks-core/k8s/053_core.control_flow.map_task.my_map_workflow_2_wf.yaml
@@ -106,8 +106,6 @@ spec:
       kind: task
       name: coalesce
       resources: {}
-      retry:
-        minAttempts: 1
       task: 'resource_type:TASK name:"core.control_flow.map_task.coalesce" '
     start-node:
       id: start-node