From 6a21728fb6b499ee1a71b0bbd5acc8a7a332902b Mon Sep 17 00:00:00 2001
From: Nikhil Soni <krsoninikhil@gmail.com>
Date: Tue, 12 Feb 2019 00:23:57 +0530
Subject: [PATCH] Use defaults package for listing namespace labels

Labels that are used for configuring defaults are moved to defaults package

Signed-off-by: Nikhil Soni <krsoninikhil@gmail.com>
---
 client.go            | 4 ++--
 client_test.go       | 3 ++-
 container_opts.go    | 3 ++-
 defaults/defaults.go | 6 ++++++
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/client.go b/client.go
index 386d07aa0..a8946991d 100644
--- a/client.go
+++ b/client.go
@@ -144,7 +144,7 @@ func New(address string, opts ...ClientOpt) (*Client, error) {
 		namespaces := c.NamespaceService()
 		ctx := context.Background()
 		if labels, err := namespaces.Labels(ctx, copts.defaultns); err == nil {
-			if defaultRuntime, ok := labels["containerd.io/defaults/runtime"]; ok {
+			if defaultRuntime, ok := labels[defaults.DefaultRuntimeNSLabel]; ok {
 				c.runtime = defaultRuntime
 			}
 		} else {
@@ -174,7 +174,7 @@ func NewWithConn(conn *grpc.ClientConn, opts ...ClientOpt) (*Client, error) {
 		namespaces := c.NamespaceService()
 		ctx := context.Background()
 		if labels, err := namespaces.Labels(ctx, copts.defaultns); err == nil {
-			if defaultRuntime, ok := labels["containerd.io/defaults/runtime"]; ok {
+			if defaultRuntime, ok := labels[defaults.DefaultRuntimeNSLabel]; ok {
 				c.runtime = defaultRuntime
 			}
 		} else {
diff --git a/client_test.go b/client_test.go
index 742140839..d022ac1c2 100644
--- a/client_test.go
+++ b/client_test.go
@@ -28,6 +28,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/containerd/containerd/defaults"
 	"github.com/containerd/containerd/images"
 	"github.com/containerd/containerd/log"
 	"github.com/containerd/containerd/namespaces"
@@ -405,7 +406,7 @@ func TestDefaultRuntimeWithNamespaceLabels(t *testing.T) {
 	defer cancel()
 	namespaces := client.NamespaceService()
 	testRuntime := "testRuntime"
-	runtimeLabel := "containerd.io/defaults/runtime"
+	runtimeLabel := defaults.DefaultRuntimeNSLabel
 	if err := namespaces.SetLabel(ctx, testNamespace, runtimeLabel, testRuntime); err != nil {
 		t.Fatal(err)
 	}
diff --git a/container_opts.go b/container_opts.go
index c04bd2387..855931959 100644
--- a/container_opts.go
+++ b/container_opts.go
@@ -20,6 +20,7 @@ import (
 	"context"
 
 	"github.com/containerd/containerd/containers"
+	"github.com/containerd/containerd/defaults"
 	"github.com/containerd/containerd/errdefs"
 	"github.com/containerd/containerd/namespaces"
 	"github.com/containerd/containerd/oci"
@@ -172,7 +173,7 @@ func setSnapshotterIfEmpty(ctx context.Context, client *Client, c *containers.Co
 		namespaceService := client.NamespaceService()
 		if ns, err := namespaces.NamespaceRequired(ctx); err == nil {
 			if labels, err := namespaceService.Labels(ctx, ns); err == nil {
-				if snapshotLabel, ok := labels["containerd.io/defaults/snapshotter"]; ok {
+				if snapshotLabel, ok := labels[defaults.DefaultSnapshotterNSLabel]; ok {
 					defaultSnapshotter = snapshotLabel
 				}
 			}
diff --git a/defaults/defaults.go b/defaults/defaults.go
index 7040f5b85..3a748e4e8 100644
--- a/defaults/defaults.go
+++ b/defaults/defaults.go
@@ -23,4 +23,10 @@ const (
 	// DefaultMaxSendMsgSize defines the default maximum message size for
 	// sending protobufs passed over the GRPC API.
 	DefaultMaxSendMsgSize = 16 << 20
+	// DefaultRuntimeNSLabel defines the namespace label to check for
+	// default runtime
+	DefaultRuntimeNSLabel = "containerd.io/defaults/runtime"
+	// DefaultSnapshotterNSLabel defines the namespances label to check for
+	// default snapshotter
+	DefaultSnapshotterNSLabel = "containerd.io/defaults/snapshotter"
 )