Merge pull request #1576 from Ace-Tang/net_priority

feature: support net priority flag
AliyunContainerService · Jul 9, 2018 · f3c247c · f3c247c
2 parents 3ab7f40 + 8869011
commit f3c247c
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 0 deletions.
diff --git a/apis/swagger.yml b/apis/swagger.yml
@@ -1964,6 +1964,10 @@ definitions:
       QuotaID:
         type: "string"
         description: "set disk quota by specified quota id, if id < 0, it means pouchd alloc a unique quota id"
+      NetPriority:
+        description: "net priority."
+        type: "integer"
+        default: 0
 
   ContainerCreateResp:
     description: "response returned by daemon when container create successfully"

diff --git a/apis/types/container_config.go b/apis/types/container_config.go
diff --git a/cli/common_flags.go b/cli/common_flags.go
@@ -97,6 +97,7 @@ func addCommonFlags(flagSet *pflag.FlagSet) *container {
 	flagSet.StringVar(&c.richMode, "rich-mode", "", "Choose one rich container mode. dumb-init(default), systemd, sbin-init")
 	flagSet.StringVar(&c.initScript, "initscript", "", "Initial script executed in container")
 	flagSet.StringVar(&c.shmSize, "shm-size", "", "Size of /dev/shm, default value is 64MB")
+	flagSet.Int64Var(&c.netPriority, "net-priority", 0, "net priority")
 
 	// cgroup
 	flagSet.StringVarP(&c.cgroupParent, "cgroup-parent", "", "", "Optional parent cgroup for the container")

diff --git a/cli/container.go b/cli/container.go
@@ -73,6 +73,7 @@ type container struct {
 	ulimit         config.Ulimit
 	pidsLimit      int64
 	shmSize        string
+	netPriority    int64
 
 	// log driver and log option
 	logDriver string
@@ -204,6 +205,7 @@ func (c *container) config() (*types.ContainerCreateConfig, error) {
 			DiskQuota:           diskQuota,
 			QuotaID:             c.quotaID,
 			SpecAnnotation:      specAnnotation,
+			NetPriority:         c.netPriority,
 		},
 
 		HostConfig: &types.HostConfig{