From dd752ec87a6e8d456a1e80ac62fb51815b8141e5 Mon Sep 17 00:00:00 2001 From: Drew Erny Date: Wed, 2 Dec 2020 12:27:23 -0600 Subject: [PATCH] Fix jobs-related bug in task conversion While working on some other code, noticed a bug in the jobs code. We're adding job version after we're checking if there are port configs. Before, if there were no port configs, the job version would be missing, because we would return before trying to convert. This moves the jobs version conversion above that code, so we don't accidentally return before it. Signed-off-by: Drew Erny --- daemon/cluster/convert/task.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/daemon/cluster/convert/task.go b/daemon/cluster/convert/task.go index e218dc0320..b29cf4871f 100644 --- a/daemon/cluster/convert/task.go +++ b/daemon/cluster/convert/task.go @@ -51,6 +51,12 @@ func TaskFromGRPC(t swarmapi.Task) (types.Task, error) { task.NetworksAttachments = append(task.NetworksAttachments, networkAttachmentFromGRPC(na)) } + if t.JobIteration != nil { + task.JobIteration = &types.Version{ + Index: t.JobIteration.Index, + } + } + if t.Status.PortStatus == nil { return task, nil } @@ -65,11 +71,5 @@ func TaskFromGRPC(t swarmapi.Task) (types.Task, error) { }) } - if t.JobIteration != nil { - task.JobIteration = &types.Version{ - Index: t.JobIteration.Index, - } - } - return task, nil }