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

Verify containerd storage separately from docker #16972

Merged
merged 1 commit into from
Aug 11, 2023

Conversation

afbjorklund
Copy link
Collaborator

@afbjorklund afbjorklund commented Jul 31, 2023

Previously docker and containerd were both using docker checks, for preload

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: afbjorklund

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 approved Indicates a PR has been approved by an approver from all required OWNERS files. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jul 31, 2023
armUpload = flag.Bool("arm-upload", false, "Upload the arm64 preload tarballs to GCS")
armPreloadsDir = flag.String("arm-preloads-dir", "artifacts", "Directory containing the arm64 preload tarballs")
dockerStorageDriver = "overlay2"
containerdSnapshotter = "overlayfs"
Copy link
Member

Choose a reason for hiding this comment

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

@afbjorklund do u mind adding details, since when containerd snapshotter is different from docker storage driver?
and how is our current containerd NOT broken with this preload ?

do we need to Bump a new preload version for force all new ones be with this snapshotter?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

There are no changes, i.e. it is the same format. Just that we should not be checking docker, when looking for containerd config. In the future, one of them might change format - without affecting the other one.

Therefore, we should name the preload (without changing the contents):
preloaded-images-k8s-v18-v1.28.0-rc.0-containerd-overlayfs-amd64.tar.lz4

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

        var storageDriver string
        if containerRuntime == "cri-o" {
                storageDriver = "overlay"
        } else {
                storageDriver = "overlay2"
        }

missing a code path for containerd

Copy link
Member

Choose a reason for hiding this comment

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

I see makes sense

Copy link

@adilwahla adilwahla left a comment

Choose a reason for hiding this comment

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

looks good 👍

@medyagh medyagh merged commit 694d9aa into kubernetes:master Aug 11, 2023
23 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants