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/etcdadm-bootstrap-provider to latest release #3068

Conversation

eks-distro-pr-bot
Copy link
Contributor

This PR bumps aws/etcdadm-bootstrap-provider to the latest Git revision.

Compare changes
Release notes

/hold
/area dependencies

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
Copy link
Collaborator

Hi @eks-distro-pr-bot. Thanks for your PR.

I'm waiting for a aws member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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.

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

d8660091 commented Apr 9, 2024

/ok-to-test

@d8660091
Copy link
Member

d8660091 commented Apr 9, 2024

/cherry-pick release-0.19

@eks-distro-pr-bot
Copy link
Contributor Author

@d8660091: 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.

@d8660091
Copy link
Member

d8660091 commented Apr 9, 2024

/lgtm
/approve
/unhold

@eks-distro-bot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: d8660091

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

@eks-distro-bot eks-distro-bot merged commit b7c90de into aws:main Apr 9, 2024
4 checks passed
@eks-distro-pr-bot
Copy link
Contributor Author

@d8660091: #3068 failed to apply on top of branch "release-0.19":

Applying: Bump aws/etcdadm-bootstrap-provider to latest release
Using index info to reconstruct a base tree...
M	UPSTREAM_PROJECTS.yaml
M	projects/aws/etcdadm-bootstrap-provider/ATTRIBUTION.txt
M	projects/aws/etcdadm-bootstrap-provider/CHECKSUMS
M	projects/aws/etcdadm-bootstrap-provider/GIT_TAG
M	projects/aws/etcdadm-bootstrap-provider/README.md
Falling back to patching base and 3-way merge...
Auto-merging projects/aws/etcdadm-bootstrap-provider/README.md
CONFLICT (content): Merge conflict in projects/aws/etcdadm-bootstrap-provider/README.md
Auto-merging projects/aws/etcdadm-bootstrap-provider/GIT_TAG
CONFLICT (content): Merge conflict in projects/aws/etcdadm-bootstrap-provider/GIT_TAG
Auto-merging projects/aws/etcdadm-bootstrap-provider/CHECKSUMS
CONFLICT (content): Merge conflict in projects/aws/etcdadm-bootstrap-provider/CHECKSUMS
Auto-merging projects/aws/etcdadm-bootstrap-provider/ATTRIBUTION.txt
CONFLICT (content): Merge conflict in projects/aws/etcdadm-bootstrap-provider/ATTRIBUTION.txt
Auto-merging UPSTREAM_PROJECTS.yaml
CONFLICT (content): Merge conflict in UPSTREAM_PROJECTS.yaml
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/etcdadm-bootstrap-provider to latest 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:

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved area/dependencies lgtm ok-to-test 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.

3 participants