update API Provider to v1beta1 by anish-mudaraddi · Pull Request #399 · azimuth-cloud/capi-helm-charts

anish-mudaraddi · 2024-09-02T12:08:27Z

An attempt to fix issue #398

update api provider to use v1beta1 since its provided in newest cluster api provider version 0.10.*

scrungus

I think this will require some additional changes, for example removing identityRef.kind:

capi-helm-charts/charts/openstack-cluster/templates/node-group/openstack-machine-template.yaml

Line 11 in e4e1ec1

kind: Secret

capi-helm-charts/charts/openstack-cluster/templates/cluster-openstack.yaml

Line 14 in e4e1ec1

kind: Secret

and addition of cloudName.

Could you go through this changelog and make any necessary changes?

made further changes for openstackmachinetemplate and openstackcluster to to be compatible with v1beta1 api provider version

anish-mudaraddi · 2024-09-04T11:59:33Z

I've made the necessary changes - and I've tested making a cluster with the changes and its working for me!

scrungus · 2024-09-16T11:28:19Z

@anish-mudaraddi the etcd test is failing, looks like we need this change as well.

mkjpryor

This PR is a good start, but while we are moving to a new API version I'd like to take the opportunity to adopt some of the new functionality. Some examples would be:

Moving the external network specification to a proper filter but still respecting the old-style ID for backwards compatibility
Supporting multiple subnets but still respecting the old-style single subnet configuration for backwards compatibility
...

I understand that you want this quickly to correct your issues with Argo CD, but it seems like a good opportunity to also do these things.

mkjpryor · 2024-09-16T12:31:06Z

It is also important that all of these changes are implemented in a backwards-compatible way. This means that where fields have changed their name, e.g. diskSize to sizeGiB for root volumes, we want to respect both (for the time being at least).

anish-mudaraddi · 2024-09-17T10:30:44Z

@mkjpryor no problem - I'll try to implement the functionality you requested!

v1beta1 changes the names of the following for the rootVolume field: - diskSize to sizeGiB - volumeType to type it also changes the way availabilityZone name is provided This commit ensures that the changes are backwards compatible and deprecates the changes in values.yaml

allow users to specify additional security groups using managedSecurityGroups. Allow backwards compatibility with previous way which set it as a boolean

allow users to specify if they want to disable external networking for the cluster allow users to utilise filter methods available in v1beta1 for specifying external network - ensured backwards compatibility with externalNetworkiD

v1beta1 allows specifying 2 subnets for dual stack configuration. It also adds the managedSubnets field. This commit adds these and also maintains backwards compatibility

allows specifying serverGroupFilter instead of serverGroupId for machine templates but maintaining backwards compatibility

anish-mudaraddi · 2024-09-24T09:30:32Z

I've implemented the following changes:

removal of identityRef kind Secret
moving cloudName to identityRef.cloudName
added field ServerGroupFilter - (an alias for ServerGroup)
- ServerGroupID is still supported for backwards compatibility.
- I used ServerGroupFilter instead of ServerGroup to match existing naming convention used for defining subnets and networks - subnetFilter and networkFilter - but I can change this
added field externalNetworkFilter - (similar to above)
added fields managedSubnets and subnets to match upstream
- old fields nodeCidr and dnsNameservers still supported
add field sizeGiB to replace diskSize
- supporting both for backwards compatibility
added field allowedCIDRs - still supporting old field allowedCidrs
changes to the way machineImage and machineImageId are parsed to be compatible with new changes
availabilityZone field in v1beta1 has changed to no longer accept name string
- I updated this but also support defining the name the old way
added disableExternalNetwork field

Bits I left out

a field like machineimageFilter - I don't think we need it since we can define an image via id and name currently which I think is enough
floatingIPPoolRef functionality - something for a future PR - I think its out-of-scope for this PR

anish-mudaraddi · 2024-10-04T13:15:42Z

@mkjpryor @scrungus just bumping this

mkjpryor · 2024-10-08T12:50:05Z

@anish-mudaraddi Can you rebase this onto main please? Thanks!

mkjpryor · 2024-10-08T12:59:20Z

@anish-mudaraddi

I'm finding this PR very hard to review.

Thinking on it some more, I think I would prefer to split this change into two PRs:

