Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 20 additions & 5 deletions executor/pkg/plugin/k8s/plugin_manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -97,10 +97,14 @@ func (pm *PluginManager) GetProperties() pluginsCore.PluginProperties {
}
}

func (pm *PluginManager) addObjectMetadata(taskCtx pluginsCore.TaskExecutionMetadata, o client.Object, cfg *config.K8sPluginConfig) {
func (pm *PluginManager) addObjectMetadata(taskCtx pluginsCore.TaskExecutionMetadata, o client.Object, cfg *config.K8sPluginConfig, taskTemplate *core.TaskTemplate) {
// Task-level metadata goes on the object itself (the pod, or the CR for CRD-backed tasks),
// while pod template metadata only reaches the CR's pods.
k8sMetadata := taskTemplate.GetMetadata().GetMetadata()

o.SetNamespace(taskCtx.GetNamespace())
o.SetAnnotations(pluginsUtils.UnionMaps(cfg.DefaultAnnotations, o.GetAnnotations(), pluginsUtils.CopyMap(taskCtx.GetAnnotations())))
o.SetLabels(pluginsUtils.UnionMaps(cfg.DefaultLabels, o.GetLabels(), pluginsUtils.CopyMap(taskCtx.GetLabels())))
o.SetAnnotations(pluginsUtils.UnionMaps(cfg.DefaultAnnotations, o.GetAnnotations(), k8sMetadata.GetAnnotations(), pluginsUtils.CopyMap(taskCtx.GetAnnotations())))
o.SetLabels(pluginsUtils.UnionMaps(cfg.DefaultLabels, o.GetLabels(), k8sMetadata.GetLabels(), pluginsUtils.CopyMap(taskCtx.GetLabels())))
name := taskCtx.GetTaskExecutionID().GetGeneratedName()
if pm.plugin.GetProperties().GeneratedNameMaxLength != nil {
if truncatedName, err := taskCtx.GetTaskExecutionID().GetGeneratedNameWith(0, *pm.plugin.GetProperties().GeneratedNameMaxLength); err == nil {
Expand Down Expand Up @@ -129,7 +133,13 @@ func (pm *PluginManager) launchResource(ctx context.Context, tCtx pluginsCore.Ta
return pluginsCore.UnknownTransition, err
}

pm.addObjectMetadata(tCtx.TaskExecutionMetadata(), o, config.GetK8sPluginConfig())
taskTemplate, err := tCtx.TaskReader().Read(ctx)
if err != nil {
logger.Errorf(ctx, "Failed to read task template. Error: %v", err)
return pluginsCore.UnknownTransition, err
}

pm.addObjectMetadata(tCtx.TaskExecutionMetadata(), o, config.GetK8sPluginConfig(), taskTemplate)
logger.Infof(ctx, "Creating Object: Type:[%v], Object:[%v/%v]", o.GetObjectKind().GroupVersionKind(), o.GetNamespace(), o.GetName())

err = pm.kubeClient.GetClient().Create(ctx, o)
Expand Down Expand Up @@ -211,7 +221,12 @@ func (pm *PluginManager) getResource(ctx context.Context, tCtx pluginsCore.TaskE
tCtx.TaskExecutionMetadata().GetTaskExecutionID().GetGeneratedName(), err)
return nil, err
}
pm.addObjectMetadata(tCtx.TaskExecutionMetadata(), o, config.GetK8sPluginConfig())
taskTemplate, err := tCtx.TaskReader().Read(ctx)
if err != nil {
logger.Errorf(ctx, "Failed to read task template. Error: %v", err)
return nil, err
}
pm.addObjectMetadata(tCtx.TaskExecutionMetadata(), o, config.GetK8sPluginConfig(), taskTemplate)
Comment on lines +224 to +229
return o, nil
}

Expand Down
72 changes: 65 additions & 7 deletions executor/pkg/plugin/k8s/plugin_manager_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ func TestAddObjectMetadata_GeneratedNameMaxLength(t *testing.T) {
taskMetadata.EXPECT().GetTaskExecutionID().Return(tID)

pod := &v1.Pod{}
pm.addObjectMetadata(taskMetadata, pod, &config.K8sPluginConfig{})
pm.addObjectMetadata(taskMetadata, pod, &config.K8sPluginConfig{}, nil)

assert.Equal(t, longName, pod.GetName())
assert.Equal(t, "test-ns", pod.GetNamespace())
Expand All @@ -89,7 +89,7 @@ func TestAddObjectMetadata_GeneratedNameMaxLength(t *testing.T) {
taskMetadata.EXPECT().GetTaskExecutionID().Return(tID)

pod := &v1.Pod{}
pm.addObjectMetadata(taskMetadata, pod, &config.K8sPluginConfig{})
pm.addObjectMetadata(taskMetadata, pod, &config.K8sPluginConfig{}, nil)

expectedName, err := encoding.FixedLengthUniqueID(longName, maxLength)
require.NoError(t, err)
Expand Down Expand Up @@ -121,7 +121,7 @@ func TestAddObjectMetadata_GeneratedNameMaxLength(t *testing.T) {
taskMetadata.EXPECT().GetTaskExecutionID().Return(tID)

pod := &v1.Pod{}
pm.addObjectMetadata(taskMetadata, pod, &config.K8sPluginConfig{})
pm.addObjectMetadata(taskMetadata, pod, &config.K8sPluginConfig{}, nil)

assert.Equal(t, shortName, pod.GetName())
})
Expand All @@ -142,6 +142,12 @@ func metadataMock(generatedName string) *pluginsCoreMock.TaskExecutionMetadata {
return meta
}

func taskReaderMock(taskTemplate *core.TaskTemplate) *pluginsCoreMock.TaskReader {
reader := &pluginsCoreMock.TaskReader{}
reader.EXPECT().Read(mock.Anything).Return(taskTemplate, nil)
return reader
}

// TestLaunchResource_InvalidCreateFastFails verifies that a deterministic admission/validation
// rejection (e.g. a derived name exceeding k8s length limits) fast-fails instead of looping via
// UnknownTransition and leaving the execution stuck RUNNING.
Expand All @@ -168,6 +174,7 @@ func TestLaunchResource_InvalidCreateFastFails(t *testing.T) {

tCtx := &pluginsCoreMock.TaskExecutionContext{}
tCtx.EXPECT().TaskExecutionMetadata().Return(metadataMock("too-long-name"))
tCtx.EXPECT().TaskReader().Return(taskReaderMock(nil))

pm := NewPluginManager("test", plugin, kubeClient)

Expand Down Expand Up @@ -248,6 +255,7 @@ func TestLaunchResourceErrors(t *testing.T) {

tCtx := &pluginsCoreMock.TaskExecutionContext{}
tCtx.EXPECT().TaskExecutionMetadata().Return(metadataMock("name"))
tCtx.EXPECT().TaskReader().Return(taskReaderMock(nil))

pm := NewPluginManager("test", plugin, kubeClient)

Expand Down Expand Up @@ -324,6 +332,7 @@ func TestLaunchResource_AlreadyExists(t *testing.T) {

tCtx := &pluginsCoreMock.TaskExecutionContext{}
tCtx.EXPECT().TaskExecutionMetadata().Return(metadataMock("name"))
tCtx.EXPECT().TaskReader().Return(taskReaderMock(nil))

pm := NewPluginManager("test", plugin, kubeClient)

Expand Down Expand Up @@ -388,6 +397,7 @@ func TestHandle_WaitsForPreviousResourceToDrain(t *testing.T) {
tCtx.EXPECT().PluginStateReader().Return(stateReader)
tCtx.EXPECT().PluginStateWriter().Return(stateWriter)
tCtx.EXPECT().TaskExecutionMetadata().Return(metadataMock("name"))
tCtx.EXPECT().TaskReader().Return(taskReaderMock(nil))

plugin := &k8sMocks.Plugin{}
plugin.EXPECT().GetProperties().Return(k8s.PluginProperties{})
Expand Down Expand Up @@ -987,34 +997,82 @@ func TestAddObjectMetadata_ManagedLabel(t *testing.T) {

t.Run("propagates to the object", func(t *testing.T) {
pod := &v1.Pod{}
newManager(t).addObjectMetadata(newMeta(managedLabels), pod, &config.K8sPluginConfig{})
newManager(t).addObjectMetadata(newMeta(managedLabels), pod, &config.K8sPluginConfig{}, nil)

assert.Equal(t, flytek8s.ManagedLabelValue, pod.GetLabels()[flytek8s.ManagedLabelKey])
})

t.Run("matches the selector the manager cache is configured with", func(t *testing.T) {
pod := &v1.Pod{}
newManager(t).addObjectMetadata(newMeta(managedLabels), pod, &config.K8sPluginConfig{})
newManager(t).addObjectMetadata(newMeta(managedLabels), pod, &config.K8sPluginConfig{}, nil)

selector := labels.SelectorFromSet(labels.Set{
flytek8s.ManagedLabelKey: flytek8s.ManagedLabelValue,
})
assert.True(t, selector.Matches(labels.Set(pod.GetLabels())))
})

t.Run("not dropped by platform defaults or labels already on the object", func(t *testing.T) {
t.Run("not dropped by platform defaults, task metadata or labels already on the object", func(t *testing.T) {
pod := &v1.Pod{ObjectMeta: metav1.ObjectMeta{
Labels: map[string]string{flytek8s.ManagedLabelKey: "object-value"},
}}
cfg := &config.K8sPluginConfig{
DefaultLabels: map[string]string{flytek8s.ManagedLabelKey: "default-value"},
}
newManager(t).addObjectMetadata(newMeta(managedLabels), pod, cfg)
taskTemplate := &core.TaskTemplate{Metadata: &core.TaskMetadata{Metadata: &core.K8SObjectMetadata{
Labels: map[string]string{flytek8s.ManagedLabelKey: "task-value"},
}}}
newManager(t).addObjectMetadata(newMeta(managedLabels), pod, cfg, taskTemplate)

assert.Equal(t, flytek8s.ManagedLabelValue, pod.GetLabels()[flytek8s.ManagedLabelKey])
})
}

// TestAddObjectMetadata_TaskMetadata verifies that TaskMetadata.metadata lands on the object
// itself, so a CRD-backed task can annotate its CR without annotating the CR's pods.
func TestAddObjectMetadata_TaskMetadata(t *testing.T) {
mockPlugin := k8sMocks.NewPlugin(t)
mockPlugin.EXPECT().GetProperties().Return(k8s.PluginProperties{})
pm := NewPluginManager("test-plugin", mockPlugin, nil)

tID := &pluginsCoreMock.TaskExecutionID{}
tID.EXPECT().GetGeneratedName().Return("name")
meta := &pluginsCoreMock.TaskExecutionMetadata{}
meta.EXPECT().GetTaskExecutionID().Return(tID)
meta.EXPECT().GetNamespace().Return("ns")
meta.EXPECT().GetAnnotations().Return(map[string]string{"shared-annotation": "execution"})
meta.EXPECT().GetLabels().Return(map[string]string{"shared-label": "execution"})
meta.EXPECT().GetOwnerReference().Return(metav1.OwnerReference{})

cfg := &config.K8sPluginConfig{
DefaultAnnotations: map[string]string{"default-annotation": "default", "elastic": "default"},
DefaultLabels: map[string]string{"default-label": "default"},
}
// What a plugin may have copied onto the CR from its pod template.
obj := &v1.Pod{ObjectMeta: metav1.ObjectMeta{
Annotations: map[string]string{"elastic": "pod-template"},
Labels: map[string]string{"pod-template-label": "pod-template"},
}}
taskTemplate := &core.TaskTemplate{Metadata: &core.TaskMetadata{Metadata: &core.K8SObjectMetadata{
Annotations: map[string]string{"elastic": "task", "shared-annotation": "task"},
Labels: map[string]string{"task-label": "task", "shared-label": "task"},
}}}

pm.addObjectMetadata(meta, obj, cfg, taskTemplate)

assert.Equal(t, map[string]string{
"default-annotation": "default",
"elastic": "task",
"shared-annotation": "execution",
}, obj.GetAnnotations())
assert.Equal(t, map[string]string{
"default-label": "default",
"pod-template-label": "pod-template",
"task-label": "task",
"shared-label": "execution",
}, obj.GetLabels())
}

func TestClassifyExternalTermination(t *testing.T) {
key := watchedObjectKey{Namespace: "ns", Name: "pod", Kind: "Pod"}
base := time.Date(2026, 9, 18, 10, 0, 0, 0, time.UTC)
Expand Down
Loading