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

Add a flag to conditionally load additional kubernetes images when source type != pkg #207

Merged
merged 1 commit into from
Apr 16, 2020

Conversation

detiber
Copy link
Member

@detiber detiber commented Apr 16, 2020

Fixes #206

@codenrhoden I wasn't entirely sure which behavior would be the most desired by default, so I defaulted to assuming support for the upstream k8s sources, which do not include pause, etcd, and coredns images by default.

This would require any current consumers that expect the old behavior to override the packer variable kubernetes_load_additional_imgs to retain that behavior.

Happy to switch up the logic if that makes more sense, though.

@k8s-ci-robot k8s-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Apr 16, 2020
@codenrhoden
Copy link
Contributor

@detiber I'm fine with the default as you have it. I'll just call it out in the release notes on the next tag.
Love your branch name 🤣

Changes LGTM. I notice you called it out as a WIP, but I'm guessing that was just because of your question re: default behavior.

/lgtm
/approve

I'd say just remove the WIP prefix when you are ready!

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: codenrhoden, detiber

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 Apr 16, 2020
@detiber
Copy link
Member Author

detiber commented Apr 16, 2020

@codenrhoden I still need to finish testing the changes, should be able to finish that up shortly.

@detiber detiber changed the title [WIP] Add a flag to conditionally load additional kubernetes images when source type != pkg Add a flag to conditionally load additional kubernetes images when source type != pkg Apr 16, 2020
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Apr 16, 2020
@detiber
Copy link
Member Author

detiber commented Apr 16, 2020

Ok, just wrapped up testing and it appears to be working as intended :)

@k8s-ci-robot k8s-ci-robot merged commit b80e13a into kubernetes-sigs:master Apr 16, 2020
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/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[capi] Building images using the k8s ci artifacts fails
3 participants