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

Bump aws eksa packages to latest #3106

Merged
merged 1 commit into from
Apr 23, 2024
Merged

Conversation

pokearu
Copy link
Member

@pokearu pokearu commented Apr 22, 2024

Description of changes:
Bumping aws/eks-anywhere-packages to latest tag v0.4.2

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

@pokearu
Copy link
Member Author

pokearu commented Apr 22, 2024

/cherry-pick release-0.19

@eks-distro-bot eks-distro-bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Apr 22, 2024
@eks-distro-pr-bot
Copy link
Contributor

@pokearu: once the present PR merges, I will cherry-pick it on top of release-0.19 in a new PR and assign it to you.

In response to this:

/cherry-pick 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.

@abhay-krishna
Copy link
Member

/lgtm
/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

@pokearu pokearu merged commit 237fd96 into aws:main Apr 23, 2024
3 of 4 checks passed
@eks-distro-pr-bot
Copy link
Contributor

@pokearu: #3106 failed to apply on top of branch "release-0.19":

Applying: Bump aws eksa packages to latest
Using index info to reconstruct a base tree...
M	projects/aws/eks-anywhere-packages/ATTRIBUTION.txt
M	projects/aws/eks-anywhere-packages/CHECKSUMS
M	projects/aws/eks-anywhere-packages/CREDENTIALPROVIDER_ATTRIBUTION.txt
M	projects/aws/eks-anywhere-packages/ECRTOKENREFRESHER_ATTRIBUTION.txt
M	projects/aws/eks-anywhere-packages/GIT_TAG
M	projects/aws/eks-anywhere-packages/README.md
Falling back to patching base and 3-way merge...
Auto-merging projects/aws/eks-anywhere-packages/README.md
CONFLICT (content): Merge conflict in projects/aws/eks-anywhere-packages/README.md
Auto-merging projects/aws/eks-anywhere-packages/GIT_TAG
CONFLICT (content): Merge conflict in projects/aws/eks-anywhere-packages/GIT_TAG
Auto-merging projects/aws/eks-anywhere-packages/ECRTOKENREFRESHER_ATTRIBUTION.txt
CONFLICT (content): Merge conflict in projects/aws/eks-anywhere-packages/ECRTOKENREFRESHER_ATTRIBUTION.txt
Auto-merging projects/aws/eks-anywhere-packages/CREDENTIALPROVIDER_ATTRIBUTION.txt
CONFLICT (content): Merge conflict in projects/aws/eks-anywhere-packages/CREDENTIALPROVIDER_ATTRIBUTION.txt
Auto-merging projects/aws/eks-anywhere-packages/CHECKSUMS
CONFLICT (content): Merge conflict in projects/aws/eks-anywhere-packages/CHECKSUMS
Auto-merging projects/aws/eks-anywhere-packages/ATTRIBUTION.txt
CONFLICT (content): Merge conflict in projects/aws/eks-anywhere-packages/ATTRIBUTION.txt
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Bump aws eksa packages to latest
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:

/cherry-pick 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.

pokearu added a commit to pokearu/eks-anywhere-build-tooling that referenced this pull request Apr 29, 2024
eks-distro-bot pushed a commit that referenced this pull request Apr 29, 2024
* Bump GO version for eks-anywhere-packages to 1.20 (#3053)

* Bump aws/eks-anywhere-packages to latest upstream release (#3057)

* Bump aws eksa packages to latest (#3106)

---------

Co-authored-by: ahreehong <46465244+ahreehong@users.noreply.github.com>
Co-authored-by: Abhay Krishna <arnchlm@amazon.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved lgtm 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.

None yet

4 participants