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 CAPI to v1.5.3 #4627

Merged
merged 1 commit into from
Nov 20, 2023
Merged

Bump CAPI to v1.5.3 #4627

merged 1 commit into from
Nov 20, 2023

Conversation

Ankitasw
Copy link
Member

@Ankitasw Ankitasw commented Nov 10, 2023

What type of PR is this?
/kind support

What this PR does / why we need it:
This PR bumps CAPI to v1.5.3

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #

Special notes for your reviewer:

Checklist:

  • squashed commits
  • includes documentation
  • adds unit tests
  • adds or updates e2e tests

Release note:

Bump CAPI to v1.5.3

@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. kind/support Categorizes issue or PR as a support question. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-priority labels Nov 10, 2023
@k8s-ci-robot k8s-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Nov 10, 2023
@Ankitasw
Copy link
Member Author

/test pull-cluster-api-provider-aws-e2e-blocking

@Ankitasw
Copy link
Member Author

/test pull-cluster-api-provider-aws-e2e-blocking

@Ankitasw
Copy link
Member Author

/test pull-cluster-api-provider-aws-e2e

@Ankitasw Ankitasw requested a review from AndiDog November 14, 2023 07:51
@AndiDog
Copy link
Contributor

AndiDog commented Nov 14, 2023

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 14, 2023
@Ankitasw
Copy link
Member Author

/test pull-cluster-api-provider-aws-e2e-eks

@Ankitasw
Copy link
Member Author

/retest

@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 20, 2023
@Ankitasw
Copy link
Member Author

/test pull-cluster-api-provider-aws-e2e

@richardcase
Copy link
Member

/test pull-cluster-api-provider-aws-e2e-eks

@Ankitasw
Copy link
Member Author

PR needs review.

@AndiDog
Copy link
Contributor

AndiDog commented Nov 20, 2023

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 20, 2023
@Ankitasw
Copy link
Member Author

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Ankitasw

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 20, 2023
@k8s-ci-robot k8s-ci-robot merged commit 49f9984 into kubernetes-sigs:main Nov 20, 2023
7 checks passed
@Ankitasw
Copy link
Member Author

/cherry-pick release-2.2

@k8s-infra-cherrypick-robot

@Ankitasw: #4627 failed to apply on top of branch "release-2.2":

Applying: Bump CAPI to v1.5.3
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
M	test/e2e/data/e2e_conf.yaml
M	test/e2e/data/e2e_eks_conf.yaml
M	versions.mk
Falling back to patching base and 3-way merge...
Auto-merging versions.mk
CONFLICT (content): Merge conflict in versions.mk
Auto-merging test/e2e/data/e2e_eks_conf.yaml
CONFLICT (content): Merge conflict in test/e2e/data/e2e_eks_conf.yaml
Auto-merging test/e2e/data/e2e_conf.yaml
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
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 CAPI to v1.5.3
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-2.2

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.

@Ankitasw
Copy link
Member Author

/cherry-pick release-2.2

@k8s-infra-cherrypick-robot

@Ankitasw: #4627 failed to apply on top of branch "release-2.2":

Applying: Bump CAPI to v1.5.3
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
M	test/e2e/data/e2e_conf.yaml
M	test/e2e/data/e2e_eks_conf.yaml
Falling back to patching base and 3-way merge...
Auto-merging test/e2e/data/e2e_eks_conf.yaml
Auto-merging test/e2e/data/e2e_conf.yaml
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
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 CAPI to v1.5.3
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-2.2

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.

@Ankitasw Ankitasw deleted the bump-capi branch November 21, 2023 12:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/support Categorizes issue or PR as a support question. lgtm "Looks good to me", indicates that a PR is ready to be merged. needs-priority release-note Denotes a PR that will be considered when it comes time to generate release notes. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants