Merge pull request #9 from hellolijj/master

update demo

Author: hellolijj

CONTRIBUTORS

@@ -74,6 +74,7 @@ root <[email protected]>
 Rudy Zhang <[email protected]>
 Runrioter Wung <[email protected]>
 Sam Xie <[email protected]>
+scy1993 <[email protected]>
 SeaRise <[email protected]>
 shaloulcy <[email protected]>
 shanbo.lkw <[email protected]>

MAINTAINERS.md

@@ -1,5 +1,7 @@
 # Maintainers
 
+## Maintainers List
+
 |GitHub ID| Name | Email|Company|
 |:---:| :----:| :---:|:--: |
 |[allencloud](https://github.com/allencloud)|Allen Sun|[email protected]|Alibaba Group|
@@ -11,3 +13,26 @@
 |[sunyuan3](https://github.com/sunyuan3)|Yuan Sun|[email protected] |Alibaba Group|
 |[HusterWan](https://github.com/HusterWan)|Michael Wan|[email protected]|Alibaba Group|
 |[ZYecho](https://github.com/ZYecho)|Yue Zhang|[email protected]|ISCAS|
+|[fuweid](https://github.com/fuweid)|Wei Fu|[email protected]|Alibaba Group|
+|[zhuangqh](https://github.com/zhuangqh)|Jerry Zhuang|[email protected]| Alibaba Group|
+
+## Component Owner/Backup
+
+In order to make all components in PouchContainer well-maintained, an owner/backup responsibility policy is set for all maintainers. No matter the owner or the backup, they have responsibilities to make/review design and programme code for the corresponding component. They work for success of the decoupled component, and efforts all maintainers do guarantee PouchContainer's success.
+
+We encourage all community participants to communicate with component owner/backup to get more information or guidance via all kinds of channels, such as @him in GitHub issue or pull request, email him via listed email address and so on. And component owner/backups are obligated to provide kind and patient help to the community.
+
+The component owner and backup are listed as below:
+
+|Component|Owner|Backup|Notes|
+|:---:|:----:|:---:|:--:|
+|CRI/Kubernetes|zhuangqh|Starnop|CRI stablibity/improvement, collaborate with upstream|
+|API/CLI|allencloud|fuweid|API/CLI definitions/change reviews|
+|runtime/OCI|Ace-Tang| zhuangqh|multiple runtime support, runc/kata/gvisor|
+|storage|rudyfly|fuweid|volumes, diskquota, volume plugin protocols|
+|network|rudyfly|HusterWan|libnetwork, cni plugins|
+|image|fuweid|ZYecho|image storage/distribution/management |
+|ctrd|fuweid|Ace-Tang|component used in pouchd to communicated with containerd|
+|ContainerMgr|HusterWan|Ace-Tang|container lifecycle management in pouchd|
+|Test|sunyuan3|chuanchang|test framework and software quality|
+|Document|allencloud|rufyfly|Document Roadmap and quality improvement|

Makefile

@@ -322,6 +322,7 @@ plugin: ## build hook plugin
 	@./hack/module --add-plugin=github.com/alibaba/pouch/hookplugins/criplugin
 	@./hack/module --add-plugin=github.com/alibaba/pouch/hookplugins/volumeplugin
 	@./hack/module --add-plugin=github.com/alibaba/pouch/hookplugins/apiplugin
+	@./hack/module --add-plugin=github.com/alibaba/pouch/hookplugins/imageplugin
 
 .PHONY: help
 help: ## this help

apis/opts/config/runtime_test.go

@@ -10,19 +10,59 @@ import (
 )
 
 func TestNewRuntime(t *testing.T) {
-	assert := assert.New(t)
+	type args struct {
+		val *map[string]types.Runtime
+	}
 
-	for _, r := range []*map[string]types.Runtime{
-		nil,
-		{},
+	//create a nil map that makes *rts = nil
+	var nilmap = map[string]types.Runtime(nil)
+
+	tests := []struct {
+		name string
+		args args
+		want *Runtime
+	}{
 		{
-			"a": {},
-			"b": {Path: "foo"},
+			name: "rts = nil",
+			args: args{
+				val: nil,
+			},
+			want: &Runtime{
+				values: &map[string]types.Runtime{},
+			},
+		},
+		{
+			name: "*rts = nil",
+			args: args{
+				val: &nilmap,
+			},
+			want: &Runtime{
+				values: &map[string]types.Runtime{},
+			},
+		},
+		{
+			name: "rts is valid",
+			args: args{
+				val: &map[string]types.Runtime{
+					"runtime_name1": {},
+					"runtime_name2": {Path: "$PATH"},
+				},
+			},
+			want: &Runtime{
+				values: &map[string]types.Runtime{
+					"runtime_name1": {},
+					"runtime_name2": {Path: "$PATH"},
+				},
+			},
 		},
-	} {
-		runtime := NewRuntime(r)
-		// just test no panic here
-		assert.NotEmpty(t, runtime)
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			got := NewRuntime(tt.args.val)
+			if !reflect.DeepEqual(got, tt.want) {
+				t.Errorf("NewRuntime() = %v, want %v", got, tt.want)
+			}
+		})
 	}
 }
 
@@ -114,3 +154,51 @@ func TestRuntimeType(t *testing.T) {
 		}
 	}
 }
+
+func TestRuntimeString(t *testing.T) {
+	type fields struct {
+		values *map[string]types.Runtime
+	}
+
+	tests := []struct {
+		name   string
+		fields fields
+		want   string
+	}{
+		{
+			name: "get string of Runtime with one element",
+			fields: fields{
+				values: &(map[string]types.Runtime{
+					"runtime_name": {Path: "$PATH"},
+				}),
+			},
+			want: "[runtime_name]",
+		},
+		{
+			name: "get string of Runtime with nil",
+			fields: fields{
+				values: &(map[string]types.Runtime{}),
+			},
+			want: "[]",
+		},
+		{
+			name: "get string of Runtime with empty string",
+			fields: fields{
+				values: &(map[string]types.Runtime{
+					"": {Path: "$PATH"},
+				}),
+			},
+			want: "[]",
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			r := &Runtime{
+				values: tt.fields.values,
+			}
+			if got := r.String(); !reflect.DeepEqual(got, tt.want) {
+				t.Errorf("Runtime.String() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}

apis/swagger.yml

@@ -2246,6 +2246,11 @@ definitions:
         type: "array"
         items:
           type: "string"
+      Snapshotter:
+        description: |
+            The snapshotter container choose, can be different with
+            default snapshotter. The Field only set through hook plugin.
+        type: "string"
 
   ContainerCreateResp:
     description: "response returned by daemon when container create successfully"

apis/types/container_config.go

@@ -85,7 +85,7 @@ func (c *Cli) InitLog() {
 	logrus.SetFormatter(formatter)
 }
 
-// Client returns API client torwards daemon.
+// Client returns API client towards daemon.
 func (c *Cli) Client() client.CommonAPIClient {
 	return c.APIClient
 }
@@ -165,7 +165,7 @@ type ExitError struct {
 	Status string
 }
 
-// Error inplements error interface.
+// Error implements error interface.
 func (e ExitError) Error() string {
 	return fmt.Sprintf("Exit Code: %d, Status: %s", e.Code, e.Status)
 }

cli/cli.go

@@ -161,7 +161,7 @@ func NewCriManager(config *config.Config, ctrMgr mgr.ContainerMgr, imgMgr mgr.Im
 		return nil, fmt.Errorf("failed to create sandbox meta store: %v", err)
 	}
 
-	imageFSPath := imageFSPath(path.Join(config.HomeDir, "containerd/root"), ctrd.CurrentSnapshotterName())
+	imageFSPath := imageFSPath(path.Join(config.HomeDir, "containerd/root"), ctrd.CurrentSnapshotterName(context.TODO()))
 	c.ImageFSUUID, err = getDeviceUUID(imageFSPath)
 	if err != nil {
 		return nil, fmt.Errorf("failed to get imagefs uuid of %q: %v", imageFSPath, err)

cri/v1alpha1/cri.go

@@ -184,7 +184,7 @@ func NewCriManager(config *config.Config, ctrMgr mgr.ContainerMgr, imgMgr mgr.Im
 		return nil, fmt.Errorf("failed to create sandbox meta store: %v", err)
 	}
 
-	c.imageFSPath = imageFSPath(path.Join(config.HomeDir, "containerd/root"), ctrd.CurrentSnapshotterName())
+	c.imageFSPath = imageFSPath(path.Join(config.HomeDir, "containerd/root"), ctrd.CurrentSnapshotterName(context.TODO()))
 	logrus.Infof("Get image filesystem path %q", c.imageFSPath)
 
 	if !config.CriConfig.DisableCriStatsCollect {

cri/v1alpha2/cri.go

@@ -13,6 +13,8 @@ import (
 	"github.com/containerd/containerd"
 	eventstypes "github.com/containerd/containerd/api/events"
 	"github.com/containerd/containerd/api/services/introspection/v1"
+	"github.com/containerd/containerd/plugin"
+	"github.com/containerd/containerd/snapshots"
 	"github.com/containerd/typeurl"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
@@ -305,3 +307,56 @@ func (c *Client) collectContainerdEvents() {
 		}
 	}
 }
+
+// CheckSnapshotterValid checks whether the given snapshotter is valid
+func (c *Client) CheckSnapshotterValid(snapshotter string, allowMultiSnapshotter bool) error {
+	var (
+		driverFound = false
+	)
+
+	plugins, err := c.Plugins(context.Background(), []string{fmt.Sprintf("type==%s", plugin.SnapshotPlugin)})
+	if err != nil {
+		logrus.Errorf("failed to get containerd plugins: %v", err)
+		return err
+	}
+
+	for _, p := range plugins {
+		if p.Status != PluginStatusOk {
+			continue
+		}
+
+		if p.ID == snapshotter {
+			driverFound = true
+			continue
+		}
+
+		// if allowMultiSnapshotter, ignore check snapshots exist
+		if !allowMultiSnapshotter {
+			// check if other snapshotter exists snapshots
+			exist, err := c.checkSnapshotsExist(p.ID)
+			if err != nil {
+				return fmt.Errorf("failed to check snapshotter driver %s: %v", p.ID, err)
+			}
+
+			if exist {
+				return fmt.Errorf("current snapshotter driver is %s, cannot change to %s", p.ID, snapshotter)
+			}
+		}
+	}
+
+	if !driverFound {
+		return fmt.Errorf("containerd not support snapshotter driver %s", snapshotter)
+	}
+
+	return nil
+}
+
+func (c *Client) checkSnapshotsExist(snapshotter string) (existSnapshot bool, err error) {
+	fn := func(c context.Context, s snapshots.Info) error {
+		existSnapshot = true
+		return nil
+	}
+
+	err = c.WalkSnapshot(context.Background(), snapshotter, fn)
+	return
+}