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 up etcdadm-controller version #2380

Merged
merged 1 commit into from
Aug 11, 2023

Conversation

abhinavmpandey08
Copy link
Member

Description of changes:
Bump up etcdadm-controller version to v1.0.10

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/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Aug 11, 2023
@eks-distro-bot eks-distro-bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Aug 11, 2023
@abhinavmpandey08
Copy link
Member Author

/cherry-pick release-0.16

@eks-distro-pr-bot
Copy link
Contributor

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

In response to this:

/cherry-pick release-0.16

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.

@abhinavmpandey08
Copy link
Member Author

/cherry-pick release-0.17

@eks-distro-pr-bot
Copy link
Contributor

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

In response to this:

/cherry-pick release-0.17

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.

@ahreehong
Copy link
Member

/lgtm
/woof

@eks-distro-bot
Copy link
Collaborator

@ahreehong: dog image

In response to this:

/lgtm
/woof

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.

@abhinavmpandey08
Copy link
Member Author

/approve

@eks-distro-bot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: abhinavmpandey08

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 92ad9f2 into aws:main Aug 11, 2023
@abhinavmpandey08 abhinavmpandey08 deleted the bump-etcd-controller branch August 11, 2023 23:03
@eks-distro-pr-bot
Copy link
Contributor

@abhinavmpandey08: #2380 failed to apply on top of branch "release-0.16":

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

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-pr-bot
Copy link
Contributor

@abhinavmpandey08: new pull request created: #2381

In response to this:

/cherry-pick release-0.17

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

4 participants