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

Don't download container runtime assets when skipping the installation #15579

Merged

Conversation

hakman
Copy link
Member

@hakman hakman commented Jul 2, 2023

For now, this only works when SkipInstall=true is set at cluster level.

Closes #15558

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Jul 2, 2023
@k8s-ci-robot k8s-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Jul 2, 2023
Comment on lines +1089 to +1094
if err != nil {
return err
}
if dockerAssetUrl != nil && dockerAssetHash != nil {
c.Assets[arch] = append(c.Assets[arch], mirrors.BuildMirroredAsset(dockerAssetUrl, dockerAssetHash))
}
Copy link
Member

Choose a reason for hiding this comment

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

In the future, it might be worth extracting this out to a method, possibly a reciever on assetBuilder. The method would take a func(Cluster, assetBuillder, arch) (url, hash, error)

Copy link
Member Author

Choose a reason for hiding this comment

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

Yep, should be pretty easy.

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 2, 2023
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: johngmyers

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 Jul 2, 2023
@k8s-ci-robot k8s-ci-robot merged commit f6285fa into kubernetes:master Jul 2, 2023
23 checks passed
@hakman hakman deleted the containerd_skipinstall_assets branch July 2, 2023 17:49
k8s-ci-robot added a commit that referenced this pull request Jul 3, 2023
…-upstream-release-1.27

Automated cherry pick of #15579: Don't download containerd assets when skipping the
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. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. 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.

containerd/runc assets are still downloaded if skipInstall is true
3 participants