Merge branch 'master' into fix-filter-volumes

.github/PULL_REQUEST_TEMPLATE.md

@@ -9,7 +9,8 @@ https://github.com/alibaba/pouch/blob/master/CONTRIBUTING.md -->
 <!--If that, add "fixes #xxxx" below in the next line, for example, fixes #15. Otherwise, add "NONE" -->
 
 
-### Ⅲ. Describe how you did it
+### Ⅲ. Why don't you add test cases (unit test/integration test)? (你真的觉得不需要加测试吗？)
+
 
 
 ### Ⅳ. Describe how to verify it

.travis.yml

@@ -33,23 +33,23 @@ script: |
     TEST_FLAGS= make build-integration-test
     sudo env "PATH=$PATH" make install
 
-    sudo env "PATH=$PATH" make download_dependencies
+    sudo env "PATH=$PATH" make download-dependencies
     sudo env "PATH=$PATH" make integration-test
     make coverage
   elif [[ "${TEST_SUITE}" = "criv1alpha1test" ]]; then
     make build
     TEST_FLAGS= make build-daemon-integration
     sudo env "PATH=$PATH" make install
 
-    sudo env "PATH=$PATH" make download_dependencies
+    sudo env "PATH=$PATH" make download-dependencies
     sudo env "PATH=$PATH" make cri-v1alpha1-test
     make coverage
   else
     make build
     TEST_FLAGS= make build-daemon-integration
     sudo env "PATH=$PATH" make install
 
-    sudo env "PATH=$PATH" make download_dependencies
+    sudo env "PATH=$PATH" make download-dependencies
     sudo env "PATH=$PATH" make cri-v1alpha2-test
     make coverage
   fi

CONTRIBUTORS

@@ -9,58 +9,80 @@ Allen Sun <allen.sun@daocloud.io>
 Allen Sun <allensun.shl@alibaba-inc.com>
 Allen Sun <shlallen1990@gmail.com>
 allen.wang <allen.wq@alipay.com>
+btlcmr0702 <btlcmr0702@hotmail.com>
 bvwells <b.v.wells@gmail.com>
 Ce Gao <ce.gao@outlook.com>
 chenzhimin <1141685075@qq.com>
 Chuanyun Li <lcy041536@gmail.com>
 Cindy <176425810@qq.com>
 CodeJuan <CodeJuan@users.noreply.github.com>
-CodeJuan <xh@decbug.com>
+codejuan <xh@decbug.com>
+Coordinate36 <2484652469@qq.com>
 dbdd4us <wangtong2712@gmail.com>
+devily <86979425@qq.com>
 Dewey-Ding <deweyding@gmail.com>
 Eileen Teng <lykosteng@gmail.com>
+Erhuan <553614753@qq.com>
 Eric Li <lcy041536@gmail.com>
+fanglin <fanglin.gu@gmail.com>
 Frank Yang <yyb196@gmail.com>
 Frank Zhao <syzhao1988@126.com>
 frankyang <yyb196@gmail.com>
+Frankzhaopku <syzhao1988@126.com>
 GodweiFighting <1250394994@qq.com>
 Guoliang Wang <iamwgliang@gmail.com>
 Haoran Lu <haoran.lu@daocloud.io>
 HusterWan <zirenwan@gmail.com>
+Jerome Tan <DevJerome@iCloud.com>
+jiapengcs <jiapengkang@gmail.com>
+johanzhu <zhubei@MacBook-Pro-62.local>
 Jumping Qu <jumping@users.noreply.github.com>
+kaicizhu <kaici.zkc@alibaba-inc.com>
 kun <oiooj@qq.com>
+lauo <244382021@qq.com>
+lauo <forienlauo@qq.com>
 Leno Hou <lenohou@gmail.com>
 letty <learn5411@gmail.com>
 letty <letty.ll@alibaba-inc.com>
 letty.ll <letty.ll@alibaba-inc.com>
+luman.qy <luman.qy@cainiao.com>
+MarkLux <marlx6590@163.com>
+mengjiahao <691225916@qq.com>
 Michael Wan <zirenwan@gmail.com>
 mozhuli <21621232@zju.edu.cn>
 mx <tiny1990@126.com>
 Penghao Cen <cenph@caicloud.io>
 pouchrobot <pouch-dev@list.alibaba-inc.com>
 pouch_robot <33292901+pouchrobot@users.noreply.github.com>
+Reficul <xuzhenglun@gmail.com>
 rhinoceros.xn <rhinoceros.xn@gmail.com>
 root <starnop@163.com>
 Rudy Zhang <rudyflyzhang@gmail.com>
 Runrioter Wung <runrioter@gmail.com>
 Sam Xie <xsambundy@gmail.com>
+SeaRise <846579815@qq.com>
 shaloulcy <lcy041536@gmail.com>
