mirror of
https://github.com/psviderski/uncloud.git
synced 2026-08-28 12:03:33 +00:00
encode and decode published ports using container labels
This commit is contained in:
@@ -27,9 +27,9 @@ type PortSpec struct {
|
|||||||
PublishedPort uint16
|
PublishedPort uint16
|
||||||
// ContainerPort is the port inside the container that the service listens on.
|
// ContainerPort is the port inside the container that the service listens on.
|
||||||
ContainerPort uint16
|
ContainerPort uint16
|
||||||
// Protocol specifies the network protocol. Default is ProtocolHTTPS if Hostname is set, ProtocolTCP otherwise.
|
// Protocol specifies the network protocol.
|
||||||
Protocol string
|
Protocol string
|
||||||
// Mode specifies how the port is published. Default is PortModeIngress.
|
// Mode specifies how the port is published.
|
||||||
Mode string
|
Mode string
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -238,6 +238,18 @@ func (cli *Client) runContainer(
|
|||||||
config.Labels[api.LabelServiceMode] = api.ServiceModeGlobal
|
config.Labels[api.LabelServiceMode] = api.ServiceModeGlobal
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if len(spec.Ports) > 0 {
|
||||||
|
encodedPorts := make([]string, len(spec.Ports))
|
||||||
|
for i, p := range spec.Ports {
|
||||||
|
encodedPorts[i], err = p.String()
|
||||||
|
if err != nil {
|
||||||
|
return resp, fmt.Errorf("encode service port spec: %w", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
config.Labels[api.LabelServicePorts] = strings.Join(encodedPorts, ",")
|
||||||
|
}
|
||||||
|
|
||||||
hostConfig := &container.HostConfig{
|
hostConfig := &container.HostConfig{
|
||||||
Init: spec.Container.Init,
|
Init: spec.Container.Init,
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -73,6 +73,61 @@ func TestRunService(t *testing.T) {
|
|||||||
assert.True(t, found)
|
assert.True(t, found)
|
||||||
})
|
})
|
||||||
|
|
||||||
|
t.Run("1 replica with ports", func(t *testing.T) {
|
||||||
|
t.Parallel()
|
||||||
|
|
||||||
|
name := "busybox-1-replica-ports"
|
||||||
|
t.Cleanup(func() {
|
||||||
|
err := cli.RemoveService(ctx, name)
|
||||||
|
if !dockerclient.IsErrNotFound(err) {
|
||||||
|
require.NoError(t, err)
|
||||||
|
}
|
||||||
|
|
||||||
|
_, err = cli.InspectService(ctx, name)
|
||||||
|
require.ErrorIs(t, err, client.ErrNotFound)
|
||||||
|
})
|
||||||
|
|
||||||
|
spec := api.ServiceSpec{
|
||||||
|
Name: name,
|
||||||
|
Mode: api.ServiceModeReplicated,
|
||||||
|
Container: api.ContainerSpec{
|
||||||
|
Command: []string{"sleep", "infinity"},
|
||||||
|
Image: "busybox:latest",
|
||||||
|
},
|
||||||
|
Ports: []api.PortSpec{
|
||||||
|
{
|
||||||
|
Hostname: "https.example.com",
|
||||||
|
ContainerPort: 8080,
|
||||||
|
Protocol: api.ProtocolHTTPS,
|
||||||
|
Mode: api.PortModeIngress,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
PublishedPort: 8000,
|
||||||
|
ContainerPort: 8080,
|
||||||
|
Protocol: api.ProtocolTCP,
|
||||||
|
Mode: api.PortModeIngress,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
PublishedPort: 8000,
|
||||||
|
ContainerPort: 8000,
|
||||||
|
Protocol: api.ProtocolUDP,
|
||||||
|
Mode: api.PortModeHost,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
resp, err := cli.RunService(ctx, spec)
|
||||||
|
require.NoError(t, err)
|
||||||
|
|
||||||
|
svc, err := cli.InspectService(ctx, resp.ID)
|
||||||
|
require.NoError(t, err)
|
||||||
|
require.Len(t, svc.Containers, 1)
|
||||||
|
ctr := svc.Containers[0].Container
|
||||||
|
|
||||||
|
ports, err := ctr.ServicePorts()
|
||||||
|
require.NoError(t, err)
|
||||||
|
assert.Equal(t, spec.Ports, ports)
|
||||||
|
})
|
||||||
|
|
||||||
t.Run("global mode", func(t *testing.T) {
|
t.Run("global mode", func(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user