Merge remote-tracking branch 'upstream/master'

Author: Dewey-Ding

CHANGELOG.md

@@ -1,5 +1,105 @@
 # CHANGELOG
 
+## 0.3.0 (2018-03-30)
+
+**IMPORTANT**: Pouch 0.3.0 has met almost all your basic needs for kubernetes:
+
+1. Sandbox/Container lifecycle management
+2. Image management
+3. Network management with CNI
+4. Container streaming: exec/attach/portforward
+5. Container logging
+6. Security Context: RunAsUser, Apparmor,Seccomp,Sysctl
+7. Validation test of cri-tools: 51/55 Pass
+
+**IMPORTANT**:
+Kubernetes 1.10 was released recently and the CRI of it has updated from v1alpha1 to v1alpha2.
+Pouch will first try to fully support CRI v1alpha1 and then CRI v1alpha2.
+So kubernetes 1.9.X is recommended now
+
+### Remote API && Client
+
+* `inspect` now support input multi items [\#989](https://github.com/alibaba/pouch/pull/989)
+* Refactor make route code much more simplified [\#988](https://github.com/alibaba/pouch/pull/988)
+* Fix `restart` router miss versionMatcher [\#986](https://github.com/alibaba/pouch/pull/986)
+* Add kernel value in `pouch version` command [\#942](https://github.com/alibaba/pouch/pull/942)
+* Make `pouch info` print more pretty [\#941](https://github.com/alibaba/pouch/pull/941)
+* Add `no-trunc` flag to `pouch ps` [\#909](https://github.com/alibaba/pouch/pull/909)
+* New `restart` command that allow restarting an running container [\#890](https://github.com/alibaba/pouch/pull/890)
+* New `upgrade` command that allow upgrading image and resources of a container [\#852](https://github.com/alibaba/pouch/pull/852)
+* New `top` command that allow showing processes informations in container [\#878](https://github.com/alibaba/pouch/pull/878)
+* Add `--format` flag to `pouch image inspect` and `pouch network inspect` commands [\#871](https://github.com/alibaba/pouch/pull/871)
+* New `pouch info` command to print all informations about th pouch daemon [\#859](https://github.com/alibaba/pouch/pull/859)
+* New `pouch logs` command that allow printing logs of container [\#886](https://github.com/alibaba/pouch/pull/886)
+* Using the default registry when execute `logout`command if not specified one [\#902](https://github.com/alibaba/pouch/pull/902)
+* New `resize` command that allow changing the height and width of TTY of an running container [\#879](https://github.com/alibaba/pouch/pull/879)
+
+### Pouch Daemon
+
+* New `update` API that allow updating `labels` and `image-proxy` parameters of pouch daemon [\#987](https://github.com/alibaba/pouch/pull/987)
+* Add `--label` flag to `pouchd` [\#982](https://github.com/alibaba/pouch/pull/982)
+
+### Runtime
+
+* Change container parameter's json name from `ID` to `Id` to be compatible with Moby API [\#1002](https://github.com/alibaba/pouch/pull/1002)
+* Fix errors checked by markdownlint [\#974](https://github.com/alibaba/pouch/pull/974)
+* Refactor the pouch ctrd layer client interface [\#971](https://github.com/alibaba/pouch/pull/971)
+* Refactor the `pkg` package that let's client package independent to other inner pkgs [\#962](https://github.com/alibaba/pouch/pull/962)
+* Add circleci to pouch to validate markdown files [\#961](https://github.com/alibaba/pouch/pull/961)
+* Fix log initialization of `libnetwork` in pouch [\#956](https://github.com/alibaba/pouch/pull/956)
+* Fix the import path of package `logrus` [\#953](https://github.com/alibaba/pouch/pull/953)
+* Fix should checking `kernelVersion.Kernel` not `kernelVersion.Major` when setting disk quota driver [\#946](https://github.com/alibaba/pouch/pull/946)
+* New `restart` interface that allow restarting an running container [\#944](https://github.com/alibaba/pouch/pull/944)
+* Refactor modify logic in complement image fullname [\#940](https://github.com/alibaba/pouch/pull/940)
+* Add `--oom-kill-disable` and `--oom-score-adj` flags to `pouch create` [\#934](https://github.com/alibaba/pouch/pull/934)
+* New `resize` API that allow changing the height and width of TTY of an running container [\#931](https://github.com/alibaba/pouch/pull/931)
+* Fix execute `pouch images` command panic when pulling an image failed before [\#926](https://github.com/alibaba/pouch/pull/926)
+* New `upgrade` API that allow upgrading the image and resource of a container [\#923](https://github.com/alibaba/pouch/pull/923)
+* New plugin framework to support executing custom codes at plugin points [\#919](https://github.com/alibaba/pouch/pull/919)
+* Add default registry namespace [\#911](https://github.com/alibaba/pouch/pull/911)
+* New `top` API that allow showing the processes informations in an running container [\#900](https://github.com/alibaba/pouch/pull/900)
+* Fix `cgroup-parent` should always be abs [\#896](https://github.com/alibaba/pouch/pull/896)
+* Refactor set lxcfs service managed by systemd [\#885](https://github.com/alibaba/pouch/pull/885)
+* Add version information in restful api url [\#869](https://github.com/alibaba/pouch/pull/869)
+* Add `repoTags` and `repoDigests` in `ImageInfo` struct [\#721](https://github.com/alibaba/pouch/pull/721)
+
+### Documentation
+
+* Add introduction document to diskquota [\#972](https://github.com/alibaba/pouch/pull/972)
+* Improve test guidance doc [\#856](https://github.com/alibaba/pouch/pull/856)
+
+### Storage
+
+* Add `--volume` flag to `pouch create` to support bind mounts for files [\#937](https://github.com/alibaba/pouch/pull/937)
+* Fix volume can be removed when using by container [\#888](https://github.com/alibaba/pouch/pull/888)
+* Add disk quota for container's rootfs [\#876](https://github.com/alibaba/pouch/pull/876)
+
+### Kubernetes
+
+* With this PR, we can get the error informations when stream server handles `exec` or `attach` commands occured errors [\#1007](https://github.com/alibaba/pouch/pull/1007)
+* Add websocket support for cri stream server [\#985](https://github.com/alibaba/pouch/pull/985)
+* Fix handle image format 'namespace/name:tag' correctly [\#981](https://github.com/alibaba/pouch/pull/981)
+* Fix pull image and get its status with RefDigest [\#973](https://github.com/alibaba/pouch/pull/973)
+* Store sandbox config informations for cri manager [\#955](https://github.com/alibaba/pouch/pull/955)
+* Seperate stdout & stderr of container io and support host network mode for sandbox [\#945](https://github.com/alibaba/pouch/pull/945)
+* Implement ReadOnlyRootfs and add `no-new-privilegs` support to cri manager [\#935](https://github.com/alibaba/pouch/pull/935)
+* Add support getting the logs of container to cri manager [\#928](https://github.com/alibaba/pouch/pull/928)
+* Add support setting pod dns configuration to cri manager [\#912](https://github.com/alibaba/pouch/pull/912)
+* Wrap cri manager to log every cri operation [\#899](https://github.com/alibaba/pouch/pull/899)
+* Fix inspect image by image id with prefix [\#895](https://github.com/alibaba/pouch/pull/895)
+* Implement exec and attach method of stream server [\#854](https://github.com/alibaba/pouch/pull/854)
+* Add `--group-add` flag to `pouch create` command and supplemental groups for cri manager [\#753](https://github.com/alibaba/pouch/pull/753)
+
+### Test
+
+* Add mock test for `rename` client [\#1021](https://github.com/alibaba/pouch/pull/1021)
+* Add mock test for `version` client [\#1004](https://github.com/alibaba/pouch/pull/1004)
+* Add test cases for `imageCache.get` [\#979](https://github.com/alibaba/pouch/pull/979)
+* Add mock test for client package [\#965](https://github.com/alibaba/pouch/pull/965)
+* Add test case for `login/logout` command [\#908](https://github.com/alibaba/pouch/pull/908)
+* Add related functions for test pouch daemon [\#884](https://github.com/alibaba/pouch/pull/884)
+* Print error log in CI for debug [\#883](https://github.com/alibaba/pouch/pull/883)
+
 ## 0.2.1 (2018-03-09)
 
 ### Network

README.md

@@ -15,6 +15,7 @@
 - [Features](#features)
 - [Architecture](#architecture)
 - [Getting Started](#getting-started)
+- [Deploying Kubernetes with Pouch](#deploying-kubernetes-with-pouch)
 - User Manual
   - [CLI Manual](docs/commandline)
   - [API Manual](docs/api)
@@ -37,6 +38,7 @@ Pouch's most important features are:
 - **P2P distribution**: Pouch utilizes [Dragonfly](https://github.com/alibaba/dragonfly), a P2P-base distribution system, to achieve lightning-fast container image distribution at enterprise's large scale.
 - **Kernel compatibility**: Enables OCI-compatible runtimes to work on old kernel versions, like linux kernel 2.6.32+.
 - **Standard compatibility**: Pouch keeps embracing container ecosystem to support industry standard, such as CNI, CSI and so on.
+- **Kubernetes compatibility**: Pouch has natively implemented Kubernetes Container Runtime Interface(CRI). It will be smooth to migrate from other Kubernetes container runtime to Pouch.
 
 ## Architecture
 
@@ -66,6 +68,10 @@ Pouch offers a more "application centric" approach for application development:
 
 You can easily setup a basic Pouch environment, see [INSTALLATION.md](INSTALLATION.md). You'll need to install a few packages before starting `pouchd`, which starts a container management service. The service can be accessed through the `pouch` CLI or RPC calls. For more details, please refer to [CLI Manual](docs/commandline) and [API Manual](docs/api).
 
+## Deploying Kubernetes With Pouch
+
+After installing Pouch on your machine, maybe it is the exiciting moment for you to power your Kubernetes cluster by Pouch. There is an easy guide for you to quickly experience this amazing combination [Kubernetes + Pouch](docs/kubernetes/pouch_with_kubernetes_deploying.md).
+
 ## Contributing
 
 You are warmly welcomed to hack on Pouch. We have prepared a detailed guide [CONTRIBUTING.md](CONTRIBUTING.md).

cli/image_inspect.go

@@ -27,7 +27,7 @@ func (i *ImageInspectCommand) Init(c *Cli) {
 		Long:  imageInspectDescription,
 		Args:  cobra.MinimumNArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
-			return inspect.MultiInspect(args, i.runInspect)
+			return i.runInspect(args)
 		},
 		Example: i.example(),
 	}
@@ -43,13 +43,12 @@ func (i *ImageInspectCommand) addFlags() {
 func (i *ImageInspectCommand) runInspect(args []string) error {
 	ctx := context.Background()
 	apiClient := i.cli.Client()
-	name := args[0]
 
 	getRefFunc := func(ref string) (interface{}, error) {
 		return apiClient.ImageInspect(ctx, ref)
 	}
 
-	return inspect.Inspect(os.Stdout, name, i.format, getRefFunc)
+	return inspect.MultiInspect(os.Stdout, args, i.format, getRefFunc)
 }
 
 // example shows examples in inspect command, and is used in auto-generated cli docs.

cli/inspect.go

@@ -27,7 +27,7 @@ func (p *InspectCommand) Init(c *Cli) {
 		Long:  inspectDescription,
 		Args:  cobra.MinimumNArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
-			return inspect.MultiInspect(args, p.runInspect)
+			return p.runInspect(args)
 		},
 		Example: inspectExample(),
 	}
@@ -43,13 +43,12 @@ func (p *InspectCommand) addFlags() {
 func (p *InspectCommand) runInspect(args []string) error {
 	ctx := context.Background()
 	apiClient := p.cli.Client()
-	name := args[0]
 
 	getRefFunc := func(ref string) (interface{}, error) {
 		return apiClient.ContainerGet(ctx, ref)
 	}
 
-	return inspect.Inspect(os.Stdout, name, p.format, getRefFunc)
+	return inspect.MultiInspect(os.Stdout, args, p.format, getRefFunc)
 }
 
 // inspectExample shows examples in inspect command, and is used in auto-generated cli docs.

cli/inspect/inspector.go

@@ -3,10 +3,12 @@ package inspect
 import (
 	"bytes"
 	"encoding/json"
+	"fmt"
 	"io"
 	"strings"
 	"text/template"
 
+	"github.com/alibaba/pouch/pkg/utils"
 	"github.com/alibaba/pouch/pkg/utils/templates"
 
 	"github.com/pkg/errors"
@@ -62,7 +64,7 @@ func Inspect(out io.Writer, ref string, tmplStr string, getRef GetRefFunc) error
 
 	element, err := getRef(ref)
 	if err != nil {
-		return errors.Errorf("Template parsing error: %v", err)
+		return errors.Errorf("Fetch object error: %v", err)
 	}
 
 	if err := inspector.Inspect(element); err != nil {
@@ -76,23 +78,28 @@ func Inspect(out io.Writer, ref string, tmplStr string, getRef GetRefFunc) error
 	return nil
 }
 
-// RunInspectFunc is a function which used by MultiInspect
-type RunInspectFunc func(args []string) error
-
-// MultiInspect Apply function to every item of ref.
-func MultiInspect(refs []string, inspect RunInspectFunc) error {
-	var inspectErrors []string
+// MultiInspect fetches objects with multiple references.
+func MultiInspect(out io.Writer, refs []string, tmplStr string, getRef GetRefFunc) error {
+	var errs []error
 	for _, ref := range refs {
-		err := inspect([]string{ref})
+		err := Inspect(out, ref, tmplStr, getRef)
 		if err != nil {
-			inspectErrors = append(inspectErrors, err.Error())
+			errs = append(errs, err)
 		}
 	}
-	if len(inspectErrors) == 0 {
+	if len(errs) == 0 {
 		return nil
 	}
 
-	return errors.New(strings.Join(inspectErrors, "Error: "))
+	formatErrMsg := func(idx int, err error) (string, error) {
+		errMsg := err.Error()
+		errMsg = strings.TrimRight(errMsg, "\n")
+		if idx != 0 {
+			errMsg = fmt.Sprintf("Error: %s", errMsg)
+		}
+		return errMsg, nil
+	}
+	return utils.CombineErrors(errs, formatErrMsg)
 }
 
 // Inspect executes the inspect template.

cli/network.go

@@ -267,7 +267,7 @@ func (n *NetworkInspectCommand) Init(c *Cli) {
 		Long:  networkInspectDescription,
 		Args:  cobra.MinimumNArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
-			return inspect.MultiInspect(args, n.runNetworkInspect)
+			return n.runNetworkInspect(args)
 		},
 		Example: networkInspectExample(),
 	}
@@ -283,16 +283,14 @@ func (n *NetworkInspectCommand) addFlags() {
 
 // runNetworkInspect is the entry of NetworkInspectCommand command.
 func (n *NetworkInspectCommand) runNetworkInspect(args []string) error {
-	name := args[0]
-
 	ctx := context.Background()
 	apiClient := n.cli.Client()
 
 	getRefFunc := func(ref string) (interface{}, error) {
 		return apiClient.NetworkInspect(ctx, ref)
 	}
 
-	return inspect.Inspect(os.Stdout, name, n.format, getRefFunc)
+	return inspect.MultiInspect(os.Stdout, args, n.format, getRefFunc)
 }
 
 // networkInspectExample shows examples in network inspect command, and is used in auto-generated cli docs.

cli/volume.go

@@ -228,7 +228,7 @@ func (v *VolumeInspectCommand) Init(c *Cli) {
 		Long:  volumeInspectDescription,
 		Args:  cobra.MinimumNArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
-			return inspect.MultiInspect(args, v.runVolumeInspect)
+			return v.runVolumeInspect(args)
 		},
 		Example: volumeInspectExample(),
 	}
@@ -242,18 +242,14 @@ func (v *VolumeInspectCommand) addFlags() {
 
 // runVolumeInspect is the entry of VolumeInspectCommand command.
 func (v *VolumeInspectCommand) runVolumeInspect(args []string) error {
-	name := args[0]
-
-	logrus.Debugf("inspect a volume: %s", name)
-
 	ctx := context.Background()
 	apiClient := v.cli.Client()
 
 	getRefFunc := func(ref string) (interface{}, error) {
 		return apiClient.VolumeInspect(ctx, ref)
 	}
 
-	return inspect.Inspect(os.Stdout, name, v.format, getRefFunc)
+	return inspect.MultiInspect(os.Stdout, args, v.format, getRefFunc)
 }
 
 // volumeInspectExample shows examples in volume inspect command, and is used in auto-generated cli docs.

client/network.go

@@ -0,0 +1,22 @@
+package client
+
+import (
+	"context"
+
+	"github.com/alibaba/pouch/apis/types"
+)
+
+// NetworkCreate creates a network.
+func (client *APIClient) NetworkCreate(ctx context.Context, req *types.NetworkCreateConfig) (*types.NetworkCreateResp, error) {
+	resp, err := client.post(ctx, "/networks/create", nil, req, nil)
+	if err != nil {
+		return nil, err
+	}
+
+	network := &types.NetworkCreateResp{}
+
+	err = decodeBody(network, resp.Body)
+	ensureCloseReader(resp)
+
+	return network, err
+}