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

Add the CRI preflight ignore, lost in refactoring #2723

Merged
merged 1 commit into from
Apr 16, 2018

Conversation

afbjorklund
Copy link
Collaborator

Also move the corresponding comments to the code

Fix from 5b54dd6
Lost in cc356e6

Fixes #2716

@k8s-ci-robot k8s-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Apr 13, 2018
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: afbjorklund
To fully approve this pull request, please assign additional approvers.
We suggest the following additional approver: aaron-prindle

Assign the PR to them by writing /assign @aaron-prindle in a comment when ready.

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 cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Apr 13, 2018
@dlorenc
Copy link
Contributor

dlorenc commented Apr 13, 2018

LGTM, but looks like there's a conflict from your other fix.

@afbjorklund afbjorklund force-pushed the cri-preflight-error branch from 56ee34e to cac9a37 Compare April 13, 2018 16:06
@afbjorklund
Copy link
Collaborator Author

@dlorenc : Rebased

Also seems that I forgot to run the entire verify suite, like "fmt"...

Also move the corresponding comments to the code
@afbjorklund afbjorklund force-pushed the cri-preflight-error branch from cac9a37 to 87689eb Compare April 14, 2018 06:55
@dlorenc dlorenc merged commit 8e299f4 into kubernetes:master Apr 16, 2018
@afbjorklund afbjorklund deleted the cri-preflight-error branch April 16, 2018 16:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. 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