Merge branch v2.11 into v3.5

This commit is contained in:
romain 2025-08-27 09:40:51 +02:00
commit 3f1b5216f0

View File

@ -358,6 +358,7 @@ func TestSwarmProvider_parseService_task(t *testing.T) {
}, },
nodes: []swarmtypes.Node{ nodes: []swarmtypes.Node{
{ {
ID: "id1",
Status: swarmtypes.NodeStatus{ Status: swarmtypes.NodeStatus{
Addr: "10.11.12.13", Addr: "10.11.12.13",
}, },
@ -387,7 +388,10 @@ func TestSwarmProvider_parseService_task(t *testing.T) {
dData, err := p.parseService(t.Context(), test.service, test.networks) dData, err := p.parseService(t.Context(), test.service, test.networks)
require.NoError(t, err) require.NoError(t, err)
dockerClient := &fakeServicesClient{tasks: test.tasks} dockerClient := &fakeServicesClient{
tasks: test.tasks,
nodes: test.nodes,
}
for _, task := range test.tasks { for _, task := range test.tasks {
taskDockerData, err := parseTasks(t.Context(), dockerClient, task, dData, test.networks, test.isGlobalSVC) taskDockerData, err := parseTasks(t.Context(), dockerClient, task, dData, test.networks, test.isGlobalSVC)
@ -395,6 +399,7 @@ func TestSwarmProvider_parseService_task(t *testing.T) {
expected := test.expected[task.ID] expected := test.expected[task.ID]
assert.Equal(t, expected.Name, taskDockerData.Name) assert.Equal(t, expected.Name, taskDockerData.Name)
assert.Equal(t, expected.NodeIP, taskDockerData.NodeIP)
} }
}) })
} }