github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Use defaults package for listing namespace labels

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

Signed-off-by: Nikhil Soni <krsoninikhil@gmail.com>
This commit is contained in:
Nikhil Soni 2019-02-12 00:23:57 +05:30
parent da2ab865e0
commit 6a21728fb6
4 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client.go
View File

@ -144,7 +144,7 @@ func New(address string, opts ...ClientOpt) (*Client, error) {
namespaces := c.NamespaceService() namespaces := c.NamespaceService()
ctx := context.Background() ctx := context.Background()
if labels, err := namespaces.Labels(ctx, copts.defaultns); err == nil { 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 c.runtime = defaultRuntime
} }
} else { } else {
@ -174,7 +174,7 @@ func NewWithConn(conn *grpc.ClientConn, opts ...ClientOpt) (*Client, error) {
namespaces := c.NamespaceService() namespaces := c.NamespaceService()
ctx := context.Background() ctx := context.Background()
if labels, err := namespaces.Labels(ctx, copts.defaultns); err == nil { 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 c.runtime = defaultRuntime
} }
} else { } else {

3
client_test.go
View File

@ -28,6 +28,7 @@ import (
"testing" "testing"
"time" "time"
"github.com/containerd/containerd/defaults"
"github.com/containerd/containerd/images" "github.com/containerd/containerd/images"
"github.com/containerd/containerd/log" "github.com/containerd/containerd/log"
"github.com/containerd/containerd/namespaces" "github.com/containerd/containerd/namespaces"
@ -405,7 +406,7 @@ func TestDefaultRuntimeWithNamespaceLabels(t *testing.T) {
defer cancel() defer cancel()
namespaces := client.NamespaceService() namespaces := client.NamespaceService()
testRuntime := "testRuntime" testRuntime := "testRuntime"
runtimeLabel := "containerd.io/defaults/runtime" runtimeLabel := defaults.DefaultRuntimeNSLabel
if err := namespaces.SetLabel(ctx, testNamespace, runtimeLabel, testRuntime); err != nil { if err := namespaces.SetLabel(ctx, testNamespace, runtimeLabel, testRuntime); err != nil {
t.Fatal(err) t.Fatal(err)
} }

3
container_opts.go
View File

@ -20,6 +20,7 @@ import (
"context" "context"
"github.com/containerd/containerd/containers" "github.com/containerd/containerd/containers"
"github.com/containerd/containerd/defaults"
"github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/namespaces" "github.com/containerd/containerd/namespaces"
"github.com/containerd/containerd/oci" "github.com/containerd/containerd/oci"
@ -172,7 +173,7 @@ func setSnapshotterIfEmpty(ctx context.Context, client *Client, c *containers.Co
namespaceService := client.NamespaceService() namespaceService := client.NamespaceService()
if ns, err := namespaces.NamespaceRequired(ctx); err == nil { if ns, err := namespaces.NamespaceRequired(ctx); err == nil {
if labels, err := namespaceService.Labels(ctx, ns); 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 defaultSnapshotter = snapshotLabel
} }
} }

6
defaults/defaults.go
View File

@ -23,4 +23,10 @@ const (
// DefaultMaxSendMsgSize defines the default maximum message size for // DefaultMaxSendMsgSize defines the default maximum message size for
// sending protobufs passed over the GRPC API. // sending protobufs passed over the GRPC API.
DefaultMaxSendMsgSize = 16 << 20 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"
) )