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

✨ Bump Cluster API to v1.6.0-beta.1 #2463

Merged
merged 1 commit into from
Nov 9, 2023
Merged

✨ Bump Cluster API to v1.6.0-beta.1 #2463

merged 1 commit into from
Nov 9, 2023

Conversation

killianmuldoon
Copy link
Contributor

Bump Cluster API to v1.6.0-beta.0.

The release notes are here: https://github.com/kubernetes-sigs/cluster-api/releases/tag/v1.6.0-beta.0

@k8s-ci-robot k8s-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Oct 25, 2023
@k8s-ci-robot k8s-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Oct 25, 2023
killianmuldoon
killianmuldoon commented Oct 25, 2023
View reviewed changes
Copy link
Contributor Author

@killianmuldoon killianmuldoon left a comment

Choose a reason for hiding this comment

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

/test

@k8s-ci-robot
Copy link
Contributor

@killianmuldoon: The /test command needs one or more targets.
The following commands are available to trigger required jobs:

  • /test pull-cluster-api-provider-vsphere-conformance-main
  • /test pull-cluster-api-provider-vsphere-e2e-full-main
  • /test pull-cluster-api-provider-vsphere-e2e-main
  • /test pull-cluster-api-provider-vsphere-test-integration-main
  • /test pull-cluster-api-provider-vsphere-test-main
  • /test pull-cluster-api-provider-vsphere-verify-main

The following commands are available to trigger optional jobs:

  • /test pull-cluster-api-provider-vsphere-apidiff-main

Use /test all to run the following jobs that were automatically triggered:

  • pull-cluster-api-provider-vsphere-apidiff-main
  • pull-cluster-api-provider-vsphere-e2e-main
  • pull-cluster-api-provider-vsphere-test-integration-main
  • pull-cluster-api-provider-vsphere-test-main
  • pull-cluster-api-provider-vsphere-verify-main

In response to this:

/test

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.

@killianmuldoon killianmuldoon changed the title [WIP] Bump Cluster API to v1.6.0-beta.0 ✨ [WIP] Bump Cluster API to v1.6.0-beta.0 Oct 25, 2023
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Oct 25, 2023
@killianmuldoon
Copy link
Contributor Author

/test pull-cluster-api-provider-vsphere-e2e-full-main

killianmuldoon
killianmuldoon commented Oct 25, 2023
View reviewed changes
Copy link
Contributor Author

@killianmuldoon killianmuldoon left a comment

Choose a reason for hiding this comment

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

Running into a lot of issues - first hurdle being the supervisor unit tests. I can't seem to find a reasonable way to run them individually locally to help debug.

@killianmuldoon killianmuldoon mentioned this pull request Oct 26, 2023
Closed
@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 1, 2023
@killianmuldoon killianmuldoon force-pushed the pr-bump-capi-1.6.0-beta.0 branch 3 times, most recently from 8cae5cb to 7aa36fa Compare November 6, 2023 20:06
@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 7, 2023
@killianmuldoon killianmuldoon changed the title ✨ [WIP] Bump Cluster API to v1.6.0-beta.0 ✨ [WIP] Bump Cluster API to v1.6.0-beta.1 Nov 7, 2023
@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 7, 2023
@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 7, 2023
@killianmuldoon killianmuldoon force-pushed the pr-bump-capi-1.6.0-beta.0 branch 2 times, most recently from cc7e186 to c740595 Compare November 7, 2023 10:13
@killianmuldoon
Copy link
Contributor Author

/test pull-cluster-api-provider-vsphere-e2e-main

@k8s-ci-robot k8s-ci-robot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Nov 7, 2023
killianmuldoon
killianmuldoon commented Nov 7, 2023
View reviewed changes
controllers/serviceaccount_controller_unit_test.go
Comment on lines -57 to -59
// Update the VSphereCluster and its status in the fake client.
Expect(controllerCtx.ControllerContext.Client.Update(ctx, controllerCtx.VSphereCluster)).To(Succeed())
Expect(controllerCtx.ControllerContext.Client.Status().Update(ctx, controllerCtx.VSphereCluster)).To(Succeed())
Copy link
Contributor Author

Choose a reason for hiding this comment

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

These functions weren't being used in the underlying test as the object was being checked in place. Some change in the fakeclient seems to have changed how Update works so that e.g. Status update also mutates the object in place making this function not work. Fine to get rid of it here, and there weren't that many changes needed for this bump.

I do wonder with how often Update functions are used across the code what kind of bugs are being missed though.

