From f6c40a4fcac72df38d4303cef8302b90ed874d4e Mon Sep 17 00:00:00 2001
From: CrazyMax <crazy-max@users.noreply.github.com>
Date: Tue, 9 Aug 2022 17:35:35 +0200
Subject: [PATCH] worker: move labels const to its own package

Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
(cherry picked from commit de2d60c4ceb326d61b8aeb61939fa9bf8c3c5868)
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
---
 worker/containerd/containerd.go | 16 ++++++++--------
 worker/label/label.go           | 15 +++++++++++++++
 worker/runc/runc.go             | 14 +++++++-------
 worker/worker.go                | 13 -------------
 4 files changed, 30 insertions(+), 28 deletions(-)
 create mode 100644 worker/label/label.go

diff --git a/worker/containerd/containerd.go b/worker/containerd/containerd.go
index c671c99e3c99..7ccb8174de0a 100644
--- a/worker/containerd/containerd.go
+++ b/worker/containerd/containerd.go
@@ -18,8 +18,8 @@ import (
 	"github.com/moby/buildkit/util/leaseutil"
 	"github.com/moby/buildkit/util/network/netproviders"
 	"github.com/moby/buildkit/util/winlayers"
-	"github.com/moby/buildkit/worker"
 	"github.com/moby/buildkit/worker/base"
+	wlabel "github.com/moby/buildkit/worker/label"
 	ocispecs "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/pkg/errors"
 	"golang.org/x/sync/semaphore"
@@ -67,16 +67,16 @@ func newContainerd(root string, client *containerd.Client, snapshotterName, ns s
 		hostname = "unknown"
 	}
 	xlabels := map[string]string{
-		worker.LabelExecutor:    "containerd",
-		worker.LabelSnapshotter: snapshotterName,
-		worker.LabelHostname:    hostname,
-		worker.LabelNetwork:     npResolvedMode,
+		wlabel.Executor:    "containerd",
+		wlabel.Snapshotter: snapshotterName,
+		wlabel.Hostname:    hostname,
+		wlabel.Network:     npResolvedMode,
 	}
 	if apparmorProfile != "" {
-		xlabels[worker.LabelApparmorProfile] = apparmorProfile
+		xlabels[wlabel.ApparmorProfile] = apparmorProfile
 	}
-	xlabels[worker.LabelContainerdNamespace] = ns
-	xlabels[worker.LabelContainerdUUID] = serverInfo.UUID
+	xlabels[wlabel.ContainerdNamespace] = ns
+	xlabels[wlabel.ContainerdUUID] = serverInfo.UUID
 	for k, v := range labels {
 		xlabels[k] = v
 	}
diff --git a/worker/label/label.go b/worker/label/label.go
new file mode 100644
index 000000000000..96c67d0b72de
--- /dev/null
+++ b/worker/label/label.go
@@ -0,0 +1,15 @@
+package label
+
+// Pre-defined label keys
+const (
+	prefix = "org.mobyproject.buildkit.worker."
+
+	Executor            = prefix + "executor"    // "oci" or "containerd"
+	Snapshotter         = prefix + "snapshotter" // containerd snapshotter name ("overlay", "native", ...)
+	Hostname            = prefix + "hostname"
+	Network             = prefix + "network" // "cni" or "host"
+	ApparmorProfile     = prefix + "apparmor.profile"
+	OCIProcessMode      = prefix + "oci.process-mode"     // OCI worker: process mode ("sandbox", "no-sandbox")
+	ContainerdUUID      = prefix + "containerd.uuid"      // containerd worker: containerd UUID
+	ContainerdNamespace = prefix + "containerd.namespace" // containerd worker: containerd namespace
+)
diff --git a/worker/runc/runc.go b/worker/runc/runc.go
index bebee7868d70..fdf803b727ff 100644
--- a/worker/runc/runc.go
+++ b/worker/runc/runc.go
@@ -20,8 +20,8 @@ import (
 	"github.com/moby/buildkit/util/leaseutil"
 	"github.com/moby/buildkit/util/network/netproviders"
 	"github.com/moby/buildkit/util/winlayers"
-	"github.com/moby/buildkit/worker"
 	"github.com/moby/buildkit/worker/base"
+	wlabel "github.com/moby/buildkit/worker/label"
 	ocispecs "github.com/opencontainers/image-spec/specs-go/v1"
 	bolt "go.etcd.io/bbolt"
 	"golang.org/x/sync/semaphore"
@@ -104,14 +104,14 @@ func NewWorkerOpt(root string, snFactory SnapshotterFactory, rootless bool, proc
 		hostname = "unknown"
 	}
 	xlabels := map[string]string{
-		worker.LabelExecutor:       "oci",
-		worker.LabelSnapshotter:    snFactory.Name,
-		worker.LabelHostname:       hostname,
-		worker.LabelNetwork:        npResolvedMode,
-		worker.LabelOCIProcessMode: processMode.String(),
+		wlabel.Executor:       "oci",
+		wlabel.Snapshotter:    snFactory.Name,
+		wlabel.Hostname:       hostname,
+		wlabel.Network:        npResolvedMode,
+		wlabel.OCIProcessMode: processMode.String(),
 	}
 	if apparmorProfile != "" {
-		xlabels[worker.LabelApparmorProfile] = apparmorProfile
+		xlabels[wlabel.ApparmorProfile] = apparmorProfile
 	}
 
 	for k, v := range labels {
diff --git a/worker/worker.go b/worker/worker.go
index 743513bb0a98..86521c5bab40 100644
--- a/worker/worker.go
+++ b/worker/worker.go
@@ -41,16 +41,3 @@ type Infos interface {
 	GetDefault() (Worker, error)
 	WorkerInfos() []client.WorkerInfo
 }
-
-// Pre-defined label keys
-const (
-	labelPrefix              = "org.mobyproject.buildkit.worker."
-	LabelExecutor            = labelPrefix + "executor"    // "oci" or "containerd"
-	LabelSnapshotter         = labelPrefix + "snapshotter" // containerd snapshotter name ("overlay", "native", ...)
-	LabelHostname            = labelPrefix + "hostname"
-	LabelNetwork             = labelPrefix + "network" // "cni" or "host"
-	LabelApparmorProfile     = labelPrefix + "apparmor.profile"
-	LabelOCIProcessMode      = labelPrefix + "oci.process-mode"     // OCI worker: process mode ("sandbox", "no-sandbox")
-	LabelContainerdUUID      = labelPrefix + "containerd.uuid"      // containerd worker: containerd UUID
-	LabelContainerdNamespace = labelPrefix + "containerd.namespace" // containerd worker: containerd namespace
-)