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

Upgrade CRI-O to 1.16.3 #514

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

krawthekrow
Copy link
Contributor

@krawthekrow krawthekrow commented Apr 24, 2020

See commit message. Unfortunately this does not seem to fix the memory leak, and the number of exit files still grows apparently unboundedly.

See #490 .


Checklist:

  • I have split up this change into one or more appropriately-delineated commits.
  • The first line of each commit is of the form "[component]: do something"
  • I have written a complete, multi-line commit message for each commit.
  • I have formatted any Go code that I have changed with gofmt.
  • I have written or updated appropriate documentation to cover this change.
  • I have confirmed that this change is covered by at least one appropriate test run by CI.
  • If my change includes new or modified functionality, I have tested that the changes work as expected.
  • I have assigned this issue to an appropriate reviewer. (Choose @celskeggs if you are not otherwise certain.)
  • I consider my PR complete and ready to be merged without my further input, assuming that it passes CI and code review.
  • My changes have passed CI, including an automatic Jenkins deploy.
  • My changes have passed code review.

platform/cri-o/conmon.patch Outdated Show resolved Hide resolved
platform/cri-o/conmon.patch Outdated Show resolved Hide resolved
platform/cri-o/crio.conf.upstream Show resolved Hide resolved
name = "com_github_containers_conmon",
commit = "1bddbf7051a973f4a4fecf06faa0c48e82f1e9e1", # 2.0.15
importpath = "github.com/containers/conmon",
build_file_generation = "off",
Copy link
Member

Choose a reason for hiding this comment

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

If we're turning off build file generation, what's the point of having this be a go_repository rule instead of a git_repository rule?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The git_repository rule seems to cause the patched-in symlink to no longer be a symlink for some reason, and I can't figure out why. In any case, I'll change the go_repository_alt back into a go_repository.

Copy link
Member

Choose a reason for hiding this comment

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

Okay; we might want to do some digging on that at some point. If you don't want to do it now, can you file a low-priority issue?

This involves:
- Separating out the conmon build (following the upstream change)
and giving it its own bazel build file patch.
- Removing the conmon tests since they require additional build
dependencies that we don't need.
- Regenerating the CRI-O build file patch.
- Updating the CRI-O upstream config file.
- Updating deps.bzl.
Copy link
Member

@celskeggs celskeggs left a comment

Choose a reason for hiding this comment

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

One nitpick and some issues to file for later. Very nice!

+ "src/*.c",
+ "src/*.h",
+ ]),
+ # TODO: get these dynamically, not statically
Copy link
Member

Choose a reason for hiding this comment

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

I know these two TODOS were already here, but while we're looking at it, can we make sure we file issues to get back to them?

+ name = "conmon",
+ srcs = glob([
+ "src/*.c",
+ "src/*.h",
Copy link
Member

Choose a reason for hiding this comment

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

I think you're mixing tabs and spaces here.

@celskeggs celskeggs assigned krawthekrow and unassigned celskeggs May 7, 2020
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.

2 participants