Move to v1beta1 resources with no changes to the values.yaml
Introduce some of the new features, in a backwards compatible way

mkjpryor · 2024-10-08T15:59:03Z

@anish-mudaraddi

I think #423 is the minimal set of changes needed to move to v1beta1 resources while supporting the existing values format. Can you please test and comment on that PR?

JohnGarbutt · 2024-10-16T08:20:26Z

charts/openstack-cluster/values.yaml

+    # The size of the disk to use in gibibytes (GiB)
    # If not given, the ephemeral root disk from the flavor is used
-    diskSize:
+    sizeGiB:


Hmm, I fear some of these are going to break a lot of users' templates without some help to migrate between the old and new values here. 🤔 @mkjpryor any ideas on how to help with that?

mkjpryor · 2024-10-16T08:33:34Z

Superseded by #423 for now

update API Provider to v1beta1

52af807

update api provider to use v1beta1 since its provided in newest cluster api provider version 0.10.*

anish-mudaraddi requested a review from mkjpryor as a code owner September 2, 2024 12:08

anish-mudaraddi had a problem deploying to ci-approval September 2, 2024 12:08 — with GitHub Actions Error

scrungus suggested changes Sep 4, 2024

View reviewed changes

test api changes for v1beta1

ae05f41

made further changes for openstackmachinetemplate and openstackcluster to to be compatible with v1beta1 api provider version

anish-mudaraddi temporarily deployed to ci-approval September 4, 2024 11:51 — with GitHub Actions Inactive

anish-mudaraddi requested a review from scrungus September 5, 2024 13:50

Merge branch 'main' into update-api-provider

babcf6a

scrungus temporarily deployed to ci-approval September 7, 2024 04:15 — with GitHub Actions Inactive

scrungus temporarily deployed to ci-approval September 16, 2024 10:23 — with GitHub Actions Inactive

mkjpryor suggested changes Sep 16, 2024

View reviewed changes

anish-mudaraddi added 6 commits September 18, 2024 16:55

modify managedSecurityGroups to allow additional security groups

ba81a38

allow users to specify additional security groups using managedSecurityGroups. Allow backwards compatibility with previous way which set it as a boolean

added subnets and managedSubnet options

9406634

v1beta1 allows specifying 2 subnets for dual stack configuration. It also adds the managedSubnets field. This commit adds these and also maintains backwards compatibility

add serverGroupFilter option

6b441c7

allows specifying serverGroupFilter instead of serverGroupId for machine templates but maintaining backwards compatibility

make kubeadmcontrolplane use v1beta1

ff914d9

anish-mudaraddi had a problem deploying to ci-approval September 18, 2024 16:10 — with GitHub Actions Failure

anish-mudaraddi requested a review from mkjpryor September 24, 2024 09:30

anish-mudaraddi mentioned this pull request Sep 24, 2024

BUG: revert CAPO Openstack provider to 0.9.1 stfc/cloud-capi-values#27

Closed

JohnGarbutt reviewed Oct 16, 2024

View reviewed changes

mkjpryor closed this Oct 16, 2024

anish-mudaraddi deleted the update-api-provider branch October 16, 2024 09:08

Conversation

anish-mudaraddi commented Sep 2, 2024

Uh oh!

scrungus left a comment

Choose a reason for hiding this comment

Uh oh!

anish-mudaraddi commented Sep 4, 2024

Uh oh!

scrungus commented Sep 16, 2024

Uh oh!

mkjpryor left a comment

Choose a reason for hiding this comment

Uh oh!

mkjpryor commented Sep 16, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

anish-mudaraddi commented Sep 17, 2024

Uh oh!

anish-mudaraddi commented Sep 24, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

anish-mudaraddi commented Oct 4, 2024

Uh oh!

mkjpryor commented Oct 8, 2024

Uh oh!

mkjpryor commented Oct 8, 2024

Uh oh!

mkjpryor commented Oct 8, 2024

Uh oh!

JohnGarbutt Oct 16, 2024

Choose a reason for hiding this comment

Uh oh!

mkjpryor commented Oct 16, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

mkjpryor commented Sep 16, 2024 •

edited

Loading

anish-mudaraddi commented Sep 24, 2024 •

edited

Loading