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.4.5 #3756

Merged
merged 1 commit into from
Jul 31, 2023
Merged

Conversation

mboersma
Copy link
Contributor

What type of PR is this?

/kind cleanup

What this PR does / why we need it:

Updates CAPI references to use the new v1.4.5 release.

Which issue(s) this PR fixes:

Special notes for your reviewer:

  • cherry-pick candidate

TODOs:

  • squashed commits
  • includes documentation
  • adds unit tests

Release note:

Update CAPI to v1.4.5

@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/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jul 25, 2023
@CecileRobertMichon
Copy link
Contributor

/retest

looks like a flake...

@CecileRobertMichon
Copy link
Contributor

@mboersma
Copy link
Contributor Author

@CecileRobertMichon that's just for CAPI v1.5, right, not v1.4.5? I'll make those changes in #3707.

@CecileRobertMichon
Copy link
Contributor

@CecileRobertMichon that's just for CAPI v1.5, right, not v1.4.5? I'll make those changes in #3707.

yep you're totally right, I commented on the wrong PR 🤦‍♀️

@mboersma mboersma force-pushed the capi-one-four-five branch from 3dda780 to 08e6866 Compare July 27, 2023 19:55
@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jul 27, 2023
@mboersma
Copy link
Contributor Author

/hold

I rebased this on #3757, which needs to merge first.

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 27, 2023
@codecov
Copy link

codecov bot commented Jul 27, 2023

Codecov Report

Patch and project coverage have no change.

Comparison is base (0b67082) 54.36% compared to head (35e14e4) 54.36%.

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #3756   +/-   ##
=======================================
  Coverage   54.36%   54.36%           
=======================================
  Files         187      187           
  Lines       18998    18998           
=======================================
  Hits        10328    10328           
  Misses       8113     8113           
  Partials      557      557           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@mboersma mboersma mentioned this pull request Jul 28, 2023
4 tasks
@mboersma mboersma force-pushed the capi-one-four-five branch from 08e6866 to 255fc13 Compare July 28, 2023 15:53
@mboersma mboersma force-pushed the capi-one-four-five branch from 255fc13 to 35e14e4 Compare July 31, 2023 18:03
@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jul 31, 2023
@mboersma
Copy link
Contributor Author

/hold cancel

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 31, 2023
Copy link
Contributor

@CecileRobertMichon CecileRobertMichon left a comment

Choose a reason for hiding this comment

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

/lgtm
/assign @nojnhuh

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 31, 2023
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: add4463a4130d9526287e295f3510fa8177c1660

Copy link
Contributor

@nojnhuh nojnhuh left a comment

Choose a reason for hiding this comment

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

/lgtm
/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: nojnhuh

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 Jul 31, 2023
@k8s-ci-robot k8s-ci-robot merged commit 668a1bc into kubernetes-sigs:main Jul 31, 2023
@k8s-ci-robot k8s-ci-robot added this to the v1.11 milestone Jul 31, 2023
@mboersma mboersma deleted the capi-one-four-five branch July 31, 2023 19:32
@mboersma
Copy link
Contributor Author

/cherry-pick release-1.10

@k8s-infra-cherrypick-robot

@mboersma: new pull request created: #3782

In response to this:

/cherry-pick release-1.10

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.

@mboersma
Copy link
Contributor Author

/cherry-pick release-1.9

@k8s-infra-cherrypick-robot

@mboersma: #3756 failed to apply on top of branch "release-1.9":

Applying: Bump CAPI to v1.4.5
Using index info to reconstruct a base tree...
M	Makefile
M	Tiltfile
M	go.mod
M	go.sum
M	test/e2e/config/azure-dev.yaml
Falling back to patching base and 3-way merge...
Auto-merging test/e2e/config/azure-dev.yaml
CONFLICT (content): Merge conflict in test/e2e/config/azure-dev.yaml
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
Auto-merging Tiltfile
CONFLICT (content): Merge conflict in Tiltfile
Auto-merging Makefile
CONFLICT (content): Merge conflict in Makefile
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.4.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-1.9

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 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/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. lgtm "Looks good to me", indicates that a PR is ready to be merged. 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
Archived in project
Development

Successfully merging this pull request may close these issues.

6 participants