From 3087986e4bafbcab0cc940a98fd9be9c6ea26e75 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Mon, 13 Apr 2026 21:34:10 +0200 Subject: [PATCH] Kubernetes: detached steps are nos services --- pipeline/backend/kubernetes/pod_test.go | 7 ++++--- pipeline/backend/kubernetes/service.go | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pipeline/backend/kubernetes/pod_test.go b/pipeline/backend/kubernetes/pod_test.go index 83f4f773c66..da492f26c7c 100644 --- a/pipeline/backend/kubernetes/pod_test.go +++ b/pipeline/backend/kubernetes/pod_test.go @@ -56,8 +56,8 @@ func TestStepToPodName(t *testing.T) { name, err = stepToPodName(&types.Step{UUID: "01he8bebctabr3kg", Name: "postgres", Type: types.StepTypeService, Ports: []types.Port{{Number: 5432}}}) assert.NoError(t, err) assert.EqualValues(t, "wp-svc-01he8bebctabr3kg-postgres", name) - // Detached service - name, err = stepToPodName(&types.Step{UUID: "01he8bebctabr3kg", Name: "postgres", Detached: true, Ports: []types.Port{{Number: 5432}}}) + // Service + name, err = stepToPodName(&types.Step{UUID: "01he8bebctabr3kg", Name: "postgres", Detached: true, Type: types.StepTypeService, Ports: []types.Port{{Number: 5432}}}) assert.NoError(t, err) assert.EqualValues(t, "wp-svc-01he8bebctabr3kg-postgres", name) // Detached long running container @@ -82,11 +82,12 @@ func TestPodMeta(t *testing.T) { assert.EqualValues(t, "wp-svc-01he8bebctabr3kg-postgres", meta.Labels[ServiceLabel]) assert.EqualValues(t, taskUUID, meta.Labels[TaskUUIDLabel]) - // Detached service + // Service meta, err = podMeta(&types.Step{ Name: "postgres", UUID: "01he8bebctabr3kg", Detached: true, + Type: types.StepTypeService, Image: "postgres:16", WorkingDir: "/woodpecker/src", Environment: map[string]string{"CI": "woodpecker"}, diff --git a/pipeline/backend/kubernetes/service.go b/pipeline/backend/kubernetes/service.go index 612aabc3c7e..81dd0dff625 100644 --- a/pipeline/backend/kubernetes/service.go +++ b/pipeline/backend/kubernetes/service.go @@ -60,7 +60,7 @@ func serviceName(step *types.Step) (string, error) { } func isService(step *types.Step) bool { - return step.Type == types.StepTypeService || (step.Detached && dnsPattern.FindStringIndex(step.Name) != nil) + return step.Type == types.StepTypeService } func subdomain(taskUUID string) (string, error) {