From 21e11f3dde211a62cad2a89270e6c4b8777d3f68 Mon Sep 17 00:00:00 2001 From: Katrina Rogan Date: Fri, 8 Oct 2021 12:00:13 -0700 Subject: [PATCH 1/9] fetch plugins Signed-off-by: Katrina Rogan --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index bba6c4298..a2bd3e914 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.10.0 github.com/flyteorg/flyteidl v0.21.1 - github.com/flyteorg/flyteplugins v0.6.3 + github.com/flyteorg/flyteplugins v0.6.5-0.20211008185403-ed8b0d061097 github.com/flyteorg/flytestdlib v0.3.36 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 2038815d1..ec33823da 100644 --- a/go.sum +++ b/go.sum @@ -234,6 +234,8 @@ github.com/flyteorg/flyteidl v0.21.1 h1:wINIuKv+0xtTD0kR2RF99C5uGYuwflhY78iw+Dki github.com/flyteorg/flyteidl v0.21.1/go.mod h1:576W2ViEyjTpT+kEVHAGbrTP3HARNUZ/eCwrNPmdx9U= github.com/flyteorg/flyteplugins v0.6.3 h1:gLLQ0nISFSFnUXORxkw3QjRyHcX8AYGlHObxRT6CBk4= github.com/flyteorg/flyteplugins v0.6.3/go.mod h1:bEMSalcpNKAu0iFy/fTP2HJOmsCi82LcMnsB8iBeJ/U= +github.com/flyteorg/flyteplugins v0.6.5-0.20211008185403-ed8b0d061097 h1:CVAhxWB8J820n7XKoogWhV3zToqg+c5Pw/Ni5MtaPUc= +github.com/flyteorg/flyteplugins v0.6.5-0.20211008185403-ed8b0d061097/go.mod h1:bEMSalcpNKAu0iFy/fTP2HJOmsCi82LcMnsB8iBeJ/U= github.com/flyteorg/flytestdlib v0.3.13/go.mod h1:Tz8JCECAbX6VWGwFT6cmEQ+RJpZ/6L9pswu3fzWs220= github.com/flyteorg/flytestdlib v0.3.36 h1:XLvc7kfc9XkQBpPvNXevh5+Ijbgmd7gEOHTWhdEY5eA= github.com/flyteorg/flytestdlib v0.3.36/go.mod h1:7cDWkY3v7xsoesFcDdu6DSW5Q2U2W5KlHUbUHSwBG1Q= From b3cd1b5fd33f12cebd885a8f11cbfd517c7a6d2e Mon Sep 17 00:00:00 2001 From: Katrina Rogan Date: Fri, 8 Oct 2021 12:17:52 -0700 Subject: [PATCH 2/9] ofc Signed-off-by: Katrina Rogan --- .../v1alpha1/execution_config.go | 1 + pkg/controller/nodes/task/taskexec_context.go | 42 +++++++++++-------- 2 files changed, 26 insertions(+), 17 deletions(-) diff --git a/pkg/apis/flyteworkflow/v1alpha1/execution_config.go b/pkg/apis/flyteworkflow/v1alpha1/execution_config.go index 378f7099e..d837dc853 100644 --- a/pkg/apis/flyteworkflow/v1alpha1/execution_config.go +++ b/pkg/apis/flyteworkflow/v1alpha1/execution_config.go @@ -41,6 +41,7 @@ type TaskResourceSpec struct { Memory resource.Quantity EphemeralStorage resource.Quantity Storage resource.Quantity + GPU resource.Quantity } // Defines the complete closure of compute resources a task can request and apply as limits. diff --git a/pkg/controller/nodes/task/taskexec_context.go b/pkg/controller/nodes/task/taskexec_context.go index 36e65860a..86c9e5aaa 100644 --- a/pkg/controller/nodes/task/taskexec_context.go +++ b/pkg/controller/nodes/task/taskexec_context.go @@ -48,27 +48,12 @@ func (te taskExecutionID) GetGeneratedName() string { return te.execName } -type taskOverrides struct { - pluginCore.TaskOverrides - resourceRequirements *v1.ResourceRequirements -} - -func (t taskOverrides) GetResources() *v1.ResourceRequirements { - return t.resourceRequirements -} - -func newTaskOverrides(overrides pluginCore.TaskOverrides, resourceRequirements *v1.ResourceRequirements) pluginCore.TaskOverrides { - return &taskOverrides{ - TaskOverrides: overrides, - resourceRequirements: resourceRequirements, - } -} - type taskExecutionMetadata struct { handler.NodeExecutionMetadata taskExecID taskExecutionID o pluginCore.TaskOverrides maxAttempts uint32 + platformResources *v1.ResourceRequirements } func (t taskExecutionMetadata) GetTaskExecutionID() pluginCore.TaskExecutionID { @@ -83,6 +68,10 @@ func (t taskExecutionMetadata) GetMaxAttempts() uint32 { return t.maxAttempts } +func (t taskExecutionMetadata) GetPlatformResources() *v1.ResourceRequirements{ + return t.platformResources +} + type taskExecutionContext struct { handler.NodeExecutionContext tm taskExecutionMetadata @@ -182,6 +171,24 @@ func assignResource(resourceName v1.ResourceName, execConfigRequest, execConfigL } } +func convertTaskResourcesToRequirements(taskResources v1alpha1.TaskResources) *v1.ResourceRequirements{ + return &v1.ResourceRequirements{ + Requests: v1.ResourceList{ + v1.ResourceCPU: taskResources.Requests.CPU, + v1.ResourceMemory: taskResources.Requests.Memory, + v1.ResourceEphemeralStorage: taskResources.Requests.EphemeralStorage, + utils.ResourceNvidiaGPU: taskResources.Requests.GPU, + }, + Limits: v1.ResourceList{ + v1.ResourceCPU: taskResources.Limits.CPU, + v1.ResourceMemory: taskResources.Limits.Memory, + v1.ResourceEphemeralStorage: taskResources.Limits.EphemeralStorage, + utils.ResourceNvidiaGPU: taskResources.Limits.GPU, + }, + } + +} + // Reconciles platform-specific resource defaults requests and max limits with the static resource values // defined by this task and node execution context. func determineResourceRequirements(nCtx handler.NodeExecutionContext, taskResources v1alpha1.TaskResources) *v1.ResourceRequirements { @@ -260,8 +267,9 @@ func (t *Handler) newTaskExecutionContext(ctx context.Context, nCtx handler.Node tm: taskExecutionMetadata{ NodeExecutionMetadata: nCtx.NodeExecutionMetadata(), taskExecID: taskExecutionID{execName: uniqueID, id: id}, - o: newTaskOverrides(nCtx.Node(), determineResourceRequirements(nCtx, nCtx.ExecutionContext().GetExecutionConfig().TaskResources)), + o: nCtx.Node(), maxAttempts: maxAttempts, + platformResources: convertTaskResourcesToRequirements(nCtx.ExecutionContext().GetExecutionConfig().TaskResources), }, rm: resourcemanager.GetTaskResourceManager( t.resourceManager, resourceNamespacePrefix, id), From 59f050cfb1b7dc03834a8351649adee243e16b54 Mon Sep 17 00:00:00 2001 From: Katrina Rogan Date: Fri, 8 Oct 2021 14:36:19 -0700 Subject: [PATCH 3/9] wip Signed-off-by: Katrina Rogan --- .../nodes/dynamic/dynamic_workflow_test.go | 2 +- pkg/controller/nodes/task/taskexec_context.go | 24 ------ .../nodes/task/taskexec_context_test.go | 74 ------------------- 3 files changed, 1 insertion(+), 99 deletions(-) diff --git a/pkg/controller/nodes/dynamic/dynamic_workflow_test.go b/pkg/controller/nodes/dynamic/dynamic_workflow_test.go index 2784e62ae..240a5e4f0 100644 --- a/pkg/controller/nodes/dynamic/dynamic_workflow_test.go +++ b/pkg/controller/nodes/dynamic/dynamic_workflow_test.go @@ -499,7 +499,7 @@ func Test_dynamicNodeHandler_buildContextualDynamicWorkflow_withLaunchPlans(t *t composedPBStore.OnWriteRawMatch( mock.MatchedBy(func(ctx context.Context) bool { return true }), storage.DataReference("s3://my-s3-bucket/foo/bar/futures_compiled.pb"), - int64(1354), + int64(1374), storage.Options{}, mock.MatchedBy(func(rdr *bytes.Reader) bool { return true })).Return(errors.New("foo")) diff --git a/pkg/controller/nodes/task/taskexec_context.go b/pkg/controller/nodes/task/taskexec_context.go index 86c9e5aaa..a9b7a4448 100644 --- a/pkg/controller/nodes/task/taskexec_context.go +++ b/pkg/controller/nodes/task/taskexec_context.go @@ -189,30 +189,6 @@ func convertTaskResourcesToRequirements(taskResources v1alpha1.TaskResources) *v } -// Reconciles platform-specific resource defaults requests and max limits with the static resource values -// defined by this task and node execution context. -func determineResourceRequirements(nCtx handler.NodeExecutionContext, taskResources v1alpha1.TaskResources) *v1.ResourceRequirements { - var requests = make(v1.ResourceList) - var limits = make(v1.ResourceList) - if nCtx.Node().GetResources() != nil { - if nCtx.Node().GetResources().Requests != nil { - requests = nCtx.Node().GetResources().Requests - } - if nCtx.Node().GetResources().Limits != nil { - limits = nCtx.Node().GetResources().Limits - } - } - - assignResource(v1.ResourceCPU, taskResources.Requests.CPU, taskResources.Limits.CPU, requests, limits) - assignResource(v1.ResourceMemory, taskResources.Requests.Memory, taskResources.Limits.Memory, requests, limits) - assignResource(v1.ResourceEphemeralStorage, taskResources.Requests.EphemeralStorage, taskResources.Limits.EphemeralStorage, requests, limits) - assignResource(v1.ResourceStorage, taskResources.Requests.Storage, taskResources.Limits.Storage, requests, limits) - return &v1.ResourceRequirements{ - Requests: requests, - Limits: limits, - } -} - func (t *Handler) newTaskExecutionContext(ctx context.Context, nCtx handler.NodeExecutionContext, plugin pluginCore.Plugin) (*taskExecutionContext, error) { id := GetTaskExecutionIdentifier(nCtx) diff --git a/pkg/controller/nodes/task/taskexec_context_test.go b/pkg/controller/nodes/task/taskexec_context_test.go index 7329606a7..2d09dc848 100644 --- a/pkg/controller/nodes/task/taskexec_context_test.go +++ b/pkg/controller/nodes/task/taskexec_context_test.go @@ -303,77 +303,3 @@ func TestAssignResource(t *testing.T) { }) } } - -func TestDetermineResourceRequirements(t *testing.T) { - node := &flyteMocks.ExecutableNode{} - node.OnGetResources().Return(&corev1.ResourceRequirements{ - Requests: corev1.ResourceList{ - corev1.ResourceCPU: resource.MustParse("1"), - corev1.ResourceMemory: resource.MustParse("10"), - }, - Limits: corev1.ResourceList{ - corev1.ResourceCPU: resource.MustParse("1"), - corev1.ResourceMemory: resource.MustParse("100"), - corev1.ResourceEphemeralStorage: resource.MustParse("10"), - corev1.ResourceStorage: resource.MustParse("20"), - }, - }) - nodeExecutionContext := &nodeMocks.NodeExecutionContext{} - nodeExecutionContext.OnNode().Return(node) - - taskResources := v1alpha1.TaskResources{ - Requests: v1alpha1.TaskResourceSpec{ - CPU: resource.MustParse("1"), - Memory: resource.MustParse("20"), - EphemeralStorage: resource.MustParse("50"), - }, - Limits: v1alpha1.TaskResourceSpec{ - CPU: resource.MustParse("2"), - Memory: resource.MustParse("50"), - EphemeralStorage: resource.MustParse("100"), - Storage: resource.MustParse("15"), - }, - } - resources := determineResourceRequirements(nodeExecutionContext, taskResources) - assert.EqualValues(t, resources.Requests, corev1.ResourceList{ - corev1.ResourceCPU: resource.MustParse("1"), - corev1.ResourceMemory: resource.MustParse("10"), - corev1.ResourceEphemeralStorage: resource.MustParse("10"), - }) - assert.EqualValues(t, resources.Limits, corev1.ResourceList{ - corev1.ResourceCPU: resource.MustParse("1"), - corev1.ResourceMemory: resource.MustParse("50"), - corev1.ResourceEphemeralStorage: resource.MustParse("10"), - corev1.ResourceStorage: resource.MustParse("15"), - }) -} - -func TestGetResources(t *testing.T) { - node := &flyteMocks.ExecutableNode{} - node.OnGetResources().Return(&corev1.ResourceRequirements{ - Requests: corev1.ResourceList{ - corev1.ResourceCPU: resource.MustParse("1"), - corev1.ResourceMemory: resource.MustParse("10"), - }, - Limits: corev1.ResourceList{ - corev1.ResourceCPU: resource.MustParse("1"), - corev1.ResourceMemory: resource.MustParse("100"), - corev1.ResourceEphemeralStorage: resource.MustParse("10"), - }, - }) - - computedRequirements := &corev1.ResourceRequirements{ - Requests: corev1.ResourceList{ - corev1.ResourceCPU: resource.MustParse("2"), - corev1.ResourceMemory: resource.MustParse("20"), - }, - Limits: corev1.ResourceList{ - corev1.ResourceCPU: resource.MustParse("2"), - corev1.ResourceMemory: resource.MustParse("200"), - corev1.ResourceEphemeralStorage: resource.MustParse("20"), - }, - } - - overrides := newTaskOverrides(node, computedRequirements) - assert.EqualValues(t, overrides.GetResources(), computedRequirements) -} From 1675907f692b274584b3b78da92bca2c376102e7 Mon Sep 17 00:00:00 2001 From: Katrina Rogan Date: Fri, 8 Oct 2021 14:39:22 -0700 Subject: [PATCH 4/9] lint Signed-off-by: Katrina Rogan --- .../v1alpha1/execution_config.go | 2 +- pkg/controller/nodes/task/taskexec_context.go | 24 +++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/pkg/apis/flyteworkflow/v1alpha1/execution_config.go b/pkg/apis/flyteworkflow/v1alpha1/execution_config.go index d837dc853..7a5830bf6 100644 --- a/pkg/apis/flyteworkflow/v1alpha1/execution_config.go +++ b/pkg/apis/flyteworkflow/v1alpha1/execution_config.go @@ -41,7 +41,7 @@ type TaskResourceSpec struct { Memory resource.Quantity EphemeralStorage resource.Quantity Storage resource.Quantity - GPU resource.Quantity + GPU resource.Quantity } // Defines the complete closure of compute resources a task can request and apply as limits. diff --git a/pkg/controller/nodes/task/taskexec_context.go b/pkg/controller/nodes/task/taskexec_context.go index a9b7a4448..a5853388d 100644 --- a/pkg/controller/nodes/task/taskexec_context.go +++ b/pkg/controller/nodes/task/taskexec_context.go @@ -50,9 +50,9 @@ func (te taskExecutionID) GetGeneratedName() string { type taskExecutionMetadata struct { handler.NodeExecutionMetadata - taskExecID taskExecutionID - o pluginCore.TaskOverrides - maxAttempts uint32 + taskExecID taskExecutionID + o pluginCore.TaskOverrides + maxAttempts uint32 platformResources *v1.ResourceRequirements } @@ -68,7 +68,7 @@ func (t taskExecutionMetadata) GetMaxAttempts() uint32 { return t.maxAttempts } -func (t taskExecutionMetadata) GetPlatformResources() *v1.ResourceRequirements{ +func (t taskExecutionMetadata) GetPlatformResources() *v1.ResourceRequirements { return t.platformResources } @@ -171,19 +171,19 @@ func assignResource(resourceName v1.ResourceName, execConfigRequest, execConfigL } } -func convertTaskResourcesToRequirements(taskResources v1alpha1.TaskResources) *v1.ResourceRequirements{ +func convertTaskResourcesToRequirements(taskResources v1alpha1.TaskResources) *v1.ResourceRequirements { return &v1.ResourceRequirements{ Requests: v1.ResourceList{ - v1.ResourceCPU: taskResources.Requests.CPU, - v1.ResourceMemory: taskResources.Requests.Memory, + v1.ResourceCPU: taskResources.Requests.CPU, + v1.ResourceMemory: taskResources.Requests.Memory, v1.ResourceEphemeralStorage: taskResources.Requests.EphemeralStorage, - utils.ResourceNvidiaGPU: taskResources.Requests.GPU, + utils.ResourceNvidiaGPU: taskResources.Requests.GPU, }, Limits: v1.ResourceList{ - v1.ResourceCPU: taskResources.Limits.CPU, - v1.ResourceMemory: taskResources.Limits.Memory, + v1.ResourceCPU: taskResources.Limits.CPU, + v1.ResourceMemory: taskResources.Limits.Memory, v1.ResourceEphemeralStorage: taskResources.Limits.EphemeralStorage, - utils.ResourceNvidiaGPU: taskResources.Limits.GPU, + utils.ResourceNvidiaGPU: taskResources.Limits.GPU, }, } @@ -245,7 +245,7 @@ func (t *Handler) newTaskExecutionContext(ctx context.Context, nCtx handler.Node taskExecID: taskExecutionID{execName: uniqueID, id: id}, o: nCtx.Node(), maxAttempts: maxAttempts, - platformResources: convertTaskResourcesToRequirements(nCtx.ExecutionContext().GetExecutionConfig().TaskResources), + platformResources: convertTaskResourcesToRequirements(nCtx.ExecutionContext().GetExecutionConfig().TaskResources), }, rm: resourcemanager.GetTaskResourceManager( t.resourceManager, resourceNamespacePrefix, id), From dd35514847afed9061ea8ef1baddc7cb83d51ee9 Mon Sep 17 00:00:00 2001 From: Katrina Rogan Date: Fri, 8 Oct 2021 14:44:33 -0700 Subject: [PATCH 5/9] fetch plugins Signed-off-by: Katrina Rogan --- go.mod | 2 +- go.sum | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index a2bd3e914..6f6396bfd 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.10.0 github.com/flyteorg/flyteidl v0.21.1 - github.com/flyteorg/flyteplugins v0.6.5-0.20211008185403-ed8b0d061097 + github.com/flyteorg/flyteplugins v0.7.0 github.com/flyteorg/flytestdlib v0.3.36 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 ec33823da..e71627617 100644 --- a/go.sum +++ b/go.sum @@ -232,10 +232,8 @@ github.com/fatih/structtag v1.2.0/go.mod h1:mBJUNpUnHmRKrKlQQlmCrh5PuhftFbNv8Ys4 github.com/flyteorg/flyteidl v0.21.0/go.mod h1:576W2ViEyjTpT+kEVHAGbrTP3HARNUZ/eCwrNPmdx9U= github.com/flyteorg/flyteidl v0.21.1 h1:wINIuKv+0xtTD0kR2RF99C5uGYuwflhY78iw+DkiY8o= github.com/flyteorg/flyteidl v0.21.1/go.mod h1:576W2ViEyjTpT+kEVHAGbrTP3HARNUZ/eCwrNPmdx9U= -github.com/flyteorg/flyteplugins v0.6.3 h1:gLLQ0nISFSFnUXORxkw3QjRyHcX8AYGlHObxRT6CBk4= -github.com/flyteorg/flyteplugins v0.6.3/go.mod h1:bEMSalcpNKAu0iFy/fTP2HJOmsCi82LcMnsB8iBeJ/U= -github.com/flyteorg/flyteplugins v0.6.5-0.20211008185403-ed8b0d061097 h1:CVAhxWB8J820n7XKoogWhV3zToqg+c5Pw/Ni5MtaPUc= -github.com/flyteorg/flyteplugins v0.6.5-0.20211008185403-ed8b0d061097/go.mod h1:bEMSalcpNKAu0iFy/fTP2HJOmsCi82LcMnsB8iBeJ/U= +github.com/flyteorg/flyteplugins v0.7.0 h1:Cy7qqUhoXcLRYVW1b0wtk9+WtMGNFFXZ+O5weCzplvA= +github.com/flyteorg/flyteplugins v0.7.0/go.mod h1:bEMSalcpNKAu0iFy/fTP2HJOmsCi82LcMnsB8iBeJ/U= github.com/flyteorg/flytestdlib v0.3.13/go.mod h1:Tz8JCECAbX6VWGwFT6cmEQ+RJpZ/6L9pswu3fzWs220= github.com/flyteorg/flytestdlib v0.3.36 h1:XLvc7kfc9XkQBpPvNXevh5+Ijbgmd7gEOHTWhdEY5eA= github.com/flyteorg/flytestdlib v0.3.36/go.mod h1:7cDWkY3v7xsoesFcDdu6DSW5Q2U2W5KlHUbUHSwBG1Q= From cb22702855fa3aae9d0fe5ded23b17b9c77de511 Mon Sep 17 00:00:00 2001 From: Katrina Rogan Date: Fri, 8 Oct 2021 14:53:12 -0700 Subject: [PATCH 6/9] regen goldens Signed-off-by: Katrina Rogan --- .../app-workflows-work-one-python-task-w-f.pb | Bin 776 -> 848 bytes ...pp-workflows-work-one-python-task-w-f.yaml | 6 +++ .../5_myapp.workflows.cereal.mycereal_2.json | 6 ++- .../k8s/mycereal_condition_has_no_deps.json | 6 ++- .../test/testdata/branch/k8s/success_1.json | 6 ++- .../branch/k8s/success_10_simple.json | 6 ++- .../test/testdata/branch/k8s/success_2.json | 6 ++- .../test/testdata/branch/k8s/success_3.json | 6 ++- .../test/testdata/branch/k8s/success_4.json | 6 ++- .../test/testdata/branch/k8s/success_5.json | 6 ++- .../test/testdata/branch/k8s/success_6.json | 6 ++- .../testdata/branch/k8s/success_7_nested.json | 6 ++- .../testdata/branch/k8s/success_8_nested.json | 6 ++- .../testdata/branch/k8s/success_9_nested.json | 6 ++- .../nodes/task/remote_workflow_store_test.go | 2 + pkg/controller/nodes/task/taskexec_context.go | 2 + .../nodes/task/taskexec_context_test.go | 37 ++++++++++++++++++ 17 files changed, 95 insertions(+), 24 deletions(-) diff --git a/pkg/compiler/test/testdata/app-workflows-work-one-python-task-w-f.pb b/pkg/compiler/test/testdata/app-workflows-work-one-python-task-w-f.pb index 175ff1e659a2ac020710851e7adf2ae7c5a3f46f..45947eb7def471aed817b4ee1d35dd95157b96f9 100755 GIT binary patch delta 27 jcmeBRyTCSK3)3vti9H$*1 Date: Fri, 8 Oct 2021 14:55:02 -0700 Subject: [PATCH 7/9] revert Signed-off-by: Katrina Rogan --- .../testdata/app-workflows-work-one-python-task-w-f.yaml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkg/compiler/test/testdata/app-workflows-work-one-python-task-w-f.yaml b/pkg/compiler/test/testdata/app-workflows-work-one-python-task-w-f.yaml index 1b4064191..3398b20ca 100644 --- a/pkg/compiler/test/testdata/app-workflows-work-one-python-task-w-f.yaml +++ b/pkg/compiler/test/testdata/app-workflows-work-one-python-task-w-f.yaml @@ -36,12 +36,6 @@ tasks: value: testValue2 - key: testKey3 value: testValue3 - - key: testKey1 - value: testValue1 - - key: testKey2 - value: testValue2 - - key: testKey3 - value: testValue3 image: myflytecontainer:abc123 resources: {} id: From 1b4939d71fc1033b9d02dfb31ded3031cae56987 Mon Sep 17 00:00:00 2001 From: Katrina Rogan Date: Mon, 11 Oct 2021 12:16:58 -0700 Subject: [PATCH 8/9] lint Signed-off-by: Katrina Rogan --- pkg/controller/nodes/task/taskexec_context.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg/controller/nodes/task/taskexec_context.go b/pkg/controller/nodes/task/taskexec_context.go index c4c0ce9d5..6f53aca84 100644 --- a/pkg/controller/nodes/task/taskexec_context.go +++ b/pkg/controller/nodes/task/taskexec_context.go @@ -3,9 +3,10 @@ package task import ( "bytes" "context" - "github.com/flyteorg/flytepropeller/pkg/utils" "strconv" + "github.com/flyteorg/flytepropeller/pkg/utils" + "github.com/flyteorg/flyteplugins/go/tasks/pluginmachinery/encoding" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" From 02d5b1aa71f0277f9e92457b2d31a947062b6ecd Mon Sep 17 00:00:00 2001 From: Haytham Abuelfutuh Date: Mon, 11 Oct 2021 12:42:46 -0700 Subject: [PATCH 9/9] Fix boilerplate Signed-off-by: Haytham Abuelfutuh --- boilerplate/flyte/end2end/end2end.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/boilerplate/flyte/end2end/end2end.sh b/boilerplate/flyte/end2end/end2end.sh index b2492de01..b28df383f 100755 --- a/boilerplate/flyte/end2end/end2end.sh +++ b/boilerplate/flyte/end2end/end2end.sh @@ -30,5 +30,7 @@ then fi make kustomize +# launch flyte end2end +kubectl apply -f "${OUT}/deployment/test/flyte_generated.yaml" make end2end_execute popd