Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
Next Next commit
chore: fix duplicated services
  • Loading branch information
eliasscosta committed Feb 16, 2024
commit e793d2f46f5f1aa39f1382fd6281b1f643789dd5
2 changes: 1 addition & 1 deletion pipeline/backend/kubernetes/pod.go
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ func podMeta(step *types.Step, config *config, options BackendOptions, podName s
}

if step.Type == types.StepTypeService {
meta.Labels[ServiceLabel] = step.Name
meta.Labels[ServiceLabel], _ = serviceName(step)
}

meta.Annotations = config.PodAnnotations
Expand Down
2 changes: 1 addition & 1 deletion pipeline/backend/kubernetes/service.go
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ func mkService(step *types.Step, config *config) (*v1.Service, error) {
}

func serviceName(step *types.Step) (string, error) {
return dnsName(step.Name)
return dnsName(step.Name + "-" + step.UUID)
}

func servicePort(port types.Port) v1.ServicePort {
Expand Down
17 changes: 9 additions & 8 deletions pipeline/backend/kubernetes/service_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,24 +24,24 @@ import (
)

func TestServiceName(t *testing.T) {
name, err := serviceName(&types.Step{Name: "database"})
name, err := serviceName(&types.Step{Name: "database", UUID: "01he8bebctabr3kgk0qj36d2me-0"})
assert.NoError(t, err)
assert.Equal(t, "database", name)
assert.Equal(t, "database-01he8bebctabr3kgk0qj36d2me-0", name)

name, err = serviceName(&types.Step{Name: "wp-01he8bebctabr3kgk0qj36d2me-0-services-0.woodpecker-runtime.svc.cluster.local"})
name, err = serviceName(&types.Step{Name: "wp-01he8bebctabr3kgk0qj36d2me-0-services-0.woodpecker-runtime.svc.cluster.local", UUID: "01he8bebctabr3kgk0qj36d2me-0"})
assert.NoError(t, err)
assert.Equal(t, "wp-01he8bebctabr3kgk0qj36d2me-0-services-0.woodpecker-runtime.svc.cluster.local", name)
assert.Equal(t, "wp-01he8bebctabr3kgk0qj36d2me-0-services-0.woodpecker-runtime.svc.cluster.local-01he8bebctabr3kgk0qj36d2me-0", name)

name, err = serviceName(&types.Step{Name: "awesome_service"})
name, err = serviceName(&types.Step{Name: "awesome_service", UUID: "01he8bebctabr3kgk0qj36d2me-0"})
assert.NoError(t, err)
assert.Equal(t, "awesome-service", name)
assert.Equal(t, "awesome-service-01he8bebctabr3kgk0qj36d2me-0", name)
}

func TestService(t *testing.T) {
expected := `
{
"metadata": {
"name": "bar",
"name": "bar-01he8bebctabr3kgk0qj36d2me-0",
"namespace": "foo",
"creationTimestamp": null
},
Expand All @@ -66,7 +66,7 @@ func TestService(t *testing.T) {
}
],
"selector": {
"service": "bar"
"service": "bar-01he8bebctabr3kgk0qj36d2me-0"
},
"type": "ClusterIP"
},
Expand All @@ -81,6 +81,7 @@ func TestService(t *testing.T) {
}
s, err := mkService(&types.Step{
Name: "bar",
UUID: "01he8bebctabr3kgk0qj36d2me-0",
Ports: ports,
}, &config{Namespace: "foo"})
assert.NoError(t, err)
Expand Down