Copy link
Member

@sbueringer sbueringer Nov 8, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

Sounds good so far. I hope we never use update outside of tests and use patch instead.

I think the changes in fake client were only to get them closer to the behavior of the real client

Copy link
Member

Choose a reason for hiding this comment

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

Q: "being checked in place" this means our reconciler code is just reading it from our magic ctx and not via the client. So there is no need for the VSphereCluster object to exist in the fakeclient, right?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Exactly

controllers/servicediscovery_controller_unit_test.go
Comment on lines -53 to -55
// Update the VSphereCluster and its status in the fake client.
Expect(controllerCtx.ControllerContext.Client.Update(ctx, controllerCtx.VSphereCluster)).To(Succeed())
Expect(controllerCtx.ControllerContext.Client.Status().Update(ctx, controllerCtx.VSphereCluster)).To(Succeed())
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Similar to above - the object is being checked in place in this test so no need to update it in the fake client.

@codecov Codecov
Copy link

codecov bot commented Nov 7, 2023 •
edited
Loading

Codecov Report

Attention: 7 lines in your changes are missing coverage. Please review.

Comparison is base (d7b0830) 63.67% compared to head (83ba5d1) 63.38%.

Additional details and impacted files 
@@            Coverage Diff             @@
##             main    #2463      +/-   ##
==========================================
- Coverage   63.67%   63.38%   -0.30%     
==========================================
  Files         123      123              
  Lines        8773     8788      +15     
==========================================
- Hits         5586     5570      -16     
- Misses       2773     2797      +24     
- Partials      414      421       +7
Files Coverage Δ
controllers/servicediscovery_controller.go 80.17% <100.00%> (ø)
pkg/context/controller_manager_context.go 75.00% <ø> (ø)
pkg/manager/manager.go 84.41% <100.00%> (ø)
test/helpers/envtest.go 70.66% <63.15%> (-1.93%) ⬇️

... and 5 files with indirect coverage changes

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

@killianmuldoon
Copy link
Contributor Author

/test pull-cluster-api-provider-vsphere-e2e-main

@killianmuldoon
Copy link
Contributor Author

/test pull-cluster-api-provider-vsphere-e2e-full-main

@killianmuldoon killianmuldoon mentioned this pull request Nov 7, 2023
Merged
@killianmuldoon killianmuldoon changed the title ✨ [WIP] Bump Cluster API to v1.6.0-beta.1 ✨ Bump Cluster API to v1.6.0-beta.1 Nov 7, 2023
sbueringer
sbueringer reviewed Nov 8, 2023
View reviewed changes
main.go Show resolved Hide resolved
sbueringer
sbueringer reviewed Nov 8, 2023
View reviewed changes
main.go Show resolved Hide resolved
sbueringer
sbueringer reviewed Nov 8, 2023
View reviewed changes
main.go Show resolved Hide resolved
sbueringer
sbueringer reviewed Nov 8, 2023
View reviewed changes
main.go Outdated Show resolved Hide resolved
sbueringer
sbueringer reviewed Nov 8, 2023
View reviewed changes
main.go Show resolved Hide resolved
@sbueringer
Copy link
Member

Thx! A few smaller findings. I compared a bit with core CAPI

@k8s-ci-robot
Copy link
Contributor

@killianmuldoon: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
pull-cluster-api-provider-vsphere-apidiff-main 83ba5d1 link false /test pull-cluster-api-provider-vsphere-apidiff-main

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

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. I understand the commands that are listed here.

@killianmuldoon killianmuldoon mentioned this pull request Nov 9, 2023
Closed
@sbueringer
Copy link
Member

Thx!

@sbueringer
Copy link
Member

/lgtm
/approve

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

LGTM label has been added.

Git tree hash: 3e4f12c4143f67edad495fa60d98515453ceea37

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: sbueringer

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 9, 2023
@k8s-ci-robot k8s-ci-robot merged commit 21e04b0 into kubernetes-sigs:main Nov 9, 2023
16 of 17 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.9 milestone Nov 9, 2023
This was referenced Nov 10, 2023
Closed
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sbueringer sbueringer sbueringer left review comments

@chrischdi chrischdi Awaiting requested review from chrischdi

@srm09 srm09 Awaiting requested review from srm09

Assignees

@sbueringer sbueringer

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. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files.
Projects
None yet
Milestone
v1.9
Development

Successfully merging this pull request may close these issues.
3 participants
@killianmuldoon @k8s-ci-robot @sbueringer