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

[release/1.6] Fix snapshotter root path when not under containerd root #10127

Merged
merged 4 commits into from May 7, 2024
Merged

[release/1.6] Fix snapshotter root path when not under containerd root #10127

merged 4 commits into from May 7, 2024

Commits on Apr 24, 2024

  1. Add platform config to proxy plugins 

    Signed-off-by: Derek McGowan <derek@mcg.dev>
(cherry picked from commit 4e56939)
Signed-off-by: Kern Walster <walster@amazon.com>
    @dmcgowan @Kern--
    dmcgowan authored and Kern-- committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    83cf026 View commit details
    Browse the repository at this point in the history

  2. Add exports to proxy plugin config 

    Allows external plugins to define exports.

Signed-off-by: Derek McGowan <derek@mcg.dev>
(cherry picked from commit e4639ad)
Signed-off-by: Kern Walster <walster@amazon.com>
    @dmcgowan @Kern--
    dmcgowan authored and Kern-- committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    cd9b746 View commit details
    Browse the repository at this point in the history

  3. Snapshotters: Export the root path 

    Some of the snapshotters that allow you to change their root location
were already doing this, this just makes all of them follow the same
pattern.

Signed-off-by: Danny Canter <danny@dcantah.dev>
(cherry picked from commit 32caaee)
Signed-off-by: Kern Walster <walster@amazon.com>
    @dcantah @Kern--
    dcantah authored and Kern-- committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    68db74d View commit details
    Browse the repository at this point in the history

  4. CRI: "Fix" imageFSPath behavior 

    Currently it didn't take into account that certain snapshots can explicitly
have their root directories placed at a different location. This changes
it to use the RootPath method of the snapshotter if it implements it.

Without this change, cadvisor is not able to get filesystem usage
information, which prevents the kubelet from doing image garbage
collection and enforcing ephemeral storage limits.

Signed-off-by: Danny Canter <danny@dcantah.dev>
(cherry picked from commit 6aeec45)
Signed-off-by: Kern Walster <walster@amazon.com>
    @dcantah @Kern--
    dcantah authored and Kern-- committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    f3e8b2c View commit details
    Browse the repository at this point in the history