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 patch to update Ubuntu 22.04 ISO URLs to latest stable release #3114

Merged
merged 1 commit into from
Apr 24, 2024

Conversation

abhay-krishna
Copy link
Member

@abhay-krishna abhay-krishna commented Apr 24, 2024

Adding a patch for kubernetes-sigs/image-builder#1438. This will be removed when we move to image-builder v0.1.26

/cherrypick release-0.19

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.

@eks-distro-bot eks-distro-bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Apr 24, 2024
@abhay-krishna
Copy link
Member Author

/approve

@eks-distro-bot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: abhay-krishna

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

@abhay-krishna abhay-krishna merged commit cf832fe into aws:main Apr 24, 2024
7 of 8 checks passed
@abhay-krishna
Copy link
Member Author

/cherrypick release-0.19

@eks-distro-pr-bot
Copy link
Contributor

@abhay-krishna: #3114 failed to apply on top of branch "release-0.19":

Applying: Add patch to update Ubuntu 22.04 ISO URLs to latest stable release
.git/rebase-apply/patch:253: trailing whitespace.
-- 
.git/rebase-apply/patch:255: new blank line at EOF.
+
warning: 2 lines add whitespace errors.
Using index info to reconstruct a base tree...
M	projects/kubernetes-sigs/image-builder/patches/0001-OVA-improvements.patch
M	projects/kubernetes-sigs/image-builder/patches/0002-EKS-D-support-and-changes.patch
M	projects/kubernetes-sigs/image-builder/patches/0003-Snow-AMI-support.patch
M	projects/kubernetes-sigs/image-builder/patches/0004-Ubuntu-22-support-and-improvements.patch
M	projects/kubernetes-sigs/image-builder/patches/0005-RHEL-support-and-improvements.patch
M	projects/kubernetes-sigs/image-builder/patches/0006-Nutanix-RHEL-support-for-AWS-image-builder.patch
M	projects/kubernetes-sigs/image-builder/patches/0007-adds-retries-and-timeout-to-packer-image-builder.patch
M	projects/kubernetes-sigs/image-builder/patches/0008-Disable-UDP-offload-service-for-Redhat-and-Ubuntu.patch
M	projects/kubernetes-sigs/image-builder/patches/0009-Default-Flatcar-version-to-avoid-pulling-from-intern.patch
A	projects/kubernetes-sigs/image-builder/patches/0010-Revert-updates-to-Ubuntu-2004-ISO-URLs.patch
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): projects/kubernetes-sigs/image-builder/patches/0010-Revert-updates-to-Ubuntu-2004-ISO-URLs.patch deleted in HEAD and modified in Add patch to update Ubuntu 22.04 ISO URLs to latest stable release. Version Add patch to update Ubuntu 22.04 ISO URLs to latest stable release of projects/kubernetes-sigs/image-builder/patches/0010-Revert-updates-to-Ubuntu-2004-ISO-URLs.patch left in tree.
Auto-merging projects/kubernetes-sigs/image-builder/patches/0009-Default-Flatcar-version-to-avoid-pulling-from-intern.patch
CONFLICT (content): Merge conflict in projects/kubernetes-sigs/image-builder/patches/0009-Default-Flatcar-version-to-avoid-pulling-from-intern.patch
Auto-merging projects/kubernetes-sigs/image-builder/patches/0008-Disable-UDP-offload-service-for-Redhat-and-Ubuntu.patch
CONFLICT (content): Merge conflict in projects/kubernetes-sigs/image-builder/patches/0008-Disable-UDP-offload-service-for-Redhat-and-Ubuntu.patch
Auto-merging projects/kubernetes-sigs/image-builder/patches/0007-adds-retries-and-timeout-to-packer-image-builder.patch
CONFLICT (content): Merge conflict in projects/kubernetes-sigs/image-builder/patches/0007-adds-retries-and-timeout-to-packer-image-builder.patch
Auto-merging projects/kubernetes-sigs/image-builder/patches/0006-Nutanix-RHEL-support-for-AWS-image-builder.patch
CONFLICT (content): Merge conflict in projects/kubernetes-sigs/image-builder/patches/0006-Nutanix-RHEL-support-for-AWS-image-builder.patch
Auto-merging projects/kubernetes-sigs/image-builder/patches/0005-RHEL-support-and-improvements.patch
CONFLICT (content): Merge conflict in projects/kubernetes-sigs/image-builder/patches/0005-RHEL-support-and-improvements.patch
Auto-merging projects/kubernetes-sigs/image-builder/patches/0004-Ubuntu-22-support-and-improvements.patch
CONFLICT (content): Merge conflict in projects/kubernetes-sigs/image-builder/patches/0004-Ubuntu-22-support-and-improvements.patch
Auto-merging projects/kubernetes-sigs/image-builder/patches/0003-Snow-AMI-support.patch
Auto-merging projects/kubernetes-sigs/image-builder/patches/0002-EKS-D-support-and-changes.patch
Auto-merging projects/kubernetes-sigs/image-builder/patches/0001-OVA-improvements.patch
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Add patch to update Ubuntu 22.04 ISO URLs to latest stable release
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick release-0.19

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved lgtm size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants