Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

support cri-dockerd.sock for docker runtime #1634

Merged
merged 1 commit into from
Jun 12, 2024

Conversation

chengjoey
Copy link
Contributor

Ⅰ. Describe what this PR does

support cri-dockerd.sock for docker runtime
#1631

Ⅱ. Does this pull request fix one issue?

Ⅲ. Describe how to verify it

https://github.com/Mirantis/cri-dockerd/blob/3248313faac560c1a32244a9015f8ff20c42a29d/cmd/cri/options/options.go#L44-L46

Ⅳ. Special notes for reviews

@kruise-bot kruise-bot requested review from FillZpp and zmberg May 31, 2024 09:24
@kruise-bot kruise-bot added the size/M size/M: 30-99 label May 31, 2024
cfgs = append(cfgs, runtimeConfig{
runtimeType: ContainerRuntimeDocker,
runtimeURI: fmt.Sprintf("unix://%s/docker.sock", varRunPath),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is it possible to treat cri-docker as if it is ContainerRuntimeCommonCRI? you can refer to the cri-o implementation

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

plz make the code a seperate block, e.g.

	// cri-dockerd
	{
		if _, err = os.Stat(fmt.Sprintf("%s/cri-dockerd.sock", varRunPath)); err == nil {
			cfgs = append(cfgs, runtimeConfig{
				runtimeType:      ContainerRuntimeCommonCRI,
				runtimeRemoteURI: fmt.Sprintf("unix://%s/cri-dockerd.sock", varRunPath),
			})
		}
	}

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done again ~

@kruise-bot kruise-bot added size/XS size/XS: 0-9 and removed size/M size/M: 30-99 labels Jun 11, 2024
Copy link

codecov bot commented Jun 11, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 49.14%. Comparing base (0d0031a) to head (b7f0851).
Report is 44 commits behind head on master.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #1634      +/-   ##
==========================================
+ Coverage   47.91%   49.14%   +1.22%     
==========================================
  Files         162      183      +21     
  Lines       23491    18925    -4566     
==========================================
- Hits        11256     9300    -1956     
+ Misses      11014     8404    -2610     
  Partials     1221     1221              
Flag Coverage Δ
unittests 49.14% <ø> (+1.22%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Signed-off-by: joey <zchengjoey@gmail.com>
@kruise-bot kruise-bot added size/S size/S 10-29 and removed size/XS size/XS: 0-9 labels Jun 11, 2024
@furykerry
Copy link
Member

/lgtm

@zmberg
Copy link
Member

zmberg commented Jun 12, 2024

/approve

@kruise-bot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: zmberg

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@kruise-bot kruise-bot merged commit 0313790 into openkruise:master Jun 12, 2024
40 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants