feature: support dns related flags when creating container through pouch cli #2380

mathspanda · 2018-10-29T11:42:48Z

Signed-off-by: mathspanda mathspanda826@gmail.com

Ⅰ. Describe what this PR did

Support dns related flags for pouch cli: dns, dns-option and dns-search.

Ⅱ. Does this pull request fix one issue?

Fix #2356

Ⅲ. Why don't you add test cases (unit test/integration test)? (你真的觉得不需要加测试吗？)

None

Ⅳ. Describe how to verify it

$ pouch run --dns 1.2.3.4 --dns-search example.com --dns-option timeout:3 busybox cat /etc/resolv.conf
search example.com
nameserver 1.2.3.4
options timeout:3

Ⅴ. Special notes for reviews

None

codecov · 2018-10-29T11:42:49Z

Codecov Report

Merging #2380 into master will decrease coverage by 0.01%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##           master    #2380      +/-   ##
==========================================
- Coverage   68.45%   68.44%   -0.02%     
==========================================
  Files         275      275              
  Lines       18291    18245      -46     
==========================================
- Hits        12522    12488      -34     
+ Misses       4340     4335       -5     
+ Partials     1429     1422       -7

Flag	Coverage Δ
#criv1alpha1test	`31.84% <ø> (+0.03%)`	⬆️
#criv1alpha2test	`35.85% <ø> (+0.02%)`	⬆️
#integrationtest	`39.88% <ø> (+0.12%)`	⬆️
#nodee2etest	`33.13% <ø> (-0.15%)`	⬇️
#unittest	`25.53% <ø> (+0.01%)`	⬆️

Impacted Files	Coverage Δ
daemon/mgr/spec_process.go	`67.01% <0%> (-12.99%)`	⬇️
cri/ocicni/cni_manager.go	`59.18% <0%> (-12.25%)`	⬇️
daemon/containerio/cri_log_file.go	`84.31% <0%> (-3.93%)`	⬇️
ctrd/image.go	`76.75% <0%> (-2.2%)`	⬇️
pkg/meta/store.go	`64.06% <0%> (-2.1%)`	⬇️
daemon/mgr/container_utils.go	`84.04% <0%> (-1.4%)`	⬇️
ctrd/container.go	`58.8% <0%> (-0.96%)`	⬇️
pkg/meta/boltdb.go	`68.67% <0%> (-0.74%)`	⬇️
daemon/mgr/container_validation.go	`44.37% <0%> (-0.63%)`	⬇️
cri/v1alpha2/cri.go	`67.81% <0%> (-0.48%)`	⬇️
... and 20 more

ZYecho · 2018-10-30T01:04:01Z

test/cli_run_dns_test.go

+	inspectRes := command.PouchRun("inspect", cname)
+	res.Assert(c, icmd.Success)
+
+	result := []types.ContainerJSON{}


I add a util func named inspectFilter in pr #2372 , use it to instead of unmarshal?

Yeah, please rebase this pr to the latest master. And do as @ZYecho said.

Rebased. And fixed as ZYecho said. @allencloud

ZYecho · 2018-10-30T01:05:20Z

test/cli_run_dns_test.go

+
+	// test if the value is in inspect result
+	inspectRes := command.PouchRun("inspect", cname)
+	res.Assert(c, icmd.Success)


inspectRes.Assert(c, icmd.Success)?

ZYecho · 2018-10-30T01:07:18Z

test/cli_run_dns_test.go

+		busyboxImage,
+		"cat", "/etc/resolv.conf")
+	defer DelContainerForceMultyTime(c, cname)
+	res.Assert(c, icmd.Success)


It's a good chioce to put command.PouchRun and Assert into one line? Since the res var didn't use after this.

I saw the behavior was divergent in the cli test.

@ZYecho Fixed.

LGTM, but waiting for the CI pass.

ZYecho · 2018-10-30T01:08:09Z

test/cli_run_dns_test.go

