fix: can't run multiple services on k8s (#3395)

Fix Issue: https://github.com/woodpecker-ci/woodpecker/issues/3288

The way the pod service starts up makes it impossible to run two or more
pipelines at the same time when we have a service section.

The idea is to set the name of the service in the same way we did for
the pod name.

Pipeline: 

```yaml

services:
  mydb:
    image: mysql
    environment:
      - MYSQL_DATABASE=test
      - MYSQL_ROOT_PASSWORD=example
    ports:
      - 3306/tcp
steps:
  get-version:
    image: ubuntu
    commands:
      - ( apt update && apt dist-upgrade -y && apt install -y mysql-client 2>&1 )> /dev/null
      - sleep 30s # need to wait for mysql-server init
      - echo 'SHOW VARIABLES LIKE "version"' | mysql -uroot -hmydb test -pexample
```

Running more than one pipeline result:


![image](https://github.com/woodpecker-ci/woodpecker/assets/22245125/e512309f-0d1e-4125-bab9-2357a710fedd)

---------

Co-authored-by: elias.souza <elias.souza@quintoandar.com.br>
This commit is contained in:
Elias 2024-02-17 08:30:06 -03:00 committed by GitHub
parent b7891b93ff
commit bffc9c8ff8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 14 additions and 12 deletions

View file

@ -90,7 +90,7 @@ func podMeta(step *types.Step, config *config, options BackendOptions, podName s
} }
if step.Type == types.StepTypeService { if step.Type == types.StepTypeService {
meta.Labels[ServiceLabel] = step.Name meta.Labels[ServiceLabel], _ = serviceName(step)
} }
meta.Annotations = config.PodAnnotations meta.Annotations = config.PodAnnotations

View file

@ -51,7 +51,7 @@ func TestStepToPodName(t *testing.T) {
assert.EqualValues(t, "wp-01he8bebctabr3kg", name) assert.EqualValues(t, "wp-01he8bebctabr3kg", name)
name, err = stepToPodName(&types.Step{UUID: "01he8bebctabr3kg", Name: "postgres", Type: types.StepTypeService}) name, err = stepToPodName(&types.Step{UUID: "01he8bebctabr3kg", Name: "postgres", Type: types.StepTypeService})
assert.NoError(t, err) assert.NoError(t, err)
assert.EqualValues(t, "postgres", name) assert.EqualValues(t, "wp-svc-01he8bebctabr3kg-postgres", name)
} }
func TestStepLabel(t *testing.T) { func TestStepLabel(t *testing.T) {

View file

@ -30,6 +30,7 @@ import (
const ( const (
ServiceLabel = "service" ServiceLabel = "service"
servicePrefix = "wp-svc-"
) )
func mkService(step *types.Step, config *config) (*v1.Service, error) { func mkService(step *types.Step, config *config) (*v1.Service, error) {
@ -62,7 +63,7 @@ func mkService(step *types.Step, config *config) (*v1.Service, error) {
} }
func serviceName(step *types.Step) (string, error) { func serviceName(step *types.Step) (string, error) {
return dnsName(step.Name) return dnsName(servicePrefix + step.UUID + "-" + step.Name)
} }
func servicePort(port types.Port) v1.ServicePort { func servicePort(port types.Port) v1.ServicePort {

View file

@ -24,24 +24,24 @@ import (
) )
func TestServiceName(t *testing.T) { func TestServiceName(t *testing.T) {
name, err := serviceName(&types.Step{Name: "database"}) name, err := serviceName(&types.Step{Name: "database", UUID: "01he8bebctabr3kgk0qj36d2me"})
assert.NoError(t, err) assert.NoError(t, err)
assert.Equal(t, "database", name) assert.Equal(t, "wp-svc-01he8bebctabr3kgk0qj36d2me-database", 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"})
assert.NoError(t, err) assert.NoError(t, err)
assert.Equal(t, "wp-01he8bebctabr3kgk0qj36d2me-0-services-0.woodpecker-runtime.svc.cluster.local", name) assert.Equal(t, "wp-svc-01he8bebctabr3kgk0qj36d2me-wp-01he8bebctabr3kgk0qj36d2me-0-services-0.woodpecker-runtime.svc.cluster.local", name)
name, err = serviceName(&types.Step{Name: "awesome_service"}) name, err = serviceName(&types.Step{Name: "awesome_service", UUID: "01he8bebctabr3kgk0qj36d2me"})
assert.NoError(t, err) assert.NoError(t, err)
assert.Equal(t, "awesome-service", name) assert.Equal(t, "wp-svc-01he8bebctabr3kgk0qj36d2me-awesome-service", name)
} }
func TestService(t *testing.T) { func TestService(t *testing.T) {
expected := ` expected := `
{ {
"metadata": { "metadata": {
"name": "bar", "name": "wp-svc-01he8bebctabr3kgk0qj36d2me-0-bar",
"namespace": "foo", "namespace": "foo",
"creationTimestamp": null "creationTimestamp": null
}, },
@ -66,7 +66,7 @@ func TestService(t *testing.T) {
} }
], ],
"selector": { "selector": {
"service": "bar" "service": "wp-svc-01he8bebctabr3kgk0qj36d2me-0-bar"
}, },
"type": "ClusterIP" "type": "ClusterIP"
}, },
@ -81,6 +81,7 @@ func TestService(t *testing.T) {
} }
s, err := mkService(&types.Step{ s, err := mkService(&types.Step{
Name: "bar", Name: "bar",
UUID: "01he8bebctabr3kgk0qj36d2me-0",
Ports: ports, Ports: ports,
}, &config{Namespace: "foo"}) }, &config{Namespace: "foo"})
assert.NoError(t, err) assert.NoError(t, err)