-
Notifications
You must be signed in to change notification settings - Fork 1.8k
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
Fix merge conflict and apply SME feedback #26070
Conversation
The preview will be available shortly at: |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM! I don't think I saw anything to prevent merging; fixes can be done in a follow-up
6d61b69
to
195ef0d
Compare
/cherrypick enterprise-4.6 |
@bobfuru: #26070 failed to apply on top of branch "enterprise-4.6":
In response to this:
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. |
Fix for 4.6 CP merge conflict in #26093 |
This PR incorporates feedback from CoreOS SMEs, compiled from separate PRs:
coreos.live.rootfs_url
.This work also relates to #25709. It's likely that 25709 will be merged first, hopefully without resulting merge conflicts. 🤞