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.6.2 #1467

Merged
merged 1 commit into from
Feb 26, 2024
Merged

Conversation

adilGhaffarDev
Copy link
Member

@adilGhaffarDev adilGhaffarDev commented Feb 22, 2024

as title says
This PR also uses k8s.io/utils/ptr instead of k8s.io/utils/pointer

@metal3-io-bot metal3-io-bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Feb 22, 2024
@adilGhaffarDev
Copy link
Member Author

/test-ubuntu-integration-main
/test-centos-e2e-integration-main

Copy link
Member

@lentzi90 lentzi90 left a comment

Choose a reason for hiding this comment

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

/approve

@metal3-io-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: lentzi90

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

@metal3-io-bot metal3-io-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 23, 2024
@kashifest
Copy link
Member

/retitle 🌱 Bump CAPI to v1.6.2

@metal3-io-bot metal3-io-bot changed the title 🌱 Bumping CAPI to v1.6.2 and syncing go modues with CAPI 🌱 Bump CAPI to v1.6.2 Feb 26, 2024
@kashifest
Copy link
Member

/lgtm

@metal3-io-bot metal3-io-bot added the lgtm Indicates that a PR is ready to be merged. label Feb 26, 2024
@metal3-io-bot metal3-io-bot merged commit 435b6fb into metal3-io:main Feb 26, 2024
34 checks passed
@metal3-io-bot metal3-io-bot deleted the bump-capi-v1.6.2/adil branch February 26, 2024 19:56
@kashifest
Copy link
Member

/cherry-pick release-1.6

@metal3-io-bot
Copy link
Contributor

@kashifest: #1467 failed to apply on top of branch "release-1.6":

Applying: Bumping CAPI to v1.6.2 and syncing go modues with CAPI
Using index info to reconstruct a base tree...
M	README.md
M	api/go.mod
M	api/go.sum
M	baremetal/metal3cluster_manager_test.go
M	baremetal/metal3data_manager.go
M	baremetal/metal3data_manager_test.go
M	baremetal/metal3machine_manager.go
M	baremetal/metal3machine_manager_test.go
M	baremetal/metal3machinetemplate_manager_test.go
M	baremetal/utils_test.go
M	controllers/metal3cluster_controller.go
M	controllers/metal3machine_controller_integration_test.go
M	controllers/metal3machine_controller_test.go
M	controllers/metal3machinetemplate_controller_test.go
M	go.mod
M	go.sum
M	test/e2e/common.go
M	test/e2e/live_iso_test.go
M	test/e2e/remediation.go
M	test/e2e/upgrade_clusterctl_test.go
M	test/go.mod
M	test/go.sum
Falling back to patching base and 3-way merge...
Auto-merging test/go.sum
CONFLICT (content): Merge conflict in test/go.sum
Auto-merging test/go.mod
CONFLICT (content): Merge conflict in test/go.mod
Auto-merging test/e2e/upgrade_clusterctl_test.go
Auto-merging test/e2e/remediation.go
CONFLICT (content): Merge conflict in test/e2e/remediation.go
Auto-merging test/e2e/live_iso_test.go
Auto-merging test/e2e/common.go
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
Auto-merging controllers/metal3machinetemplate_controller_test.go
Auto-merging controllers/metal3machine_controller_test.go
Auto-merging controllers/metal3machine_controller_integration_test.go
CONFLICT (content): Merge conflict in controllers/metal3machine_controller_integration_test.go
Auto-merging controllers/metal3cluster_controller.go
Auto-merging baremetal/utils_test.go
CONFLICT (content): Merge conflict in baremetal/utils_test.go
Auto-merging baremetal/metal3machinetemplate_manager_test.go
Auto-merging baremetal/metal3machine_manager_test.go
Auto-merging baremetal/metal3machine_manager.go
Auto-merging baremetal/metal3data_manager_test.go
Auto-merging baremetal/metal3data_manager.go
Auto-merging baremetal/metal3cluster_manager_test.go
Auto-merging api/go.sum
CONFLICT (content): Merge conflict in api/go.sum
Auto-merging api/go.mod
CONFLICT (content): Merge conflict in api/go.mod
Auto-merging README.md
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Bumping CAPI to v1.6.2 and syncing go modues with CAPI
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-1.6

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.

@kashifest
Copy link
Member

@kashifest: #1467 failed to apply on top of branch "release-1.6":

@adilGhaffarDev we need a manual cherry pick

@adilGhaffarDev
Copy link
Member Author

@adilGhaffarDev we need a manual cherry pick

Yes, I thought so. I will do it

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. lgtm Indicates that a PR is ready to be merged. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants