Use labels only when default namespace is provided and prefer given

krsoninikhil · krsoninikhil · commit 34323985a130 · 2019-01-30T23:21:24.000+05:30
options.

Implements same approach of setting defaults for `NewWithConn`.

Signed-off-by: Nikhil Soni &lt;krsoninikhil@gmail.com&gt;
diff --git a/client.go b/client.go
@@ -140,18 +140,16 @@ func New(address string, opts ...ClientOpt) (*Client, error) {
 	}
 
 	// check namespace labels for default runtime
-	defaultns := "default"
-	if copts.defaultns != "" {
-		defaultns = copts.defaultns
-	}
-	namespaces := c.NamespaceService()
-	ctx := context.Background()
-	if labels, err := namespaces.Labels(ctx, defaultns); err == nil {
-		if defaultRuntime, ok := labels["runtime"]; ok {
-			c.runtime = defaultRuntime
+	if copts.defaultRuntime == "" && copts.defaultns != "" {
+		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 {
+				c.runtime = defaultRuntime
+			}
+		} else {
+			return nil, err
 		}
-	} else {
-		return nil, err
 	}
 
 	return c, nil
@@ -170,6 +168,20 @@ func NewWithConn(conn *grpc.ClientConn, opts ...ClientOpt) (*Client, error) {
 		conn:    conn,
 		runtime: fmt.Sprintf("%s.%s", plugin.RuntimePlugin, runtime.GOOS),
 	}
+
+	// check namespace labels for default runtime
+	if copts.defaultRuntime == "" && copts.defaultns != "" {
+		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 {
+				c.runtime = defaultRuntime
+			}
+		} else {
+			return nil, err
+		}
+	}
+
 	if copts.services != nil {
 		c.services = *copts.services
 	}
diff --git a/client_test.go b/client_test.go
@@ -405,11 +405,12 @@ func TestDefaultRuntimeWithNamespaceLabels(t *testing.T) {
 	defer cancel()
 	namespaces := client.NamespaceService()
 	testRuntime := "testRuntime"
-	if err := namespaces.SetLabel(ctx, testNamespace, "runtime", testRuntime); err != nil {
+	runtimeLabel := "containerd.io/defaults/runtime"
+	if err := namespaces.SetLabel(ctx, testNamespace, runtimeLabel, testRuntime); err != nil {
 		t.Fatal(err)
 	}
 
-	testClient, err := newClient(t, address, WithDefaultNamespace(testNamespace))
+	testClient, err := New(address, WithDefaultNamespace(testNamespace))
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/container_opts.go b/container_opts.go
@@ -172,7 +172,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["snapshotter"]; ok {
+				if snapshotLabel, ok := labels["containerd.io/defaults/snapshotter"]; ok {
 					defaultSnapshotter = snapshotLabel
 				}
 			}

Original file line number	Diff line number	Diff line change
`@@ -405,11 +405,12 @@ func TestDefaultRuntimeWithNamespaceLabels(t *testing.T) {`
`405`	`405`	`defer cancel()`
`406`	`406`	`namespaces := client.NamespaceService()`
`407`	`407`	`testRuntime := "testRuntime"`
`408`		`- if err := namespaces.SetLabel(ctx, testNamespace, "runtime", testRuntime); err != nil {`
	`408`	`+ runtimeLabel := "containerd.io/defaults/runtime"`
	`409`	`+ if err := namespaces.SetLabel(ctx, testNamespace, runtimeLabel, testRuntime); err != nil {`
`409`	`410`	`t.Fatal(err)`
`410`	`411`	`}`
`411`	`412`
`412`		`- testClient, err := newClient(t, address, WithDefaultNamespace(testNamespace))`
	`413`	`+ testClient, err := New(address, WithDefaultNamespace(testNamespace))`
`413`	`414`	`if err != nil {`
`414`	`415`	`t.Fatal(err)`
`415`	`416`	`}`
Original file line number	Diff line number	Diff line change
`@@ -172,7 +172,7 @@ func setSnapshotterIfEmpty(ctx context.Context, client Client, c containers.Co`
`172`	`172`	`namespaceService := client.NamespaceService()`
`173`	`173`	`if ns, err := namespaces.NamespaceRequired(ctx); err == nil {`
`174`	`174`	`if labels, err := namespaceService.Labels(ctx, ns); err == nil {`
`175`		`- if snapshotLabel, ok := labels["snapshotter"]; ok {`
	`175`	`+ if snapshotLabel, ok := labels["containerd.io/defaults/snapshotter"]; ok {`
`176`	`176`	`defaultSnapshotter = snapshotLabel`
`177`	`177`	`}`
`178`	`178`	`}`