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.

Sign up for GitHub

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

Jump to bottom

CRI-API - Add rootfs size to WindowsContainerResources #108894

Merged
merged 1 commit into from
Mar 26, 2022
Merged

CRI-API - Add rootfs size to WindowsContainerResources #108894

merged 1 commit into from
Mar 26, 2022

Conversation

marosset
Copy link
Contributor

Signed-off-by: Mark Rossetti marosset@microsoft.com

What type of PR is this?

/kind feature

What this PR does / why we need it:

This PR adds a new field to WindowsContainerResources CRI-API objects that is used to specify the size of the rootfs/scratch space used for Windows containers.

This value defaults to 20Gb on Windows.
This value can also either be specified per container when starting containers with Docker cli with --storage-opt and can also be set globally by specifying storage-opts in the docker config.

Currently we cannot change this value from the 20Gb default in Kubernetes clusters using containerd as the container runtime.

Which issue(s) this PR fixes:

Fixes #

Special notes for your reviewer:

This PR only adds the new field to the CRI-API field.

We are doing this so that after 1.24 releases containerd can add support for the new field and hopefully have full support in the 1.7 release.

SIG-Windows will create a KEP in the 1.25 release to cover the Kubernetes related changes to expose this new value in the pod spec.

Does this PR introduce a user-facing change?

NONE

Additional documentation e.g., KEPs (Kubernetes Enhancement Proposals), usage docs, etc.:

More information on how the rootfs / scratch space for Windows containers can be found at https://docs.microsoft.com/en-us/virtualization/windowscontainers/manage-containers/container-storage

/sig windows
/sig node
/milestone v1.24

@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. kind/feature Categorizes issue or PR as related to a new feature. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. sig/windows Categorizes an issue or PR as relevant to SIG Windows. labels Mar 22, 2022
@k8s-ci-robot k8s-ci-robot added this to the v1.24 milestone Mar 22, 2022
@k8s-ci-robot k8s-ci-robot added 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. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels Mar 22, 2022
@marosset
Copy link
Contributor Author

/assign @dcantah

@marosset
Copy link
Contributor Author

/retest

@dcantah
Copy link
Member

dcantah commented Mar 23, 2022

cc @kevpar. Does this seem sound to you? This seems like a much needed addition to me

@marosset marosset force-pushed the windows-cri-api-storage-opts branch from b19b497 to 3bb6f76 Compare March 23, 2022 17:23
@marosset
Copy link
Contributor Author

/triage accepted
/priority important-soon

@k8s-ci-robot k8s-ci-robot added triage/accepted Indicates an issue or PR is ready to be actively worked on. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. and removed needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels Mar 23, 2022
@jterry75
Copy link

Only question I have is if this will be per container as the change in the proto is or if its per sandbox. Do we need both?

@marosset
Copy link
Contributor Author

Only question I have is if this will be per container as the change in the proto is or if its per sandbox. Do we need both?

I'd like it to be per-container.
We'll need to do some design work in 1.25 to see how/where to expose this in the pod-specs tho...

@dcantah
Copy link
Member

dcantah commented Mar 23, 2022

I'd prefer to have this be per container if possible.. I think that's the main advantage for this if its on the spec itself

@marosset
Copy link
Contributor Author

/retest

@khatrig khatrig mentioned this pull request Mar 24, 2022
Closed
@matthyx
Copy link
Contributor

matthyx commented Mar 24, 2022

/uncc

@dcantah
Copy link
Member

dcantah commented Mar 24, 2022

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 24, 2022
@dcantah
Copy link
Member

dcantah commented Mar 24, 2022

Curious why the other _bytes fields are int64's, but that seems to be the convention

@marosset
Copy link
Contributor Author

Curious why the other _bytes fields are int64's, but that seems to be the convention

I had the same question...

@marosset
Copy link
Contributor Author

/test pull-kubernetes-integration

@marosset
CRI-API - Add rootfs size to WindowsContainerResources
04d85fb 
Signed-off-by: Mark Rossetti <marosset@microsoft.com>
@marosset marosset force-pushed the windows-cri-api-storage-opts branch from 3bb6f76 to 04d85fb Compare March 25, 2022 16:02
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 25, 2022
@marosset
Copy link
Contributor Author

/test pull-kubernetes-integration

@marosset
Copy link
Contributor Author

/test pull-kubernetes-integration

@dcantah
Copy link
Member

dcantah commented Mar 25, 2022

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 25, 2022
@marosset
Copy link
Contributor Author

/assign @sjenning @murnalp
For node review / approval

@k8s-ci-robot
Copy link
Contributor

@marosset: GitHub didn't allow me to assign the following users: murnalp.

Note that only kubernetes members, repo collaborators and people who have commented on this issue/PR can be assigned. Additionally, issues/PRs can only have 10 assignees at the same time.
For more information please see the contributor guide

In response to this:

/assign @sjenning @murnalp
For node review / approval

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.

@marosset
Copy link
Contributor Author

/assign @mrunalp

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: marosset, mrunalp

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 Mar 25, 2022
@k8s-ci-robot k8s-ci-robot merged commit 08765e1 into kubernetes:master Mar 26, 2022
@marosset marosset deleted the windows-cri-api-storage-opts branch March 28, 2022 17:12
This was referenced Apr 27, 2022
Closed
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mrunalp mrunalp mrunalp approved these changes

Assignees

@mrunalp mrunalp

@sjenning sjenning

@dcantah dcantah

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/kubelet cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/feature Categorizes issue or PR as related to a new feature. lgtm "Looks good to me", indicates that a PR is ready to be merged. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. release-note-none Denotes a PR that doesn't merit a release note. sig/node Categorizes an issue or PR as relevant to SIG Node. sig/windows Categorizes an issue or PR as relevant to SIG Windows. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. triage/accepted Indicates an issue or PR is ready to be actively worked on.
Projects
SIG Node: code and documentation PRs
Archived in project
Milestone
v1.24
Development

Successfully merging this pull request may close these issues.
8 participants
@marosset @dcantah @jterry75 @matthyx @wzshiming @k8s-ci-robot @mrunalp @sjenning