+	res.Assert(c, icmd.Success)
+
+	result := []types.ContainerJSON{}
+	if err := json.Unmarshal([]byte(inspectRes.Stdout()), &result); err != nil {


same with above.

allencloud · 2018-10-30T02:36:06Z

Could you squash the two commits into a single one? @mathspanda
And I am afraid that the commit message 123 is not preferred since it means less.
How about changing that?

mathspanda · 2018-10-30T02:41:09Z

Sorry. "123" is just a test commit. I will squash them. @allencloud

mathspanda · 2018-10-30T02:41:22Z

@ZYecho Fixed.

allencloud · 2018-10-31T16:50:13Z

Thanks a lot for your careful review. @ZYecho
To double check, I would like to invite @Ace-Tang to take another review for this. Thanks.

HusterWan · 2018-11-01T05:10:10Z

test/cli_run_dns_test.go

+func (suite *PouchRunDNSSuite) TestRunWithDNSFlags(c *check.C) {
+	cname := "TestRunWithDNSFlags"
+
+	res := command.PouchRun("run", "--name", cname,


since res not used, how about command.PouchRun(xx).(c, icmd.Success)

Nope. res is used in line 84.

OK, got it , my mistake

…uch cli Signed-off-by: mathspanda <mathspanda826@gmail.com>

allencloud · 2018-11-05T05:40:10Z

LGTM

pouchrobot added kind/feature size/L labels Oct 29, 2018

ZYecho reviewed Oct 30, 2018

View reviewed changes

mathspanda force-pushed the cli-dns branch from 05dad36 to 39d3576 Compare October 30, 2018 02:38

mathspanda force-pushed the cli-dns branch 2 times, most recently from 30e9dfe to ec0f322 Compare October 31, 2018 07:09

allencloud assigned Ace-Tang Oct 31, 2018

HusterWan reviewed Nov 1, 2018

View reviewed changes

feature: support dns related flags when creating container through po…

1387b6a

…uch cli Signed-off-by: mathspanda <mathspanda826@gmail.com>

mathspanda force-pushed the cli-dns branch from ec0f322 to 1387b6a Compare November 2, 2018 16:06

pouchrobot added the LGTM one maintainer or community participant agrees to merge the pull reuqest. label Nov 5, 2018

allencloud merged commit 1932630 into AliyunContainerService:master Nov 5, 2018

pouchrobot mentioned this pull request Nov 9, 2018

WeeklyReport of PouchContainer from 2018-11-02 to 2018-11-09 #2457

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feature: support dns related flags when creating container through pouch cli #2380

feature: support dns related flags when creating container through pouch cli #2380

mathspanda commented Oct 29, 2018

codecov bot commented Oct 29, 2018 •

edited

ZYecho Oct 30, 2018

allencloud Oct 31, 2018

mathspanda Oct 31, 2018

ZYecho Oct 30, 2018

ZYecho Oct 30, 2018

ZYecho Oct 30, 2018

ZYecho Oct 30, 2018

ZYecho Oct 30, 2018

allencloud commented Oct 30, 2018

mathspanda commented Oct 30, 2018 •

edited

mathspanda commented Oct 30, 2018 •

edited

allencloud commented Oct 31, 2018

HusterWan Nov 1, 2018

mathspanda Nov 1, 2018

HusterWan Nov 1, 2018

allencloud commented Nov 5, 2018

feature: support dns related flags when creating container through pouch cli #2380

feature: support dns related flags when creating container through pouch cli #2380

Conversation

mathspanda commented Oct 29, 2018

Ⅰ. Describe what this PR did

Ⅱ. Does this pull request fix one issue?

Ⅲ. Why don't you add test cases (unit test/integration test)? (你真的觉得不需要加测试吗？)

Ⅳ. Describe how to verify it

Ⅴ. Special notes for reviews

codecov bot commented Oct 29, 2018 • edited

Codecov Report

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

allencloud commented Oct 30, 2018

mathspanda commented Oct 30, 2018 • edited

mathspanda commented Oct 30, 2018 • edited

allencloud commented Oct 31, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

allencloud commented Nov 5, 2018

codecov bot commented Oct 29, 2018 •

edited

mathspanda commented Oct 30, 2018 •

edited

mathspanda commented Oct 30, 2018 •

edited