+shanbo.lkw <shanbo.lkw@alibaba-inc.com>
 skoo <marckywu@gmail.com>
 skoo87 <marckywu@gmail.com>
 soarpenguin <soarpenguin@gmail.com>
 Starnop <starnop@163.com>
 steven <fhtjob@hotmail.com>
 Tao Qingyun <845767657@qq.com>
+Tardis Xu <xiaoxubeii@gmail.com>
 Tiramisu 1993 <sabergeass@gmail.com>
 u2takey <u2takey@gmail.com>
 unknown <1020216950@qq.com>
 upccup <yaoyunsmile@gmail.com>
 wangcong <king6cong@gmail.com>
 wangforthinker <allen.wq@alipay.com>
+Wangrui <baijia.wr@antfin.com>
 Wei Fu <fhfuwei@163.com>
 Wendell Sun <iwendellsun@gmail.com>
+wq2526 <wq2526@126.com>
 wrfly <mr.wrfly@gmail.com>
 Xiang Li <xiangli.cs@gmail.com>
+Xiangning (Shannon) <31495840+shannonxn@users.noreply.github.com>
 xiaohuo <xiaohuo200@gmail.com>
 Xie.CS <xie1995@whut.edu.cn>
 xiechengsheng <XIE1995@whut.edu.cn>
@@ -73,6 +95,8 @@ Yao Zengzeng <yaozengzeng@zju.edu.cn>
 YaoZengzeng <yaozengzeng@zju.edu.cn>
 Yaxiong Zhao <justicezyx@gmail.com>
 Yuan Sun <yile.sy@alibaba-inc.com>
+yuannauy123 <13673717303@163.com>
+yuchuan <yuchuan.jyc@gmail.com>
 zeppp <30573528+zeppp@users.noreply.github.com>
 zeppp <zc951016@outlook.com>
 zeppp <zeppp1995@gmail.com>
@@ -83,6 +107,7 @@ Zhang Zhanchun <zzchun@zju.edu.cn>
 zheng chen <21751032@zju.edu.cn>
 zheng chen <30573528+zeppp@users.noreply.github.com>
 zhuangqh <zhuangqhc@163.com>
+zhuangqh <zhuangqhc@gmail.com>
 zhubingbing <1392607554@qq.com>
 zhubingbing <zhu.bingbing@99cloud.net>
 zhubingbing <zhubingbing@zhubingbing.local>
@@ -94,3 +119,4 @@ ZouRui89 <32304680+ZouRui89@users.noreply.github.com>
 程飞 <fay.cheng.cn@gmail.com>
 谢恒忠@运维小盆友 <10927831@qq.com>
 谢烟客 <CoderInfo@163.com>
+阑风 <zaiyu.pzy@alibaba-inc.com>

Makefile

@@ -89,16 +89,20 @@ uninstall: ## uninstall pouchd and pouch binary
 	@rm -f $(addprefix $(DEST_DIR)/bin/,$(notdir $(DAEMON_BINARY_NAME)))
 	@rm -f $(addprefix $(DEST_DIR)/bin/,$(notdir $(CLI_BINARY_NAME)))
 
-.PHONY: download_dependencies
-download_dependencies: ## download related dependencies, such as dumb_init
+.PHONY: package-dependencies
+package-dependencies: ## install containerd, runc and lxcfs dependencies for packaging
 	@echo $@
-	hack/install/install_ci_related.sh
 	hack/install/install_containerd.sh
+	hack/install/install_lxcfs.sh
+	hack/install/install_runc.sh
+
+.PHONY: download-dependencies
+download-dependencies: package-dependencies ## install dumb-init, local-persist, nsenter and CI tools dependencies
+	@echo $@
+	hack/install/install_ci_related.sh
 	hack/install/install_dumb_init.sh
 	hack/install/install_local_persist.sh
-	hack/install/install_lxcfs.sh
 	hack/install/install_nsenter.sh
-	hack/install/install_runc.sh
 
 .PHONY: clean
 clean: ## clean to remove bin/* and files created by module

apis/opts/intel_rdt.go

@@ -2,8 +2,8 @@ package opts
 
 // ParseIntelRdt parses inter-rdt params of container
 func ParseIntelRdt(intelRdtL3Cbm string) (string, error) {
-	// FIXME: add Intel RDT L3 Cbm validation
+	// FIXME(ningzhuo): add Intel RDT L3 Cbm validation
 	return intelRdtL3Cbm, nil
 }
 
-// TODO: ValidateInterRdt
+// TODO(ningzhuo): ValidateInterRdt

apis/opts/memory_swap.go

@@ -16,9 +16,3 @@ func ParseMemorySwap(memorySwap string) (int64, error) {
 	}
 	return result, nil
 }
-
-// ValidateMemorySwap verifies the correctness of memory-swap.
-func ValidateMemorySwap(memorySwap int64) error {
-	// TODO
-	return nil
-}