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

⚠️ Resolved and Resources become optional pointer types #1967

Merged
merged 1 commit into from
Mar 26, 2024
Merged

⚠️ Resolved and Resources become optional pointer types #1967

merged 1 commit into from
Mar 26, 2024

Conversation

mdbooth
Copy link
Contributor

@mdbooth mdbooth commented Mar 21, 2024 •
edited
Loading

This updates Resolved and Resources in both OpenStackMachine and the Bastion to be optional pointer types.

TODO:

/hold

@k8s-ci-robot k8s-ci-robot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Mar 21, 2024
@k8s-ci-robot k8s-ci-robot requested review from dulek and jichenjc March 21, 2024 17:01
@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 21, 2024
@netlify Netlify
Copy link

netlify bot commented Mar 21, 2024 •
edited
Loading

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

Name Link
🔨 Latest commit 2758a6d
🔍 Latest deploy log https://app.netlify.com/sites/kubernetes-sigs-cluster-api-openstack/deploys/660183f0aceb4d0008935242
😎 Deploy Preview https://deploy-preview-1967--kubernetes-sigs-cluster-api-openstack.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 configuration.

@mdbooth mdbooth force-pushed the machineresourcespointers branch 2 times, most recently from c22ae58 to cee39c9 Compare March 22, 2024 11:01
@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 22, 2024
@mdbooth mdbooth force-pushed the machineresourcespointers branch from cee39c9 to 9969ea3 Compare March 25, 2024 10:52
@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Mar 25, 2024
@mdbooth
Copy link
Contributor Author

mdbooth commented Mar 25, 2024

/test pull-cluster-api-provider-openstack-e2e-full-test

@mdbooth mdbooth force-pushed the machineresourcespointers branch from 9969ea3 to 2758a6d Compare March 25, 2024 14:02
@mdbooth
Copy link
Contributor Author

mdbooth commented Mar 25, 2024

/test pull-cluster-api-provider-openstack-e2e-full-test

MaysaMacedo
MaysaMacedo reviewed Mar 25, 2024
View reviewed changes
Copy link
Contributor

@MaysaMacedo MaysaMacedo left a comment

Choose a reason for hiding this comment

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

Other than the nit I noticed, it LGTM.

api/v1alpha7/openstackcluster_conversion.go
// ReferencedResources have no equivalent in v1alpha7
if previous.Bastion != nil {
dst.Bastion.Resolved = previous.Bastion.Resolved
if previous == nil || dst == nil {
Copy link
Contributor

Choose a reason for hiding this comment

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

this check also happens in restorev1beta1BastionStatus, can it be removed?

Copy link
Contributor

Choose a reason for hiding this comment

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

In restorev1beta1BastionStatus it's BastionStatus, not ClusterStatus. I think we need both.

Copy link
Contributor

Choose a reason for hiding this comment

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

Here we are checking previous and dst. Then we pass on previous.Bastion and dst.Bastion, so I would say both checks are needed.

@dulek
Copy link
Contributor

dulek commented Mar 26, 2024

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 26, 2024
lentzi90
lentzi90 reviewed Mar 26, 2024
View reviewed changes
Copy link
Contributor

@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.

/lgtm

@jichenjc
Copy link
Contributor

/approve
/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 Mar 26, 2024
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jichenjc, mdbooth

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 merged commit ec77c18 into kubernetes-sigs:main Mar 26, 2024
10 checks passed
@mdbooth mdbooth deleted the machineresourcespointers branch March 26, 2024 14:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lentzi90 lentzi90 lentzi90 left review comments

@MaysaMacedo MaysaMacedo MaysaMacedo left review comments

@dulek dulek Awaiting requested review from dulek

@jichenjc jichenjc Awaiting requested review from jichenjc

Assignees

@dulek dulek

@lentzi90 lentzi90

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/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
CAPO Roadmap
Archived in project
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@mdbooth @dulek @jichenjc @k8s-ci-robot @MaysaMacedo @lentzi90