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.

Sign up for GitHub

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

Jump to bottom

Update cluster-api to v1.2.5 #953

Merged
merged 1 commit into from
Nov 10, 2022
Merged

Update cluster-api to v1.2.5 #953

merged 1 commit into from
Nov 10, 2022

Conversation

Prajyot-Parab
Copy link
Contributor

@Prajyot-Parab Prajyot-Parab commented Nov 10, 2022 •
edited
Loading

Signed-off-by: Prajyot-Parab [email protected]

What this PR does / why we need it:

  • Update cluster-api to v1.2.5

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 #951

Special notes for your reviewer:

/area provider/ibmcloud

  1. Please confirm that if this PR changes any image versions, then that's the sole change this PR makes.

Release note:

Update cluster-api to v1.2.5

@k8s-ci-robot k8s-ci-robot added area/provider/ibmcloud Issues or PRs related to ibmcloud provider cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Nov 10, 2022
@netlify
Copy link

netlify bot commented Nov 10, 2022 •
edited
Loading

✅ Deploy Preview for kubernetes-sigs-cluster-api-ibmcloud ready!

Name Link
🔨 Latest commit 148a175
🔍 Latest deploy log https://app.netlify.com/sites/kubernetes-sigs-cluster-api-ibmcloud/deploys/636c99b70252ab0008f75e42
😎 Deploy Preview https://deploy-preview-953--kubernetes-sigs-cluster-api-ibmcloud.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site settings.

@k8s-ci-robot k8s-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Nov 10, 2022
@Prajyot-Parab Prajyot-Parab mentioned this pull request Nov 10, 2022
Closed
@Amulyam24
Copy link
Contributor

@Prajyot-Parab, the hack/tools/go.mod should also be updated

@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 10, 2022
@Prajyot-Parab
Copy link
Contributor Author

@Prajyot-Parab, the hack/tools/go.mod should also be updated

Done. Thanks for pointing out.

@Prajyot-Parab
Update cluster-api to v1.2.5
148a175 
Signed-off-by: Prajyot-Parab <[email protected]>
@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 10, 2022
@Prajyot-Parab
Copy link
Contributor Author

/cc @Amulyam24

Amulyam24
Amulyam24 approved these changes Nov 10, 2022
View reviewed changes
Copy link
Contributor

@Amulyam24 Amulyam24 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/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 10, 2022
mkumatag
mkumatag approved these changes Nov 10, 2022
View reviewed changes
Copy link
Member

@mkumatag mkumatag left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Amulyam24, mkumatag, Prajyot-Parab

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 10, 2022
@mkumatag
Copy link
Member

@Prajyot-Parab lets cherrypick this to release-0.3 branch as well.

@k8s-ci-robot k8s-ci-robot merged commit bd2090a into kubernetes-sigs:main Nov 10, 2022
@Prajyot-Parab
Copy link
Contributor Author

/cherry-pick release-0.3

@k8s-infra-cherrypick-robot
Copy link

@Prajyot-Parab: #953 failed to apply on top of branch "release-0.3":

Applying: Update cluster-api to v1.2.5
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
M	hack/tools/go.mod
M	hack/tools/go.sum
M	test/e2e/config/ibmcloud-e2e-powervs.yaml
M	test/e2e/config/ibmcloud-e2e-vpc.yaml
Falling back to patching base and 3-way merge...
Auto-merging test/e2e/config/ibmcloud-e2e-vpc.yaml
CONFLICT (content): Merge conflict in test/e2e/config/ibmcloud-e2e-vpc.yaml
Auto-merging test/e2e/config/ibmcloud-e2e-powervs.yaml
CONFLICT (content): Merge conflict in test/e2e/config/ibmcloud-e2e-powervs.yaml
Auto-merging hack/tools/go.sum
CONFLICT (content): Merge conflict in hack/tools/go.sum
Auto-merging hack/tools/go.mod
CONFLICT (content): Merge conflict in hack/tools/go.mod
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 Update cluster-api to v1.2.5
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.3

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.

@Prajyot-Parab
Copy link
Contributor Author

will do manual cherry-pick

Prajyot-Parab added a commit to Prajyot-Parab/cluster-api-provider-ibmcloud that referenced this pull request Nov 10, 2022
@Prajyot-Parab
Update cluster-api to v1.2.5 (kubernetes-sigs#953)
d9c5bad 
Signed-off-by: Prajyot-Parab <[email protected]>
@Prajyot-Parab Prajyot-Parab mentioned this pull request Nov 10, 2022
Merged
k8s-ci-robot pushed a commit that referenced this pull request Nov 10, 2022
@Prajyot-Parab
Update cluster-api to v1.2.5 (#953) (#954)
e9ce6d8 
Signed-off-by: Prajyot-Parab <[email protected]>

Signed-off-by: Prajyot-Parab <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Amulyam24 Amulyam24 Amulyam24 approved these changes

@mkumatag mkumatag mkumatag approved these changes

@jichenjc jichenjc Awaiting requested review from jichenjc

Assignees

@mkumatag mkumatag

@Amulyam24 Amulyam24

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/provider/ibmcloud Issues or PRs related to ibmcloud provider cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Update capi to 1.2.5
5 participants
@Prajyot-Parab @Amulyam24 @k8s-ci-robot @mkumatag @k8s-infra-cherrypick-robot