From b5a0b398d06844ad140b13e041de203db91266df Mon Sep 17 00:00:00 2001 From: Anand Swaminathan Date: Mon, 15 Mar 2021 18:02:25 -0700 Subject: [PATCH 1/4] Pull in FlytePlugins for Security Context fix Signed-off-by: Anand Swaminathan --- go.mod | 6 ++-- go.sum | 10 +++--- pkg/apis/flyteworkflow/v1alpha1/iface.go | 1 + .../v1alpha1/mocks/ExecutableWorkflow.go | 34 ++++++++++++++++++ pkg/apis/flyteworkflow/v1alpha1/mocks/Meta.go | 34 ++++++++++++++++++ .../v1alpha1/mocks/MetaExtended.go | 34 ++++++++++++++++++ pkg/apis/flyteworkflow/v1alpha1/workflow.go | 13 +++++-- .../executors/mocks/execution_context.go | 34 ++++++++++++++++++ .../mocks/immutable_execution_context.go | 35 +++++++++++++++++++ .../handler/mocks/node_execution_metadata.go | 32 +++++++++++++++++ .../nodes/handler/node_exec_context.go | 1 + pkg/controller/nodes/resolve_test.go | 4 +++ 12 files changed, 228 insertions(+), 10 deletions(-) diff --git a/go.mod b/go.mod index ee948299d..7d43cda87 100644 --- a/go.mod +++ b/go.mod @@ -7,9 +7,9 @@ require ( github.com/benlaurie/objecthash v0.0.0-20180202135721-d1e3d6079fc1 github.com/fatih/color v1.10.0 github.com/flyteorg/datacatalog v0.3.0 - github.com/flyteorg/flyteidl v0.18.15 - github.com/flyteorg/flyteplugins v0.5.32 - github.com/flyteorg/flytestdlib v0.3.13 + github.com/flyteorg/flyteidl v0.18.17 + github.com/flyteorg/flyteplugins v0.5.34-0.20210316001250-2aa78752626e + github.com/flyteorg/flytestdlib v0.3.14 github.com/ghodss/yaml v1.0.0 github.com/go-redis/redis v6.15.7+incompatible github.com/golang/protobuf v1.4.3 diff --git a/go.sum b/go.sum index 0e24fab66..0b21d5fca 100644 --- a/go.sum +++ b/go.sum @@ -237,12 +237,14 @@ github.com/fatih/color v1.10.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGE github.com/fatih/structtag v1.2.0/go.mod h1:mBJUNpUnHmRKrKlQQlmCrh5PuhftFbNv8Ys4/aAZl94= github.com/flyteorg/datacatalog v0.3.0 h1:rkZ/IJTPGAJjHig2O+iSq9W9xqqVZdJTwGYb2QLtKBg= github.com/flyteorg/datacatalog v0.3.0/go.mod h1:Y022upSReYrjYCO+S+/udfuVOBj047bxgJkA+2irHRI= -github.com/flyteorg/flyteidl v0.18.15 h1:sXrlwTRaRjQsXYMNrY/S930SKdKtu4XnpNFEu8I4tn4= github.com/flyteorg/flyteidl v0.18.15/go.mod h1:b5Fq4Z8a5b0mF6pEwTd48ufvikUGVkWSjZiMT0ZtqKI= -github.com/flyteorg/flyteplugins v0.5.32 h1:fXyHUZFtNt1yQIQehilSnpzKlOAkXkqqnwh9M696Dvw= -github.com/flyteorg/flyteplugins v0.5.32/go.mod h1:+qu3cAdUdyNXer+R9NcvEKsEWwhvKAqRObmuFBGOJ0s= -github.com/flyteorg/flytestdlib v0.3.13 h1:5ioA/q3ixlyqkFh5kDaHgmPyTP/AHtqq1K/TIbVLUzM= +github.com/flyteorg/flyteidl v0.18.17 h1:74pPZ9PzITuzq+CgjMPb9EcFI5bVkf8mM5m4xmmlTmY= +github.com/flyteorg/flyteidl v0.18.17/go.mod h1:b5Fq4Z8a5b0mF6pEwTd48ufvikUGVkWSjZiMT0ZtqKI= +github.com/flyteorg/flyteplugins v0.5.34-0.20210316001250-2aa78752626e h1:4A+fIYJHxDhYgX/Av151qzSc+YUo9T64I8amun/PZEE= +github.com/flyteorg/flyteplugins v0.5.34-0.20210316001250-2aa78752626e/go.mod h1:CxerBGWWEmNYmPxSMHnwQEr9cc1Fbo/g5fcABazU6Jo= github.com/flyteorg/flytestdlib v0.3.13/go.mod h1:Tz8JCECAbX6VWGwFT6cmEQ+RJpZ/6L9pswu3fzWs220= +github.com/flyteorg/flytestdlib v0.3.14 h1:ipHGxux3ITe7Z39MJWdbVMW+/D6QuL6ppYUOPvJWelE= +github.com/flyteorg/flytestdlib v0.3.14/go.mod h1:Tz8JCECAbX6VWGwFT6cmEQ+RJpZ/6L9pswu3fzWs220= github.com/form3tech-oss/jwt-go v3.2.2+incompatible h1:TcekIExNqud5crz4xD2pavyTgWiPvpYe4Xau31I0PRk= github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVBjqR7JHJk0brhHOZYGmfBYOrK0ZhYMEtBr4= diff --git a/pkg/apis/flyteworkflow/v1alpha1/iface.go b/pkg/apis/flyteworkflow/v1alpha1/iface.go index 392baff26..dea6a57bc 100644 --- a/pkg/apis/flyteworkflow/v1alpha1/iface.go +++ b/pkg/apis/flyteworkflow/v1alpha1/iface.go @@ -434,6 +434,7 @@ type Meta interface { GetLabels() map[string]string GetName() string GetServiceAccountName() string + GetSecurityContext() core.SecurityContext IsInterruptible() bool GetEventVersion() EventVersion GetRawOutputDataConfig() RawOutputDataConfig diff --git a/pkg/apis/flyteworkflow/v1alpha1/mocks/ExecutableWorkflow.go b/pkg/apis/flyteworkflow/v1alpha1/mocks/ExecutableWorkflow.go index f9260463d..88593c007 100644 --- a/pkg/apis/flyteworkflow/v1alpha1/mocks/ExecutableWorkflow.go +++ b/pkg/apis/flyteworkflow/v1alpha1/mocks/ExecutableWorkflow.go @@ -5,7 +5,9 @@ package mocks import ( context "context" + core "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" mock "github.com/stretchr/testify/mock" + types "k8s.io/apimachinery/pkg/types" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -792,6 +794,38 @@ func (_m *ExecutableWorkflow) GetRawOutputDataConfig() v1alpha1.RawOutputDataCon return r0 } +type ExecutableWorkflow_GetSecurityContext struct { + *mock.Call +} + +func (_m ExecutableWorkflow_GetSecurityContext) Return(_a0 core.SecurityContext) *ExecutableWorkflow_GetSecurityContext { + return &ExecutableWorkflow_GetSecurityContext{Call: _m.Call.Return(_a0)} +} + +func (_m *ExecutableWorkflow) OnGetSecurityContext() *ExecutableWorkflow_GetSecurityContext { + c := _m.On("GetSecurityContext") + return &ExecutableWorkflow_GetSecurityContext{Call: c} +} + +func (_m *ExecutableWorkflow) OnGetSecurityContextMatch(matchers ...interface{}) *ExecutableWorkflow_GetSecurityContext { + c := _m.On("GetSecurityContext", matchers...) + return &ExecutableWorkflow_GetSecurityContext{Call: c} +} + +// GetSecurityContext provides a mock function with given fields: +func (_m *ExecutableWorkflow) GetSecurityContext() core.SecurityContext { + ret := _m.Called() + + var r0 core.SecurityContext + if rf, ok := ret.Get(0).(func() core.SecurityContext); ok { + r0 = rf() + } else { + r0 = ret.Get(0).(core.SecurityContext) + } + + return r0 +} + type ExecutableWorkflow_GetServiceAccountName struct { *mock.Call } diff --git a/pkg/apis/flyteworkflow/v1alpha1/mocks/Meta.go b/pkg/apis/flyteworkflow/v1alpha1/mocks/Meta.go index 524492db9..c2b2b72f7 100644 --- a/pkg/apis/flyteworkflow/v1alpha1/mocks/Meta.go +++ b/pkg/apis/flyteworkflow/v1alpha1/mocks/Meta.go @@ -3,7 +3,9 @@ package mocks import ( + core "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" mock "github.com/stretchr/testify/mock" + types "k8s.io/apimachinery/pkg/types" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -340,6 +342,38 @@ func (_m *Meta) GetRawOutputDataConfig() v1alpha1.RawOutputDataConfig { return r0 } +type Meta_GetSecurityContext struct { + *mock.Call +} + +func (_m Meta_GetSecurityContext) Return(_a0 core.SecurityContext) *Meta_GetSecurityContext { + return &Meta_GetSecurityContext{Call: _m.Call.Return(_a0)} +} + +func (_m *Meta) OnGetSecurityContext() *Meta_GetSecurityContext { + c := _m.On("GetSecurityContext") + return &Meta_GetSecurityContext{Call: c} +} + +func (_m *Meta) OnGetSecurityContextMatch(matchers ...interface{}) *Meta_GetSecurityContext { + c := _m.On("GetSecurityContext", matchers...) + return &Meta_GetSecurityContext{Call: c} +} + +// GetSecurityContext provides a mock function with given fields: +func (_m *Meta) GetSecurityContext() core.SecurityContext { + ret := _m.Called() + + var r0 core.SecurityContext + if rf, ok := ret.Get(0).(func() core.SecurityContext); ok { + r0 = rf() + } else { + r0 = ret.Get(0).(core.SecurityContext) + } + + return r0 +} + type Meta_GetServiceAccountName struct { *mock.Call } diff --git a/pkg/apis/flyteworkflow/v1alpha1/mocks/MetaExtended.go b/pkg/apis/flyteworkflow/v1alpha1/mocks/MetaExtended.go index 6017fc3af..cca89c09f 100644 --- a/pkg/apis/flyteworkflow/v1alpha1/mocks/MetaExtended.go +++ b/pkg/apis/flyteworkflow/v1alpha1/mocks/MetaExtended.go @@ -3,7 +3,9 @@ package mocks import ( + core "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" mock "github.com/stretchr/testify/mock" + types "k8s.io/apimachinery/pkg/types" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -408,6 +410,38 @@ func (_m *MetaExtended) GetRawOutputDataConfig() v1alpha1.RawOutputDataConfig { return r0 } +type MetaExtended_GetSecurityContext struct { + *mock.Call +} + +func (_m MetaExtended_GetSecurityContext) Return(_a0 core.SecurityContext) *MetaExtended_GetSecurityContext { + return &MetaExtended_GetSecurityContext{Call: _m.Call.Return(_a0)} +} + +func (_m *MetaExtended) OnGetSecurityContext() *MetaExtended_GetSecurityContext { + c := _m.On("GetSecurityContext") + return &MetaExtended_GetSecurityContext{Call: c} +} + +func (_m *MetaExtended) OnGetSecurityContextMatch(matchers ...interface{}) *MetaExtended_GetSecurityContext { + c := _m.On("GetSecurityContext", matchers...) + return &MetaExtended_GetSecurityContext{Call: c} +} + +// GetSecurityContext provides a mock function with given fields: +func (_m *MetaExtended) GetSecurityContext() core.SecurityContext { + ret := _m.Called() + + var r0 core.SecurityContext + if rf, ok := ret.Get(0).(func() core.SecurityContext); ok { + r0 = rf() + } else { + r0 = ret.Get(0).(core.SecurityContext) + } + + return r0 +} + type MetaExtended_GetServiceAccountName struct { *mock.Call } diff --git a/pkg/apis/flyteworkflow/v1alpha1/workflow.go b/pkg/apis/flyteworkflow/v1alpha1/workflow.go index f5a23f462..6a56f5979 100644 --- a/pkg/apis/flyteworkflow/v1alpha1/workflow.go +++ b/pkg/apis/flyteworkflow/v1alpha1/workflow.go @@ -40,10 +40,13 @@ type FlyteWorkflow struct { NodeDefaults NodeDefaults `json:"node-defaults,omitempty"` // Specifies the time when the workflow has been accepted into the system. AcceptedAt *metav1.Time `json:"acceptedAt,omitempty"` - // ServiceAccountName is the name of the ServiceAccount to use to run this pod. - // More info: https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/ - // +optional + // [DEPRECATED] ServiceAccountName is the name of the ServiceAccount to use to run this pod. + // [DEPRECATED] More info: https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/ + // [DEPRECATED] +optional ServiceAccountName string `json:"serviceAccountName,omitempty" protobuf:"bytes,8,opt,name=serviceAccountName"` + // Security context fields to define privilege and access control settings + // +optional + SecurityContext core.SecurityContext `json:"securityContext,omitempty" protobuf:"bytes,12,rep,name=securityContext"` // Status is the only mutable section in the workflow. It holds all the execution information Status WorkflowStatus `json:"status,omitempty"` // RawOutputDataConfig defines the configurations to use for generating raw outputs (e.g. blobs, schemas). @@ -59,6 +62,10 @@ type FlyteWorkflow struct { DataReferenceConstructor storage.ReferenceConstructor `json:"-"` } +func (in *FlyteWorkflow) GetSecurityContext() core.SecurityContext { + return in.SecurityContext +} + func (in *FlyteWorkflow) GetEventVersion() EventVersion { if in.WorkflowMeta != nil { return in.WorkflowMeta.EventVersion diff --git a/pkg/controller/executors/mocks/execution_context.go b/pkg/controller/executors/mocks/execution_context.go index d56ee4696..5f5951568 100644 --- a/pkg/controller/executors/mocks/execution_context.go +++ b/pkg/controller/executors/mocks/execution_context.go @@ -3,7 +3,9 @@ package mocks import ( + core "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" executors "github.com/flyteorg/flytepropeller/pkg/controller/executors" + mock "github.com/stretchr/testify/mock" types "k8s.io/apimachinery/pkg/types" @@ -506,6 +508,38 @@ func (_m *ExecutionContext) GetRawOutputDataConfig() v1alpha1.RawOutputDataConfi return r0 } +type ExecutionContext_GetSecurityContext struct { + *mock.Call +} + +func (_m ExecutionContext_GetSecurityContext) Return(_a0 core.SecurityContext) *ExecutionContext_GetSecurityContext { + return &ExecutionContext_GetSecurityContext{Call: _m.Call.Return(_a0)} +} + +func (_m *ExecutionContext) OnGetSecurityContext() *ExecutionContext_GetSecurityContext { + c := _m.On("GetSecurityContext") + return &ExecutionContext_GetSecurityContext{Call: c} +} + +func (_m *ExecutionContext) OnGetSecurityContextMatch(matchers ...interface{}) *ExecutionContext_GetSecurityContext { + c := _m.On("GetSecurityContext", matchers...) + return &ExecutionContext_GetSecurityContext{Call: c} +} + +// GetSecurityContext provides a mock function with given fields: +func (_m *ExecutionContext) GetSecurityContext() core.SecurityContext { + ret := _m.Called() + + var r0 core.SecurityContext + if rf, ok := ret.Get(0).(func() core.SecurityContext); ok { + r0 = rf() + } else { + r0 = ret.Get(0).(core.SecurityContext) + } + + return r0 +} + type ExecutionContext_GetServiceAccountName struct { *mock.Call } diff --git a/pkg/controller/executors/mocks/immutable_execution_context.go b/pkg/controller/executors/mocks/immutable_execution_context.go index 14a8cd39b..fec05a4bc 100644 --- a/pkg/controller/executors/mocks/immutable_execution_context.go +++ b/pkg/controller/executors/mocks/immutable_execution_context.go @@ -3,7 +3,10 @@ package mocks import ( + core "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" + mock "github.com/stretchr/testify/mock" + types "k8s.io/apimachinery/pkg/types" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -436,6 +439,38 @@ func (_m *ImmutableExecutionContext) GetRawOutputDataConfig() v1alpha1.RawOutput return r0 } +type ImmutableExecutionContext_GetSecurityContext struct { + *mock.Call +} + +func (_m ImmutableExecutionContext_GetSecurityContext) Return(_a0 core.SecurityContext) *ImmutableExecutionContext_GetSecurityContext { + return &ImmutableExecutionContext_GetSecurityContext{Call: _m.Call.Return(_a0)} +} + +func (_m *ImmutableExecutionContext) OnGetSecurityContext() *ImmutableExecutionContext_GetSecurityContext { + c := _m.On("GetSecurityContext") + return &ImmutableExecutionContext_GetSecurityContext{Call: c} +} + +func (_m *ImmutableExecutionContext) OnGetSecurityContextMatch(matchers ...interface{}) *ImmutableExecutionContext_GetSecurityContext { + c := _m.On("GetSecurityContext", matchers...) + return &ImmutableExecutionContext_GetSecurityContext{Call: c} +} + +// GetSecurityContext provides a mock function with given fields: +func (_m *ImmutableExecutionContext) GetSecurityContext() core.SecurityContext { + ret := _m.Called() + + var r0 core.SecurityContext + if rf, ok := ret.Get(0).(func() core.SecurityContext); ok { + r0 = rf() + } else { + r0 = ret.Get(0).(core.SecurityContext) + } + + return r0 +} + type ImmutableExecutionContext_GetServiceAccountName struct { *mock.Call } diff --git a/pkg/controller/nodes/handler/mocks/node_execution_metadata.go b/pkg/controller/nodes/handler/mocks/node_execution_metadata.go index 9d857d118..c6dcc65b7 100644 --- a/pkg/controller/nodes/handler/mocks/node_execution_metadata.go +++ b/pkg/controller/nodes/handler/mocks/node_execution_metadata.go @@ -247,6 +247,38 @@ func (_m *NodeExecutionMetadata) GetOwnerReference() v1.OwnerReference { return r0 } +type NodeExecutionMetadata_GetSecurityContext struct { + *mock.Call +} + +func (_m NodeExecutionMetadata_GetSecurityContext) Return(_a0 core.SecurityContext) *NodeExecutionMetadata_GetSecurityContext { + return &NodeExecutionMetadata_GetSecurityContext{Call: _m.Call.Return(_a0)} +} + +func (_m *NodeExecutionMetadata) OnGetSecurityContext() *NodeExecutionMetadata_GetSecurityContext { + c := _m.On("GetSecurityContext") + return &NodeExecutionMetadata_GetSecurityContext{Call: c} +} + +func (_m *NodeExecutionMetadata) OnGetSecurityContextMatch(matchers ...interface{}) *NodeExecutionMetadata_GetSecurityContext { + c := _m.On("GetSecurityContext", matchers...) + return &NodeExecutionMetadata_GetSecurityContext{Call: c} +} + +// GetSecurityContext provides a mock function with given fields: +func (_m *NodeExecutionMetadata) GetSecurityContext() core.SecurityContext { + ret := _m.Called() + + var r0 core.SecurityContext + if rf, ok := ret.Get(0).(func() core.SecurityContext); ok { + r0 = rf() + } else { + r0 = ret.Get(0).(core.SecurityContext) + } + + return r0 +} + type NodeExecutionMetadata_IsInterruptible struct { *mock.Call } diff --git a/pkg/controller/nodes/handler/node_exec_context.go b/pkg/controller/nodes/handler/node_exec_context.go index a74ed3b84..a32c8c056 100644 --- a/pkg/controller/nodes/handler/node_exec_context.go +++ b/pkg/controller/nodes/handler/node_exec_context.go @@ -37,6 +37,7 @@ type NodeExecutionMetadata interface { GetLabels() map[string]string GetAnnotations() map[string]string GetK8sServiceAccount() string + GetSecurityContext() core.SecurityContext IsInterruptible() bool } diff --git a/pkg/controller/nodes/resolve_test.go b/pkg/controller/nodes/resolve_test.go index 95fea0d42..0c6d5f58d 100644 --- a/pkg/controller/nodes/resolve_test.go +++ b/pkg/controller/nodes/resolve_test.go @@ -118,6 +118,10 @@ func (d *dummyBaseWorkflow) GetServiceAccountName() string { return "" } +func (d *dummyBaseWorkflow) GetSecurityContext() core.SecurityContext { + return core.SecurityContext{} +} + func (d *dummyBaseWorkflow) GetTask(id v1alpha1.TaskID) (v1alpha1.ExecutableTask, error) { return nil, nil } From 1d42a5b413db68faf67db8727512bc32fe14899d Mon Sep 17 00:00:00 2001 From: Anand Swaminathan Date: Mon, 15 Mar 2021 19:15:40 -0700 Subject: [PATCH 2/4] Upgrade plugins to pull Spark ServiceAccount Fix Signed-off-by: Anand Swaminathan --- go.mod | 2 +- go.sum | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 7d43cda87..9b04bedda 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/flyteorg/datacatalog v0.3.0 github.com/flyteorg/flyteidl v0.18.17 github.com/flyteorg/flyteplugins v0.5.34-0.20210316001250-2aa78752626e - github.com/flyteorg/flytestdlib v0.3.14 + github.com/flyteorg/flytestdlib v0.3.13 github.com/ghodss/yaml v1.0.0 github.com/go-redis/redis v6.15.7+incompatible github.com/golang/protobuf v1.4.3 diff --git a/go.sum b/go.sum index 0b21d5fca..200e2e7e5 100644 --- a/go.sum +++ b/go.sum @@ -242,9 +242,8 @@ github.com/flyteorg/flyteidl v0.18.17 h1:74pPZ9PzITuzq+CgjMPb9EcFI5bVkf8mM5m4xmm github.com/flyteorg/flyteidl v0.18.17/go.mod h1:b5Fq4Z8a5b0mF6pEwTd48ufvikUGVkWSjZiMT0ZtqKI= github.com/flyteorg/flyteplugins v0.5.34-0.20210316001250-2aa78752626e h1:4A+fIYJHxDhYgX/Av151qzSc+YUo9T64I8amun/PZEE= github.com/flyteorg/flyteplugins v0.5.34-0.20210316001250-2aa78752626e/go.mod h1:CxerBGWWEmNYmPxSMHnwQEr9cc1Fbo/g5fcABazU6Jo= +github.com/flyteorg/flytestdlib v0.3.13 h1:5ioA/q3ixlyqkFh5kDaHgmPyTP/AHtqq1K/TIbVLUzM= github.com/flyteorg/flytestdlib v0.3.13/go.mod h1:Tz8JCECAbX6VWGwFT6cmEQ+RJpZ/6L9pswu3fzWs220= -github.com/flyteorg/flytestdlib v0.3.14 h1:ipHGxux3ITe7Z39MJWdbVMW+/D6QuL6ppYUOPvJWelE= -github.com/flyteorg/flytestdlib v0.3.14/go.mod h1:Tz8JCECAbX6VWGwFT6cmEQ+RJpZ/6L9pswu3fzWs220= github.com/form3tech-oss/jwt-go v3.2.2+incompatible h1:TcekIExNqud5crz4xD2pavyTgWiPvpYe4Xau31I0PRk= github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVBjqR7JHJk0brhHOZYGmfBYOrK0ZhYMEtBr4= From b6274782a2ec76c504d30e6a17ba0e020db3556a Mon Sep 17 00:00:00 2001 From: Anand Swaminathan Date: Thu, 18 Mar 2021 11:05:33 -0700 Subject: [PATCH 3/4] pull Signed-off-by: Anand Swaminathan --- go.mod | 2 +- go.sum | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index 9b04bedda..d1e5bd7e3 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ require ( github.com/fatih/color v1.10.0 github.com/flyteorg/datacatalog v0.3.0 github.com/flyteorg/flyteidl v0.18.17 - github.com/flyteorg/flyteplugins v0.5.34-0.20210316001250-2aa78752626e + github.com/flyteorg/flyteplugins v0.5.35 github.com/flyteorg/flytestdlib v0.3.13 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 200e2e7e5..9d58c87d5 100644 --- a/go.sum +++ b/go.sum @@ -73,7 +73,6 @@ github.com/Azure/go-autorest/logger v0.2.0/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZ github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk= github.com/Azure/go-autorest/tracing v0.6.0 h1:TYi4+3m5t6K48TGI9AUdb+IzbnSxvnvUMfuitfgcfuo= github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU= -github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/DiSiqueira/GoTree v1.0.1-0.20180907134536-53a8e837f295 h1:xJ0dAkuxJXfwdH7IaSzBEbSQxEDz36YUmt7+CB4zoNA= @@ -240,8 +239,8 @@ github.com/flyteorg/datacatalog v0.3.0/go.mod h1:Y022upSReYrjYCO+S+/udfuVOBj047b github.com/flyteorg/flyteidl v0.18.15/go.mod h1:b5Fq4Z8a5b0mF6pEwTd48ufvikUGVkWSjZiMT0ZtqKI= github.com/flyteorg/flyteidl v0.18.17 h1:74pPZ9PzITuzq+CgjMPb9EcFI5bVkf8mM5m4xmmlTmY= github.com/flyteorg/flyteidl v0.18.17/go.mod h1:b5Fq4Z8a5b0mF6pEwTd48ufvikUGVkWSjZiMT0ZtqKI= -github.com/flyteorg/flyteplugins v0.5.34-0.20210316001250-2aa78752626e h1:4A+fIYJHxDhYgX/Av151qzSc+YUo9T64I8amun/PZEE= -github.com/flyteorg/flyteplugins v0.5.34-0.20210316001250-2aa78752626e/go.mod h1:CxerBGWWEmNYmPxSMHnwQEr9cc1Fbo/g5fcABazU6Jo= +github.com/flyteorg/flyteplugins v0.5.35 h1:KEMOiA4B+lIxQ+l7FRHzVcPA234Td9+ursuJDm6I8dg= +github.com/flyteorg/flyteplugins v0.5.35/go.mod h1:CxerBGWWEmNYmPxSMHnwQEr9cc1Fbo/g5fcABazU6Jo= github.com/flyteorg/flytestdlib v0.3.13 h1:5ioA/q3ixlyqkFh5kDaHgmPyTP/AHtqq1K/TIbVLUzM= github.com/flyteorg/flytestdlib v0.3.13/go.mod h1:Tz8JCECAbX6VWGwFT6cmEQ+RJpZ/6L9pswu3fzWs220= github.com/form3tech-oss/jwt-go v3.2.2+incompatible h1:TcekIExNqud5crz4xD2pavyTgWiPvpYe4Xau31I0PRk= @@ -1245,7 +1244,6 @@ honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -honnef.co/go/tools v0.0.1-2020.1.4 h1:UoveltGrhghAA7ePc+e+QYDHXrBps2PqFZiHkGR/xK8= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= k8s.io/api v0.0.0-20210217171935-8e2decd92398/go.mod h1:60tmSUpHxGPFerNHbo/ayI2lKxvtrhbxFyXuEIWJd78= k8s.io/api v0.18.2/go.mod h1:SJCWI7OLzhZSvbY7U8zwNl9UA4o1fizoug34OV/2r78= From 1d8da902db59b363e48a9052d86480b75b1d0a71 Mon Sep 17 00:00:00 2001 From: Anand Swaminathan Date: Thu, 18 Mar 2021 14:06:17 -0700 Subject: [PATCH 4/4] fix Signed-off-by: Anand Swaminathan --- .../flyteworkflow/v1alpha1/zz_generated.deepcopy.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/apis/flyteworkflow/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/flyteworkflow/v1alpha1/zz_generated.deepcopy.go index cd84032cf..3fcdcc3b2 100644 --- a/pkg/apis/flyteworkflow/v1alpha1/zz_generated.deepcopy.go +++ b/pkg/apis/flyteworkflow/v1alpha1/zz_generated.deepcopy.go @@ -233,12 +233,12 @@ func (in *FlyteWorkflow) DeepCopyInto(out *FlyteWorkflow) { in, out := &in.AcceptedAt, &out.AcceptedAt *out = (*in).DeepCopy() } - in.SecurityContext.DeepCopyInto(&out.SecurityContext) + out.SecurityContext = in.SecurityContext in.Status.DeepCopyInto(&out.Status) in.RawOutputDataConfig.DeepCopyInto(&out.RawOutputDataConfig) in.ExecutionConfig.DeepCopyInto(&out.ExecutionConfig) if in.DataReferenceConstructor != nil { - out.DataReferenceConstructor = in.DataReferenceConstructor.DeepCopyReferenceConstructor() + out.DataReferenceConstructor = in.DataReferenceConstructor } return } @@ -550,7 +550,7 @@ func (in *NodeStatus) DeepCopyInto(out *NodeStatus) { *out = (*in).DeepCopy() } if in.DataReferenceConstructor != nil { - out.DataReferenceConstructor = in.DataReferenceConstructor.DeepCopyReferenceConstructor() + out.DataReferenceConstructor = in.DataReferenceConstructor } return } @@ -705,7 +705,7 @@ func (in *WorkflowNodeStatus) DeepCopyInto(out *WorkflowNodeStatus) { if in.ExecutionError != nil { in, out := &in.ExecutionError, &out.ExecutionError *out = new(core.ExecutionError) - (*in).DeepCopyInto(*out) + *out = *in } return } @@ -806,7 +806,7 @@ func (in *WorkflowStatus) DeepCopyInto(out *WorkflowStatus) { *out = (*in).DeepCopy() } if in.DataReferenceConstructor != nil { - out.DataReferenceConstructor = in.DataReferenceConstructor.DeepCopyReferenceConstructor() + out.DataReferenceConstructor = in.DataReferenceConstructor } return }