From 8074a164a4f9ae361a4d1ef468137bf20b16f233 Mon Sep 17 00:00:00 2001 From: Kevin Su Date: Fri, 15 Sep 2023 16:11:46 -0700 Subject: [PATCH 1/5] Bump flytestdlib Signed-off-by: Kevin Su --- go.mod | 4 +++- go.sum | 8 ++++---- pkg/controller/nodes/subworkflow/launchplan/admin.go | 4 ++++ 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index 85c1a0d4a..464717e72 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ require ( github.com/fatih/color v1.13.0 github.com/flyteorg/flyteidl v1.5.13 github.com/flyteorg/flyteplugins v1.1.16 - github.com/flyteorg/flytestdlib v1.0.22 + github.com/flyteorg/flytestdlib v1.0.24 github.com/ghodss/yaml v1.0.0 github.com/go-redis/redis v6.15.7+incompatible github.com/go-test/deep v1.0.7 @@ -146,3 +146,5 @@ require ( ) replace github.com/aws/amazon-sagemaker-operator-for-k8s => github.com/aws/amazon-sagemaker-operator-for-k8s v1.0.1-0.20210303003444-0fb33b1fd49d + +replace github.com/flyteorg/flyteplugins => ../flyteplugins diff --git a/go.sum b/go.sum index 7db68a26a..0463308fc 100644 --- a/go.sum +++ b/go.sum @@ -244,10 +244,10 @@ 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.13 h1:IQ2Cw+u36ew3BPyRDAcHdzc/GyNEOXOxhKy9jbS4hbo= github.com/flyteorg/flyteidl v1.5.13/go.mod h1:EtE/muM2lHHgBabjYcxqe9TWeJSL0kXwbI0RgVwI4Og= -github.com/flyteorg/flyteplugins v1.1.16 h1:DIQxPERFMvTGnLTkkeG9R8STF3YMvxK1nPtFf+a6o5Q= -github.com/flyteorg/flyteplugins v1.1.16/go.mod h1:HEd4yf0H8XfxMcHFwrTdTIJ/9lEAz83OpgcFQe47L6I= -github.com/flyteorg/flytestdlib v1.0.22 h1:8RAc+TmME54FInf4+t6+C7X8Z/dW6i6aTs6W8SEzpI8= -github.com/flyteorg/flytestdlib v1.0.22/go.mod h1:6nXa5g00qFIsgdvQ7jKQMJmDniqO0hG6Z5X5olfduqQ= +github.com/flyteorg/flyteplugins v1.1.26-0.20230915200830-ac382612b5b0 h1:0iJaPhJusVzHljiectP+MzGMYtnhjcQae051LMeWyOQ= +github.com/flyteorg/flyteplugins v1.1.26-0.20230915200830-ac382612b5b0/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= github.com/flyteorg/stow v0.3.7/go.mod h1:5dfBitPM004dwaZdoVylVjxFT4GWAgI0ghAndhNUzCo= github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= diff --git a/pkg/controller/nodes/subworkflow/launchplan/admin.go b/pkg/controller/nodes/subworkflow/launchplan/admin.go index 574464a1c..4a00ad4ee 100644 --- a/pkg/controller/nodes/subworkflow/launchplan/admin.go +++ b/pkg/controller/nodes/subworkflow/launchplan/admin.go @@ -47,6 +47,10 @@ type executionCacheItem struct { ExecutionOutputs *core.LiteralMap } +func (e executionCacheItem) IsTerminal() bool { + return e.ExecutionClosure.Phase == core.WorkflowExecution_ABORTED || e.ExecutionClosure.Phase == core.WorkflowExecution_FAILED || e.ExecutionClosure.Phase == core.WorkflowExecution_SUCCEEDED +} + func (e executionCacheItem) ID() string { return e.String() } From 1ee8ad671a6ac7519eaade7cc5f05fcdc6c7d652 Mon Sep 17 00:00:00 2001 From: Kevin Su Date: Mon, 18 Sep 2023 15:10:08 -0700 Subject: [PATCH 2/5] bump flytestdlib Signed-off-by: Kevin Su --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 464717e72..0911643dd 100644 --- a/go.mod +++ b/go.mod @@ -147,4 +147,4 @@ require ( replace github.com/aws/amazon-sagemaker-operator-for-k8s => github.com/aws/amazon-sagemaker-operator-for-k8s v1.0.1-0.20210303003444-0fb33b1fd49d -replace github.com/flyteorg/flyteplugins => ../flyteplugins +replace github.com/flyteorg/flyteplugins => github.com/flyteorg/flyteplugins v1.1.27-0.20230918215436-54793dfb1817 diff --git a/go.sum b/go.sum index 0463308fc..59838e22a 100644 --- 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.13 h1:IQ2Cw+u36ew3BPyRDAcHdzc/GyNEOXOxhKy9jbS4hbo= github.com/flyteorg/flyteidl v1.5.13/go.mod h1:EtE/muM2lHHgBabjYcxqe9TWeJSL0kXwbI0RgVwI4Og= -github.com/flyteorg/flyteplugins v1.1.26-0.20230915200830-ac382612b5b0 h1:0iJaPhJusVzHljiectP+MzGMYtnhjcQae051LMeWyOQ= -github.com/flyteorg/flyteplugins v1.1.26-0.20230915200830-ac382612b5b0/go.mod h1:FujFQdL/f9r1HvFR81JCiNYusDy9F0lExhyoyMHXXbg= +github.com/flyteorg/flyteplugins v1.1.27-0.20230918215436-54793dfb1817 h1:+qERUe15HOjUdIpZ/SkWpqg0VZf9YU8xht3GBdikfcQ= +github.com/flyteorg/flyteplugins v1.1.27-0.20230918215436-54793dfb1817/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= From c7682a4838c4938b43454379048ed8f51e119094 Mon Sep 17 00:00:00 2001 From: Kevin Su Date: Mon, 18 Sep 2023 15:17:18 -0700 Subject: [PATCH 3/5] bump flytestdlib Signed-off-by: Kevin Su --- boilerplate/flyte/docker_build/docker_build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boilerplate/flyte/docker_build/docker_build.sh b/boilerplate/flyte/docker_build/docker_build.sh index a77f8a2d7..fb5e53592 100755 --- a/boilerplate/flyte/docker_build/docker_build.sh +++ b/boilerplate/flyte/docker_build/docker_build.sh @@ -40,7 +40,7 @@ fi # build the image # passing no build phase will build the final image -docker build -t "$IMAGE_TAG_WITH_SHA" --target=${BUILD_PHASE} . +docker build --platform linux/amd64 -t "$IMAGE_TAG_WITH_SHA" --target=${BUILD_PHASE} . echo "${IMAGE_TAG_WITH_SHA} built locally." # if REGISTRY specified, push the images to the remote registy From 845ea41745815ed87d3ccf5583d42b39abab251f Mon Sep 17 00:00:00 2001 From: Kevin Su Date: Tue, 19 Sep 2023 12:49:36 -0700 Subject: [PATCH 4/5] test Signed-off-by: Kevin Su --- go.mod | 4 +--- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index dfca67827..c668ea926 100644 --- 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.13 - github.com/flyteorg/flyteplugins v1.1.23 + github.com/flyteorg/flyteplugins v1.1.27 github.com/flyteorg/flytestdlib v1.0.24 github.com/ghodss/yaml v1.0.0 github.com/go-redis/redis v6.15.7+incompatible @@ -146,5 +146,3 @@ require ( ) replace github.com/aws/amazon-sagemaker-operator-for-k8s => github.com/aws/amazon-sagemaker-operator-for-k8s v1.0.1-0.20210303003444-0fb33b1fd49d - -replace github.com/flyteorg/flyteplugins => github.com/flyteorg/flyteplugins v1.1.27-0.20230918215436-54793dfb1817 diff --git a/go.sum b/go.sum index 59838e22a..b97a35330 100644 --- 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.13 h1:IQ2Cw+u36ew3BPyRDAcHdzc/GyNEOXOxhKy9jbS4hbo= github.com/flyteorg/flyteidl v1.5.13/go.mod h1:EtE/muM2lHHgBabjYcxqe9TWeJSL0kXwbI0RgVwI4Og= -github.com/flyteorg/flyteplugins v1.1.27-0.20230918215436-54793dfb1817 h1:+qERUe15HOjUdIpZ/SkWpqg0VZf9YU8xht3GBdikfcQ= -github.com/flyteorg/flyteplugins v1.1.27-0.20230918215436-54793dfb1817/go.mod h1:FujFQdL/f9r1HvFR81JCiNYusDy9F0lExhyoyMHXXbg= +github.com/flyteorg/flyteplugins v1.1.27 h1:Cd1Veiw8e+xEXCXMCDtSyDZ4jDRompXZj7ebH26acwY= +github.com/flyteorg/flyteplugins v1.1.27/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= From 1416c3eaa17badcda6bc8a2273fbe570110b0f01 Mon Sep 17 00:00:00 2001 From: Kevin Su Date: Tue, 19 Sep 2023 13:40:45 -0700 Subject: [PATCH 5/5] update plugin Signed-off-by: Kevin Su --- boilerplate/flyte/docker_build/docker_build.sh | 2 +- go.mod | 2 +- go.sum | 4 ++-- pkg/controller/nodes/subworkflow/launchplan/admin.go | 3 +++ 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/boilerplate/flyte/docker_build/docker_build.sh b/boilerplate/flyte/docker_build/docker_build.sh index fb5e53592..a77f8a2d7 100755 --- a/boilerplate/flyte/docker_build/docker_build.sh +++ b/boilerplate/flyte/docker_build/docker_build.sh @@ -40,7 +40,7 @@ fi # build the image # passing no build phase will build the final image -docker build --platform linux/amd64 -t "$IMAGE_TAG_WITH_SHA" --target=${BUILD_PHASE} . +docker build -t "$IMAGE_TAG_WITH_SHA" --target=${BUILD_PHASE} . echo "${IMAGE_TAG_WITH_SHA} built locally." # if REGISTRY specified, push the images to the remote registy diff --git a/go.mod b/go.mod index c668ea926..a5a93af9e 100644 --- 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.13 - github.com/flyteorg/flyteplugins v1.1.27 + github.com/flyteorg/flyteplugins v1.1.28 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 index b97a35330..013f99651 100644 --- 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.13 h1:IQ2Cw+u36ew3BPyRDAcHdzc/GyNEOXOxhKy9jbS4hbo= github.com/flyteorg/flyteidl v1.5.13/go.mod h1:EtE/muM2lHHgBabjYcxqe9TWeJSL0kXwbI0RgVwI4Og= -github.com/flyteorg/flyteplugins v1.1.27 h1:Cd1Veiw8e+xEXCXMCDtSyDZ4jDRompXZj7ebH26acwY= -github.com/flyteorg/flyteplugins v1.1.27/go.mod h1:FujFQdL/f9r1HvFR81JCiNYusDy9F0lExhyoyMHXXbg= +github.com/flyteorg/flyteplugins v1.1.28 h1:vf0Qzxkh9xezF/DrXIQW92lSnjreGIiBfGyBVmDpBXQ= +github.com/flyteorg/flyteplugins v1.1.28/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/pkg/controller/nodes/subworkflow/launchplan/admin.go b/pkg/controller/nodes/subworkflow/launchplan/admin.go index 4a00ad4ee..913ae101d 100644 --- a/pkg/controller/nodes/subworkflow/launchplan/admin.go +++ b/pkg/controller/nodes/subworkflow/launchplan/admin.go @@ -48,6 +48,9 @@ type executionCacheItem struct { } func (e executionCacheItem) IsTerminal() bool { + if e.ExecutionClosure == nil { + return false + } return e.ExecutionClosure.Phase == core.WorkflowExecution_ABORTED || e.ExecutionClosure.Phase == core.WorkflowExecution_FAILED || e.ExecutionClosure.Phase == core.WorkflowExecution_SUCCEEDED }