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 OpenStackCluster with v1beta1 case and omitempty. #481

Open
wants to merge 1 commit into
base: main
Choose a base branch
from

Conversation

dalees
Copy link
Contributor

@dalees dalees commented Jan 23, 2025

These changes match resource changes in CAPO and allow tools such as ArgoCD to fully synchronize the resource instead of showing minor changes. No functionality is changed.

  • disableAPIServerFloatingIP is now omitempty[1], and is therefore absent when querying the resource when set to 'false'.
  • allowedCidrs becomes allowedCIDRs [2]

[1] kubernetes-sigs/cluster-api-provider-openstack@9223883
[2] https://cluster-api-openstack.sigs.k8s.io/topics/crd-changes/v1alpha7-to-v1beta1#changes-to-ports

These changes match resource changes in CAPO and allow
tools such as ArgoCD to fully synchronize the resource
instead of showing minor changes. No functionality is changed.

* disableAPIServerFloatingIP is now `omitempty`[1], and is
  therefore absent when querying the resource when set to 'false'.
* `allowedCidrs` becomes `allowedCIDRs` [2]

[1] kubernetes-sigs/cluster-api-provider-openstack@9223883
[2] https://cluster-api-openstack.sigs.k8s.io/topics/crd-changes/v1alpha7-to-v1beta1#changes-to-ports
@dalees dalees requested a review from a team as a code owner January 23, 2025 22:08
Copy link
Collaborator

@mkjpryor mkjpryor left a comment

Choose a reason for hiding this comment

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

LGTM

@mkjpryor mkjpryor self-requested a review January 27, 2025 10:39
Copy link
Collaborator

@mkjpryor mkjpryor left a comment

Choose a reason for hiding this comment

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

@dalees

Looks like this caused the chart upgrade test to fail, which tests upgrading the chart while keeping the same values. This is because the OpenStackCluster.spec changes, even though it is effectively a null change (which does annoy me...). I suspect the issue is the disableAPIServerFloatingIP change, and I'm not sure how we fix it.

FWIW, the charts as they are cause us no issues with Flux. I'm inclined not to break on chart upgrade for the sake of one tool right now...

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.

2 participants