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

Update to some newer dependencies including docker #2790

Merged
merged 1 commit into from
Jan 27, 2021

Conversation

dims
Copy link
Collaborator

@dims dims commented Jan 26, 2021

Essentially updated docker and the rest of the changes just flowed from that ...

Signed-off-by: Davanum Srinivas davanum@gmail.com

@google-cla google-cla bot added the cla: yes label Jan 26, 2021
go.mod Outdated Show resolved Hide resolved
go.mod Show resolved Hide resolved
go.mod Outdated Show resolved Hide resolved
go.mod Show resolved Hide resolved
go.mod Outdated Show resolved Hide resolved
go.mod Outdated Show resolved Hide resolved
go.mod Outdated Show resolved Hide resolved
go.mod Show resolved Hide resolved
cmd/go.mod Outdated Show resolved Hide resolved
@dims dims changed the title Update to some newer dependencies including docker [WIP] Update to some newer dependencies including docker Jan 26, 2021
@dims dims force-pushed the update-to-latest-sha/tag branch 3 times, most recently from 8743839 to c0e6c94 Compare January 26, 2021 20:12
@dims dims changed the title [WIP] Update to some newer dependencies including docker Update to some newer dependencies including docker Jan 26, 2021
@dims dims changed the title Update to some newer dependencies including docker [WIP] Update to some newer dependencies including docker Jan 26, 2021
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
@dims dims changed the title [WIP] Update to some newer dependencies including docker Update to some newer dependencies including docker Jan 26, 2021
github.com/morikuni/aec v1.0.0 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.0.1 // indirect
github.com/opencontainers/runc v1.0.0-rc92
github.com/opencontainers/runtime-spec v1.0.3-0.20200728170252-4d89ac9fbff6
github.com/opencontainers/runc v1.0.0-rc92.0.20210122051217-c69ae759fbf5
Copy link
Collaborator

Choose a reason for hiding this comment

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

a little curious why this changed, shouldn't this stay on rc-92 instead of opencontainers/runc@c69ae75 ?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

we need to move to newer runc as there's a older runc uses the older sys/mountinfo (and moving to newer docker we need to move to newer sys/mountinfo). there's a type mismatch (FSType vs FsType i mountinfo).

there's a lot of weird dance we have to do to get runc, containerd, cadvisor, k8s all in line. this is one of those.

we are also trying to get runc rc-93 out the door, so going to a SHA now will help make sure nothing is broken as well.

Copy link
Collaborator

@bobbypage bobbypage Jan 27, 2021

Choose a reason for hiding this comment

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

got it, so we'll need to ensure to update to rc-93 (when it will be released) before cutting next cAdvisor release and vendoring in k/k right?

also thinking i hope it will mean rc-93 will be released in time for next k/k 1.21 release :)

go.mod Show resolved Hide resolved
github.com/opencontainers/runc v1.0.0-rc92
github.com/opencontainers/runtime-spec v1.0.3-0.20200728170252-4d89ac9fbff6
github.com/opencontainers/runc v1.0.0-rc92.0.20210122051217-c69ae759fbf5
github.com/opencontainers/runtime-spec v1.0.3-0.20200929063507-e6143ca7d51d
Copy link
Collaborator

@bobbypage bobbypage Jan 26, 2021

Choose a reason for hiding this comment

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

curious why runtime-spec needed to change? e.g. in containerd pr it's still on 4d89ac9fbff6 after your PR containerd/containerd#4926

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

docker switched ahead of containerd ... don't ask :)

Copy link
Collaborator

@bobbypage bobbypage Jan 27, 2021

Choose a reason for hiding this comment

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

ack :) just want to ensure it won't cause issues when vendoring back into k/k due to containerd and cadvisor pointing to different sha's for runtime-spec...

@bobbypage bobbypage self-assigned this Jan 26, 2021
@Creatone
Copy link
Collaborator

Resctrl part LGTM

@bobbypage
Copy link
Collaborator

bobbypage commented Jan 27, 2021

Chatted with @dims offline as well.

Note: This PR is updating runc from github.com/opencontainers/runc v1.0.0-rc92 to github.com/opencontainers/runc v1.0.0-rc92.0.20210122051217-c69ae759fbf5, i.e. opencontainers/runc@c69ae75

We'll need to ensure we update to tagged runc rc93 when it will be cut: xref: opencontainers/runc#2659 prior to cutting cAdvisor release

@bobbypage
Copy link
Collaborator

LGTM, thanks @dims!

@bobbypage bobbypage merged commit 730e7df into google:master Jan 27, 2021
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.

3 participants