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

Fix cri-dockerd CI runs #867

Merged
merged 1 commit into from
Dec 31, 2021

Conversation

dcantah
Copy link
Member

@dcantah dcantah commented Dec 29, 2021

What type of PR is this?

/kind bug

What this PR does / why we need it:

github.com/Mirantis/cri-dockerd has changed a couple things that were affecting the CI. The code has moved to a src/ subdirectory so running 'go install .' at the root of the repo fails on finding anything. The default addresses have also changed from /var/run/dockershim.sock (and //./pipe/dockershim) to /var/run/cri-dockerd.sock. A couple of flags also don't seem to exist anymore, namely --logtostderr and --v. All in all this change cds to the src subdirectory before trying to build/install anything, makes cri-dockerd launch with the old dockershim address, and gets rid of the now nonexistent flags.

Which issue(s) this PR fixes:

Special notes for your reviewer:

Does this PR introduce a user-facing change?

NONE

@k8s-ci-robot k8s-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. kind/bug Categorizes issue or PR as related to a bug. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Dec 29, 2021
@dcantah dcantah changed the title Fix dockerd-shim CI runs Fix cri-dockerd CI runs Dec 30, 2021
@k8s-ci-robot k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Dec 30, 2021
@dcantah dcantah force-pushed the fix-dockershim-ci branch 3 times, most recently from 55d6c2f to 0ee4b31 Compare December 30, 2021 02:01
github.com/Mirantis/cri-dockerd has changed a couple things that were
affecting the CI. The code has moved to a src/ subdirectory so running
'go install .' at the root of the repo fails on finding anything. The
default addresses have also changed from /var/run/dockershim.sock
(and //./pipe/dockershim) to /var/run/cri-dockerd.sock. A couple of flags
also don't seem to exist anymore, namely --logtostderr and --v. All in all
this change cds to the src subdirectory before trying to build/install anything,
makes cri-dockerd launch with the old dockershim address, and gets rid of the
now nonexistent flags.

Signed-off-by: Daniel Canter <[email protected]>
@dcantah dcantah marked this pull request as ready for review December 30, 2021 04:04
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Dec 30, 2021
@dcantah
Copy link
Member Author

dcantah commented Dec 30, 2021

Ok this looks like it's ready after testing this locally @feiskyer

@dcantah
Copy link
Member Author

dcantah commented Dec 30, 2021

We could go either way in this PR also for the address. Pass the new default address to critest under the -runtime-endpoint and -image-endpoint flags or do what we have currently and launch cri-dockerd with the old default address. Or change these https://github.com/kubernetes-sigs/cri-tools/blob/master/pkg/framework/test_context.go#L74-L78 but I'm not sure if this makes sense at the moment.

Copy link
Member

@feiskyer feiskyer left a comment

Choose a reason for hiding this comment

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

LGTM with setting the ep for the tests and thanks for the fix.

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Dec 31, 2021
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dcantah, feiskyer

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 31, 2021
@k8s-ci-robot k8s-ci-robot merged commit aa9b4de into kubernetes-sigs:master Dec 31, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/bug Categorizes issue or PR as related to a bug. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants