Skip to content

deps: update runc to 1.1.1#109091

Closed
kolyshkin wants to merge 1 commit intokubernetes:masterfrom
kolyshkin:runc-1.1.1
Closed

deps: update runc to 1.1.1#109091
kolyshkin wants to merge 1 commit intokubernetes:masterfrom
kolyshkin:runc-1.1.1

Conversation

@kolyshkin
Copy link
Copy Markdown
Contributor

@kolyshkin kolyshkin commented Mar 29, 2022

What type of PR is this?

/kind cleanup
/priority important-soon
/sig node
/cc @odinuge @dims @mrunalp @liggitt @ehashman

What this PR does / why we need it

This updates vendored runc/libcontainer to 1.1.1,
and google/cadvisor to v0.44.0 (which updates runc to 1.1).

Changes in vendor are generated by (roughly):

        ./hack/pin-dependency.sh github.com/google/cadvisor v0.44.0
        ./hack/pin-dependency.sh github.com/opencontainers/runc v1.1.1
        ./hack/update-vendor.sh
        ./hack/lint-dependencies.sh # And follow all its recommendations.
        ./hack/update-vendor.sh
        ./hack/update-internal-modules.sh
        ./hack/lint-dependencies.sh # Re-check everything again.

The changes (mostly in pkg/kubelet/cm) are there to adopt changed
runc 1.1 API, and simplify things a bit. In particular:

  1. simplify cgroup manager instantiation, using a new, easier way of
    libcontainers/cgroups/manager.New;

  2. replace libcontainerAdapter with a boolean variable (all it did
    was passing on whether systemd manager should be used);

  3. trivial change due to removed cgroupfs.HugePageSizes and added
    cgroups.HugePageSizes();

  4. do not calculate cgroup paths in update / destroy, since libcontainer
    cgroup managers now calculate the paths upon creation (previously,
    they were doing that only in Apply, so using e.g. Set or Destroy right
    after creation was impossible without specifying paths).

    We currently still calculate cgroup paths in Exists -- this is to be
    addressed separately.

Which issue(s) this PR fixes:

Closes: #109029

Special notes for your reviewer:

This is a carry of #109029, which is a carry of #107149. The main change is using runc 1.1.1,
which addresses #109029 (comment)

Does this PR introduce a user-facing change?

Update runc to 1.1.1
Update cadvisor to 0.44.0

@kolyshkin
deps: update runc to 1.1.1
9d233d4 
    This updates vendored runc/libcontainer to 1.1.1,
    and google/cadvisor to v0.44.0 (which updates runc to 1.1).

    Changes in vendor are generated by (roughly):

            ./hack/pin-dependency.sh github.com/google/cadvisor v0.44.0
            ./hack/pin-dependency.sh github.com/opencontainers/runc v1.1.1
            ./hack/update-vendor.sh
            ./hack/lint-dependencies.sh # And follow all its recommendations.
            ./hack/update-vendor.sh
            ./hack/update-internal-modules.sh
            ./hack/lint-dependencies.sh # Re-check everything again.

    The changes (mostly in pkg/kubelet/cm) are there to adopt changed
    runc 1.1 API, and simplify things a bit. In particular:

    1. simplify cgroup manager instantiation, using a new, easier way of
       libcontainers/cgroups/manager.New;

    2. replace libcontainerAdapter with a boolean variable (all it did
       was passing on whether systemd manager should be used);

    3. trivial change due to removed cgroupfs.HugePageSizes and added
        cgroups.HugePageSizes();

    4. do not calculate cgroup paths in update / destroy, since libcontainer
       cgroup managers now calculate the paths upon creation (previously,
       they were doing that only in Apply, so using e.g. Set or Destroy right
       after creation was impossible without specifying paths).

    We currently still calculate cgroup paths in Exists -- this is to be
    addressed separately.

    Signed-off-by: Kir Kolyshkin <[email protected]>

Signed-off-by: Kir Kolyshkin <[email protected]>
@k8s-ci-robot k8s-ci-robot added the release-note Denotes a PR that will be considered when it comes time to generate release notes. label Mar 29, 2022
@k8s-ci-robot k8s-ci-robot added the kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. label Mar 29, 2022
@k8s-ci-robot k8s-ci-robot requested review from mrunalp and odinuge March 29, 2022 04:21
@k8s-ci-robot k8s-ci-robot added priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. sig/node Categorizes an issue or PR as relevant to SIG Node. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Mar 29, 2022
@k8s-ci-robot
Copy link
Copy Markdown
Contributor

k8s-ci-robot commented Mar 29, 2022

@kolyshkin: This issue is currently awaiting triage.

If a SIG or subproject determines this is a relevant issue, they will accept it by applying the triage/accepted label and provide further guidance.

The triage/accepted label can be added by org members by writing /triage accepted in a comment.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@k8s-ci-robot k8s-ci-robot added the needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. label Mar 29, 2022
@k8s-ci-robot
Copy link
Copy Markdown
Contributor

k8s-ci-robot commented Mar 29, 2022

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: kolyshkin
To complete the pull request process, please assign thockin after the PR has been reviewed.
You can assign the PR to them by writing /assign @thockin in a comment when ready.

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

Details 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

@kolyshkin kolyshkin mentioned this pull request Mar 29, 2022
Merged
@k8s-ci-robot k8s-ci-robot added area/dependency Issues or PRs related to dependency changes area/kubectl area/kubelet sig/cli Categorizes an issue or PR as relevant to SIG CLI. labels Mar 29, 2022
@k8s-ci-robot
Copy link
Copy Markdown
Contributor

k8s-ci-robot commented Mar 29, 2022

@kolyshkin: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
pull-kubernetes-e2e-kind-ipv6 9d233d4 link true /test pull-kubernetes-e2e-kind-ipv6
pull-kubernetes-e2e-kind 9d233d4 link true /test pull-kubernetes-e2e-kind

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@dims
Copy link
Copy Markdown
Member

dims commented Mar 29, 2022

@kolyshkin #109029 already landed right? we need a rebase?

@k8s-ci-robot
Copy link
Copy Markdown
Contributor

k8s-ci-robot commented Mar 29, 2022

@kolyshkin: PR needs rebase.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 29, 2022
@dims
Copy link
Copy Markdown
Member

dims commented Mar 29, 2022

@kolyshkin #109029 already landed right? we need a rebase?

2 similar comments
@dims
Copy link
Copy Markdown
Member

dims commented Mar 29, 2022

@kolyshkin #109029 already landed right? we need a rebase?

@dims
Copy link
Copy Markdown
Member

dims commented Mar 29, 2022

@kolyshkin #109029 already landed right? we need a rebase?

@liggitt liggitt self-assigned this Mar 29, 2022
@liggitt
Copy link
Copy Markdown
Member

liggitt commented Mar 29, 2022

thanks for the quick turnaround on the panic cleanup, tag me once the rebase is done and we'll get this in (it might be easier to just start from latest master and bump to 1.1.1)

@kolyshkin
Copy link
Copy Markdown
Contributor Author

kolyshkin commented Mar 29, 2022

@kolyshkin #109029 already landed right? we need a rebase?

Ah! Replacing this one with #109104

@kolyshkin kolyshkin closed this Mar 29, 2022
@kolyshkin kolyshkin deleted the runc-1.1.1 branch March 29, 2022 14:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@dims dims Awaiting requested review from dims

@ehashman ehashman Awaiting requested review from ehashman

@liggitt liggitt Awaiting requested review from liggitt

@mrunalp mrunalp Awaiting requested review from mrunalp

@odinuge odinuge Awaiting requested review from odinuge

Assignees

@liggitt liggitt

Labels

area/dependency Issues or PRs related to dependency changes area/kubectl area/kubelet cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/cli Categorizes an issue or PR as relevant to SIG CLI. sig/node Categorizes an issue or PR as relevant to SIG Node. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@kolyshkin @k8s-ci-robot @dims @liggitt