diff --git a/flyteplugins/go/tasks/pluginmachinery/flytek8s/pod_helper.go b/flyteplugins/go/tasks/pluginmachinery/flytek8s/pod_helper.go index ca1a8cc674..f72e3db86c 100644 --- a/flyteplugins/go/tasks/pluginmachinery/flytek8s/pod_helper.go +++ b/flyteplugins/go/tasks/pluginmachinery/flytek8s/pod_helper.go @@ -23,6 +23,7 @@ import ( "github.com/flyteorg/flyte/v2/flyteplugins/go/tasks/pluginmachinery/flytek8s/config" "github.com/flyteorg/flyte/v2/flyteplugins/go/tasks/pluginmachinery/k8s" "github.com/flyteorg/flyte/v2/flyteplugins/go/tasks/pluginmachinery/utils" + // TODO @pvditt fix //propellerCfg "github.com/flyteorg/flyte/flytepropeller/pkg/controller/config" "github.com/flyteorg/flyte/v2/flytestdlib/logger" @@ -469,6 +470,9 @@ func BuildRawPod(ctx context.Context, tCtx pluginsCore.TaskExecutionContext) (*v "invalid TaskSpecification, unable to determine Pod configuration") } + enableServiceLinks := false + podSpec.EnableServiceLinks = &enableServiceLinks + return podSpec, &objectMeta, primaryContainerName, nil } diff --git a/flyteplugins/go/tasks/pluginmachinery/flytek8s/pod_helper_test.go b/flyteplugins/go/tasks/pluginmachinery/flytek8s/pod_helper_test.go index 505c68f201..39fc9e0ff6 100644 --- a/flyteplugins/go/tasks/pluginmachinery/flytek8s/pod_helper_test.go +++ b/flyteplugins/go/tasks/pluginmachinery/flytek8s/pod_helper_test.go @@ -98,7 +98,7 @@ func dummyExecContext(taskTemplate *core.TaskTemplate, r *v1.ResourceRequirement tCtx.EXPECT().OutputWriter().Return(ow) taskReader := &pluginsCoreMock.TaskReader{} - taskReader.EXPECT().Read( mock.Anything).Return(taskTemplate, nil) + taskReader.EXPECT().Read(mock.Anything).Return(taskTemplate, nil) tCtx.EXPECT().TaskReader().Return(taskReader) return tCtx } @@ -1939,6 +1939,15 @@ func TestToK8sPod(t *testing.T) { assert.False(t, p.HostNetwork) }) + t.Run("disableServiceLinks", func(t *testing.T) { + assert.NoError(t, config.SetK8sPluginConfig(&config.K8sPluginConfig{})) + x := dummyExecContext(dummyTaskTemplate(), &v1.ResourceRequirements{}, nil, "", nil) + p, _, _, err := ToK8sPodSpec(ctx, x) + assert.NoError(t, err) + assert.NotNil(t, p.EnableServiceLinks) + assert.False(t, *p.EnableServiceLinks) + }) + t.Run("default-pod-dns-config", func(t *testing.T) { val1 := "1" val2 := "1" @@ -3046,7 +3055,7 @@ func TestGetPodTemplate(t *testing.T) { } taskReader := &pluginsCoreMock.TaskReader{} - taskReader.EXPECT().Read( mock.Anything).Return(task, nil) + taskReader.EXPECT().Read(mock.Anything).Return(task, nil) tCtx := &pluginsCoreMock.TaskExecutionContext{} tCtx.EXPECT().TaskExecutionMetadata().Return(dummyTaskExecutionMetadata(&v1.ResourceRequirements{}, nil, "", nil)) @@ -3072,7 +3081,7 @@ func TestGetPodTemplate(t *testing.T) { } taskReader := &pluginsCoreMock.TaskReader{} - taskReader.EXPECT().Read( mock.Anything).Return(task, nil) + taskReader.EXPECT().Read(mock.Anything).Return(task, nil) tCtx := &pluginsCoreMock.TaskExecutionContext{} tCtx.EXPECT().TaskExecutionMetadata().Return(dummyTaskExecutionMetadata(&v1.ResourceRequirements{}, nil, "", nil)) @@ -3099,7 +3108,7 @@ func TestGetPodTemplate(t *testing.T) { } taskReader := &pluginsCoreMock.TaskReader{} - taskReader.EXPECT().Read( mock.Anything).Return(task, nil) + taskReader.EXPECT().Read(mock.Anything).Return(task, nil) tCtx := &pluginsCoreMock.TaskExecutionContext{} tCtx.EXPECT().TaskExecutionMetadata().Return(dummyTaskExecutionMetadata(&v1.ResourceRequirements{}, nil, "", nil)) @@ -3127,7 +3136,7 @@ func TestGetPodTemplate(t *testing.T) { } taskReader := &pluginsCoreMock.TaskReader{} - taskReader.EXPECT().Read( mock.Anything).Return(task, nil) + taskReader.EXPECT().Read(mock.Anything).Return(task, nil) tCtx := &pluginsCoreMock.TaskExecutionContext{} tCtx.EXPECT().TaskExecutionMetadata().Return(dummyTaskExecutionMetadata(&v1.ResourceRequirements{}, nil, "", nil)) @@ -3169,7 +3178,7 @@ func TestMergeWithBasePodTemplate(t *testing.T) { } taskReader := &pluginsCoreMock.TaskReader{} - taskReader.EXPECT().Read( mock.Anything).Return(task, nil) + taskReader.EXPECT().Read(mock.Anything).Return(task, nil) tCtx := &pluginsCoreMock.TaskExecutionContext{} tCtx.EXPECT().TaskExecutionMetadata().Return(dummyTaskExecutionMetadata(&v1.ResourceRequirements{}, nil, "", nil)) @@ -3231,7 +3240,7 @@ func TestMergeWithBasePodTemplate(t *testing.T) { } taskReader := &pluginsCoreMock.TaskReader{} - taskReader.EXPECT().Read( mock.Anything).Return(task, nil) + taskReader.EXPECT().Read(mock.Anything).Return(task, nil) tCtx := &pluginsCoreMock.TaskExecutionContext{} tCtx.EXPECT().TaskExecutionMetadata().Return(dummyTaskExecutionMetadata(&v1.ResourceRequirements{}, nil, "", nil)) diff --git a/gen/rust/Cargo.lock b/gen/rust/Cargo.lock index e784fe1a99..df35a5c975 100644 --- a/gen/rust/Cargo.lock +++ b/gen/rust/Cargo.lock @@ -135,9 +135,9 @@ checksum = "b35204fbdc0b3f4446b89fc1ac2cf84a8a68971995d0bf2e925ec7cd960f9cb3" [[package]] name = "cc" -version = "1.2.54" +version = "1.2.55" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6354c81bbfd62d9cfa9cb3c773c2b7b2a3a482d569de977fd0e961f6e7c00583" +checksum = "47b26a0954ae34af09b50f0de26458fa95369a0d478d8236d3f93082b219bd29" dependencies = [ "find-msvc-tools", "shlex", @@ -188,9 +188,9 @@ checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" [[package]] name = "find-msvc-tools" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8591b0bcc8a98a64310a2fae1bb3e9b8564dd10e381e6e28010fde8e8e8568db" +checksum = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582" [[package]] name = "fixedbitset" @@ -1723,18 +1723,18 @@ checksum = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5" [[package]] name = "zerocopy" -version = "0.8.35" +version = "0.8.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdea86ddd5568519879b8187e1cf04e24fce28f7fe046ceecbce472ff19a2572" +checksum = "7456cf00f0685ad319c5b1693f291a650eaf345e941d082fc4e03df8a03996ac" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.8.35" +version = "0.8.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c15e1b46eff7c6c91195752e0eeed8ef040e391cdece7c25376957d5f15df22" +checksum = "1328722bbf2115db7e19d69ebcc15e795719e2d66b60827c6a69a117365e37a0" dependencies = [ "proc-macro2", "quote",