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

Update controller-runtime and cluster-api dependencies #1363

Merged

Conversation

Birdrock
Copy link
Contributor

@Birdrock Birdrock commented Oct 5, 2023

Changes proposed by this PR

Update controller-runtime to v0.16.2 and cluster-api to v1.5.2.

closes #1362

Release Note

  • Update controller-runtime to v0.16.2
  • Update cluster-api to v1.5.2

PR Checklist

Note: Please do not remove items. Mark items as done [x] or use strikethrough if you believe they are not relevant

  • Linked to a relevant issue. Eg: Fixes #123 or Updates #123
  • Removed non-atomic or wip commits
  • Filled in the Release Note section above
  • Added any relevant branches to cherry-pick
  • Modified the docs to match changes

@github-actions
Copy link

github-actions bot commented Oct 5, 2023

Hello @Birdrock!, thanks for opening your first Pull Request. Someone will review it soon. Thank you for committing to make Cartographer better

@Birdrock
Copy link
Contributor Author

I can resolve the conflicts, but I'd like to avoid drift as much as possible. Any chance someone could take a look at this?

@@ -322,6 +322,27 @@ spec:
resources:
description: Resource constraints for the application. See https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
properties:
claims:
Copy link
Member

Choose a reason for hiding this comment

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

I don't understand why this is turning up now?. I wonder if previous commits did not remember to generate.

@@ -342,7 +363,8 @@ spec:
description: 'Requests describes the minimum amount of compute
Copy link
Member

Choose a reason for hiding this comment

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

this is a nice improvment in codegen :D

Copy link
Member

@squeedee squeedee left a comment

Choose a reason for hiding this comment

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

Thanks so much for your time and effort on this!

@Birdrock Birdrock force-pushed the controller-runtime-dependency-update branch from f3dae05 to 5c1a45d Compare October 16, 2023 18:51
@Birdrock
Copy link
Contributor Author

Resolved go.mod and go.sum conflicts.

@Birdrock Birdrock force-pushed the controller-runtime-dependency-update branch from 5c1a45d to 8e0fa37 Compare October 17, 2023 21:36
@squeedee
Copy link
Member

squeedee commented Oct 23, 2023

You'll just need to resolve the lint and regen issues:

make gen-objects gen-manifests
make lint

@Birdrock
Copy link
Contributor Author

I've made the updates requested. Please let me know if there is anything else I need to do.

@squeedee squeedee enabled auto-merge (squash) October 25, 2023 23:03
@Birdrock
Copy link
Contributor Author

Looks like it'll need another workflow run.

@squeedee squeedee merged commit bfb8523 into vmware-tanzu:main Dec 13, 2023
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update Cartographer to use [email protected] and [email protected]
4 participants