From 43673fa257e76f6120de872190e4da033a88e48d Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Wed, 21 Feb 2024 14:23:41 -0500 Subject: [PATCH] Rename `v1alpha8` to `v1beta1` --- .golangci.yml | 2 +- Makefile | 6 +- PROJECT | 8 +- README.md | 6 +- api/v1alpha5/conversion.go | 152 +-- api/v1alpha5/conversion_test.go | 6 +- api/v1alpha5/doc.go | 2 +- api/v1alpha5/zz_generated.conversion.go | 874 ++++++------- api/v1alpha6/conversion.go | 204 ++-- api/v1alpha6/conversion_test.go | 6 +- api/v1alpha6/doc.go | 2 +- api/v1alpha6/zz_generated.conversion.go | 912 +++++++------- api/v1alpha7/conversion.go | 136 +-- api/v1alpha7/conversion_test.go | 6 +- api/v1alpha7/doc.go | 2 +- api/v1alpha7/zz_generated.conversion.go | 1088 ++++++++--------- .../conditions_consts.go | 2 +- api/{v1alpha8 => v1beta1}/conversion.go | 4 +- api/{v1alpha8 => v1beta1}/doc.go | 2 +- api/{v1alpha8 => v1beta1}/filter_convert.go | 2 +- .../groupversion_info.go | 6 +- api/{v1alpha8 => v1beta1}/identity_types.go | 2 +- .../openstackcluster_types.go | 2 +- .../openstackcluster_webhook.go | 6 +- .../openstackcluster_webhook_test.go | 2 +- .../openstackclusterlist_webhook.go | 2 +- .../openstackclustertemplate_types.go | 2 +- .../openstackclustertemplate_webhook.go | 6 +- .../openstackmachine_types.go | 2 +- .../openstackmachine_webhook.go | 6 +- .../openstackmachinelist_webhook.go | 2 +- .../openstackmachinetemplate_types.go | 2 +- .../openstackmachinetemplate_webhook.go | 4 +- .../openstackmachinetemplate_webhook_test.go | 2 +- .../openstackmachinetemplatelist_webhook.go | 2 +- api/{v1alpha8 => v1beta1}/types.go | 2 +- api/{v1alpha8 => v1beta1}/webhooks.go | 2 +- .../zz_generated.deepcopy.go | 8 +- ...re.cluster.x-k8s.io_openstackclusters.yaml | 2 +- ...er.x-k8s.io_openstackclustertemplates.yaml | 2 +- ...re.cluster.x-k8s.io_openstackmachines.yaml | 2 +- ...er.x-k8s.io_openstackmachinetemplates.yaml | 2 +- config/crd/kustomization.yaml | 2 +- config/webhook/manifests.yaml | 28 +- controllers/openstackcluster_controller.go | 2 +- .../openstackcluster_controller_test.go | 2 +- .../openstackfloatingippool_controller.go | 2 +- controllers/openstackmachine_controller.go | 2 +- .../openstackmachine_controller_test.go | 2 +- controllers/suite_test.go | 2 +- docs/book/src/SUMMARY.md | 2 +- .../src/clusteropenstack/configuration.md | 28 +- docs/book/src/development/development.md | 2 +- ...-to-v1alpha8.md => v1alpha7-to-v1beta1.md} | 20 +- .../default/cluster-template.yaml | 12 +- .../default/kustomization.yaml | 0 .../flatcar-sysext/kustomization.yaml | 0 .../flatcar-sysext/patch-flatcar.yaml | 6 +- .../flatcar/kustomization.yaml | 0 .../flatcar/patch-flatcar.yaml | 6 +- .../without-lb/kustomization.yaml | 0 .../without-lb/patch-without-lb.yaml | 2 +- main.go | 2 +- pkg/cloud/services/compute/instance.go | 2 +- pkg/cloud/services/compute/instance_test.go | 2 +- pkg/cloud/services/compute/instance_types.go | 2 +- .../services/compute/referenced_resources.go | 2 +- .../compute/referenced_resources_test.go | 2 +- pkg/cloud/services/compute/servergroup.go | 2 +- .../services/compute/servergroup_test.go | 2 +- .../services/loadbalancer/loadbalancer.go | 2 +- .../loadbalancer/loadbalancer_test.go | 2 +- pkg/cloud/services/networking/floatingip.go | 2 +- .../services/networking/floatingip_test.go | 2 +- pkg/cloud/services/networking/network.go | 2 +- pkg/cloud/services/networking/network_test.go | 2 +- pkg/cloud/services/networking/port.go | 2 +- pkg/cloud/services/networking/port_test.go | 2 +- pkg/cloud/services/networking/router.go | 2 +- .../services/networking/securitygroups.go | 2 +- .../networking/securitygroups_test.go | 2 +- pkg/cloud/services/networking/trunk_test.go | 2 +- pkg/scope/mock.go | 2 +- pkg/scope/provider.go | 2 +- pkg/scope/scope.go | 2 +- pkg/utils/controllers/controllers.go | 2 +- pkg/utils/controllers/controllers_test.go | 2 +- .../cluster-template-flatcar-sysext.yaml | 12 +- templates/cluster-template-flatcar.yaml | 12 +- templates/cluster-template-without-lb.yaml | 12 +- templates/cluster-template.yaml | 12 +- templates/clusterclass-dev-test.yaml | 16 +- .../data/kustomize/default/kustomization.yaml | 2 +- .../flatcar-sysext/kustomization.yaml | 2 +- .../data/kustomize/flatcar/kustomization.yaml | 2 +- .../data/kustomize/k8s-upgrade/kcp-patch.yaml | 2 +- .../data/kustomize/k8s-upgrade/md-patch.yaml | 2 +- .../k8s-upgrade/upgrade-from-template.yaml | 4 +- .../k8s-upgrade/upgrade-to-template.yaml | 4 +- .../kustomize/without-lb/kustomization.yaml | 2 +- test/e2e/shared/common.go | 2 +- test/e2e/shared/defaults.go | 2 +- test/e2e/shared/openstack.go | 2 +- test/e2e/suites/e2e/e2e_test.go | 2 +- 104 files changed, 1876 insertions(+), 1876 deletions(-) rename api/{v1alpha8 => v1beta1}/conditions_consts.go (99%) rename api/{v1alpha8 => v1beta1}/conversion.go (96%) rename api/{v1alpha8 => v1beta1}/doc.go (97%) rename api/{v1alpha8 => v1beta1}/filter_convert.go (99%) rename api/{v1alpha8 => v1beta1}/groupversion_info.go (90%) rename api/{v1alpha8 => v1beta1}/identity_types.go (98%) rename api/{v1alpha8 => v1beta1}/openstackcluster_types.go (99%) rename api/{v1alpha8 => v1beta1}/openstackcluster_webhook.go (91%) rename api/{v1alpha8 => v1beta1}/openstackcluster_webhook_test.go (99%) rename api/{v1alpha8 => v1beta1}/openstackclusterlist_webhook.go (98%) rename api/{v1alpha8 => v1beta1}/openstackclustertemplate_types.go (99%) rename api/{v1alpha8 => v1beta1}/openstackclustertemplate_webhook.go (82%) rename api/{v1alpha8 => v1beta1}/openstackmachine_types.go (99%) rename api/{v1alpha8 => v1beta1}/openstackmachine_webhook.go (87%) rename api/{v1alpha8 => v1beta1}/openstackmachinelist_webhook.go (98%) rename api/{v1alpha8 => v1beta1}/openstackmachinetemplate_types.go (98%) rename api/{v1alpha8 => v1beta1}/openstackmachinetemplate_webhook.go (91%) rename api/{v1alpha8 => v1beta1}/openstackmachinetemplate_webhook_test.go (99%) rename api/{v1alpha8 => v1beta1}/openstackmachinetemplatelist_webhook.go (98%) rename api/{v1alpha8 => v1beta1}/types.go (99%) rename api/{v1alpha8 => v1beta1}/webhooks.go (98%) rename api/{v1alpha8 => v1beta1}/zz_generated.deepcopy.go (99%) rename docs/book/src/topics/crd-changes/{v1alpha7-to-v1alpha8.md => v1alpha7-to-v1beta1.md} (88%) rename kustomize/{v1alpha8 => v1beta1}/default/cluster-template.yaml (92%) rename kustomize/{v1alpha8 => v1beta1}/default/kustomization.yaml (100%) rename kustomize/{v1alpha8 => v1beta1}/flatcar-sysext/kustomization.yaml (100%) rename kustomize/{v1alpha8 => v1beta1}/flatcar-sysext/patch-flatcar.yaml (98%) rename kustomize/{v1alpha8 => v1beta1}/flatcar/kustomization.yaml (100%) rename kustomize/{v1alpha8 => v1beta1}/flatcar/patch-flatcar.yaml (95%) rename kustomize/{v1alpha8 => v1beta1}/without-lb/kustomization.yaml (100%) rename kustomize/{v1alpha8 => v1beta1}/without-lb/patch-without-lb.yaml (83%) diff --git a/.golangci.yml b/.golangci.yml index 3bc8da3e48..5fc2435fb4 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -102,7 +102,7 @@ linters-settings: alias: infrav1alpha6 - pkg: sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha7 alias: infrav1alpha7 - - pkg: sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha8 + - pkg: sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1 alias: infrav1 - pkg: sigs.k8s.io/cluster-api-provider-openstack/pkg/utils/errors alias: capoerrors diff --git a/Makefile b/Makefile index b66e60a5c6..4c6837f716 100644 --- a/Makefile +++ b/Makefile @@ -260,7 +260,7 @@ generate-go: $(MOCKGEN) --input-dirs=./api/v1alpha5 \ --input-dirs=./api/v1alpha6 \ --input-dirs=./api/v1alpha7 \ - --input-dirs=./api/v1alpha8 \ + --input-dirs=./api/v1beta1 \ --output-file-base=zz_generated.conversion \ --go-header-file=./hack/boilerplate/boilerplate.generatego.txt go generate ./... @@ -410,10 +410,10 @@ templates: templates/cluster-template.yaml \ templates/cluster-template-flatcar.yaml \ templates/cluster-template-flatcar-sysext.yaml -templates/cluster-template.yaml: kustomize/v1alpha8/default $(KUSTOMIZE) FORCE +templates/cluster-template.yaml: kustomize/v1beta1/default $(KUSTOMIZE) FORCE $(KUSTOMIZE) build "$<" > "$@" -templates/cluster-template-%.yaml: kustomize/v1alpha8/% $(KUSTOMIZE) FORCE +templates/cluster-template-%.yaml: kustomize/v1beta1/% $(KUSTOMIZE) FORCE $(KUSTOMIZE) build "$<" > "$@" .PHONY: release-templates diff --git a/PROJECT b/PROJECT index 6514dde9b3..6b397b884f 100644 --- a/PROJECT +++ b/PROJECT @@ -42,17 +42,17 @@ resources: kind: OpenStackClusterTemplate version: v1alpha7 - group: infrastructure - version: v1alpha8 + version: v1beta1 kind: OpenStackCluster - group: infrastructure - version: v1alpha8 + version: v1beta1 kind: OpenStackMachine - group: infrastructure - version: v1alpha8 + version: v1beta1 kind: OpenStackMachineTemplate - group: infrastructure kind: OpenStackClusterTemplate - version: v1alpha8 + version: v1beta1 - group: infrastructure kind: OpenStackFloatingIPPool version: v1alpha1 diff --git a/README.md b/README.md index 134890bfa9..51b35911b5 100644 --- a/README.md +++ b/README.md @@ -44,7 +44,7 @@ This provider's versions are compatible with the following versions of Cluster A | OpenStack Provider v1alpha5 (v0.6) | ✓ | | OpenStack Provider v1alpha6 (v0.7) | ✓ | | OpenStack Provider v1alpha7 (v0.9) | ✓ | -| OpenStack Provider v1alpha8 | ✓ | +| OpenStack Provider v1beta1 | ✓ | This provider's versions are able to install and manage the following versions of Kubernetes: @@ -54,7 +54,7 @@ This provider's versions are able to install and manage the following versions o | OpenStack Provider v1alpha5 (v0.6) | ✓ | + | + | + | | OpenStack Provider v1alpha6 (v0.7) | ✓ | ✓ | ✓ | + | | OpenStack Provider v1alpha7 (v0.9) | + | ✓ | ✓ | ★ | -| OpenStack Provider v1alpha8 | + | ✓ | ✓ | ★ | +| OpenStack Provider v1beta1 | + | ✓ | ✓ | ★ | This provider's versions are able to install Kubernetes to the following versions of OpenStack: @@ -63,7 +63,7 @@ This provider's versions are able to install Kubernetes to the following version | OpenStack Provider v1alpha5 (v0.6) | + | + | + | + | + | ✓ | ✓ | ✓ | ✓ | ★ | | OpenStack Provider v1alpha6 (v0.7) | + | + | + | + | + | ✓ | ✓ | ✓ | ✓ | ★ | | OpenStack Provider v1alpha7 (v0.9) | | + | + | + | + | ✓ | ✓ | ✓ | ✓ | ★ | -| OpenStack Provider v1alpha8 | | + | + | + | + | ✓ | ✓ | ✓ | ✓ | ★ | +| OpenStack Provider v1beta1 | | + | + | + | + | ✓ | ✓ | ✓ | ✓ | ★ | Test status: diff --git a/api/v1alpha5/conversion.go b/api/v1alpha5/conversion.go index 95177baa3e..08cfd30b3c 100644 --- a/api/v1alpha5/conversion.go +++ b/api/v1alpha5/conversion.go @@ -24,7 +24,7 @@ import ( utilconversion "sigs.k8s.io/cluster-api/util/conversion" ctrlconversion "sigs.k8s.io/controller-runtime/pkg/conversion" - infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha8" + infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1" ) var _ ctrlconversion.Convertible = &OpenStackCluster{} @@ -34,7 +34,7 @@ const trueString = "true" func (r *OpenStackCluster) ConvertTo(dstRaw ctrlconversion.Hub) error { dst := dstRaw.(*infrav1.OpenStackCluster) - if err := Convert_v1alpha5_OpenStackCluster_To_v1alpha8_OpenStackCluster(r, dst, nil); err != nil { + if err := Convert_v1alpha5_OpenStackCluster_To_v1beta1_OpenStackCluster(r, dst, nil); err != nil { return err } @@ -50,7 +50,7 @@ func (r *OpenStackCluster) ConvertTo(dstRaw ctrlconversion.Hub) error { func (r *OpenStackCluster) ConvertFrom(srcRaw ctrlconversion.Hub) error { src := srcRaw.(*infrav1.OpenStackCluster) - if err := Convert_v1alpha8_OpenStackCluster_To_v1alpha5_OpenStackCluster(src, r, nil); err != nil { + if err := Convert_v1beta1_OpenStackCluster_To_v1alpha5_OpenStackCluster(src, r, nil); err != nil { return err } @@ -63,13 +63,13 @@ var _ ctrlconversion.Convertible = &OpenStackClusterList{} func (r *OpenStackClusterList) ConvertTo(dstRaw ctrlconversion.Hub) error { dst := dstRaw.(*infrav1.OpenStackClusterList) - return Convert_v1alpha5_OpenStackClusterList_To_v1alpha8_OpenStackClusterList(r, dst, nil) + return Convert_v1alpha5_OpenStackClusterList_To_v1beta1_OpenStackClusterList(r, dst, nil) } func (r *OpenStackClusterList) ConvertFrom(srcRaw ctrlconversion.Hub) error { src := srcRaw.(*infrav1.OpenStackClusterList) - return Convert_v1alpha8_OpenStackClusterList_To_v1alpha5_OpenStackClusterList(src, r, nil) + return Convert_v1beta1_OpenStackClusterList_To_v1alpha5_OpenStackClusterList(src, r, nil) } var _ ctrlconversion.Convertible = &OpenStackClusterTemplate{} @@ -77,7 +77,7 @@ var _ ctrlconversion.Convertible = &OpenStackClusterTemplate{} func (r *OpenStackClusterTemplate) ConvertTo(dstRaw ctrlconversion.Hub) error { dst := dstRaw.(*infrav1.OpenStackClusterTemplate) - if err := Convert_v1alpha5_OpenStackClusterTemplate_To_v1alpha8_OpenStackClusterTemplate(r, dst, nil); err != nil { + if err := Convert_v1alpha5_OpenStackClusterTemplate_To_v1beta1_OpenStackClusterTemplate(r, dst, nil); err != nil { return err } @@ -93,7 +93,7 @@ func (r *OpenStackClusterTemplate) ConvertTo(dstRaw ctrlconversion.Hub) error { func (r *OpenStackClusterTemplate) ConvertFrom(srcRaw ctrlconversion.Hub) error { src := srcRaw.(*infrav1.OpenStackClusterTemplate) - if err := Convert_v1alpha8_OpenStackClusterTemplate_To_v1alpha5_OpenStackClusterTemplate(src, r, nil); err != nil { + if err := Convert_v1beta1_OpenStackClusterTemplate_To_v1alpha5_OpenStackClusterTemplate(src, r, nil); err != nil { return err } @@ -106,7 +106,7 @@ var _ ctrlconversion.Convertible = &OpenStackMachine{} func (r *OpenStackMachine) ConvertTo(dstRaw ctrlconversion.Hub) error { dst := dstRaw.(*infrav1.OpenStackMachine) - if err := Convert_v1alpha5_OpenStackMachine_To_v1alpha8_OpenStackMachine(r, dst, nil); err != nil { + if err := Convert_v1alpha5_OpenStackMachine_To_v1beta1_OpenStackMachine(r, dst, nil); err != nil { return err } @@ -122,7 +122,7 @@ func (r *OpenStackMachine) ConvertTo(dstRaw ctrlconversion.Hub) error { func (r *OpenStackMachine) ConvertFrom(srcRaw ctrlconversion.Hub) error { src := srcRaw.(*infrav1.OpenStackMachine) - if err := Convert_v1alpha8_OpenStackMachine_To_v1alpha5_OpenStackMachine(src, r, nil); err != nil { + if err := Convert_v1beta1_OpenStackMachine_To_v1alpha5_OpenStackMachine(src, r, nil); err != nil { return err } @@ -135,13 +135,13 @@ var _ ctrlconversion.Convertible = &OpenStackMachineList{} func (r *OpenStackMachineList) ConvertTo(dstRaw ctrlconversion.Hub) error { dst := dstRaw.(*infrav1.OpenStackMachineList) - return Convert_v1alpha5_OpenStackMachineList_To_v1alpha8_OpenStackMachineList(r, dst, nil) + return Convert_v1alpha5_OpenStackMachineList_To_v1beta1_OpenStackMachineList(r, dst, nil) } func (r *OpenStackMachineList) ConvertFrom(srcRaw ctrlconversion.Hub) error { src := srcRaw.(*infrav1.OpenStackMachineList) - return Convert_v1alpha8_OpenStackMachineList_To_v1alpha5_OpenStackMachineList(src, r, nil) + return Convert_v1beta1_OpenStackMachineList_To_v1alpha5_OpenStackMachineList(src, r, nil) } var _ ctrlconversion.Convertible = &OpenStackMachineTemplate{} @@ -149,7 +149,7 @@ var _ ctrlconversion.Convertible = &OpenStackMachineTemplate{} func (r *OpenStackMachineTemplate) ConvertTo(dstRaw ctrlconversion.Hub) error { dst := dstRaw.(*infrav1.OpenStackMachineTemplate) - if err := Convert_v1alpha5_OpenStackMachineTemplate_To_v1alpha8_OpenStackMachineTemplate(r, dst, nil); err != nil { + if err := Convert_v1alpha5_OpenStackMachineTemplate_To_v1beta1_OpenStackMachineTemplate(r, dst, nil); err != nil { return err } @@ -165,7 +165,7 @@ func (r *OpenStackMachineTemplate) ConvertTo(dstRaw ctrlconversion.Hub) error { func (r *OpenStackMachineTemplate) ConvertFrom(srcRaw ctrlconversion.Hub) error { src := srcRaw.(*infrav1.OpenStackMachineTemplate) - if err := Convert_v1alpha8_OpenStackMachineTemplate_To_v1alpha5_OpenStackMachineTemplate(src, r, nil); err != nil { + if err := Convert_v1beta1_OpenStackMachineTemplate_To_v1alpha5_OpenStackMachineTemplate(src, r, nil); err != nil { return err } @@ -178,17 +178,17 @@ var _ ctrlconversion.Convertible = &OpenStackMachineTemplateList{} func (r *OpenStackMachineTemplateList) ConvertTo(dstRaw ctrlconversion.Hub) error { dst := dstRaw.(*infrav1.OpenStackMachineTemplateList) - return Convert_v1alpha5_OpenStackMachineTemplateList_To_v1alpha8_OpenStackMachineTemplateList(r, dst, nil) + return Convert_v1alpha5_OpenStackMachineTemplateList_To_v1beta1_OpenStackMachineTemplateList(r, dst, nil) } func (r *OpenStackMachineTemplateList) ConvertFrom(srcRaw ctrlconversion.Hub) error { src := srcRaw.(*infrav1.OpenStackMachineTemplateList) - return Convert_v1alpha8_OpenStackMachineTemplateList_To_v1alpha5_OpenStackMachineTemplateList(src, r, nil) + return Convert_v1beta1_OpenStackMachineTemplateList_To_v1alpha5_OpenStackMachineTemplateList(src, r, nil) } -func Convert_v1alpha8_OpenStackClusterSpec_To_v1alpha5_OpenStackClusterSpec(in *infrav1.OpenStackClusterSpec, out *OpenStackClusterSpec, s conversion.Scope) error { - err := autoConvert_v1alpha8_OpenStackClusterSpec_To_v1alpha5_OpenStackClusterSpec(in, out, s) +func Convert_v1beta1_OpenStackClusterSpec_To_v1alpha5_OpenStackClusterSpec(in *infrav1.OpenStackClusterSpec, out *OpenStackClusterSpec, s conversion.Scope) error { + err := autoConvert_v1beta1_OpenStackClusterSpec_To_v1alpha5_OpenStackClusterSpec(in, out, s) if err != nil { return err } @@ -204,7 +204,7 @@ func Convert_v1alpha8_OpenStackClusterSpec_To_v1alpha5_OpenStackClusterSpec(in * if in.Subnets != nil { if len(in.Subnets) >= 1 { - if err := Convert_v1alpha8_SubnetFilter_To_v1alpha5_SubnetFilter(&in.Subnets[0], &out.Subnet, s); err != nil { + if err := Convert_v1beta1_SubnetFilter_To_v1alpha5_SubnetFilter(&in.Subnets[0], &out.Subnet, s); err != nil { return err } } @@ -218,8 +218,8 @@ func Convert_v1alpha8_OpenStackClusterSpec_To_v1alpha5_OpenStackClusterSpec(in * return nil } -func Convert_v1alpha5_OpenStackClusterSpec_To_v1alpha8_OpenStackClusterSpec(in *OpenStackClusterSpec, out *infrav1.OpenStackClusterSpec, s conversion.Scope) error { - err := autoConvert_v1alpha5_OpenStackClusterSpec_To_v1alpha8_OpenStackClusterSpec(in, out, s) +func Convert_v1alpha5_OpenStackClusterSpec_To_v1beta1_OpenStackClusterSpec(in *OpenStackClusterSpec, out *infrav1.OpenStackClusterSpec, s conversion.Scope) error { + err := autoConvert_v1alpha5_OpenStackClusterSpec_To_v1beta1_OpenStackClusterSpec(in, out, s) if err != nil { return err } @@ -233,7 +233,7 @@ func Convert_v1alpha5_OpenStackClusterSpec_To_v1alpha8_OpenStackClusterSpec(in * emptySubnet := SubnetFilter{} if in.Subnet != emptySubnet { subnet := infrav1.SubnetFilter{} - if err := Convert_v1alpha5_SubnetFilter_To_v1alpha8_SubnetFilter(&in.Subnet, &subnet, s); err != nil { + if err := Convert_v1alpha5_SubnetFilter_To_v1beta1_SubnetFilter(&in.Subnet, &subnet, s); err != nil { return err } out.Subnets = []infrav1.SubnetFilter{subnet} @@ -261,13 +261,13 @@ func Convert_v1alpha5_OpenStackClusterSpec_To_v1alpha8_OpenStackClusterSpec(in * return nil } -func Convert_v1alpha8_LoadBalancer_To_v1alpha5_LoadBalancer(in *infrav1.LoadBalancer, out *LoadBalancer, s conversion.Scope) error { - return autoConvert_v1alpha8_LoadBalancer_To_v1alpha5_LoadBalancer(in, out, s) +func Convert_v1beta1_LoadBalancer_To_v1alpha5_LoadBalancer(in *infrav1.LoadBalancer, out *LoadBalancer, s conversion.Scope) error { + return autoConvert_v1beta1_LoadBalancer_To_v1alpha5_LoadBalancer(in, out, s) } -func Convert_v1alpha8_PortOpts_To_v1alpha5_PortOpts(in *infrav1.PortOpts, out *PortOpts, s conversion.Scope) error { - // value specs and propagate uplink status have been added in v1alpha8 but have no equivalent in v1alpha5 - err := autoConvert_v1alpha8_PortOpts_To_v1alpha5_PortOpts(in, out, s) +func Convert_v1beta1_PortOpts_To_v1alpha5_PortOpts(in *infrav1.PortOpts, out *PortOpts, s conversion.Scope) error { + // value specs and propagate uplink status have been added in v1beta1 but have no equivalent in v1alpha5 + err := autoConvert_v1beta1_PortOpts_To_v1alpha5_PortOpts(in, out, s) if err != nil { return err } @@ -282,8 +282,8 @@ func Convert_v1alpha8_PortOpts_To_v1alpha5_PortOpts(in *infrav1.PortOpts, out *P return nil } -func Convert_v1alpha5_OpenStackMachineSpec_To_v1alpha8_OpenStackMachineSpec(in *OpenStackMachineSpec, out *infrav1.OpenStackMachineSpec, s conversion.Scope) error { - err := autoConvert_v1alpha5_OpenStackMachineSpec_To_v1alpha8_OpenStackMachineSpec(in, out, s) +func Convert_v1alpha5_OpenStackMachineSpec_To_v1beta1_OpenStackMachineSpec(in *OpenStackMachineSpec, out *infrav1.OpenStackMachineSpec, s conversion.Scope) error { + err := autoConvert_v1alpha5_OpenStackMachineSpec_To_v1beta1_OpenStackMachineSpec(in, out, s) if err != nil { return err } @@ -306,19 +306,19 @@ func Convert_v1alpha5_OpenStackMachineSpec_To_v1alpha8_OpenStackMachineSpec(in * return nil } -func Convert_v1alpha8_APIServerLoadBalancer_To_v1alpha5_APIServerLoadBalancer(in *infrav1.APIServerLoadBalancer, out *APIServerLoadBalancer, s conversion.Scope) error { - // Provider was originally added in v1alpha8, but was backported to v1alpha6, but has no equivalent in v1alpha5 - return autoConvert_v1alpha8_APIServerLoadBalancer_To_v1alpha5_APIServerLoadBalancer(in, out, s) +func Convert_v1beta1_APIServerLoadBalancer_To_v1alpha5_APIServerLoadBalancer(in *infrav1.APIServerLoadBalancer, out *APIServerLoadBalancer, s conversion.Scope) error { + // Provider was originally added in v1beta1, but was backported to v1alpha6, but has no equivalent in v1alpha5 + return autoConvert_v1beta1_APIServerLoadBalancer_To_v1alpha5_APIServerLoadBalancer(in, out, s) } -func Convert_v1alpha5_PortOpts_To_v1alpha8_PortOpts(in *PortOpts, out *infrav1.PortOpts, s conversion.Scope) error { - // SecurityGroups have been removed in v1alpha8. - err := autoConvert_v1alpha5_PortOpts_To_v1alpha8_PortOpts(in, out, s) +func Convert_v1alpha5_PortOpts_To_v1beta1_PortOpts(in *PortOpts, out *infrav1.PortOpts, s conversion.Scope) error { + // SecurityGroups have been removed in v1beta1. + err := autoConvert_v1alpha5_PortOpts_To_v1beta1_PortOpts(in, out, s) if err != nil { return err } - // Profile is now a struct in v1alpha8. + // Profile is now a struct in v1beta1. if strings.Contains(in.Profile["capabilities"], "switchdev") { out.Profile.OVSHWOffload = true } @@ -328,7 +328,7 @@ func Convert_v1alpha5_PortOpts_To_v1alpha8_PortOpts(in *PortOpts, out *infrav1.P return nil } -func Convert_v1alpha5_Instance_To_v1alpha8_BastionStatus(in *Instance, out *infrav1.BastionStatus, _ conversion.Scope) error { +func Convert_v1alpha5_Instance_To_v1beta1_BastionStatus(in *Instance, out *infrav1.BastionStatus, _ conversion.Scope) error { // BastionStatus is the same as Instance with unused fields removed out.ID = in.ID out.Name = in.Name @@ -340,7 +340,7 @@ func Convert_v1alpha5_Instance_To_v1alpha8_BastionStatus(in *Instance, out *infr return nil } -func Convert_v1alpha8_BastionStatus_To_v1alpha5_Instance(in *infrav1.BastionStatus, out *Instance, _ conversion.Scope) error { +func Convert_v1beta1_BastionStatus_To_v1alpha5_Instance(in *infrav1.BastionStatus, out *Instance, _ conversion.Scope) error { // BastionStatus is the same as Instance with unused fields removed out.ID = in.ID out.Name = in.Name @@ -352,9 +352,9 @@ func Convert_v1alpha8_BastionStatus_To_v1alpha5_Instance(in *infrav1.BastionStat return nil } -func Convert_v1alpha5_Network_To_v1alpha8_NetworkStatusWithSubnets(in *Network, out *infrav1.NetworkStatusWithSubnets, s conversion.Scope) error { - // PortOpts has been removed in v1alpha8 - err := Convert_v1alpha5_Network_To_v1alpha8_NetworkStatus(in, &out.NetworkStatus, s) +func Convert_v1alpha5_Network_To_v1beta1_NetworkStatusWithSubnets(in *Network, out *infrav1.NetworkStatusWithSubnets, s conversion.Scope) error { + // PortOpts has been removed in v1beta1 + err := Convert_v1alpha5_Network_To_v1beta1_NetworkStatus(in, &out.NetworkStatus, s) if err != nil { return err } @@ -365,9 +365,9 @@ func Convert_v1alpha5_Network_To_v1alpha8_NetworkStatusWithSubnets(in *Network, return nil } -func Convert_v1alpha8_NetworkStatusWithSubnets_To_v1alpha5_Network(in *infrav1.NetworkStatusWithSubnets, out *Network, s conversion.Scope) error { - // PortOpts has been removed in v1alpha8 - err := Convert_v1alpha8_NetworkStatus_To_v1alpha5_Network(&in.NetworkStatus, out, s) +func Convert_v1beta1_NetworkStatusWithSubnets_To_v1alpha5_Network(in *infrav1.NetworkStatusWithSubnets, out *Network, s conversion.Scope) error { + // PortOpts has been removed in v1beta1 + err := Convert_v1beta1_NetworkStatus_To_v1alpha5_Network(&in.NetworkStatus, out, s) if err != nil { return err } @@ -379,7 +379,7 @@ func Convert_v1alpha8_NetworkStatusWithSubnets_To_v1alpha5_Network(in *infrav1.N return nil } -func Convert_v1alpha5_Network_To_v1alpha8_NetworkStatus(in *Network, out *infrav1.NetworkStatus, _ conversion.Scope) error { +func Convert_v1alpha5_Network_To_v1beta1_NetworkStatus(in *Network, out *infrav1.NetworkStatus, _ conversion.Scope) error { out.ID = in.ID out.Name = in.Name out.Tags = in.Tags @@ -387,7 +387,7 @@ func Convert_v1alpha5_Network_To_v1alpha8_NetworkStatus(in *Network, out *infrav return nil } -func Convert_v1alpha8_NetworkStatus_To_v1alpha5_Network(in *infrav1.NetworkStatus, out *Network, _ conversion.Scope) error { +func Convert_v1beta1_NetworkStatus_To_v1alpha5_Network(in *infrav1.NetworkStatus, out *Network, _ conversion.Scope) error { out.ID = in.ID out.Name = in.Name out.Tags = in.Tags @@ -395,13 +395,13 @@ func Convert_v1alpha8_NetworkStatus_To_v1alpha5_Network(in *infrav1.NetworkStatu return nil } -func Convert_v1alpha5_SecurityGroupFilter_To_v1alpha8_SecurityGroupFilter(in *SecurityGroupFilter, out *infrav1.SecurityGroupFilter, s conversion.Scope) error { - err := autoConvert_v1alpha5_SecurityGroupFilter_To_v1alpha8_SecurityGroupFilter(in, out, s) +func Convert_v1alpha5_SecurityGroupFilter_To_v1beta1_SecurityGroupFilter(in *SecurityGroupFilter, out *infrav1.SecurityGroupFilter, s conversion.Scope) error { + err := autoConvert_v1alpha5_SecurityGroupFilter_To_v1beta1_SecurityGroupFilter(in, out, s) if err != nil { return err } - // TenantID has been removed in v1alpha8. Write it to ProjectID if ProjectID is not already set. + // TenantID has been removed in v1beta1. Write it to ProjectID if ProjectID is not already set. if out.ProjectID == "" { out.ProjectID = in.TenantID } @@ -409,9 +409,9 @@ func Convert_v1alpha5_SecurityGroupFilter_To_v1alpha8_SecurityGroupFilter(in *Se return nil } -func Convert_v1alpha5_SecurityGroupParam_To_v1alpha8_SecurityGroupFilter(in *SecurityGroupParam, out *infrav1.SecurityGroupFilter, s conversion.Scope) error { - // SecurityGroupParam is replaced by its contained SecurityGroupFilter in v1alpha8 - err := Convert_v1alpha5_SecurityGroupFilter_To_v1alpha8_SecurityGroupFilter(&in.Filter, out, s) +func Convert_v1alpha5_SecurityGroupParam_To_v1beta1_SecurityGroupFilter(in *SecurityGroupParam, out *infrav1.SecurityGroupFilter, s conversion.Scope) error { + // SecurityGroupParam is replaced by its contained SecurityGroupFilter in v1beta1 + err := Convert_v1alpha5_SecurityGroupFilter_To_v1beta1_SecurityGroupFilter(&in.Filter, out, s) if err != nil { return err } @@ -425,9 +425,9 @@ func Convert_v1alpha5_SecurityGroupParam_To_v1alpha8_SecurityGroupFilter(in *Sec return nil } -func Convert_v1alpha8_SecurityGroupFilter_To_v1alpha5_SecurityGroupParam(in *infrav1.SecurityGroupFilter, out *SecurityGroupParam, s conversion.Scope) error { - // SecurityGroupParam is replaced by its contained SecurityGroupFilter in v1alpha8 - err := Convert_v1alpha8_SecurityGroupFilter_To_v1alpha5_SecurityGroupFilter(in, &out.Filter, s) +func Convert_v1beta1_SecurityGroupFilter_To_v1alpha5_SecurityGroupParam(in *infrav1.SecurityGroupFilter, out *SecurityGroupParam, s conversion.Scope) error { + // SecurityGroupParam is replaced by its contained SecurityGroupFilter in v1beta1 + err := Convert_v1beta1_SecurityGroupFilter_To_v1alpha5_SecurityGroupFilter(in, &out.Filter, s) if err != nil { return err } @@ -441,7 +441,7 @@ func Convert_v1alpha8_SecurityGroupFilter_To_v1alpha5_SecurityGroupParam(in *inf return nil } -func Convert_v1alpha5_SubnetParam_To_v1alpha8_SubnetFilter(in *SubnetParam, out *infrav1.SubnetFilter, _ conversion.Scope) error { +func Convert_v1alpha5_SubnetParam_To_v1beta1_SubnetFilter(in *SubnetParam, out *infrav1.SubnetFilter, _ conversion.Scope) error { *out = infrav1.SubnetFilter(in.Filter) if in.UUID != "" { out.ID = in.UUID @@ -449,14 +449,14 @@ func Convert_v1alpha5_SubnetParam_To_v1alpha8_SubnetFilter(in *SubnetParam, out return nil } -func Convert_v1alpha8_SubnetFilter_To_v1alpha5_SubnetParam(in *infrav1.SubnetFilter, out *SubnetParam, _ conversion.Scope) error { +func Convert_v1beta1_SubnetFilter_To_v1alpha5_SubnetParam(in *infrav1.SubnetFilter, out *SubnetParam, _ conversion.Scope) error { out.Filter = SubnetFilter(*in) out.UUID = in.ID return nil } -func Convert_Map_string_To_Interface_To_v1alpha8_BindingProfile(in map[string]string, out *infrav1.BindingProfile, _ conversion.Scope) error { +func Convert_Map_string_To_Interface_To_v1beta1_BindingProfile(in map[string]string, out *infrav1.BindingProfile, _ conversion.Scope) error { for k, v := range in { if k == "capabilities" { if strings.Contains(v, "switchdev") { @@ -470,7 +470,7 @@ func Convert_Map_string_To_Interface_To_v1alpha8_BindingProfile(in map[string]st return nil } -func Convert_v1alpha8_BindingProfile_To_Map_string_To_Interface(in *infrav1.BindingProfile, out map[string]string, _ conversion.Scope) error { +func Convert_v1beta1_BindingProfile_To_Map_string_To_Interface(in *infrav1.BindingProfile, out map[string]string, _ conversion.Scope) error { if in.OVSHWOffload { (out)["capabilities"] = "[\"switchdev\"]" } @@ -480,13 +480,13 @@ func Convert_v1alpha8_BindingProfile_To_Map_string_To_Interface(in *infrav1.Bind return nil } -func Convert_v1alpha8_OpenStackClusterStatus_To_v1alpha5_OpenStackClusterStatus(in *infrav1.OpenStackClusterStatus, out *OpenStackClusterStatus, s conversion.Scope) error { - err := autoConvert_v1alpha8_OpenStackClusterStatus_To_v1alpha5_OpenStackClusterStatus(in, out, s) +func Convert_v1beta1_OpenStackClusterStatus_To_v1alpha5_OpenStackClusterStatus(in *infrav1.OpenStackClusterStatus, out *OpenStackClusterStatus, s conversion.Scope) error { + err := autoConvert_v1beta1_OpenStackClusterStatus_To_v1alpha5_OpenStackClusterStatus(in, out, s) if err != nil { return err } - // Router and APIServerLoadBalancer have been moved out of Network in v1alpha8 + // Router and APIServerLoadBalancer have been moved out of Network in v1beta1 if in.Router != nil || in.APIServerLoadBalancer != nil { if out.Network == nil { out.Network = &Network{} @@ -495,7 +495,7 @@ func Convert_v1alpha8_OpenStackClusterStatus_To_v1alpha5_OpenStackClusterStatus( out.Network.Router = (*Router)(in.Router) if in.APIServerLoadBalancer != nil { out.Network.APIServerLoadBalancer = &LoadBalancer{} - err = Convert_v1alpha8_LoadBalancer_To_v1alpha5_LoadBalancer(in.APIServerLoadBalancer, out.Network.APIServerLoadBalancer, s) + err = Convert_v1beta1_LoadBalancer_To_v1alpha5_LoadBalancer(in.APIServerLoadBalancer, out.Network.APIServerLoadBalancer, s) if err != nil { return err } @@ -505,18 +505,18 @@ func Convert_v1alpha8_OpenStackClusterStatus_To_v1alpha5_OpenStackClusterStatus( return nil } -func Convert_v1alpha5_OpenStackClusterStatus_To_v1alpha8_OpenStackClusterStatus(in *OpenStackClusterStatus, out *infrav1.OpenStackClusterStatus, s conversion.Scope) error { - err := autoConvert_v1alpha5_OpenStackClusterStatus_To_v1alpha8_OpenStackClusterStatus(in, out, s) +func Convert_v1alpha5_OpenStackClusterStatus_To_v1beta1_OpenStackClusterStatus(in *OpenStackClusterStatus, out *infrav1.OpenStackClusterStatus, s conversion.Scope) error { + err := autoConvert_v1alpha5_OpenStackClusterStatus_To_v1beta1_OpenStackClusterStatus(in, out, s) if err != nil { return err } - // Router and APIServerLoadBalancer have been moved out of Network in v1alpha8 + // Router and APIServerLoadBalancer have been moved out of Network in v1beta1 if in.Network != nil { out.Router = (*infrav1.Router)(in.Network.Router) if in.Network.APIServerLoadBalancer != nil { out.APIServerLoadBalancer = &infrav1.LoadBalancer{} - err = Convert_v1alpha5_LoadBalancer_To_v1alpha8_LoadBalancer(in.Network.APIServerLoadBalancer, out.APIServerLoadBalancer, s) + err = Convert_v1alpha5_LoadBalancer_To_v1beta1_LoadBalancer(in.Network.APIServerLoadBalancer, out.APIServerLoadBalancer, s) if err != nil { return err } @@ -526,8 +526,8 @@ func Convert_v1alpha5_OpenStackClusterStatus_To_v1alpha8_OpenStackClusterStatus( return nil } -func Convert_v1alpha8_OpenStackMachineSpec_To_v1alpha5_OpenStackMachineSpec(in *infrav1.OpenStackMachineSpec, out *OpenStackMachineSpec, s conversion.Scope) error { - err := autoConvert_v1alpha8_OpenStackMachineSpec_To_v1alpha5_OpenStackMachineSpec(in, out, s) +func Convert_v1beta1_OpenStackMachineSpec_To_v1alpha5_OpenStackMachineSpec(in *infrav1.OpenStackMachineSpec, out *OpenStackMachineSpec, s conversion.Scope) error { + err := autoConvert_v1beta1_OpenStackMachineSpec_To_v1alpha5_OpenStackMachineSpec(in, out, s) if err != nil { return err } @@ -547,13 +547,13 @@ func Convert_v1alpha8_OpenStackMachineSpec_To_v1alpha5_OpenStackMachineSpec(in * return nil } -func Convert_v1alpha8_OpenStackMachineStatus_To_v1alpha5_OpenStackMachineStatus(in *infrav1.OpenStackMachineStatus, out *OpenStackMachineStatus, s conversion.Scope) error { +func Convert_v1beta1_OpenStackMachineStatus_To_v1alpha5_OpenStackMachineStatus(in *infrav1.OpenStackMachineStatus, out *OpenStackMachineStatus, s conversion.Scope) error { // ReferencedResources have no equivalent in v1alpha5 - return autoConvert_v1alpha8_OpenStackMachineStatus_To_v1alpha5_OpenStackMachineStatus(in, out, s) + return autoConvert_v1beta1_OpenStackMachineStatus_To_v1alpha5_OpenStackMachineStatus(in, out, s) } -func Convert_v1alpha8_Bastion_To_v1alpha5_Bastion(in *infrav1.Bastion, out *Bastion, s conversion.Scope) error { - err := autoConvert_v1alpha8_Bastion_To_v1alpha5_Bastion(in, out, s) +func Convert_v1beta1_Bastion_To_v1alpha5_Bastion(in *infrav1.Bastion, out *Bastion, s conversion.Scope) error { + err := autoConvert_v1beta1_Bastion_To_v1alpha5_Bastion(in, out, s) if err != nil { return err } @@ -561,8 +561,8 @@ func Convert_v1alpha8_Bastion_To_v1alpha5_Bastion(in *infrav1.Bastion, out *Bast return nil } -func Convert_v1alpha5_Bastion_To_v1alpha8_Bastion(in *Bastion, out *infrav1.Bastion, s conversion.Scope) error { - err := autoConvert_v1alpha5_Bastion_To_v1alpha8_Bastion(in, out, s) +func Convert_v1alpha5_Bastion_To_v1beta1_Bastion(in *Bastion, out *infrav1.Bastion, s conversion.Scope) error { + err := autoConvert_v1alpha5_Bastion_To_v1beta1_Bastion(in, out, s) if err != nil { return err } @@ -570,7 +570,7 @@ func Convert_v1alpha5_Bastion_To_v1alpha8_Bastion(in *Bastion, out *infrav1.Bast return nil } -func Convert_v1alpha8_SecurityGroupStatus_To_v1alpha5_SecurityGroup(in *infrav1.SecurityGroupStatus, out *SecurityGroup, s conversion.Scope) error { //nolint:revive +func Convert_v1beta1_SecurityGroupStatus_To_v1alpha5_SecurityGroup(in *infrav1.SecurityGroupStatus, out *SecurityGroup, s conversion.Scope) error { //nolint:revive out.ID = in.ID out.Name = in.Name out.Rules = make([]SecurityGroupRule, len(in.Rules)) @@ -604,7 +604,7 @@ func Convert_v1alpha8_SecurityGroupStatus_To_v1alpha5_SecurityGroup(in *infrav1. return nil } -func Convert_v1alpha5_SecurityGroup_To_v1alpha8_SecurityGroupStatus(in *SecurityGroup, out *infrav1.SecurityGroupStatus, s conversion.Scope) error { //nolint:revive +func Convert_v1alpha5_SecurityGroup_To_v1beta1_SecurityGroupStatus(in *SecurityGroup, out *infrav1.SecurityGroupStatus, s conversion.Scope) error { //nolint:revive out.ID = in.ID out.Name = in.Name out.Rules = make([]infrav1.SecurityGroupRuleStatus, len(in.Rules)) diff --git a/api/v1alpha5/conversion_test.go b/api/v1alpha5/conversion_test.go index 480471b3c6..5ab7fab505 100644 --- a/api/v1alpha5/conversion_test.go +++ b/api/v1alpha5/conversion_test.go @@ -24,7 +24,7 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" ctrlconversion "sigs.k8s.io/controller-runtime/pkg/conversion" - infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha8" + infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1" ) func TestConvertFrom(t *testing.T) { @@ -110,7 +110,7 @@ func TestConvertFrom(t *testing.T) { } } -func TestConvert_v1alpha5_OpenStackClusterSpec_To_v1alpha8_OpenStackClusterSpec(t *testing.T) { +func TestConvert_v1alpha5_OpenStackClusterSpec_To_v1beta1_OpenStackClusterSpec(t *testing.T) { tests := []struct { name string in *OpenStackClusterSpec @@ -151,7 +151,7 @@ func TestConvert_v1alpha5_OpenStackClusterSpec_To_v1alpha8_OpenStackClusterSpec( t.Run(tt.name, func(t *testing.T) { g := gomega.NewWithT(t) out := &infrav1.OpenStackClusterSpec{} - err := Convert_v1alpha5_OpenStackClusterSpec_To_v1alpha8_OpenStackClusterSpec(tt.in, out, nil) + err := Convert_v1alpha5_OpenStackClusterSpec_To_v1beta1_OpenStackClusterSpec(tt.in, out, nil) g.Expect(err).NotTo(gomega.HaveOccurred()) g.Expect(out).To(gomega.Equal(tt.expectedOut)) }) diff --git a/api/v1alpha5/doc.go b/api/v1alpha5/doc.go index ad0e9949b2..4b0192a1be 100644 --- a/api/v1alpha5/doc.go +++ b/api/v1alpha5/doc.go @@ -14,5 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// +k8s:conversion-gen=sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha8 +// +k8s:conversion-gen=sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1 package v1alpha5 diff --git a/api/v1alpha5/zz_generated.conversion.go b/api/v1alpha5/zz_generated.conversion.go index 8ec8034142..3cd18bfd1f 100644 --- a/api/v1alpha5/zz_generated.conversion.go +++ b/api/v1alpha5/zz_generated.conversion.go @@ -27,8 +27,8 @@ import ( v1 "k8s.io/api/core/v1" conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" - v1alpha8 "sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha8" - v1beta1 "sigs.k8s.io/cluster-api/api/v1beta1" + v1beta1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1" + apiv1beta1 "sigs.k8s.io/cluster-api/api/v1beta1" errors "sigs.k8s.io/cluster-api/errors" ) @@ -39,382 +39,382 @@ func init() { // RegisterConversions adds conversion functions to the given scheme. // Public to allow building arbitrary schemes. func RegisterConversions(s *runtime.Scheme) error { - if err := s.AddGeneratedConversionFunc((*APIServerLoadBalancer)(nil), (*v1alpha8.APIServerLoadBalancer)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha5_APIServerLoadBalancer_To_v1alpha8_APIServerLoadBalancer(a.(*APIServerLoadBalancer), b.(*v1alpha8.APIServerLoadBalancer), scope) + if err := s.AddGeneratedConversionFunc((*APIServerLoadBalancer)(nil), (*v1beta1.APIServerLoadBalancer)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha5_APIServerLoadBalancer_To_v1beta1_APIServerLoadBalancer(a.(*APIServerLoadBalancer), b.(*v1beta1.APIServerLoadBalancer), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*AddressPair)(nil), (*v1alpha8.AddressPair)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha5_AddressPair_To_v1alpha8_AddressPair(a.(*AddressPair), b.(*v1alpha8.AddressPair), scope) + if err := s.AddGeneratedConversionFunc((*AddressPair)(nil), (*v1beta1.AddressPair)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha5_AddressPair_To_v1beta1_AddressPair(a.(*AddressPair), b.(*v1beta1.AddressPair), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1alpha8.AddressPair)(nil), (*AddressPair)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_AddressPair_To_v1alpha5_AddressPair(a.(*v1alpha8.AddressPair), b.(*AddressPair), scope) + if err := s.AddGeneratedConversionFunc((*v1beta1.AddressPair)(nil), (*AddressPair)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_AddressPair_To_v1alpha5_AddressPair(a.(*v1beta1.AddressPair), b.(*AddressPair), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*ExternalRouterIPParam)(nil), (*v1alpha8.ExternalRouterIPParam)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha5_ExternalRouterIPParam_To_v1alpha8_ExternalRouterIPParam(a.(*ExternalRouterIPParam), b.(*v1alpha8.ExternalRouterIPParam), scope) + if err := s.AddGeneratedConversionFunc((*ExternalRouterIPParam)(nil), (*v1beta1.ExternalRouterIPParam)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha5_ExternalRouterIPParam_To_v1beta1_ExternalRouterIPParam(a.(*ExternalRouterIPParam), b.(*v1beta1.ExternalRouterIPParam), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1alpha8.ExternalRouterIPParam)(nil), (*ExternalRouterIPParam)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_ExternalRouterIPParam_To_v1alpha5_ExternalRouterIPParam(a.(*v1alpha8.ExternalRouterIPParam), b.(*ExternalRouterIPParam), scope) + if err := s.AddGeneratedConversionFunc((*v1beta1.ExternalRouterIPParam)(nil), (*ExternalRouterIPParam)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_ExternalRouterIPParam_To_v1alpha5_ExternalRouterIPParam(a.(*v1beta1.ExternalRouterIPParam), b.(*ExternalRouterIPParam), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*FixedIP)(nil), (*v1alpha8.FixedIP)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha5_FixedIP_To_v1alpha8_FixedIP(a.(*FixedIP), b.(*v1alpha8.FixedIP), scope) + if err := s.AddGeneratedConversionFunc((*FixedIP)(nil), (*v1beta1.FixedIP)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha5_FixedIP_To_v1beta1_FixedIP(a.(*FixedIP), b.(*v1beta1.FixedIP), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1alpha8.FixedIP)(nil), (*FixedIP)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_FixedIP_To_v1alpha5_FixedIP(a.(*v1alpha8.FixedIP), b.(*FixedIP), scope) + if err := s.AddGeneratedConversionFunc((*v1beta1.FixedIP)(nil), (*FixedIP)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_FixedIP_To_v1alpha5_FixedIP(a.(*v1beta1.FixedIP), b.(*FixedIP), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*LoadBalancer)(nil), (*v1alpha8.LoadBalancer)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha5_LoadBalancer_To_v1alpha8_LoadBalancer(a.(*LoadBalancer), b.(*v1alpha8.LoadBalancer), scope) + if err := s.AddGeneratedConversionFunc((*LoadBalancer)(nil), (*v1beta1.LoadBalancer)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha5_LoadBalancer_To_v1beta1_LoadBalancer(a.(*LoadBalancer), b.(*v1beta1.LoadBalancer), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*NetworkFilter)(nil), (*v1alpha8.NetworkFilter)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha5_NetworkFilter_To_v1alpha8_NetworkFilter(a.(*NetworkFilter), b.(*v1alpha8.NetworkFilter), scope) + if err := s.AddGeneratedConversionFunc((*NetworkFilter)(nil), (*v1beta1.NetworkFilter)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha5_NetworkFilter_To_v1beta1_NetworkFilter(a.(*NetworkFilter), b.(*v1beta1.NetworkFilter), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1alpha8.NetworkFilter)(nil), (*NetworkFilter)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_NetworkFilter_To_v1alpha5_NetworkFilter(a.(*v1alpha8.NetworkFilter), b.(*NetworkFilter), scope) + if err := s.AddGeneratedConversionFunc((*v1beta1.NetworkFilter)(nil), (*NetworkFilter)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_NetworkFilter_To_v1alpha5_NetworkFilter(a.(*v1beta1.NetworkFilter), b.(*NetworkFilter), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*OpenStackCluster)(nil), (*v1alpha8.OpenStackCluster)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha5_OpenStackCluster_To_v1alpha8_OpenStackCluster(a.(*OpenStackCluster), b.(*v1alpha8.OpenStackCluster), scope) + if err := s.AddGeneratedConversionFunc((*OpenStackCluster)(nil), (*v1beta1.OpenStackCluster)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha5_OpenStackCluster_To_v1beta1_OpenStackCluster(a.(*OpenStackCluster), b.(*v1beta1.OpenStackCluster), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1alpha8.OpenStackCluster)(nil), (*OpenStackCluster)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_OpenStackCluster_To_v1alpha5_OpenStackCluster(a.(*v1alpha8.OpenStackCluster), b.(*OpenStackCluster), scope) + if err := s.AddGeneratedConversionFunc((*v1beta1.OpenStackCluster)(nil), (*OpenStackCluster)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_OpenStackCluster_To_v1alpha5_OpenStackCluster(a.(*v1beta1.OpenStackCluster), b.(*OpenStackCluster), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*OpenStackClusterList)(nil), (*v1alpha8.OpenStackClusterList)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha5_OpenStackClusterList_To_v1alpha8_OpenStackClusterList(a.(*OpenStackClusterList), b.(*v1alpha8.OpenStackClusterList), scope) + if err := s.AddGeneratedConversionFunc((*OpenStackClusterList)(nil), (*v1beta1.OpenStackClusterList)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha5_OpenStackClusterList_To_v1beta1_OpenStackClusterList(a.(*OpenStackClusterList), b.(*v1beta1.OpenStackClusterList), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1alpha8.OpenStackClusterList)(nil), (*OpenStackClusterList)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_OpenStackClusterList_To_v1alpha5_OpenStackClusterList(a.(*v1alpha8.OpenStackClusterList), b.(*OpenStackClusterList), scope) + if err := s.AddGeneratedConversionFunc((*v1beta1.OpenStackClusterList)(nil), (*OpenStackClusterList)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_OpenStackClusterList_To_v1alpha5_OpenStackClusterList(a.(*v1beta1.OpenStackClusterList), b.(*OpenStackClusterList), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*OpenStackClusterTemplate)(nil), (*v1alpha8.OpenStackClusterTemplate)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha5_OpenStackClusterTemplate_To_v1alpha8_OpenStackClusterTemplate(a.(*OpenStackClusterTemplate), b.(*v1alpha8.OpenStackClusterTemplate), scope) + if err := s.AddGeneratedConversionFunc((*OpenStackClusterTemplate)(nil), (*v1beta1.OpenStackClusterTemplate)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha5_OpenStackClusterTemplate_To_v1beta1_OpenStackClusterTemplate(a.(*OpenStackClusterTemplate), b.(*v1beta1.OpenStackClusterTemplate), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1alpha8.OpenStackClusterTemplate)(nil), (*OpenStackClusterTemplate)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_OpenStackClusterTemplate_To_v1alpha5_OpenStackClusterTemplate(a.(*v1alpha8.OpenStackClusterTemplate), b.(*OpenStackClusterTemplate), scope) + if err := s.AddGeneratedConversionFunc((*v1beta1.OpenStackClusterTemplate)(nil), (*OpenStackClusterTemplate)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_OpenStackClusterTemplate_To_v1alpha5_OpenStackClusterTemplate(a.(*v1beta1.OpenStackClusterTemplate), b.(*OpenStackClusterTemplate), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*OpenStackClusterTemplateList)(nil), (*v1alpha8.OpenStackClusterTemplateList)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha5_OpenStackClusterTemplateList_To_v1alpha8_OpenStackClusterTemplateList(a.(*OpenStackClusterTemplateList), b.(*v1alpha8.OpenStackClusterTemplateList), scope) + if err := s.AddGeneratedConversionFunc((*OpenStackClusterTemplateList)(nil), (*v1beta1.OpenStackClusterTemplateList)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha5_OpenStackClusterTemplateList_To_v1beta1_OpenStackClusterTemplateList(a.(*OpenStackClusterTemplateList), b.(*v1beta1.OpenStackClusterTemplateList), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1alpha8.OpenStackClusterTemplateList)(nil), (*OpenStackClusterTemplateList)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_OpenStackClusterTemplateList_To_v1alpha5_OpenStackClusterTemplateList(a.(*v1alpha8.OpenStackClusterTemplateList), b.(*OpenStackClusterTemplateList), scope) + if err := s.AddGeneratedConversionFunc((*v1beta1.OpenStackClusterTemplateList)(nil), (*OpenStackClusterTemplateList)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_OpenStackClusterTemplateList_To_v1alpha5_OpenStackClusterTemplateList(a.(*v1beta1.OpenStackClusterTemplateList), b.(*OpenStackClusterTemplateList), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*OpenStackClusterTemplateResource)(nil), (*v1alpha8.OpenStackClusterTemplateResource)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha5_OpenStackClusterTemplateResource_To_v1alpha8_OpenStackClusterTemplateResource(a.(*OpenStackClusterTemplateResource), b.(*v1alpha8.OpenStackClusterTemplateResource), scope) + if err := s.AddGeneratedConversionFunc((*OpenStackClusterTemplateResource)(nil), (*v1beta1.OpenStackClusterTemplateResource)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha5_OpenStackClusterTemplateResource_To_v1beta1_OpenStackClusterTemplateResource(a.(*OpenStackClusterTemplateResource), b.(*v1beta1.OpenStackClusterTemplateResource), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1alpha8.OpenStackClusterTemplateResource)(nil), (*OpenStackClusterTemplateResource)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_OpenStackClusterTemplateResource_To_v1alpha5_OpenStackClusterTemplateResource(a.(*v1alpha8.OpenStackClusterTemplateResource), b.(*OpenStackClusterTemplateResource), scope) + if err := s.AddGeneratedConversionFunc((*v1beta1.OpenStackClusterTemplateResource)(nil), (*OpenStackClusterTemplateResource)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_OpenStackClusterTemplateResource_To_v1alpha5_OpenStackClusterTemplateResource(a.(*v1beta1.OpenStackClusterTemplateResource), b.(*OpenStackClusterTemplateResource), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*OpenStackClusterTemplateSpec)(nil), (*v1alpha8.OpenStackClusterTemplateSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha5_OpenStackClusterTemplateSpec_To_v1alpha8_OpenStackClusterTemplateSpec(a.(*OpenStackClusterTemplateSpec), b.(*v1alpha8.OpenStackClusterTemplateSpec), scope) + if err := s.AddGeneratedConversionFunc((*OpenStackClusterTemplateSpec)(nil), (*v1beta1.OpenStackClusterTemplateSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha5_OpenStackClusterTemplateSpec_To_v1beta1_OpenStackClusterTemplateSpec(a.(*OpenStackClusterTemplateSpec), b.(*v1beta1.OpenStackClusterTemplateSpec), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1alpha8.OpenStackClusterTemplateSpec)(nil), (*OpenStackClusterTemplateSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_OpenStackClusterTemplateSpec_To_v1alpha5_OpenStackClusterTemplateSpec(a.(*v1alpha8.OpenStackClusterTemplateSpec), b.(*OpenStackClusterTemplateSpec), scope) + if err := s.AddGeneratedConversionFunc((*v1beta1.OpenStackClusterTemplateSpec)(nil), (*OpenStackClusterTemplateSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_OpenStackClusterTemplateSpec_To_v1alpha5_OpenStackClusterTemplateSpec(a.(*v1beta1.OpenStackClusterTemplateSpec), b.(*OpenStackClusterTemplateSpec), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*OpenStackIdentityReference)(nil), (*v1alpha8.OpenStackIdentityReference)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha5_OpenStackIdentityReference_To_v1alpha8_OpenStackIdentityReference(a.(*OpenStackIdentityReference), b.(*v1alpha8.OpenStackIdentityReference), scope) + if err := s.AddGeneratedConversionFunc((*OpenStackIdentityReference)(nil), (*v1beta1.OpenStackIdentityReference)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha5_OpenStackIdentityReference_To_v1beta1_OpenStackIdentityReference(a.(*OpenStackIdentityReference), b.(*v1beta1.OpenStackIdentityReference), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1alpha8.OpenStackIdentityReference)(nil), (*OpenStackIdentityReference)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_OpenStackIdentityReference_To_v1alpha5_OpenStackIdentityReference(a.(*v1alpha8.OpenStackIdentityReference), b.(*OpenStackIdentityReference), scope) + if err := s.AddGeneratedConversionFunc((*v1beta1.OpenStackIdentityReference)(nil), (*OpenStackIdentityReference)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_OpenStackIdentityReference_To_v1alpha5_OpenStackIdentityReference(a.(*v1beta1.OpenStackIdentityReference), b.(*OpenStackIdentityReference), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*OpenStackMachine)(nil), (*v1alpha8.OpenStackMachine)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha5_OpenStackMachine_To_v1alpha8_OpenStackMachine(a.(*OpenStackMachine), b.(*v1alpha8.OpenStackMachine), scope) + if err := s.AddGeneratedConversionFunc((*OpenStackMachine)(nil), (*v1beta1.OpenStackMachine)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha5_OpenStackMachine_To_v1beta1_OpenStackMachine(a.(*OpenStackMachine), b.(*v1beta1.OpenStackMachine), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1alpha8.OpenStackMachine)(nil), (*OpenStackMachine)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_OpenStackMachine_To_v1alpha5_OpenStackMachine(a.(*v1alpha8.OpenStackMachine), b.(*OpenStackMachine), scope) + if err := s.AddGeneratedConversionFunc((*v1beta1.OpenStackMachine)(nil), (*OpenStackMachine)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_OpenStackMachine_To_v1alpha5_OpenStackMachine(a.(*v1beta1.OpenStackMachine), b.(*OpenStackMachine), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*OpenStackMachineList)(nil), (*v1alpha8.OpenStackMachineList)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha5_OpenStackMachineList_To_v1alpha8_OpenStackMachineList(a.(*OpenStackMachineList), b.(*v1alpha8.OpenStackMachineList), scope) + if err := s.AddGeneratedConversionFunc((*OpenStackMachineList)(nil), (*v1beta1.OpenStackMachineList)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha5_OpenStackMachineList_To_v1beta1_OpenStackMachineList(a.(*OpenStackMachineList), b.(*v1beta1.OpenStackMachineList), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1alpha8.OpenStackMachineList)(nil), (*OpenStackMachineList)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_OpenStackMachineList_To_v1alpha5_OpenStackMachineList(a.(*v1alpha8.OpenStackMachineList), b.(*OpenStackMachineList), scope) + if err := s.AddGeneratedConversionFunc((*v1beta1.OpenStackMachineList)(nil), (*OpenStackMachineList)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_OpenStackMachineList_To_v1alpha5_OpenStackMachineList(a.(*v1beta1.OpenStackMachineList), b.(*OpenStackMachineList), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*OpenStackMachineStatus)(nil), (*v1alpha8.OpenStackMachineStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha5_OpenStackMachineStatus_To_v1alpha8_OpenStackMachineStatus(a.(*OpenStackMachineStatus), b.(*v1alpha8.OpenStackMachineStatus), scope) + if err := s.AddGeneratedConversionFunc((*OpenStackMachineStatus)(nil), (*v1beta1.OpenStackMachineStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha5_OpenStackMachineStatus_To_v1beta1_OpenStackMachineStatus(a.(*OpenStackMachineStatus), b.(*v1beta1.OpenStackMachineStatus), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*OpenStackMachineTemplate)(nil), (*v1alpha8.OpenStackMachineTemplate)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha5_OpenStackMachineTemplate_To_v1alpha8_OpenStackMachineTemplate(a.(*OpenStackMachineTemplate), b.(*v1alpha8.OpenStackMachineTemplate), scope) + if err := s.AddGeneratedConversionFunc((*OpenStackMachineTemplate)(nil), (*v1beta1.OpenStackMachineTemplate)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha5_OpenStackMachineTemplate_To_v1beta1_OpenStackMachineTemplate(a.(*OpenStackMachineTemplate), b.(*v1beta1.OpenStackMachineTemplate), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1alpha8.OpenStackMachineTemplate)(nil), (*OpenStackMachineTemplate)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_OpenStackMachineTemplate_To_v1alpha5_OpenStackMachineTemplate(a.(*v1alpha8.OpenStackMachineTemplate), b.(*OpenStackMachineTemplate), scope) + if err := s.AddGeneratedConversionFunc((*v1beta1.OpenStackMachineTemplate)(nil), (*OpenStackMachineTemplate)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_OpenStackMachineTemplate_To_v1alpha5_OpenStackMachineTemplate(a.(*v1beta1.OpenStackMachineTemplate), b.(*OpenStackMachineTemplate), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*OpenStackMachineTemplateList)(nil), (*v1alpha8.OpenStackMachineTemplateList)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha5_OpenStackMachineTemplateList_To_v1alpha8_OpenStackMachineTemplateList(a.(*OpenStackMachineTemplateList), b.(*v1alpha8.OpenStackMachineTemplateList), scope) + if err := s.AddGeneratedConversionFunc((*OpenStackMachineTemplateList)(nil), (*v1beta1.OpenStackMachineTemplateList)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha5_OpenStackMachineTemplateList_To_v1beta1_OpenStackMachineTemplateList(a.(*OpenStackMachineTemplateList), b.(*v1beta1.OpenStackMachineTemplateList), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1alpha8.OpenStackMachineTemplateList)(nil), (*OpenStackMachineTemplateList)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_OpenStackMachineTemplateList_To_v1alpha5_OpenStackMachineTemplateList(a.(*v1alpha8.OpenStackMachineTemplateList), b.(*OpenStackMachineTemplateList), scope) + if err := s.AddGeneratedConversionFunc((*v1beta1.OpenStackMachineTemplateList)(nil), (*OpenStackMachineTemplateList)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_OpenStackMachineTemplateList_To_v1alpha5_OpenStackMachineTemplateList(a.(*v1beta1.OpenStackMachineTemplateList), b.(*OpenStackMachineTemplateList), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*OpenStackMachineTemplateResource)(nil), (*v1alpha8.OpenStackMachineTemplateResource)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha5_OpenStackMachineTemplateResource_To_v1alpha8_OpenStackMachineTemplateResource(a.(*OpenStackMachineTemplateResource), b.(*v1alpha8.OpenStackMachineTemplateResource), scope) + if err := s.AddGeneratedConversionFunc((*OpenStackMachineTemplateResource)(nil), (*v1beta1.OpenStackMachineTemplateResource)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha5_OpenStackMachineTemplateResource_To_v1beta1_OpenStackMachineTemplateResource(a.(*OpenStackMachineTemplateResource), b.(*v1beta1.OpenStackMachineTemplateResource), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1alpha8.OpenStackMachineTemplateResource)(nil), (*OpenStackMachineTemplateResource)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_OpenStackMachineTemplateResource_To_v1alpha5_OpenStackMachineTemplateResource(a.(*v1alpha8.OpenStackMachineTemplateResource), b.(*OpenStackMachineTemplateResource), scope) + if err := s.AddGeneratedConversionFunc((*v1beta1.OpenStackMachineTemplateResource)(nil), (*OpenStackMachineTemplateResource)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_OpenStackMachineTemplateResource_To_v1alpha5_OpenStackMachineTemplateResource(a.(*v1beta1.OpenStackMachineTemplateResource), b.(*OpenStackMachineTemplateResource), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*OpenStackMachineTemplateSpec)(nil), (*v1alpha8.OpenStackMachineTemplateSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha5_OpenStackMachineTemplateSpec_To_v1alpha8_OpenStackMachineTemplateSpec(a.(*OpenStackMachineTemplateSpec), b.(*v1alpha8.OpenStackMachineTemplateSpec), scope) + if err := s.AddGeneratedConversionFunc((*OpenStackMachineTemplateSpec)(nil), (*v1beta1.OpenStackMachineTemplateSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha5_OpenStackMachineTemplateSpec_To_v1beta1_OpenStackMachineTemplateSpec(a.(*OpenStackMachineTemplateSpec), b.(*v1beta1.OpenStackMachineTemplateSpec), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1alpha8.OpenStackMachineTemplateSpec)(nil), (*OpenStackMachineTemplateSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_OpenStackMachineTemplateSpec_To_v1alpha5_OpenStackMachineTemplateSpec(a.(*v1alpha8.OpenStackMachineTemplateSpec), b.(*OpenStackMachineTemplateSpec), scope) + if err := s.AddGeneratedConversionFunc((*v1beta1.OpenStackMachineTemplateSpec)(nil), (*OpenStackMachineTemplateSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_OpenStackMachineTemplateSpec_To_v1alpha5_OpenStackMachineTemplateSpec(a.(*v1beta1.OpenStackMachineTemplateSpec), b.(*OpenStackMachineTemplateSpec), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*RootVolume)(nil), (*v1alpha8.RootVolume)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha5_RootVolume_To_v1alpha8_RootVolume(a.(*RootVolume), b.(*v1alpha8.RootVolume), scope) + if err := s.AddGeneratedConversionFunc((*RootVolume)(nil), (*v1beta1.RootVolume)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha5_RootVolume_To_v1beta1_RootVolume(a.(*RootVolume), b.(*v1beta1.RootVolume), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1alpha8.RootVolume)(nil), (*RootVolume)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_RootVolume_To_v1alpha5_RootVolume(a.(*v1alpha8.RootVolume), b.(*RootVolume), scope) + if err := s.AddGeneratedConversionFunc((*v1beta1.RootVolume)(nil), (*RootVolume)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_RootVolume_To_v1alpha5_RootVolume(a.(*v1beta1.RootVolume), b.(*RootVolume), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*Router)(nil), (*v1alpha8.Router)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha5_Router_To_v1alpha8_Router(a.(*Router), b.(*v1alpha8.Router), scope) + if err := s.AddGeneratedConversionFunc((*Router)(nil), (*v1beta1.Router)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha5_Router_To_v1beta1_Router(a.(*Router), b.(*v1beta1.Router), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1alpha8.Router)(nil), (*Router)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_Router_To_v1alpha5_Router(a.(*v1alpha8.Router), b.(*Router), scope) + if err := s.AddGeneratedConversionFunc((*v1beta1.Router)(nil), (*Router)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_Router_To_v1alpha5_Router(a.(*v1beta1.Router), b.(*Router), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1alpha8.SecurityGroupFilter)(nil), (*SecurityGroupFilter)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_SecurityGroupFilter_To_v1alpha5_SecurityGroupFilter(a.(*v1alpha8.SecurityGroupFilter), b.(*SecurityGroupFilter), scope) + if err := s.AddGeneratedConversionFunc((*v1beta1.SecurityGroupFilter)(nil), (*SecurityGroupFilter)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_SecurityGroupFilter_To_v1alpha5_SecurityGroupFilter(a.(*v1beta1.SecurityGroupFilter), b.(*SecurityGroupFilter), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*Subnet)(nil), (*v1alpha8.Subnet)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha5_Subnet_To_v1alpha8_Subnet(a.(*Subnet), b.(*v1alpha8.Subnet), scope) + if err := s.AddGeneratedConversionFunc((*Subnet)(nil), (*v1beta1.Subnet)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha5_Subnet_To_v1beta1_Subnet(a.(*Subnet), b.(*v1beta1.Subnet), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1alpha8.Subnet)(nil), (*Subnet)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_Subnet_To_v1alpha5_Subnet(a.(*v1alpha8.Subnet), b.(*Subnet), scope) + if err := s.AddGeneratedConversionFunc((*v1beta1.Subnet)(nil), (*Subnet)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_Subnet_To_v1alpha5_Subnet(a.(*v1beta1.Subnet), b.(*Subnet), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*SubnetFilter)(nil), (*v1alpha8.SubnetFilter)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha5_SubnetFilter_To_v1alpha8_SubnetFilter(a.(*SubnetFilter), b.(*v1alpha8.SubnetFilter), scope) + if err := s.AddGeneratedConversionFunc((*SubnetFilter)(nil), (*v1beta1.SubnetFilter)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha5_SubnetFilter_To_v1beta1_SubnetFilter(a.(*SubnetFilter), b.(*v1beta1.SubnetFilter), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1alpha8.SubnetFilter)(nil), (*SubnetFilter)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_SubnetFilter_To_v1alpha5_SubnetFilter(a.(*v1alpha8.SubnetFilter), b.(*SubnetFilter), scope) + if err := s.AddGeneratedConversionFunc((*v1beta1.SubnetFilter)(nil), (*SubnetFilter)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_SubnetFilter_To_v1alpha5_SubnetFilter(a.(*v1beta1.SubnetFilter), b.(*SubnetFilter), scope) }); err != nil { return err } - if err := s.AddConversionFunc((*Bastion)(nil), (*v1alpha8.Bastion)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha5_Bastion_To_v1alpha8_Bastion(a.(*Bastion), b.(*v1alpha8.Bastion), scope) + if err := s.AddConversionFunc((*Bastion)(nil), (*v1beta1.Bastion)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha5_Bastion_To_v1beta1_Bastion(a.(*Bastion), b.(*v1beta1.Bastion), scope) }); err != nil { return err } - if err := s.AddConversionFunc((*Instance)(nil), (*v1alpha8.BastionStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha5_Instance_To_v1alpha8_BastionStatus(a.(*Instance), b.(*v1alpha8.BastionStatus), scope) + if err := s.AddConversionFunc((*Instance)(nil), (*v1beta1.BastionStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha5_Instance_To_v1beta1_BastionStatus(a.(*Instance), b.(*v1beta1.BastionStatus), scope) }); err != nil { return err } - if err := s.AddConversionFunc((*Network)(nil), (*v1alpha8.NetworkStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha5_Network_To_v1alpha8_NetworkStatus(a.(*Network), b.(*v1alpha8.NetworkStatus), scope) + if err := s.AddConversionFunc((*Network)(nil), (*v1beta1.NetworkStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha5_Network_To_v1beta1_NetworkStatus(a.(*Network), b.(*v1beta1.NetworkStatus), scope) }); err != nil { return err } - if err := s.AddConversionFunc((*Network)(nil), (*v1alpha8.NetworkStatusWithSubnets)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha5_Network_To_v1alpha8_NetworkStatusWithSubnets(a.(*Network), b.(*v1alpha8.NetworkStatusWithSubnets), scope) + if err := s.AddConversionFunc((*Network)(nil), (*v1beta1.NetworkStatusWithSubnets)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha5_Network_To_v1beta1_NetworkStatusWithSubnets(a.(*Network), b.(*v1beta1.NetworkStatusWithSubnets), scope) }); err != nil { return err } - if err := s.AddConversionFunc((*OpenStackClusterSpec)(nil), (*v1alpha8.OpenStackClusterSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha5_OpenStackClusterSpec_To_v1alpha8_OpenStackClusterSpec(a.(*OpenStackClusterSpec), b.(*v1alpha8.OpenStackClusterSpec), scope) + if err := s.AddConversionFunc((*OpenStackClusterSpec)(nil), (*v1beta1.OpenStackClusterSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha5_OpenStackClusterSpec_To_v1beta1_OpenStackClusterSpec(a.(*OpenStackClusterSpec), b.(*v1beta1.OpenStackClusterSpec), scope) }); err != nil { return err } - if err := s.AddConversionFunc((*OpenStackClusterStatus)(nil), (*v1alpha8.OpenStackClusterStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha5_OpenStackClusterStatus_To_v1alpha8_OpenStackClusterStatus(a.(*OpenStackClusterStatus), b.(*v1alpha8.OpenStackClusterStatus), scope) + if err := s.AddConversionFunc((*OpenStackClusterStatus)(nil), (*v1beta1.OpenStackClusterStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha5_OpenStackClusterStatus_To_v1beta1_OpenStackClusterStatus(a.(*OpenStackClusterStatus), b.(*v1beta1.OpenStackClusterStatus), scope) }); err != nil { return err } - if err := s.AddConversionFunc((*OpenStackMachineSpec)(nil), (*v1alpha8.OpenStackMachineSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha5_OpenStackMachineSpec_To_v1alpha8_OpenStackMachineSpec(a.(*OpenStackMachineSpec), b.(*v1alpha8.OpenStackMachineSpec), scope) + if err := s.AddConversionFunc((*OpenStackMachineSpec)(nil), (*v1beta1.OpenStackMachineSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha5_OpenStackMachineSpec_To_v1beta1_OpenStackMachineSpec(a.(*OpenStackMachineSpec), b.(*v1beta1.OpenStackMachineSpec), scope) }); err != nil { return err } - if err := s.AddConversionFunc((*PortOpts)(nil), (*v1alpha8.PortOpts)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha5_PortOpts_To_v1alpha8_PortOpts(a.(*PortOpts), b.(*v1alpha8.PortOpts), scope) + if err := s.AddConversionFunc((*PortOpts)(nil), (*v1beta1.PortOpts)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha5_PortOpts_To_v1beta1_PortOpts(a.(*PortOpts), b.(*v1beta1.PortOpts), scope) }); err != nil { return err } - if err := s.AddConversionFunc((*SecurityGroupFilter)(nil), (*v1alpha8.SecurityGroupFilter)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha5_SecurityGroupFilter_To_v1alpha8_SecurityGroupFilter(a.(*SecurityGroupFilter), b.(*v1alpha8.SecurityGroupFilter), scope) + if err := s.AddConversionFunc((*SecurityGroupFilter)(nil), (*v1beta1.SecurityGroupFilter)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha5_SecurityGroupFilter_To_v1beta1_SecurityGroupFilter(a.(*SecurityGroupFilter), b.(*v1beta1.SecurityGroupFilter), scope) }); err != nil { return err } - if err := s.AddConversionFunc((*SecurityGroupParam)(nil), (*v1alpha8.SecurityGroupFilter)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha5_SecurityGroupParam_To_v1alpha8_SecurityGroupFilter(a.(*SecurityGroupParam), b.(*v1alpha8.SecurityGroupFilter), scope) + if err := s.AddConversionFunc((*SecurityGroupParam)(nil), (*v1beta1.SecurityGroupFilter)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha5_SecurityGroupParam_To_v1beta1_SecurityGroupFilter(a.(*SecurityGroupParam), b.(*v1beta1.SecurityGroupFilter), scope) }); err != nil { return err } - if err := s.AddConversionFunc((*SecurityGroup)(nil), (*v1alpha8.SecurityGroupStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha5_SecurityGroup_To_v1alpha8_SecurityGroupStatus(a.(*SecurityGroup), b.(*v1alpha8.SecurityGroupStatus), scope) + if err := s.AddConversionFunc((*SecurityGroup)(nil), (*v1beta1.SecurityGroupStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha5_SecurityGroup_To_v1beta1_SecurityGroupStatus(a.(*SecurityGroup), b.(*v1beta1.SecurityGroupStatus), scope) }); err != nil { return err } - if err := s.AddConversionFunc((*SubnetParam)(nil), (*v1alpha8.SubnetFilter)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha5_SubnetParam_To_v1alpha8_SubnetFilter(a.(*SubnetParam), b.(*v1alpha8.SubnetFilter), scope) + if err := s.AddConversionFunc((*SubnetParam)(nil), (*v1beta1.SubnetFilter)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha5_SubnetParam_To_v1beta1_SubnetFilter(a.(*SubnetParam), b.(*v1beta1.SubnetFilter), scope) }); err != nil { return err } - if err := s.AddConversionFunc((*v1alpha8.APIServerLoadBalancer)(nil), (*APIServerLoadBalancer)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_APIServerLoadBalancer_To_v1alpha5_APIServerLoadBalancer(a.(*v1alpha8.APIServerLoadBalancer), b.(*APIServerLoadBalancer), scope) + if err := s.AddConversionFunc((*v1beta1.APIServerLoadBalancer)(nil), (*APIServerLoadBalancer)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_APIServerLoadBalancer_To_v1alpha5_APIServerLoadBalancer(a.(*v1beta1.APIServerLoadBalancer), b.(*APIServerLoadBalancer), scope) }); err != nil { return err } - if err := s.AddConversionFunc((*v1alpha8.BastionStatus)(nil), (*Instance)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_BastionStatus_To_v1alpha5_Instance(a.(*v1alpha8.BastionStatus), b.(*Instance), scope) + if err := s.AddConversionFunc((*v1beta1.BastionStatus)(nil), (*Instance)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_BastionStatus_To_v1alpha5_Instance(a.(*v1beta1.BastionStatus), b.(*Instance), scope) }); err != nil { return err } - if err := s.AddConversionFunc((*v1alpha8.Bastion)(nil), (*Bastion)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_Bastion_To_v1alpha5_Bastion(a.(*v1alpha8.Bastion), b.(*Bastion), scope) + if err := s.AddConversionFunc((*v1beta1.Bastion)(nil), (*Bastion)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_Bastion_To_v1alpha5_Bastion(a.(*v1beta1.Bastion), b.(*Bastion), scope) }); err != nil { return err } - if err := s.AddConversionFunc((*v1alpha8.LoadBalancer)(nil), (*LoadBalancer)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_LoadBalancer_To_v1alpha5_LoadBalancer(a.(*v1alpha8.LoadBalancer), b.(*LoadBalancer), scope) + if err := s.AddConversionFunc((*v1beta1.LoadBalancer)(nil), (*LoadBalancer)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_LoadBalancer_To_v1alpha5_LoadBalancer(a.(*v1beta1.LoadBalancer), b.(*LoadBalancer), scope) }); err != nil { return err } - if err := s.AddConversionFunc((*v1alpha8.NetworkStatusWithSubnets)(nil), (*Network)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_NetworkStatusWithSubnets_To_v1alpha5_Network(a.(*v1alpha8.NetworkStatusWithSubnets), b.(*Network), scope) + if err := s.AddConversionFunc((*v1beta1.NetworkStatusWithSubnets)(nil), (*Network)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_NetworkStatusWithSubnets_To_v1alpha5_Network(a.(*v1beta1.NetworkStatusWithSubnets), b.(*Network), scope) }); err != nil { return err } - if err := s.AddConversionFunc((*v1alpha8.NetworkStatus)(nil), (*Network)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_NetworkStatus_To_v1alpha5_Network(a.(*v1alpha8.NetworkStatus), b.(*Network), scope) + if err := s.AddConversionFunc((*v1beta1.NetworkStatus)(nil), (*Network)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_NetworkStatus_To_v1alpha5_Network(a.(*v1beta1.NetworkStatus), b.(*Network), scope) }); err != nil { return err } - if err := s.AddConversionFunc((*v1alpha8.OpenStackClusterSpec)(nil), (*OpenStackClusterSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_OpenStackClusterSpec_To_v1alpha5_OpenStackClusterSpec(a.(*v1alpha8.OpenStackClusterSpec), b.(*OpenStackClusterSpec), scope) + if err := s.AddConversionFunc((*v1beta1.OpenStackClusterSpec)(nil), (*OpenStackClusterSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_OpenStackClusterSpec_To_v1alpha5_OpenStackClusterSpec(a.(*v1beta1.OpenStackClusterSpec), b.(*OpenStackClusterSpec), scope) }); err != nil { return err } - if err := s.AddConversionFunc((*v1alpha8.OpenStackClusterStatus)(nil), (*OpenStackClusterStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_OpenStackClusterStatus_To_v1alpha5_OpenStackClusterStatus(a.(*v1alpha8.OpenStackClusterStatus), b.(*OpenStackClusterStatus), scope) + if err := s.AddConversionFunc((*v1beta1.OpenStackClusterStatus)(nil), (*OpenStackClusterStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_OpenStackClusterStatus_To_v1alpha5_OpenStackClusterStatus(a.(*v1beta1.OpenStackClusterStatus), b.(*OpenStackClusterStatus), scope) }); err != nil { return err } - if err := s.AddConversionFunc((*v1alpha8.OpenStackMachineSpec)(nil), (*OpenStackMachineSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_OpenStackMachineSpec_To_v1alpha5_OpenStackMachineSpec(a.(*v1alpha8.OpenStackMachineSpec), b.(*OpenStackMachineSpec), scope) + if err := s.AddConversionFunc((*v1beta1.OpenStackMachineSpec)(nil), (*OpenStackMachineSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_OpenStackMachineSpec_To_v1alpha5_OpenStackMachineSpec(a.(*v1beta1.OpenStackMachineSpec), b.(*OpenStackMachineSpec), scope) }); err != nil { return err } - if err := s.AddConversionFunc((*v1alpha8.OpenStackMachineStatus)(nil), (*OpenStackMachineStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_OpenStackMachineStatus_To_v1alpha5_OpenStackMachineStatus(a.(*v1alpha8.OpenStackMachineStatus), b.(*OpenStackMachineStatus), scope) + if err := s.AddConversionFunc((*v1beta1.OpenStackMachineStatus)(nil), (*OpenStackMachineStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_OpenStackMachineStatus_To_v1alpha5_OpenStackMachineStatus(a.(*v1beta1.OpenStackMachineStatus), b.(*OpenStackMachineStatus), scope) }); err != nil { return err } - if err := s.AddConversionFunc((*v1alpha8.PortOpts)(nil), (*PortOpts)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_PortOpts_To_v1alpha5_PortOpts(a.(*v1alpha8.PortOpts), b.(*PortOpts), scope) + if err := s.AddConversionFunc((*v1beta1.PortOpts)(nil), (*PortOpts)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_PortOpts_To_v1alpha5_PortOpts(a.(*v1beta1.PortOpts), b.(*PortOpts), scope) }); err != nil { return err } - if err := s.AddConversionFunc((*v1alpha8.SecurityGroupFilter)(nil), (*SecurityGroupParam)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_SecurityGroupFilter_To_v1alpha5_SecurityGroupParam(a.(*v1alpha8.SecurityGroupFilter), b.(*SecurityGroupParam), scope) + if err := s.AddConversionFunc((*v1beta1.SecurityGroupFilter)(nil), (*SecurityGroupParam)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_SecurityGroupFilter_To_v1alpha5_SecurityGroupParam(a.(*v1beta1.SecurityGroupFilter), b.(*SecurityGroupParam), scope) }); err != nil { return err } - if err := s.AddConversionFunc((*v1alpha8.SecurityGroupStatus)(nil), (*SecurityGroup)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_SecurityGroupStatus_To_v1alpha5_SecurityGroup(a.(*v1alpha8.SecurityGroupStatus), b.(*SecurityGroup), scope) + if err := s.AddConversionFunc((*v1beta1.SecurityGroupStatus)(nil), (*SecurityGroup)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_SecurityGroupStatus_To_v1alpha5_SecurityGroup(a.(*v1beta1.SecurityGroupStatus), b.(*SecurityGroup), scope) }); err != nil { return err } - if err := s.AddConversionFunc((*v1alpha8.SubnetFilter)(nil), (*SubnetParam)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_SubnetFilter_To_v1alpha5_SubnetParam(a.(*v1alpha8.SubnetFilter), b.(*SubnetParam), scope) + if err := s.AddConversionFunc((*v1beta1.SubnetFilter)(nil), (*SubnetParam)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_SubnetFilter_To_v1alpha5_SubnetParam(a.(*v1beta1.SubnetFilter), b.(*SubnetParam), scope) }); err != nil { return err } return nil } -func autoConvert_v1alpha5_APIServerLoadBalancer_To_v1alpha8_APIServerLoadBalancer(in *APIServerLoadBalancer, out *v1alpha8.APIServerLoadBalancer, s conversion.Scope) error { +func autoConvert_v1alpha5_APIServerLoadBalancer_To_v1beta1_APIServerLoadBalancer(in *APIServerLoadBalancer, out *v1beta1.APIServerLoadBalancer, s conversion.Scope) error { out.Enabled = in.Enabled out.AdditionalPorts = *(*[]int)(unsafe.Pointer(&in.AdditionalPorts)) out.AllowedCIDRs = *(*[]string)(unsafe.Pointer(&in.AllowedCIDRs)) return nil } -// Convert_v1alpha5_APIServerLoadBalancer_To_v1alpha8_APIServerLoadBalancer is an autogenerated conversion function. -func Convert_v1alpha5_APIServerLoadBalancer_To_v1alpha8_APIServerLoadBalancer(in *APIServerLoadBalancer, out *v1alpha8.APIServerLoadBalancer, s conversion.Scope) error { - return autoConvert_v1alpha5_APIServerLoadBalancer_To_v1alpha8_APIServerLoadBalancer(in, out, s) +// Convert_v1alpha5_APIServerLoadBalancer_To_v1beta1_APIServerLoadBalancer is an autogenerated conversion function. +func Convert_v1alpha5_APIServerLoadBalancer_To_v1beta1_APIServerLoadBalancer(in *APIServerLoadBalancer, out *v1beta1.APIServerLoadBalancer, s conversion.Scope) error { + return autoConvert_v1alpha5_APIServerLoadBalancer_To_v1beta1_APIServerLoadBalancer(in, out, s) } -func autoConvert_v1alpha8_APIServerLoadBalancer_To_v1alpha5_APIServerLoadBalancer(in *v1alpha8.APIServerLoadBalancer, out *APIServerLoadBalancer, s conversion.Scope) error { +func autoConvert_v1beta1_APIServerLoadBalancer_To_v1alpha5_APIServerLoadBalancer(in *v1beta1.APIServerLoadBalancer, out *APIServerLoadBalancer, s conversion.Scope) error { out.Enabled = in.Enabled out.AdditionalPorts = *(*[]int)(unsafe.Pointer(&in.AdditionalPorts)) out.AllowedCIDRs = *(*[]string)(unsafe.Pointer(&in.AllowedCIDRs)) @@ -422,40 +422,40 @@ func autoConvert_v1alpha8_APIServerLoadBalancer_To_v1alpha5_APIServerLoadBalance return nil } -func autoConvert_v1alpha5_AddressPair_To_v1alpha8_AddressPair(in *AddressPair, out *v1alpha8.AddressPair, s conversion.Scope) error { +func autoConvert_v1alpha5_AddressPair_To_v1beta1_AddressPair(in *AddressPair, out *v1beta1.AddressPair, s conversion.Scope) error { out.IPAddress = in.IPAddress out.MACAddress = in.MACAddress return nil } -// Convert_v1alpha5_AddressPair_To_v1alpha8_AddressPair is an autogenerated conversion function. -func Convert_v1alpha5_AddressPair_To_v1alpha8_AddressPair(in *AddressPair, out *v1alpha8.AddressPair, s conversion.Scope) error { - return autoConvert_v1alpha5_AddressPair_To_v1alpha8_AddressPair(in, out, s) +// Convert_v1alpha5_AddressPair_To_v1beta1_AddressPair is an autogenerated conversion function. +func Convert_v1alpha5_AddressPair_To_v1beta1_AddressPair(in *AddressPair, out *v1beta1.AddressPair, s conversion.Scope) error { + return autoConvert_v1alpha5_AddressPair_To_v1beta1_AddressPair(in, out, s) } -func autoConvert_v1alpha8_AddressPair_To_v1alpha5_AddressPair(in *v1alpha8.AddressPair, out *AddressPair, s conversion.Scope) error { +func autoConvert_v1beta1_AddressPair_To_v1alpha5_AddressPair(in *v1beta1.AddressPair, out *AddressPair, s conversion.Scope) error { out.IPAddress = in.IPAddress out.MACAddress = in.MACAddress return nil } -// Convert_v1alpha8_AddressPair_To_v1alpha5_AddressPair is an autogenerated conversion function. -func Convert_v1alpha8_AddressPair_To_v1alpha5_AddressPair(in *v1alpha8.AddressPair, out *AddressPair, s conversion.Scope) error { - return autoConvert_v1alpha8_AddressPair_To_v1alpha5_AddressPair(in, out, s) +// Convert_v1beta1_AddressPair_To_v1alpha5_AddressPair is an autogenerated conversion function. +func Convert_v1beta1_AddressPair_To_v1alpha5_AddressPair(in *v1beta1.AddressPair, out *AddressPair, s conversion.Scope) error { + return autoConvert_v1beta1_AddressPair_To_v1alpha5_AddressPair(in, out, s) } -func autoConvert_v1alpha5_Bastion_To_v1alpha8_Bastion(in *Bastion, out *v1alpha8.Bastion, s conversion.Scope) error { +func autoConvert_v1alpha5_Bastion_To_v1beta1_Bastion(in *Bastion, out *v1beta1.Bastion, s conversion.Scope) error { out.Enabled = in.Enabled - if err := Convert_v1alpha5_OpenStackMachineSpec_To_v1alpha8_OpenStackMachineSpec(&in.Instance, &out.Instance, s); err != nil { + if err := Convert_v1alpha5_OpenStackMachineSpec_To_v1beta1_OpenStackMachineSpec(&in.Instance, &out.Instance, s); err != nil { return err } out.AvailabilityZone = in.AvailabilityZone return nil } -func autoConvert_v1alpha8_Bastion_To_v1alpha5_Bastion(in *v1alpha8.Bastion, out *Bastion, s conversion.Scope) error { +func autoConvert_v1beta1_Bastion_To_v1alpha5_Bastion(in *v1beta1.Bastion, out *Bastion, s conversion.Scope) error { out.Enabled = in.Enabled - if err := Convert_v1alpha8_OpenStackMachineSpec_To_v1alpha5_OpenStackMachineSpec(&in.Instance, &out.Instance, s); err != nil { + if err := Convert_v1beta1_OpenStackMachineSpec_To_v1alpha5_OpenStackMachineSpec(&in.Instance, &out.Instance, s); err != nil { return err } out.AvailabilityZone = in.AvailabilityZone @@ -463,55 +463,55 @@ func autoConvert_v1alpha8_Bastion_To_v1alpha5_Bastion(in *v1alpha8.Bastion, out return nil } -func autoConvert_v1alpha5_ExternalRouterIPParam_To_v1alpha8_ExternalRouterIPParam(in *ExternalRouterIPParam, out *v1alpha8.ExternalRouterIPParam, s conversion.Scope) error { +func autoConvert_v1alpha5_ExternalRouterIPParam_To_v1beta1_ExternalRouterIPParam(in *ExternalRouterIPParam, out *v1beta1.ExternalRouterIPParam, s conversion.Scope) error { out.FixedIP = in.FixedIP - if err := Convert_v1alpha5_SubnetParam_To_v1alpha8_SubnetFilter(&in.Subnet, &out.Subnet, s); err != nil { + if err := Convert_v1alpha5_SubnetParam_To_v1beta1_SubnetFilter(&in.Subnet, &out.Subnet, s); err != nil { return err } return nil } -// Convert_v1alpha5_ExternalRouterIPParam_To_v1alpha8_ExternalRouterIPParam is an autogenerated conversion function. -func Convert_v1alpha5_ExternalRouterIPParam_To_v1alpha8_ExternalRouterIPParam(in *ExternalRouterIPParam, out *v1alpha8.ExternalRouterIPParam, s conversion.Scope) error { - return autoConvert_v1alpha5_ExternalRouterIPParam_To_v1alpha8_ExternalRouterIPParam(in, out, s) +// Convert_v1alpha5_ExternalRouterIPParam_To_v1beta1_ExternalRouterIPParam is an autogenerated conversion function. +func Convert_v1alpha5_ExternalRouterIPParam_To_v1beta1_ExternalRouterIPParam(in *ExternalRouterIPParam, out *v1beta1.ExternalRouterIPParam, s conversion.Scope) error { + return autoConvert_v1alpha5_ExternalRouterIPParam_To_v1beta1_ExternalRouterIPParam(in, out, s) } -func autoConvert_v1alpha8_ExternalRouterIPParam_To_v1alpha5_ExternalRouterIPParam(in *v1alpha8.ExternalRouterIPParam, out *ExternalRouterIPParam, s conversion.Scope) error { +func autoConvert_v1beta1_ExternalRouterIPParam_To_v1alpha5_ExternalRouterIPParam(in *v1beta1.ExternalRouterIPParam, out *ExternalRouterIPParam, s conversion.Scope) error { out.FixedIP = in.FixedIP - if err := Convert_v1alpha8_SubnetFilter_To_v1alpha5_SubnetParam(&in.Subnet, &out.Subnet, s); err != nil { + if err := Convert_v1beta1_SubnetFilter_To_v1alpha5_SubnetParam(&in.Subnet, &out.Subnet, s); err != nil { return err } return nil } -// Convert_v1alpha8_ExternalRouterIPParam_To_v1alpha5_ExternalRouterIPParam is an autogenerated conversion function. -func Convert_v1alpha8_ExternalRouterIPParam_To_v1alpha5_ExternalRouterIPParam(in *v1alpha8.ExternalRouterIPParam, out *ExternalRouterIPParam, s conversion.Scope) error { - return autoConvert_v1alpha8_ExternalRouterIPParam_To_v1alpha5_ExternalRouterIPParam(in, out, s) +// Convert_v1beta1_ExternalRouterIPParam_To_v1alpha5_ExternalRouterIPParam is an autogenerated conversion function. +func Convert_v1beta1_ExternalRouterIPParam_To_v1alpha5_ExternalRouterIPParam(in *v1beta1.ExternalRouterIPParam, out *ExternalRouterIPParam, s conversion.Scope) error { + return autoConvert_v1beta1_ExternalRouterIPParam_To_v1alpha5_ExternalRouterIPParam(in, out, s) } -func autoConvert_v1alpha5_FixedIP_To_v1alpha8_FixedIP(in *FixedIP, out *v1alpha8.FixedIP, s conversion.Scope) error { - out.Subnet = (*v1alpha8.SubnetFilter)(unsafe.Pointer(in.Subnet)) +func autoConvert_v1alpha5_FixedIP_To_v1beta1_FixedIP(in *FixedIP, out *v1beta1.FixedIP, s conversion.Scope) error { + out.Subnet = (*v1beta1.SubnetFilter)(unsafe.Pointer(in.Subnet)) out.IPAddress = in.IPAddress return nil } -// Convert_v1alpha5_FixedIP_To_v1alpha8_FixedIP is an autogenerated conversion function. -func Convert_v1alpha5_FixedIP_To_v1alpha8_FixedIP(in *FixedIP, out *v1alpha8.FixedIP, s conversion.Scope) error { - return autoConvert_v1alpha5_FixedIP_To_v1alpha8_FixedIP(in, out, s) +// Convert_v1alpha5_FixedIP_To_v1beta1_FixedIP is an autogenerated conversion function. +func Convert_v1alpha5_FixedIP_To_v1beta1_FixedIP(in *FixedIP, out *v1beta1.FixedIP, s conversion.Scope) error { + return autoConvert_v1alpha5_FixedIP_To_v1beta1_FixedIP(in, out, s) } -func autoConvert_v1alpha8_FixedIP_To_v1alpha5_FixedIP(in *v1alpha8.FixedIP, out *FixedIP, s conversion.Scope) error { +func autoConvert_v1beta1_FixedIP_To_v1alpha5_FixedIP(in *v1beta1.FixedIP, out *FixedIP, s conversion.Scope) error { out.Subnet = (*SubnetFilter)(unsafe.Pointer(in.Subnet)) out.IPAddress = in.IPAddress return nil } -// Convert_v1alpha8_FixedIP_To_v1alpha5_FixedIP is an autogenerated conversion function. -func Convert_v1alpha8_FixedIP_To_v1alpha5_FixedIP(in *v1alpha8.FixedIP, out *FixedIP, s conversion.Scope) error { - return autoConvert_v1alpha8_FixedIP_To_v1alpha5_FixedIP(in, out, s) +// Convert_v1beta1_FixedIP_To_v1alpha5_FixedIP is an autogenerated conversion function. +func Convert_v1beta1_FixedIP_To_v1alpha5_FixedIP(in *v1beta1.FixedIP, out *FixedIP, s conversion.Scope) error { + return autoConvert_v1beta1_FixedIP_To_v1alpha5_FixedIP(in, out, s) } -func autoConvert_v1alpha5_LoadBalancer_To_v1alpha8_LoadBalancer(in *LoadBalancer, out *v1alpha8.LoadBalancer, s conversion.Scope) error { +func autoConvert_v1alpha5_LoadBalancer_To_v1beta1_LoadBalancer(in *LoadBalancer, out *v1beta1.LoadBalancer, s conversion.Scope) error { out.Name = in.Name out.ID = in.ID out.IP = in.IP @@ -520,12 +520,12 @@ func autoConvert_v1alpha5_LoadBalancer_To_v1alpha8_LoadBalancer(in *LoadBalancer return nil } -// Convert_v1alpha5_LoadBalancer_To_v1alpha8_LoadBalancer is an autogenerated conversion function. -func Convert_v1alpha5_LoadBalancer_To_v1alpha8_LoadBalancer(in *LoadBalancer, out *v1alpha8.LoadBalancer, s conversion.Scope) error { - return autoConvert_v1alpha5_LoadBalancer_To_v1alpha8_LoadBalancer(in, out, s) +// Convert_v1alpha5_LoadBalancer_To_v1beta1_LoadBalancer is an autogenerated conversion function. +func Convert_v1alpha5_LoadBalancer_To_v1beta1_LoadBalancer(in *LoadBalancer, out *v1beta1.LoadBalancer, s conversion.Scope) error { + return autoConvert_v1alpha5_LoadBalancer_To_v1beta1_LoadBalancer(in, out, s) } -func autoConvert_v1alpha8_LoadBalancer_To_v1alpha5_LoadBalancer(in *v1alpha8.LoadBalancer, out *LoadBalancer, s conversion.Scope) error { +func autoConvert_v1beta1_LoadBalancer_To_v1alpha5_LoadBalancer(in *v1beta1.LoadBalancer, out *LoadBalancer, s conversion.Scope) error { out.Name = in.Name out.ID = in.ID out.IP = in.IP @@ -535,7 +535,7 @@ func autoConvert_v1alpha8_LoadBalancer_To_v1alpha5_LoadBalancer(in *v1alpha8.Loa return nil } -func autoConvert_v1alpha5_NetworkFilter_To_v1alpha8_NetworkFilter(in *NetworkFilter, out *v1alpha8.NetworkFilter, s conversion.Scope) error { +func autoConvert_v1alpha5_NetworkFilter_To_v1beta1_NetworkFilter(in *NetworkFilter, out *v1beta1.NetworkFilter, s conversion.Scope) error { out.Name = in.Name out.Description = in.Description out.ProjectID = in.ProjectID @@ -547,12 +547,12 @@ func autoConvert_v1alpha5_NetworkFilter_To_v1alpha8_NetworkFilter(in *NetworkFil return nil } -// Convert_v1alpha5_NetworkFilter_To_v1alpha8_NetworkFilter is an autogenerated conversion function. -func Convert_v1alpha5_NetworkFilter_To_v1alpha8_NetworkFilter(in *NetworkFilter, out *v1alpha8.NetworkFilter, s conversion.Scope) error { - return autoConvert_v1alpha5_NetworkFilter_To_v1alpha8_NetworkFilter(in, out, s) +// Convert_v1alpha5_NetworkFilter_To_v1beta1_NetworkFilter is an autogenerated conversion function. +func Convert_v1alpha5_NetworkFilter_To_v1beta1_NetworkFilter(in *NetworkFilter, out *v1beta1.NetworkFilter, s conversion.Scope) error { + return autoConvert_v1alpha5_NetworkFilter_To_v1beta1_NetworkFilter(in, out, s) } -func autoConvert_v1alpha8_NetworkFilter_To_v1alpha5_NetworkFilter(in *v1alpha8.NetworkFilter, out *NetworkFilter, s conversion.Scope) error { +func autoConvert_v1beta1_NetworkFilter_To_v1alpha5_NetworkFilter(in *v1beta1.NetworkFilter, out *NetworkFilter, s conversion.Scope) error { out.Name = in.Name out.Description = in.Description out.ProjectID = in.ProjectID @@ -564,50 +564,50 @@ func autoConvert_v1alpha8_NetworkFilter_To_v1alpha5_NetworkFilter(in *v1alpha8.N return nil } -// Convert_v1alpha8_NetworkFilter_To_v1alpha5_NetworkFilter is an autogenerated conversion function. -func Convert_v1alpha8_NetworkFilter_To_v1alpha5_NetworkFilter(in *v1alpha8.NetworkFilter, out *NetworkFilter, s conversion.Scope) error { - return autoConvert_v1alpha8_NetworkFilter_To_v1alpha5_NetworkFilter(in, out, s) +// Convert_v1beta1_NetworkFilter_To_v1alpha5_NetworkFilter is an autogenerated conversion function. +func Convert_v1beta1_NetworkFilter_To_v1alpha5_NetworkFilter(in *v1beta1.NetworkFilter, out *NetworkFilter, s conversion.Scope) error { + return autoConvert_v1beta1_NetworkFilter_To_v1alpha5_NetworkFilter(in, out, s) } -func autoConvert_v1alpha5_OpenStackCluster_To_v1alpha8_OpenStackCluster(in *OpenStackCluster, out *v1alpha8.OpenStackCluster, s conversion.Scope) error { +func autoConvert_v1alpha5_OpenStackCluster_To_v1beta1_OpenStackCluster(in *OpenStackCluster, out *v1beta1.OpenStackCluster, s conversion.Scope) error { out.ObjectMeta = in.ObjectMeta - if err := Convert_v1alpha5_OpenStackClusterSpec_To_v1alpha8_OpenStackClusterSpec(&in.Spec, &out.Spec, s); err != nil { + if err := Convert_v1alpha5_OpenStackClusterSpec_To_v1beta1_OpenStackClusterSpec(&in.Spec, &out.Spec, s); err != nil { return err } - if err := Convert_v1alpha5_OpenStackClusterStatus_To_v1alpha8_OpenStackClusterStatus(&in.Status, &out.Status, s); err != nil { + if err := Convert_v1alpha5_OpenStackClusterStatus_To_v1beta1_OpenStackClusterStatus(&in.Status, &out.Status, s); err != nil { return err } return nil } -// Convert_v1alpha5_OpenStackCluster_To_v1alpha8_OpenStackCluster is an autogenerated conversion function. -func Convert_v1alpha5_OpenStackCluster_To_v1alpha8_OpenStackCluster(in *OpenStackCluster, out *v1alpha8.OpenStackCluster, s conversion.Scope) error { - return autoConvert_v1alpha5_OpenStackCluster_To_v1alpha8_OpenStackCluster(in, out, s) +// Convert_v1alpha5_OpenStackCluster_To_v1beta1_OpenStackCluster is an autogenerated conversion function. +func Convert_v1alpha5_OpenStackCluster_To_v1beta1_OpenStackCluster(in *OpenStackCluster, out *v1beta1.OpenStackCluster, s conversion.Scope) error { + return autoConvert_v1alpha5_OpenStackCluster_To_v1beta1_OpenStackCluster(in, out, s) } -func autoConvert_v1alpha8_OpenStackCluster_To_v1alpha5_OpenStackCluster(in *v1alpha8.OpenStackCluster, out *OpenStackCluster, s conversion.Scope) error { +func autoConvert_v1beta1_OpenStackCluster_To_v1alpha5_OpenStackCluster(in *v1beta1.OpenStackCluster, out *OpenStackCluster, s conversion.Scope) error { out.ObjectMeta = in.ObjectMeta - if err := Convert_v1alpha8_OpenStackClusterSpec_To_v1alpha5_OpenStackClusterSpec(&in.Spec, &out.Spec, s); err != nil { + if err := Convert_v1beta1_OpenStackClusterSpec_To_v1alpha5_OpenStackClusterSpec(&in.Spec, &out.Spec, s); err != nil { return err } - if err := Convert_v1alpha8_OpenStackClusterStatus_To_v1alpha5_OpenStackClusterStatus(&in.Status, &out.Status, s); err != nil { + if err := Convert_v1beta1_OpenStackClusterStatus_To_v1alpha5_OpenStackClusterStatus(&in.Status, &out.Status, s); err != nil { return err } return nil } -// Convert_v1alpha8_OpenStackCluster_To_v1alpha5_OpenStackCluster is an autogenerated conversion function. -func Convert_v1alpha8_OpenStackCluster_To_v1alpha5_OpenStackCluster(in *v1alpha8.OpenStackCluster, out *OpenStackCluster, s conversion.Scope) error { - return autoConvert_v1alpha8_OpenStackCluster_To_v1alpha5_OpenStackCluster(in, out, s) +// Convert_v1beta1_OpenStackCluster_To_v1alpha5_OpenStackCluster is an autogenerated conversion function. +func Convert_v1beta1_OpenStackCluster_To_v1alpha5_OpenStackCluster(in *v1beta1.OpenStackCluster, out *OpenStackCluster, s conversion.Scope) error { + return autoConvert_v1beta1_OpenStackCluster_To_v1alpha5_OpenStackCluster(in, out, s) } -func autoConvert_v1alpha5_OpenStackClusterList_To_v1alpha8_OpenStackClusterList(in *OpenStackClusterList, out *v1alpha8.OpenStackClusterList, s conversion.Scope) error { +func autoConvert_v1alpha5_OpenStackClusterList_To_v1beta1_OpenStackClusterList(in *OpenStackClusterList, out *v1beta1.OpenStackClusterList, s conversion.Scope) error { out.ListMeta = in.ListMeta if in.Items != nil { in, out := &in.Items, &out.Items - *out = make([]v1alpha8.OpenStackCluster, len(*in)) + *out = make([]v1beta1.OpenStackCluster, len(*in)) for i := range *in { - if err := Convert_v1alpha5_OpenStackCluster_To_v1alpha8_OpenStackCluster(&(*in)[i], &(*out)[i], s); err != nil { + if err := Convert_v1alpha5_OpenStackCluster_To_v1beta1_OpenStackCluster(&(*in)[i], &(*out)[i], s); err != nil { return err } } @@ -617,18 +617,18 @@ func autoConvert_v1alpha5_OpenStackClusterList_To_v1alpha8_OpenStackClusterList( return nil } -// Convert_v1alpha5_OpenStackClusterList_To_v1alpha8_OpenStackClusterList is an autogenerated conversion function. -func Convert_v1alpha5_OpenStackClusterList_To_v1alpha8_OpenStackClusterList(in *OpenStackClusterList, out *v1alpha8.OpenStackClusterList, s conversion.Scope) error { - return autoConvert_v1alpha5_OpenStackClusterList_To_v1alpha8_OpenStackClusterList(in, out, s) +// Convert_v1alpha5_OpenStackClusterList_To_v1beta1_OpenStackClusterList is an autogenerated conversion function. +func Convert_v1alpha5_OpenStackClusterList_To_v1beta1_OpenStackClusterList(in *OpenStackClusterList, out *v1beta1.OpenStackClusterList, s conversion.Scope) error { + return autoConvert_v1alpha5_OpenStackClusterList_To_v1beta1_OpenStackClusterList(in, out, s) } -func autoConvert_v1alpha8_OpenStackClusterList_To_v1alpha5_OpenStackClusterList(in *v1alpha8.OpenStackClusterList, out *OpenStackClusterList, s conversion.Scope) error { +func autoConvert_v1beta1_OpenStackClusterList_To_v1alpha5_OpenStackClusterList(in *v1beta1.OpenStackClusterList, out *OpenStackClusterList, s conversion.Scope) error { out.ListMeta = in.ListMeta if in.Items != nil { in, out := &in.Items, &out.Items *out = make([]OpenStackCluster, len(*in)) for i := range *in { - if err := Convert_v1alpha8_OpenStackCluster_To_v1alpha5_OpenStackCluster(&(*in)[i], &(*out)[i], s); err != nil { + if err := Convert_v1beta1_OpenStackCluster_To_v1alpha5_OpenStackCluster(&(*in)[i], &(*out)[i], s); err != nil { return err } } @@ -638,24 +638,24 @@ func autoConvert_v1alpha8_OpenStackClusterList_To_v1alpha5_OpenStackClusterList( return nil } -// Convert_v1alpha8_OpenStackClusterList_To_v1alpha5_OpenStackClusterList is an autogenerated conversion function. -func Convert_v1alpha8_OpenStackClusterList_To_v1alpha5_OpenStackClusterList(in *v1alpha8.OpenStackClusterList, out *OpenStackClusterList, s conversion.Scope) error { - return autoConvert_v1alpha8_OpenStackClusterList_To_v1alpha5_OpenStackClusterList(in, out, s) +// Convert_v1beta1_OpenStackClusterList_To_v1alpha5_OpenStackClusterList is an autogenerated conversion function. +func Convert_v1beta1_OpenStackClusterList_To_v1alpha5_OpenStackClusterList(in *v1beta1.OpenStackClusterList, out *OpenStackClusterList, s conversion.Scope) error { + return autoConvert_v1beta1_OpenStackClusterList_To_v1alpha5_OpenStackClusterList(in, out, s) } -func autoConvert_v1alpha5_OpenStackClusterSpec_To_v1alpha8_OpenStackClusterSpec(in *OpenStackClusterSpec, out *v1alpha8.OpenStackClusterSpec, s conversion.Scope) error { +func autoConvert_v1alpha5_OpenStackClusterSpec_To_v1beta1_OpenStackClusterSpec(in *OpenStackClusterSpec, out *v1beta1.OpenStackClusterSpec, s conversion.Scope) error { out.CloudName = in.CloudName // WARNING: in.NodeCIDR requires manual conversion: does not exist in peer-type - if err := Convert_v1alpha5_NetworkFilter_To_v1alpha8_NetworkFilter(&in.Network, &out.Network, s); err != nil { + if err := Convert_v1alpha5_NetworkFilter_To_v1beta1_NetworkFilter(&in.Network, &out.Network, s); err != nil { return err } // WARNING: in.Subnet requires manual conversion: does not exist in peer-type // WARNING: in.DNSNameservers requires manual conversion: does not exist in peer-type if in.ExternalRouterIPs != nil { in, out := &in.ExternalRouterIPs, &out.ExternalRouterIPs - *out = make([]v1alpha8.ExternalRouterIPParam, len(*in)) + *out = make([]v1beta1.ExternalRouterIPParam, len(*in)) for i := range *in { - if err := Convert_v1alpha5_ExternalRouterIPParam_To_v1alpha8_ExternalRouterIPParam(&(*in)[i], &(*out)[i], s); err != nil { + if err := Convert_v1alpha5_ExternalRouterIPParam_To_v1beta1_ExternalRouterIPParam(&(*in)[i], &(*out)[i], s); err != nil { return err } } @@ -663,14 +663,14 @@ func autoConvert_v1alpha5_OpenStackClusterSpec_To_v1alpha8_OpenStackClusterSpec( out.ExternalRouterIPs = nil } // WARNING: in.ExternalNetworkID requires manual conversion: does not exist in peer-type - if err := Convert_v1alpha5_APIServerLoadBalancer_To_v1alpha8_APIServerLoadBalancer(&in.APIServerLoadBalancer, &out.APIServerLoadBalancer, s); err != nil { + if err := Convert_v1alpha5_APIServerLoadBalancer_To_v1beta1_APIServerLoadBalancer(&in.APIServerLoadBalancer, &out.APIServerLoadBalancer, s); err != nil { return err } out.DisableAPIServerFloatingIP = in.DisableAPIServerFloatingIP out.APIServerFloatingIP = in.APIServerFloatingIP out.APIServerFixedIP = in.APIServerFixedIP out.APIServerPort = in.APIServerPort - // WARNING: in.ManagedSecurityGroups requires manual conversion: inconvertible types (bool vs *sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha8.ManagedSecurityGroups) + // WARNING: in.ManagedSecurityGroups requires manual conversion: inconvertible types (bool vs *sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1.ManagedSecurityGroups) // WARNING: in.AllowAllInClusterTraffic requires manual conversion: does not exist in peer-type out.DisablePortSecurity = in.DisablePortSecurity out.Tags = *(*[]string)(unsafe.Pointer(&in.Tags)) @@ -678,22 +678,22 @@ func autoConvert_v1alpha5_OpenStackClusterSpec_To_v1alpha8_OpenStackClusterSpec( out.ControlPlaneAvailabilityZones = *(*[]string)(unsafe.Pointer(&in.ControlPlaneAvailabilityZones)) if in.Bastion != nil { in, out := &in.Bastion, &out.Bastion - *out = new(v1alpha8.Bastion) - if err := Convert_v1alpha5_Bastion_To_v1alpha8_Bastion(*in, *out, s); err != nil { + *out = new(v1beta1.Bastion) + if err := Convert_v1alpha5_Bastion_To_v1beta1_Bastion(*in, *out, s); err != nil { return err } } else { out.Bastion = nil } - out.IdentityRef = (*v1alpha8.OpenStackIdentityReference)(unsafe.Pointer(in.IdentityRef)) + out.IdentityRef = (*v1beta1.OpenStackIdentityReference)(unsafe.Pointer(in.IdentityRef)) return nil } -func autoConvert_v1alpha8_OpenStackClusterSpec_To_v1alpha5_OpenStackClusterSpec(in *v1alpha8.OpenStackClusterSpec, out *OpenStackClusterSpec, s conversion.Scope) error { +func autoConvert_v1beta1_OpenStackClusterSpec_To_v1alpha5_OpenStackClusterSpec(in *v1beta1.OpenStackClusterSpec, out *OpenStackClusterSpec, s conversion.Scope) error { out.CloudName = in.CloudName // WARNING: in.ManagedSubnets requires manual conversion: does not exist in peer-type // WARNING: in.Router requires manual conversion: does not exist in peer-type - if err := Convert_v1alpha8_NetworkFilter_To_v1alpha5_NetworkFilter(&in.Network, &out.Network, s); err != nil { + if err := Convert_v1beta1_NetworkFilter_To_v1alpha5_NetworkFilter(&in.Network, &out.Network, s); err != nil { return err } // WARNING: in.Subnets requires manual conversion: does not exist in peer-type @@ -702,7 +702,7 @@ func autoConvert_v1alpha8_OpenStackClusterSpec_To_v1alpha5_OpenStackClusterSpec( in, out := &in.ExternalRouterIPs, &out.ExternalRouterIPs *out = make([]ExternalRouterIPParam, len(*in)) for i := range *in { - if err := Convert_v1alpha8_ExternalRouterIPParam_To_v1alpha5_ExternalRouterIPParam(&(*in)[i], &(*out)[i], s); err != nil { + if err := Convert_v1beta1_ExternalRouterIPParam_To_v1alpha5_ExternalRouterIPParam(&(*in)[i], &(*out)[i], s); err != nil { return err } } @@ -711,14 +711,14 @@ func autoConvert_v1alpha8_OpenStackClusterSpec_To_v1alpha5_OpenStackClusterSpec( } // WARNING: in.ExternalNetwork requires manual conversion: does not exist in peer-type // WARNING: in.DisableExternalNetwork requires manual conversion: does not exist in peer-type - if err := Convert_v1alpha8_APIServerLoadBalancer_To_v1alpha5_APIServerLoadBalancer(&in.APIServerLoadBalancer, &out.APIServerLoadBalancer, s); err != nil { + if err := Convert_v1beta1_APIServerLoadBalancer_To_v1alpha5_APIServerLoadBalancer(&in.APIServerLoadBalancer, &out.APIServerLoadBalancer, s); err != nil { return err } out.DisableAPIServerFloatingIP = in.DisableAPIServerFloatingIP out.APIServerFloatingIP = in.APIServerFloatingIP out.APIServerFixedIP = in.APIServerFixedIP out.APIServerPort = in.APIServerPort - // WARNING: in.ManagedSecurityGroups requires manual conversion: inconvertible types (*sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha8.ManagedSecurityGroups vs bool) + // WARNING: in.ManagedSecurityGroups requires manual conversion: inconvertible types (*sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1.ManagedSecurityGroups vs bool) out.DisablePortSecurity = in.DisablePortSecurity out.Tags = *(*[]string)(unsafe.Pointer(&in.Tags)) out.ControlPlaneEndpoint = in.ControlPlaneEndpoint @@ -727,7 +727,7 @@ func autoConvert_v1alpha8_OpenStackClusterSpec_To_v1alpha5_OpenStackClusterSpec( if in.Bastion != nil { in, out := &in.Bastion, &out.Bastion *out = new(Bastion) - if err := Convert_v1alpha8_Bastion_To_v1alpha5_Bastion(*in, *out, s); err != nil { + if err := Convert_v1beta1_Bastion_To_v1alpha5_Bastion(*in, *out, s); err != nil { return err } } else { @@ -737,12 +737,12 @@ func autoConvert_v1alpha8_OpenStackClusterSpec_To_v1alpha5_OpenStackClusterSpec( return nil } -func autoConvert_v1alpha5_OpenStackClusterStatus_To_v1alpha8_OpenStackClusterStatus(in *OpenStackClusterStatus, out *v1alpha8.OpenStackClusterStatus, s conversion.Scope) error { +func autoConvert_v1alpha5_OpenStackClusterStatus_To_v1beta1_OpenStackClusterStatus(in *OpenStackClusterStatus, out *v1beta1.OpenStackClusterStatus, s conversion.Scope) error { out.Ready = in.Ready if in.Network != nil { in, out := &in.Network, &out.Network - *out = new(v1alpha8.NetworkStatusWithSubnets) - if err := Convert_v1alpha5_Network_To_v1alpha8_NetworkStatusWithSubnets(*in, *out, s); err != nil { + *out = new(v1beta1.NetworkStatusWithSubnets) + if err := Convert_v1alpha5_Network_To_v1beta1_NetworkStatusWithSubnets(*in, *out, s); err != nil { return err } } else { @@ -750,18 +750,18 @@ func autoConvert_v1alpha5_OpenStackClusterStatus_To_v1alpha8_OpenStackClusterSta } if in.ExternalNetwork != nil { in, out := &in.ExternalNetwork, &out.ExternalNetwork - *out = new(v1alpha8.NetworkStatus) - if err := Convert_v1alpha5_Network_To_v1alpha8_NetworkStatus(*in, *out, s); err != nil { + *out = new(v1beta1.NetworkStatus) + if err := Convert_v1alpha5_Network_To_v1beta1_NetworkStatus(*in, *out, s); err != nil { return err } } else { out.ExternalNetwork = nil } - out.FailureDomains = *(*v1beta1.FailureDomains)(unsafe.Pointer(&in.FailureDomains)) + out.FailureDomains = *(*apiv1beta1.FailureDomains)(unsafe.Pointer(&in.FailureDomains)) if in.ControlPlaneSecurityGroup != nil { in, out := &in.ControlPlaneSecurityGroup, &out.ControlPlaneSecurityGroup - *out = new(v1alpha8.SecurityGroupStatus) - if err := Convert_v1alpha5_SecurityGroup_To_v1alpha8_SecurityGroupStatus(*in, *out, s); err != nil { + *out = new(v1beta1.SecurityGroupStatus) + if err := Convert_v1alpha5_SecurityGroup_To_v1beta1_SecurityGroupStatus(*in, *out, s); err != nil { return err } } else { @@ -769,8 +769,8 @@ func autoConvert_v1alpha5_OpenStackClusterStatus_To_v1alpha8_OpenStackClusterSta } if in.WorkerSecurityGroup != nil { in, out := &in.WorkerSecurityGroup, &out.WorkerSecurityGroup - *out = new(v1alpha8.SecurityGroupStatus) - if err := Convert_v1alpha5_SecurityGroup_To_v1alpha8_SecurityGroupStatus(*in, *out, s); err != nil { + *out = new(v1beta1.SecurityGroupStatus) + if err := Convert_v1alpha5_SecurityGroup_To_v1beta1_SecurityGroupStatus(*in, *out, s); err != nil { return err } } else { @@ -778,8 +778,8 @@ func autoConvert_v1alpha5_OpenStackClusterStatus_To_v1alpha8_OpenStackClusterSta } if in.BastionSecurityGroup != nil { in, out := &in.BastionSecurityGroup, &out.BastionSecurityGroup - *out = new(v1alpha8.SecurityGroupStatus) - if err := Convert_v1alpha5_SecurityGroup_To_v1alpha8_SecurityGroupStatus(*in, *out, s); err != nil { + *out = new(v1beta1.SecurityGroupStatus) + if err := Convert_v1alpha5_SecurityGroup_To_v1beta1_SecurityGroupStatus(*in, *out, s); err != nil { return err } } else { @@ -787,8 +787,8 @@ func autoConvert_v1alpha5_OpenStackClusterStatus_To_v1alpha8_OpenStackClusterSta } if in.Bastion != nil { in, out := &in.Bastion, &out.Bastion - *out = new(v1alpha8.BastionStatus) - if err := Convert_v1alpha5_Instance_To_v1alpha8_BastionStatus(*in, *out, s); err != nil { + *out = new(v1beta1.BastionStatus) + if err := Convert_v1alpha5_Instance_To_v1beta1_BastionStatus(*in, *out, s); err != nil { return err } } else { @@ -799,12 +799,12 @@ func autoConvert_v1alpha5_OpenStackClusterStatus_To_v1alpha8_OpenStackClusterSta return nil } -func autoConvert_v1alpha8_OpenStackClusterStatus_To_v1alpha5_OpenStackClusterStatus(in *v1alpha8.OpenStackClusterStatus, out *OpenStackClusterStatus, s conversion.Scope) error { +func autoConvert_v1beta1_OpenStackClusterStatus_To_v1alpha5_OpenStackClusterStatus(in *v1beta1.OpenStackClusterStatus, out *OpenStackClusterStatus, s conversion.Scope) error { out.Ready = in.Ready if in.Network != nil { in, out := &in.Network, &out.Network *out = new(Network) - if err := Convert_v1alpha8_NetworkStatusWithSubnets_To_v1alpha5_Network(*in, *out, s); err != nil { + if err := Convert_v1beta1_NetworkStatusWithSubnets_To_v1alpha5_Network(*in, *out, s); err != nil { return err } } else { @@ -813,7 +813,7 @@ func autoConvert_v1alpha8_OpenStackClusterStatus_To_v1alpha5_OpenStackClusterSta if in.ExternalNetwork != nil { in, out := &in.ExternalNetwork, &out.ExternalNetwork *out = new(Network) - if err := Convert_v1alpha8_NetworkStatus_To_v1alpha5_Network(*in, *out, s); err != nil { + if err := Convert_v1beta1_NetworkStatus_To_v1alpha5_Network(*in, *out, s); err != nil { return err } } else { @@ -821,11 +821,11 @@ func autoConvert_v1alpha8_OpenStackClusterStatus_To_v1alpha5_OpenStackClusterSta } // WARNING: in.Router requires manual conversion: does not exist in peer-type // WARNING: in.APIServerLoadBalancer requires manual conversion: does not exist in peer-type - out.FailureDomains = *(*v1beta1.FailureDomains)(unsafe.Pointer(&in.FailureDomains)) + out.FailureDomains = *(*apiv1beta1.FailureDomains)(unsafe.Pointer(&in.FailureDomains)) if in.ControlPlaneSecurityGroup != nil { in, out := &in.ControlPlaneSecurityGroup, &out.ControlPlaneSecurityGroup *out = new(SecurityGroup) - if err := Convert_v1alpha8_SecurityGroupStatus_To_v1alpha5_SecurityGroup(*in, *out, s); err != nil { + if err := Convert_v1beta1_SecurityGroupStatus_To_v1alpha5_SecurityGroup(*in, *out, s); err != nil { return err } } else { @@ -834,7 +834,7 @@ func autoConvert_v1alpha8_OpenStackClusterStatus_To_v1alpha5_OpenStackClusterSta if in.WorkerSecurityGroup != nil { in, out := &in.WorkerSecurityGroup, &out.WorkerSecurityGroup *out = new(SecurityGroup) - if err := Convert_v1alpha8_SecurityGroupStatus_To_v1alpha5_SecurityGroup(*in, *out, s); err != nil { + if err := Convert_v1beta1_SecurityGroupStatus_To_v1alpha5_SecurityGroup(*in, *out, s); err != nil { return err } } else { @@ -843,7 +843,7 @@ func autoConvert_v1alpha8_OpenStackClusterStatus_To_v1alpha5_OpenStackClusterSta if in.BastionSecurityGroup != nil { in, out := &in.BastionSecurityGroup, &out.BastionSecurityGroup *out = new(SecurityGroup) - if err := Convert_v1alpha8_SecurityGroupStatus_To_v1alpha5_SecurityGroup(*in, *out, s); err != nil { + if err := Convert_v1beta1_SecurityGroupStatus_To_v1alpha5_SecurityGroup(*in, *out, s); err != nil { return err } } else { @@ -852,7 +852,7 @@ func autoConvert_v1alpha8_OpenStackClusterStatus_To_v1alpha5_OpenStackClusterSta if in.Bastion != nil { in, out := &in.Bastion, &out.Bastion *out = new(Instance) - if err := Convert_v1alpha8_BastionStatus_To_v1alpha5_Instance(*in, *out, s); err != nil { + if err := Convert_v1beta1_BastionStatus_To_v1alpha5_Instance(*in, *out, s); err != nil { return err } } else { @@ -863,39 +863,39 @@ func autoConvert_v1alpha8_OpenStackClusterStatus_To_v1alpha5_OpenStackClusterSta return nil } -func autoConvert_v1alpha5_OpenStackClusterTemplate_To_v1alpha8_OpenStackClusterTemplate(in *OpenStackClusterTemplate, out *v1alpha8.OpenStackClusterTemplate, s conversion.Scope) error { +func autoConvert_v1alpha5_OpenStackClusterTemplate_To_v1beta1_OpenStackClusterTemplate(in *OpenStackClusterTemplate, out *v1beta1.OpenStackClusterTemplate, s conversion.Scope) error { out.ObjectMeta = in.ObjectMeta - if err := Convert_v1alpha5_OpenStackClusterTemplateSpec_To_v1alpha8_OpenStackClusterTemplateSpec(&in.Spec, &out.Spec, s); err != nil { + if err := Convert_v1alpha5_OpenStackClusterTemplateSpec_To_v1beta1_OpenStackClusterTemplateSpec(&in.Spec, &out.Spec, s); err != nil { return err } return nil } -// Convert_v1alpha5_OpenStackClusterTemplate_To_v1alpha8_OpenStackClusterTemplate is an autogenerated conversion function. -func Convert_v1alpha5_OpenStackClusterTemplate_To_v1alpha8_OpenStackClusterTemplate(in *OpenStackClusterTemplate, out *v1alpha8.OpenStackClusterTemplate, s conversion.Scope) error { - return autoConvert_v1alpha5_OpenStackClusterTemplate_To_v1alpha8_OpenStackClusterTemplate(in, out, s) +// Convert_v1alpha5_OpenStackClusterTemplate_To_v1beta1_OpenStackClusterTemplate is an autogenerated conversion function. +func Convert_v1alpha5_OpenStackClusterTemplate_To_v1beta1_OpenStackClusterTemplate(in *OpenStackClusterTemplate, out *v1beta1.OpenStackClusterTemplate, s conversion.Scope) error { + return autoConvert_v1alpha5_OpenStackClusterTemplate_To_v1beta1_OpenStackClusterTemplate(in, out, s) } -func autoConvert_v1alpha8_OpenStackClusterTemplate_To_v1alpha5_OpenStackClusterTemplate(in *v1alpha8.OpenStackClusterTemplate, out *OpenStackClusterTemplate, s conversion.Scope) error { +func autoConvert_v1beta1_OpenStackClusterTemplate_To_v1alpha5_OpenStackClusterTemplate(in *v1beta1.OpenStackClusterTemplate, out *OpenStackClusterTemplate, s conversion.Scope) error { out.ObjectMeta = in.ObjectMeta - if err := Convert_v1alpha8_OpenStackClusterTemplateSpec_To_v1alpha5_OpenStackClusterTemplateSpec(&in.Spec, &out.Spec, s); err != nil { + if err := Convert_v1beta1_OpenStackClusterTemplateSpec_To_v1alpha5_OpenStackClusterTemplateSpec(&in.Spec, &out.Spec, s); err != nil { return err } return nil } -// Convert_v1alpha8_OpenStackClusterTemplate_To_v1alpha5_OpenStackClusterTemplate is an autogenerated conversion function. -func Convert_v1alpha8_OpenStackClusterTemplate_To_v1alpha5_OpenStackClusterTemplate(in *v1alpha8.OpenStackClusterTemplate, out *OpenStackClusterTemplate, s conversion.Scope) error { - return autoConvert_v1alpha8_OpenStackClusterTemplate_To_v1alpha5_OpenStackClusterTemplate(in, out, s) +// Convert_v1beta1_OpenStackClusterTemplate_To_v1alpha5_OpenStackClusterTemplate is an autogenerated conversion function. +func Convert_v1beta1_OpenStackClusterTemplate_To_v1alpha5_OpenStackClusterTemplate(in *v1beta1.OpenStackClusterTemplate, out *OpenStackClusterTemplate, s conversion.Scope) error { + return autoConvert_v1beta1_OpenStackClusterTemplate_To_v1alpha5_OpenStackClusterTemplate(in, out, s) } -func autoConvert_v1alpha5_OpenStackClusterTemplateList_To_v1alpha8_OpenStackClusterTemplateList(in *OpenStackClusterTemplateList, out *v1alpha8.OpenStackClusterTemplateList, s conversion.Scope) error { +func autoConvert_v1alpha5_OpenStackClusterTemplateList_To_v1beta1_OpenStackClusterTemplateList(in *OpenStackClusterTemplateList, out *v1beta1.OpenStackClusterTemplateList, s conversion.Scope) error { out.ListMeta = in.ListMeta if in.Items != nil { in, out := &in.Items, &out.Items - *out = make([]v1alpha8.OpenStackClusterTemplate, len(*in)) + *out = make([]v1beta1.OpenStackClusterTemplate, len(*in)) for i := range *in { - if err := Convert_v1alpha5_OpenStackClusterTemplate_To_v1alpha8_OpenStackClusterTemplate(&(*in)[i], &(*out)[i], s); err != nil { + if err := Convert_v1alpha5_OpenStackClusterTemplate_To_v1beta1_OpenStackClusterTemplate(&(*in)[i], &(*out)[i], s); err != nil { return err } } @@ -905,18 +905,18 @@ func autoConvert_v1alpha5_OpenStackClusterTemplateList_To_v1alpha8_OpenStackClus return nil } -// Convert_v1alpha5_OpenStackClusterTemplateList_To_v1alpha8_OpenStackClusterTemplateList is an autogenerated conversion function. -func Convert_v1alpha5_OpenStackClusterTemplateList_To_v1alpha8_OpenStackClusterTemplateList(in *OpenStackClusterTemplateList, out *v1alpha8.OpenStackClusterTemplateList, s conversion.Scope) error { - return autoConvert_v1alpha5_OpenStackClusterTemplateList_To_v1alpha8_OpenStackClusterTemplateList(in, out, s) +// Convert_v1alpha5_OpenStackClusterTemplateList_To_v1beta1_OpenStackClusterTemplateList is an autogenerated conversion function. +func Convert_v1alpha5_OpenStackClusterTemplateList_To_v1beta1_OpenStackClusterTemplateList(in *OpenStackClusterTemplateList, out *v1beta1.OpenStackClusterTemplateList, s conversion.Scope) error { + return autoConvert_v1alpha5_OpenStackClusterTemplateList_To_v1beta1_OpenStackClusterTemplateList(in, out, s) } -func autoConvert_v1alpha8_OpenStackClusterTemplateList_To_v1alpha5_OpenStackClusterTemplateList(in *v1alpha8.OpenStackClusterTemplateList, out *OpenStackClusterTemplateList, s conversion.Scope) error { +func autoConvert_v1beta1_OpenStackClusterTemplateList_To_v1alpha5_OpenStackClusterTemplateList(in *v1beta1.OpenStackClusterTemplateList, out *OpenStackClusterTemplateList, s conversion.Scope) error { out.ListMeta = in.ListMeta if in.Items != nil { in, out := &in.Items, &out.Items *out = make([]OpenStackClusterTemplate, len(*in)) for i := range *in { - if err := Convert_v1alpha8_OpenStackClusterTemplate_To_v1alpha5_OpenStackClusterTemplate(&(*in)[i], &(*out)[i], s); err != nil { + if err := Convert_v1beta1_OpenStackClusterTemplate_To_v1alpha5_OpenStackClusterTemplate(&(*in)[i], &(*out)[i], s); err != nil { return err } } @@ -926,120 +926,120 @@ func autoConvert_v1alpha8_OpenStackClusterTemplateList_To_v1alpha5_OpenStackClus return nil } -// Convert_v1alpha8_OpenStackClusterTemplateList_To_v1alpha5_OpenStackClusterTemplateList is an autogenerated conversion function. -func Convert_v1alpha8_OpenStackClusterTemplateList_To_v1alpha5_OpenStackClusterTemplateList(in *v1alpha8.OpenStackClusterTemplateList, out *OpenStackClusterTemplateList, s conversion.Scope) error { - return autoConvert_v1alpha8_OpenStackClusterTemplateList_To_v1alpha5_OpenStackClusterTemplateList(in, out, s) +// Convert_v1beta1_OpenStackClusterTemplateList_To_v1alpha5_OpenStackClusterTemplateList is an autogenerated conversion function. +func Convert_v1beta1_OpenStackClusterTemplateList_To_v1alpha5_OpenStackClusterTemplateList(in *v1beta1.OpenStackClusterTemplateList, out *OpenStackClusterTemplateList, s conversion.Scope) error { + return autoConvert_v1beta1_OpenStackClusterTemplateList_To_v1alpha5_OpenStackClusterTemplateList(in, out, s) } -func autoConvert_v1alpha5_OpenStackClusterTemplateResource_To_v1alpha8_OpenStackClusterTemplateResource(in *OpenStackClusterTemplateResource, out *v1alpha8.OpenStackClusterTemplateResource, s conversion.Scope) error { - if err := Convert_v1alpha5_OpenStackClusterSpec_To_v1alpha8_OpenStackClusterSpec(&in.Spec, &out.Spec, s); err != nil { +func autoConvert_v1alpha5_OpenStackClusterTemplateResource_To_v1beta1_OpenStackClusterTemplateResource(in *OpenStackClusterTemplateResource, out *v1beta1.OpenStackClusterTemplateResource, s conversion.Scope) error { + if err := Convert_v1alpha5_OpenStackClusterSpec_To_v1beta1_OpenStackClusterSpec(&in.Spec, &out.Spec, s); err != nil { return err } return nil } -// Convert_v1alpha5_OpenStackClusterTemplateResource_To_v1alpha8_OpenStackClusterTemplateResource is an autogenerated conversion function. -func Convert_v1alpha5_OpenStackClusterTemplateResource_To_v1alpha8_OpenStackClusterTemplateResource(in *OpenStackClusterTemplateResource, out *v1alpha8.OpenStackClusterTemplateResource, s conversion.Scope) error { - return autoConvert_v1alpha5_OpenStackClusterTemplateResource_To_v1alpha8_OpenStackClusterTemplateResource(in, out, s) +// Convert_v1alpha5_OpenStackClusterTemplateResource_To_v1beta1_OpenStackClusterTemplateResource is an autogenerated conversion function. +func Convert_v1alpha5_OpenStackClusterTemplateResource_To_v1beta1_OpenStackClusterTemplateResource(in *OpenStackClusterTemplateResource, out *v1beta1.OpenStackClusterTemplateResource, s conversion.Scope) error { + return autoConvert_v1alpha5_OpenStackClusterTemplateResource_To_v1beta1_OpenStackClusterTemplateResource(in, out, s) } -func autoConvert_v1alpha8_OpenStackClusterTemplateResource_To_v1alpha5_OpenStackClusterTemplateResource(in *v1alpha8.OpenStackClusterTemplateResource, out *OpenStackClusterTemplateResource, s conversion.Scope) error { - if err := Convert_v1alpha8_OpenStackClusterSpec_To_v1alpha5_OpenStackClusterSpec(&in.Spec, &out.Spec, s); err != nil { +func autoConvert_v1beta1_OpenStackClusterTemplateResource_To_v1alpha5_OpenStackClusterTemplateResource(in *v1beta1.OpenStackClusterTemplateResource, out *OpenStackClusterTemplateResource, s conversion.Scope) error { + if err := Convert_v1beta1_OpenStackClusterSpec_To_v1alpha5_OpenStackClusterSpec(&in.Spec, &out.Spec, s); err != nil { return err } return nil } -// Convert_v1alpha8_OpenStackClusterTemplateResource_To_v1alpha5_OpenStackClusterTemplateResource is an autogenerated conversion function. -func Convert_v1alpha8_OpenStackClusterTemplateResource_To_v1alpha5_OpenStackClusterTemplateResource(in *v1alpha8.OpenStackClusterTemplateResource, out *OpenStackClusterTemplateResource, s conversion.Scope) error { - return autoConvert_v1alpha8_OpenStackClusterTemplateResource_To_v1alpha5_OpenStackClusterTemplateResource(in, out, s) +// Convert_v1beta1_OpenStackClusterTemplateResource_To_v1alpha5_OpenStackClusterTemplateResource is an autogenerated conversion function. +func Convert_v1beta1_OpenStackClusterTemplateResource_To_v1alpha5_OpenStackClusterTemplateResource(in *v1beta1.OpenStackClusterTemplateResource, out *OpenStackClusterTemplateResource, s conversion.Scope) error { + return autoConvert_v1beta1_OpenStackClusterTemplateResource_To_v1alpha5_OpenStackClusterTemplateResource(in, out, s) } -func autoConvert_v1alpha5_OpenStackClusterTemplateSpec_To_v1alpha8_OpenStackClusterTemplateSpec(in *OpenStackClusterTemplateSpec, out *v1alpha8.OpenStackClusterTemplateSpec, s conversion.Scope) error { - if err := Convert_v1alpha5_OpenStackClusterTemplateResource_To_v1alpha8_OpenStackClusterTemplateResource(&in.Template, &out.Template, s); err != nil { +func autoConvert_v1alpha5_OpenStackClusterTemplateSpec_To_v1beta1_OpenStackClusterTemplateSpec(in *OpenStackClusterTemplateSpec, out *v1beta1.OpenStackClusterTemplateSpec, s conversion.Scope) error { + if err := Convert_v1alpha5_OpenStackClusterTemplateResource_To_v1beta1_OpenStackClusterTemplateResource(&in.Template, &out.Template, s); err != nil { return err } return nil } -// Convert_v1alpha5_OpenStackClusterTemplateSpec_To_v1alpha8_OpenStackClusterTemplateSpec is an autogenerated conversion function. -func Convert_v1alpha5_OpenStackClusterTemplateSpec_To_v1alpha8_OpenStackClusterTemplateSpec(in *OpenStackClusterTemplateSpec, out *v1alpha8.OpenStackClusterTemplateSpec, s conversion.Scope) error { - return autoConvert_v1alpha5_OpenStackClusterTemplateSpec_To_v1alpha8_OpenStackClusterTemplateSpec(in, out, s) +// Convert_v1alpha5_OpenStackClusterTemplateSpec_To_v1beta1_OpenStackClusterTemplateSpec is an autogenerated conversion function. +func Convert_v1alpha5_OpenStackClusterTemplateSpec_To_v1beta1_OpenStackClusterTemplateSpec(in *OpenStackClusterTemplateSpec, out *v1beta1.OpenStackClusterTemplateSpec, s conversion.Scope) error { + return autoConvert_v1alpha5_OpenStackClusterTemplateSpec_To_v1beta1_OpenStackClusterTemplateSpec(in, out, s) } -func autoConvert_v1alpha8_OpenStackClusterTemplateSpec_To_v1alpha5_OpenStackClusterTemplateSpec(in *v1alpha8.OpenStackClusterTemplateSpec, out *OpenStackClusterTemplateSpec, s conversion.Scope) error { - if err := Convert_v1alpha8_OpenStackClusterTemplateResource_To_v1alpha5_OpenStackClusterTemplateResource(&in.Template, &out.Template, s); err != nil { +func autoConvert_v1beta1_OpenStackClusterTemplateSpec_To_v1alpha5_OpenStackClusterTemplateSpec(in *v1beta1.OpenStackClusterTemplateSpec, out *OpenStackClusterTemplateSpec, s conversion.Scope) error { + if err := Convert_v1beta1_OpenStackClusterTemplateResource_To_v1alpha5_OpenStackClusterTemplateResource(&in.Template, &out.Template, s); err != nil { return err } return nil } -// Convert_v1alpha8_OpenStackClusterTemplateSpec_To_v1alpha5_OpenStackClusterTemplateSpec is an autogenerated conversion function. -func Convert_v1alpha8_OpenStackClusterTemplateSpec_To_v1alpha5_OpenStackClusterTemplateSpec(in *v1alpha8.OpenStackClusterTemplateSpec, out *OpenStackClusterTemplateSpec, s conversion.Scope) error { - return autoConvert_v1alpha8_OpenStackClusterTemplateSpec_To_v1alpha5_OpenStackClusterTemplateSpec(in, out, s) +// Convert_v1beta1_OpenStackClusterTemplateSpec_To_v1alpha5_OpenStackClusterTemplateSpec is an autogenerated conversion function. +func Convert_v1beta1_OpenStackClusterTemplateSpec_To_v1alpha5_OpenStackClusterTemplateSpec(in *v1beta1.OpenStackClusterTemplateSpec, out *OpenStackClusterTemplateSpec, s conversion.Scope) error { + return autoConvert_v1beta1_OpenStackClusterTemplateSpec_To_v1alpha5_OpenStackClusterTemplateSpec(in, out, s) } -func autoConvert_v1alpha5_OpenStackIdentityReference_To_v1alpha8_OpenStackIdentityReference(in *OpenStackIdentityReference, out *v1alpha8.OpenStackIdentityReference, s conversion.Scope) error { +func autoConvert_v1alpha5_OpenStackIdentityReference_To_v1beta1_OpenStackIdentityReference(in *OpenStackIdentityReference, out *v1beta1.OpenStackIdentityReference, s conversion.Scope) error { out.Kind = in.Kind out.Name = in.Name return nil } -// Convert_v1alpha5_OpenStackIdentityReference_To_v1alpha8_OpenStackIdentityReference is an autogenerated conversion function. -func Convert_v1alpha5_OpenStackIdentityReference_To_v1alpha8_OpenStackIdentityReference(in *OpenStackIdentityReference, out *v1alpha8.OpenStackIdentityReference, s conversion.Scope) error { - return autoConvert_v1alpha5_OpenStackIdentityReference_To_v1alpha8_OpenStackIdentityReference(in, out, s) +// Convert_v1alpha5_OpenStackIdentityReference_To_v1beta1_OpenStackIdentityReference is an autogenerated conversion function. +func Convert_v1alpha5_OpenStackIdentityReference_To_v1beta1_OpenStackIdentityReference(in *OpenStackIdentityReference, out *v1beta1.OpenStackIdentityReference, s conversion.Scope) error { + return autoConvert_v1alpha5_OpenStackIdentityReference_To_v1beta1_OpenStackIdentityReference(in, out, s) } -func autoConvert_v1alpha8_OpenStackIdentityReference_To_v1alpha5_OpenStackIdentityReference(in *v1alpha8.OpenStackIdentityReference, out *OpenStackIdentityReference, s conversion.Scope) error { +func autoConvert_v1beta1_OpenStackIdentityReference_To_v1alpha5_OpenStackIdentityReference(in *v1beta1.OpenStackIdentityReference, out *OpenStackIdentityReference, s conversion.Scope) error { out.Kind = in.Kind out.Name = in.Name return nil } -// Convert_v1alpha8_OpenStackIdentityReference_To_v1alpha5_OpenStackIdentityReference is an autogenerated conversion function. -func Convert_v1alpha8_OpenStackIdentityReference_To_v1alpha5_OpenStackIdentityReference(in *v1alpha8.OpenStackIdentityReference, out *OpenStackIdentityReference, s conversion.Scope) error { - return autoConvert_v1alpha8_OpenStackIdentityReference_To_v1alpha5_OpenStackIdentityReference(in, out, s) +// Convert_v1beta1_OpenStackIdentityReference_To_v1alpha5_OpenStackIdentityReference is an autogenerated conversion function. +func Convert_v1beta1_OpenStackIdentityReference_To_v1alpha5_OpenStackIdentityReference(in *v1beta1.OpenStackIdentityReference, out *OpenStackIdentityReference, s conversion.Scope) error { + return autoConvert_v1beta1_OpenStackIdentityReference_To_v1alpha5_OpenStackIdentityReference(in, out, s) } -func autoConvert_v1alpha5_OpenStackMachine_To_v1alpha8_OpenStackMachine(in *OpenStackMachine, out *v1alpha8.OpenStackMachine, s conversion.Scope) error { +func autoConvert_v1alpha5_OpenStackMachine_To_v1beta1_OpenStackMachine(in *OpenStackMachine, out *v1beta1.OpenStackMachine, s conversion.Scope) error { out.ObjectMeta = in.ObjectMeta - if err := Convert_v1alpha5_OpenStackMachineSpec_To_v1alpha8_OpenStackMachineSpec(&in.Spec, &out.Spec, s); err != nil { + if err := Convert_v1alpha5_OpenStackMachineSpec_To_v1beta1_OpenStackMachineSpec(&in.Spec, &out.Spec, s); err != nil { return err } - if err := Convert_v1alpha5_OpenStackMachineStatus_To_v1alpha8_OpenStackMachineStatus(&in.Status, &out.Status, s); err != nil { + if err := Convert_v1alpha5_OpenStackMachineStatus_To_v1beta1_OpenStackMachineStatus(&in.Status, &out.Status, s); err != nil { return err } return nil } -// Convert_v1alpha5_OpenStackMachine_To_v1alpha8_OpenStackMachine is an autogenerated conversion function. -func Convert_v1alpha5_OpenStackMachine_To_v1alpha8_OpenStackMachine(in *OpenStackMachine, out *v1alpha8.OpenStackMachine, s conversion.Scope) error { - return autoConvert_v1alpha5_OpenStackMachine_To_v1alpha8_OpenStackMachine(in, out, s) +// Convert_v1alpha5_OpenStackMachine_To_v1beta1_OpenStackMachine is an autogenerated conversion function. +func Convert_v1alpha5_OpenStackMachine_To_v1beta1_OpenStackMachine(in *OpenStackMachine, out *v1beta1.OpenStackMachine, s conversion.Scope) error { + return autoConvert_v1alpha5_OpenStackMachine_To_v1beta1_OpenStackMachine(in, out, s) } -func autoConvert_v1alpha8_OpenStackMachine_To_v1alpha5_OpenStackMachine(in *v1alpha8.OpenStackMachine, out *OpenStackMachine, s conversion.Scope) error { +func autoConvert_v1beta1_OpenStackMachine_To_v1alpha5_OpenStackMachine(in *v1beta1.OpenStackMachine, out *OpenStackMachine, s conversion.Scope) error { out.ObjectMeta = in.ObjectMeta - if err := Convert_v1alpha8_OpenStackMachineSpec_To_v1alpha5_OpenStackMachineSpec(&in.Spec, &out.Spec, s); err != nil { + if err := Convert_v1beta1_OpenStackMachineSpec_To_v1alpha5_OpenStackMachineSpec(&in.Spec, &out.Spec, s); err != nil { return err } - if err := Convert_v1alpha8_OpenStackMachineStatus_To_v1alpha5_OpenStackMachineStatus(&in.Status, &out.Status, s); err != nil { + if err := Convert_v1beta1_OpenStackMachineStatus_To_v1alpha5_OpenStackMachineStatus(&in.Status, &out.Status, s); err != nil { return err } return nil } -// Convert_v1alpha8_OpenStackMachine_To_v1alpha5_OpenStackMachine is an autogenerated conversion function. -func Convert_v1alpha8_OpenStackMachine_To_v1alpha5_OpenStackMachine(in *v1alpha8.OpenStackMachine, out *OpenStackMachine, s conversion.Scope) error { - return autoConvert_v1alpha8_OpenStackMachine_To_v1alpha5_OpenStackMachine(in, out, s) +// Convert_v1beta1_OpenStackMachine_To_v1alpha5_OpenStackMachine is an autogenerated conversion function. +func Convert_v1beta1_OpenStackMachine_To_v1alpha5_OpenStackMachine(in *v1beta1.OpenStackMachine, out *OpenStackMachine, s conversion.Scope) error { + return autoConvert_v1beta1_OpenStackMachine_To_v1alpha5_OpenStackMachine(in, out, s) } -func autoConvert_v1alpha5_OpenStackMachineList_To_v1alpha8_OpenStackMachineList(in *OpenStackMachineList, out *v1alpha8.OpenStackMachineList, s conversion.Scope) error { +func autoConvert_v1alpha5_OpenStackMachineList_To_v1beta1_OpenStackMachineList(in *OpenStackMachineList, out *v1beta1.OpenStackMachineList, s conversion.Scope) error { out.ListMeta = in.ListMeta if in.Items != nil { in, out := &in.Items, &out.Items - *out = make([]v1alpha8.OpenStackMachine, len(*in)) + *out = make([]v1beta1.OpenStackMachine, len(*in)) for i := range *in { - if err := Convert_v1alpha5_OpenStackMachine_To_v1alpha8_OpenStackMachine(&(*in)[i], &(*out)[i], s); err != nil { + if err := Convert_v1alpha5_OpenStackMachine_To_v1beta1_OpenStackMachine(&(*in)[i], &(*out)[i], s); err != nil { return err } } @@ -1049,18 +1049,18 @@ func autoConvert_v1alpha5_OpenStackMachineList_To_v1alpha8_OpenStackMachineList( return nil } -// Convert_v1alpha5_OpenStackMachineList_To_v1alpha8_OpenStackMachineList is an autogenerated conversion function. -func Convert_v1alpha5_OpenStackMachineList_To_v1alpha8_OpenStackMachineList(in *OpenStackMachineList, out *v1alpha8.OpenStackMachineList, s conversion.Scope) error { - return autoConvert_v1alpha5_OpenStackMachineList_To_v1alpha8_OpenStackMachineList(in, out, s) +// Convert_v1alpha5_OpenStackMachineList_To_v1beta1_OpenStackMachineList is an autogenerated conversion function. +func Convert_v1alpha5_OpenStackMachineList_To_v1beta1_OpenStackMachineList(in *OpenStackMachineList, out *v1beta1.OpenStackMachineList, s conversion.Scope) error { + return autoConvert_v1alpha5_OpenStackMachineList_To_v1beta1_OpenStackMachineList(in, out, s) } -func autoConvert_v1alpha8_OpenStackMachineList_To_v1alpha5_OpenStackMachineList(in *v1alpha8.OpenStackMachineList, out *OpenStackMachineList, s conversion.Scope) error { +func autoConvert_v1beta1_OpenStackMachineList_To_v1alpha5_OpenStackMachineList(in *v1beta1.OpenStackMachineList, out *OpenStackMachineList, s conversion.Scope) error { out.ListMeta = in.ListMeta if in.Items != nil { in, out := &in.Items, &out.Items *out = make([]OpenStackMachine, len(*in)) for i := range *in { - if err := Convert_v1alpha8_OpenStackMachine_To_v1alpha5_OpenStackMachine(&(*in)[i], &(*out)[i], s); err != nil { + if err := Convert_v1beta1_OpenStackMachine_To_v1alpha5_OpenStackMachine(&(*in)[i], &(*out)[i], s); err != nil { return err } } @@ -1070,25 +1070,25 @@ func autoConvert_v1alpha8_OpenStackMachineList_To_v1alpha5_OpenStackMachineList( return nil } -// Convert_v1alpha8_OpenStackMachineList_To_v1alpha5_OpenStackMachineList is an autogenerated conversion function. -func Convert_v1alpha8_OpenStackMachineList_To_v1alpha5_OpenStackMachineList(in *v1alpha8.OpenStackMachineList, out *OpenStackMachineList, s conversion.Scope) error { - return autoConvert_v1alpha8_OpenStackMachineList_To_v1alpha5_OpenStackMachineList(in, out, s) +// Convert_v1beta1_OpenStackMachineList_To_v1alpha5_OpenStackMachineList is an autogenerated conversion function. +func Convert_v1beta1_OpenStackMachineList_To_v1alpha5_OpenStackMachineList(in *v1beta1.OpenStackMachineList, out *OpenStackMachineList, s conversion.Scope) error { + return autoConvert_v1beta1_OpenStackMachineList_To_v1alpha5_OpenStackMachineList(in, out, s) } -func autoConvert_v1alpha5_OpenStackMachineSpec_To_v1alpha8_OpenStackMachineSpec(in *OpenStackMachineSpec, out *v1alpha8.OpenStackMachineSpec, s conversion.Scope) error { +func autoConvert_v1alpha5_OpenStackMachineSpec_To_v1beta1_OpenStackMachineSpec(in *OpenStackMachineSpec, out *v1beta1.OpenStackMachineSpec, s conversion.Scope) error { out.ProviderID = (*string)(unsafe.Pointer(in.ProviderID)) out.InstanceID = (*string)(unsafe.Pointer(in.InstanceID)) out.CloudName = in.CloudName out.Flavor = in.Flavor - // WARNING: in.Image requires manual conversion: inconvertible types (string vs sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha8.ImageFilter) + // WARNING: in.Image requires manual conversion: inconvertible types (string vs sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1.ImageFilter) // WARNING: in.ImageUUID requires manual conversion: does not exist in peer-type out.SSHKeyName = in.SSHKeyName // WARNING: in.Networks requires manual conversion: does not exist in peer-type if in.Ports != nil { in, out := &in.Ports, &out.Ports - *out = make([]v1alpha8.PortOpts, len(*in)) + *out = make([]v1beta1.PortOpts, len(*in)) for i := range *in { - if err := Convert_v1alpha5_PortOpts_To_v1alpha8_PortOpts(&(*in)[i], &(*out)[i], s); err != nil { + if err := Convert_v1alpha5_PortOpts_To_v1beta1_PortOpts(&(*in)[i], &(*out)[i], s); err != nil { return err } } @@ -1099,9 +1099,9 @@ func autoConvert_v1alpha5_OpenStackMachineSpec_To_v1alpha8_OpenStackMachineSpec( // WARNING: in.FloatingIP requires manual conversion: does not exist in peer-type if in.SecurityGroups != nil { in, out := &in.SecurityGroups, &out.SecurityGroups - *out = make([]v1alpha8.SecurityGroupFilter, len(*in)) + *out = make([]v1beta1.SecurityGroupFilter, len(*in)) for i := range *in { - if err := Convert_v1alpha5_SecurityGroupParam_To_v1alpha8_SecurityGroupFilter(&(*in)[i], &(*out)[i], s); err != nil { + if err := Convert_v1alpha5_SecurityGroupParam_To_v1beta1_SecurityGroupFilter(&(*in)[i], &(*out)[i], s); err != nil { return err } } @@ -1110,26 +1110,26 @@ func autoConvert_v1alpha5_OpenStackMachineSpec_To_v1alpha8_OpenStackMachineSpec( } out.Trunk = in.Trunk out.Tags = *(*[]string)(unsafe.Pointer(&in.Tags)) - // WARNING: in.ServerMetadata requires manual conversion: inconvertible types (map[string]string vs []sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha8.ServerMetadata) + // WARNING: in.ServerMetadata requires manual conversion: inconvertible types (map[string]string vs []sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1.ServerMetadata) out.ConfigDrive = (*bool)(unsafe.Pointer(in.ConfigDrive)) - out.RootVolume = (*v1alpha8.RootVolume)(unsafe.Pointer(in.RootVolume)) + out.RootVolume = (*v1beta1.RootVolume)(unsafe.Pointer(in.RootVolume)) // WARNING: in.ServerGroupID requires manual conversion: does not exist in peer-type - out.IdentityRef = (*v1alpha8.OpenStackIdentityReference)(unsafe.Pointer(in.IdentityRef)) + out.IdentityRef = (*v1beta1.OpenStackIdentityReference)(unsafe.Pointer(in.IdentityRef)) return nil } -func autoConvert_v1alpha8_OpenStackMachineSpec_To_v1alpha5_OpenStackMachineSpec(in *v1alpha8.OpenStackMachineSpec, out *OpenStackMachineSpec, s conversion.Scope) error { +func autoConvert_v1beta1_OpenStackMachineSpec_To_v1alpha5_OpenStackMachineSpec(in *v1beta1.OpenStackMachineSpec, out *OpenStackMachineSpec, s conversion.Scope) error { out.ProviderID = (*string)(unsafe.Pointer(in.ProviderID)) out.InstanceID = (*string)(unsafe.Pointer(in.InstanceID)) out.CloudName = in.CloudName out.Flavor = in.Flavor - // WARNING: in.Image requires manual conversion: inconvertible types (sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha8.ImageFilter vs string) + // WARNING: in.Image requires manual conversion: inconvertible types (sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1.ImageFilter vs string) out.SSHKeyName = in.SSHKeyName if in.Ports != nil { in, out := &in.Ports, &out.Ports *out = make([]PortOpts, len(*in)) for i := range *in { - if err := Convert_v1alpha8_PortOpts_To_v1alpha5_PortOpts(&(*in)[i], &(*out)[i], s); err != nil { + if err := Convert_v1beta1_PortOpts_To_v1alpha5_PortOpts(&(*in)[i], &(*out)[i], s); err != nil { return err } } @@ -1140,7 +1140,7 @@ func autoConvert_v1alpha8_OpenStackMachineSpec_To_v1alpha5_OpenStackMachineSpec( in, out := &in.SecurityGroups, &out.SecurityGroups *out = make([]SecurityGroupParam, len(*in)) for i := range *in { - if err := Convert_v1alpha8_SecurityGroupFilter_To_v1alpha5_SecurityGroupParam(&(*in)[i], &(*out)[i], s); err != nil { + if err := Convert_v1beta1_SecurityGroupFilter_To_v1alpha5_SecurityGroupParam(&(*in)[i], &(*out)[i], s); err != nil { return err } } @@ -1149,7 +1149,7 @@ func autoConvert_v1alpha8_OpenStackMachineSpec_To_v1alpha5_OpenStackMachineSpec( } out.Trunk = in.Trunk out.Tags = *(*[]string)(unsafe.Pointer(&in.Tags)) - // WARNING: in.ServerMetadata requires manual conversion: inconvertible types ([]sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha8.ServerMetadata vs map[string]string) + // WARNING: in.ServerMetadata requires manual conversion: inconvertible types ([]sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1.ServerMetadata vs map[string]string) out.ConfigDrive = (*bool)(unsafe.Pointer(in.ConfigDrive)) out.RootVolume = (*RootVolume)(unsafe.Pointer(in.RootVolume)) // WARNING: in.AdditionalBlockDevices requires manual conversion: does not exist in peer-type @@ -1158,65 +1158,65 @@ func autoConvert_v1alpha8_OpenStackMachineSpec_To_v1alpha5_OpenStackMachineSpec( return nil } -func autoConvert_v1alpha5_OpenStackMachineStatus_To_v1alpha8_OpenStackMachineStatus(in *OpenStackMachineStatus, out *v1alpha8.OpenStackMachineStatus, s conversion.Scope) error { +func autoConvert_v1alpha5_OpenStackMachineStatus_To_v1beta1_OpenStackMachineStatus(in *OpenStackMachineStatus, out *v1beta1.OpenStackMachineStatus, s conversion.Scope) error { out.Ready = in.Ready out.Addresses = *(*[]v1.NodeAddress)(unsafe.Pointer(&in.Addresses)) - out.InstanceState = (*v1alpha8.InstanceState)(unsafe.Pointer(in.InstanceState)) + out.InstanceState = (*v1beta1.InstanceState)(unsafe.Pointer(in.InstanceState)) out.FailureReason = (*errors.MachineStatusError)(unsafe.Pointer(in.FailureReason)) out.FailureMessage = (*string)(unsafe.Pointer(in.FailureMessage)) - out.Conditions = *(*v1beta1.Conditions)(unsafe.Pointer(&in.Conditions)) + out.Conditions = *(*apiv1beta1.Conditions)(unsafe.Pointer(&in.Conditions)) return nil } -// Convert_v1alpha5_OpenStackMachineStatus_To_v1alpha8_OpenStackMachineStatus is an autogenerated conversion function. -func Convert_v1alpha5_OpenStackMachineStatus_To_v1alpha8_OpenStackMachineStatus(in *OpenStackMachineStatus, out *v1alpha8.OpenStackMachineStatus, s conversion.Scope) error { - return autoConvert_v1alpha5_OpenStackMachineStatus_To_v1alpha8_OpenStackMachineStatus(in, out, s) +// Convert_v1alpha5_OpenStackMachineStatus_To_v1beta1_OpenStackMachineStatus is an autogenerated conversion function. +func Convert_v1alpha5_OpenStackMachineStatus_To_v1beta1_OpenStackMachineStatus(in *OpenStackMachineStatus, out *v1beta1.OpenStackMachineStatus, s conversion.Scope) error { + return autoConvert_v1alpha5_OpenStackMachineStatus_To_v1beta1_OpenStackMachineStatus(in, out, s) } -func autoConvert_v1alpha8_OpenStackMachineStatus_To_v1alpha5_OpenStackMachineStatus(in *v1alpha8.OpenStackMachineStatus, out *OpenStackMachineStatus, s conversion.Scope) error { +func autoConvert_v1beta1_OpenStackMachineStatus_To_v1alpha5_OpenStackMachineStatus(in *v1beta1.OpenStackMachineStatus, out *OpenStackMachineStatus, s conversion.Scope) error { out.Ready = in.Ready out.Addresses = *(*[]v1.NodeAddress)(unsafe.Pointer(&in.Addresses)) out.InstanceState = (*InstanceState)(unsafe.Pointer(in.InstanceState)) // WARNING: in.ReferencedResources requires manual conversion: does not exist in peer-type out.FailureReason = (*errors.MachineStatusError)(unsafe.Pointer(in.FailureReason)) out.FailureMessage = (*string)(unsafe.Pointer(in.FailureMessage)) - out.Conditions = *(*v1beta1.Conditions)(unsafe.Pointer(&in.Conditions)) + out.Conditions = *(*apiv1beta1.Conditions)(unsafe.Pointer(&in.Conditions)) return nil } -func autoConvert_v1alpha5_OpenStackMachineTemplate_To_v1alpha8_OpenStackMachineTemplate(in *OpenStackMachineTemplate, out *v1alpha8.OpenStackMachineTemplate, s conversion.Scope) error { +func autoConvert_v1alpha5_OpenStackMachineTemplate_To_v1beta1_OpenStackMachineTemplate(in *OpenStackMachineTemplate, out *v1beta1.OpenStackMachineTemplate, s conversion.Scope) error { out.ObjectMeta = in.ObjectMeta - if err := Convert_v1alpha5_OpenStackMachineTemplateSpec_To_v1alpha8_OpenStackMachineTemplateSpec(&in.Spec, &out.Spec, s); err != nil { + if err := Convert_v1alpha5_OpenStackMachineTemplateSpec_To_v1beta1_OpenStackMachineTemplateSpec(&in.Spec, &out.Spec, s); err != nil { return err } return nil } -// Convert_v1alpha5_OpenStackMachineTemplate_To_v1alpha8_OpenStackMachineTemplate is an autogenerated conversion function. -func Convert_v1alpha5_OpenStackMachineTemplate_To_v1alpha8_OpenStackMachineTemplate(in *OpenStackMachineTemplate, out *v1alpha8.OpenStackMachineTemplate, s conversion.Scope) error { - return autoConvert_v1alpha5_OpenStackMachineTemplate_To_v1alpha8_OpenStackMachineTemplate(in, out, s) +// Convert_v1alpha5_OpenStackMachineTemplate_To_v1beta1_OpenStackMachineTemplate is an autogenerated conversion function. +func Convert_v1alpha5_OpenStackMachineTemplate_To_v1beta1_OpenStackMachineTemplate(in *OpenStackMachineTemplate, out *v1beta1.OpenStackMachineTemplate, s conversion.Scope) error { + return autoConvert_v1alpha5_OpenStackMachineTemplate_To_v1beta1_OpenStackMachineTemplate(in, out, s) } -func autoConvert_v1alpha8_OpenStackMachineTemplate_To_v1alpha5_OpenStackMachineTemplate(in *v1alpha8.OpenStackMachineTemplate, out *OpenStackMachineTemplate, s conversion.Scope) error { +func autoConvert_v1beta1_OpenStackMachineTemplate_To_v1alpha5_OpenStackMachineTemplate(in *v1beta1.OpenStackMachineTemplate, out *OpenStackMachineTemplate, s conversion.Scope) error { out.ObjectMeta = in.ObjectMeta - if err := Convert_v1alpha8_OpenStackMachineTemplateSpec_To_v1alpha5_OpenStackMachineTemplateSpec(&in.Spec, &out.Spec, s); err != nil { + if err := Convert_v1beta1_OpenStackMachineTemplateSpec_To_v1alpha5_OpenStackMachineTemplateSpec(&in.Spec, &out.Spec, s); err != nil { return err } return nil } -// Convert_v1alpha8_OpenStackMachineTemplate_To_v1alpha5_OpenStackMachineTemplate is an autogenerated conversion function. -func Convert_v1alpha8_OpenStackMachineTemplate_To_v1alpha5_OpenStackMachineTemplate(in *v1alpha8.OpenStackMachineTemplate, out *OpenStackMachineTemplate, s conversion.Scope) error { - return autoConvert_v1alpha8_OpenStackMachineTemplate_To_v1alpha5_OpenStackMachineTemplate(in, out, s) +// Convert_v1beta1_OpenStackMachineTemplate_To_v1alpha5_OpenStackMachineTemplate is an autogenerated conversion function. +func Convert_v1beta1_OpenStackMachineTemplate_To_v1alpha5_OpenStackMachineTemplate(in *v1beta1.OpenStackMachineTemplate, out *OpenStackMachineTemplate, s conversion.Scope) error { + return autoConvert_v1beta1_OpenStackMachineTemplate_To_v1alpha5_OpenStackMachineTemplate(in, out, s) } -func autoConvert_v1alpha5_OpenStackMachineTemplateList_To_v1alpha8_OpenStackMachineTemplateList(in *OpenStackMachineTemplateList, out *v1alpha8.OpenStackMachineTemplateList, s conversion.Scope) error { +func autoConvert_v1alpha5_OpenStackMachineTemplateList_To_v1beta1_OpenStackMachineTemplateList(in *OpenStackMachineTemplateList, out *v1beta1.OpenStackMachineTemplateList, s conversion.Scope) error { out.ListMeta = in.ListMeta if in.Items != nil { in, out := &in.Items, &out.Items - *out = make([]v1alpha8.OpenStackMachineTemplate, len(*in)) + *out = make([]v1beta1.OpenStackMachineTemplate, len(*in)) for i := range *in { - if err := Convert_v1alpha5_OpenStackMachineTemplate_To_v1alpha8_OpenStackMachineTemplate(&(*in)[i], &(*out)[i], s); err != nil { + if err := Convert_v1alpha5_OpenStackMachineTemplate_To_v1beta1_OpenStackMachineTemplate(&(*in)[i], &(*out)[i], s); err != nil { return err } } @@ -1226,18 +1226,18 @@ func autoConvert_v1alpha5_OpenStackMachineTemplateList_To_v1alpha8_OpenStackMach return nil } -// Convert_v1alpha5_OpenStackMachineTemplateList_To_v1alpha8_OpenStackMachineTemplateList is an autogenerated conversion function. -func Convert_v1alpha5_OpenStackMachineTemplateList_To_v1alpha8_OpenStackMachineTemplateList(in *OpenStackMachineTemplateList, out *v1alpha8.OpenStackMachineTemplateList, s conversion.Scope) error { - return autoConvert_v1alpha5_OpenStackMachineTemplateList_To_v1alpha8_OpenStackMachineTemplateList(in, out, s) +// Convert_v1alpha5_OpenStackMachineTemplateList_To_v1beta1_OpenStackMachineTemplateList is an autogenerated conversion function. +func Convert_v1alpha5_OpenStackMachineTemplateList_To_v1beta1_OpenStackMachineTemplateList(in *OpenStackMachineTemplateList, out *v1beta1.OpenStackMachineTemplateList, s conversion.Scope) error { + return autoConvert_v1alpha5_OpenStackMachineTemplateList_To_v1beta1_OpenStackMachineTemplateList(in, out, s) } -func autoConvert_v1alpha8_OpenStackMachineTemplateList_To_v1alpha5_OpenStackMachineTemplateList(in *v1alpha8.OpenStackMachineTemplateList, out *OpenStackMachineTemplateList, s conversion.Scope) error { +func autoConvert_v1beta1_OpenStackMachineTemplateList_To_v1alpha5_OpenStackMachineTemplateList(in *v1beta1.OpenStackMachineTemplateList, out *OpenStackMachineTemplateList, s conversion.Scope) error { out.ListMeta = in.ListMeta if in.Items != nil { in, out := &in.Items, &out.Items *out = make([]OpenStackMachineTemplate, len(*in)) for i := range *in { - if err := Convert_v1alpha8_OpenStackMachineTemplate_To_v1alpha5_OpenStackMachineTemplate(&(*in)[i], &(*out)[i], s); err != nil { + if err := Convert_v1beta1_OpenStackMachineTemplate_To_v1alpha5_OpenStackMachineTemplate(&(*in)[i], &(*out)[i], s); err != nil { return err } } @@ -1247,91 +1247,91 @@ func autoConvert_v1alpha8_OpenStackMachineTemplateList_To_v1alpha5_OpenStackMach return nil } -// Convert_v1alpha8_OpenStackMachineTemplateList_To_v1alpha5_OpenStackMachineTemplateList is an autogenerated conversion function. -func Convert_v1alpha8_OpenStackMachineTemplateList_To_v1alpha5_OpenStackMachineTemplateList(in *v1alpha8.OpenStackMachineTemplateList, out *OpenStackMachineTemplateList, s conversion.Scope) error { - return autoConvert_v1alpha8_OpenStackMachineTemplateList_To_v1alpha5_OpenStackMachineTemplateList(in, out, s) +// Convert_v1beta1_OpenStackMachineTemplateList_To_v1alpha5_OpenStackMachineTemplateList is an autogenerated conversion function. +func Convert_v1beta1_OpenStackMachineTemplateList_To_v1alpha5_OpenStackMachineTemplateList(in *v1beta1.OpenStackMachineTemplateList, out *OpenStackMachineTemplateList, s conversion.Scope) error { + return autoConvert_v1beta1_OpenStackMachineTemplateList_To_v1alpha5_OpenStackMachineTemplateList(in, out, s) } -func autoConvert_v1alpha5_OpenStackMachineTemplateResource_To_v1alpha8_OpenStackMachineTemplateResource(in *OpenStackMachineTemplateResource, out *v1alpha8.OpenStackMachineTemplateResource, s conversion.Scope) error { - if err := Convert_v1alpha5_OpenStackMachineSpec_To_v1alpha8_OpenStackMachineSpec(&in.Spec, &out.Spec, s); err != nil { +func autoConvert_v1alpha5_OpenStackMachineTemplateResource_To_v1beta1_OpenStackMachineTemplateResource(in *OpenStackMachineTemplateResource, out *v1beta1.OpenStackMachineTemplateResource, s conversion.Scope) error { + if err := Convert_v1alpha5_OpenStackMachineSpec_To_v1beta1_OpenStackMachineSpec(&in.Spec, &out.Spec, s); err != nil { return err } return nil } -// Convert_v1alpha5_OpenStackMachineTemplateResource_To_v1alpha8_OpenStackMachineTemplateResource is an autogenerated conversion function. -func Convert_v1alpha5_OpenStackMachineTemplateResource_To_v1alpha8_OpenStackMachineTemplateResource(in *OpenStackMachineTemplateResource, out *v1alpha8.OpenStackMachineTemplateResource, s conversion.Scope) error { - return autoConvert_v1alpha5_OpenStackMachineTemplateResource_To_v1alpha8_OpenStackMachineTemplateResource(in, out, s) +// Convert_v1alpha5_OpenStackMachineTemplateResource_To_v1beta1_OpenStackMachineTemplateResource is an autogenerated conversion function. +func Convert_v1alpha5_OpenStackMachineTemplateResource_To_v1beta1_OpenStackMachineTemplateResource(in *OpenStackMachineTemplateResource, out *v1beta1.OpenStackMachineTemplateResource, s conversion.Scope) error { + return autoConvert_v1alpha5_OpenStackMachineTemplateResource_To_v1beta1_OpenStackMachineTemplateResource(in, out, s) } -func autoConvert_v1alpha8_OpenStackMachineTemplateResource_To_v1alpha5_OpenStackMachineTemplateResource(in *v1alpha8.OpenStackMachineTemplateResource, out *OpenStackMachineTemplateResource, s conversion.Scope) error { - if err := Convert_v1alpha8_OpenStackMachineSpec_To_v1alpha5_OpenStackMachineSpec(&in.Spec, &out.Spec, s); err != nil { +func autoConvert_v1beta1_OpenStackMachineTemplateResource_To_v1alpha5_OpenStackMachineTemplateResource(in *v1beta1.OpenStackMachineTemplateResource, out *OpenStackMachineTemplateResource, s conversion.Scope) error { + if err := Convert_v1beta1_OpenStackMachineSpec_To_v1alpha5_OpenStackMachineSpec(&in.Spec, &out.Spec, s); err != nil { return err } return nil } -// Convert_v1alpha8_OpenStackMachineTemplateResource_To_v1alpha5_OpenStackMachineTemplateResource is an autogenerated conversion function. -func Convert_v1alpha8_OpenStackMachineTemplateResource_To_v1alpha5_OpenStackMachineTemplateResource(in *v1alpha8.OpenStackMachineTemplateResource, out *OpenStackMachineTemplateResource, s conversion.Scope) error { - return autoConvert_v1alpha8_OpenStackMachineTemplateResource_To_v1alpha5_OpenStackMachineTemplateResource(in, out, s) +// Convert_v1beta1_OpenStackMachineTemplateResource_To_v1alpha5_OpenStackMachineTemplateResource is an autogenerated conversion function. +func Convert_v1beta1_OpenStackMachineTemplateResource_To_v1alpha5_OpenStackMachineTemplateResource(in *v1beta1.OpenStackMachineTemplateResource, out *OpenStackMachineTemplateResource, s conversion.Scope) error { + return autoConvert_v1beta1_OpenStackMachineTemplateResource_To_v1alpha5_OpenStackMachineTemplateResource(in, out, s) } -func autoConvert_v1alpha5_OpenStackMachineTemplateSpec_To_v1alpha8_OpenStackMachineTemplateSpec(in *OpenStackMachineTemplateSpec, out *v1alpha8.OpenStackMachineTemplateSpec, s conversion.Scope) error { - if err := Convert_v1alpha5_OpenStackMachineTemplateResource_To_v1alpha8_OpenStackMachineTemplateResource(&in.Template, &out.Template, s); err != nil { +func autoConvert_v1alpha5_OpenStackMachineTemplateSpec_To_v1beta1_OpenStackMachineTemplateSpec(in *OpenStackMachineTemplateSpec, out *v1beta1.OpenStackMachineTemplateSpec, s conversion.Scope) error { + if err := Convert_v1alpha5_OpenStackMachineTemplateResource_To_v1beta1_OpenStackMachineTemplateResource(&in.Template, &out.Template, s); err != nil { return err } return nil } -// Convert_v1alpha5_OpenStackMachineTemplateSpec_To_v1alpha8_OpenStackMachineTemplateSpec is an autogenerated conversion function. -func Convert_v1alpha5_OpenStackMachineTemplateSpec_To_v1alpha8_OpenStackMachineTemplateSpec(in *OpenStackMachineTemplateSpec, out *v1alpha8.OpenStackMachineTemplateSpec, s conversion.Scope) error { - return autoConvert_v1alpha5_OpenStackMachineTemplateSpec_To_v1alpha8_OpenStackMachineTemplateSpec(in, out, s) +// Convert_v1alpha5_OpenStackMachineTemplateSpec_To_v1beta1_OpenStackMachineTemplateSpec is an autogenerated conversion function. +func Convert_v1alpha5_OpenStackMachineTemplateSpec_To_v1beta1_OpenStackMachineTemplateSpec(in *OpenStackMachineTemplateSpec, out *v1beta1.OpenStackMachineTemplateSpec, s conversion.Scope) error { + return autoConvert_v1alpha5_OpenStackMachineTemplateSpec_To_v1beta1_OpenStackMachineTemplateSpec(in, out, s) } -func autoConvert_v1alpha8_OpenStackMachineTemplateSpec_To_v1alpha5_OpenStackMachineTemplateSpec(in *v1alpha8.OpenStackMachineTemplateSpec, out *OpenStackMachineTemplateSpec, s conversion.Scope) error { - if err := Convert_v1alpha8_OpenStackMachineTemplateResource_To_v1alpha5_OpenStackMachineTemplateResource(&in.Template, &out.Template, s); err != nil { +func autoConvert_v1beta1_OpenStackMachineTemplateSpec_To_v1alpha5_OpenStackMachineTemplateSpec(in *v1beta1.OpenStackMachineTemplateSpec, out *OpenStackMachineTemplateSpec, s conversion.Scope) error { + if err := Convert_v1beta1_OpenStackMachineTemplateResource_To_v1alpha5_OpenStackMachineTemplateResource(&in.Template, &out.Template, s); err != nil { return err } return nil } -// Convert_v1alpha8_OpenStackMachineTemplateSpec_To_v1alpha5_OpenStackMachineTemplateSpec is an autogenerated conversion function. -func Convert_v1alpha8_OpenStackMachineTemplateSpec_To_v1alpha5_OpenStackMachineTemplateSpec(in *v1alpha8.OpenStackMachineTemplateSpec, out *OpenStackMachineTemplateSpec, s conversion.Scope) error { - return autoConvert_v1alpha8_OpenStackMachineTemplateSpec_To_v1alpha5_OpenStackMachineTemplateSpec(in, out, s) +// Convert_v1beta1_OpenStackMachineTemplateSpec_To_v1alpha5_OpenStackMachineTemplateSpec is an autogenerated conversion function. +func Convert_v1beta1_OpenStackMachineTemplateSpec_To_v1alpha5_OpenStackMachineTemplateSpec(in *v1beta1.OpenStackMachineTemplateSpec, out *OpenStackMachineTemplateSpec, s conversion.Scope) error { + return autoConvert_v1beta1_OpenStackMachineTemplateSpec_To_v1alpha5_OpenStackMachineTemplateSpec(in, out, s) } -func autoConvert_v1alpha5_PortOpts_To_v1alpha8_PortOpts(in *PortOpts, out *v1alpha8.PortOpts, s conversion.Scope) error { - out.Network = (*v1alpha8.NetworkFilter)(unsafe.Pointer(in.Network)) +func autoConvert_v1alpha5_PortOpts_To_v1beta1_PortOpts(in *PortOpts, out *v1beta1.PortOpts, s conversion.Scope) error { + out.Network = (*v1beta1.NetworkFilter)(unsafe.Pointer(in.Network)) out.NameSuffix = in.NameSuffix out.Description = in.Description out.AdminStateUp = (*bool)(unsafe.Pointer(in.AdminStateUp)) out.MACAddress = in.MACAddress - out.FixedIPs = *(*[]v1alpha8.FixedIP)(unsafe.Pointer(&in.FixedIPs)) + out.FixedIPs = *(*[]v1beta1.FixedIP)(unsafe.Pointer(&in.FixedIPs)) // WARNING: in.TenantID requires manual conversion: does not exist in peer-type // WARNING: in.ProjectID requires manual conversion: does not exist in peer-type // WARNING: in.SecurityGroups requires manual conversion: does not exist in peer-type if in.SecurityGroupFilters != nil { in, out := &in.SecurityGroupFilters, &out.SecurityGroupFilters - *out = make([]v1alpha8.SecurityGroupFilter, len(*in)) + *out = make([]v1beta1.SecurityGroupFilter, len(*in)) for i := range *in { - if err := Convert_v1alpha5_SecurityGroupParam_To_v1alpha8_SecurityGroupFilter(&(*in)[i], &(*out)[i], s); err != nil { + if err := Convert_v1alpha5_SecurityGroupParam_To_v1beta1_SecurityGroupFilter(&(*in)[i], &(*out)[i], s); err != nil { return err } } } else { out.SecurityGroupFilters = nil } - out.AllowedAddressPairs = *(*[]v1alpha8.AddressPair)(unsafe.Pointer(&in.AllowedAddressPairs)) + out.AllowedAddressPairs = *(*[]v1beta1.AddressPair)(unsafe.Pointer(&in.AllowedAddressPairs)) out.Trunk = (*bool)(unsafe.Pointer(in.Trunk)) out.HostID = in.HostID out.VNICType = in.VNICType - // WARNING: in.Profile requires manual conversion: inconvertible types (map[string]string vs sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha8.BindingProfile) + // WARNING: in.Profile requires manual conversion: inconvertible types (map[string]string vs sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1.BindingProfile) out.DisablePortSecurity = (*bool)(unsafe.Pointer(in.DisablePortSecurity)) out.Tags = *(*[]string)(unsafe.Pointer(&in.Tags)) return nil } -func autoConvert_v1alpha8_PortOpts_To_v1alpha5_PortOpts(in *v1alpha8.PortOpts, out *PortOpts, s conversion.Scope) error { +func autoConvert_v1beta1_PortOpts_To_v1alpha5_PortOpts(in *v1beta1.PortOpts, out *PortOpts, s conversion.Scope) error { out.Network = (*NetworkFilter)(unsafe.Pointer(in.Network)) out.NameSuffix = in.NameSuffix out.Description = in.Description @@ -1342,7 +1342,7 @@ func autoConvert_v1alpha8_PortOpts_To_v1alpha5_PortOpts(in *v1alpha8.PortOpts, o in, out := &in.SecurityGroupFilters, &out.SecurityGroupFilters *out = make([]SecurityGroupParam, len(*in)) for i := range *in { - if err := Convert_v1alpha8_SecurityGroupFilter_To_v1alpha5_SecurityGroupParam(&(*in)[i], &(*out)[i], s); err != nil { + if err := Convert_v1beta1_SecurityGroupFilter_To_v1alpha5_SecurityGroupParam(&(*in)[i], &(*out)[i], s); err != nil { return err } } @@ -1353,7 +1353,7 @@ func autoConvert_v1alpha8_PortOpts_To_v1alpha5_PortOpts(in *v1alpha8.PortOpts, o out.Trunk = (*bool)(unsafe.Pointer(in.Trunk)) out.HostID = in.HostID out.VNICType = in.VNICType - // WARNING: in.Profile requires manual conversion: inconvertible types (sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha8.BindingProfile vs map[string]string) + // WARNING: in.Profile requires manual conversion: inconvertible types (sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1.BindingProfile vs map[string]string) out.DisablePortSecurity = (*bool)(unsafe.Pointer(in.DisablePortSecurity)) // WARNING: in.PropagateUplinkStatus requires manual conversion: does not exist in peer-type out.Tags = *(*[]string)(unsafe.Pointer(&in.Tags)) @@ -1361,31 +1361,31 @@ func autoConvert_v1alpha8_PortOpts_To_v1alpha5_PortOpts(in *v1alpha8.PortOpts, o return nil } -func autoConvert_v1alpha5_RootVolume_To_v1alpha8_RootVolume(in *RootVolume, out *v1alpha8.RootVolume, s conversion.Scope) error { +func autoConvert_v1alpha5_RootVolume_To_v1beta1_RootVolume(in *RootVolume, out *v1beta1.RootVolume, s conversion.Scope) error { out.Size = in.Size out.VolumeType = in.VolumeType out.AvailabilityZone = in.AvailabilityZone return nil } -// Convert_v1alpha5_RootVolume_To_v1alpha8_RootVolume is an autogenerated conversion function. -func Convert_v1alpha5_RootVolume_To_v1alpha8_RootVolume(in *RootVolume, out *v1alpha8.RootVolume, s conversion.Scope) error { - return autoConvert_v1alpha5_RootVolume_To_v1alpha8_RootVolume(in, out, s) +// Convert_v1alpha5_RootVolume_To_v1beta1_RootVolume is an autogenerated conversion function. +func Convert_v1alpha5_RootVolume_To_v1beta1_RootVolume(in *RootVolume, out *v1beta1.RootVolume, s conversion.Scope) error { + return autoConvert_v1alpha5_RootVolume_To_v1beta1_RootVolume(in, out, s) } -func autoConvert_v1alpha8_RootVolume_To_v1alpha5_RootVolume(in *v1alpha8.RootVolume, out *RootVolume, s conversion.Scope) error { +func autoConvert_v1beta1_RootVolume_To_v1alpha5_RootVolume(in *v1beta1.RootVolume, out *RootVolume, s conversion.Scope) error { out.Size = in.Size out.VolumeType = in.VolumeType out.AvailabilityZone = in.AvailabilityZone return nil } -// Convert_v1alpha8_RootVolume_To_v1alpha5_RootVolume is an autogenerated conversion function. -func Convert_v1alpha8_RootVolume_To_v1alpha5_RootVolume(in *v1alpha8.RootVolume, out *RootVolume, s conversion.Scope) error { - return autoConvert_v1alpha8_RootVolume_To_v1alpha5_RootVolume(in, out, s) +// Convert_v1beta1_RootVolume_To_v1alpha5_RootVolume is an autogenerated conversion function. +func Convert_v1beta1_RootVolume_To_v1alpha5_RootVolume(in *v1beta1.RootVolume, out *RootVolume, s conversion.Scope) error { + return autoConvert_v1beta1_RootVolume_To_v1alpha5_RootVolume(in, out, s) } -func autoConvert_v1alpha5_Router_To_v1alpha8_Router(in *Router, out *v1alpha8.Router, s conversion.Scope) error { +func autoConvert_v1alpha5_Router_To_v1beta1_Router(in *Router, out *v1beta1.Router, s conversion.Scope) error { out.Name = in.Name out.ID = in.ID out.Tags = *(*[]string)(unsafe.Pointer(&in.Tags)) @@ -1393,12 +1393,12 @@ func autoConvert_v1alpha5_Router_To_v1alpha8_Router(in *Router, out *v1alpha8.Ro return nil } -// Convert_v1alpha5_Router_To_v1alpha8_Router is an autogenerated conversion function. -func Convert_v1alpha5_Router_To_v1alpha8_Router(in *Router, out *v1alpha8.Router, s conversion.Scope) error { - return autoConvert_v1alpha5_Router_To_v1alpha8_Router(in, out, s) +// Convert_v1alpha5_Router_To_v1beta1_Router is an autogenerated conversion function. +func Convert_v1alpha5_Router_To_v1beta1_Router(in *Router, out *v1beta1.Router, s conversion.Scope) error { + return autoConvert_v1alpha5_Router_To_v1beta1_Router(in, out, s) } -func autoConvert_v1alpha8_Router_To_v1alpha5_Router(in *v1alpha8.Router, out *Router, s conversion.Scope) error { +func autoConvert_v1beta1_Router_To_v1alpha5_Router(in *v1beta1.Router, out *Router, s conversion.Scope) error { out.Name = in.Name out.ID = in.ID out.Tags = *(*[]string)(unsafe.Pointer(&in.Tags)) @@ -1406,12 +1406,12 @@ func autoConvert_v1alpha8_Router_To_v1alpha5_Router(in *v1alpha8.Router, out *Ro return nil } -// Convert_v1alpha8_Router_To_v1alpha5_Router is an autogenerated conversion function. -func Convert_v1alpha8_Router_To_v1alpha5_Router(in *v1alpha8.Router, out *Router, s conversion.Scope) error { - return autoConvert_v1alpha8_Router_To_v1alpha5_Router(in, out, s) +// Convert_v1beta1_Router_To_v1alpha5_Router is an autogenerated conversion function. +func Convert_v1beta1_Router_To_v1alpha5_Router(in *v1beta1.Router, out *Router, s conversion.Scope) error { + return autoConvert_v1beta1_Router_To_v1alpha5_Router(in, out, s) } -func autoConvert_v1alpha5_SecurityGroupFilter_To_v1alpha8_SecurityGroupFilter(in *SecurityGroupFilter, out *v1alpha8.SecurityGroupFilter, s conversion.Scope) error { +func autoConvert_v1alpha5_SecurityGroupFilter_To_v1beta1_SecurityGroupFilter(in *SecurityGroupFilter, out *v1beta1.SecurityGroupFilter, s conversion.Scope) error { out.ID = in.ID out.Name = in.Name out.Description = in.Description @@ -1428,7 +1428,7 @@ func autoConvert_v1alpha5_SecurityGroupFilter_To_v1alpha8_SecurityGroupFilter(in return nil } -func autoConvert_v1alpha8_SecurityGroupFilter_To_v1alpha5_SecurityGroupFilter(in *v1alpha8.SecurityGroupFilter, out *SecurityGroupFilter, s conversion.Scope) error { +func autoConvert_v1beta1_SecurityGroupFilter_To_v1alpha5_SecurityGroupFilter(in *v1beta1.SecurityGroupFilter, out *SecurityGroupFilter, s conversion.Scope) error { out.ID = in.ID out.Name = in.Name out.Description = in.Description @@ -1440,12 +1440,12 @@ func autoConvert_v1alpha8_SecurityGroupFilter_To_v1alpha5_SecurityGroupFilter(in return nil } -// Convert_v1alpha8_SecurityGroupFilter_To_v1alpha5_SecurityGroupFilter is an autogenerated conversion function. -func Convert_v1alpha8_SecurityGroupFilter_To_v1alpha5_SecurityGroupFilter(in *v1alpha8.SecurityGroupFilter, out *SecurityGroupFilter, s conversion.Scope) error { - return autoConvert_v1alpha8_SecurityGroupFilter_To_v1alpha5_SecurityGroupFilter(in, out, s) +// Convert_v1beta1_SecurityGroupFilter_To_v1alpha5_SecurityGroupFilter is an autogenerated conversion function. +func Convert_v1beta1_SecurityGroupFilter_To_v1alpha5_SecurityGroupFilter(in *v1beta1.SecurityGroupFilter, out *SecurityGroupFilter, s conversion.Scope) error { + return autoConvert_v1beta1_SecurityGroupFilter_To_v1alpha5_SecurityGroupFilter(in, out, s) } -func autoConvert_v1alpha5_Subnet_To_v1alpha8_Subnet(in *Subnet, out *v1alpha8.Subnet, s conversion.Scope) error { +func autoConvert_v1alpha5_Subnet_To_v1beta1_Subnet(in *Subnet, out *v1beta1.Subnet, s conversion.Scope) error { out.Name = in.Name out.ID = in.ID out.CIDR = in.CIDR @@ -1453,12 +1453,12 @@ func autoConvert_v1alpha5_Subnet_To_v1alpha8_Subnet(in *Subnet, out *v1alpha8.Su return nil } -// Convert_v1alpha5_Subnet_To_v1alpha8_Subnet is an autogenerated conversion function. -func Convert_v1alpha5_Subnet_To_v1alpha8_Subnet(in *Subnet, out *v1alpha8.Subnet, s conversion.Scope) error { - return autoConvert_v1alpha5_Subnet_To_v1alpha8_Subnet(in, out, s) +// Convert_v1alpha5_Subnet_To_v1beta1_Subnet is an autogenerated conversion function. +func Convert_v1alpha5_Subnet_To_v1beta1_Subnet(in *Subnet, out *v1beta1.Subnet, s conversion.Scope) error { + return autoConvert_v1alpha5_Subnet_To_v1beta1_Subnet(in, out, s) } -func autoConvert_v1alpha8_Subnet_To_v1alpha5_Subnet(in *v1alpha8.Subnet, out *Subnet, s conversion.Scope) error { +func autoConvert_v1beta1_Subnet_To_v1alpha5_Subnet(in *v1beta1.Subnet, out *Subnet, s conversion.Scope) error { out.Name = in.Name out.ID = in.ID out.CIDR = in.CIDR @@ -1466,12 +1466,12 @@ func autoConvert_v1alpha8_Subnet_To_v1alpha5_Subnet(in *v1alpha8.Subnet, out *Su return nil } -// Convert_v1alpha8_Subnet_To_v1alpha5_Subnet is an autogenerated conversion function. -func Convert_v1alpha8_Subnet_To_v1alpha5_Subnet(in *v1alpha8.Subnet, out *Subnet, s conversion.Scope) error { - return autoConvert_v1alpha8_Subnet_To_v1alpha5_Subnet(in, out, s) +// Convert_v1beta1_Subnet_To_v1alpha5_Subnet is an autogenerated conversion function. +func Convert_v1beta1_Subnet_To_v1alpha5_Subnet(in *v1beta1.Subnet, out *Subnet, s conversion.Scope) error { + return autoConvert_v1beta1_Subnet_To_v1alpha5_Subnet(in, out, s) } -func autoConvert_v1alpha5_SubnetFilter_To_v1alpha8_SubnetFilter(in *SubnetFilter, out *v1alpha8.SubnetFilter, s conversion.Scope) error { +func autoConvert_v1alpha5_SubnetFilter_To_v1beta1_SubnetFilter(in *SubnetFilter, out *v1beta1.SubnetFilter, s conversion.Scope) error { out.Name = in.Name out.Description = in.Description out.ProjectID = in.ProjectID @@ -1488,12 +1488,12 @@ func autoConvert_v1alpha5_SubnetFilter_To_v1alpha8_SubnetFilter(in *SubnetFilter return nil } -// Convert_v1alpha5_SubnetFilter_To_v1alpha8_SubnetFilter is an autogenerated conversion function. -func Convert_v1alpha5_SubnetFilter_To_v1alpha8_SubnetFilter(in *SubnetFilter, out *v1alpha8.SubnetFilter, s conversion.Scope) error { - return autoConvert_v1alpha5_SubnetFilter_To_v1alpha8_SubnetFilter(in, out, s) +// Convert_v1alpha5_SubnetFilter_To_v1beta1_SubnetFilter is an autogenerated conversion function. +func Convert_v1alpha5_SubnetFilter_To_v1beta1_SubnetFilter(in *SubnetFilter, out *v1beta1.SubnetFilter, s conversion.Scope) error { + return autoConvert_v1alpha5_SubnetFilter_To_v1beta1_SubnetFilter(in, out, s) } -func autoConvert_v1alpha8_SubnetFilter_To_v1alpha5_SubnetFilter(in *v1alpha8.SubnetFilter, out *SubnetFilter, s conversion.Scope) error { +func autoConvert_v1beta1_SubnetFilter_To_v1alpha5_SubnetFilter(in *v1beta1.SubnetFilter, out *SubnetFilter, s conversion.Scope) error { out.Name = in.Name out.Description = in.Description out.ProjectID = in.ProjectID @@ -1510,7 +1510,7 @@ func autoConvert_v1alpha8_SubnetFilter_To_v1alpha5_SubnetFilter(in *v1alpha8.Sub return nil } -// Convert_v1alpha8_SubnetFilter_To_v1alpha5_SubnetFilter is an autogenerated conversion function. -func Convert_v1alpha8_SubnetFilter_To_v1alpha5_SubnetFilter(in *v1alpha8.SubnetFilter, out *SubnetFilter, s conversion.Scope) error { - return autoConvert_v1alpha8_SubnetFilter_To_v1alpha5_SubnetFilter(in, out, s) +// Convert_v1beta1_SubnetFilter_To_v1alpha5_SubnetFilter is an autogenerated conversion function. +func Convert_v1beta1_SubnetFilter_To_v1alpha5_SubnetFilter(in *v1beta1.SubnetFilter, out *SubnetFilter, s conversion.Scope) error { + return autoConvert_v1beta1_SubnetFilter_To_v1alpha5_SubnetFilter(in, out, s) } diff --git a/api/v1alpha6/conversion.go b/api/v1alpha6/conversion.go index 5068c87b07..6636509e0d 100644 --- a/api/v1alpha6/conversion.go +++ b/api/v1alpha6/conversion.go @@ -24,7 +24,7 @@ import ( "k8s.io/utils/pointer" ctrlconversion "sigs.k8s.io/controller-runtime/pkg/conversion" - infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha8" + infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1" "sigs.k8s.io/cluster-api-provider-openstack/pkg/utils/conversion" ) @@ -41,7 +41,7 @@ func restorev1alpha6SecurityGroup(previous *SecurityGroup, dst *SecurityGroup) { } func restorev1alpha6MachineSpec(previous *OpenStackMachineSpec, dst *OpenStackMachineSpec) { - // Subnet is removed from v1alpha8 with no replacement, so can't be + // Subnet is removed from v1beta1 with no replacement, so can't be // losslessly converted. Restore the previously stored value on down-conversion. dst.Subnet = previous.Subnet @@ -56,7 +56,7 @@ func restorev1alpha6MachineSpec(previous *OpenStackMachineSpec, dst *OpenStackMa // losslessly converted. Restore the previously stored value on down-conversion. dst.FloatingIP = previous.FloatingIP - // Conversion to v1alpha8 truncates keys and values to 255 characters + // Conversion to v1beta1 truncates keys and values to 255 characters for k, v := range previous.ServerMetadata { kd := k if len(k) > 255 { @@ -76,7 +76,7 @@ func restorev1alpha6MachineSpec(previous *OpenStackMachineSpec, dst *OpenStackMa } func restorev1alpha6ClusterStatus(previous *OpenStackClusterStatus, dst *OpenStackClusterStatus) { - // PortOpts.SecurityGroups have been removed in v1alpha8 + // PortOpts.SecurityGroups have been removed in v1beta1 // We restore the whole PortOpts/Networks since they are anyway immutable. if previous.ExternalNetwork != nil { dst.ExternalNetwork.PortOpts = previous.ExternalNetwork.PortOpts @@ -93,8 +93,8 @@ func restorev1alpha6ClusterStatus(previous *OpenStackClusterStatus, dst *OpenSta restorev1alpha6SecurityGroup(previous.BastionSecurityGroup, dst.BastionSecurityGroup) } -func restorev1alpha8MachineSpec(previous *infrav1.OpenStackMachineSpec, dst *infrav1.OpenStackMachineSpec) { - // PropagateUplinkStatus has been added in v1alpha8. +func restorev1beta1MachineSpec(previous *infrav1.OpenStackMachineSpec, dst *infrav1.OpenStackMachineSpec) { + // PropagateUplinkStatus has been added in v1beta1. // We restore the whole Ports since they are anyway immutable. dst.Ports = previous.Ports dst.AdditionalBlockDevices = previous.AdditionalBlockDevices @@ -102,20 +102,20 @@ func restorev1alpha8MachineSpec(previous *infrav1.OpenStackMachineSpec, dst *inf dst.Image = previous.Image } -func restorev1alpha8Bastion(previous **infrav1.Bastion, dst **infrav1.Bastion) { +func restorev1beta1Bastion(previous **infrav1.Bastion, dst **infrav1.Bastion) { if *previous != nil && *dst != nil { - restorev1alpha8MachineSpec(&(*previous).Instance, &(*dst).Instance) + restorev1beta1MachineSpec(&(*previous).Instance, &(*dst).Instance) } } -func restorev1alpha8Subnets(previous *[]infrav1.SubnetFilter, dst *[]infrav1.SubnetFilter) { +func restorev1beta1Subnets(previous *[]infrav1.SubnetFilter, dst *[]infrav1.SubnetFilter) { if len(*previous) > 1 { *dst = append(*dst, (*previous)[1:]...) } } -func restorev1alpha8ClusterStatus(previous *infrav1.OpenStackClusterStatus, dst *infrav1.OpenStackClusterStatus) { - // It's (theoretically) possible in v1alpha8 to have Network nil but +func restorev1beta1ClusterStatus(previous *infrav1.OpenStackClusterStatus, dst *infrav1.OpenStackClusterStatus) { + // It's (theoretically) possible in v1beta1 to have Network nil but // Router or APIServerLoadBalancer not nil. In hub-spoke-hub conversion this will // result in Network being a pointer to an empty object. if previous.Network == nil && dst.Network != nil && reflect.ValueOf(*dst.Network).IsZero() { @@ -181,7 +181,7 @@ var v1alpha6OpenStackClusterRestorer = conversion.RestorerFor[*OpenStackCluster] ), } -var v1alpha8OpenStackClusterRestorer = conversion.RestorerFor[*infrav1.OpenStackCluster]{ +var v1beta1OpenStackClusterRestorer = conversion.RestorerFor[*infrav1.OpenStackCluster]{ "externalNetwork": conversion.UnconditionalFieldRestorer( func(c *infrav1.OpenStackCluster) *infrav1.NetworkFilter { return &c.Spec.ExternalNetwork @@ -206,25 +206,25 @@ var v1alpha8OpenStackClusterRestorer = conversion.RestorerFor[*infrav1.OpenStack func(c *infrav1.OpenStackCluster) **infrav1.Bastion { return &c.Spec.Bastion }, - restorev1alpha8Bastion, + restorev1beta1Bastion, ), "subnets": conversion.HashedFieldRestorer( func(c *infrav1.OpenStackCluster) *[]infrav1.SubnetFilter { return &c.Spec.Subnets }, - restorev1alpha8Subnets, + restorev1beta1Subnets, ), "allNodesSecurityGroupRules": conversion.HashedFieldRestorer( func(c *infrav1.OpenStackCluster) *infrav1.ManagedSecurityGroups { return c.Spec.ManagedSecurityGroups }, - restorev1alpha8ManagedSecurityGroups, + restorev1beta1ManagedSecurityGroups, ), "status": conversion.HashedFieldRestorer( func(c *infrav1.OpenStackCluster) *infrav1.OpenStackClusterStatus { return &c.Status }, - restorev1alpha8ClusterStatus, + restorev1beta1ClusterStatus, ), } @@ -233,8 +233,8 @@ func (r *OpenStackCluster) ConvertTo(dstRaw ctrlconversion.Hub) error { return conversion.ConvertAndRestore( r, dst, - Convert_v1alpha6_OpenStackCluster_To_v1alpha8_OpenStackCluster, Convert_v1alpha8_OpenStackCluster_To_v1alpha6_OpenStackCluster, - v1alpha6OpenStackClusterRestorer, v1alpha8OpenStackClusterRestorer, + Convert_v1alpha6_OpenStackCluster_To_v1beta1_OpenStackCluster, Convert_v1beta1_OpenStackCluster_To_v1alpha6_OpenStackCluster, + v1alpha6OpenStackClusterRestorer, v1beta1OpenStackClusterRestorer, ) } @@ -243,8 +243,8 @@ func (r *OpenStackCluster) ConvertFrom(srcRaw ctrlconversion.Hub) error { return conversion.ConvertAndRestore( src, r, - Convert_v1alpha8_OpenStackCluster_To_v1alpha6_OpenStackCluster, Convert_v1alpha6_OpenStackCluster_To_v1alpha8_OpenStackCluster, - v1alpha8OpenStackClusterRestorer, v1alpha6OpenStackClusterRestorer, + Convert_v1beta1_OpenStackCluster_To_v1alpha6_OpenStackCluster, Convert_v1alpha6_OpenStackCluster_To_v1beta1_OpenStackCluster, + v1beta1OpenStackClusterRestorer, v1alpha6OpenStackClusterRestorer, ) } @@ -253,13 +253,13 @@ var _ ctrlconversion.Convertible = &OpenStackClusterList{} func (r *OpenStackClusterList) ConvertTo(dstRaw ctrlconversion.Hub) error { dst := dstRaw.(*infrav1.OpenStackClusterList) - return Convert_v1alpha6_OpenStackClusterList_To_v1alpha8_OpenStackClusterList(r, dst, nil) + return Convert_v1alpha6_OpenStackClusterList_To_v1beta1_OpenStackClusterList(r, dst, nil) } func (r *OpenStackClusterList) ConvertFrom(srcRaw ctrlconversion.Hub) error { src := srcRaw.(*infrav1.OpenStackClusterList) - return Convert_v1alpha8_OpenStackClusterList_To_v1alpha6_OpenStackClusterList(src, r, nil) + return Convert_v1beta1_OpenStackClusterList_To_v1alpha6_OpenStackClusterList(src, r, nil) } var _ ctrlconversion.Convertible = &OpenStackClusterTemplate{} @@ -273,11 +273,11 @@ var v1alpha6OpenStackClusterTemplateRestorer = conversion.RestorerFor[*OpenStack ), } -func restorev1alpha8ManagedSecurityGroups(previous *infrav1.ManagedSecurityGroups, dst *infrav1.ManagedSecurityGroups) { +func restorev1beta1ManagedSecurityGroups(previous *infrav1.ManagedSecurityGroups, dst *infrav1.ManagedSecurityGroups) { dst.AllNodesSecurityGroupRules = previous.AllNodesSecurityGroupRules } -var v1alpha8OpenStackClusterTemplateRestorer = conversion.RestorerFor[*infrav1.OpenStackClusterTemplate]{ +var v1beta1OpenStackClusterTemplateRestorer = conversion.RestorerFor[*infrav1.OpenStackClusterTemplate]{ "externalNetwork": conversion.UnconditionalFieldRestorer( func(c *infrav1.OpenStackClusterTemplate) *infrav1.NetworkFilter { return &c.Spec.Template.Spec.ExternalNetwork @@ -302,19 +302,19 @@ var v1alpha8OpenStackClusterTemplateRestorer = conversion.RestorerFor[*infrav1.O func(c *infrav1.OpenStackClusterTemplate) **infrav1.Bastion { return &c.Spec.Template.Spec.Bastion }, - restorev1alpha8Bastion, + restorev1beta1Bastion, ), "subnets": conversion.HashedFieldRestorer( func(c *infrav1.OpenStackClusterTemplate) *[]infrav1.SubnetFilter { return &c.Spec.Template.Spec.Subnets }, - restorev1alpha8Subnets, + restorev1beta1Subnets, ), "allNodesSecurityGroupRules": conversion.HashedFieldRestorer( func(c *infrav1.OpenStackClusterTemplate) *infrav1.ManagedSecurityGroups { return c.Spec.Template.Spec.ManagedSecurityGroups }, - restorev1alpha8ManagedSecurityGroups, + restorev1beta1ManagedSecurityGroups, ), } @@ -323,8 +323,8 @@ func (r *OpenStackClusterTemplate) ConvertTo(dstRaw ctrlconversion.Hub) error { return conversion.ConvertAndRestore( r, dst, - Convert_v1alpha6_OpenStackClusterTemplate_To_v1alpha8_OpenStackClusterTemplate, Convert_v1alpha8_OpenStackClusterTemplate_To_v1alpha6_OpenStackClusterTemplate, - v1alpha6OpenStackClusterTemplateRestorer, v1alpha8OpenStackClusterTemplateRestorer, + Convert_v1alpha6_OpenStackClusterTemplate_To_v1beta1_OpenStackClusterTemplate, Convert_v1beta1_OpenStackClusterTemplate_To_v1alpha6_OpenStackClusterTemplate, + v1alpha6OpenStackClusterTemplateRestorer, v1beta1OpenStackClusterTemplateRestorer, ) } @@ -333,8 +333,8 @@ func (r *OpenStackClusterTemplate) ConvertFrom(srcRaw ctrlconversion.Hub) error return conversion.ConvertAndRestore( src, r, - Convert_v1alpha8_OpenStackClusterTemplate_To_v1alpha6_OpenStackClusterTemplate, Convert_v1alpha6_OpenStackClusterTemplate_To_v1alpha8_OpenStackClusterTemplate, - v1alpha8OpenStackClusterTemplateRestorer, v1alpha6OpenStackClusterTemplateRestorer, + Convert_v1beta1_OpenStackClusterTemplate_To_v1alpha6_OpenStackClusterTemplate, Convert_v1alpha6_OpenStackClusterTemplate_To_v1beta1_OpenStackClusterTemplate, + v1beta1OpenStackClusterTemplateRestorer, v1alpha6OpenStackClusterTemplateRestorer, ) } @@ -362,12 +362,12 @@ var v1alpha6OpenStackMachineRestorer = conversion.RestorerFor[*OpenStackMachine] ), } -var v1alpha8OpenStackMachineRestorer = conversion.RestorerFor[*infrav1.OpenStackMachine]{ +var v1beta1OpenStackMachineRestorer = conversion.RestorerFor[*infrav1.OpenStackMachine]{ "spec": conversion.HashedFieldRestorer( func(c *infrav1.OpenStackMachine) *infrav1.OpenStackMachineSpec { return &c.Spec }, - restorev1alpha8MachineSpec, + restorev1beta1MachineSpec, ), // No equivalent in v1alpha6 @@ -383,8 +383,8 @@ func (r *OpenStackMachine) ConvertTo(dstRaw ctrlconversion.Hub) error { return conversion.ConvertAndRestore( r, dst, - Convert_v1alpha6_OpenStackMachine_To_v1alpha8_OpenStackMachine, Convert_v1alpha8_OpenStackMachine_To_v1alpha6_OpenStackMachine, - v1alpha6OpenStackMachineRestorer, v1alpha8OpenStackMachineRestorer, + Convert_v1alpha6_OpenStackMachine_To_v1beta1_OpenStackMachine, Convert_v1beta1_OpenStackMachine_To_v1alpha6_OpenStackMachine, + v1alpha6OpenStackMachineRestorer, v1beta1OpenStackMachineRestorer, ) } @@ -393,8 +393,8 @@ func (r *OpenStackMachine) ConvertFrom(srcRaw ctrlconversion.Hub) error { return conversion.ConvertAndRestore( src, r, - Convert_v1alpha8_OpenStackMachine_To_v1alpha6_OpenStackMachine, Convert_v1alpha6_OpenStackMachine_To_v1alpha8_OpenStackMachine, - v1alpha8OpenStackMachineRestorer, v1alpha6OpenStackMachineRestorer, + Convert_v1beta1_OpenStackMachine_To_v1alpha6_OpenStackMachine, Convert_v1alpha6_OpenStackMachine_To_v1beta1_OpenStackMachine, + v1beta1OpenStackMachineRestorer, v1alpha6OpenStackMachineRestorer, ) } @@ -402,12 +402,12 @@ var _ ctrlconversion.Convertible = &OpenStackMachineList{} func (r *OpenStackMachineList) ConvertTo(dstRaw ctrlconversion.Hub) error { dst := dstRaw.(*infrav1.OpenStackMachineList) - return Convert_v1alpha6_OpenStackMachineList_To_v1alpha8_OpenStackMachineList(r, dst, nil) + return Convert_v1alpha6_OpenStackMachineList_To_v1beta1_OpenStackMachineList(r, dst, nil) } func (r *OpenStackMachineList) ConvertFrom(srcRaw ctrlconversion.Hub) error { src := srcRaw.(*infrav1.OpenStackMachineList) - return Convert_v1alpha8_OpenStackMachineList_To_v1alpha6_OpenStackMachineList(src, r, nil) + return Convert_v1beta1_OpenStackMachineList_To_v1alpha6_OpenStackMachineList(src, r, nil) } var _ ctrlconversion.Convertible = &OpenStackMachineTemplate{} @@ -421,12 +421,12 @@ var v1alpha6OpenStackMachineTemplateRestorer = conversion.RestorerFor[*OpenStack ), } -var v1alpha8OpenStackMachineTemplateRestorer = conversion.RestorerFor[*infrav1.OpenStackMachineTemplate]{ +var v1beta1OpenStackMachineTemplateRestorer = conversion.RestorerFor[*infrav1.OpenStackMachineTemplate]{ "spec": conversion.HashedFieldRestorer( func(c *infrav1.OpenStackMachineTemplate) *infrav1.OpenStackMachineSpec { return &c.Spec.Template.Spec }, - restorev1alpha8MachineSpec, + restorev1beta1MachineSpec, ), } @@ -435,8 +435,8 @@ func (r *OpenStackMachineTemplate) ConvertTo(dstRaw ctrlconversion.Hub) error { return conversion.ConvertAndRestore( r, dst, - Convert_v1alpha6_OpenStackMachineTemplate_To_v1alpha8_OpenStackMachineTemplate, Convert_v1alpha8_OpenStackMachineTemplate_To_v1alpha6_OpenStackMachineTemplate, - v1alpha6OpenStackMachineTemplateRestorer, v1alpha8OpenStackMachineTemplateRestorer, + Convert_v1alpha6_OpenStackMachineTemplate_To_v1beta1_OpenStackMachineTemplate, Convert_v1beta1_OpenStackMachineTemplate_To_v1alpha6_OpenStackMachineTemplate, + v1alpha6OpenStackMachineTemplateRestorer, v1beta1OpenStackMachineTemplateRestorer, ) } @@ -445,8 +445,8 @@ func (r *OpenStackMachineTemplate) ConvertFrom(srcRaw ctrlconversion.Hub) error return conversion.ConvertAndRestore( src, r, - Convert_v1alpha8_OpenStackMachineTemplate_To_v1alpha6_OpenStackMachineTemplate, Convert_v1alpha6_OpenStackMachineTemplate_To_v1alpha8_OpenStackMachineTemplate, - v1alpha8OpenStackMachineTemplateRestorer, v1alpha6OpenStackMachineTemplateRestorer, + Convert_v1beta1_OpenStackMachineTemplate_To_v1alpha6_OpenStackMachineTemplate, Convert_v1alpha6_OpenStackMachineTemplate_To_v1beta1_OpenStackMachineTemplate, + v1beta1OpenStackMachineTemplateRestorer, v1alpha6OpenStackMachineTemplateRestorer, ) } @@ -454,16 +454,16 @@ var _ ctrlconversion.Convertible = &OpenStackMachineTemplateList{} func (r *OpenStackMachineTemplateList) ConvertTo(dstRaw ctrlconversion.Hub) error { dst := dstRaw.(*infrav1.OpenStackMachineTemplateList) - return Convert_v1alpha6_OpenStackMachineTemplateList_To_v1alpha8_OpenStackMachineTemplateList(r, dst, nil) + return Convert_v1alpha6_OpenStackMachineTemplateList_To_v1beta1_OpenStackMachineTemplateList(r, dst, nil) } func (r *OpenStackMachineTemplateList) ConvertFrom(srcRaw ctrlconversion.Hub) error { src := srcRaw.(*infrav1.OpenStackMachineTemplateList) - return Convert_v1alpha8_OpenStackMachineTemplateList_To_v1alpha6_OpenStackMachineTemplateList(src, r, nil) + return Convert_v1beta1_OpenStackMachineTemplateList_To_v1alpha6_OpenStackMachineTemplateList(src, r, nil) } -func Convert_v1alpha6_OpenStackMachineSpec_To_v1alpha8_OpenStackMachineSpec(in *OpenStackMachineSpec, out *infrav1.OpenStackMachineSpec, s apiconversion.Scope) error { - err := autoConvert_v1alpha6_OpenStackMachineSpec_To_v1alpha8_OpenStackMachineSpec(in, out, s) +func Convert_v1alpha6_OpenStackMachineSpec_To_v1beta1_OpenStackMachineSpec(in *OpenStackMachineSpec, out *infrav1.OpenStackMachineSpec, s apiconversion.Scope) error { + err := autoConvert_v1alpha6_OpenStackMachineSpec_To_v1beta1_OpenStackMachineSpec(in, out, s) if err != nil { return err } @@ -493,7 +493,7 @@ func Convert_v1alpha6_OpenStackMachineSpec_To_v1alpha8_OpenStackMachineSpec(in * serverMetadata := make([]infrav1.ServerMetadata, 0, len(in.ServerMetadata)) for k, v := range in.ServerMetadata { // Truncate key and value to 255 characters if required, as this - // was not validated prior to v1alpha8 + // was not validated prior to v1beta1 if len(k) > 255 { k = k[:255] } @@ -575,8 +575,8 @@ func convertNetworksToPorts(networks []NetworkParam) []infrav1.PortOpts { return ports } -func Convert_v1alpha8_OpenStackClusterSpec_To_v1alpha6_OpenStackClusterSpec(in *infrav1.OpenStackClusterSpec, out *OpenStackClusterSpec, s apiconversion.Scope) error { - err := autoConvert_v1alpha8_OpenStackClusterSpec_To_v1alpha6_OpenStackClusterSpec(in, out, s) +func Convert_v1beta1_OpenStackClusterSpec_To_v1alpha6_OpenStackClusterSpec(in *infrav1.OpenStackClusterSpec, out *OpenStackClusterSpec, s apiconversion.Scope) error { + err := autoConvert_v1beta1_OpenStackClusterSpec_To_v1alpha6_OpenStackClusterSpec(in, out, s) if err != nil { return err } @@ -586,7 +586,7 @@ func Convert_v1alpha8_OpenStackClusterSpec_To_v1alpha6_OpenStackClusterSpec(in * } if len(in.Subnets) >= 1 { - if err := Convert_v1alpha8_SubnetFilter_To_v1alpha6_SubnetFilter(&in.Subnets[0], &out.Subnet, s); err != nil { + if err := Convert_v1beta1_SubnetFilter_To_v1alpha6_SubnetFilter(&in.Subnets[0], &out.Subnet, s); err != nil { return err } } @@ -604,8 +604,8 @@ func Convert_v1alpha8_OpenStackClusterSpec_To_v1alpha6_OpenStackClusterSpec(in * return nil } -func Convert_v1alpha6_OpenStackClusterSpec_To_v1alpha8_OpenStackClusterSpec(in *OpenStackClusterSpec, out *infrav1.OpenStackClusterSpec, s apiconversion.Scope) error { - err := autoConvert_v1alpha6_OpenStackClusterSpec_To_v1alpha8_OpenStackClusterSpec(in, out, s) +func Convert_v1alpha6_OpenStackClusterSpec_To_v1beta1_OpenStackClusterSpec(in *OpenStackClusterSpec, out *infrav1.OpenStackClusterSpec, s apiconversion.Scope) error { + err := autoConvert_v1alpha6_OpenStackClusterSpec_To_v1beta1_OpenStackClusterSpec(in, out, s) if err != nil { return err } @@ -619,7 +619,7 @@ func Convert_v1alpha6_OpenStackClusterSpec_To_v1alpha8_OpenStackClusterSpec(in * emptySubnet := SubnetFilter{} if in.Subnet != emptySubnet { subnet := infrav1.SubnetFilter{} - if err := Convert_v1alpha6_SubnetFilter_To_v1alpha8_SubnetFilter(&in.Subnet, &subnet, s); err != nil { + if err := Convert_v1alpha6_SubnetFilter_To_v1beta1_SubnetFilter(&in.Subnet, &subnet, s); err != nil { return err } out.Subnets = []infrav1.SubnetFilter{subnet} @@ -647,17 +647,17 @@ func Convert_v1alpha6_OpenStackClusterSpec_To_v1alpha8_OpenStackClusterSpec(in * return nil } -func Convert_v1alpha6_PortOpts_To_v1alpha8_PortOpts(in *PortOpts, out *infrav1.PortOpts, s apiconversion.Scope) error { - err := autoConvert_v1alpha6_PortOpts_To_v1alpha8_PortOpts(in, out, s) +func Convert_v1alpha6_PortOpts_To_v1beta1_PortOpts(in *PortOpts, out *infrav1.PortOpts, s apiconversion.Scope) error { + err := autoConvert_v1alpha6_PortOpts_To_v1beta1_PortOpts(in, out, s) if err != nil { return err } - // SecurityGroups are removed in v1alpha8 without replacement. SecurityGroupFilters can be used instead. + // SecurityGroups are removed in v1beta1 without replacement. SecurityGroupFilters can be used instead. for i := range in.SecurityGroups { out.SecurityGroupFilters = append(out.SecurityGroupFilters, infrav1.SecurityGroupFilter{ID: in.SecurityGroups[i]}) } - // Profile is now a struct in v1alpha8. + // Profile is now a struct in v1beta1. if strings.Contains(in.Profile["capabilities"], "switchdev") { out.Profile.OVSHWOffload = true } @@ -667,9 +667,9 @@ func Convert_v1alpha6_PortOpts_To_v1alpha8_PortOpts(in *PortOpts, out *infrav1.P return nil } -func Convert_v1alpha8_PortOpts_To_v1alpha6_PortOpts(in *infrav1.PortOpts, out *PortOpts, s apiconversion.Scope) error { - // value specs and propagate uplink status have been added in v1alpha8 but have no equivalent in v1alpha5 - err := autoConvert_v1alpha8_PortOpts_To_v1alpha6_PortOpts(in, out, s) +func Convert_v1beta1_PortOpts_To_v1alpha6_PortOpts(in *infrav1.PortOpts, out *PortOpts, s apiconversion.Scope) error { + // value specs and propagate uplink status have been added in v1beta1 but have no equivalent in v1alpha5 + err := autoConvert_v1beta1_PortOpts_To_v1alpha6_PortOpts(in, out, s) if err != nil { return err } @@ -684,7 +684,7 @@ func Convert_v1alpha8_PortOpts_To_v1alpha6_PortOpts(in *infrav1.PortOpts, out *P return nil } -func Convert_v1alpha6_Instance_To_v1alpha8_BastionStatus(in *Instance, out *infrav1.BastionStatus, _ apiconversion.Scope) error { +func Convert_v1alpha6_Instance_To_v1beta1_BastionStatus(in *Instance, out *infrav1.BastionStatus, _ apiconversion.Scope) error { // BastionStatus is the same as Instance with unused fields removed out.ID = in.ID out.Name = in.Name @@ -695,7 +695,7 @@ func Convert_v1alpha6_Instance_To_v1alpha8_BastionStatus(in *Instance, out *infr return nil } -func Convert_v1alpha8_BastionStatus_To_v1alpha6_Instance(in *infrav1.BastionStatus, out *Instance, _ apiconversion.Scope) error { +func Convert_v1beta1_BastionStatus_To_v1alpha6_Instance(in *infrav1.BastionStatus, out *Instance, _ apiconversion.Scope) error { // BastionStatus is the same as Instance with unused fields removed out.ID = in.ID out.Name = in.Name @@ -706,9 +706,9 @@ func Convert_v1alpha8_BastionStatus_To_v1alpha6_Instance(in *infrav1.BastionStat return nil } -func Convert_v1alpha6_Network_To_v1alpha8_NetworkStatusWithSubnets(in *Network, out *infrav1.NetworkStatusWithSubnets, s apiconversion.Scope) error { - // PortOpts has been removed in v1alpha8 - err := Convert_v1alpha6_Network_To_v1alpha8_NetworkStatus(in, &out.NetworkStatus, s) +func Convert_v1alpha6_Network_To_v1beta1_NetworkStatusWithSubnets(in *Network, out *infrav1.NetworkStatusWithSubnets, s apiconversion.Scope) error { + // PortOpts has been removed in v1beta1 + err := Convert_v1alpha6_Network_To_v1beta1_NetworkStatus(in, &out.NetworkStatus, s) if err != nil { return err } @@ -719,9 +719,9 @@ func Convert_v1alpha6_Network_To_v1alpha8_NetworkStatusWithSubnets(in *Network, return nil } -func Convert_v1alpha8_NetworkStatusWithSubnets_To_v1alpha6_Network(in *infrav1.NetworkStatusWithSubnets, out *Network, s apiconversion.Scope) error { - // PortOpts has been removed in v1alpha8 - err := Convert_v1alpha8_NetworkStatus_To_v1alpha6_Network(&in.NetworkStatus, out, s) +func Convert_v1beta1_NetworkStatusWithSubnets_To_v1alpha6_Network(in *infrav1.NetworkStatusWithSubnets, out *Network, s apiconversion.Scope) error { + // PortOpts has been removed in v1beta1 + err := Convert_v1beta1_NetworkStatus_To_v1alpha6_Network(&in.NetworkStatus, out, s) if err != nil { return err } @@ -733,7 +733,7 @@ func Convert_v1alpha8_NetworkStatusWithSubnets_To_v1alpha6_Network(in *infrav1.N return nil } -func Convert_v1alpha6_Network_To_v1alpha8_NetworkStatus(in *Network, out *infrav1.NetworkStatus, _ apiconversion.Scope) error { +func Convert_v1alpha6_Network_To_v1beta1_NetworkStatus(in *Network, out *infrav1.NetworkStatus, _ apiconversion.Scope) error { out.ID = in.ID out.Name = in.Name out.Tags = in.Tags @@ -741,7 +741,7 @@ func Convert_v1alpha6_Network_To_v1alpha8_NetworkStatus(in *Network, out *infrav return nil } -func Convert_v1alpha8_NetworkStatus_To_v1alpha6_Network(in *infrav1.NetworkStatus, out *Network, _ apiconversion.Scope) error { +func Convert_v1beta1_NetworkStatus_To_v1alpha6_Network(in *infrav1.NetworkStatus, out *Network, _ apiconversion.Scope) error { out.ID = in.ID out.Name = in.Name out.Tags = in.Tags @@ -749,13 +749,13 @@ func Convert_v1alpha8_NetworkStatus_To_v1alpha6_Network(in *infrav1.NetworkStatu return nil } -func Convert_v1alpha6_SecurityGroupFilter_To_v1alpha8_SecurityGroupFilter(in *SecurityGroupFilter, out *infrav1.SecurityGroupFilter, s apiconversion.Scope) error { - err := autoConvert_v1alpha6_SecurityGroupFilter_To_v1alpha8_SecurityGroupFilter(in, out, s) +func Convert_v1alpha6_SecurityGroupFilter_To_v1beta1_SecurityGroupFilter(in *SecurityGroupFilter, out *infrav1.SecurityGroupFilter, s apiconversion.Scope) error { + err := autoConvert_v1alpha6_SecurityGroupFilter_To_v1beta1_SecurityGroupFilter(in, out, s) if err != nil { return err } - // TenantID has been removed in v1alpha8. Write it to ProjectID if ProjectID is not already set. + // TenantID has been removed in v1beta1. Write it to ProjectID if ProjectID is not already set. if out.ProjectID == "" { out.ProjectID = in.TenantID } @@ -763,9 +763,9 @@ func Convert_v1alpha6_SecurityGroupFilter_To_v1alpha8_SecurityGroupFilter(in *Se return nil } -func Convert_v1alpha6_SecurityGroupParam_To_v1alpha8_SecurityGroupFilter(in *SecurityGroupParam, out *infrav1.SecurityGroupFilter, s apiconversion.Scope) error { - // SecurityGroupParam is replaced by its contained SecurityGroupFilter in v1alpha8 - err := Convert_v1alpha6_SecurityGroupFilter_To_v1alpha8_SecurityGroupFilter(&in.Filter, out, s) +func Convert_v1alpha6_SecurityGroupParam_To_v1beta1_SecurityGroupFilter(in *SecurityGroupParam, out *infrav1.SecurityGroupFilter, s apiconversion.Scope) error { + // SecurityGroupParam is replaced by its contained SecurityGroupFilter in v1beta1 + err := Convert_v1alpha6_SecurityGroupFilter_To_v1beta1_SecurityGroupFilter(&in.Filter, out, s) if err != nil { return err } @@ -779,9 +779,9 @@ func Convert_v1alpha6_SecurityGroupParam_To_v1alpha8_SecurityGroupFilter(in *Sec return nil } -func Convert_v1alpha8_SecurityGroupFilter_To_v1alpha6_SecurityGroupParam(in *infrav1.SecurityGroupFilter, out *SecurityGroupParam, s apiconversion.Scope) error { - // SecurityGroupParam is replaced by its contained SecurityGroupFilter in v1alpha8 - err := Convert_v1alpha8_SecurityGroupFilter_To_v1alpha6_SecurityGroupFilter(in, &out.Filter, s) +func Convert_v1beta1_SecurityGroupFilter_To_v1alpha6_SecurityGroupParam(in *infrav1.SecurityGroupFilter, out *SecurityGroupParam, s apiconversion.Scope) error { + // SecurityGroupParam is replaced by its contained SecurityGroupFilter in v1beta1 + err := Convert_v1beta1_SecurityGroupFilter_To_v1alpha6_SecurityGroupFilter(in, &out.Filter, s) if err != nil { return err } @@ -795,7 +795,7 @@ func Convert_v1alpha8_SecurityGroupFilter_To_v1alpha6_SecurityGroupParam(in *inf return nil } -func Convert_v1alpha6_SubnetParam_To_v1alpha8_SubnetFilter(in *SubnetParam, out *infrav1.SubnetFilter, _ apiconversion.Scope) error { +func Convert_v1alpha6_SubnetParam_To_v1beta1_SubnetFilter(in *SubnetParam, out *infrav1.SubnetFilter, _ apiconversion.Scope) error { *out = infrav1.SubnetFilter(in.Filter) if in.UUID != "" { out.ID = in.UUID @@ -803,14 +803,14 @@ func Convert_v1alpha6_SubnetParam_To_v1alpha8_SubnetFilter(in *SubnetParam, out return nil } -func Convert_v1alpha8_SubnetFilter_To_v1alpha6_SubnetParam(in *infrav1.SubnetFilter, out *SubnetParam, _ apiconversion.Scope) error { +func Convert_v1beta1_SubnetFilter_To_v1alpha6_SubnetParam(in *infrav1.SubnetFilter, out *SubnetParam, _ apiconversion.Scope) error { out.Filter = SubnetFilter(*in) out.UUID = in.ID return nil } -func Convert_Map_string_To_Interface_To_v1alpha8_BindingProfile(in map[string]string, out *infrav1.BindingProfile, _ apiconversion.Scope) error { +func Convert_Map_string_To_Interface_To_v1beta1_BindingProfile(in map[string]string, out *infrav1.BindingProfile, _ apiconversion.Scope) error { for k, v := range in { if k == "capabilities" { if strings.Contains(v, "switchdev") { @@ -824,7 +824,7 @@ func Convert_Map_string_To_Interface_To_v1alpha8_BindingProfile(in map[string]st return nil } -func Convert_v1alpha8_BindingProfile_To_Map_string_To_Interface(in *infrav1.BindingProfile, out map[string]string, _ apiconversion.Scope) error { +func Convert_v1beta1_BindingProfile_To_Map_string_To_Interface(in *infrav1.BindingProfile, out map[string]string, _ apiconversion.Scope) error { if in.OVSHWOffload { (out)["capabilities"] = "[\"switchdev\"]" } @@ -834,13 +834,13 @@ func Convert_v1alpha8_BindingProfile_To_Map_string_To_Interface(in *infrav1.Bind return nil } -func Convert_v1alpha8_OpenStackClusterStatus_To_v1alpha6_OpenStackClusterStatus(in *infrav1.OpenStackClusterStatus, out *OpenStackClusterStatus, s apiconversion.Scope) error { - err := autoConvert_v1alpha8_OpenStackClusterStatus_To_v1alpha6_OpenStackClusterStatus(in, out, s) +func Convert_v1beta1_OpenStackClusterStatus_To_v1alpha6_OpenStackClusterStatus(in *infrav1.OpenStackClusterStatus, out *OpenStackClusterStatus, s apiconversion.Scope) error { + err := autoConvert_v1beta1_OpenStackClusterStatus_To_v1alpha6_OpenStackClusterStatus(in, out, s) if err != nil { return err } - // Router and APIServerLoadBalancer have been moved out of Network in v1alpha8 + // Router and APIServerLoadBalancer have been moved out of Network in v1beta1 if in.Router != nil || in.APIServerLoadBalancer != nil { if out.Network == nil { out.Network = &Network{} @@ -853,13 +853,13 @@ func Convert_v1alpha8_OpenStackClusterStatus_To_v1alpha6_OpenStackClusterStatus( return nil } -func Convert_v1alpha6_OpenStackClusterStatus_To_v1alpha8_OpenStackClusterStatus(in *OpenStackClusterStatus, out *infrav1.OpenStackClusterStatus, s apiconversion.Scope) error { - err := autoConvert_v1alpha6_OpenStackClusterStatus_To_v1alpha8_OpenStackClusterStatus(in, out, s) +func Convert_v1alpha6_OpenStackClusterStatus_To_v1beta1_OpenStackClusterStatus(in *OpenStackClusterStatus, out *infrav1.OpenStackClusterStatus, s apiconversion.Scope) error { + err := autoConvert_v1alpha6_OpenStackClusterStatus_To_v1beta1_OpenStackClusterStatus(in, out, s) if err != nil { return err } - // Router and APIServerLoadBalancer have been moved out of Network in v1alpha8 + // Router and APIServerLoadBalancer have been moved out of Network in v1beta1 if in.Network != nil { out.Router = (*infrav1.Router)(in.Network.Router) out.APIServerLoadBalancer = (*infrav1.LoadBalancer)(in.Network.APIServerLoadBalancer) @@ -868,8 +868,8 @@ func Convert_v1alpha6_OpenStackClusterStatus_To_v1alpha8_OpenStackClusterStatus( return nil } -func Convert_v1alpha8_OpenStackMachineSpec_To_v1alpha6_OpenStackMachineSpec(in *infrav1.OpenStackMachineSpec, out *OpenStackMachineSpec, s apiconversion.Scope) error { - err := autoConvert_v1alpha8_OpenStackMachineSpec_To_v1alpha6_OpenStackMachineSpec(in, out, s) +func Convert_v1beta1_OpenStackMachineSpec_To_v1alpha6_OpenStackMachineSpec(in *infrav1.OpenStackMachineSpec, out *OpenStackMachineSpec, s apiconversion.Scope) error { + err := autoConvert_v1beta1_OpenStackMachineSpec_To_v1alpha6_OpenStackMachineSpec(in, out, s) if err != nil { return err } @@ -899,13 +899,13 @@ func Convert_v1alpha8_OpenStackMachineSpec_To_v1alpha6_OpenStackMachineSpec(in * return nil } -func Convert_v1alpha8_OpenStackMachineStatus_To_v1alpha6_OpenStackMachineStatus(in *infrav1.OpenStackMachineStatus, out *OpenStackMachineStatus, s apiconversion.Scope) error { +func Convert_v1beta1_OpenStackMachineStatus_To_v1alpha6_OpenStackMachineStatus(in *infrav1.OpenStackMachineStatus, out *OpenStackMachineStatus, s apiconversion.Scope) error { // ReferencedResources have no equivalent in v1alpha6 - return autoConvert_v1alpha8_OpenStackMachineStatus_To_v1alpha6_OpenStackMachineStatus(in, out, s) + return autoConvert_v1beta1_OpenStackMachineStatus_To_v1alpha6_OpenStackMachineStatus(in, out, s) } -func Convert_v1alpha6_Bastion_To_v1alpha8_Bastion(in *Bastion, out *infrav1.Bastion, s apiconversion.Scope) error { - err := autoConvert_v1alpha6_Bastion_To_v1alpha8_Bastion(in, out, s) +func Convert_v1alpha6_Bastion_To_v1beta1_Bastion(in *Bastion, out *infrav1.Bastion, s apiconversion.Scope) error { + err := autoConvert_v1alpha6_Bastion_To_v1beta1_Bastion(in, out, s) if err != nil { return err } @@ -920,8 +920,8 @@ func Convert_v1alpha6_Bastion_To_v1alpha8_Bastion(in *Bastion, out *infrav1.Bast return nil } -func Convert_v1alpha8_Bastion_To_v1alpha6_Bastion(in *infrav1.Bastion, out *Bastion, s apiconversion.Scope) error { - err := autoConvert_v1alpha8_Bastion_To_v1alpha6_Bastion(in, out, s) +func Convert_v1beta1_Bastion_To_v1alpha6_Bastion(in *infrav1.Bastion, out *Bastion, s apiconversion.Scope) error { + err := autoConvert_v1beta1_Bastion_To_v1alpha6_Bastion(in, out, s) if err != nil { return err } @@ -934,7 +934,7 @@ func Convert_v1alpha8_Bastion_To_v1alpha6_Bastion(in *infrav1.Bastion, out *Bast return nil } -func Convert_v1alpha8_SecurityGroupStatus_To_v1alpha6_SecurityGroup(in *infrav1.SecurityGroupStatus, out *SecurityGroup, s apiconversion.Scope) error { //nolint:revive +func Convert_v1beta1_SecurityGroupStatus_To_v1alpha6_SecurityGroup(in *infrav1.SecurityGroupStatus, out *SecurityGroup, s apiconversion.Scope) error { //nolint:revive out.ID = in.ID out.Name = in.Name out.Rules = make([]SecurityGroupRule, len(in.Rules)) @@ -968,7 +968,7 @@ func Convert_v1alpha8_SecurityGroupStatus_To_v1alpha6_SecurityGroup(in *infrav1. return nil } -func Convert_v1alpha6_SecurityGroup_To_v1alpha8_SecurityGroupStatus(in *SecurityGroup, out *infrav1.SecurityGroupStatus, s apiconversion.Scope) error { //nolint:revive +func Convert_v1alpha6_SecurityGroup_To_v1beta1_SecurityGroupStatus(in *SecurityGroup, out *infrav1.SecurityGroupStatus, s apiconversion.Scope) error { //nolint:revive out.ID = in.ID out.Name = in.Name out.Rules = make([]infrav1.SecurityGroupRuleStatus, len(in.Rules)) diff --git a/api/v1alpha6/conversion_test.go b/api/v1alpha6/conversion_test.go index 77f5c4de76..8d7e382836 100644 --- a/api/v1alpha6/conversion_test.go +++ b/api/v1alpha6/conversion_test.go @@ -29,7 +29,7 @@ import ( utilconversion "sigs.k8s.io/cluster-api/util/conversion" "sigs.k8s.io/controller-runtime/pkg/conversion" - infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha8" + infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1" testhelpers "sigs.k8s.io/cluster-api-provider-openstack/test/helpers" ) @@ -655,7 +655,7 @@ func TestMachineConversionControllerSpecFields(t *testing.T) { } } -func TestConvert_v1alpha6_OpenStackClusterSpec_To_v1alpha8_OpenStackClusterSpec(t *testing.T) { +func TestConvert_v1alpha6_OpenStackClusterSpec_To_v1beta1_OpenStackClusterSpec(t *testing.T) { tests := []struct { name string in *OpenStackClusterSpec @@ -696,7 +696,7 @@ func TestConvert_v1alpha6_OpenStackClusterSpec_To_v1alpha8_OpenStackClusterSpec( t.Run(tt.name, func(t *testing.T) { g := gomega.NewWithT(t) out := &infrav1.OpenStackClusterSpec{} - err := Convert_v1alpha6_OpenStackClusterSpec_To_v1alpha8_OpenStackClusterSpec(tt.in, out, nil) + err := Convert_v1alpha6_OpenStackClusterSpec_To_v1beta1_OpenStackClusterSpec(tt.in, out, nil) g.Expect(err).NotTo(gomega.HaveOccurred()) g.Expect(out).To(gomega.Equal(tt.expectedOut)) }) diff --git a/api/v1alpha6/doc.go b/api/v1alpha6/doc.go index e0fde58a62..8b8c08cd51 100644 --- a/api/v1alpha6/doc.go +++ b/api/v1alpha6/doc.go @@ -14,5 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// +k8s:conversion-gen=sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha8 +// +k8s:conversion-gen=sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1 package v1alpha6 diff --git a/api/v1alpha6/zz_generated.conversion.go b/api/v1alpha6/zz_generated.conversion.go index 2bbcd48d10..8f51756da3 100644 --- a/api/v1alpha6/zz_generated.conversion.go +++ b/api/v1alpha6/zz_generated.conversion.go @@ -27,8 +27,8 @@ import ( v1 "k8s.io/api/core/v1" conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" - v1alpha8 "sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha8" - v1beta1 "sigs.k8s.io/cluster-api/api/v1beta1" + v1beta1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1" + apiv1beta1 "sigs.k8s.io/cluster-api/api/v1beta1" errors "sigs.k8s.io/cluster-api/errors" ) @@ -39,380 +39,380 @@ func init() { // RegisterConversions adds conversion functions to the given scheme. // Public to allow building arbitrary schemes. func RegisterConversions(s *runtime.Scheme) error { - if err := s.AddGeneratedConversionFunc((*APIServerLoadBalancer)(nil), (*v1alpha8.APIServerLoadBalancer)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha6_APIServerLoadBalancer_To_v1alpha8_APIServerLoadBalancer(a.(*APIServerLoadBalancer), b.(*v1alpha8.APIServerLoadBalancer), scope) + if err := s.AddGeneratedConversionFunc((*APIServerLoadBalancer)(nil), (*v1beta1.APIServerLoadBalancer)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha6_APIServerLoadBalancer_To_v1beta1_APIServerLoadBalancer(a.(*APIServerLoadBalancer), b.(*v1beta1.APIServerLoadBalancer), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1alpha8.APIServerLoadBalancer)(nil), (*APIServerLoadBalancer)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_APIServerLoadBalancer_To_v1alpha6_APIServerLoadBalancer(a.(*v1alpha8.APIServerLoadBalancer), b.(*APIServerLoadBalancer), scope) + if err := s.AddGeneratedConversionFunc((*v1beta1.APIServerLoadBalancer)(nil), (*APIServerLoadBalancer)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_APIServerLoadBalancer_To_v1alpha6_APIServerLoadBalancer(a.(*v1beta1.APIServerLoadBalancer), b.(*APIServerLoadBalancer), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*AddressPair)(nil), (*v1alpha8.AddressPair)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha6_AddressPair_To_v1alpha8_AddressPair(a.(*AddressPair), b.(*v1alpha8.AddressPair), scope) + if err := s.AddGeneratedConversionFunc((*AddressPair)(nil), (*v1beta1.AddressPair)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha6_AddressPair_To_v1beta1_AddressPair(a.(*AddressPair), b.(*v1beta1.AddressPair), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1alpha8.AddressPair)(nil), (*AddressPair)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_AddressPair_To_v1alpha6_AddressPair(a.(*v1alpha8.AddressPair), b.(*AddressPair), scope) + if err := s.AddGeneratedConversionFunc((*v1beta1.AddressPair)(nil), (*AddressPair)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_AddressPair_To_v1alpha6_AddressPair(a.(*v1beta1.AddressPair), b.(*AddressPair), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*ExternalRouterIPParam)(nil), (*v1alpha8.ExternalRouterIPParam)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha6_ExternalRouterIPParam_To_v1alpha8_ExternalRouterIPParam(a.(*ExternalRouterIPParam), b.(*v1alpha8.ExternalRouterIPParam), scope) + if err := s.AddGeneratedConversionFunc((*ExternalRouterIPParam)(nil), (*v1beta1.ExternalRouterIPParam)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha6_ExternalRouterIPParam_To_v1beta1_ExternalRouterIPParam(a.(*ExternalRouterIPParam), b.(*v1beta1.ExternalRouterIPParam), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1alpha8.ExternalRouterIPParam)(nil), (*ExternalRouterIPParam)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_ExternalRouterIPParam_To_v1alpha6_ExternalRouterIPParam(a.(*v1alpha8.ExternalRouterIPParam), b.(*ExternalRouterIPParam), scope) + if err := s.AddGeneratedConversionFunc((*v1beta1.ExternalRouterIPParam)(nil), (*ExternalRouterIPParam)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_ExternalRouterIPParam_To_v1alpha6_ExternalRouterIPParam(a.(*v1beta1.ExternalRouterIPParam), b.(*ExternalRouterIPParam), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*FixedIP)(nil), (*v1alpha8.FixedIP)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha6_FixedIP_To_v1alpha8_FixedIP(a.(*FixedIP), b.(*v1alpha8.FixedIP), scope) + if err := s.AddGeneratedConversionFunc((*FixedIP)(nil), (*v1beta1.FixedIP)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha6_FixedIP_To_v1beta1_FixedIP(a.(*FixedIP), b.(*v1beta1.FixedIP), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1alpha8.FixedIP)(nil), (*FixedIP)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_FixedIP_To_v1alpha6_FixedIP(a.(*v1alpha8.FixedIP), b.(*FixedIP), scope) + if err := s.AddGeneratedConversionFunc((*v1beta1.FixedIP)(nil), (*FixedIP)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_FixedIP_To_v1alpha6_FixedIP(a.(*v1beta1.FixedIP), b.(*FixedIP), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*LoadBalancer)(nil), (*v1alpha8.LoadBalancer)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha6_LoadBalancer_To_v1alpha8_LoadBalancer(a.(*LoadBalancer), b.(*v1alpha8.LoadBalancer), scope) + if err := s.AddGeneratedConversionFunc((*LoadBalancer)(nil), (*v1beta1.LoadBalancer)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha6_LoadBalancer_To_v1beta1_LoadBalancer(a.(*LoadBalancer), b.(*v1beta1.LoadBalancer), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1alpha8.LoadBalancer)(nil), (*LoadBalancer)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_LoadBalancer_To_v1alpha6_LoadBalancer(a.(*v1alpha8.LoadBalancer), b.(*LoadBalancer), scope) + if err := s.AddGeneratedConversionFunc((*v1beta1.LoadBalancer)(nil), (*LoadBalancer)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_LoadBalancer_To_v1alpha6_LoadBalancer(a.(*v1beta1.LoadBalancer), b.(*LoadBalancer), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*NetworkFilter)(nil), (*v1alpha8.NetworkFilter)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha6_NetworkFilter_To_v1alpha8_NetworkFilter(a.(*NetworkFilter), b.(*v1alpha8.NetworkFilter), scope) + if err := s.AddGeneratedConversionFunc((*NetworkFilter)(nil), (*v1beta1.NetworkFilter)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha6_NetworkFilter_To_v1beta1_NetworkFilter(a.(*NetworkFilter), b.(*v1beta1.NetworkFilter), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1alpha8.NetworkFilter)(nil), (*NetworkFilter)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_NetworkFilter_To_v1alpha6_NetworkFilter(a.(*v1alpha8.NetworkFilter), b.(*NetworkFilter), scope) + if err := s.AddGeneratedConversionFunc((*v1beta1.NetworkFilter)(nil), (*NetworkFilter)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_NetworkFilter_To_v1alpha6_NetworkFilter(a.(*v1beta1.NetworkFilter), b.(*NetworkFilter), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*OpenStackCluster)(nil), (*v1alpha8.OpenStackCluster)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha6_OpenStackCluster_To_v1alpha8_OpenStackCluster(a.(*OpenStackCluster), b.(*v1alpha8.OpenStackCluster), scope) + if err := s.AddGeneratedConversionFunc((*OpenStackCluster)(nil), (*v1beta1.OpenStackCluster)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha6_OpenStackCluster_To_v1beta1_OpenStackCluster(a.(*OpenStackCluster), b.(*v1beta1.OpenStackCluster), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1alpha8.OpenStackCluster)(nil), (*OpenStackCluster)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_OpenStackCluster_To_v1alpha6_OpenStackCluster(a.(*v1alpha8.OpenStackCluster), b.(*OpenStackCluster), scope) + if err := s.AddGeneratedConversionFunc((*v1beta1.OpenStackCluster)(nil), (*OpenStackCluster)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_OpenStackCluster_To_v1alpha6_OpenStackCluster(a.(*v1beta1.OpenStackCluster), b.(*OpenStackCluster), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*OpenStackClusterList)(nil), (*v1alpha8.OpenStackClusterList)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha6_OpenStackClusterList_To_v1alpha8_OpenStackClusterList(a.(*OpenStackClusterList), b.(*v1alpha8.OpenStackClusterList), scope) + if err := s.AddGeneratedConversionFunc((*OpenStackClusterList)(nil), (*v1beta1.OpenStackClusterList)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha6_OpenStackClusterList_To_v1beta1_OpenStackClusterList(a.(*OpenStackClusterList), b.(*v1beta1.OpenStackClusterList), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1alpha8.OpenStackClusterList)(nil), (*OpenStackClusterList)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_OpenStackClusterList_To_v1alpha6_OpenStackClusterList(a.(*v1alpha8.OpenStackClusterList), b.(*OpenStackClusterList), scope) + if err := s.AddGeneratedConversionFunc((*v1beta1.OpenStackClusterList)(nil), (*OpenStackClusterList)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_OpenStackClusterList_To_v1alpha6_OpenStackClusterList(a.(*v1beta1.OpenStackClusterList), b.(*OpenStackClusterList), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*OpenStackClusterTemplate)(nil), (*v1alpha8.OpenStackClusterTemplate)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha6_OpenStackClusterTemplate_To_v1alpha8_OpenStackClusterTemplate(a.(*OpenStackClusterTemplate), b.(*v1alpha8.OpenStackClusterTemplate), scope) + if err := s.AddGeneratedConversionFunc((*OpenStackClusterTemplate)(nil), (*v1beta1.OpenStackClusterTemplate)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha6_OpenStackClusterTemplate_To_v1beta1_OpenStackClusterTemplate(a.(*OpenStackClusterTemplate), b.(*v1beta1.OpenStackClusterTemplate), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1alpha8.OpenStackClusterTemplate)(nil), (*OpenStackClusterTemplate)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_OpenStackClusterTemplate_To_v1alpha6_OpenStackClusterTemplate(a.(*v1alpha8.OpenStackClusterTemplate), b.(*OpenStackClusterTemplate), scope) + if err := s.AddGeneratedConversionFunc((*v1beta1.OpenStackClusterTemplate)(nil), (*OpenStackClusterTemplate)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_OpenStackClusterTemplate_To_v1alpha6_OpenStackClusterTemplate(a.(*v1beta1.OpenStackClusterTemplate), b.(*OpenStackClusterTemplate), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*OpenStackClusterTemplateList)(nil), (*v1alpha8.OpenStackClusterTemplateList)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha6_OpenStackClusterTemplateList_To_v1alpha8_OpenStackClusterTemplateList(a.(*OpenStackClusterTemplateList), b.(*v1alpha8.OpenStackClusterTemplateList), scope) + if err := s.AddGeneratedConversionFunc((*OpenStackClusterTemplateList)(nil), (*v1beta1.OpenStackClusterTemplateList)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha6_OpenStackClusterTemplateList_To_v1beta1_OpenStackClusterTemplateList(a.(*OpenStackClusterTemplateList), b.(*v1beta1.OpenStackClusterTemplateList), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1alpha8.OpenStackClusterTemplateList)(nil), (*OpenStackClusterTemplateList)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_OpenStackClusterTemplateList_To_v1alpha6_OpenStackClusterTemplateList(a.(*v1alpha8.OpenStackClusterTemplateList), b.(*OpenStackClusterTemplateList), scope) + if err := s.AddGeneratedConversionFunc((*v1beta1.OpenStackClusterTemplateList)(nil), (*OpenStackClusterTemplateList)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_OpenStackClusterTemplateList_To_v1alpha6_OpenStackClusterTemplateList(a.(*v1beta1.OpenStackClusterTemplateList), b.(*OpenStackClusterTemplateList), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*OpenStackClusterTemplateResource)(nil), (*v1alpha8.OpenStackClusterTemplateResource)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha6_OpenStackClusterTemplateResource_To_v1alpha8_OpenStackClusterTemplateResource(a.(*OpenStackClusterTemplateResource), b.(*v1alpha8.OpenStackClusterTemplateResource), scope) + if err := s.AddGeneratedConversionFunc((*OpenStackClusterTemplateResource)(nil), (*v1beta1.OpenStackClusterTemplateResource)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha6_OpenStackClusterTemplateResource_To_v1beta1_OpenStackClusterTemplateResource(a.(*OpenStackClusterTemplateResource), b.(*v1beta1.OpenStackClusterTemplateResource), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1alpha8.OpenStackClusterTemplateResource)(nil), (*OpenStackClusterTemplateResource)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_OpenStackClusterTemplateResource_To_v1alpha6_OpenStackClusterTemplateResource(a.(*v1alpha8.OpenStackClusterTemplateResource), b.(*OpenStackClusterTemplateResource), scope) + if err := s.AddGeneratedConversionFunc((*v1beta1.OpenStackClusterTemplateResource)(nil), (*OpenStackClusterTemplateResource)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_OpenStackClusterTemplateResource_To_v1alpha6_OpenStackClusterTemplateResource(a.(*v1beta1.OpenStackClusterTemplateResource), b.(*OpenStackClusterTemplateResource), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*OpenStackClusterTemplateSpec)(nil), (*v1alpha8.OpenStackClusterTemplateSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha6_OpenStackClusterTemplateSpec_To_v1alpha8_OpenStackClusterTemplateSpec(a.(*OpenStackClusterTemplateSpec), b.(*v1alpha8.OpenStackClusterTemplateSpec), scope) + if err := s.AddGeneratedConversionFunc((*OpenStackClusterTemplateSpec)(nil), (*v1beta1.OpenStackClusterTemplateSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha6_OpenStackClusterTemplateSpec_To_v1beta1_OpenStackClusterTemplateSpec(a.(*OpenStackClusterTemplateSpec), b.(*v1beta1.OpenStackClusterTemplateSpec), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1alpha8.OpenStackClusterTemplateSpec)(nil), (*OpenStackClusterTemplateSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_OpenStackClusterTemplateSpec_To_v1alpha6_OpenStackClusterTemplateSpec(a.(*v1alpha8.OpenStackClusterTemplateSpec), b.(*OpenStackClusterTemplateSpec), scope) + if err := s.AddGeneratedConversionFunc((*v1beta1.OpenStackClusterTemplateSpec)(nil), (*OpenStackClusterTemplateSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_OpenStackClusterTemplateSpec_To_v1alpha6_OpenStackClusterTemplateSpec(a.(*v1beta1.OpenStackClusterTemplateSpec), b.(*OpenStackClusterTemplateSpec), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*OpenStackIdentityReference)(nil), (*v1alpha8.OpenStackIdentityReference)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha6_OpenStackIdentityReference_To_v1alpha8_OpenStackIdentityReference(a.(*OpenStackIdentityReference), b.(*v1alpha8.OpenStackIdentityReference), scope) + if err := s.AddGeneratedConversionFunc((*OpenStackIdentityReference)(nil), (*v1beta1.OpenStackIdentityReference)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha6_OpenStackIdentityReference_To_v1beta1_OpenStackIdentityReference(a.(*OpenStackIdentityReference), b.(*v1beta1.OpenStackIdentityReference), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1alpha8.OpenStackIdentityReference)(nil), (*OpenStackIdentityReference)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_OpenStackIdentityReference_To_v1alpha6_OpenStackIdentityReference(a.(*v1alpha8.OpenStackIdentityReference), b.(*OpenStackIdentityReference), scope) + if err := s.AddGeneratedConversionFunc((*v1beta1.OpenStackIdentityReference)(nil), (*OpenStackIdentityReference)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_OpenStackIdentityReference_To_v1alpha6_OpenStackIdentityReference(a.(*v1beta1.OpenStackIdentityReference), b.(*OpenStackIdentityReference), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*OpenStackMachine)(nil), (*v1alpha8.OpenStackMachine)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha6_OpenStackMachine_To_v1alpha8_OpenStackMachine(a.(*OpenStackMachine), b.(*v1alpha8.OpenStackMachine), scope) + if err := s.AddGeneratedConversionFunc((*OpenStackMachine)(nil), (*v1beta1.OpenStackMachine)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha6_OpenStackMachine_To_v1beta1_OpenStackMachine(a.(*OpenStackMachine), b.(*v1beta1.OpenStackMachine), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1alpha8.OpenStackMachine)(nil), (*OpenStackMachine)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_OpenStackMachine_To_v1alpha6_OpenStackMachine(a.(*v1alpha8.OpenStackMachine), b.(*OpenStackMachine), scope) + if err := s.AddGeneratedConversionFunc((*v1beta1.OpenStackMachine)(nil), (*OpenStackMachine)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_OpenStackMachine_To_v1alpha6_OpenStackMachine(a.(*v1beta1.OpenStackMachine), b.(*OpenStackMachine), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*OpenStackMachineList)(nil), (*v1alpha8.OpenStackMachineList)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha6_OpenStackMachineList_To_v1alpha8_OpenStackMachineList(a.(*OpenStackMachineList), b.(*v1alpha8.OpenStackMachineList), scope) + if err := s.AddGeneratedConversionFunc((*OpenStackMachineList)(nil), (*v1beta1.OpenStackMachineList)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha6_OpenStackMachineList_To_v1beta1_OpenStackMachineList(a.(*OpenStackMachineList), b.(*v1beta1.OpenStackMachineList), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1alpha8.OpenStackMachineList)(nil), (*OpenStackMachineList)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_OpenStackMachineList_To_v1alpha6_OpenStackMachineList(a.(*v1alpha8.OpenStackMachineList), b.(*OpenStackMachineList), scope) + if err := s.AddGeneratedConversionFunc((*v1beta1.OpenStackMachineList)(nil), (*OpenStackMachineList)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_OpenStackMachineList_To_v1alpha6_OpenStackMachineList(a.(*v1beta1.OpenStackMachineList), b.(*OpenStackMachineList), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*OpenStackMachineStatus)(nil), (*v1alpha8.OpenStackMachineStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha6_OpenStackMachineStatus_To_v1alpha8_OpenStackMachineStatus(a.(*OpenStackMachineStatus), b.(*v1alpha8.OpenStackMachineStatus), scope) + if err := s.AddGeneratedConversionFunc((*OpenStackMachineStatus)(nil), (*v1beta1.OpenStackMachineStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha6_OpenStackMachineStatus_To_v1beta1_OpenStackMachineStatus(a.(*OpenStackMachineStatus), b.(*v1beta1.OpenStackMachineStatus), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*OpenStackMachineTemplate)(nil), (*v1alpha8.OpenStackMachineTemplate)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha6_OpenStackMachineTemplate_To_v1alpha8_OpenStackMachineTemplate(a.(*OpenStackMachineTemplate), b.(*v1alpha8.OpenStackMachineTemplate), scope) + if err := s.AddGeneratedConversionFunc((*OpenStackMachineTemplate)(nil), (*v1beta1.OpenStackMachineTemplate)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha6_OpenStackMachineTemplate_To_v1beta1_OpenStackMachineTemplate(a.(*OpenStackMachineTemplate), b.(*v1beta1.OpenStackMachineTemplate), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1alpha8.OpenStackMachineTemplate)(nil), (*OpenStackMachineTemplate)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_OpenStackMachineTemplate_To_v1alpha6_OpenStackMachineTemplate(a.(*v1alpha8.OpenStackMachineTemplate), b.(*OpenStackMachineTemplate), scope) + if err := s.AddGeneratedConversionFunc((*v1beta1.OpenStackMachineTemplate)(nil), (*OpenStackMachineTemplate)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_OpenStackMachineTemplate_To_v1alpha6_OpenStackMachineTemplate(a.(*v1beta1.OpenStackMachineTemplate), b.(*OpenStackMachineTemplate), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*OpenStackMachineTemplateList)(nil), (*v1alpha8.OpenStackMachineTemplateList)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha6_OpenStackMachineTemplateList_To_v1alpha8_OpenStackMachineTemplateList(a.(*OpenStackMachineTemplateList), b.(*v1alpha8.OpenStackMachineTemplateList), scope) + if err := s.AddGeneratedConversionFunc((*OpenStackMachineTemplateList)(nil), (*v1beta1.OpenStackMachineTemplateList)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha6_OpenStackMachineTemplateList_To_v1beta1_OpenStackMachineTemplateList(a.(*OpenStackMachineTemplateList), b.(*v1beta1.OpenStackMachineTemplateList), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1alpha8.OpenStackMachineTemplateList)(nil), (*OpenStackMachineTemplateList)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_OpenStackMachineTemplateList_To_v1alpha6_OpenStackMachineTemplateList(a.(*v1alpha8.OpenStackMachineTemplateList), b.(*OpenStackMachineTemplateList), scope) + if err := s.AddGeneratedConversionFunc((*v1beta1.OpenStackMachineTemplateList)(nil), (*OpenStackMachineTemplateList)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_OpenStackMachineTemplateList_To_v1alpha6_OpenStackMachineTemplateList(a.(*v1beta1.OpenStackMachineTemplateList), b.(*OpenStackMachineTemplateList), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*OpenStackMachineTemplateResource)(nil), (*v1alpha8.OpenStackMachineTemplateResource)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha6_OpenStackMachineTemplateResource_To_v1alpha8_OpenStackMachineTemplateResource(a.(*OpenStackMachineTemplateResource), b.(*v1alpha8.OpenStackMachineTemplateResource), scope) + if err := s.AddGeneratedConversionFunc((*OpenStackMachineTemplateResource)(nil), (*v1beta1.OpenStackMachineTemplateResource)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha6_OpenStackMachineTemplateResource_To_v1beta1_OpenStackMachineTemplateResource(a.(*OpenStackMachineTemplateResource), b.(*v1beta1.OpenStackMachineTemplateResource), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1alpha8.OpenStackMachineTemplateResource)(nil), (*OpenStackMachineTemplateResource)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_OpenStackMachineTemplateResource_To_v1alpha6_OpenStackMachineTemplateResource(a.(*v1alpha8.OpenStackMachineTemplateResource), b.(*OpenStackMachineTemplateResource), scope) + if err := s.AddGeneratedConversionFunc((*v1beta1.OpenStackMachineTemplateResource)(nil), (*OpenStackMachineTemplateResource)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_OpenStackMachineTemplateResource_To_v1alpha6_OpenStackMachineTemplateResource(a.(*v1beta1.OpenStackMachineTemplateResource), b.(*OpenStackMachineTemplateResource), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*OpenStackMachineTemplateSpec)(nil), (*v1alpha8.OpenStackMachineTemplateSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha6_OpenStackMachineTemplateSpec_To_v1alpha8_OpenStackMachineTemplateSpec(a.(*OpenStackMachineTemplateSpec), b.(*v1alpha8.OpenStackMachineTemplateSpec), scope) + if err := s.AddGeneratedConversionFunc((*OpenStackMachineTemplateSpec)(nil), (*v1beta1.OpenStackMachineTemplateSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha6_OpenStackMachineTemplateSpec_To_v1beta1_OpenStackMachineTemplateSpec(a.(*OpenStackMachineTemplateSpec), b.(*v1beta1.OpenStackMachineTemplateSpec), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1alpha8.OpenStackMachineTemplateSpec)(nil), (*OpenStackMachineTemplateSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_OpenStackMachineTemplateSpec_To_v1alpha6_OpenStackMachineTemplateSpec(a.(*v1alpha8.OpenStackMachineTemplateSpec), b.(*OpenStackMachineTemplateSpec), scope) + if err := s.AddGeneratedConversionFunc((*v1beta1.OpenStackMachineTemplateSpec)(nil), (*OpenStackMachineTemplateSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_OpenStackMachineTemplateSpec_To_v1alpha6_OpenStackMachineTemplateSpec(a.(*v1beta1.OpenStackMachineTemplateSpec), b.(*OpenStackMachineTemplateSpec), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*RootVolume)(nil), (*v1alpha8.RootVolume)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha6_RootVolume_To_v1alpha8_RootVolume(a.(*RootVolume), b.(*v1alpha8.RootVolume), scope) + if err := s.AddGeneratedConversionFunc((*RootVolume)(nil), (*v1beta1.RootVolume)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha6_RootVolume_To_v1beta1_RootVolume(a.(*RootVolume), b.(*v1beta1.RootVolume), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1alpha8.RootVolume)(nil), (*RootVolume)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_RootVolume_To_v1alpha6_RootVolume(a.(*v1alpha8.RootVolume), b.(*RootVolume), scope) + if err := s.AddGeneratedConversionFunc((*v1beta1.RootVolume)(nil), (*RootVolume)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_RootVolume_To_v1alpha6_RootVolume(a.(*v1beta1.RootVolume), b.(*RootVolume), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*Router)(nil), (*v1alpha8.Router)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha6_Router_To_v1alpha8_Router(a.(*Router), b.(*v1alpha8.Router), scope) + if err := s.AddGeneratedConversionFunc((*Router)(nil), (*v1beta1.Router)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha6_Router_To_v1beta1_Router(a.(*Router), b.(*v1beta1.Router), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1alpha8.Router)(nil), (*Router)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_Router_To_v1alpha6_Router(a.(*v1alpha8.Router), b.(*Router), scope) + if err := s.AddGeneratedConversionFunc((*v1beta1.Router)(nil), (*Router)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_Router_To_v1alpha6_Router(a.(*v1beta1.Router), b.(*Router), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1alpha8.SecurityGroupFilter)(nil), (*SecurityGroupFilter)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_SecurityGroupFilter_To_v1alpha6_SecurityGroupFilter(a.(*v1alpha8.SecurityGroupFilter), b.(*SecurityGroupFilter), scope) + if err := s.AddGeneratedConversionFunc((*v1beta1.SecurityGroupFilter)(nil), (*SecurityGroupFilter)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_SecurityGroupFilter_To_v1alpha6_SecurityGroupFilter(a.(*v1beta1.SecurityGroupFilter), b.(*SecurityGroupFilter), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*Subnet)(nil), (*v1alpha8.Subnet)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha6_Subnet_To_v1alpha8_Subnet(a.(*Subnet), b.(*v1alpha8.Subnet), scope) + if err := s.AddGeneratedConversionFunc((*Subnet)(nil), (*v1beta1.Subnet)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha6_Subnet_To_v1beta1_Subnet(a.(*Subnet), b.(*v1beta1.Subnet), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1alpha8.Subnet)(nil), (*Subnet)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_Subnet_To_v1alpha6_Subnet(a.(*v1alpha8.Subnet), b.(*Subnet), scope) + if err := s.AddGeneratedConversionFunc((*v1beta1.Subnet)(nil), (*Subnet)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_Subnet_To_v1alpha6_Subnet(a.(*v1beta1.Subnet), b.(*Subnet), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*SubnetFilter)(nil), (*v1alpha8.SubnetFilter)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha6_SubnetFilter_To_v1alpha8_SubnetFilter(a.(*SubnetFilter), b.(*v1alpha8.SubnetFilter), scope) + if err := s.AddGeneratedConversionFunc((*SubnetFilter)(nil), (*v1beta1.SubnetFilter)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha6_SubnetFilter_To_v1beta1_SubnetFilter(a.(*SubnetFilter), b.(*v1beta1.SubnetFilter), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1alpha8.SubnetFilter)(nil), (*SubnetFilter)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_SubnetFilter_To_v1alpha6_SubnetFilter(a.(*v1alpha8.SubnetFilter), b.(*SubnetFilter), scope) + if err := s.AddGeneratedConversionFunc((*v1beta1.SubnetFilter)(nil), (*SubnetFilter)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_SubnetFilter_To_v1alpha6_SubnetFilter(a.(*v1beta1.SubnetFilter), b.(*SubnetFilter), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*ValueSpec)(nil), (*v1alpha8.ValueSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha6_ValueSpec_To_v1alpha8_ValueSpec(a.(*ValueSpec), b.(*v1alpha8.ValueSpec), scope) + if err := s.AddGeneratedConversionFunc((*ValueSpec)(nil), (*v1beta1.ValueSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha6_ValueSpec_To_v1beta1_ValueSpec(a.(*ValueSpec), b.(*v1beta1.ValueSpec), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1alpha8.ValueSpec)(nil), (*ValueSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_ValueSpec_To_v1alpha6_ValueSpec(a.(*v1alpha8.ValueSpec), b.(*ValueSpec), scope) + if err := s.AddGeneratedConversionFunc((*v1beta1.ValueSpec)(nil), (*ValueSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_ValueSpec_To_v1alpha6_ValueSpec(a.(*v1beta1.ValueSpec), b.(*ValueSpec), scope) }); err != nil { return err } - if err := s.AddConversionFunc((*Bastion)(nil), (*v1alpha8.Bastion)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha6_Bastion_To_v1alpha8_Bastion(a.(*Bastion), b.(*v1alpha8.Bastion), scope) + if err := s.AddConversionFunc((*Bastion)(nil), (*v1beta1.Bastion)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha6_Bastion_To_v1beta1_Bastion(a.(*Bastion), b.(*v1beta1.Bastion), scope) }); err != nil { return err } - if err := s.AddConversionFunc((*Instance)(nil), (*v1alpha8.BastionStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha6_Instance_To_v1alpha8_BastionStatus(a.(*Instance), b.(*v1alpha8.BastionStatus), scope) + if err := s.AddConversionFunc((*Instance)(nil), (*v1beta1.BastionStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha6_Instance_To_v1beta1_BastionStatus(a.(*Instance), b.(*v1beta1.BastionStatus), scope) }); err != nil { return err } - if err := s.AddConversionFunc((*Network)(nil), (*v1alpha8.NetworkStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha6_Network_To_v1alpha8_NetworkStatus(a.(*Network), b.(*v1alpha8.NetworkStatus), scope) + if err := s.AddConversionFunc((*Network)(nil), (*v1beta1.NetworkStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha6_Network_To_v1beta1_NetworkStatus(a.(*Network), b.(*v1beta1.NetworkStatus), scope) }); err != nil { return err } - if err := s.AddConversionFunc((*Network)(nil), (*v1alpha8.NetworkStatusWithSubnets)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha6_Network_To_v1alpha8_NetworkStatusWithSubnets(a.(*Network), b.(*v1alpha8.NetworkStatusWithSubnets), scope) + if err := s.AddConversionFunc((*Network)(nil), (*v1beta1.NetworkStatusWithSubnets)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha6_Network_To_v1beta1_NetworkStatusWithSubnets(a.(*Network), b.(*v1beta1.NetworkStatusWithSubnets), scope) }); err != nil { return err } - if err := s.AddConversionFunc((*OpenStackClusterSpec)(nil), (*v1alpha8.OpenStackClusterSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha6_OpenStackClusterSpec_To_v1alpha8_OpenStackClusterSpec(a.(*OpenStackClusterSpec), b.(*v1alpha8.OpenStackClusterSpec), scope) + if err := s.AddConversionFunc((*OpenStackClusterSpec)(nil), (*v1beta1.OpenStackClusterSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha6_OpenStackClusterSpec_To_v1beta1_OpenStackClusterSpec(a.(*OpenStackClusterSpec), b.(*v1beta1.OpenStackClusterSpec), scope) }); err != nil { return err } - if err := s.AddConversionFunc((*OpenStackClusterStatus)(nil), (*v1alpha8.OpenStackClusterStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha6_OpenStackClusterStatus_To_v1alpha8_OpenStackClusterStatus(a.(*OpenStackClusterStatus), b.(*v1alpha8.OpenStackClusterStatus), scope) + if err := s.AddConversionFunc((*OpenStackClusterStatus)(nil), (*v1beta1.OpenStackClusterStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha6_OpenStackClusterStatus_To_v1beta1_OpenStackClusterStatus(a.(*OpenStackClusterStatus), b.(*v1beta1.OpenStackClusterStatus), scope) }); err != nil { return err } - if err := s.AddConversionFunc((*OpenStackMachineSpec)(nil), (*v1alpha8.OpenStackMachineSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha6_OpenStackMachineSpec_To_v1alpha8_OpenStackMachineSpec(a.(*OpenStackMachineSpec), b.(*v1alpha8.OpenStackMachineSpec), scope) + if err := s.AddConversionFunc((*OpenStackMachineSpec)(nil), (*v1beta1.OpenStackMachineSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha6_OpenStackMachineSpec_To_v1beta1_OpenStackMachineSpec(a.(*OpenStackMachineSpec), b.(*v1beta1.OpenStackMachineSpec), scope) }); err != nil { return err } - if err := s.AddConversionFunc((*PortOpts)(nil), (*v1alpha8.PortOpts)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha6_PortOpts_To_v1alpha8_PortOpts(a.(*PortOpts), b.(*v1alpha8.PortOpts), scope) + if err := s.AddConversionFunc((*PortOpts)(nil), (*v1beta1.PortOpts)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha6_PortOpts_To_v1beta1_PortOpts(a.(*PortOpts), b.(*v1beta1.PortOpts), scope) }); err != nil { return err } - if err := s.AddConversionFunc((*SecurityGroupFilter)(nil), (*v1alpha8.SecurityGroupFilter)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha6_SecurityGroupFilter_To_v1alpha8_SecurityGroupFilter(a.(*SecurityGroupFilter), b.(*v1alpha8.SecurityGroupFilter), scope) + if err := s.AddConversionFunc((*SecurityGroupFilter)(nil), (*v1beta1.SecurityGroupFilter)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha6_SecurityGroupFilter_To_v1beta1_SecurityGroupFilter(a.(*SecurityGroupFilter), b.(*v1beta1.SecurityGroupFilter), scope) }); err != nil { return err } - if err := s.AddConversionFunc((*SecurityGroupParam)(nil), (*v1alpha8.SecurityGroupFilter)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha6_SecurityGroupParam_To_v1alpha8_SecurityGroupFilter(a.(*SecurityGroupParam), b.(*v1alpha8.SecurityGroupFilter), scope) + if err := s.AddConversionFunc((*SecurityGroupParam)(nil), (*v1beta1.SecurityGroupFilter)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha6_SecurityGroupParam_To_v1beta1_SecurityGroupFilter(a.(*SecurityGroupParam), b.(*v1beta1.SecurityGroupFilter), scope) }); err != nil { return err } - if err := s.AddConversionFunc((*SecurityGroup)(nil), (*v1alpha8.SecurityGroupStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha6_SecurityGroup_To_v1alpha8_SecurityGroupStatus(a.(*SecurityGroup), b.(*v1alpha8.SecurityGroupStatus), scope) + if err := s.AddConversionFunc((*SecurityGroup)(nil), (*v1beta1.SecurityGroupStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha6_SecurityGroup_To_v1beta1_SecurityGroupStatus(a.(*SecurityGroup), b.(*v1beta1.SecurityGroupStatus), scope) }); err != nil { return err } - if err := s.AddConversionFunc((*SubnetParam)(nil), (*v1alpha8.SubnetFilter)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha6_SubnetParam_To_v1alpha8_SubnetFilter(a.(*SubnetParam), b.(*v1alpha8.SubnetFilter), scope) + if err := s.AddConversionFunc((*SubnetParam)(nil), (*v1beta1.SubnetFilter)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha6_SubnetParam_To_v1beta1_SubnetFilter(a.(*SubnetParam), b.(*v1beta1.SubnetFilter), scope) }); err != nil { return err } - if err := s.AddConversionFunc((*v1alpha8.BastionStatus)(nil), (*Instance)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_BastionStatus_To_v1alpha6_Instance(a.(*v1alpha8.BastionStatus), b.(*Instance), scope) + if err := s.AddConversionFunc((*v1beta1.BastionStatus)(nil), (*Instance)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_BastionStatus_To_v1alpha6_Instance(a.(*v1beta1.BastionStatus), b.(*Instance), scope) }); err != nil { return err } - if err := s.AddConversionFunc((*v1alpha8.Bastion)(nil), (*Bastion)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_Bastion_To_v1alpha6_Bastion(a.(*v1alpha8.Bastion), b.(*Bastion), scope) + if err := s.AddConversionFunc((*v1beta1.Bastion)(nil), (*Bastion)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_Bastion_To_v1alpha6_Bastion(a.(*v1beta1.Bastion), b.(*Bastion), scope) }); err != nil { return err } - if err := s.AddConversionFunc((*v1alpha8.NetworkStatusWithSubnets)(nil), (*Network)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_NetworkStatusWithSubnets_To_v1alpha6_Network(a.(*v1alpha8.NetworkStatusWithSubnets), b.(*Network), scope) + if err := s.AddConversionFunc((*v1beta1.NetworkStatusWithSubnets)(nil), (*Network)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_NetworkStatusWithSubnets_To_v1alpha6_Network(a.(*v1beta1.NetworkStatusWithSubnets), b.(*Network), scope) }); err != nil { return err } - if err := s.AddConversionFunc((*v1alpha8.NetworkStatus)(nil), (*Network)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_NetworkStatus_To_v1alpha6_Network(a.(*v1alpha8.NetworkStatus), b.(*Network), scope) + if err := s.AddConversionFunc((*v1beta1.NetworkStatus)(nil), (*Network)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_NetworkStatus_To_v1alpha6_Network(a.(*v1beta1.NetworkStatus), b.(*Network), scope) }); err != nil { return err } - if err := s.AddConversionFunc((*v1alpha8.OpenStackClusterSpec)(nil), (*OpenStackClusterSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_OpenStackClusterSpec_To_v1alpha6_OpenStackClusterSpec(a.(*v1alpha8.OpenStackClusterSpec), b.(*OpenStackClusterSpec), scope) + if err := s.AddConversionFunc((*v1beta1.OpenStackClusterSpec)(nil), (*OpenStackClusterSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_OpenStackClusterSpec_To_v1alpha6_OpenStackClusterSpec(a.(*v1beta1.OpenStackClusterSpec), b.(*OpenStackClusterSpec), scope) }); err != nil { return err } - if err := s.AddConversionFunc((*v1alpha8.OpenStackClusterStatus)(nil), (*OpenStackClusterStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_OpenStackClusterStatus_To_v1alpha6_OpenStackClusterStatus(a.(*v1alpha8.OpenStackClusterStatus), b.(*OpenStackClusterStatus), scope) + if err := s.AddConversionFunc((*v1beta1.OpenStackClusterStatus)(nil), (*OpenStackClusterStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_OpenStackClusterStatus_To_v1alpha6_OpenStackClusterStatus(a.(*v1beta1.OpenStackClusterStatus), b.(*OpenStackClusterStatus), scope) }); err != nil { return err } - if err := s.AddConversionFunc((*v1alpha8.OpenStackMachineSpec)(nil), (*OpenStackMachineSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_OpenStackMachineSpec_To_v1alpha6_OpenStackMachineSpec(a.(*v1alpha8.OpenStackMachineSpec), b.(*OpenStackMachineSpec), scope) + if err := s.AddConversionFunc((*v1beta1.OpenStackMachineSpec)(nil), (*OpenStackMachineSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_OpenStackMachineSpec_To_v1alpha6_OpenStackMachineSpec(a.(*v1beta1.OpenStackMachineSpec), b.(*OpenStackMachineSpec), scope) }); err != nil { return err } - if err := s.AddConversionFunc((*v1alpha8.OpenStackMachineStatus)(nil), (*OpenStackMachineStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_OpenStackMachineStatus_To_v1alpha6_OpenStackMachineStatus(a.(*v1alpha8.OpenStackMachineStatus), b.(*OpenStackMachineStatus), scope) + if err := s.AddConversionFunc((*v1beta1.OpenStackMachineStatus)(nil), (*OpenStackMachineStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_OpenStackMachineStatus_To_v1alpha6_OpenStackMachineStatus(a.(*v1beta1.OpenStackMachineStatus), b.(*OpenStackMachineStatus), scope) }); err != nil { return err } - if err := s.AddConversionFunc((*v1alpha8.PortOpts)(nil), (*PortOpts)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_PortOpts_To_v1alpha6_PortOpts(a.(*v1alpha8.PortOpts), b.(*PortOpts), scope) + if err := s.AddConversionFunc((*v1beta1.PortOpts)(nil), (*PortOpts)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_PortOpts_To_v1alpha6_PortOpts(a.(*v1beta1.PortOpts), b.(*PortOpts), scope) }); err != nil { return err } - if err := s.AddConversionFunc((*v1alpha8.SecurityGroupFilter)(nil), (*SecurityGroupParam)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_SecurityGroupFilter_To_v1alpha6_SecurityGroupParam(a.(*v1alpha8.SecurityGroupFilter), b.(*SecurityGroupParam), scope) + if err := s.AddConversionFunc((*v1beta1.SecurityGroupFilter)(nil), (*SecurityGroupParam)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_SecurityGroupFilter_To_v1alpha6_SecurityGroupParam(a.(*v1beta1.SecurityGroupFilter), b.(*SecurityGroupParam), scope) }); err != nil { return err } - if err := s.AddConversionFunc((*v1alpha8.SecurityGroupStatus)(nil), (*SecurityGroup)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_SecurityGroupStatus_To_v1alpha6_SecurityGroup(a.(*v1alpha8.SecurityGroupStatus), b.(*SecurityGroup), scope) + if err := s.AddConversionFunc((*v1beta1.SecurityGroupStatus)(nil), (*SecurityGroup)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_SecurityGroupStatus_To_v1alpha6_SecurityGroup(a.(*v1beta1.SecurityGroupStatus), b.(*SecurityGroup), scope) }); err != nil { return err } - if err := s.AddConversionFunc((*v1alpha8.SubnetFilter)(nil), (*SubnetParam)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_SubnetFilter_To_v1alpha6_SubnetParam(a.(*v1alpha8.SubnetFilter), b.(*SubnetParam), scope) + if err := s.AddConversionFunc((*v1beta1.SubnetFilter)(nil), (*SubnetParam)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_SubnetFilter_To_v1alpha6_SubnetParam(a.(*v1beta1.SubnetFilter), b.(*SubnetParam), scope) }); err != nil { return err } return nil } -func autoConvert_v1alpha6_APIServerLoadBalancer_To_v1alpha8_APIServerLoadBalancer(in *APIServerLoadBalancer, out *v1alpha8.APIServerLoadBalancer, s conversion.Scope) error { +func autoConvert_v1alpha6_APIServerLoadBalancer_To_v1beta1_APIServerLoadBalancer(in *APIServerLoadBalancer, out *v1beta1.APIServerLoadBalancer, s conversion.Scope) error { out.Enabled = in.Enabled out.AdditionalPorts = *(*[]int)(unsafe.Pointer(&in.AdditionalPorts)) out.AllowedCIDRs = *(*[]string)(unsafe.Pointer(&in.AllowedCIDRs)) @@ -420,12 +420,12 @@ func autoConvert_v1alpha6_APIServerLoadBalancer_To_v1alpha8_APIServerLoadBalance return nil } -// Convert_v1alpha6_APIServerLoadBalancer_To_v1alpha8_APIServerLoadBalancer is an autogenerated conversion function. -func Convert_v1alpha6_APIServerLoadBalancer_To_v1alpha8_APIServerLoadBalancer(in *APIServerLoadBalancer, out *v1alpha8.APIServerLoadBalancer, s conversion.Scope) error { - return autoConvert_v1alpha6_APIServerLoadBalancer_To_v1alpha8_APIServerLoadBalancer(in, out, s) +// Convert_v1alpha6_APIServerLoadBalancer_To_v1beta1_APIServerLoadBalancer is an autogenerated conversion function. +func Convert_v1alpha6_APIServerLoadBalancer_To_v1beta1_APIServerLoadBalancer(in *APIServerLoadBalancer, out *v1beta1.APIServerLoadBalancer, s conversion.Scope) error { + return autoConvert_v1alpha6_APIServerLoadBalancer_To_v1beta1_APIServerLoadBalancer(in, out, s) } -func autoConvert_v1alpha8_APIServerLoadBalancer_To_v1alpha6_APIServerLoadBalancer(in *v1alpha8.APIServerLoadBalancer, out *APIServerLoadBalancer, s conversion.Scope) error { +func autoConvert_v1beta1_APIServerLoadBalancer_To_v1alpha6_APIServerLoadBalancer(in *v1beta1.APIServerLoadBalancer, out *APIServerLoadBalancer, s conversion.Scope) error { out.Enabled = in.Enabled out.AdditionalPorts = *(*[]int)(unsafe.Pointer(&in.AdditionalPorts)) out.AllowedCIDRs = *(*[]string)(unsafe.Pointer(&in.AllowedCIDRs)) @@ -433,45 +433,45 @@ func autoConvert_v1alpha8_APIServerLoadBalancer_To_v1alpha6_APIServerLoadBalance return nil } -// Convert_v1alpha8_APIServerLoadBalancer_To_v1alpha6_APIServerLoadBalancer is an autogenerated conversion function. -func Convert_v1alpha8_APIServerLoadBalancer_To_v1alpha6_APIServerLoadBalancer(in *v1alpha8.APIServerLoadBalancer, out *APIServerLoadBalancer, s conversion.Scope) error { - return autoConvert_v1alpha8_APIServerLoadBalancer_To_v1alpha6_APIServerLoadBalancer(in, out, s) +// Convert_v1beta1_APIServerLoadBalancer_To_v1alpha6_APIServerLoadBalancer is an autogenerated conversion function. +func Convert_v1beta1_APIServerLoadBalancer_To_v1alpha6_APIServerLoadBalancer(in *v1beta1.APIServerLoadBalancer, out *APIServerLoadBalancer, s conversion.Scope) error { + return autoConvert_v1beta1_APIServerLoadBalancer_To_v1alpha6_APIServerLoadBalancer(in, out, s) } -func autoConvert_v1alpha6_AddressPair_To_v1alpha8_AddressPair(in *AddressPair, out *v1alpha8.AddressPair, s conversion.Scope) error { +func autoConvert_v1alpha6_AddressPair_To_v1beta1_AddressPair(in *AddressPair, out *v1beta1.AddressPair, s conversion.Scope) error { out.IPAddress = in.IPAddress out.MACAddress = in.MACAddress return nil } -// Convert_v1alpha6_AddressPair_To_v1alpha8_AddressPair is an autogenerated conversion function. -func Convert_v1alpha6_AddressPair_To_v1alpha8_AddressPair(in *AddressPair, out *v1alpha8.AddressPair, s conversion.Scope) error { - return autoConvert_v1alpha6_AddressPair_To_v1alpha8_AddressPair(in, out, s) +// Convert_v1alpha6_AddressPair_To_v1beta1_AddressPair is an autogenerated conversion function. +func Convert_v1alpha6_AddressPair_To_v1beta1_AddressPair(in *AddressPair, out *v1beta1.AddressPair, s conversion.Scope) error { + return autoConvert_v1alpha6_AddressPair_To_v1beta1_AddressPair(in, out, s) } -func autoConvert_v1alpha8_AddressPair_To_v1alpha6_AddressPair(in *v1alpha8.AddressPair, out *AddressPair, s conversion.Scope) error { +func autoConvert_v1beta1_AddressPair_To_v1alpha6_AddressPair(in *v1beta1.AddressPair, out *AddressPair, s conversion.Scope) error { out.IPAddress = in.IPAddress out.MACAddress = in.MACAddress return nil } -// Convert_v1alpha8_AddressPair_To_v1alpha6_AddressPair is an autogenerated conversion function. -func Convert_v1alpha8_AddressPair_To_v1alpha6_AddressPair(in *v1alpha8.AddressPair, out *AddressPair, s conversion.Scope) error { - return autoConvert_v1alpha8_AddressPair_To_v1alpha6_AddressPair(in, out, s) +// Convert_v1beta1_AddressPair_To_v1alpha6_AddressPair is an autogenerated conversion function. +func Convert_v1beta1_AddressPair_To_v1alpha6_AddressPair(in *v1beta1.AddressPair, out *AddressPair, s conversion.Scope) error { + return autoConvert_v1beta1_AddressPair_To_v1alpha6_AddressPair(in, out, s) } -func autoConvert_v1alpha6_Bastion_To_v1alpha8_Bastion(in *Bastion, out *v1alpha8.Bastion, s conversion.Scope) error { +func autoConvert_v1alpha6_Bastion_To_v1beta1_Bastion(in *Bastion, out *v1beta1.Bastion, s conversion.Scope) error { out.Enabled = in.Enabled - if err := Convert_v1alpha6_OpenStackMachineSpec_To_v1alpha8_OpenStackMachineSpec(&in.Instance, &out.Instance, s); err != nil { + if err := Convert_v1alpha6_OpenStackMachineSpec_To_v1beta1_OpenStackMachineSpec(&in.Instance, &out.Instance, s); err != nil { return err } out.AvailabilityZone = in.AvailabilityZone return nil } -func autoConvert_v1alpha8_Bastion_To_v1alpha6_Bastion(in *v1alpha8.Bastion, out *Bastion, s conversion.Scope) error { +func autoConvert_v1beta1_Bastion_To_v1alpha6_Bastion(in *v1beta1.Bastion, out *Bastion, s conversion.Scope) error { out.Enabled = in.Enabled - if err := Convert_v1alpha8_OpenStackMachineSpec_To_v1alpha6_OpenStackMachineSpec(&in.Instance, &out.Instance, s); err != nil { + if err := Convert_v1beta1_OpenStackMachineSpec_To_v1alpha6_OpenStackMachineSpec(&in.Instance, &out.Instance, s); err != nil { return err } out.AvailabilityZone = in.AvailabilityZone @@ -479,55 +479,55 @@ func autoConvert_v1alpha8_Bastion_To_v1alpha6_Bastion(in *v1alpha8.Bastion, out return nil } -func autoConvert_v1alpha6_ExternalRouterIPParam_To_v1alpha8_ExternalRouterIPParam(in *ExternalRouterIPParam, out *v1alpha8.ExternalRouterIPParam, s conversion.Scope) error { +func autoConvert_v1alpha6_ExternalRouterIPParam_To_v1beta1_ExternalRouterIPParam(in *ExternalRouterIPParam, out *v1beta1.ExternalRouterIPParam, s conversion.Scope) error { out.FixedIP = in.FixedIP - if err := Convert_v1alpha6_SubnetParam_To_v1alpha8_SubnetFilter(&in.Subnet, &out.Subnet, s); err != nil { + if err := Convert_v1alpha6_SubnetParam_To_v1beta1_SubnetFilter(&in.Subnet, &out.Subnet, s); err != nil { return err } return nil } -// Convert_v1alpha6_ExternalRouterIPParam_To_v1alpha8_ExternalRouterIPParam is an autogenerated conversion function. -func Convert_v1alpha6_ExternalRouterIPParam_To_v1alpha8_ExternalRouterIPParam(in *ExternalRouterIPParam, out *v1alpha8.ExternalRouterIPParam, s conversion.Scope) error { - return autoConvert_v1alpha6_ExternalRouterIPParam_To_v1alpha8_ExternalRouterIPParam(in, out, s) +// Convert_v1alpha6_ExternalRouterIPParam_To_v1beta1_ExternalRouterIPParam is an autogenerated conversion function. +func Convert_v1alpha6_ExternalRouterIPParam_To_v1beta1_ExternalRouterIPParam(in *ExternalRouterIPParam, out *v1beta1.ExternalRouterIPParam, s conversion.Scope) error { + return autoConvert_v1alpha6_ExternalRouterIPParam_To_v1beta1_ExternalRouterIPParam(in, out, s) } -func autoConvert_v1alpha8_ExternalRouterIPParam_To_v1alpha6_ExternalRouterIPParam(in *v1alpha8.ExternalRouterIPParam, out *ExternalRouterIPParam, s conversion.Scope) error { +func autoConvert_v1beta1_ExternalRouterIPParam_To_v1alpha6_ExternalRouterIPParam(in *v1beta1.ExternalRouterIPParam, out *ExternalRouterIPParam, s conversion.Scope) error { out.FixedIP = in.FixedIP - if err := Convert_v1alpha8_SubnetFilter_To_v1alpha6_SubnetParam(&in.Subnet, &out.Subnet, s); err != nil { + if err := Convert_v1beta1_SubnetFilter_To_v1alpha6_SubnetParam(&in.Subnet, &out.Subnet, s); err != nil { return err } return nil } -// Convert_v1alpha8_ExternalRouterIPParam_To_v1alpha6_ExternalRouterIPParam is an autogenerated conversion function. -func Convert_v1alpha8_ExternalRouterIPParam_To_v1alpha6_ExternalRouterIPParam(in *v1alpha8.ExternalRouterIPParam, out *ExternalRouterIPParam, s conversion.Scope) error { - return autoConvert_v1alpha8_ExternalRouterIPParam_To_v1alpha6_ExternalRouterIPParam(in, out, s) +// Convert_v1beta1_ExternalRouterIPParam_To_v1alpha6_ExternalRouterIPParam is an autogenerated conversion function. +func Convert_v1beta1_ExternalRouterIPParam_To_v1alpha6_ExternalRouterIPParam(in *v1beta1.ExternalRouterIPParam, out *ExternalRouterIPParam, s conversion.Scope) error { + return autoConvert_v1beta1_ExternalRouterIPParam_To_v1alpha6_ExternalRouterIPParam(in, out, s) } -func autoConvert_v1alpha6_FixedIP_To_v1alpha8_FixedIP(in *FixedIP, out *v1alpha8.FixedIP, s conversion.Scope) error { - out.Subnet = (*v1alpha8.SubnetFilter)(unsafe.Pointer(in.Subnet)) +func autoConvert_v1alpha6_FixedIP_To_v1beta1_FixedIP(in *FixedIP, out *v1beta1.FixedIP, s conversion.Scope) error { + out.Subnet = (*v1beta1.SubnetFilter)(unsafe.Pointer(in.Subnet)) out.IPAddress = in.IPAddress return nil } -// Convert_v1alpha6_FixedIP_To_v1alpha8_FixedIP is an autogenerated conversion function. -func Convert_v1alpha6_FixedIP_To_v1alpha8_FixedIP(in *FixedIP, out *v1alpha8.FixedIP, s conversion.Scope) error { - return autoConvert_v1alpha6_FixedIP_To_v1alpha8_FixedIP(in, out, s) +// Convert_v1alpha6_FixedIP_To_v1beta1_FixedIP is an autogenerated conversion function. +func Convert_v1alpha6_FixedIP_To_v1beta1_FixedIP(in *FixedIP, out *v1beta1.FixedIP, s conversion.Scope) error { + return autoConvert_v1alpha6_FixedIP_To_v1beta1_FixedIP(in, out, s) } -func autoConvert_v1alpha8_FixedIP_To_v1alpha6_FixedIP(in *v1alpha8.FixedIP, out *FixedIP, s conversion.Scope) error { +func autoConvert_v1beta1_FixedIP_To_v1alpha6_FixedIP(in *v1beta1.FixedIP, out *FixedIP, s conversion.Scope) error { out.Subnet = (*SubnetFilter)(unsafe.Pointer(in.Subnet)) out.IPAddress = in.IPAddress return nil } -// Convert_v1alpha8_FixedIP_To_v1alpha6_FixedIP is an autogenerated conversion function. -func Convert_v1alpha8_FixedIP_To_v1alpha6_FixedIP(in *v1alpha8.FixedIP, out *FixedIP, s conversion.Scope) error { - return autoConvert_v1alpha8_FixedIP_To_v1alpha6_FixedIP(in, out, s) +// Convert_v1beta1_FixedIP_To_v1alpha6_FixedIP is an autogenerated conversion function. +func Convert_v1beta1_FixedIP_To_v1alpha6_FixedIP(in *v1beta1.FixedIP, out *FixedIP, s conversion.Scope) error { + return autoConvert_v1beta1_FixedIP_To_v1alpha6_FixedIP(in, out, s) } -func autoConvert_v1alpha6_LoadBalancer_To_v1alpha8_LoadBalancer(in *LoadBalancer, out *v1alpha8.LoadBalancer, s conversion.Scope) error { +func autoConvert_v1alpha6_LoadBalancer_To_v1beta1_LoadBalancer(in *LoadBalancer, out *v1beta1.LoadBalancer, s conversion.Scope) error { out.Name = in.Name out.ID = in.ID out.IP = in.IP @@ -537,12 +537,12 @@ func autoConvert_v1alpha6_LoadBalancer_To_v1alpha8_LoadBalancer(in *LoadBalancer return nil } -// Convert_v1alpha6_LoadBalancer_To_v1alpha8_LoadBalancer is an autogenerated conversion function. -func Convert_v1alpha6_LoadBalancer_To_v1alpha8_LoadBalancer(in *LoadBalancer, out *v1alpha8.LoadBalancer, s conversion.Scope) error { - return autoConvert_v1alpha6_LoadBalancer_To_v1alpha8_LoadBalancer(in, out, s) +// Convert_v1alpha6_LoadBalancer_To_v1beta1_LoadBalancer is an autogenerated conversion function. +func Convert_v1alpha6_LoadBalancer_To_v1beta1_LoadBalancer(in *LoadBalancer, out *v1beta1.LoadBalancer, s conversion.Scope) error { + return autoConvert_v1alpha6_LoadBalancer_To_v1beta1_LoadBalancer(in, out, s) } -func autoConvert_v1alpha8_LoadBalancer_To_v1alpha6_LoadBalancer(in *v1alpha8.LoadBalancer, out *LoadBalancer, s conversion.Scope) error { +func autoConvert_v1beta1_LoadBalancer_To_v1alpha6_LoadBalancer(in *v1beta1.LoadBalancer, out *LoadBalancer, s conversion.Scope) error { out.Name = in.Name out.ID = in.ID out.IP = in.IP @@ -552,12 +552,12 @@ func autoConvert_v1alpha8_LoadBalancer_To_v1alpha6_LoadBalancer(in *v1alpha8.Loa return nil } -// Convert_v1alpha8_LoadBalancer_To_v1alpha6_LoadBalancer is an autogenerated conversion function. -func Convert_v1alpha8_LoadBalancer_To_v1alpha6_LoadBalancer(in *v1alpha8.LoadBalancer, out *LoadBalancer, s conversion.Scope) error { - return autoConvert_v1alpha8_LoadBalancer_To_v1alpha6_LoadBalancer(in, out, s) +// Convert_v1beta1_LoadBalancer_To_v1alpha6_LoadBalancer is an autogenerated conversion function. +func Convert_v1beta1_LoadBalancer_To_v1alpha6_LoadBalancer(in *v1beta1.LoadBalancer, out *LoadBalancer, s conversion.Scope) error { + return autoConvert_v1beta1_LoadBalancer_To_v1alpha6_LoadBalancer(in, out, s) } -func autoConvert_v1alpha6_NetworkFilter_To_v1alpha8_NetworkFilter(in *NetworkFilter, out *v1alpha8.NetworkFilter, s conversion.Scope) error { +func autoConvert_v1alpha6_NetworkFilter_To_v1beta1_NetworkFilter(in *NetworkFilter, out *v1beta1.NetworkFilter, s conversion.Scope) error { out.Name = in.Name out.Description = in.Description out.ProjectID = in.ProjectID @@ -569,12 +569,12 @@ func autoConvert_v1alpha6_NetworkFilter_To_v1alpha8_NetworkFilter(in *NetworkFil return nil } -// Convert_v1alpha6_NetworkFilter_To_v1alpha8_NetworkFilter is an autogenerated conversion function. -func Convert_v1alpha6_NetworkFilter_To_v1alpha8_NetworkFilter(in *NetworkFilter, out *v1alpha8.NetworkFilter, s conversion.Scope) error { - return autoConvert_v1alpha6_NetworkFilter_To_v1alpha8_NetworkFilter(in, out, s) +// Convert_v1alpha6_NetworkFilter_To_v1beta1_NetworkFilter is an autogenerated conversion function. +func Convert_v1alpha6_NetworkFilter_To_v1beta1_NetworkFilter(in *NetworkFilter, out *v1beta1.NetworkFilter, s conversion.Scope) error { + return autoConvert_v1alpha6_NetworkFilter_To_v1beta1_NetworkFilter(in, out, s) } -func autoConvert_v1alpha8_NetworkFilter_To_v1alpha6_NetworkFilter(in *v1alpha8.NetworkFilter, out *NetworkFilter, s conversion.Scope) error { +func autoConvert_v1beta1_NetworkFilter_To_v1alpha6_NetworkFilter(in *v1beta1.NetworkFilter, out *NetworkFilter, s conversion.Scope) error { out.Name = in.Name out.Description = in.Description out.ProjectID = in.ProjectID @@ -586,50 +586,50 @@ func autoConvert_v1alpha8_NetworkFilter_To_v1alpha6_NetworkFilter(in *v1alpha8.N return nil } -// Convert_v1alpha8_NetworkFilter_To_v1alpha6_NetworkFilter is an autogenerated conversion function. -func Convert_v1alpha8_NetworkFilter_To_v1alpha6_NetworkFilter(in *v1alpha8.NetworkFilter, out *NetworkFilter, s conversion.Scope) error { - return autoConvert_v1alpha8_NetworkFilter_To_v1alpha6_NetworkFilter(in, out, s) +// Convert_v1beta1_NetworkFilter_To_v1alpha6_NetworkFilter is an autogenerated conversion function. +func Convert_v1beta1_NetworkFilter_To_v1alpha6_NetworkFilter(in *v1beta1.NetworkFilter, out *NetworkFilter, s conversion.Scope) error { + return autoConvert_v1beta1_NetworkFilter_To_v1alpha6_NetworkFilter(in, out, s) } -func autoConvert_v1alpha6_OpenStackCluster_To_v1alpha8_OpenStackCluster(in *OpenStackCluster, out *v1alpha8.OpenStackCluster, s conversion.Scope) error { +func autoConvert_v1alpha6_OpenStackCluster_To_v1beta1_OpenStackCluster(in *OpenStackCluster, out *v1beta1.OpenStackCluster, s conversion.Scope) error { out.ObjectMeta = in.ObjectMeta - if err := Convert_v1alpha6_OpenStackClusterSpec_To_v1alpha8_OpenStackClusterSpec(&in.Spec, &out.Spec, s); err != nil { + if err := Convert_v1alpha6_OpenStackClusterSpec_To_v1beta1_OpenStackClusterSpec(&in.Spec, &out.Spec, s); err != nil { return err } - if err := Convert_v1alpha6_OpenStackClusterStatus_To_v1alpha8_OpenStackClusterStatus(&in.Status, &out.Status, s); err != nil { + if err := Convert_v1alpha6_OpenStackClusterStatus_To_v1beta1_OpenStackClusterStatus(&in.Status, &out.Status, s); err != nil { return err } return nil } -// Convert_v1alpha6_OpenStackCluster_To_v1alpha8_OpenStackCluster is an autogenerated conversion function. -func Convert_v1alpha6_OpenStackCluster_To_v1alpha8_OpenStackCluster(in *OpenStackCluster, out *v1alpha8.OpenStackCluster, s conversion.Scope) error { - return autoConvert_v1alpha6_OpenStackCluster_To_v1alpha8_OpenStackCluster(in, out, s) +// Convert_v1alpha6_OpenStackCluster_To_v1beta1_OpenStackCluster is an autogenerated conversion function. +func Convert_v1alpha6_OpenStackCluster_To_v1beta1_OpenStackCluster(in *OpenStackCluster, out *v1beta1.OpenStackCluster, s conversion.Scope) error { + return autoConvert_v1alpha6_OpenStackCluster_To_v1beta1_OpenStackCluster(in, out, s) } -func autoConvert_v1alpha8_OpenStackCluster_To_v1alpha6_OpenStackCluster(in *v1alpha8.OpenStackCluster, out *OpenStackCluster, s conversion.Scope) error { +func autoConvert_v1beta1_OpenStackCluster_To_v1alpha6_OpenStackCluster(in *v1beta1.OpenStackCluster, out *OpenStackCluster, s conversion.Scope) error { out.ObjectMeta = in.ObjectMeta - if err := Convert_v1alpha8_OpenStackClusterSpec_To_v1alpha6_OpenStackClusterSpec(&in.Spec, &out.Spec, s); err != nil { + if err := Convert_v1beta1_OpenStackClusterSpec_To_v1alpha6_OpenStackClusterSpec(&in.Spec, &out.Spec, s); err != nil { return err } - if err := Convert_v1alpha8_OpenStackClusterStatus_To_v1alpha6_OpenStackClusterStatus(&in.Status, &out.Status, s); err != nil { + if err := Convert_v1beta1_OpenStackClusterStatus_To_v1alpha6_OpenStackClusterStatus(&in.Status, &out.Status, s); err != nil { return err } return nil } -// Convert_v1alpha8_OpenStackCluster_To_v1alpha6_OpenStackCluster is an autogenerated conversion function. -func Convert_v1alpha8_OpenStackCluster_To_v1alpha6_OpenStackCluster(in *v1alpha8.OpenStackCluster, out *OpenStackCluster, s conversion.Scope) error { - return autoConvert_v1alpha8_OpenStackCluster_To_v1alpha6_OpenStackCluster(in, out, s) +// Convert_v1beta1_OpenStackCluster_To_v1alpha6_OpenStackCluster is an autogenerated conversion function. +func Convert_v1beta1_OpenStackCluster_To_v1alpha6_OpenStackCluster(in *v1beta1.OpenStackCluster, out *OpenStackCluster, s conversion.Scope) error { + return autoConvert_v1beta1_OpenStackCluster_To_v1alpha6_OpenStackCluster(in, out, s) } -func autoConvert_v1alpha6_OpenStackClusterList_To_v1alpha8_OpenStackClusterList(in *OpenStackClusterList, out *v1alpha8.OpenStackClusterList, s conversion.Scope) error { +func autoConvert_v1alpha6_OpenStackClusterList_To_v1beta1_OpenStackClusterList(in *OpenStackClusterList, out *v1beta1.OpenStackClusterList, s conversion.Scope) error { out.ListMeta = in.ListMeta if in.Items != nil { in, out := &in.Items, &out.Items - *out = make([]v1alpha8.OpenStackCluster, len(*in)) + *out = make([]v1beta1.OpenStackCluster, len(*in)) for i := range *in { - if err := Convert_v1alpha6_OpenStackCluster_To_v1alpha8_OpenStackCluster(&(*in)[i], &(*out)[i], s); err != nil { + if err := Convert_v1alpha6_OpenStackCluster_To_v1beta1_OpenStackCluster(&(*in)[i], &(*out)[i], s); err != nil { return err } } @@ -639,18 +639,18 @@ func autoConvert_v1alpha6_OpenStackClusterList_To_v1alpha8_OpenStackClusterList( return nil } -// Convert_v1alpha6_OpenStackClusterList_To_v1alpha8_OpenStackClusterList is an autogenerated conversion function. -func Convert_v1alpha6_OpenStackClusterList_To_v1alpha8_OpenStackClusterList(in *OpenStackClusterList, out *v1alpha8.OpenStackClusterList, s conversion.Scope) error { - return autoConvert_v1alpha6_OpenStackClusterList_To_v1alpha8_OpenStackClusterList(in, out, s) +// Convert_v1alpha6_OpenStackClusterList_To_v1beta1_OpenStackClusterList is an autogenerated conversion function. +func Convert_v1alpha6_OpenStackClusterList_To_v1beta1_OpenStackClusterList(in *OpenStackClusterList, out *v1beta1.OpenStackClusterList, s conversion.Scope) error { + return autoConvert_v1alpha6_OpenStackClusterList_To_v1beta1_OpenStackClusterList(in, out, s) } -func autoConvert_v1alpha8_OpenStackClusterList_To_v1alpha6_OpenStackClusterList(in *v1alpha8.OpenStackClusterList, out *OpenStackClusterList, s conversion.Scope) error { +func autoConvert_v1beta1_OpenStackClusterList_To_v1alpha6_OpenStackClusterList(in *v1beta1.OpenStackClusterList, out *OpenStackClusterList, s conversion.Scope) error { out.ListMeta = in.ListMeta if in.Items != nil { in, out := &in.Items, &out.Items *out = make([]OpenStackCluster, len(*in)) for i := range *in { - if err := Convert_v1alpha8_OpenStackCluster_To_v1alpha6_OpenStackCluster(&(*in)[i], &(*out)[i], s); err != nil { + if err := Convert_v1beta1_OpenStackCluster_To_v1alpha6_OpenStackCluster(&(*in)[i], &(*out)[i], s); err != nil { return err } } @@ -660,24 +660,24 @@ func autoConvert_v1alpha8_OpenStackClusterList_To_v1alpha6_OpenStackClusterList( return nil } -// Convert_v1alpha8_OpenStackClusterList_To_v1alpha6_OpenStackClusterList is an autogenerated conversion function. -func Convert_v1alpha8_OpenStackClusterList_To_v1alpha6_OpenStackClusterList(in *v1alpha8.OpenStackClusterList, out *OpenStackClusterList, s conversion.Scope) error { - return autoConvert_v1alpha8_OpenStackClusterList_To_v1alpha6_OpenStackClusterList(in, out, s) +// Convert_v1beta1_OpenStackClusterList_To_v1alpha6_OpenStackClusterList is an autogenerated conversion function. +func Convert_v1beta1_OpenStackClusterList_To_v1alpha6_OpenStackClusterList(in *v1beta1.OpenStackClusterList, out *OpenStackClusterList, s conversion.Scope) error { + return autoConvert_v1beta1_OpenStackClusterList_To_v1alpha6_OpenStackClusterList(in, out, s) } -func autoConvert_v1alpha6_OpenStackClusterSpec_To_v1alpha8_OpenStackClusterSpec(in *OpenStackClusterSpec, out *v1alpha8.OpenStackClusterSpec, s conversion.Scope) error { +func autoConvert_v1alpha6_OpenStackClusterSpec_To_v1beta1_OpenStackClusterSpec(in *OpenStackClusterSpec, out *v1beta1.OpenStackClusterSpec, s conversion.Scope) error { out.CloudName = in.CloudName // WARNING: in.NodeCIDR requires manual conversion: does not exist in peer-type - if err := Convert_v1alpha6_NetworkFilter_To_v1alpha8_NetworkFilter(&in.Network, &out.Network, s); err != nil { + if err := Convert_v1alpha6_NetworkFilter_To_v1beta1_NetworkFilter(&in.Network, &out.Network, s); err != nil { return err } // WARNING: in.Subnet requires manual conversion: does not exist in peer-type // WARNING: in.DNSNameservers requires manual conversion: does not exist in peer-type if in.ExternalRouterIPs != nil { in, out := &in.ExternalRouterIPs, &out.ExternalRouterIPs - *out = make([]v1alpha8.ExternalRouterIPParam, len(*in)) + *out = make([]v1beta1.ExternalRouterIPParam, len(*in)) for i := range *in { - if err := Convert_v1alpha6_ExternalRouterIPParam_To_v1alpha8_ExternalRouterIPParam(&(*in)[i], &(*out)[i], s); err != nil { + if err := Convert_v1alpha6_ExternalRouterIPParam_To_v1beta1_ExternalRouterIPParam(&(*in)[i], &(*out)[i], s); err != nil { return err } } @@ -685,14 +685,14 @@ func autoConvert_v1alpha6_OpenStackClusterSpec_To_v1alpha8_OpenStackClusterSpec( out.ExternalRouterIPs = nil } // WARNING: in.ExternalNetworkID requires manual conversion: does not exist in peer-type - if err := Convert_v1alpha6_APIServerLoadBalancer_To_v1alpha8_APIServerLoadBalancer(&in.APIServerLoadBalancer, &out.APIServerLoadBalancer, s); err != nil { + if err := Convert_v1alpha6_APIServerLoadBalancer_To_v1beta1_APIServerLoadBalancer(&in.APIServerLoadBalancer, &out.APIServerLoadBalancer, s); err != nil { return err } out.DisableAPIServerFloatingIP = in.DisableAPIServerFloatingIP out.APIServerFloatingIP = in.APIServerFloatingIP out.APIServerFixedIP = in.APIServerFixedIP out.APIServerPort = in.APIServerPort - // WARNING: in.ManagedSecurityGroups requires manual conversion: inconvertible types (bool vs *sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha8.ManagedSecurityGroups) + // WARNING: in.ManagedSecurityGroups requires manual conversion: inconvertible types (bool vs *sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1.ManagedSecurityGroups) // WARNING: in.AllowAllInClusterTraffic requires manual conversion: does not exist in peer-type out.DisablePortSecurity = in.DisablePortSecurity out.Tags = *(*[]string)(unsafe.Pointer(&in.Tags)) @@ -701,22 +701,22 @@ func autoConvert_v1alpha6_OpenStackClusterSpec_To_v1alpha8_OpenStackClusterSpec( out.ControlPlaneOmitAvailabilityZone = in.ControlPlaneOmitAvailabilityZone if in.Bastion != nil { in, out := &in.Bastion, &out.Bastion - *out = new(v1alpha8.Bastion) - if err := Convert_v1alpha6_Bastion_To_v1alpha8_Bastion(*in, *out, s); err != nil { + *out = new(v1beta1.Bastion) + if err := Convert_v1alpha6_Bastion_To_v1beta1_Bastion(*in, *out, s); err != nil { return err } } else { out.Bastion = nil } - out.IdentityRef = (*v1alpha8.OpenStackIdentityReference)(unsafe.Pointer(in.IdentityRef)) + out.IdentityRef = (*v1beta1.OpenStackIdentityReference)(unsafe.Pointer(in.IdentityRef)) return nil } -func autoConvert_v1alpha8_OpenStackClusterSpec_To_v1alpha6_OpenStackClusterSpec(in *v1alpha8.OpenStackClusterSpec, out *OpenStackClusterSpec, s conversion.Scope) error { +func autoConvert_v1beta1_OpenStackClusterSpec_To_v1alpha6_OpenStackClusterSpec(in *v1beta1.OpenStackClusterSpec, out *OpenStackClusterSpec, s conversion.Scope) error { out.CloudName = in.CloudName // WARNING: in.ManagedSubnets requires manual conversion: does not exist in peer-type // WARNING: in.Router requires manual conversion: does not exist in peer-type - if err := Convert_v1alpha8_NetworkFilter_To_v1alpha6_NetworkFilter(&in.Network, &out.Network, s); err != nil { + if err := Convert_v1beta1_NetworkFilter_To_v1alpha6_NetworkFilter(&in.Network, &out.Network, s); err != nil { return err } // WARNING: in.Subnets requires manual conversion: does not exist in peer-type @@ -725,7 +725,7 @@ func autoConvert_v1alpha8_OpenStackClusterSpec_To_v1alpha6_OpenStackClusterSpec( in, out := &in.ExternalRouterIPs, &out.ExternalRouterIPs *out = make([]ExternalRouterIPParam, len(*in)) for i := range *in { - if err := Convert_v1alpha8_ExternalRouterIPParam_To_v1alpha6_ExternalRouterIPParam(&(*in)[i], &(*out)[i], s); err != nil { + if err := Convert_v1beta1_ExternalRouterIPParam_To_v1alpha6_ExternalRouterIPParam(&(*in)[i], &(*out)[i], s); err != nil { return err } } @@ -734,14 +734,14 @@ func autoConvert_v1alpha8_OpenStackClusterSpec_To_v1alpha6_OpenStackClusterSpec( } // WARNING: in.ExternalNetwork requires manual conversion: does not exist in peer-type // WARNING: in.DisableExternalNetwork requires manual conversion: does not exist in peer-type - if err := Convert_v1alpha8_APIServerLoadBalancer_To_v1alpha6_APIServerLoadBalancer(&in.APIServerLoadBalancer, &out.APIServerLoadBalancer, s); err != nil { + if err := Convert_v1beta1_APIServerLoadBalancer_To_v1alpha6_APIServerLoadBalancer(&in.APIServerLoadBalancer, &out.APIServerLoadBalancer, s); err != nil { return err } out.DisableAPIServerFloatingIP = in.DisableAPIServerFloatingIP out.APIServerFloatingIP = in.APIServerFloatingIP out.APIServerFixedIP = in.APIServerFixedIP out.APIServerPort = in.APIServerPort - // WARNING: in.ManagedSecurityGroups requires manual conversion: inconvertible types (*sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha8.ManagedSecurityGroups vs bool) + // WARNING: in.ManagedSecurityGroups requires manual conversion: inconvertible types (*sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1.ManagedSecurityGroups vs bool) out.DisablePortSecurity = in.DisablePortSecurity out.Tags = *(*[]string)(unsafe.Pointer(&in.Tags)) out.ControlPlaneEndpoint = in.ControlPlaneEndpoint @@ -750,7 +750,7 @@ func autoConvert_v1alpha8_OpenStackClusterSpec_To_v1alpha6_OpenStackClusterSpec( if in.Bastion != nil { in, out := &in.Bastion, &out.Bastion *out = new(Bastion) - if err := Convert_v1alpha8_Bastion_To_v1alpha6_Bastion(*in, *out, s); err != nil { + if err := Convert_v1beta1_Bastion_To_v1alpha6_Bastion(*in, *out, s); err != nil { return err } } else { @@ -760,12 +760,12 @@ func autoConvert_v1alpha8_OpenStackClusterSpec_To_v1alpha6_OpenStackClusterSpec( return nil } -func autoConvert_v1alpha6_OpenStackClusterStatus_To_v1alpha8_OpenStackClusterStatus(in *OpenStackClusterStatus, out *v1alpha8.OpenStackClusterStatus, s conversion.Scope) error { +func autoConvert_v1alpha6_OpenStackClusterStatus_To_v1beta1_OpenStackClusterStatus(in *OpenStackClusterStatus, out *v1beta1.OpenStackClusterStatus, s conversion.Scope) error { out.Ready = in.Ready if in.Network != nil { in, out := &in.Network, &out.Network - *out = new(v1alpha8.NetworkStatusWithSubnets) - if err := Convert_v1alpha6_Network_To_v1alpha8_NetworkStatusWithSubnets(*in, *out, s); err != nil { + *out = new(v1beta1.NetworkStatusWithSubnets) + if err := Convert_v1alpha6_Network_To_v1beta1_NetworkStatusWithSubnets(*in, *out, s); err != nil { return err } } else { @@ -773,18 +773,18 @@ func autoConvert_v1alpha6_OpenStackClusterStatus_To_v1alpha8_OpenStackClusterSta } if in.ExternalNetwork != nil { in, out := &in.ExternalNetwork, &out.ExternalNetwork - *out = new(v1alpha8.NetworkStatus) - if err := Convert_v1alpha6_Network_To_v1alpha8_NetworkStatus(*in, *out, s); err != nil { + *out = new(v1beta1.NetworkStatus) + if err := Convert_v1alpha6_Network_To_v1beta1_NetworkStatus(*in, *out, s); err != nil { return err } } else { out.ExternalNetwork = nil } - out.FailureDomains = *(*v1beta1.FailureDomains)(unsafe.Pointer(&in.FailureDomains)) + out.FailureDomains = *(*apiv1beta1.FailureDomains)(unsafe.Pointer(&in.FailureDomains)) if in.ControlPlaneSecurityGroup != nil { in, out := &in.ControlPlaneSecurityGroup, &out.ControlPlaneSecurityGroup - *out = new(v1alpha8.SecurityGroupStatus) - if err := Convert_v1alpha6_SecurityGroup_To_v1alpha8_SecurityGroupStatus(*in, *out, s); err != nil { + *out = new(v1beta1.SecurityGroupStatus) + if err := Convert_v1alpha6_SecurityGroup_To_v1beta1_SecurityGroupStatus(*in, *out, s); err != nil { return err } } else { @@ -792,8 +792,8 @@ func autoConvert_v1alpha6_OpenStackClusterStatus_To_v1alpha8_OpenStackClusterSta } if in.WorkerSecurityGroup != nil { in, out := &in.WorkerSecurityGroup, &out.WorkerSecurityGroup - *out = new(v1alpha8.SecurityGroupStatus) - if err := Convert_v1alpha6_SecurityGroup_To_v1alpha8_SecurityGroupStatus(*in, *out, s); err != nil { + *out = new(v1beta1.SecurityGroupStatus) + if err := Convert_v1alpha6_SecurityGroup_To_v1beta1_SecurityGroupStatus(*in, *out, s); err != nil { return err } } else { @@ -801,8 +801,8 @@ func autoConvert_v1alpha6_OpenStackClusterStatus_To_v1alpha8_OpenStackClusterSta } if in.BastionSecurityGroup != nil { in, out := &in.BastionSecurityGroup, &out.BastionSecurityGroup - *out = new(v1alpha8.SecurityGroupStatus) - if err := Convert_v1alpha6_SecurityGroup_To_v1alpha8_SecurityGroupStatus(*in, *out, s); err != nil { + *out = new(v1beta1.SecurityGroupStatus) + if err := Convert_v1alpha6_SecurityGroup_To_v1beta1_SecurityGroupStatus(*in, *out, s); err != nil { return err } } else { @@ -810,8 +810,8 @@ func autoConvert_v1alpha6_OpenStackClusterStatus_To_v1alpha8_OpenStackClusterSta } if in.Bastion != nil { in, out := &in.Bastion, &out.Bastion - *out = new(v1alpha8.BastionStatus) - if err := Convert_v1alpha6_Instance_To_v1alpha8_BastionStatus(*in, *out, s); err != nil { + *out = new(v1beta1.BastionStatus) + if err := Convert_v1alpha6_Instance_To_v1beta1_BastionStatus(*in, *out, s); err != nil { return err } } else { @@ -822,12 +822,12 @@ func autoConvert_v1alpha6_OpenStackClusterStatus_To_v1alpha8_OpenStackClusterSta return nil } -func autoConvert_v1alpha8_OpenStackClusterStatus_To_v1alpha6_OpenStackClusterStatus(in *v1alpha8.OpenStackClusterStatus, out *OpenStackClusterStatus, s conversion.Scope) error { +func autoConvert_v1beta1_OpenStackClusterStatus_To_v1alpha6_OpenStackClusterStatus(in *v1beta1.OpenStackClusterStatus, out *OpenStackClusterStatus, s conversion.Scope) error { out.Ready = in.Ready if in.Network != nil { in, out := &in.Network, &out.Network *out = new(Network) - if err := Convert_v1alpha8_NetworkStatusWithSubnets_To_v1alpha6_Network(*in, *out, s); err != nil { + if err := Convert_v1beta1_NetworkStatusWithSubnets_To_v1alpha6_Network(*in, *out, s); err != nil { return err } } else { @@ -836,7 +836,7 @@ func autoConvert_v1alpha8_OpenStackClusterStatus_To_v1alpha6_OpenStackClusterSta if in.ExternalNetwork != nil { in, out := &in.ExternalNetwork, &out.ExternalNetwork *out = new(Network) - if err := Convert_v1alpha8_NetworkStatus_To_v1alpha6_Network(*in, *out, s); err != nil { + if err := Convert_v1beta1_NetworkStatus_To_v1alpha6_Network(*in, *out, s); err != nil { return err } } else { @@ -844,11 +844,11 @@ func autoConvert_v1alpha8_OpenStackClusterStatus_To_v1alpha6_OpenStackClusterSta } // WARNING: in.Router requires manual conversion: does not exist in peer-type // WARNING: in.APIServerLoadBalancer requires manual conversion: does not exist in peer-type - out.FailureDomains = *(*v1beta1.FailureDomains)(unsafe.Pointer(&in.FailureDomains)) + out.FailureDomains = *(*apiv1beta1.FailureDomains)(unsafe.Pointer(&in.FailureDomains)) if in.ControlPlaneSecurityGroup != nil { in, out := &in.ControlPlaneSecurityGroup, &out.ControlPlaneSecurityGroup *out = new(SecurityGroup) - if err := Convert_v1alpha8_SecurityGroupStatus_To_v1alpha6_SecurityGroup(*in, *out, s); err != nil { + if err := Convert_v1beta1_SecurityGroupStatus_To_v1alpha6_SecurityGroup(*in, *out, s); err != nil { return err } } else { @@ -857,7 +857,7 @@ func autoConvert_v1alpha8_OpenStackClusterStatus_To_v1alpha6_OpenStackClusterSta if in.WorkerSecurityGroup != nil { in, out := &in.WorkerSecurityGroup, &out.WorkerSecurityGroup *out = new(SecurityGroup) - if err := Convert_v1alpha8_SecurityGroupStatus_To_v1alpha6_SecurityGroup(*in, *out, s); err != nil { + if err := Convert_v1beta1_SecurityGroupStatus_To_v1alpha6_SecurityGroup(*in, *out, s); err != nil { return err } } else { @@ -866,7 +866,7 @@ func autoConvert_v1alpha8_OpenStackClusterStatus_To_v1alpha6_OpenStackClusterSta if in.BastionSecurityGroup != nil { in, out := &in.BastionSecurityGroup, &out.BastionSecurityGroup *out = new(SecurityGroup) - if err := Convert_v1alpha8_SecurityGroupStatus_To_v1alpha6_SecurityGroup(*in, *out, s); err != nil { + if err := Convert_v1beta1_SecurityGroupStatus_To_v1alpha6_SecurityGroup(*in, *out, s); err != nil { return err } } else { @@ -875,7 +875,7 @@ func autoConvert_v1alpha8_OpenStackClusterStatus_To_v1alpha6_OpenStackClusterSta if in.Bastion != nil { in, out := &in.Bastion, &out.Bastion *out = new(Instance) - if err := Convert_v1alpha8_BastionStatus_To_v1alpha6_Instance(*in, *out, s); err != nil { + if err := Convert_v1beta1_BastionStatus_To_v1alpha6_Instance(*in, *out, s); err != nil { return err } } else { @@ -886,39 +886,39 @@ func autoConvert_v1alpha8_OpenStackClusterStatus_To_v1alpha6_OpenStackClusterSta return nil } -func autoConvert_v1alpha6_OpenStackClusterTemplate_To_v1alpha8_OpenStackClusterTemplate(in *OpenStackClusterTemplate, out *v1alpha8.OpenStackClusterTemplate, s conversion.Scope) error { +func autoConvert_v1alpha6_OpenStackClusterTemplate_To_v1beta1_OpenStackClusterTemplate(in *OpenStackClusterTemplate, out *v1beta1.OpenStackClusterTemplate, s conversion.Scope) error { out.ObjectMeta = in.ObjectMeta - if err := Convert_v1alpha6_OpenStackClusterTemplateSpec_To_v1alpha8_OpenStackClusterTemplateSpec(&in.Spec, &out.Spec, s); err != nil { + if err := Convert_v1alpha6_OpenStackClusterTemplateSpec_To_v1beta1_OpenStackClusterTemplateSpec(&in.Spec, &out.Spec, s); err != nil { return err } return nil } -// Convert_v1alpha6_OpenStackClusterTemplate_To_v1alpha8_OpenStackClusterTemplate is an autogenerated conversion function. -func Convert_v1alpha6_OpenStackClusterTemplate_To_v1alpha8_OpenStackClusterTemplate(in *OpenStackClusterTemplate, out *v1alpha8.OpenStackClusterTemplate, s conversion.Scope) error { - return autoConvert_v1alpha6_OpenStackClusterTemplate_To_v1alpha8_OpenStackClusterTemplate(in, out, s) +// Convert_v1alpha6_OpenStackClusterTemplate_To_v1beta1_OpenStackClusterTemplate is an autogenerated conversion function. +func Convert_v1alpha6_OpenStackClusterTemplate_To_v1beta1_OpenStackClusterTemplate(in *OpenStackClusterTemplate, out *v1beta1.OpenStackClusterTemplate, s conversion.Scope) error { + return autoConvert_v1alpha6_OpenStackClusterTemplate_To_v1beta1_OpenStackClusterTemplate(in, out, s) } -func autoConvert_v1alpha8_OpenStackClusterTemplate_To_v1alpha6_OpenStackClusterTemplate(in *v1alpha8.OpenStackClusterTemplate, out *OpenStackClusterTemplate, s conversion.Scope) error { +func autoConvert_v1beta1_OpenStackClusterTemplate_To_v1alpha6_OpenStackClusterTemplate(in *v1beta1.OpenStackClusterTemplate, out *OpenStackClusterTemplate, s conversion.Scope) error { out.ObjectMeta = in.ObjectMeta - if err := Convert_v1alpha8_OpenStackClusterTemplateSpec_To_v1alpha6_OpenStackClusterTemplateSpec(&in.Spec, &out.Spec, s); err != nil { + if err := Convert_v1beta1_OpenStackClusterTemplateSpec_To_v1alpha6_OpenStackClusterTemplateSpec(&in.Spec, &out.Spec, s); err != nil { return err } return nil } -// Convert_v1alpha8_OpenStackClusterTemplate_To_v1alpha6_OpenStackClusterTemplate is an autogenerated conversion function. -func Convert_v1alpha8_OpenStackClusterTemplate_To_v1alpha6_OpenStackClusterTemplate(in *v1alpha8.OpenStackClusterTemplate, out *OpenStackClusterTemplate, s conversion.Scope) error { - return autoConvert_v1alpha8_OpenStackClusterTemplate_To_v1alpha6_OpenStackClusterTemplate(in, out, s) +// Convert_v1beta1_OpenStackClusterTemplate_To_v1alpha6_OpenStackClusterTemplate is an autogenerated conversion function. +func Convert_v1beta1_OpenStackClusterTemplate_To_v1alpha6_OpenStackClusterTemplate(in *v1beta1.OpenStackClusterTemplate, out *OpenStackClusterTemplate, s conversion.Scope) error { + return autoConvert_v1beta1_OpenStackClusterTemplate_To_v1alpha6_OpenStackClusterTemplate(in, out, s) } -func autoConvert_v1alpha6_OpenStackClusterTemplateList_To_v1alpha8_OpenStackClusterTemplateList(in *OpenStackClusterTemplateList, out *v1alpha8.OpenStackClusterTemplateList, s conversion.Scope) error { +func autoConvert_v1alpha6_OpenStackClusterTemplateList_To_v1beta1_OpenStackClusterTemplateList(in *OpenStackClusterTemplateList, out *v1beta1.OpenStackClusterTemplateList, s conversion.Scope) error { out.ListMeta = in.ListMeta if in.Items != nil { in, out := &in.Items, &out.Items - *out = make([]v1alpha8.OpenStackClusterTemplate, len(*in)) + *out = make([]v1beta1.OpenStackClusterTemplate, len(*in)) for i := range *in { - if err := Convert_v1alpha6_OpenStackClusterTemplate_To_v1alpha8_OpenStackClusterTemplate(&(*in)[i], &(*out)[i], s); err != nil { + if err := Convert_v1alpha6_OpenStackClusterTemplate_To_v1beta1_OpenStackClusterTemplate(&(*in)[i], &(*out)[i], s); err != nil { return err } } @@ -928,18 +928,18 @@ func autoConvert_v1alpha6_OpenStackClusterTemplateList_To_v1alpha8_OpenStackClus return nil } -// Convert_v1alpha6_OpenStackClusterTemplateList_To_v1alpha8_OpenStackClusterTemplateList is an autogenerated conversion function. -func Convert_v1alpha6_OpenStackClusterTemplateList_To_v1alpha8_OpenStackClusterTemplateList(in *OpenStackClusterTemplateList, out *v1alpha8.OpenStackClusterTemplateList, s conversion.Scope) error { - return autoConvert_v1alpha6_OpenStackClusterTemplateList_To_v1alpha8_OpenStackClusterTemplateList(in, out, s) +// Convert_v1alpha6_OpenStackClusterTemplateList_To_v1beta1_OpenStackClusterTemplateList is an autogenerated conversion function. +func Convert_v1alpha6_OpenStackClusterTemplateList_To_v1beta1_OpenStackClusterTemplateList(in *OpenStackClusterTemplateList, out *v1beta1.OpenStackClusterTemplateList, s conversion.Scope) error { + return autoConvert_v1alpha6_OpenStackClusterTemplateList_To_v1beta1_OpenStackClusterTemplateList(in, out, s) } -func autoConvert_v1alpha8_OpenStackClusterTemplateList_To_v1alpha6_OpenStackClusterTemplateList(in *v1alpha8.OpenStackClusterTemplateList, out *OpenStackClusterTemplateList, s conversion.Scope) error { +func autoConvert_v1beta1_OpenStackClusterTemplateList_To_v1alpha6_OpenStackClusterTemplateList(in *v1beta1.OpenStackClusterTemplateList, out *OpenStackClusterTemplateList, s conversion.Scope) error { out.ListMeta = in.ListMeta if in.Items != nil { in, out := &in.Items, &out.Items *out = make([]OpenStackClusterTemplate, len(*in)) for i := range *in { - if err := Convert_v1alpha8_OpenStackClusterTemplate_To_v1alpha6_OpenStackClusterTemplate(&(*in)[i], &(*out)[i], s); err != nil { + if err := Convert_v1beta1_OpenStackClusterTemplate_To_v1alpha6_OpenStackClusterTemplate(&(*in)[i], &(*out)[i], s); err != nil { return err } } @@ -949,120 +949,120 @@ func autoConvert_v1alpha8_OpenStackClusterTemplateList_To_v1alpha6_OpenStackClus return nil } -// Convert_v1alpha8_OpenStackClusterTemplateList_To_v1alpha6_OpenStackClusterTemplateList is an autogenerated conversion function. -func Convert_v1alpha8_OpenStackClusterTemplateList_To_v1alpha6_OpenStackClusterTemplateList(in *v1alpha8.OpenStackClusterTemplateList, out *OpenStackClusterTemplateList, s conversion.Scope) error { - return autoConvert_v1alpha8_OpenStackClusterTemplateList_To_v1alpha6_OpenStackClusterTemplateList(in, out, s) +// Convert_v1beta1_OpenStackClusterTemplateList_To_v1alpha6_OpenStackClusterTemplateList is an autogenerated conversion function. +func Convert_v1beta1_OpenStackClusterTemplateList_To_v1alpha6_OpenStackClusterTemplateList(in *v1beta1.OpenStackClusterTemplateList, out *OpenStackClusterTemplateList, s conversion.Scope) error { + return autoConvert_v1beta1_OpenStackClusterTemplateList_To_v1alpha6_OpenStackClusterTemplateList(in, out, s) } -func autoConvert_v1alpha6_OpenStackClusterTemplateResource_To_v1alpha8_OpenStackClusterTemplateResource(in *OpenStackClusterTemplateResource, out *v1alpha8.OpenStackClusterTemplateResource, s conversion.Scope) error { - if err := Convert_v1alpha6_OpenStackClusterSpec_To_v1alpha8_OpenStackClusterSpec(&in.Spec, &out.Spec, s); err != nil { +func autoConvert_v1alpha6_OpenStackClusterTemplateResource_To_v1beta1_OpenStackClusterTemplateResource(in *OpenStackClusterTemplateResource, out *v1beta1.OpenStackClusterTemplateResource, s conversion.Scope) error { + if err := Convert_v1alpha6_OpenStackClusterSpec_To_v1beta1_OpenStackClusterSpec(&in.Spec, &out.Spec, s); err != nil { return err } return nil } -// Convert_v1alpha6_OpenStackClusterTemplateResource_To_v1alpha8_OpenStackClusterTemplateResource is an autogenerated conversion function. -func Convert_v1alpha6_OpenStackClusterTemplateResource_To_v1alpha8_OpenStackClusterTemplateResource(in *OpenStackClusterTemplateResource, out *v1alpha8.OpenStackClusterTemplateResource, s conversion.Scope) error { - return autoConvert_v1alpha6_OpenStackClusterTemplateResource_To_v1alpha8_OpenStackClusterTemplateResource(in, out, s) +// Convert_v1alpha6_OpenStackClusterTemplateResource_To_v1beta1_OpenStackClusterTemplateResource is an autogenerated conversion function. +func Convert_v1alpha6_OpenStackClusterTemplateResource_To_v1beta1_OpenStackClusterTemplateResource(in *OpenStackClusterTemplateResource, out *v1beta1.OpenStackClusterTemplateResource, s conversion.Scope) error { + return autoConvert_v1alpha6_OpenStackClusterTemplateResource_To_v1beta1_OpenStackClusterTemplateResource(in, out, s) } -func autoConvert_v1alpha8_OpenStackClusterTemplateResource_To_v1alpha6_OpenStackClusterTemplateResource(in *v1alpha8.OpenStackClusterTemplateResource, out *OpenStackClusterTemplateResource, s conversion.Scope) error { - if err := Convert_v1alpha8_OpenStackClusterSpec_To_v1alpha6_OpenStackClusterSpec(&in.Spec, &out.Spec, s); err != nil { +func autoConvert_v1beta1_OpenStackClusterTemplateResource_To_v1alpha6_OpenStackClusterTemplateResource(in *v1beta1.OpenStackClusterTemplateResource, out *OpenStackClusterTemplateResource, s conversion.Scope) error { + if err := Convert_v1beta1_OpenStackClusterSpec_To_v1alpha6_OpenStackClusterSpec(&in.Spec, &out.Spec, s); err != nil { return err } return nil } -// Convert_v1alpha8_OpenStackClusterTemplateResource_To_v1alpha6_OpenStackClusterTemplateResource is an autogenerated conversion function. -func Convert_v1alpha8_OpenStackClusterTemplateResource_To_v1alpha6_OpenStackClusterTemplateResource(in *v1alpha8.OpenStackClusterTemplateResource, out *OpenStackClusterTemplateResource, s conversion.Scope) error { - return autoConvert_v1alpha8_OpenStackClusterTemplateResource_To_v1alpha6_OpenStackClusterTemplateResource(in, out, s) +// Convert_v1beta1_OpenStackClusterTemplateResource_To_v1alpha6_OpenStackClusterTemplateResource is an autogenerated conversion function. +func Convert_v1beta1_OpenStackClusterTemplateResource_To_v1alpha6_OpenStackClusterTemplateResource(in *v1beta1.OpenStackClusterTemplateResource, out *OpenStackClusterTemplateResource, s conversion.Scope) error { + return autoConvert_v1beta1_OpenStackClusterTemplateResource_To_v1alpha6_OpenStackClusterTemplateResource(in, out, s) } -func autoConvert_v1alpha6_OpenStackClusterTemplateSpec_To_v1alpha8_OpenStackClusterTemplateSpec(in *OpenStackClusterTemplateSpec, out *v1alpha8.OpenStackClusterTemplateSpec, s conversion.Scope) error { - if err := Convert_v1alpha6_OpenStackClusterTemplateResource_To_v1alpha8_OpenStackClusterTemplateResource(&in.Template, &out.Template, s); err != nil { +func autoConvert_v1alpha6_OpenStackClusterTemplateSpec_To_v1beta1_OpenStackClusterTemplateSpec(in *OpenStackClusterTemplateSpec, out *v1beta1.OpenStackClusterTemplateSpec, s conversion.Scope) error { + if err := Convert_v1alpha6_OpenStackClusterTemplateResource_To_v1beta1_OpenStackClusterTemplateResource(&in.Template, &out.Template, s); err != nil { return err } return nil } -// Convert_v1alpha6_OpenStackClusterTemplateSpec_To_v1alpha8_OpenStackClusterTemplateSpec is an autogenerated conversion function. -func Convert_v1alpha6_OpenStackClusterTemplateSpec_To_v1alpha8_OpenStackClusterTemplateSpec(in *OpenStackClusterTemplateSpec, out *v1alpha8.OpenStackClusterTemplateSpec, s conversion.Scope) error { - return autoConvert_v1alpha6_OpenStackClusterTemplateSpec_To_v1alpha8_OpenStackClusterTemplateSpec(in, out, s) +// Convert_v1alpha6_OpenStackClusterTemplateSpec_To_v1beta1_OpenStackClusterTemplateSpec is an autogenerated conversion function. +func Convert_v1alpha6_OpenStackClusterTemplateSpec_To_v1beta1_OpenStackClusterTemplateSpec(in *OpenStackClusterTemplateSpec, out *v1beta1.OpenStackClusterTemplateSpec, s conversion.Scope) error { + return autoConvert_v1alpha6_OpenStackClusterTemplateSpec_To_v1beta1_OpenStackClusterTemplateSpec(in, out, s) } -func autoConvert_v1alpha8_OpenStackClusterTemplateSpec_To_v1alpha6_OpenStackClusterTemplateSpec(in *v1alpha8.OpenStackClusterTemplateSpec, out *OpenStackClusterTemplateSpec, s conversion.Scope) error { - if err := Convert_v1alpha8_OpenStackClusterTemplateResource_To_v1alpha6_OpenStackClusterTemplateResource(&in.Template, &out.Template, s); err != nil { +func autoConvert_v1beta1_OpenStackClusterTemplateSpec_To_v1alpha6_OpenStackClusterTemplateSpec(in *v1beta1.OpenStackClusterTemplateSpec, out *OpenStackClusterTemplateSpec, s conversion.Scope) error { + if err := Convert_v1beta1_OpenStackClusterTemplateResource_To_v1alpha6_OpenStackClusterTemplateResource(&in.Template, &out.Template, s); err != nil { return err } return nil } -// Convert_v1alpha8_OpenStackClusterTemplateSpec_To_v1alpha6_OpenStackClusterTemplateSpec is an autogenerated conversion function. -func Convert_v1alpha8_OpenStackClusterTemplateSpec_To_v1alpha6_OpenStackClusterTemplateSpec(in *v1alpha8.OpenStackClusterTemplateSpec, out *OpenStackClusterTemplateSpec, s conversion.Scope) error { - return autoConvert_v1alpha8_OpenStackClusterTemplateSpec_To_v1alpha6_OpenStackClusterTemplateSpec(in, out, s) +// Convert_v1beta1_OpenStackClusterTemplateSpec_To_v1alpha6_OpenStackClusterTemplateSpec is an autogenerated conversion function. +func Convert_v1beta1_OpenStackClusterTemplateSpec_To_v1alpha6_OpenStackClusterTemplateSpec(in *v1beta1.OpenStackClusterTemplateSpec, out *OpenStackClusterTemplateSpec, s conversion.Scope) error { + return autoConvert_v1beta1_OpenStackClusterTemplateSpec_To_v1alpha6_OpenStackClusterTemplateSpec(in, out, s) } -func autoConvert_v1alpha6_OpenStackIdentityReference_To_v1alpha8_OpenStackIdentityReference(in *OpenStackIdentityReference, out *v1alpha8.OpenStackIdentityReference, s conversion.Scope) error { +func autoConvert_v1alpha6_OpenStackIdentityReference_To_v1beta1_OpenStackIdentityReference(in *OpenStackIdentityReference, out *v1beta1.OpenStackIdentityReference, s conversion.Scope) error { out.Kind = in.Kind out.Name = in.Name return nil } -// Convert_v1alpha6_OpenStackIdentityReference_To_v1alpha8_OpenStackIdentityReference is an autogenerated conversion function. -func Convert_v1alpha6_OpenStackIdentityReference_To_v1alpha8_OpenStackIdentityReference(in *OpenStackIdentityReference, out *v1alpha8.OpenStackIdentityReference, s conversion.Scope) error { - return autoConvert_v1alpha6_OpenStackIdentityReference_To_v1alpha8_OpenStackIdentityReference(in, out, s) +// Convert_v1alpha6_OpenStackIdentityReference_To_v1beta1_OpenStackIdentityReference is an autogenerated conversion function. +func Convert_v1alpha6_OpenStackIdentityReference_To_v1beta1_OpenStackIdentityReference(in *OpenStackIdentityReference, out *v1beta1.OpenStackIdentityReference, s conversion.Scope) error { + return autoConvert_v1alpha6_OpenStackIdentityReference_To_v1beta1_OpenStackIdentityReference(in, out, s) } -func autoConvert_v1alpha8_OpenStackIdentityReference_To_v1alpha6_OpenStackIdentityReference(in *v1alpha8.OpenStackIdentityReference, out *OpenStackIdentityReference, s conversion.Scope) error { +func autoConvert_v1beta1_OpenStackIdentityReference_To_v1alpha6_OpenStackIdentityReference(in *v1beta1.OpenStackIdentityReference, out *OpenStackIdentityReference, s conversion.Scope) error { out.Kind = in.Kind out.Name = in.Name return nil } -// Convert_v1alpha8_OpenStackIdentityReference_To_v1alpha6_OpenStackIdentityReference is an autogenerated conversion function. -func Convert_v1alpha8_OpenStackIdentityReference_To_v1alpha6_OpenStackIdentityReference(in *v1alpha8.OpenStackIdentityReference, out *OpenStackIdentityReference, s conversion.Scope) error { - return autoConvert_v1alpha8_OpenStackIdentityReference_To_v1alpha6_OpenStackIdentityReference(in, out, s) +// Convert_v1beta1_OpenStackIdentityReference_To_v1alpha6_OpenStackIdentityReference is an autogenerated conversion function. +func Convert_v1beta1_OpenStackIdentityReference_To_v1alpha6_OpenStackIdentityReference(in *v1beta1.OpenStackIdentityReference, out *OpenStackIdentityReference, s conversion.Scope) error { + return autoConvert_v1beta1_OpenStackIdentityReference_To_v1alpha6_OpenStackIdentityReference(in, out, s) } -func autoConvert_v1alpha6_OpenStackMachine_To_v1alpha8_OpenStackMachine(in *OpenStackMachine, out *v1alpha8.OpenStackMachine, s conversion.Scope) error { +func autoConvert_v1alpha6_OpenStackMachine_To_v1beta1_OpenStackMachine(in *OpenStackMachine, out *v1beta1.OpenStackMachine, s conversion.Scope) error { out.ObjectMeta = in.ObjectMeta - if err := Convert_v1alpha6_OpenStackMachineSpec_To_v1alpha8_OpenStackMachineSpec(&in.Spec, &out.Spec, s); err != nil { + if err := Convert_v1alpha6_OpenStackMachineSpec_To_v1beta1_OpenStackMachineSpec(&in.Spec, &out.Spec, s); err != nil { return err } - if err := Convert_v1alpha6_OpenStackMachineStatus_To_v1alpha8_OpenStackMachineStatus(&in.Status, &out.Status, s); err != nil { + if err := Convert_v1alpha6_OpenStackMachineStatus_To_v1beta1_OpenStackMachineStatus(&in.Status, &out.Status, s); err != nil { return err } return nil } -// Convert_v1alpha6_OpenStackMachine_To_v1alpha8_OpenStackMachine is an autogenerated conversion function. -func Convert_v1alpha6_OpenStackMachine_To_v1alpha8_OpenStackMachine(in *OpenStackMachine, out *v1alpha8.OpenStackMachine, s conversion.Scope) error { - return autoConvert_v1alpha6_OpenStackMachine_To_v1alpha8_OpenStackMachine(in, out, s) +// Convert_v1alpha6_OpenStackMachine_To_v1beta1_OpenStackMachine is an autogenerated conversion function. +func Convert_v1alpha6_OpenStackMachine_To_v1beta1_OpenStackMachine(in *OpenStackMachine, out *v1beta1.OpenStackMachine, s conversion.Scope) error { + return autoConvert_v1alpha6_OpenStackMachine_To_v1beta1_OpenStackMachine(in, out, s) } -func autoConvert_v1alpha8_OpenStackMachine_To_v1alpha6_OpenStackMachine(in *v1alpha8.OpenStackMachine, out *OpenStackMachine, s conversion.Scope) error { +func autoConvert_v1beta1_OpenStackMachine_To_v1alpha6_OpenStackMachine(in *v1beta1.OpenStackMachine, out *OpenStackMachine, s conversion.Scope) error { out.ObjectMeta = in.ObjectMeta - if err := Convert_v1alpha8_OpenStackMachineSpec_To_v1alpha6_OpenStackMachineSpec(&in.Spec, &out.Spec, s); err != nil { + if err := Convert_v1beta1_OpenStackMachineSpec_To_v1alpha6_OpenStackMachineSpec(&in.Spec, &out.Spec, s); err != nil { return err } - if err := Convert_v1alpha8_OpenStackMachineStatus_To_v1alpha6_OpenStackMachineStatus(&in.Status, &out.Status, s); err != nil { + if err := Convert_v1beta1_OpenStackMachineStatus_To_v1alpha6_OpenStackMachineStatus(&in.Status, &out.Status, s); err != nil { return err } return nil } -// Convert_v1alpha8_OpenStackMachine_To_v1alpha6_OpenStackMachine is an autogenerated conversion function. -func Convert_v1alpha8_OpenStackMachine_To_v1alpha6_OpenStackMachine(in *v1alpha8.OpenStackMachine, out *OpenStackMachine, s conversion.Scope) error { - return autoConvert_v1alpha8_OpenStackMachine_To_v1alpha6_OpenStackMachine(in, out, s) +// Convert_v1beta1_OpenStackMachine_To_v1alpha6_OpenStackMachine is an autogenerated conversion function. +func Convert_v1beta1_OpenStackMachine_To_v1alpha6_OpenStackMachine(in *v1beta1.OpenStackMachine, out *OpenStackMachine, s conversion.Scope) error { + return autoConvert_v1beta1_OpenStackMachine_To_v1alpha6_OpenStackMachine(in, out, s) } -func autoConvert_v1alpha6_OpenStackMachineList_To_v1alpha8_OpenStackMachineList(in *OpenStackMachineList, out *v1alpha8.OpenStackMachineList, s conversion.Scope) error { +func autoConvert_v1alpha6_OpenStackMachineList_To_v1beta1_OpenStackMachineList(in *OpenStackMachineList, out *v1beta1.OpenStackMachineList, s conversion.Scope) error { out.ListMeta = in.ListMeta if in.Items != nil { in, out := &in.Items, &out.Items - *out = make([]v1alpha8.OpenStackMachine, len(*in)) + *out = make([]v1beta1.OpenStackMachine, len(*in)) for i := range *in { - if err := Convert_v1alpha6_OpenStackMachine_To_v1alpha8_OpenStackMachine(&(*in)[i], &(*out)[i], s); err != nil { + if err := Convert_v1alpha6_OpenStackMachine_To_v1beta1_OpenStackMachine(&(*in)[i], &(*out)[i], s); err != nil { return err } } @@ -1072,18 +1072,18 @@ func autoConvert_v1alpha6_OpenStackMachineList_To_v1alpha8_OpenStackMachineList( return nil } -// Convert_v1alpha6_OpenStackMachineList_To_v1alpha8_OpenStackMachineList is an autogenerated conversion function. -func Convert_v1alpha6_OpenStackMachineList_To_v1alpha8_OpenStackMachineList(in *OpenStackMachineList, out *v1alpha8.OpenStackMachineList, s conversion.Scope) error { - return autoConvert_v1alpha6_OpenStackMachineList_To_v1alpha8_OpenStackMachineList(in, out, s) +// Convert_v1alpha6_OpenStackMachineList_To_v1beta1_OpenStackMachineList is an autogenerated conversion function. +func Convert_v1alpha6_OpenStackMachineList_To_v1beta1_OpenStackMachineList(in *OpenStackMachineList, out *v1beta1.OpenStackMachineList, s conversion.Scope) error { + return autoConvert_v1alpha6_OpenStackMachineList_To_v1beta1_OpenStackMachineList(in, out, s) } -func autoConvert_v1alpha8_OpenStackMachineList_To_v1alpha6_OpenStackMachineList(in *v1alpha8.OpenStackMachineList, out *OpenStackMachineList, s conversion.Scope) error { +func autoConvert_v1beta1_OpenStackMachineList_To_v1alpha6_OpenStackMachineList(in *v1beta1.OpenStackMachineList, out *OpenStackMachineList, s conversion.Scope) error { out.ListMeta = in.ListMeta if in.Items != nil { in, out := &in.Items, &out.Items *out = make([]OpenStackMachine, len(*in)) for i := range *in { - if err := Convert_v1alpha8_OpenStackMachine_To_v1alpha6_OpenStackMachine(&(*in)[i], &(*out)[i], s); err != nil { + if err := Convert_v1beta1_OpenStackMachine_To_v1alpha6_OpenStackMachine(&(*in)[i], &(*out)[i], s); err != nil { return err } } @@ -1093,25 +1093,25 @@ func autoConvert_v1alpha8_OpenStackMachineList_To_v1alpha6_OpenStackMachineList( return nil } -// Convert_v1alpha8_OpenStackMachineList_To_v1alpha6_OpenStackMachineList is an autogenerated conversion function. -func Convert_v1alpha8_OpenStackMachineList_To_v1alpha6_OpenStackMachineList(in *v1alpha8.OpenStackMachineList, out *OpenStackMachineList, s conversion.Scope) error { - return autoConvert_v1alpha8_OpenStackMachineList_To_v1alpha6_OpenStackMachineList(in, out, s) +// Convert_v1beta1_OpenStackMachineList_To_v1alpha6_OpenStackMachineList is an autogenerated conversion function. +func Convert_v1beta1_OpenStackMachineList_To_v1alpha6_OpenStackMachineList(in *v1beta1.OpenStackMachineList, out *OpenStackMachineList, s conversion.Scope) error { + return autoConvert_v1beta1_OpenStackMachineList_To_v1alpha6_OpenStackMachineList(in, out, s) } -func autoConvert_v1alpha6_OpenStackMachineSpec_To_v1alpha8_OpenStackMachineSpec(in *OpenStackMachineSpec, out *v1alpha8.OpenStackMachineSpec, s conversion.Scope) error { +func autoConvert_v1alpha6_OpenStackMachineSpec_To_v1beta1_OpenStackMachineSpec(in *OpenStackMachineSpec, out *v1beta1.OpenStackMachineSpec, s conversion.Scope) error { out.ProviderID = (*string)(unsafe.Pointer(in.ProviderID)) out.InstanceID = (*string)(unsafe.Pointer(in.InstanceID)) out.CloudName = in.CloudName out.Flavor = in.Flavor - // WARNING: in.Image requires manual conversion: inconvertible types (string vs sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha8.ImageFilter) + // WARNING: in.Image requires manual conversion: inconvertible types (string vs sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1.ImageFilter) // WARNING: in.ImageUUID requires manual conversion: does not exist in peer-type out.SSHKeyName = in.SSHKeyName // WARNING: in.Networks requires manual conversion: does not exist in peer-type if in.Ports != nil { in, out := &in.Ports, &out.Ports - *out = make([]v1alpha8.PortOpts, len(*in)) + *out = make([]v1beta1.PortOpts, len(*in)) for i := range *in { - if err := Convert_v1alpha6_PortOpts_To_v1alpha8_PortOpts(&(*in)[i], &(*out)[i], s); err != nil { + if err := Convert_v1alpha6_PortOpts_To_v1beta1_PortOpts(&(*in)[i], &(*out)[i], s); err != nil { return err } } @@ -1122,9 +1122,9 @@ func autoConvert_v1alpha6_OpenStackMachineSpec_To_v1alpha8_OpenStackMachineSpec( // WARNING: in.FloatingIP requires manual conversion: does not exist in peer-type if in.SecurityGroups != nil { in, out := &in.SecurityGroups, &out.SecurityGroups - *out = make([]v1alpha8.SecurityGroupFilter, len(*in)) + *out = make([]v1beta1.SecurityGroupFilter, len(*in)) for i := range *in { - if err := Convert_v1alpha6_SecurityGroupParam_To_v1alpha8_SecurityGroupFilter(&(*in)[i], &(*out)[i], s); err != nil { + if err := Convert_v1alpha6_SecurityGroupParam_To_v1beta1_SecurityGroupFilter(&(*in)[i], &(*out)[i], s); err != nil { return err } } @@ -1133,26 +1133,26 @@ func autoConvert_v1alpha6_OpenStackMachineSpec_To_v1alpha8_OpenStackMachineSpec( } out.Trunk = in.Trunk out.Tags = *(*[]string)(unsafe.Pointer(&in.Tags)) - // WARNING: in.ServerMetadata requires manual conversion: inconvertible types (map[string]string vs []sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha8.ServerMetadata) + // WARNING: in.ServerMetadata requires manual conversion: inconvertible types (map[string]string vs []sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1.ServerMetadata) out.ConfigDrive = (*bool)(unsafe.Pointer(in.ConfigDrive)) - out.RootVolume = (*v1alpha8.RootVolume)(unsafe.Pointer(in.RootVolume)) + out.RootVolume = (*v1beta1.RootVolume)(unsafe.Pointer(in.RootVolume)) // WARNING: in.ServerGroupID requires manual conversion: does not exist in peer-type - out.IdentityRef = (*v1alpha8.OpenStackIdentityReference)(unsafe.Pointer(in.IdentityRef)) + out.IdentityRef = (*v1beta1.OpenStackIdentityReference)(unsafe.Pointer(in.IdentityRef)) return nil } -func autoConvert_v1alpha8_OpenStackMachineSpec_To_v1alpha6_OpenStackMachineSpec(in *v1alpha8.OpenStackMachineSpec, out *OpenStackMachineSpec, s conversion.Scope) error { +func autoConvert_v1beta1_OpenStackMachineSpec_To_v1alpha6_OpenStackMachineSpec(in *v1beta1.OpenStackMachineSpec, out *OpenStackMachineSpec, s conversion.Scope) error { out.ProviderID = (*string)(unsafe.Pointer(in.ProviderID)) out.InstanceID = (*string)(unsafe.Pointer(in.InstanceID)) out.CloudName = in.CloudName out.Flavor = in.Flavor - // WARNING: in.Image requires manual conversion: inconvertible types (sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha8.ImageFilter vs string) + // WARNING: in.Image requires manual conversion: inconvertible types (sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1.ImageFilter vs string) out.SSHKeyName = in.SSHKeyName if in.Ports != nil { in, out := &in.Ports, &out.Ports *out = make([]PortOpts, len(*in)) for i := range *in { - if err := Convert_v1alpha8_PortOpts_To_v1alpha6_PortOpts(&(*in)[i], &(*out)[i], s); err != nil { + if err := Convert_v1beta1_PortOpts_To_v1alpha6_PortOpts(&(*in)[i], &(*out)[i], s); err != nil { return err } } @@ -1163,7 +1163,7 @@ func autoConvert_v1alpha8_OpenStackMachineSpec_To_v1alpha6_OpenStackMachineSpec( in, out := &in.SecurityGroups, &out.SecurityGroups *out = make([]SecurityGroupParam, len(*in)) for i := range *in { - if err := Convert_v1alpha8_SecurityGroupFilter_To_v1alpha6_SecurityGroupParam(&(*in)[i], &(*out)[i], s); err != nil { + if err := Convert_v1beta1_SecurityGroupFilter_To_v1alpha6_SecurityGroupParam(&(*in)[i], &(*out)[i], s); err != nil { return err } } @@ -1172,7 +1172,7 @@ func autoConvert_v1alpha8_OpenStackMachineSpec_To_v1alpha6_OpenStackMachineSpec( } out.Trunk = in.Trunk out.Tags = *(*[]string)(unsafe.Pointer(&in.Tags)) - // WARNING: in.ServerMetadata requires manual conversion: inconvertible types ([]sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha8.ServerMetadata vs map[string]string) + // WARNING: in.ServerMetadata requires manual conversion: inconvertible types ([]sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1.ServerMetadata vs map[string]string) out.ConfigDrive = (*bool)(unsafe.Pointer(in.ConfigDrive)) out.RootVolume = (*RootVolume)(unsafe.Pointer(in.RootVolume)) // WARNING: in.AdditionalBlockDevices requires manual conversion: does not exist in peer-type @@ -1181,65 +1181,65 @@ func autoConvert_v1alpha8_OpenStackMachineSpec_To_v1alpha6_OpenStackMachineSpec( return nil } -func autoConvert_v1alpha6_OpenStackMachineStatus_To_v1alpha8_OpenStackMachineStatus(in *OpenStackMachineStatus, out *v1alpha8.OpenStackMachineStatus, s conversion.Scope) error { +func autoConvert_v1alpha6_OpenStackMachineStatus_To_v1beta1_OpenStackMachineStatus(in *OpenStackMachineStatus, out *v1beta1.OpenStackMachineStatus, s conversion.Scope) error { out.Ready = in.Ready out.Addresses = *(*[]v1.NodeAddress)(unsafe.Pointer(&in.Addresses)) - out.InstanceState = (*v1alpha8.InstanceState)(unsafe.Pointer(in.InstanceState)) + out.InstanceState = (*v1beta1.InstanceState)(unsafe.Pointer(in.InstanceState)) out.FailureReason = (*errors.MachineStatusError)(unsafe.Pointer(in.FailureReason)) out.FailureMessage = (*string)(unsafe.Pointer(in.FailureMessage)) - out.Conditions = *(*v1beta1.Conditions)(unsafe.Pointer(&in.Conditions)) + out.Conditions = *(*apiv1beta1.Conditions)(unsafe.Pointer(&in.Conditions)) return nil } -// Convert_v1alpha6_OpenStackMachineStatus_To_v1alpha8_OpenStackMachineStatus is an autogenerated conversion function. -func Convert_v1alpha6_OpenStackMachineStatus_To_v1alpha8_OpenStackMachineStatus(in *OpenStackMachineStatus, out *v1alpha8.OpenStackMachineStatus, s conversion.Scope) error { - return autoConvert_v1alpha6_OpenStackMachineStatus_To_v1alpha8_OpenStackMachineStatus(in, out, s) +// Convert_v1alpha6_OpenStackMachineStatus_To_v1beta1_OpenStackMachineStatus is an autogenerated conversion function. +func Convert_v1alpha6_OpenStackMachineStatus_To_v1beta1_OpenStackMachineStatus(in *OpenStackMachineStatus, out *v1beta1.OpenStackMachineStatus, s conversion.Scope) error { + return autoConvert_v1alpha6_OpenStackMachineStatus_To_v1beta1_OpenStackMachineStatus(in, out, s) } -func autoConvert_v1alpha8_OpenStackMachineStatus_To_v1alpha6_OpenStackMachineStatus(in *v1alpha8.OpenStackMachineStatus, out *OpenStackMachineStatus, s conversion.Scope) error { +func autoConvert_v1beta1_OpenStackMachineStatus_To_v1alpha6_OpenStackMachineStatus(in *v1beta1.OpenStackMachineStatus, out *OpenStackMachineStatus, s conversion.Scope) error { out.Ready = in.Ready out.Addresses = *(*[]v1.NodeAddress)(unsafe.Pointer(&in.Addresses)) out.InstanceState = (*InstanceState)(unsafe.Pointer(in.InstanceState)) // WARNING: in.ReferencedResources requires manual conversion: does not exist in peer-type out.FailureReason = (*errors.MachineStatusError)(unsafe.Pointer(in.FailureReason)) out.FailureMessage = (*string)(unsafe.Pointer(in.FailureMessage)) - out.Conditions = *(*v1beta1.Conditions)(unsafe.Pointer(&in.Conditions)) + out.Conditions = *(*apiv1beta1.Conditions)(unsafe.Pointer(&in.Conditions)) return nil } -func autoConvert_v1alpha6_OpenStackMachineTemplate_To_v1alpha8_OpenStackMachineTemplate(in *OpenStackMachineTemplate, out *v1alpha8.OpenStackMachineTemplate, s conversion.Scope) error { +func autoConvert_v1alpha6_OpenStackMachineTemplate_To_v1beta1_OpenStackMachineTemplate(in *OpenStackMachineTemplate, out *v1beta1.OpenStackMachineTemplate, s conversion.Scope) error { out.ObjectMeta = in.ObjectMeta - if err := Convert_v1alpha6_OpenStackMachineTemplateSpec_To_v1alpha8_OpenStackMachineTemplateSpec(&in.Spec, &out.Spec, s); err != nil { + if err := Convert_v1alpha6_OpenStackMachineTemplateSpec_To_v1beta1_OpenStackMachineTemplateSpec(&in.Spec, &out.Spec, s); err != nil { return err } return nil } -// Convert_v1alpha6_OpenStackMachineTemplate_To_v1alpha8_OpenStackMachineTemplate is an autogenerated conversion function. -func Convert_v1alpha6_OpenStackMachineTemplate_To_v1alpha8_OpenStackMachineTemplate(in *OpenStackMachineTemplate, out *v1alpha8.OpenStackMachineTemplate, s conversion.Scope) error { - return autoConvert_v1alpha6_OpenStackMachineTemplate_To_v1alpha8_OpenStackMachineTemplate(in, out, s) +// Convert_v1alpha6_OpenStackMachineTemplate_To_v1beta1_OpenStackMachineTemplate is an autogenerated conversion function. +func Convert_v1alpha6_OpenStackMachineTemplate_To_v1beta1_OpenStackMachineTemplate(in *OpenStackMachineTemplate, out *v1beta1.OpenStackMachineTemplate, s conversion.Scope) error { + return autoConvert_v1alpha6_OpenStackMachineTemplate_To_v1beta1_OpenStackMachineTemplate(in, out, s) } -func autoConvert_v1alpha8_OpenStackMachineTemplate_To_v1alpha6_OpenStackMachineTemplate(in *v1alpha8.OpenStackMachineTemplate, out *OpenStackMachineTemplate, s conversion.Scope) error { +func autoConvert_v1beta1_OpenStackMachineTemplate_To_v1alpha6_OpenStackMachineTemplate(in *v1beta1.OpenStackMachineTemplate, out *OpenStackMachineTemplate, s conversion.Scope) error { out.ObjectMeta = in.ObjectMeta - if err := Convert_v1alpha8_OpenStackMachineTemplateSpec_To_v1alpha6_OpenStackMachineTemplateSpec(&in.Spec, &out.Spec, s); err != nil { + if err := Convert_v1beta1_OpenStackMachineTemplateSpec_To_v1alpha6_OpenStackMachineTemplateSpec(&in.Spec, &out.Spec, s); err != nil { return err } return nil } -// Convert_v1alpha8_OpenStackMachineTemplate_To_v1alpha6_OpenStackMachineTemplate is an autogenerated conversion function. -func Convert_v1alpha8_OpenStackMachineTemplate_To_v1alpha6_OpenStackMachineTemplate(in *v1alpha8.OpenStackMachineTemplate, out *OpenStackMachineTemplate, s conversion.Scope) error { - return autoConvert_v1alpha8_OpenStackMachineTemplate_To_v1alpha6_OpenStackMachineTemplate(in, out, s) +// Convert_v1beta1_OpenStackMachineTemplate_To_v1alpha6_OpenStackMachineTemplate is an autogenerated conversion function. +func Convert_v1beta1_OpenStackMachineTemplate_To_v1alpha6_OpenStackMachineTemplate(in *v1beta1.OpenStackMachineTemplate, out *OpenStackMachineTemplate, s conversion.Scope) error { + return autoConvert_v1beta1_OpenStackMachineTemplate_To_v1alpha6_OpenStackMachineTemplate(in, out, s) } -func autoConvert_v1alpha6_OpenStackMachineTemplateList_To_v1alpha8_OpenStackMachineTemplateList(in *OpenStackMachineTemplateList, out *v1alpha8.OpenStackMachineTemplateList, s conversion.Scope) error { +func autoConvert_v1alpha6_OpenStackMachineTemplateList_To_v1beta1_OpenStackMachineTemplateList(in *OpenStackMachineTemplateList, out *v1beta1.OpenStackMachineTemplateList, s conversion.Scope) error { out.ListMeta = in.ListMeta if in.Items != nil { in, out := &in.Items, &out.Items - *out = make([]v1alpha8.OpenStackMachineTemplate, len(*in)) + *out = make([]v1beta1.OpenStackMachineTemplate, len(*in)) for i := range *in { - if err := Convert_v1alpha6_OpenStackMachineTemplate_To_v1alpha8_OpenStackMachineTemplate(&(*in)[i], &(*out)[i], s); err != nil { + if err := Convert_v1alpha6_OpenStackMachineTemplate_To_v1beta1_OpenStackMachineTemplate(&(*in)[i], &(*out)[i], s); err != nil { return err } } @@ -1249,18 +1249,18 @@ func autoConvert_v1alpha6_OpenStackMachineTemplateList_To_v1alpha8_OpenStackMach return nil } -// Convert_v1alpha6_OpenStackMachineTemplateList_To_v1alpha8_OpenStackMachineTemplateList is an autogenerated conversion function. -func Convert_v1alpha6_OpenStackMachineTemplateList_To_v1alpha8_OpenStackMachineTemplateList(in *OpenStackMachineTemplateList, out *v1alpha8.OpenStackMachineTemplateList, s conversion.Scope) error { - return autoConvert_v1alpha6_OpenStackMachineTemplateList_To_v1alpha8_OpenStackMachineTemplateList(in, out, s) +// Convert_v1alpha6_OpenStackMachineTemplateList_To_v1beta1_OpenStackMachineTemplateList is an autogenerated conversion function. +func Convert_v1alpha6_OpenStackMachineTemplateList_To_v1beta1_OpenStackMachineTemplateList(in *OpenStackMachineTemplateList, out *v1beta1.OpenStackMachineTemplateList, s conversion.Scope) error { + return autoConvert_v1alpha6_OpenStackMachineTemplateList_To_v1beta1_OpenStackMachineTemplateList(in, out, s) } -func autoConvert_v1alpha8_OpenStackMachineTemplateList_To_v1alpha6_OpenStackMachineTemplateList(in *v1alpha8.OpenStackMachineTemplateList, out *OpenStackMachineTemplateList, s conversion.Scope) error { +func autoConvert_v1beta1_OpenStackMachineTemplateList_To_v1alpha6_OpenStackMachineTemplateList(in *v1beta1.OpenStackMachineTemplateList, out *OpenStackMachineTemplateList, s conversion.Scope) error { out.ListMeta = in.ListMeta if in.Items != nil { in, out := &in.Items, &out.Items *out = make([]OpenStackMachineTemplate, len(*in)) for i := range *in { - if err := Convert_v1alpha8_OpenStackMachineTemplate_To_v1alpha6_OpenStackMachineTemplate(&(*in)[i], &(*out)[i], s); err != nil { + if err := Convert_v1beta1_OpenStackMachineTemplate_To_v1alpha6_OpenStackMachineTemplate(&(*in)[i], &(*out)[i], s); err != nil { return err } } @@ -1270,92 +1270,92 @@ func autoConvert_v1alpha8_OpenStackMachineTemplateList_To_v1alpha6_OpenStackMach return nil } -// Convert_v1alpha8_OpenStackMachineTemplateList_To_v1alpha6_OpenStackMachineTemplateList is an autogenerated conversion function. -func Convert_v1alpha8_OpenStackMachineTemplateList_To_v1alpha6_OpenStackMachineTemplateList(in *v1alpha8.OpenStackMachineTemplateList, out *OpenStackMachineTemplateList, s conversion.Scope) error { - return autoConvert_v1alpha8_OpenStackMachineTemplateList_To_v1alpha6_OpenStackMachineTemplateList(in, out, s) +// Convert_v1beta1_OpenStackMachineTemplateList_To_v1alpha6_OpenStackMachineTemplateList is an autogenerated conversion function. +func Convert_v1beta1_OpenStackMachineTemplateList_To_v1alpha6_OpenStackMachineTemplateList(in *v1beta1.OpenStackMachineTemplateList, out *OpenStackMachineTemplateList, s conversion.Scope) error { + return autoConvert_v1beta1_OpenStackMachineTemplateList_To_v1alpha6_OpenStackMachineTemplateList(in, out, s) } -func autoConvert_v1alpha6_OpenStackMachineTemplateResource_To_v1alpha8_OpenStackMachineTemplateResource(in *OpenStackMachineTemplateResource, out *v1alpha8.OpenStackMachineTemplateResource, s conversion.Scope) error { - if err := Convert_v1alpha6_OpenStackMachineSpec_To_v1alpha8_OpenStackMachineSpec(&in.Spec, &out.Spec, s); err != nil { +func autoConvert_v1alpha6_OpenStackMachineTemplateResource_To_v1beta1_OpenStackMachineTemplateResource(in *OpenStackMachineTemplateResource, out *v1beta1.OpenStackMachineTemplateResource, s conversion.Scope) error { + if err := Convert_v1alpha6_OpenStackMachineSpec_To_v1beta1_OpenStackMachineSpec(&in.Spec, &out.Spec, s); err != nil { return err } return nil } -// Convert_v1alpha6_OpenStackMachineTemplateResource_To_v1alpha8_OpenStackMachineTemplateResource is an autogenerated conversion function. -func Convert_v1alpha6_OpenStackMachineTemplateResource_To_v1alpha8_OpenStackMachineTemplateResource(in *OpenStackMachineTemplateResource, out *v1alpha8.OpenStackMachineTemplateResource, s conversion.Scope) error { - return autoConvert_v1alpha6_OpenStackMachineTemplateResource_To_v1alpha8_OpenStackMachineTemplateResource(in, out, s) +// Convert_v1alpha6_OpenStackMachineTemplateResource_To_v1beta1_OpenStackMachineTemplateResource is an autogenerated conversion function. +func Convert_v1alpha6_OpenStackMachineTemplateResource_To_v1beta1_OpenStackMachineTemplateResource(in *OpenStackMachineTemplateResource, out *v1beta1.OpenStackMachineTemplateResource, s conversion.Scope) error { + return autoConvert_v1alpha6_OpenStackMachineTemplateResource_To_v1beta1_OpenStackMachineTemplateResource(in, out, s) } -func autoConvert_v1alpha8_OpenStackMachineTemplateResource_To_v1alpha6_OpenStackMachineTemplateResource(in *v1alpha8.OpenStackMachineTemplateResource, out *OpenStackMachineTemplateResource, s conversion.Scope) error { - if err := Convert_v1alpha8_OpenStackMachineSpec_To_v1alpha6_OpenStackMachineSpec(&in.Spec, &out.Spec, s); err != nil { +func autoConvert_v1beta1_OpenStackMachineTemplateResource_To_v1alpha6_OpenStackMachineTemplateResource(in *v1beta1.OpenStackMachineTemplateResource, out *OpenStackMachineTemplateResource, s conversion.Scope) error { + if err := Convert_v1beta1_OpenStackMachineSpec_To_v1alpha6_OpenStackMachineSpec(&in.Spec, &out.Spec, s); err != nil { return err } return nil } -// Convert_v1alpha8_OpenStackMachineTemplateResource_To_v1alpha6_OpenStackMachineTemplateResource is an autogenerated conversion function. -func Convert_v1alpha8_OpenStackMachineTemplateResource_To_v1alpha6_OpenStackMachineTemplateResource(in *v1alpha8.OpenStackMachineTemplateResource, out *OpenStackMachineTemplateResource, s conversion.Scope) error { - return autoConvert_v1alpha8_OpenStackMachineTemplateResource_To_v1alpha6_OpenStackMachineTemplateResource(in, out, s) +// Convert_v1beta1_OpenStackMachineTemplateResource_To_v1alpha6_OpenStackMachineTemplateResource is an autogenerated conversion function. +func Convert_v1beta1_OpenStackMachineTemplateResource_To_v1alpha6_OpenStackMachineTemplateResource(in *v1beta1.OpenStackMachineTemplateResource, out *OpenStackMachineTemplateResource, s conversion.Scope) error { + return autoConvert_v1beta1_OpenStackMachineTemplateResource_To_v1alpha6_OpenStackMachineTemplateResource(in, out, s) } -func autoConvert_v1alpha6_OpenStackMachineTemplateSpec_To_v1alpha8_OpenStackMachineTemplateSpec(in *OpenStackMachineTemplateSpec, out *v1alpha8.OpenStackMachineTemplateSpec, s conversion.Scope) error { - if err := Convert_v1alpha6_OpenStackMachineTemplateResource_To_v1alpha8_OpenStackMachineTemplateResource(&in.Template, &out.Template, s); err != nil { +func autoConvert_v1alpha6_OpenStackMachineTemplateSpec_To_v1beta1_OpenStackMachineTemplateSpec(in *OpenStackMachineTemplateSpec, out *v1beta1.OpenStackMachineTemplateSpec, s conversion.Scope) error { + if err := Convert_v1alpha6_OpenStackMachineTemplateResource_To_v1beta1_OpenStackMachineTemplateResource(&in.Template, &out.Template, s); err != nil { return err } return nil } -// Convert_v1alpha6_OpenStackMachineTemplateSpec_To_v1alpha8_OpenStackMachineTemplateSpec is an autogenerated conversion function. -func Convert_v1alpha6_OpenStackMachineTemplateSpec_To_v1alpha8_OpenStackMachineTemplateSpec(in *OpenStackMachineTemplateSpec, out *v1alpha8.OpenStackMachineTemplateSpec, s conversion.Scope) error { - return autoConvert_v1alpha6_OpenStackMachineTemplateSpec_To_v1alpha8_OpenStackMachineTemplateSpec(in, out, s) +// Convert_v1alpha6_OpenStackMachineTemplateSpec_To_v1beta1_OpenStackMachineTemplateSpec is an autogenerated conversion function. +func Convert_v1alpha6_OpenStackMachineTemplateSpec_To_v1beta1_OpenStackMachineTemplateSpec(in *OpenStackMachineTemplateSpec, out *v1beta1.OpenStackMachineTemplateSpec, s conversion.Scope) error { + return autoConvert_v1alpha6_OpenStackMachineTemplateSpec_To_v1beta1_OpenStackMachineTemplateSpec(in, out, s) } -func autoConvert_v1alpha8_OpenStackMachineTemplateSpec_To_v1alpha6_OpenStackMachineTemplateSpec(in *v1alpha8.OpenStackMachineTemplateSpec, out *OpenStackMachineTemplateSpec, s conversion.Scope) error { - if err := Convert_v1alpha8_OpenStackMachineTemplateResource_To_v1alpha6_OpenStackMachineTemplateResource(&in.Template, &out.Template, s); err != nil { +func autoConvert_v1beta1_OpenStackMachineTemplateSpec_To_v1alpha6_OpenStackMachineTemplateSpec(in *v1beta1.OpenStackMachineTemplateSpec, out *OpenStackMachineTemplateSpec, s conversion.Scope) error { + if err := Convert_v1beta1_OpenStackMachineTemplateResource_To_v1alpha6_OpenStackMachineTemplateResource(&in.Template, &out.Template, s); err != nil { return err } return nil } -// Convert_v1alpha8_OpenStackMachineTemplateSpec_To_v1alpha6_OpenStackMachineTemplateSpec is an autogenerated conversion function. -func Convert_v1alpha8_OpenStackMachineTemplateSpec_To_v1alpha6_OpenStackMachineTemplateSpec(in *v1alpha8.OpenStackMachineTemplateSpec, out *OpenStackMachineTemplateSpec, s conversion.Scope) error { - return autoConvert_v1alpha8_OpenStackMachineTemplateSpec_To_v1alpha6_OpenStackMachineTemplateSpec(in, out, s) +// Convert_v1beta1_OpenStackMachineTemplateSpec_To_v1alpha6_OpenStackMachineTemplateSpec is an autogenerated conversion function. +func Convert_v1beta1_OpenStackMachineTemplateSpec_To_v1alpha6_OpenStackMachineTemplateSpec(in *v1beta1.OpenStackMachineTemplateSpec, out *OpenStackMachineTemplateSpec, s conversion.Scope) error { + return autoConvert_v1beta1_OpenStackMachineTemplateSpec_To_v1alpha6_OpenStackMachineTemplateSpec(in, out, s) } -func autoConvert_v1alpha6_PortOpts_To_v1alpha8_PortOpts(in *PortOpts, out *v1alpha8.PortOpts, s conversion.Scope) error { - out.Network = (*v1alpha8.NetworkFilter)(unsafe.Pointer(in.Network)) +func autoConvert_v1alpha6_PortOpts_To_v1beta1_PortOpts(in *PortOpts, out *v1beta1.PortOpts, s conversion.Scope) error { + out.Network = (*v1beta1.NetworkFilter)(unsafe.Pointer(in.Network)) out.NameSuffix = in.NameSuffix out.Description = in.Description out.AdminStateUp = (*bool)(unsafe.Pointer(in.AdminStateUp)) out.MACAddress = in.MACAddress - out.FixedIPs = *(*[]v1alpha8.FixedIP)(unsafe.Pointer(&in.FixedIPs)) + out.FixedIPs = *(*[]v1beta1.FixedIP)(unsafe.Pointer(&in.FixedIPs)) // WARNING: in.TenantID requires manual conversion: does not exist in peer-type // WARNING: in.ProjectID requires manual conversion: does not exist in peer-type // WARNING: in.SecurityGroups requires manual conversion: does not exist in peer-type if in.SecurityGroupFilters != nil { in, out := &in.SecurityGroupFilters, &out.SecurityGroupFilters - *out = make([]v1alpha8.SecurityGroupFilter, len(*in)) + *out = make([]v1beta1.SecurityGroupFilter, len(*in)) for i := range *in { - if err := Convert_v1alpha6_SecurityGroupParam_To_v1alpha8_SecurityGroupFilter(&(*in)[i], &(*out)[i], s); err != nil { + if err := Convert_v1alpha6_SecurityGroupParam_To_v1beta1_SecurityGroupFilter(&(*in)[i], &(*out)[i], s); err != nil { return err } } } else { out.SecurityGroupFilters = nil } - out.AllowedAddressPairs = *(*[]v1alpha8.AddressPair)(unsafe.Pointer(&in.AllowedAddressPairs)) + out.AllowedAddressPairs = *(*[]v1beta1.AddressPair)(unsafe.Pointer(&in.AllowedAddressPairs)) out.Trunk = (*bool)(unsafe.Pointer(in.Trunk)) out.HostID = in.HostID out.VNICType = in.VNICType - // WARNING: in.Profile requires manual conversion: inconvertible types (map[string]string vs sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha8.BindingProfile) + // WARNING: in.Profile requires manual conversion: inconvertible types (map[string]string vs sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1.BindingProfile) out.DisablePortSecurity = (*bool)(unsafe.Pointer(in.DisablePortSecurity)) out.Tags = *(*[]string)(unsafe.Pointer(&in.Tags)) - out.ValueSpecs = *(*[]v1alpha8.ValueSpec)(unsafe.Pointer(&in.ValueSpecs)) + out.ValueSpecs = *(*[]v1beta1.ValueSpec)(unsafe.Pointer(&in.ValueSpecs)) return nil } -func autoConvert_v1alpha8_PortOpts_To_v1alpha6_PortOpts(in *v1alpha8.PortOpts, out *PortOpts, s conversion.Scope) error { +func autoConvert_v1beta1_PortOpts_To_v1alpha6_PortOpts(in *v1beta1.PortOpts, out *PortOpts, s conversion.Scope) error { out.Network = (*NetworkFilter)(unsafe.Pointer(in.Network)) out.NameSuffix = in.NameSuffix out.Description = in.Description @@ -1366,7 +1366,7 @@ func autoConvert_v1alpha8_PortOpts_To_v1alpha6_PortOpts(in *v1alpha8.PortOpts, o in, out := &in.SecurityGroupFilters, &out.SecurityGroupFilters *out = make([]SecurityGroupParam, len(*in)) for i := range *in { - if err := Convert_v1alpha8_SecurityGroupFilter_To_v1alpha6_SecurityGroupParam(&(*in)[i], &(*out)[i], s); err != nil { + if err := Convert_v1beta1_SecurityGroupFilter_To_v1alpha6_SecurityGroupParam(&(*in)[i], &(*out)[i], s); err != nil { return err } } @@ -1377,7 +1377,7 @@ func autoConvert_v1alpha8_PortOpts_To_v1alpha6_PortOpts(in *v1alpha8.PortOpts, o out.Trunk = (*bool)(unsafe.Pointer(in.Trunk)) out.HostID = in.HostID out.VNICType = in.VNICType - // WARNING: in.Profile requires manual conversion: inconvertible types (sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha8.BindingProfile vs map[string]string) + // WARNING: in.Profile requires manual conversion: inconvertible types (sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1.BindingProfile vs map[string]string) out.DisablePortSecurity = (*bool)(unsafe.Pointer(in.DisablePortSecurity)) // WARNING: in.PropagateUplinkStatus requires manual conversion: does not exist in peer-type out.Tags = *(*[]string)(unsafe.Pointer(&in.Tags)) @@ -1385,31 +1385,31 @@ func autoConvert_v1alpha8_PortOpts_To_v1alpha6_PortOpts(in *v1alpha8.PortOpts, o return nil } -func autoConvert_v1alpha6_RootVolume_To_v1alpha8_RootVolume(in *RootVolume, out *v1alpha8.RootVolume, s conversion.Scope) error { +func autoConvert_v1alpha6_RootVolume_To_v1beta1_RootVolume(in *RootVolume, out *v1beta1.RootVolume, s conversion.Scope) error { out.Size = in.Size out.VolumeType = in.VolumeType out.AvailabilityZone = in.AvailabilityZone return nil } -// Convert_v1alpha6_RootVolume_To_v1alpha8_RootVolume is an autogenerated conversion function. -func Convert_v1alpha6_RootVolume_To_v1alpha8_RootVolume(in *RootVolume, out *v1alpha8.RootVolume, s conversion.Scope) error { - return autoConvert_v1alpha6_RootVolume_To_v1alpha8_RootVolume(in, out, s) +// Convert_v1alpha6_RootVolume_To_v1beta1_RootVolume is an autogenerated conversion function. +func Convert_v1alpha6_RootVolume_To_v1beta1_RootVolume(in *RootVolume, out *v1beta1.RootVolume, s conversion.Scope) error { + return autoConvert_v1alpha6_RootVolume_To_v1beta1_RootVolume(in, out, s) } -func autoConvert_v1alpha8_RootVolume_To_v1alpha6_RootVolume(in *v1alpha8.RootVolume, out *RootVolume, s conversion.Scope) error { +func autoConvert_v1beta1_RootVolume_To_v1alpha6_RootVolume(in *v1beta1.RootVolume, out *RootVolume, s conversion.Scope) error { out.Size = in.Size out.VolumeType = in.VolumeType out.AvailabilityZone = in.AvailabilityZone return nil } -// Convert_v1alpha8_RootVolume_To_v1alpha6_RootVolume is an autogenerated conversion function. -func Convert_v1alpha8_RootVolume_To_v1alpha6_RootVolume(in *v1alpha8.RootVolume, out *RootVolume, s conversion.Scope) error { - return autoConvert_v1alpha8_RootVolume_To_v1alpha6_RootVolume(in, out, s) +// Convert_v1beta1_RootVolume_To_v1alpha6_RootVolume is an autogenerated conversion function. +func Convert_v1beta1_RootVolume_To_v1alpha6_RootVolume(in *v1beta1.RootVolume, out *RootVolume, s conversion.Scope) error { + return autoConvert_v1beta1_RootVolume_To_v1alpha6_RootVolume(in, out, s) } -func autoConvert_v1alpha6_Router_To_v1alpha8_Router(in *Router, out *v1alpha8.Router, s conversion.Scope) error { +func autoConvert_v1alpha6_Router_To_v1beta1_Router(in *Router, out *v1beta1.Router, s conversion.Scope) error { out.Name = in.Name out.ID = in.ID out.Tags = *(*[]string)(unsafe.Pointer(&in.Tags)) @@ -1417,12 +1417,12 @@ func autoConvert_v1alpha6_Router_To_v1alpha8_Router(in *Router, out *v1alpha8.Ro return nil } -// Convert_v1alpha6_Router_To_v1alpha8_Router is an autogenerated conversion function. -func Convert_v1alpha6_Router_To_v1alpha8_Router(in *Router, out *v1alpha8.Router, s conversion.Scope) error { - return autoConvert_v1alpha6_Router_To_v1alpha8_Router(in, out, s) +// Convert_v1alpha6_Router_To_v1beta1_Router is an autogenerated conversion function. +func Convert_v1alpha6_Router_To_v1beta1_Router(in *Router, out *v1beta1.Router, s conversion.Scope) error { + return autoConvert_v1alpha6_Router_To_v1beta1_Router(in, out, s) } -func autoConvert_v1alpha8_Router_To_v1alpha6_Router(in *v1alpha8.Router, out *Router, s conversion.Scope) error { +func autoConvert_v1beta1_Router_To_v1alpha6_Router(in *v1beta1.Router, out *Router, s conversion.Scope) error { out.Name = in.Name out.ID = in.ID out.Tags = *(*[]string)(unsafe.Pointer(&in.Tags)) @@ -1430,12 +1430,12 @@ func autoConvert_v1alpha8_Router_To_v1alpha6_Router(in *v1alpha8.Router, out *Ro return nil } -// Convert_v1alpha8_Router_To_v1alpha6_Router is an autogenerated conversion function. -func Convert_v1alpha8_Router_To_v1alpha6_Router(in *v1alpha8.Router, out *Router, s conversion.Scope) error { - return autoConvert_v1alpha8_Router_To_v1alpha6_Router(in, out, s) +// Convert_v1beta1_Router_To_v1alpha6_Router is an autogenerated conversion function. +func Convert_v1beta1_Router_To_v1alpha6_Router(in *v1beta1.Router, out *Router, s conversion.Scope) error { + return autoConvert_v1beta1_Router_To_v1alpha6_Router(in, out, s) } -func autoConvert_v1alpha6_SecurityGroupFilter_To_v1alpha8_SecurityGroupFilter(in *SecurityGroupFilter, out *v1alpha8.SecurityGroupFilter, s conversion.Scope) error { +func autoConvert_v1alpha6_SecurityGroupFilter_To_v1beta1_SecurityGroupFilter(in *SecurityGroupFilter, out *v1beta1.SecurityGroupFilter, s conversion.Scope) error { out.ID = in.ID out.Name = in.Name out.Description = in.Description @@ -1452,7 +1452,7 @@ func autoConvert_v1alpha6_SecurityGroupFilter_To_v1alpha8_SecurityGroupFilter(in return nil } -func autoConvert_v1alpha8_SecurityGroupFilter_To_v1alpha6_SecurityGroupFilter(in *v1alpha8.SecurityGroupFilter, out *SecurityGroupFilter, s conversion.Scope) error { +func autoConvert_v1beta1_SecurityGroupFilter_To_v1alpha6_SecurityGroupFilter(in *v1beta1.SecurityGroupFilter, out *SecurityGroupFilter, s conversion.Scope) error { out.ID = in.ID out.Name = in.Name out.Description = in.Description @@ -1464,12 +1464,12 @@ func autoConvert_v1alpha8_SecurityGroupFilter_To_v1alpha6_SecurityGroupFilter(in return nil } -// Convert_v1alpha8_SecurityGroupFilter_To_v1alpha6_SecurityGroupFilter is an autogenerated conversion function. -func Convert_v1alpha8_SecurityGroupFilter_To_v1alpha6_SecurityGroupFilter(in *v1alpha8.SecurityGroupFilter, out *SecurityGroupFilter, s conversion.Scope) error { - return autoConvert_v1alpha8_SecurityGroupFilter_To_v1alpha6_SecurityGroupFilter(in, out, s) +// Convert_v1beta1_SecurityGroupFilter_To_v1alpha6_SecurityGroupFilter is an autogenerated conversion function. +func Convert_v1beta1_SecurityGroupFilter_To_v1alpha6_SecurityGroupFilter(in *v1beta1.SecurityGroupFilter, out *SecurityGroupFilter, s conversion.Scope) error { + return autoConvert_v1beta1_SecurityGroupFilter_To_v1alpha6_SecurityGroupFilter(in, out, s) } -func autoConvert_v1alpha6_Subnet_To_v1alpha8_Subnet(in *Subnet, out *v1alpha8.Subnet, s conversion.Scope) error { +func autoConvert_v1alpha6_Subnet_To_v1beta1_Subnet(in *Subnet, out *v1beta1.Subnet, s conversion.Scope) error { out.Name = in.Name out.ID = in.ID out.CIDR = in.CIDR @@ -1477,12 +1477,12 @@ func autoConvert_v1alpha6_Subnet_To_v1alpha8_Subnet(in *Subnet, out *v1alpha8.Su return nil } -// Convert_v1alpha6_Subnet_To_v1alpha8_Subnet is an autogenerated conversion function. -func Convert_v1alpha6_Subnet_To_v1alpha8_Subnet(in *Subnet, out *v1alpha8.Subnet, s conversion.Scope) error { - return autoConvert_v1alpha6_Subnet_To_v1alpha8_Subnet(in, out, s) +// Convert_v1alpha6_Subnet_To_v1beta1_Subnet is an autogenerated conversion function. +func Convert_v1alpha6_Subnet_To_v1beta1_Subnet(in *Subnet, out *v1beta1.Subnet, s conversion.Scope) error { + return autoConvert_v1alpha6_Subnet_To_v1beta1_Subnet(in, out, s) } -func autoConvert_v1alpha8_Subnet_To_v1alpha6_Subnet(in *v1alpha8.Subnet, out *Subnet, s conversion.Scope) error { +func autoConvert_v1beta1_Subnet_To_v1alpha6_Subnet(in *v1beta1.Subnet, out *Subnet, s conversion.Scope) error { out.Name = in.Name out.ID = in.ID out.CIDR = in.CIDR @@ -1490,12 +1490,12 @@ func autoConvert_v1alpha8_Subnet_To_v1alpha6_Subnet(in *v1alpha8.Subnet, out *Su return nil } -// Convert_v1alpha8_Subnet_To_v1alpha6_Subnet is an autogenerated conversion function. -func Convert_v1alpha8_Subnet_To_v1alpha6_Subnet(in *v1alpha8.Subnet, out *Subnet, s conversion.Scope) error { - return autoConvert_v1alpha8_Subnet_To_v1alpha6_Subnet(in, out, s) +// Convert_v1beta1_Subnet_To_v1alpha6_Subnet is an autogenerated conversion function. +func Convert_v1beta1_Subnet_To_v1alpha6_Subnet(in *v1beta1.Subnet, out *Subnet, s conversion.Scope) error { + return autoConvert_v1beta1_Subnet_To_v1alpha6_Subnet(in, out, s) } -func autoConvert_v1alpha6_SubnetFilter_To_v1alpha8_SubnetFilter(in *SubnetFilter, out *v1alpha8.SubnetFilter, s conversion.Scope) error { +func autoConvert_v1alpha6_SubnetFilter_To_v1beta1_SubnetFilter(in *SubnetFilter, out *v1beta1.SubnetFilter, s conversion.Scope) error { out.Name = in.Name out.Description = in.Description out.ProjectID = in.ProjectID @@ -1512,12 +1512,12 @@ func autoConvert_v1alpha6_SubnetFilter_To_v1alpha8_SubnetFilter(in *SubnetFilter return nil } -// Convert_v1alpha6_SubnetFilter_To_v1alpha8_SubnetFilter is an autogenerated conversion function. -func Convert_v1alpha6_SubnetFilter_To_v1alpha8_SubnetFilter(in *SubnetFilter, out *v1alpha8.SubnetFilter, s conversion.Scope) error { - return autoConvert_v1alpha6_SubnetFilter_To_v1alpha8_SubnetFilter(in, out, s) +// Convert_v1alpha6_SubnetFilter_To_v1beta1_SubnetFilter is an autogenerated conversion function. +func Convert_v1alpha6_SubnetFilter_To_v1beta1_SubnetFilter(in *SubnetFilter, out *v1beta1.SubnetFilter, s conversion.Scope) error { + return autoConvert_v1alpha6_SubnetFilter_To_v1beta1_SubnetFilter(in, out, s) } -func autoConvert_v1alpha8_SubnetFilter_To_v1alpha6_SubnetFilter(in *v1alpha8.SubnetFilter, out *SubnetFilter, s conversion.Scope) error { +func autoConvert_v1beta1_SubnetFilter_To_v1alpha6_SubnetFilter(in *v1beta1.SubnetFilter, out *SubnetFilter, s conversion.Scope) error { out.Name = in.Name out.Description = in.Description out.ProjectID = in.ProjectID @@ -1534,31 +1534,31 @@ func autoConvert_v1alpha8_SubnetFilter_To_v1alpha6_SubnetFilter(in *v1alpha8.Sub return nil } -// Convert_v1alpha8_SubnetFilter_To_v1alpha6_SubnetFilter is an autogenerated conversion function. -func Convert_v1alpha8_SubnetFilter_To_v1alpha6_SubnetFilter(in *v1alpha8.SubnetFilter, out *SubnetFilter, s conversion.Scope) error { - return autoConvert_v1alpha8_SubnetFilter_To_v1alpha6_SubnetFilter(in, out, s) +// Convert_v1beta1_SubnetFilter_To_v1alpha6_SubnetFilter is an autogenerated conversion function. +func Convert_v1beta1_SubnetFilter_To_v1alpha6_SubnetFilter(in *v1beta1.SubnetFilter, out *SubnetFilter, s conversion.Scope) error { + return autoConvert_v1beta1_SubnetFilter_To_v1alpha6_SubnetFilter(in, out, s) } -func autoConvert_v1alpha6_ValueSpec_To_v1alpha8_ValueSpec(in *ValueSpec, out *v1alpha8.ValueSpec, s conversion.Scope) error { +func autoConvert_v1alpha6_ValueSpec_To_v1beta1_ValueSpec(in *ValueSpec, out *v1beta1.ValueSpec, s conversion.Scope) error { out.Name = in.Name out.Key = in.Key out.Value = in.Value return nil } -// Convert_v1alpha6_ValueSpec_To_v1alpha8_ValueSpec is an autogenerated conversion function. -func Convert_v1alpha6_ValueSpec_To_v1alpha8_ValueSpec(in *ValueSpec, out *v1alpha8.ValueSpec, s conversion.Scope) error { - return autoConvert_v1alpha6_ValueSpec_To_v1alpha8_ValueSpec(in, out, s) +// Convert_v1alpha6_ValueSpec_To_v1beta1_ValueSpec is an autogenerated conversion function. +func Convert_v1alpha6_ValueSpec_To_v1beta1_ValueSpec(in *ValueSpec, out *v1beta1.ValueSpec, s conversion.Scope) error { + return autoConvert_v1alpha6_ValueSpec_To_v1beta1_ValueSpec(in, out, s) } -func autoConvert_v1alpha8_ValueSpec_To_v1alpha6_ValueSpec(in *v1alpha8.ValueSpec, out *ValueSpec, s conversion.Scope) error { +func autoConvert_v1beta1_ValueSpec_To_v1alpha6_ValueSpec(in *v1beta1.ValueSpec, out *ValueSpec, s conversion.Scope) error { out.Name = in.Name out.Key = in.Key out.Value = in.Value return nil } -// Convert_v1alpha8_ValueSpec_To_v1alpha6_ValueSpec is an autogenerated conversion function. -func Convert_v1alpha8_ValueSpec_To_v1alpha6_ValueSpec(in *v1alpha8.ValueSpec, out *ValueSpec, s conversion.Scope) error { - return autoConvert_v1alpha8_ValueSpec_To_v1alpha6_ValueSpec(in, out, s) +// Convert_v1beta1_ValueSpec_To_v1alpha6_ValueSpec is an autogenerated conversion function. +func Convert_v1beta1_ValueSpec_To_v1alpha6_ValueSpec(in *v1beta1.ValueSpec, out *ValueSpec, s conversion.Scope) error { + return autoConvert_v1beta1_ValueSpec_To_v1alpha6_ValueSpec(in, out, s) } diff --git a/api/v1alpha7/conversion.go b/api/v1alpha7/conversion.go index 2183d37386..a446673697 100644 --- a/api/v1alpha7/conversion.go +++ b/api/v1alpha7/conversion.go @@ -21,7 +21,7 @@ import ( "k8s.io/utils/pointer" ctrlconversion "sigs.k8s.io/controller-runtime/pkg/conversion" - infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha8" + infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1" "sigs.k8s.io/cluster-api-provider-openstack/pkg/utils/conversion" ) @@ -82,7 +82,7 @@ func restorev1alpha7ClusterStatus(previous *OpenStackClusterStatus, dst *OpenSta restorev1alpha7SecurityGroup(previous.BastionSecurityGroup, dst.BastionSecurityGroup) } -func restorev1alpha8SecurityGroupStatus(previous *infrav1.SecurityGroupStatus, dst *infrav1.SecurityGroupStatus) { +func restorev1beta1SecurityGroupStatus(previous *infrav1.SecurityGroupStatus, dst *infrav1.SecurityGroupStatus) { if previous == nil || dst == nil { return } @@ -115,10 +115,10 @@ func restorev1alpha8SecurityGroupStatus(previous *infrav1.SecurityGroupStatus, d } } -func restorev1alpha8ClusterStatus(previous *infrav1.OpenStackClusterStatus, dst *infrav1.OpenStackClusterStatus) { - restorev1alpha8SecurityGroupStatus(previous.ControlPlaneSecurityGroup, dst.ControlPlaneSecurityGroup) - restorev1alpha8SecurityGroupStatus(previous.WorkerSecurityGroup, dst.WorkerSecurityGroup) - restorev1alpha8SecurityGroupStatus(previous.BastionSecurityGroup, dst.BastionSecurityGroup) +func restorev1beta1ClusterStatus(previous *infrav1.OpenStackClusterStatus, dst *infrav1.OpenStackClusterStatus) { + restorev1beta1SecurityGroupStatus(previous.ControlPlaneSecurityGroup, dst.ControlPlaneSecurityGroup) + restorev1beta1SecurityGroupStatus(previous.WorkerSecurityGroup, dst.WorkerSecurityGroup) + restorev1beta1SecurityGroupStatus(previous.BastionSecurityGroup, dst.BastionSecurityGroup) // ReferencedResources have no equivalent in v1alpha7 if dst.Bastion != nil { @@ -126,18 +126,18 @@ func restorev1alpha8ClusterStatus(previous *infrav1.OpenStackClusterStatus, dst } } -var v1alpha8OpenStackClusterRestorer = conversion.RestorerFor[*infrav1.OpenStackCluster]{ +var v1beta1OpenStackClusterRestorer = conversion.RestorerFor[*infrav1.OpenStackCluster]{ "bastion": conversion.HashedFieldRestorer( func(c *infrav1.OpenStackCluster) **infrav1.Bastion { return &c.Spec.Bastion }, - restorev1alpha8Bastion, + restorev1beta1Bastion, ), "spec": conversion.HashedFieldRestorer( func(c *infrav1.OpenStackCluster) *infrav1.OpenStackClusterSpec { return &c.Spec }, - restorev1alpha8ClusterSpec, + restorev1beta1ClusterSpec, // Filter out Bastion, which is restored separately conversion.HashedFilterField[*infrav1.OpenStackCluster, infrav1.OpenStackClusterSpec]( @@ -156,14 +156,14 @@ var v1alpha8OpenStackClusterRestorer = conversion.RestorerFor[*infrav1.OpenStack func(c *infrav1.OpenStackCluster) *infrav1.OpenStackClusterStatus { return &c.Status }, - restorev1alpha8ClusterStatus, + restorev1beta1ClusterStatus, ), } func restorev1alpha7MachineSpec(previous *OpenStackMachineSpec, dst *OpenStackMachineSpec) { dst.FloatingIP = previous.FloatingIP - // Conversion to v1alpha8 truncates keys and values to 255 characters + // Conversion to v1beta1 truncates keys and values to 255 characters for k, v := range previous.ServerMetadata { kd := k if len(k) > 255 { @@ -182,14 +182,14 @@ func restorev1alpha7MachineSpec(previous *OpenStackMachineSpec, dst *OpenStackMa } } -func restorev1alpha8MachineSpec(previous *infrav1.OpenStackMachineSpec, dst *infrav1.OpenStackMachineSpec) { +func restorev1beta1MachineSpec(previous *infrav1.OpenStackMachineSpec, dst *infrav1.OpenStackMachineSpec) { dst.ServerGroup = previous.ServerGroup dst.Image = previous.Image } -func restorev1alpha8Bastion(previous **infrav1.Bastion, dst **infrav1.Bastion) { +func restorev1beta1Bastion(previous **infrav1.Bastion, dst **infrav1.Bastion) { if *previous != nil && *dst != nil { - restorev1alpha8MachineSpec(&(*previous).Instance, &(*dst).Instance) + restorev1beta1MachineSpec(&(*previous).Instance, &(*dst).Instance) } } @@ -212,11 +212,11 @@ func restorev1alpha7ClusterSpec(previous *OpenStackClusterSpec, dst *OpenStackCl } } -func restorev1alpha8ClusterSpec(previous *infrav1.OpenStackClusterSpec, dst *infrav1.OpenStackClusterSpec) { +func restorev1beta1ClusterSpec(previous *infrav1.OpenStackClusterSpec, dst *infrav1.OpenStackClusterSpec) { prevBastion := previous.Bastion dstBastion := dst.Bastion if prevBastion != nil && dstBastion != nil { - restorev1alpha8MachineSpec(&prevBastion.Instance, &dstBastion.Instance) + restorev1beta1MachineSpec(&prevBastion.Instance, &dstBastion.Instance) } // Restore all fields except ID, which should have been copied over in conversion @@ -246,8 +246,8 @@ func (r *OpenStackCluster) ConvertTo(dstRaw ctrlconversion.Hub) error { return conversion.ConvertAndRestore( r, dst, - Convert_v1alpha7_OpenStackCluster_To_v1alpha8_OpenStackCluster, Convert_v1alpha8_OpenStackCluster_To_v1alpha7_OpenStackCluster, - v1alpha7OpenStackClusterRestorer, v1alpha8OpenStackClusterRestorer, + Convert_v1alpha7_OpenStackCluster_To_v1beta1_OpenStackCluster, Convert_v1beta1_OpenStackCluster_To_v1alpha7_OpenStackCluster, + v1alpha7OpenStackClusterRestorer, v1beta1OpenStackClusterRestorer, ) } @@ -256,8 +256,8 @@ func (r *OpenStackCluster) ConvertFrom(srcRaw ctrlconversion.Hub) error { return conversion.ConvertAndRestore( src, r, - Convert_v1alpha8_OpenStackCluster_To_v1alpha7_OpenStackCluster, Convert_v1alpha7_OpenStackCluster_To_v1alpha8_OpenStackCluster, - v1alpha8OpenStackClusterRestorer, v1alpha7OpenStackClusterRestorer, + Convert_v1beta1_OpenStackCluster_To_v1alpha7_OpenStackCluster, Convert_v1alpha7_OpenStackCluster_To_v1beta1_OpenStackCluster, + v1beta1OpenStackClusterRestorer, v1alpha7OpenStackClusterRestorer, ) } @@ -266,13 +266,13 @@ var _ ctrlconversion.Convertible = &OpenStackClusterList{} func (r *OpenStackClusterList) ConvertTo(dstRaw ctrlconversion.Hub) error { dst := dstRaw.(*infrav1.OpenStackClusterList) - return Convert_v1alpha7_OpenStackClusterList_To_v1alpha8_OpenStackClusterList(r, dst, nil) + return Convert_v1alpha7_OpenStackClusterList_To_v1beta1_OpenStackClusterList(r, dst, nil) } func (r *OpenStackClusterList) ConvertFrom(srcRaw ctrlconversion.Hub) error { src := srcRaw.(*infrav1.OpenStackClusterList) - return Convert_v1alpha8_OpenStackClusterList_To_v1alpha7_OpenStackClusterList(src, r, nil) + return Convert_v1beta1_OpenStackClusterList_To_v1alpha7_OpenStackClusterList(src, r, nil) } var _ ctrlconversion.Convertible = &OpenStackClusterTemplate{} @@ -282,9 +282,9 @@ func restorev1alpha7ClusterTemplateSpec(previous *OpenStackClusterTemplateSpec, restorev1alpha7Bastion(&previous.Template.Spec.Bastion, &dst.Template.Spec.Bastion) } -func restorev1alpha8ClusterTemplateSpec(previous *infrav1.OpenStackClusterTemplateSpec, dst *infrav1.OpenStackClusterTemplateSpec) { - restorev1alpha8Bastion(&previous.Template.Spec.Bastion, &dst.Template.Spec.Bastion) - restorev1alpha8ClusterSpec(&previous.Template.Spec, &dst.Template.Spec) +func restorev1beta1ClusterTemplateSpec(previous *infrav1.OpenStackClusterTemplateSpec, dst *infrav1.OpenStackClusterTemplateSpec) { + restorev1beta1Bastion(&previous.Template.Spec.Bastion, &dst.Template.Spec.Bastion) + restorev1beta1ClusterSpec(&previous.Template.Spec, &dst.Template.Spec) } var v1alpha7OpenStackClusterTemplateRestorer = conversion.RestorerFor[*OpenStackClusterTemplate]{ @@ -296,12 +296,12 @@ var v1alpha7OpenStackClusterTemplateRestorer = conversion.RestorerFor[*OpenStack ), } -var v1alpha8OpenStackClusterTemplateRestorer = conversion.RestorerFor[*infrav1.OpenStackClusterTemplate]{ +var v1beta1OpenStackClusterTemplateRestorer = conversion.RestorerFor[*infrav1.OpenStackClusterTemplate]{ "spec": conversion.HashedFieldRestorer( func(c *infrav1.OpenStackClusterTemplate) *infrav1.OpenStackClusterTemplateSpec { return &c.Spec }, - restorev1alpha8ClusterTemplateSpec, + restorev1beta1ClusterTemplateSpec, ), } @@ -310,8 +310,8 @@ func (r *OpenStackClusterTemplate) ConvertTo(dstRaw ctrlconversion.Hub) error { return conversion.ConvertAndRestore( r, dst, - Convert_v1alpha7_OpenStackClusterTemplate_To_v1alpha8_OpenStackClusterTemplate, Convert_v1alpha8_OpenStackClusterTemplate_To_v1alpha7_OpenStackClusterTemplate, - v1alpha7OpenStackClusterTemplateRestorer, v1alpha8OpenStackClusterTemplateRestorer, + Convert_v1alpha7_OpenStackClusterTemplate_To_v1beta1_OpenStackClusterTemplate, Convert_v1beta1_OpenStackClusterTemplate_To_v1alpha7_OpenStackClusterTemplate, + v1alpha7OpenStackClusterTemplateRestorer, v1beta1OpenStackClusterTemplateRestorer, ) } @@ -320,8 +320,8 @@ func (r *OpenStackClusterTemplate) ConvertFrom(srcRaw ctrlconversion.Hub) error return conversion.ConvertAndRestore( src, r, - Convert_v1alpha8_OpenStackClusterTemplate_To_v1alpha7_OpenStackClusterTemplate, Convert_v1alpha7_OpenStackClusterTemplate_To_v1alpha8_OpenStackClusterTemplate, - v1alpha8OpenStackClusterTemplateRestorer, v1alpha7OpenStackClusterTemplateRestorer, + Convert_v1beta1_OpenStackClusterTemplate_To_v1alpha7_OpenStackClusterTemplate, Convert_v1alpha7_OpenStackClusterTemplate_To_v1beta1_OpenStackClusterTemplate, + v1beta1OpenStackClusterTemplateRestorer, v1alpha7OpenStackClusterTemplateRestorer, ) } @@ -336,12 +336,12 @@ var v1alpha7OpenStackMachineRestorer = conversion.RestorerFor[*OpenStackMachine] ), } -var v1alpha8OpenStackMachineRestorer = conversion.RestorerFor[*infrav1.OpenStackMachine]{ +var v1beta1OpenStackMachineRestorer = conversion.RestorerFor[*infrav1.OpenStackMachine]{ "spec": conversion.HashedFieldRestorer( func(c *infrav1.OpenStackMachine) *infrav1.OpenStackMachineSpec { return &c.Spec }, - restorev1alpha8MachineSpec, + restorev1beta1MachineSpec, ), // No equivalent in v1alpha7 @@ -357,8 +357,8 @@ func (r *OpenStackMachine) ConvertTo(dstRaw ctrlconversion.Hub) error { return conversion.ConvertAndRestore( r, dst, - Convert_v1alpha7_OpenStackMachine_To_v1alpha8_OpenStackMachine, Convert_v1alpha8_OpenStackMachine_To_v1alpha7_OpenStackMachine, - v1alpha7OpenStackMachineRestorer, v1alpha8OpenStackMachineRestorer, + Convert_v1alpha7_OpenStackMachine_To_v1beta1_OpenStackMachine, Convert_v1beta1_OpenStackMachine_To_v1alpha7_OpenStackMachine, + v1alpha7OpenStackMachineRestorer, v1beta1OpenStackMachineRestorer, ) } @@ -367,8 +367,8 @@ func (r *OpenStackMachine) ConvertFrom(srcRaw ctrlconversion.Hub) error { return conversion.ConvertAndRestore( src, r, - Convert_v1alpha8_OpenStackMachine_To_v1alpha7_OpenStackMachine, Convert_v1alpha7_OpenStackMachine_To_v1alpha8_OpenStackMachine, - v1alpha8OpenStackMachineRestorer, v1alpha7OpenStackMachineRestorer, + Convert_v1beta1_OpenStackMachine_To_v1alpha7_OpenStackMachine, Convert_v1alpha7_OpenStackMachine_To_v1beta1_OpenStackMachine, + v1beta1OpenStackMachineRestorer, v1alpha7OpenStackMachineRestorer, ) } @@ -376,12 +376,12 @@ var _ ctrlconversion.Convertible = &OpenStackMachineList{} func (r *OpenStackMachineList) ConvertTo(dstRaw ctrlconversion.Hub) error { dst := dstRaw.(*infrav1.OpenStackMachineList) - return Convert_v1alpha7_OpenStackMachineList_To_v1alpha8_OpenStackMachineList(r, dst, nil) + return Convert_v1alpha7_OpenStackMachineList_To_v1beta1_OpenStackMachineList(r, dst, nil) } func (r *OpenStackMachineList) ConvertFrom(srcRaw ctrlconversion.Hub) error { src := srcRaw.(*infrav1.OpenStackMachineList) - return Convert_v1alpha8_OpenStackMachineList_To_v1alpha7_OpenStackMachineList(src, r, nil) + return Convert_v1beta1_OpenStackMachineList_To_v1alpha7_OpenStackMachineList(src, r, nil) } var _ ctrlconversion.Convertible = &OpenStackMachineTemplate{} @@ -399,12 +399,12 @@ var v1alpha7OpenStackMachineTemplateRestorer = conversion.RestorerFor[*OpenStack ), } -var v1alpha8OpenStackMachineTemplateRestorer = conversion.RestorerFor[*infrav1.OpenStackMachineTemplate]{ +var v1beta1OpenStackMachineTemplateRestorer = conversion.RestorerFor[*infrav1.OpenStackMachineTemplate]{ "spec": conversion.HashedFieldRestorer( func(c *infrav1.OpenStackMachineTemplate) *infrav1.OpenStackMachineSpec { return &c.Spec.Template.Spec }, - restorev1alpha8MachineSpec, + restorev1beta1MachineSpec, ), } @@ -413,8 +413,8 @@ func (r *OpenStackMachineTemplate) ConvertTo(dstRaw ctrlconversion.Hub) error { return conversion.ConvertAndRestore( r, dst, - Convert_v1alpha7_OpenStackMachineTemplate_To_v1alpha8_OpenStackMachineTemplate, Convert_v1alpha8_OpenStackMachineTemplate_To_v1alpha7_OpenStackMachineTemplate, - v1alpha7OpenStackMachineTemplateRestorer, v1alpha8OpenStackMachineTemplateRestorer, + Convert_v1alpha7_OpenStackMachineTemplate_To_v1beta1_OpenStackMachineTemplate, Convert_v1beta1_OpenStackMachineTemplate_To_v1alpha7_OpenStackMachineTemplate, + v1alpha7OpenStackMachineTemplateRestorer, v1beta1OpenStackMachineTemplateRestorer, ) } @@ -423,8 +423,8 @@ func (r *OpenStackMachineTemplate) ConvertFrom(srcRaw ctrlconversion.Hub) error return conversion.ConvertAndRestore( src, r, - Convert_v1alpha8_OpenStackMachineTemplate_To_v1alpha7_OpenStackMachineTemplate, Convert_v1alpha7_OpenStackMachineTemplate_To_v1alpha8_OpenStackMachineTemplate, - v1alpha8OpenStackMachineTemplateRestorer, v1alpha7OpenStackMachineTemplateRestorer, + Convert_v1beta1_OpenStackMachineTemplate_To_v1alpha7_OpenStackMachineTemplate, Convert_v1alpha7_OpenStackMachineTemplate_To_v1beta1_OpenStackMachineTemplate, + v1beta1OpenStackMachineTemplateRestorer, v1alpha7OpenStackMachineTemplateRestorer, ) } @@ -432,16 +432,16 @@ var _ ctrlconversion.Convertible = &OpenStackMachineTemplateList{} func (r *OpenStackMachineTemplateList) ConvertTo(dstRaw ctrlconversion.Hub) error { dst := dstRaw.(*infrav1.OpenStackMachineTemplateList) - return Convert_v1alpha7_OpenStackMachineTemplateList_To_v1alpha8_OpenStackMachineTemplateList(r, dst, nil) + return Convert_v1alpha7_OpenStackMachineTemplateList_To_v1beta1_OpenStackMachineTemplateList(r, dst, nil) } func (r *OpenStackMachineTemplateList) ConvertFrom(srcRaw ctrlconversion.Hub) error { src := srcRaw.(*infrav1.OpenStackMachineTemplateList) - return Convert_v1alpha8_OpenStackMachineTemplateList_To_v1alpha7_OpenStackMachineTemplateList(src, r, nil) + return Convert_v1beta1_OpenStackMachineTemplateList_To_v1alpha7_OpenStackMachineTemplateList(src, r, nil) } -func Convert_v1alpha8_OpenStackMachineSpec_To_v1alpha7_OpenStackMachineSpec(in *infrav1.OpenStackMachineSpec, out *OpenStackMachineSpec, s apiconversion.Scope) error { - err := autoConvert_v1alpha8_OpenStackMachineSpec_To_v1alpha7_OpenStackMachineSpec(in, out, s) +func Convert_v1beta1_OpenStackMachineSpec_To_v1alpha7_OpenStackMachineSpec(in *infrav1.OpenStackMachineSpec, out *OpenStackMachineSpec, s apiconversion.Scope) error { + err := autoConvert_v1beta1_OpenStackMachineSpec_To_v1alpha7_OpenStackMachineSpec(in, out, s) if err != nil { return err } @@ -471,8 +471,8 @@ func Convert_v1alpha8_OpenStackMachineSpec_To_v1alpha7_OpenStackMachineSpec(in * return nil } -func Convert_v1alpha7_OpenStackMachineSpec_To_v1alpha8_OpenStackMachineSpec(in *OpenStackMachineSpec, out *infrav1.OpenStackMachineSpec, s apiconversion.Scope) error { - err := autoConvert_v1alpha7_OpenStackMachineSpec_To_v1alpha8_OpenStackMachineSpec(in, out, s) +func Convert_v1alpha7_OpenStackMachineSpec_To_v1beta1_OpenStackMachineSpec(in *OpenStackMachineSpec, out *infrav1.OpenStackMachineSpec, s apiconversion.Scope) error { + err := autoConvert_v1alpha7_OpenStackMachineSpec_To_v1beta1_OpenStackMachineSpec(in, out, s) if err != nil { return err } @@ -496,7 +496,7 @@ func Convert_v1alpha7_OpenStackMachineSpec_To_v1alpha8_OpenStackMachineSpec(in * serverMetadata := make([]infrav1.ServerMetadata, 0, len(in.ServerMetadata)) for k, v := range in.ServerMetadata { // Truncate key and value to 255 characters if required, as this - // was not validated prior to v1alpha8 + // was not validated prior to v1beta1 if len(k) > 255 { k = k[:255] } @@ -512,18 +512,18 @@ func Convert_v1alpha7_OpenStackMachineSpec_To_v1alpha8_OpenStackMachineSpec(in * return nil } -func Convert_v1alpha8_OpenStackMachineStatus_To_v1alpha7_OpenStackMachineStatus(in *infrav1.OpenStackMachineStatus, out *OpenStackMachineStatus, s apiconversion.Scope) error { +func Convert_v1beta1_OpenStackMachineStatus_To_v1alpha7_OpenStackMachineStatus(in *infrav1.OpenStackMachineStatus, out *OpenStackMachineStatus, s apiconversion.Scope) error { // ReferencedResources have no equivalent in v1alpha7 - return autoConvert_v1alpha8_OpenStackMachineStatus_To_v1alpha7_OpenStackMachineStatus(in, out, s) + return autoConvert_v1beta1_OpenStackMachineStatus_To_v1alpha7_OpenStackMachineStatus(in, out, s) } -func Convert_v1alpha8_BastionStatus_To_v1alpha7_BastionStatus(in *infrav1.BastionStatus, out *BastionStatus, s apiconversion.Scope) error { +func Convert_v1beta1_BastionStatus_To_v1alpha7_BastionStatus(in *infrav1.BastionStatus, out *BastionStatus, s apiconversion.Scope) error { // ReferencedResources have no equivalent in v1alpha7 - return autoConvert_v1alpha8_BastionStatus_To_v1alpha7_BastionStatus(in, out, s) + return autoConvert_v1beta1_BastionStatus_To_v1alpha7_BastionStatus(in, out, s) } -func Convert_v1alpha7_Bastion_To_v1alpha8_Bastion(in *Bastion, out *infrav1.Bastion, s apiconversion.Scope) error { - err := autoConvert_v1alpha7_Bastion_To_v1alpha8_Bastion(in, out, s) +func Convert_v1alpha7_Bastion_To_v1beta1_Bastion(in *Bastion, out *infrav1.Bastion, s apiconversion.Scope) error { + err := autoConvert_v1alpha7_Bastion_To_v1beta1_Bastion(in, out, s) if err != nil { return err } @@ -538,8 +538,8 @@ func Convert_v1alpha7_Bastion_To_v1alpha8_Bastion(in *Bastion, out *infrav1.Bast return nil } -func Convert_v1alpha8_Bastion_To_v1alpha7_Bastion(in *infrav1.Bastion, out *Bastion, s apiconversion.Scope) error { - err := autoConvert_v1alpha8_Bastion_To_v1alpha7_Bastion(in, out, s) +func Convert_v1beta1_Bastion_To_v1alpha7_Bastion(in *infrav1.Bastion, out *Bastion, s apiconversion.Scope) error { + err := autoConvert_v1beta1_Bastion_To_v1alpha7_Bastion(in, out, s) if err != nil { return err } @@ -552,8 +552,8 @@ func Convert_v1alpha8_Bastion_To_v1alpha7_Bastion(in *infrav1.Bastion, out *Bast return nil } -func Convert_v1alpha7_OpenStackClusterSpec_To_v1alpha8_OpenStackClusterSpec(in *OpenStackClusterSpec, out *infrav1.OpenStackClusterSpec, s apiconversion.Scope) error { - err := autoConvert_v1alpha7_OpenStackClusterSpec_To_v1alpha8_OpenStackClusterSpec(in, out, s) +func Convert_v1alpha7_OpenStackClusterSpec_To_v1beta1_OpenStackClusterSpec(in *OpenStackClusterSpec, out *infrav1.OpenStackClusterSpec, s apiconversion.Scope) error { + err := autoConvert_v1alpha7_OpenStackClusterSpec_To_v1beta1_OpenStackClusterSpec(in, out, s) if err != nil { return err } @@ -567,7 +567,7 @@ func Convert_v1alpha7_OpenStackClusterSpec_To_v1alpha8_OpenStackClusterSpec(in * emptySubnet := SubnetFilter{} if in.Subnet != emptySubnet { subnet := infrav1.SubnetFilter{} - if err := Convert_v1alpha7_SubnetFilter_To_v1alpha8_SubnetFilter(&in.Subnet, &subnet, s); err != nil { + if err := Convert_v1alpha7_SubnetFilter_To_v1beta1_SubnetFilter(&in.Subnet, &subnet, s); err != nil { return err } out.Subnets = []infrav1.SubnetFilter{subnet} @@ -595,8 +595,8 @@ func Convert_v1alpha7_OpenStackClusterSpec_To_v1alpha8_OpenStackClusterSpec(in * return nil } -func Convert_v1alpha8_OpenStackClusterSpec_To_v1alpha7_OpenStackClusterSpec(in *infrav1.OpenStackClusterSpec, out *OpenStackClusterSpec, s apiconversion.Scope) error { - err := autoConvert_v1alpha8_OpenStackClusterSpec_To_v1alpha7_OpenStackClusterSpec(in, out, s) +func Convert_v1beta1_OpenStackClusterSpec_To_v1alpha7_OpenStackClusterSpec(in *infrav1.OpenStackClusterSpec, out *OpenStackClusterSpec, s apiconversion.Scope) error { + err := autoConvert_v1beta1_OpenStackClusterSpec_To_v1alpha7_OpenStackClusterSpec(in, out, s) if err != nil { return err } @@ -606,7 +606,7 @@ func Convert_v1alpha8_OpenStackClusterSpec_To_v1alpha7_OpenStackClusterSpec(in * } if len(in.Subnets) >= 1 { - if err := Convert_v1alpha8_SubnetFilter_To_v1alpha7_SubnetFilter(&in.Subnets[0], &out.Subnet, s); err != nil { + if err := Convert_v1beta1_SubnetFilter_To_v1alpha7_SubnetFilter(&in.Subnets[0], &out.Subnet, s); err != nil { return err } } @@ -624,7 +624,7 @@ func Convert_v1alpha8_OpenStackClusterSpec_To_v1alpha7_OpenStackClusterSpec(in * return nil } -func Convert_v1alpha8_SecurityGroupStatus_To_v1alpha7_SecurityGroup(in *infrav1.SecurityGroupStatus, out *SecurityGroup, s apiconversion.Scope) error { //nolint:revive +func Convert_v1beta1_SecurityGroupStatus_To_v1alpha7_SecurityGroup(in *infrav1.SecurityGroupStatus, out *SecurityGroup, s apiconversion.Scope) error { //nolint:revive out.ID = in.ID out.Name = in.Name out.Rules = make([]SecurityGroupRule, len(in.Rules)) @@ -658,7 +658,7 @@ func Convert_v1alpha8_SecurityGroupStatus_To_v1alpha7_SecurityGroup(in *infrav1. return nil } -func Convert_v1alpha7_SecurityGroup_To_v1alpha8_SecurityGroupStatus(in *SecurityGroup, out *infrav1.SecurityGroupStatus, s apiconversion.Scope) error { //nolint:revive +func Convert_v1alpha7_SecurityGroup_To_v1beta1_SecurityGroupStatus(in *SecurityGroup, out *infrav1.SecurityGroupStatus, s apiconversion.Scope) error { //nolint:revive out.ID = in.ID out.Name = in.Name out.Rules = make([]infrav1.SecurityGroupRuleStatus, len(in.Rules)) diff --git a/api/v1alpha7/conversion_test.go b/api/v1alpha7/conversion_test.go index f3c2338e70..d17177de46 100644 --- a/api/v1alpha7/conversion_test.go +++ b/api/v1alpha7/conversion_test.go @@ -29,7 +29,7 @@ import ( utilconversion "sigs.k8s.io/cluster-api/util/conversion" "sigs.k8s.io/controller-runtime/pkg/conversion" - infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha8" + infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1" testhelpers "sigs.k8s.io/cluster-api-provider-openstack/test/helpers" ) @@ -270,7 +270,7 @@ func TestMachineConversionControllerSpecFields(t *testing.T) { } } -func TestConvert_v1alpha7_OpenStackClusterSpec_To_v1alpha8_OpenStackClusterSpec(t *testing.T) { +func TestConvert_v1alpha7_OpenStackClusterSpec_To_v1beta1_OpenStackClusterSpec(t *testing.T) { tests := []struct { name string in *OpenStackClusterSpec @@ -311,7 +311,7 @@ func TestConvert_v1alpha7_OpenStackClusterSpec_To_v1alpha8_OpenStackClusterSpec( t.Run(tt.name, func(t *testing.T) { g := gomega.NewWithT(t) out := &infrav1.OpenStackClusterSpec{} - err := Convert_v1alpha7_OpenStackClusterSpec_To_v1alpha8_OpenStackClusterSpec(tt.in, out, nil) + err := Convert_v1alpha7_OpenStackClusterSpec_To_v1beta1_OpenStackClusterSpec(tt.in, out, nil) g.Expect(err).NotTo(gomega.HaveOccurred()) g.Expect(out).To(gomega.Equal(tt.expectedOut)) }) diff --git a/api/v1alpha7/doc.go b/api/v1alpha7/doc.go index 91f912911d..84a3ca41b1 100644 --- a/api/v1alpha7/doc.go +++ b/api/v1alpha7/doc.go @@ -14,5 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// +k8s:conversion-gen=sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha8 +// +k8s:conversion-gen=sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1 package v1alpha7 diff --git a/api/v1alpha7/zz_generated.conversion.go b/api/v1alpha7/zz_generated.conversion.go index c29aaf334f..c1413f24d4 100644 --- a/api/v1alpha7/zz_generated.conversion.go +++ b/api/v1alpha7/zz_generated.conversion.go @@ -27,8 +27,8 @@ import ( v1 "k8s.io/api/core/v1" conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" - v1alpha8 "sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha8" - v1beta1 "sigs.k8s.io/cluster-api/api/v1beta1" + v1beta1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1" + apiv1beta1 "sigs.k8s.io/cluster-api/api/v1beta1" errors "sigs.k8s.io/cluster-api/errors" ) @@ -39,410 +39,410 @@ func init() { // RegisterConversions adds conversion functions to the given scheme. // Public to allow building arbitrary schemes. func RegisterConversions(s *runtime.Scheme) error { - if err := s.AddGeneratedConversionFunc((*APIServerLoadBalancer)(nil), (*v1alpha8.APIServerLoadBalancer)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha7_APIServerLoadBalancer_To_v1alpha8_APIServerLoadBalancer(a.(*APIServerLoadBalancer), b.(*v1alpha8.APIServerLoadBalancer), scope) + if err := s.AddGeneratedConversionFunc((*APIServerLoadBalancer)(nil), (*v1beta1.APIServerLoadBalancer)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha7_APIServerLoadBalancer_To_v1beta1_APIServerLoadBalancer(a.(*APIServerLoadBalancer), b.(*v1beta1.APIServerLoadBalancer), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1alpha8.APIServerLoadBalancer)(nil), (*APIServerLoadBalancer)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_APIServerLoadBalancer_To_v1alpha7_APIServerLoadBalancer(a.(*v1alpha8.APIServerLoadBalancer), b.(*APIServerLoadBalancer), scope) + if err := s.AddGeneratedConversionFunc((*v1beta1.APIServerLoadBalancer)(nil), (*APIServerLoadBalancer)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_APIServerLoadBalancer_To_v1alpha7_APIServerLoadBalancer(a.(*v1beta1.APIServerLoadBalancer), b.(*APIServerLoadBalancer), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*AdditionalBlockDevice)(nil), (*v1alpha8.AdditionalBlockDevice)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha7_AdditionalBlockDevice_To_v1alpha8_AdditionalBlockDevice(a.(*AdditionalBlockDevice), b.(*v1alpha8.AdditionalBlockDevice), scope) + if err := s.AddGeneratedConversionFunc((*AdditionalBlockDevice)(nil), (*v1beta1.AdditionalBlockDevice)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha7_AdditionalBlockDevice_To_v1beta1_AdditionalBlockDevice(a.(*AdditionalBlockDevice), b.(*v1beta1.AdditionalBlockDevice), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1alpha8.AdditionalBlockDevice)(nil), (*AdditionalBlockDevice)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_AdditionalBlockDevice_To_v1alpha7_AdditionalBlockDevice(a.(*v1alpha8.AdditionalBlockDevice), b.(*AdditionalBlockDevice), scope) + if err := s.AddGeneratedConversionFunc((*v1beta1.AdditionalBlockDevice)(nil), (*AdditionalBlockDevice)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_AdditionalBlockDevice_To_v1alpha7_AdditionalBlockDevice(a.(*v1beta1.AdditionalBlockDevice), b.(*AdditionalBlockDevice), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*AddressPair)(nil), (*v1alpha8.AddressPair)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha7_AddressPair_To_v1alpha8_AddressPair(a.(*AddressPair), b.(*v1alpha8.AddressPair), scope) + if err := s.AddGeneratedConversionFunc((*AddressPair)(nil), (*v1beta1.AddressPair)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha7_AddressPair_To_v1beta1_AddressPair(a.(*AddressPair), b.(*v1beta1.AddressPair), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1alpha8.AddressPair)(nil), (*AddressPair)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_AddressPair_To_v1alpha7_AddressPair(a.(*v1alpha8.AddressPair), b.(*AddressPair), scope) + if err := s.AddGeneratedConversionFunc((*v1beta1.AddressPair)(nil), (*AddressPair)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_AddressPair_To_v1alpha7_AddressPair(a.(*v1beta1.AddressPair), b.(*AddressPair), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*BastionStatus)(nil), (*v1alpha8.BastionStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha7_BastionStatus_To_v1alpha8_BastionStatus(a.(*BastionStatus), b.(*v1alpha8.BastionStatus), scope) + if err := s.AddGeneratedConversionFunc((*BastionStatus)(nil), (*v1beta1.BastionStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha7_BastionStatus_To_v1beta1_BastionStatus(a.(*BastionStatus), b.(*v1beta1.BastionStatus), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*BindingProfile)(nil), (*v1alpha8.BindingProfile)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha7_BindingProfile_To_v1alpha8_BindingProfile(a.(*BindingProfile), b.(*v1alpha8.BindingProfile), scope) + if err := s.AddGeneratedConversionFunc((*BindingProfile)(nil), (*v1beta1.BindingProfile)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha7_BindingProfile_To_v1beta1_BindingProfile(a.(*BindingProfile), b.(*v1beta1.BindingProfile), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1alpha8.BindingProfile)(nil), (*BindingProfile)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_BindingProfile_To_v1alpha7_BindingProfile(a.(*v1alpha8.BindingProfile), b.(*BindingProfile), scope) + if err := s.AddGeneratedConversionFunc((*v1beta1.BindingProfile)(nil), (*BindingProfile)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_BindingProfile_To_v1alpha7_BindingProfile(a.(*v1beta1.BindingProfile), b.(*BindingProfile), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*BlockDeviceStorage)(nil), (*v1alpha8.BlockDeviceStorage)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha7_BlockDeviceStorage_To_v1alpha8_BlockDeviceStorage(a.(*BlockDeviceStorage), b.(*v1alpha8.BlockDeviceStorage), scope) + if err := s.AddGeneratedConversionFunc((*BlockDeviceStorage)(nil), (*v1beta1.BlockDeviceStorage)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha7_BlockDeviceStorage_To_v1beta1_BlockDeviceStorage(a.(*BlockDeviceStorage), b.(*v1beta1.BlockDeviceStorage), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1alpha8.BlockDeviceStorage)(nil), (*BlockDeviceStorage)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_BlockDeviceStorage_To_v1alpha7_BlockDeviceStorage(a.(*v1alpha8.BlockDeviceStorage), b.(*BlockDeviceStorage), scope) + if err := s.AddGeneratedConversionFunc((*v1beta1.BlockDeviceStorage)(nil), (*BlockDeviceStorage)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_BlockDeviceStorage_To_v1alpha7_BlockDeviceStorage(a.(*v1beta1.BlockDeviceStorage), b.(*BlockDeviceStorage), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*BlockDeviceVolume)(nil), (*v1alpha8.BlockDeviceVolume)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha7_BlockDeviceVolume_To_v1alpha8_BlockDeviceVolume(a.(*BlockDeviceVolume), b.(*v1alpha8.BlockDeviceVolume), scope) + if err := s.AddGeneratedConversionFunc((*BlockDeviceVolume)(nil), (*v1beta1.BlockDeviceVolume)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha7_BlockDeviceVolume_To_v1beta1_BlockDeviceVolume(a.(*BlockDeviceVolume), b.(*v1beta1.BlockDeviceVolume), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1alpha8.BlockDeviceVolume)(nil), (*BlockDeviceVolume)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_BlockDeviceVolume_To_v1alpha7_BlockDeviceVolume(a.(*v1alpha8.BlockDeviceVolume), b.(*BlockDeviceVolume), scope) + if err := s.AddGeneratedConversionFunc((*v1beta1.BlockDeviceVolume)(nil), (*BlockDeviceVolume)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_BlockDeviceVolume_To_v1alpha7_BlockDeviceVolume(a.(*v1beta1.BlockDeviceVolume), b.(*BlockDeviceVolume), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*ExternalRouterIPParam)(nil), (*v1alpha8.ExternalRouterIPParam)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha7_ExternalRouterIPParam_To_v1alpha8_ExternalRouterIPParam(a.(*ExternalRouterIPParam), b.(*v1alpha8.ExternalRouterIPParam), scope) + if err := s.AddGeneratedConversionFunc((*ExternalRouterIPParam)(nil), (*v1beta1.ExternalRouterIPParam)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha7_ExternalRouterIPParam_To_v1beta1_ExternalRouterIPParam(a.(*ExternalRouterIPParam), b.(*v1beta1.ExternalRouterIPParam), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1alpha8.ExternalRouterIPParam)(nil), (*ExternalRouterIPParam)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_ExternalRouterIPParam_To_v1alpha7_ExternalRouterIPParam(a.(*v1alpha8.ExternalRouterIPParam), b.(*ExternalRouterIPParam), scope) + if err := s.AddGeneratedConversionFunc((*v1beta1.ExternalRouterIPParam)(nil), (*ExternalRouterIPParam)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_ExternalRouterIPParam_To_v1alpha7_ExternalRouterIPParam(a.(*v1beta1.ExternalRouterIPParam), b.(*ExternalRouterIPParam), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*FixedIP)(nil), (*v1alpha8.FixedIP)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha7_FixedIP_To_v1alpha8_FixedIP(a.(*FixedIP), b.(*v1alpha8.FixedIP), scope) + if err := s.AddGeneratedConversionFunc((*FixedIP)(nil), (*v1beta1.FixedIP)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha7_FixedIP_To_v1beta1_FixedIP(a.(*FixedIP), b.(*v1beta1.FixedIP), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1alpha8.FixedIP)(nil), (*FixedIP)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_FixedIP_To_v1alpha7_FixedIP(a.(*v1alpha8.FixedIP), b.(*FixedIP), scope) + if err := s.AddGeneratedConversionFunc((*v1beta1.FixedIP)(nil), (*FixedIP)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_FixedIP_To_v1alpha7_FixedIP(a.(*v1beta1.FixedIP), b.(*FixedIP), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*LoadBalancer)(nil), (*v1alpha8.LoadBalancer)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha7_LoadBalancer_To_v1alpha8_LoadBalancer(a.(*LoadBalancer), b.(*v1alpha8.LoadBalancer), scope) + if err := s.AddGeneratedConversionFunc((*LoadBalancer)(nil), (*v1beta1.LoadBalancer)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha7_LoadBalancer_To_v1beta1_LoadBalancer(a.(*LoadBalancer), b.(*v1beta1.LoadBalancer), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1alpha8.LoadBalancer)(nil), (*LoadBalancer)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_LoadBalancer_To_v1alpha7_LoadBalancer(a.(*v1alpha8.LoadBalancer), b.(*LoadBalancer), scope) + if err := s.AddGeneratedConversionFunc((*v1beta1.LoadBalancer)(nil), (*LoadBalancer)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_LoadBalancer_To_v1alpha7_LoadBalancer(a.(*v1beta1.LoadBalancer), b.(*LoadBalancer), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*NetworkFilter)(nil), (*v1alpha8.NetworkFilter)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha7_NetworkFilter_To_v1alpha8_NetworkFilter(a.(*NetworkFilter), b.(*v1alpha8.NetworkFilter), scope) + if err := s.AddGeneratedConversionFunc((*NetworkFilter)(nil), (*v1beta1.NetworkFilter)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha7_NetworkFilter_To_v1beta1_NetworkFilter(a.(*NetworkFilter), b.(*v1beta1.NetworkFilter), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1alpha8.NetworkFilter)(nil), (*NetworkFilter)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_NetworkFilter_To_v1alpha7_NetworkFilter(a.(*v1alpha8.NetworkFilter), b.(*NetworkFilter), scope) + if err := s.AddGeneratedConversionFunc((*v1beta1.NetworkFilter)(nil), (*NetworkFilter)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_NetworkFilter_To_v1alpha7_NetworkFilter(a.(*v1beta1.NetworkFilter), b.(*NetworkFilter), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*NetworkStatus)(nil), (*v1alpha8.NetworkStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha7_NetworkStatus_To_v1alpha8_NetworkStatus(a.(*NetworkStatus), b.(*v1alpha8.NetworkStatus), scope) + if err := s.AddGeneratedConversionFunc((*NetworkStatus)(nil), (*v1beta1.NetworkStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha7_NetworkStatus_To_v1beta1_NetworkStatus(a.(*NetworkStatus), b.(*v1beta1.NetworkStatus), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1alpha8.NetworkStatus)(nil), (*NetworkStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_NetworkStatus_To_v1alpha7_NetworkStatus(a.(*v1alpha8.NetworkStatus), b.(*NetworkStatus), scope) + if err := s.AddGeneratedConversionFunc((*v1beta1.NetworkStatus)(nil), (*NetworkStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_NetworkStatus_To_v1alpha7_NetworkStatus(a.(*v1beta1.NetworkStatus), b.(*NetworkStatus), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*NetworkStatusWithSubnets)(nil), (*v1alpha8.NetworkStatusWithSubnets)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha7_NetworkStatusWithSubnets_To_v1alpha8_NetworkStatusWithSubnets(a.(*NetworkStatusWithSubnets), b.(*v1alpha8.NetworkStatusWithSubnets), scope) + if err := s.AddGeneratedConversionFunc((*NetworkStatusWithSubnets)(nil), (*v1beta1.NetworkStatusWithSubnets)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha7_NetworkStatusWithSubnets_To_v1beta1_NetworkStatusWithSubnets(a.(*NetworkStatusWithSubnets), b.(*v1beta1.NetworkStatusWithSubnets), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1alpha8.NetworkStatusWithSubnets)(nil), (*NetworkStatusWithSubnets)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_NetworkStatusWithSubnets_To_v1alpha7_NetworkStatusWithSubnets(a.(*v1alpha8.NetworkStatusWithSubnets), b.(*NetworkStatusWithSubnets), scope) + if err := s.AddGeneratedConversionFunc((*v1beta1.NetworkStatusWithSubnets)(nil), (*NetworkStatusWithSubnets)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_NetworkStatusWithSubnets_To_v1alpha7_NetworkStatusWithSubnets(a.(*v1beta1.NetworkStatusWithSubnets), b.(*NetworkStatusWithSubnets), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*OpenStackCluster)(nil), (*v1alpha8.OpenStackCluster)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha7_OpenStackCluster_To_v1alpha8_OpenStackCluster(a.(*OpenStackCluster), b.(*v1alpha8.OpenStackCluster), scope) + if err := s.AddGeneratedConversionFunc((*OpenStackCluster)(nil), (*v1beta1.OpenStackCluster)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha7_OpenStackCluster_To_v1beta1_OpenStackCluster(a.(*OpenStackCluster), b.(*v1beta1.OpenStackCluster), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1alpha8.OpenStackCluster)(nil), (*OpenStackCluster)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_OpenStackCluster_To_v1alpha7_OpenStackCluster(a.(*v1alpha8.OpenStackCluster), b.(*OpenStackCluster), scope) + if err := s.AddGeneratedConversionFunc((*v1beta1.OpenStackCluster)(nil), (*OpenStackCluster)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_OpenStackCluster_To_v1alpha7_OpenStackCluster(a.(*v1beta1.OpenStackCluster), b.(*OpenStackCluster), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*OpenStackClusterList)(nil), (*v1alpha8.OpenStackClusterList)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha7_OpenStackClusterList_To_v1alpha8_OpenStackClusterList(a.(*OpenStackClusterList), b.(*v1alpha8.OpenStackClusterList), scope) + if err := s.AddGeneratedConversionFunc((*OpenStackClusterList)(nil), (*v1beta1.OpenStackClusterList)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha7_OpenStackClusterList_To_v1beta1_OpenStackClusterList(a.(*OpenStackClusterList), b.(*v1beta1.OpenStackClusterList), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1alpha8.OpenStackClusterList)(nil), (*OpenStackClusterList)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_OpenStackClusterList_To_v1alpha7_OpenStackClusterList(a.(*v1alpha8.OpenStackClusterList), b.(*OpenStackClusterList), scope) + if err := s.AddGeneratedConversionFunc((*v1beta1.OpenStackClusterList)(nil), (*OpenStackClusterList)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_OpenStackClusterList_To_v1alpha7_OpenStackClusterList(a.(*v1beta1.OpenStackClusterList), b.(*OpenStackClusterList), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*OpenStackClusterStatus)(nil), (*v1alpha8.OpenStackClusterStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha7_OpenStackClusterStatus_To_v1alpha8_OpenStackClusterStatus(a.(*OpenStackClusterStatus), b.(*v1alpha8.OpenStackClusterStatus), scope) + if err := s.AddGeneratedConversionFunc((*OpenStackClusterStatus)(nil), (*v1beta1.OpenStackClusterStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha7_OpenStackClusterStatus_To_v1beta1_OpenStackClusterStatus(a.(*OpenStackClusterStatus), b.(*v1beta1.OpenStackClusterStatus), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1alpha8.OpenStackClusterStatus)(nil), (*OpenStackClusterStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_OpenStackClusterStatus_To_v1alpha7_OpenStackClusterStatus(a.(*v1alpha8.OpenStackClusterStatus), b.(*OpenStackClusterStatus), scope) + if err := s.AddGeneratedConversionFunc((*v1beta1.OpenStackClusterStatus)(nil), (*OpenStackClusterStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_OpenStackClusterStatus_To_v1alpha7_OpenStackClusterStatus(a.(*v1beta1.OpenStackClusterStatus), b.(*OpenStackClusterStatus), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*OpenStackClusterTemplate)(nil), (*v1alpha8.OpenStackClusterTemplate)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha7_OpenStackClusterTemplate_To_v1alpha8_OpenStackClusterTemplate(a.(*OpenStackClusterTemplate), b.(*v1alpha8.OpenStackClusterTemplate), scope) + if err := s.AddGeneratedConversionFunc((*OpenStackClusterTemplate)(nil), (*v1beta1.OpenStackClusterTemplate)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha7_OpenStackClusterTemplate_To_v1beta1_OpenStackClusterTemplate(a.(*OpenStackClusterTemplate), b.(*v1beta1.OpenStackClusterTemplate), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1alpha8.OpenStackClusterTemplate)(nil), (*OpenStackClusterTemplate)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_OpenStackClusterTemplate_To_v1alpha7_OpenStackClusterTemplate(a.(*v1alpha8.OpenStackClusterTemplate), b.(*OpenStackClusterTemplate), scope) + if err := s.AddGeneratedConversionFunc((*v1beta1.OpenStackClusterTemplate)(nil), (*OpenStackClusterTemplate)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_OpenStackClusterTemplate_To_v1alpha7_OpenStackClusterTemplate(a.(*v1beta1.OpenStackClusterTemplate), b.(*OpenStackClusterTemplate), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*OpenStackClusterTemplateList)(nil), (*v1alpha8.OpenStackClusterTemplateList)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha7_OpenStackClusterTemplateList_To_v1alpha8_OpenStackClusterTemplateList(a.(*OpenStackClusterTemplateList), b.(*v1alpha8.OpenStackClusterTemplateList), scope) + if err := s.AddGeneratedConversionFunc((*OpenStackClusterTemplateList)(nil), (*v1beta1.OpenStackClusterTemplateList)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha7_OpenStackClusterTemplateList_To_v1beta1_OpenStackClusterTemplateList(a.(*OpenStackClusterTemplateList), b.(*v1beta1.OpenStackClusterTemplateList), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1alpha8.OpenStackClusterTemplateList)(nil), (*OpenStackClusterTemplateList)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_OpenStackClusterTemplateList_To_v1alpha7_OpenStackClusterTemplateList(a.(*v1alpha8.OpenStackClusterTemplateList), b.(*OpenStackClusterTemplateList), scope) + if err := s.AddGeneratedConversionFunc((*v1beta1.OpenStackClusterTemplateList)(nil), (*OpenStackClusterTemplateList)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_OpenStackClusterTemplateList_To_v1alpha7_OpenStackClusterTemplateList(a.(*v1beta1.OpenStackClusterTemplateList), b.(*OpenStackClusterTemplateList), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*OpenStackClusterTemplateResource)(nil), (*v1alpha8.OpenStackClusterTemplateResource)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha7_OpenStackClusterTemplateResource_To_v1alpha8_OpenStackClusterTemplateResource(a.(*OpenStackClusterTemplateResource), b.(*v1alpha8.OpenStackClusterTemplateResource), scope) + if err := s.AddGeneratedConversionFunc((*OpenStackClusterTemplateResource)(nil), (*v1beta1.OpenStackClusterTemplateResource)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha7_OpenStackClusterTemplateResource_To_v1beta1_OpenStackClusterTemplateResource(a.(*OpenStackClusterTemplateResource), b.(*v1beta1.OpenStackClusterTemplateResource), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1alpha8.OpenStackClusterTemplateResource)(nil), (*OpenStackClusterTemplateResource)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_OpenStackClusterTemplateResource_To_v1alpha7_OpenStackClusterTemplateResource(a.(*v1alpha8.OpenStackClusterTemplateResource), b.(*OpenStackClusterTemplateResource), scope) + if err := s.AddGeneratedConversionFunc((*v1beta1.OpenStackClusterTemplateResource)(nil), (*OpenStackClusterTemplateResource)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_OpenStackClusterTemplateResource_To_v1alpha7_OpenStackClusterTemplateResource(a.(*v1beta1.OpenStackClusterTemplateResource), b.(*OpenStackClusterTemplateResource), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*OpenStackClusterTemplateSpec)(nil), (*v1alpha8.OpenStackClusterTemplateSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha7_OpenStackClusterTemplateSpec_To_v1alpha8_OpenStackClusterTemplateSpec(a.(*OpenStackClusterTemplateSpec), b.(*v1alpha8.OpenStackClusterTemplateSpec), scope) + if err := s.AddGeneratedConversionFunc((*OpenStackClusterTemplateSpec)(nil), (*v1beta1.OpenStackClusterTemplateSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha7_OpenStackClusterTemplateSpec_To_v1beta1_OpenStackClusterTemplateSpec(a.(*OpenStackClusterTemplateSpec), b.(*v1beta1.OpenStackClusterTemplateSpec), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1alpha8.OpenStackClusterTemplateSpec)(nil), (*OpenStackClusterTemplateSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_OpenStackClusterTemplateSpec_To_v1alpha7_OpenStackClusterTemplateSpec(a.(*v1alpha8.OpenStackClusterTemplateSpec), b.(*OpenStackClusterTemplateSpec), scope) + if err := s.AddGeneratedConversionFunc((*v1beta1.OpenStackClusterTemplateSpec)(nil), (*OpenStackClusterTemplateSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_OpenStackClusterTemplateSpec_To_v1alpha7_OpenStackClusterTemplateSpec(a.(*v1beta1.OpenStackClusterTemplateSpec), b.(*OpenStackClusterTemplateSpec), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*OpenStackIdentityReference)(nil), (*v1alpha8.OpenStackIdentityReference)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha7_OpenStackIdentityReference_To_v1alpha8_OpenStackIdentityReference(a.(*OpenStackIdentityReference), b.(*v1alpha8.OpenStackIdentityReference), scope) + if err := s.AddGeneratedConversionFunc((*OpenStackIdentityReference)(nil), (*v1beta1.OpenStackIdentityReference)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha7_OpenStackIdentityReference_To_v1beta1_OpenStackIdentityReference(a.(*OpenStackIdentityReference), b.(*v1beta1.OpenStackIdentityReference), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1alpha8.OpenStackIdentityReference)(nil), (*OpenStackIdentityReference)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_OpenStackIdentityReference_To_v1alpha7_OpenStackIdentityReference(a.(*v1alpha8.OpenStackIdentityReference), b.(*OpenStackIdentityReference), scope) + if err := s.AddGeneratedConversionFunc((*v1beta1.OpenStackIdentityReference)(nil), (*OpenStackIdentityReference)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_OpenStackIdentityReference_To_v1alpha7_OpenStackIdentityReference(a.(*v1beta1.OpenStackIdentityReference), b.(*OpenStackIdentityReference), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*OpenStackMachine)(nil), (*v1alpha8.OpenStackMachine)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha7_OpenStackMachine_To_v1alpha8_OpenStackMachine(a.(*OpenStackMachine), b.(*v1alpha8.OpenStackMachine), scope) + if err := s.AddGeneratedConversionFunc((*OpenStackMachine)(nil), (*v1beta1.OpenStackMachine)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha7_OpenStackMachine_To_v1beta1_OpenStackMachine(a.(*OpenStackMachine), b.(*v1beta1.OpenStackMachine), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1alpha8.OpenStackMachine)(nil), (*OpenStackMachine)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_OpenStackMachine_To_v1alpha7_OpenStackMachine(a.(*v1alpha8.OpenStackMachine), b.(*OpenStackMachine), scope) + if err := s.AddGeneratedConversionFunc((*v1beta1.OpenStackMachine)(nil), (*OpenStackMachine)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_OpenStackMachine_To_v1alpha7_OpenStackMachine(a.(*v1beta1.OpenStackMachine), b.(*OpenStackMachine), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*OpenStackMachineList)(nil), (*v1alpha8.OpenStackMachineList)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha7_OpenStackMachineList_To_v1alpha8_OpenStackMachineList(a.(*OpenStackMachineList), b.(*v1alpha8.OpenStackMachineList), scope) + if err := s.AddGeneratedConversionFunc((*OpenStackMachineList)(nil), (*v1beta1.OpenStackMachineList)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha7_OpenStackMachineList_To_v1beta1_OpenStackMachineList(a.(*OpenStackMachineList), b.(*v1beta1.OpenStackMachineList), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1alpha8.OpenStackMachineList)(nil), (*OpenStackMachineList)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_OpenStackMachineList_To_v1alpha7_OpenStackMachineList(a.(*v1alpha8.OpenStackMachineList), b.(*OpenStackMachineList), scope) + if err := s.AddGeneratedConversionFunc((*v1beta1.OpenStackMachineList)(nil), (*OpenStackMachineList)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_OpenStackMachineList_To_v1alpha7_OpenStackMachineList(a.(*v1beta1.OpenStackMachineList), b.(*OpenStackMachineList), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*OpenStackMachineStatus)(nil), (*v1alpha8.OpenStackMachineStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha7_OpenStackMachineStatus_To_v1alpha8_OpenStackMachineStatus(a.(*OpenStackMachineStatus), b.(*v1alpha8.OpenStackMachineStatus), scope) + if err := s.AddGeneratedConversionFunc((*OpenStackMachineStatus)(nil), (*v1beta1.OpenStackMachineStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha7_OpenStackMachineStatus_To_v1beta1_OpenStackMachineStatus(a.(*OpenStackMachineStatus), b.(*v1beta1.OpenStackMachineStatus), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*OpenStackMachineTemplate)(nil), (*v1alpha8.OpenStackMachineTemplate)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha7_OpenStackMachineTemplate_To_v1alpha8_OpenStackMachineTemplate(a.(*OpenStackMachineTemplate), b.(*v1alpha8.OpenStackMachineTemplate), scope) + if err := s.AddGeneratedConversionFunc((*OpenStackMachineTemplate)(nil), (*v1beta1.OpenStackMachineTemplate)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha7_OpenStackMachineTemplate_To_v1beta1_OpenStackMachineTemplate(a.(*OpenStackMachineTemplate), b.(*v1beta1.OpenStackMachineTemplate), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1alpha8.OpenStackMachineTemplate)(nil), (*OpenStackMachineTemplate)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_OpenStackMachineTemplate_To_v1alpha7_OpenStackMachineTemplate(a.(*v1alpha8.OpenStackMachineTemplate), b.(*OpenStackMachineTemplate), scope) + if err := s.AddGeneratedConversionFunc((*v1beta1.OpenStackMachineTemplate)(nil), (*OpenStackMachineTemplate)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_OpenStackMachineTemplate_To_v1alpha7_OpenStackMachineTemplate(a.(*v1beta1.OpenStackMachineTemplate), b.(*OpenStackMachineTemplate), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*OpenStackMachineTemplateList)(nil), (*v1alpha8.OpenStackMachineTemplateList)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha7_OpenStackMachineTemplateList_To_v1alpha8_OpenStackMachineTemplateList(a.(*OpenStackMachineTemplateList), b.(*v1alpha8.OpenStackMachineTemplateList), scope) + if err := s.AddGeneratedConversionFunc((*OpenStackMachineTemplateList)(nil), (*v1beta1.OpenStackMachineTemplateList)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha7_OpenStackMachineTemplateList_To_v1beta1_OpenStackMachineTemplateList(a.(*OpenStackMachineTemplateList), b.(*v1beta1.OpenStackMachineTemplateList), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1alpha8.OpenStackMachineTemplateList)(nil), (*OpenStackMachineTemplateList)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_OpenStackMachineTemplateList_To_v1alpha7_OpenStackMachineTemplateList(a.(*v1alpha8.OpenStackMachineTemplateList), b.(*OpenStackMachineTemplateList), scope) + if err := s.AddGeneratedConversionFunc((*v1beta1.OpenStackMachineTemplateList)(nil), (*OpenStackMachineTemplateList)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_OpenStackMachineTemplateList_To_v1alpha7_OpenStackMachineTemplateList(a.(*v1beta1.OpenStackMachineTemplateList), b.(*OpenStackMachineTemplateList), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*OpenStackMachineTemplateResource)(nil), (*v1alpha8.OpenStackMachineTemplateResource)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha7_OpenStackMachineTemplateResource_To_v1alpha8_OpenStackMachineTemplateResource(a.(*OpenStackMachineTemplateResource), b.(*v1alpha8.OpenStackMachineTemplateResource), scope) + if err := s.AddGeneratedConversionFunc((*OpenStackMachineTemplateResource)(nil), (*v1beta1.OpenStackMachineTemplateResource)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha7_OpenStackMachineTemplateResource_To_v1beta1_OpenStackMachineTemplateResource(a.(*OpenStackMachineTemplateResource), b.(*v1beta1.OpenStackMachineTemplateResource), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1alpha8.OpenStackMachineTemplateResource)(nil), (*OpenStackMachineTemplateResource)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_OpenStackMachineTemplateResource_To_v1alpha7_OpenStackMachineTemplateResource(a.(*v1alpha8.OpenStackMachineTemplateResource), b.(*OpenStackMachineTemplateResource), scope) + if err := s.AddGeneratedConversionFunc((*v1beta1.OpenStackMachineTemplateResource)(nil), (*OpenStackMachineTemplateResource)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_OpenStackMachineTemplateResource_To_v1alpha7_OpenStackMachineTemplateResource(a.(*v1beta1.OpenStackMachineTemplateResource), b.(*OpenStackMachineTemplateResource), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*OpenStackMachineTemplateSpec)(nil), (*v1alpha8.OpenStackMachineTemplateSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha7_OpenStackMachineTemplateSpec_To_v1alpha8_OpenStackMachineTemplateSpec(a.(*OpenStackMachineTemplateSpec), b.(*v1alpha8.OpenStackMachineTemplateSpec), scope) + if err := s.AddGeneratedConversionFunc((*OpenStackMachineTemplateSpec)(nil), (*v1beta1.OpenStackMachineTemplateSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha7_OpenStackMachineTemplateSpec_To_v1beta1_OpenStackMachineTemplateSpec(a.(*OpenStackMachineTemplateSpec), b.(*v1beta1.OpenStackMachineTemplateSpec), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1alpha8.OpenStackMachineTemplateSpec)(nil), (*OpenStackMachineTemplateSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_OpenStackMachineTemplateSpec_To_v1alpha7_OpenStackMachineTemplateSpec(a.(*v1alpha8.OpenStackMachineTemplateSpec), b.(*OpenStackMachineTemplateSpec), scope) + if err := s.AddGeneratedConversionFunc((*v1beta1.OpenStackMachineTemplateSpec)(nil), (*OpenStackMachineTemplateSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_OpenStackMachineTemplateSpec_To_v1alpha7_OpenStackMachineTemplateSpec(a.(*v1beta1.OpenStackMachineTemplateSpec), b.(*OpenStackMachineTemplateSpec), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*PortOpts)(nil), (*v1alpha8.PortOpts)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha7_PortOpts_To_v1alpha8_PortOpts(a.(*PortOpts), b.(*v1alpha8.PortOpts), scope) + if err := s.AddGeneratedConversionFunc((*PortOpts)(nil), (*v1beta1.PortOpts)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha7_PortOpts_To_v1beta1_PortOpts(a.(*PortOpts), b.(*v1beta1.PortOpts), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1alpha8.PortOpts)(nil), (*PortOpts)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_PortOpts_To_v1alpha7_PortOpts(a.(*v1alpha8.PortOpts), b.(*PortOpts), scope) + if err := s.AddGeneratedConversionFunc((*v1beta1.PortOpts)(nil), (*PortOpts)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_PortOpts_To_v1alpha7_PortOpts(a.(*v1beta1.PortOpts), b.(*PortOpts), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*RootVolume)(nil), (*v1alpha8.RootVolume)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha7_RootVolume_To_v1alpha8_RootVolume(a.(*RootVolume), b.(*v1alpha8.RootVolume), scope) + if err := s.AddGeneratedConversionFunc((*RootVolume)(nil), (*v1beta1.RootVolume)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha7_RootVolume_To_v1beta1_RootVolume(a.(*RootVolume), b.(*v1beta1.RootVolume), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1alpha8.RootVolume)(nil), (*RootVolume)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_RootVolume_To_v1alpha7_RootVolume(a.(*v1alpha8.RootVolume), b.(*RootVolume), scope) + if err := s.AddGeneratedConversionFunc((*v1beta1.RootVolume)(nil), (*RootVolume)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_RootVolume_To_v1alpha7_RootVolume(a.(*v1beta1.RootVolume), b.(*RootVolume), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*Router)(nil), (*v1alpha8.Router)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha7_Router_To_v1alpha8_Router(a.(*Router), b.(*v1alpha8.Router), scope) + if err := s.AddGeneratedConversionFunc((*Router)(nil), (*v1beta1.Router)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha7_Router_To_v1beta1_Router(a.(*Router), b.(*v1beta1.Router), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1alpha8.Router)(nil), (*Router)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_Router_To_v1alpha7_Router(a.(*v1alpha8.Router), b.(*Router), scope) + if err := s.AddGeneratedConversionFunc((*v1beta1.Router)(nil), (*Router)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_Router_To_v1alpha7_Router(a.(*v1beta1.Router), b.(*Router), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*RouterFilter)(nil), (*v1alpha8.RouterFilter)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha7_RouterFilter_To_v1alpha8_RouterFilter(a.(*RouterFilter), b.(*v1alpha8.RouterFilter), scope) + if err := s.AddGeneratedConversionFunc((*RouterFilter)(nil), (*v1beta1.RouterFilter)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha7_RouterFilter_To_v1beta1_RouterFilter(a.(*RouterFilter), b.(*v1beta1.RouterFilter), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1alpha8.RouterFilter)(nil), (*RouterFilter)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_RouterFilter_To_v1alpha7_RouterFilter(a.(*v1alpha8.RouterFilter), b.(*RouterFilter), scope) + if err := s.AddGeneratedConversionFunc((*v1beta1.RouterFilter)(nil), (*RouterFilter)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_RouterFilter_To_v1alpha7_RouterFilter(a.(*v1beta1.RouterFilter), b.(*RouterFilter), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*SecurityGroupFilter)(nil), (*v1alpha8.SecurityGroupFilter)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha7_SecurityGroupFilter_To_v1alpha8_SecurityGroupFilter(a.(*SecurityGroupFilter), b.(*v1alpha8.SecurityGroupFilter), scope) + if err := s.AddGeneratedConversionFunc((*SecurityGroupFilter)(nil), (*v1beta1.SecurityGroupFilter)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha7_SecurityGroupFilter_To_v1beta1_SecurityGroupFilter(a.(*SecurityGroupFilter), b.(*v1beta1.SecurityGroupFilter), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1alpha8.SecurityGroupFilter)(nil), (*SecurityGroupFilter)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_SecurityGroupFilter_To_v1alpha7_SecurityGroupFilter(a.(*v1alpha8.SecurityGroupFilter), b.(*SecurityGroupFilter), scope) + if err := s.AddGeneratedConversionFunc((*v1beta1.SecurityGroupFilter)(nil), (*SecurityGroupFilter)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_SecurityGroupFilter_To_v1alpha7_SecurityGroupFilter(a.(*v1beta1.SecurityGroupFilter), b.(*SecurityGroupFilter), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*Subnet)(nil), (*v1alpha8.Subnet)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha7_Subnet_To_v1alpha8_Subnet(a.(*Subnet), b.(*v1alpha8.Subnet), scope) + if err := s.AddGeneratedConversionFunc((*Subnet)(nil), (*v1beta1.Subnet)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha7_Subnet_To_v1beta1_Subnet(a.(*Subnet), b.(*v1beta1.Subnet), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1alpha8.Subnet)(nil), (*Subnet)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_Subnet_To_v1alpha7_Subnet(a.(*v1alpha8.Subnet), b.(*Subnet), scope) + if err := s.AddGeneratedConversionFunc((*v1beta1.Subnet)(nil), (*Subnet)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_Subnet_To_v1alpha7_Subnet(a.(*v1beta1.Subnet), b.(*Subnet), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*SubnetFilter)(nil), (*v1alpha8.SubnetFilter)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha7_SubnetFilter_To_v1alpha8_SubnetFilter(a.(*SubnetFilter), b.(*v1alpha8.SubnetFilter), scope) + if err := s.AddGeneratedConversionFunc((*SubnetFilter)(nil), (*v1beta1.SubnetFilter)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha7_SubnetFilter_To_v1beta1_SubnetFilter(a.(*SubnetFilter), b.(*v1beta1.SubnetFilter), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1alpha8.SubnetFilter)(nil), (*SubnetFilter)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_SubnetFilter_To_v1alpha7_SubnetFilter(a.(*v1alpha8.SubnetFilter), b.(*SubnetFilter), scope) + if err := s.AddGeneratedConversionFunc((*v1beta1.SubnetFilter)(nil), (*SubnetFilter)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_SubnetFilter_To_v1alpha7_SubnetFilter(a.(*v1beta1.SubnetFilter), b.(*SubnetFilter), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*ValueSpec)(nil), (*v1alpha8.ValueSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha7_ValueSpec_To_v1alpha8_ValueSpec(a.(*ValueSpec), b.(*v1alpha8.ValueSpec), scope) + if err := s.AddGeneratedConversionFunc((*ValueSpec)(nil), (*v1beta1.ValueSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha7_ValueSpec_To_v1beta1_ValueSpec(a.(*ValueSpec), b.(*v1beta1.ValueSpec), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*v1alpha8.ValueSpec)(nil), (*ValueSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_ValueSpec_To_v1alpha7_ValueSpec(a.(*v1alpha8.ValueSpec), b.(*ValueSpec), scope) + if err := s.AddGeneratedConversionFunc((*v1beta1.ValueSpec)(nil), (*ValueSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_ValueSpec_To_v1alpha7_ValueSpec(a.(*v1beta1.ValueSpec), b.(*ValueSpec), scope) }); err != nil { return err } - if err := s.AddConversionFunc((*Bastion)(nil), (*v1alpha8.Bastion)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha7_Bastion_To_v1alpha8_Bastion(a.(*Bastion), b.(*v1alpha8.Bastion), scope) + if err := s.AddConversionFunc((*Bastion)(nil), (*v1beta1.Bastion)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha7_Bastion_To_v1beta1_Bastion(a.(*Bastion), b.(*v1beta1.Bastion), scope) }); err != nil { return err } - if err := s.AddConversionFunc((*OpenStackClusterSpec)(nil), (*v1alpha8.OpenStackClusterSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha7_OpenStackClusterSpec_To_v1alpha8_OpenStackClusterSpec(a.(*OpenStackClusterSpec), b.(*v1alpha8.OpenStackClusterSpec), scope) + if err := s.AddConversionFunc((*OpenStackClusterSpec)(nil), (*v1beta1.OpenStackClusterSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha7_OpenStackClusterSpec_To_v1beta1_OpenStackClusterSpec(a.(*OpenStackClusterSpec), b.(*v1beta1.OpenStackClusterSpec), scope) }); err != nil { return err } - if err := s.AddConversionFunc((*OpenStackMachineSpec)(nil), (*v1alpha8.OpenStackMachineSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha7_OpenStackMachineSpec_To_v1alpha8_OpenStackMachineSpec(a.(*OpenStackMachineSpec), b.(*v1alpha8.OpenStackMachineSpec), scope) + if err := s.AddConversionFunc((*OpenStackMachineSpec)(nil), (*v1beta1.OpenStackMachineSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha7_OpenStackMachineSpec_To_v1beta1_OpenStackMachineSpec(a.(*OpenStackMachineSpec), b.(*v1beta1.OpenStackMachineSpec), scope) }); err != nil { return err } - if err := s.AddConversionFunc((*SecurityGroup)(nil), (*v1alpha8.SecurityGroupStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha7_SecurityGroup_To_v1alpha8_SecurityGroupStatus(a.(*SecurityGroup), b.(*v1alpha8.SecurityGroupStatus), scope) + if err := s.AddConversionFunc((*SecurityGroup)(nil), (*v1beta1.SecurityGroupStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha7_SecurityGroup_To_v1beta1_SecurityGroupStatus(a.(*SecurityGroup), b.(*v1beta1.SecurityGroupStatus), scope) }); err != nil { return err } - if err := s.AddConversionFunc((*v1alpha8.BastionStatus)(nil), (*BastionStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_BastionStatus_To_v1alpha7_BastionStatus(a.(*v1alpha8.BastionStatus), b.(*BastionStatus), scope) + if err := s.AddConversionFunc((*v1beta1.BastionStatus)(nil), (*BastionStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_BastionStatus_To_v1alpha7_BastionStatus(a.(*v1beta1.BastionStatus), b.(*BastionStatus), scope) }); err != nil { return err } - if err := s.AddConversionFunc((*v1alpha8.Bastion)(nil), (*Bastion)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_Bastion_To_v1alpha7_Bastion(a.(*v1alpha8.Bastion), b.(*Bastion), scope) + if err := s.AddConversionFunc((*v1beta1.Bastion)(nil), (*Bastion)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_Bastion_To_v1alpha7_Bastion(a.(*v1beta1.Bastion), b.(*Bastion), scope) }); err != nil { return err } - if err := s.AddConversionFunc((*v1alpha8.OpenStackClusterSpec)(nil), (*OpenStackClusterSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_OpenStackClusterSpec_To_v1alpha7_OpenStackClusterSpec(a.(*v1alpha8.OpenStackClusterSpec), b.(*OpenStackClusterSpec), scope) + if err := s.AddConversionFunc((*v1beta1.OpenStackClusterSpec)(nil), (*OpenStackClusterSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_OpenStackClusterSpec_To_v1alpha7_OpenStackClusterSpec(a.(*v1beta1.OpenStackClusterSpec), b.(*OpenStackClusterSpec), scope) }); err != nil { return err } - if err := s.AddConversionFunc((*v1alpha8.OpenStackMachineSpec)(nil), (*OpenStackMachineSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_OpenStackMachineSpec_To_v1alpha7_OpenStackMachineSpec(a.(*v1alpha8.OpenStackMachineSpec), b.(*OpenStackMachineSpec), scope) + if err := s.AddConversionFunc((*v1beta1.OpenStackMachineSpec)(nil), (*OpenStackMachineSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_OpenStackMachineSpec_To_v1alpha7_OpenStackMachineSpec(a.(*v1beta1.OpenStackMachineSpec), b.(*OpenStackMachineSpec), scope) }); err != nil { return err } - if err := s.AddConversionFunc((*v1alpha8.OpenStackMachineStatus)(nil), (*OpenStackMachineStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_OpenStackMachineStatus_To_v1alpha7_OpenStackMachineStatus(a.(*v1alpha8.OpenStackMachineStatus), b.(*OpenStackMachineStatus), scope) + if err := s.AddConversionFunc((*v1beta1.OpenStackMachineStatus)(nil), (*OpenStackMachineStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_OpenStackMachineStatus_To_v1alpha7_OpenStackMachineStatus(a.(*v1beta1.OpenStackMachineStatus), b.(*OpenStackMachineStatus), scope) }); err != nil { return err } - if err := s.AddConversionFunc((*v1alpha8.SecurityGroupStatus)(nil), (*SecurityGroup)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha8_SecurityGroupStatus_To_v1alpha7_SecurityGroup(a.(*v1alpha8.SecurityGroupStatus), b.(*SecurityGroup), scope) + if err := s.AddConversionFunc((*v1beta1.SecurityGroupStatus)(nil), (*SecurityGroup)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_SecurityGroupStatus_To_v1alpha7_SecurityGroup(a.(*v1beta1.SecurityGroupStatus), b.(*SecurityGroup), scope) }); err != nil { return err } return nil } -func autoConvert_v1alpha7_APIServerLoadBalancer_To_v1alpha8_APIServerLoadBalancer(in *APIServerLoadBalancer, out *v1alpha8.APIServerLoadBalancer, s conversion.Scope) error { +func autoConvert_v1alpha7_APIServerLoadBalancer_To_v1beta1_APIServerLoadBalancer(in *APIServerLoadBalancer, out *v1beta1.APIServerLoadBalancer, s conversion.Scope) error { out.Enabled = in.Enabled out.AdditionalPorts = *(*[]int)(unsafe.Pointer(&in.AdditionalPorts)) out.AllowedCIDRs = *(*[]string)(unsafe.Pointer(&in.AllowedCIDRs)) @@ -450,12 +450,12 @@ func autoConvert_v1alpha7_APIServerLoadBalancer_To_v1alpha8_APIServerLoadBalance return nil } -// Convert_v1alpha7_APIServerLoadBalancer_To_v1alpha8_APIServerLoadBalancer is an autogenerated conversion function. -func Convert_v1alpha7_APIServerLoadBalancer_To_v1alpha8_APIServerLoadBalancer(in *APIServerLoadBalancer, out *v1alpha8.APIServerLoadBalancer, s conversion.Scope) error { - return autoConvert_v1alpha7_APIServerLoadBalancer_To_v1alpha8_APIServerLoadBalancer(in, out, s) +// Convert_v1alpha7_APIServerLoadBalancer_To_v1beta1_APIServerLoadBalancer is an autogenerated conversion function. +func Convert_v1alpha7_APIServerLoadBalancer_To_v1beta1_APIServerLoadBalancer(in *APIServerLoadBalancer, out *v1beta1.APIServerLoadBalancer, s conversion.Scope) error { + return autoConvert_v1alpha7_APIServerLoadBalancer_To_v1beta1_APIServerLoadBalancer(in, out, s) } -func autoConvert_v1alpha8_APIServerLoadBalancer_To_v1alpha7_APIServerLoadBalancer(in *v1alpha8.APIServerLoadBalancer, out *APIServerLoadBalancer, s conversion.Scope) error { +func autoConvert_v1beta1_APIServerLoadBalancer_To_v1alpha7_APIServerLoadBalancer(in *v1beta1.APIServerLoadBalancer, out *APIServerLoadBalancer, s conversion.Scope) error { out.Enabled = in.Enabled out.AdditionalPorts = *(*[]int)(unsafe.Pointer(&in.AdditionalPorts)) out.AllowedCIDRs = *(*[]string)(unsafe.Pointer(&in.AllowedCIDRs)) @@ -463,73 +463,73 @@ func autoConvert_v1alpha8_APIServerLoadBalancer_To_v1alpha7_APIServerLoadBalance return nil } -// Convert_v1alpha8_APIServerLoadBalancer_To_v1alpha7_APIServerLoadBalancer is an autogenerated conversion function. -func Convert_v1alpha8_APIServerLoadBalancer_To_v1alpha7_APIServerLoadBalancer(in *v1alpha8.APIServerLoadBalancer, out *APIServerLoadBalancer, s conversion.Scope) error { - return autoConvert_v1alpha8_APIServerLoadBalancer_To_v1alpha7_APIServerLoadBalancer(in, out, s) +// Convert_v1beta1_APIServerLoadBalancer_To_v1alpha7_APIServerLoadBalancer is an autogenerated conversion function. +func Convert_v1beta1_APIServerLoadBalancer_To_v1alpha7_APIServerLoadBalancer(in *v1beta1.APIServerLoadBalancer, out *APIServerLoadBalancer, s conversion.Scope) error { + return autoConvert_v1beta1_APIServerLoadBalancer_To_v1alpha7_APIServerLoadBalancer(in, out, s) } -func autoConvert_v1alpha7_AdditionalBlockDevice_To_v1alpha8_AdditionalBlockDevice(in *AdditionalBlockDevice, out *v1alpha8.AdditionalBlockDevice, s conversion.Scope) error { +func autoConvert_v1alpha7_AdditionalBlockDevice_To_v1beta1_AdditionalBlockDevice(in *AdditionalBlockDevice, out *v1beta1.AdditionalBlockDevice, s conversion.Scope) error { out.Name = in.Name out.SizeGiB = in.SizeGiB - if err := Convert_v1alpha7_BlockDeviceStorage_To_v1alpha8_BlockDeviceStorage(&in.Storage, &out.Storage, s); err != nil { + if err := Convert_v1alpha7_BlockDeviceStorage_To_v1beta1_BlockDeviceStorage(&in.Storage, &out.Storage, s); err != nil { return err } return nil } -// Convert_v1alpha7_AdditionalBlockDevice_To_v1alpha8_AdditionalBlockDevice is an autogenerated conversion function. -func Convert_v1alpha7_AdditionalBlockDevice_To_v1alpha8_AdditionalBlockDevice(in *AdditionalBlockDevice, out *v1alpha8.AdditionalBlockDevice, s conversion.Scope) error { - return autoConvert_v1alpha7_AdditionalBlockDevice_To_v1alpha8_AdditionalBlockDevice(in, out, s) +// Convert_v1alpha7_AdditionalBlockDevice_To_v1beta1_AdditionalBlockDevice is an autogenerated conversion function. +func Convert_v1alpha7_AdditionalBlockDevice_To_v1beta1_AdditionalBlockDevice(in *AdditionalBlockDevice, out *v1beta1.AdditionalBlockDevice, s conversion.Scope) error { + return autoConvert_v1alpha7_AdditionalBlockDevice_To_v1beta1_AdditionalBlockDevice(in, out, s) } -func autoConvert_v1alpha8_AdditionalBlockDevice_To_v1alpha7_AdditionalBlockDevice(in *v1alpha8.AdditionalBlockDevice, out *AdditionalBlockDevice, s conversion.Scope) error { +func autoConvert_v1beta1_AdditionalBlockDevice_To_v1alpha7_AdditionalBlockDevice(in *v1beta1.AdditionalBlockDevice, out *AdditionalBlockDevice, s conversion.Scope) error { out.Name = in.Name out.SizeGiB = in.SizeGiB - if err := Convert_v1alpha8_BlockDeviceStorage_To_v1alpha7_BlockDeviceStorage(&in.Storage, &out.Storage, s); err != nil { + if err := Convert_v1beta1_BlockDeviceStorage_To_v1alpha7_BlockDeviceStorage(&in.Storage, &out.Storage, s); err != nil { return err } return nil } -// Convert_v1alpha8_AdditionalBlockDevice_To_v1alpha7_AdditionalBlockDevice is an autogenerated conversion function. -func Convert_v1alpha8_AdditionalBlockDevice_To_v1alpha7_AdditionalBlockDevice(in *v1alpha8.AdditionalBlockDevice, out *AdditionalBlockDevice, s conversion.Scope) error { - return autoConvert_v1alpha8_AdditionalBlockDevice_To_v1alpha7_AdditionalBlockDevice(in, out, s) +// Convert_v1beta1_AdditionalBlockDevice_To_v1alpha7_AdditionalBlockDevice is an autogenerated conversion function. +func Convert_v1beta1_AdditionalBlockDevice_To_v1alpha7_AdditionalBlockDevice(in *v1beta1.AdditionalBlockDevice, out *AdditionalBlockDevice, s conversion.Scope) error { + return autoConvert_v1beta1_AdditionalBlockDevice_To_v1alpha7_AdditionalBlockDevice(in, out, s) } -func autoConvert_v1alpha7_AddressPair_To_v1alpha8_AddressPair(in *AddressPair, out *v1alpha8.AddressPair, s conversion.Scope) error { +func autoConvert_v1alpha7_AddressPair_To_v1beta1_AddressPair(in *AddressPair, out *v1beta1.AddressPair, s conversion.Scope) error { out.IPAddress = in.IPAddress out.MACAddress = in.MACAddress return nil } -// Convert_v1alpha7_AddressPair_To_v1alpha8_AddressPair is an autogenerated conversion function. -func Convert_v1alpha7_AddressPair_To_v1alpha8_AddressPair(in *AddressPair, out *v1alpha8.AddressPair, s conversion.Scope) error { - return autoConvert_v1alpha7_AddressPair_To_v1alpha8_AddressPair(in, out, s) +// Convert_v1alpha7_AddressPair_To_v1beta1_AddressPair is an autogenerated conversion function. +func Convert_v1alpha7_AddressPair_To_v1beta1_AddressPair(in *AddressPair, out *v1beta1.AddressPair, s conversion.Scope) error { + return autoConvert_v1alpha7_AddressPair_To_v1beta1_AddressPair(in, out, s) } -func autoConvert_v1alpha8_AddressPair_To_v1alpha7_AddressPair(in *v1alpha8.AddressPair, out *AddressPair, s conversion.Scope) error { +func autoConvert_v1beta1_AddressPair_To_v1alpha7_AddressPair(in *v1beta1.AddressPair, out *AddressPair, s conversion.Scope) error { out.IPAddress = in.IPAddress out.MACAddress = in.MACAddress return nil } -// Convert_v1alpha8_AddressPair_To_v1alpha7_AddressPair is an autogenerated conversion function. -func Convert_v1alpha8_AddressPair_To_v1alpha7_AddressPair(in *v1alpha8.AddressPair, out *AddressPair, s conversion.Scope) error { - return autoConvert_v1alpha8_AddressPair_To_v1alpha7_AddressPair(in, out, s) +// Convert_v1beta1_AddressPair_To_v1alpha7_AddressPair is an autogenerated conversion function. +func Convert_v1beta1_AddressPair_To_v1alpha7_AddressPair(in *v1beta1.AddressPair, out *AddressPair, s conversion.Scope) error { + return autoConvert_v1beta1_AddressPair_To_v1alpha7_AddressPair(in, out, s) } -func autoConvert_v1alpha7_Bastion_To_v1alpha8_Bastion(in *Bastion, out *v1alpha8.Bastion, s conversion.Scope) error { +func autoConvert_v1alpha7_Bastion_To_v1beta1_Bastion(in *Bastion, out *v1beta1.Bastion, s conversion.Scope) error { out.Enabled = in.Enabled - if err := Convert_v1alpha7_OpenStackMachineSpec_To_v1alpha8_OpenStackMachineSpec(&in.Instance, &out.Instance, s); err != nil { + if err := Convert_v1alpha7_OpenStackMachineSpec_To_v1beta1_OpenStackMachineSpec(&in.Instance, &out.Instance, s); err != nil { return err } out.AvailabilityZone = in.AvailabilityZone return nil } -func autoConvert_v1alpha8_Bastion_To_v1alpha7_Bastion(in *v1alpha8.Bastion, out *Bastion, s conversion.Scope) error { +func autoConvert_v1beta1_Bastion_To_v1alpha7_Bastion(in *v1beta1.Bastion, out *Bastion, s conversion.Scope) error { out.Enabled = in.Enabled - if err := Convert_v1alpha8_OpenStackMachineSpec_To_v1alpha7_OpenStackMachineSpec(&in.Instance, &out.Instance, s); err != nil { + if err := Convert_v1beta1_OpenStackMachineSpec_To_v1alpha7_OpenStackMachineSpec(&in.Instance, &out.Instance, s); err != nil { return err } out.AvailabilityZone = in.AvailabilityZone @@ -537,22 +537,22 @@ func autoConvert_v1alpha8_Bastion_To_v1alpha7_Bastion(in *v1alpha8.Bastion, out return nil } -func autoConvert_v1alpha7_BastionStatus_To_v1alpha8_BastionStatus(in *BastionStatus, out *v1alpha8.BastionStatus, s conversion.Scope) error { +func autoConvert_v1alpha7_BastionStatus_To_v1beta1_BastionStatus(in *BastionStatus, out *v1beta1.BastionStatus, s conversion.Scope) error { out.ID = in.ID out.Name = in.Name out.SSHKeyName = in.SSHKeyName - out.State = v1alpha8.InstanceState(in.State) + out.State = v1beta1.InstanceState(in.State) out.IP = in.IP out.FloatingIP = in.FloatingIP return nil } -// Convert_v1alpha7_BastionStatus_To_v1alpha8_BastionStatus is an autogenerated conversion function. -func Convert_v1alpha7_BastionStatus_To_v1alpha8_BastionStatus(in *BastionStatus, out *v1alpha8.BastionStatus, s conversion.Scope) error { - return autoConvert_v1alpha7_BastionStatus_To_v1alpha8_BastionStatus(in, out, s) +// Convert_v1alpha7_BastionStatus_To_v1beta1_BastionStatus is an autogenerated conversion function. +func Convert_v1alpha7_BastionStatus_To_v1beta1_BastionStatus(in *BastionStatus, out *v1beta1.BastionStatus, s conversion.Scope) error { + return autoConvert_v1alpha7_BastionStatus_To_v1beta1_BastionStatus(in, out, s) } -func autoConvert_v1alpha8_BastionStatus_To_v1alpha7_BastionStatus(in *v1alpha8.BastionStatus, out *BastionStatus, s conversion.Scope) error { +func autoConvert_v1beta1_BastionStatus_To_v1alpha7_BastionStatus(in *v1beta1.BastionStatus, out *BastionStatus, s conversion.Scope) error { out.ID = in.ID out.Name = in.Name out.SSHKeyName = in.SSHKeyName @@ -563,121 +563,121 @@ func autoConvert_v1alpha8_BastionStatus_To_v1alpha7_BastionStatus(in *v1alpha8.B return nil } -func autoConvert_v1alpha7_BindingProfile_To_v1alpha8_BindingProfile(in *BindingProfile, out *v1alpha8.BindingProfile, s conversion.Scope) error { +func autoConvert_v1alpha7_BindingProfile_To_v1beta1_BindingProfile(in *BindingProfile, out *v1beta1.BindingProfile, s conversion.Scope) error { out.OVSHWOffload = in.OVSHWOffload out.TrustedVF = in.TrustedVF return nil } -// Convert_v1alpha7_BindingProfile_To_v1alpha8_BindingProfile is an autogenerated conversion function. -func Convert_v1alpha7_BindingProfile_To_v1alpha8_BindingProfile(in *BindingProfile, out *v1alpha8.BindingProfile, s conversion.Scope) error { - return autoConvert_v1alpha7_BindingProfile_To_v1alpha8_BindingProfile(in, out, s) +// Convert_v1alpha7_BindingProfile_To_v1beta1_BindingProfile is an autogenerated conversion function. +func Convert_v1alpha7_BindingProfile_To_v1beta1_BindingProfile(in *BindingProfile, out *v1beta1.BindingProfile, s conversion.Scope) error { + return autoConvert_v1alpha7_BindingProfile_To_v1beta1_BindingProfile(in, out, s) } -func autoConvert_v1alpha8_BindingProfile_To_v1alpha7_BindingProfile(in *v1alpha8.BindingProfile, out *BindingProfile, s conversion.Scope) error { +func autoConvert_v1beta1_BindingProfile_To_v1alpha7_BindingProfile(in *v1beta1.BindingProfile, out *BindingProfile, s conversion.Scope) error { out.OVSHWOffload = in.OVSHWOffload out.TrustedVF = in.TrustedVF return nil } -// Convert_v1alpha8_BindingProfile_To_v1alpha7_BindingProfile is an autogenerated conversion function. -func Convert_v1alpha8_BindingProfile_To_v1alpha7_BindingProfile(in *v1alpha8.BindingProfile, out *BindingProfile, s conversion.Scope) error { - return autoConvert_v1alpha8_BindingProfile_To_v1alpha7_BindingProfile(in, out, s) +// Convert_v1beta1_BindingProfile_To_v1alpha7_BindingProfile is an autogenerated conversion function. +func Convert_v1beta1_BindingProfile_To_v1alpha7_BindingProfile(in *v1beta1.BindingProfile, out *BindingProfile, s conversion.Scope) error { + return autoConvert_v1beta1_BindingProfile_To_v1alpha7_BindingProfile(in, out, s) } -func autoConvert_v1alpha7_BlockDeviceStorage_To_v1alpha8_BlockDeviceStorage(in *BlockDeviceStorage, out *v1alpha8.BlockDeviceStorage, s conversion.Scope) error { - out.Type = v1alpha8.BlockDeviceType(in.Type) - out.Volume = (*v1alpha8.BlockDeviceVolume)(unsafe.Pointer(in.Volume)) +func autoConvert_v1alpha7_BlockDeviceStorage_To_v1beta1_BlockDeviceStorage(in *BlockDeviceStorage, out *v1beta1.BlockDeviceStorage, s conversion.Scope) error { + out.Type = v1beta1.BlockDeviceType(in.Type) + out.Volume = (*v1beta1.BlockDeviceVolume)(unsafe.Pointer(in.Volume)) return nil } -// Convert_v1alpha7_BlockDeviceStorage_To_v1alpha8_BlockDeviceStorage is an autogenerated conversion function. -func Convert_v1alpha7_BlockDeviceStorage_To_v1alpha8_BlockDeviceStorage(in *BlockDeviceStorage, out *v1alpha8.BlockDeviceStorage, s conversion.Scope) error { - return autoConvert_v1alpha7_BlockDeviceStorage_To_v1alpha8_BlockDeviceStorage(in, out, s) +// Convert_v1alpha7_BlockDeviceStorage_To_v1beta1_BlockDeviceStorage is an autogenerated conversion function. +func Convert_v1alpha7_BlockDeviceStorage_To_v1beta1_BlockDeviceStorage(in *BlockDeviceStorage, out *v1beta1.BlockDeviceStorage, s conversion.Scope) error { + return autoConvert_v1alpha7_BlockDeviceStorage_To_v1beta1_BlockDeviceStorage(in, out, s) } -func autoConvert_v1alpha8_BlockDeviceStorage_To_v1alpha7_BlockDeviceStorage(in *v1alpha8.BlockDeviceStorage, out *BlockDeviceStorage, s conversion.Scope) error { +func autoConvert_v1beta1_BlockDeviceStorage_To_v1alpha7_BlockDeviceStorage(in *v1beta1.BlockDeviceStorage, out *BlockDeviceStorage, s conversion.Scope) error { out.Type = BlockDeviceType(in.Type) out.Volume = (*BlockDeviceVolume)(unsafe.Pointer(in.Volume)) return nil } -// Convert_v1alpha8_BlockDeviceStorage_To_v1alpha7_BlockDeviceStorage is an autogenerated conversion function. -func Convert_v1alpha8_BlockDeviceStorage_To_v1alpha7_BlockDeviceStorage(in *v1alpha8.BlockDeviceStorage, out *BlockDeviceStorage, s conversion.Scope) error { - return autoConvert_v1alpha8_BlockDeviceStorage_To_v1alpha7_BlockDeviceStorage(in, out, s) +// Convert_v1beta1_BlockDeviceStorage_To_v1alpha7_BlockDeviceStorage is an autogenerated conversion function. +func Convert_v1beta1_BlockDeviceStorage_To_v1alpha7_BlockDeviceStorage(in *v1beta1.BlockDeviceStorage, out *BlockDeviceStorage, s conversion.Scope) error { + return autoConvert_v1beta1_BlockDeviceStorage_To_v1alpha7_BlockDeviceStorage(in, out, s) } -func autoConvert_v1alpha7_BlockDeviceVolume_To_v1alpha8_BlockDeviceVolume(in *BlockDeviceVolume, out *v1alpha8.BlockDeviceVolume, s conversion.Scope) error { +func autoConvert_v1alpha7_BlockDeviceVolume_To_v1beta1_BlockDeviceVolume(in *BlockDeviceVolume, out *v1beta1.BlockDeviceVolume, s conversion.Scope) error { out.Type = in.Type out.AvailabilityZone = in.AvailabilityZone return nil } -// Convert_v1alpha7_BlockDeviceVolume_To_v1alpha8_BlockDeviceVolume is an autogenerated conversion function. -func Convert_v1alpha7_BlockDeviceVolume_To_v1alpha8_BlockDeviceVolume(in *BlockDeviceVolume, out *v1alpha8.BlockDeviceVolume, s conversion.Scope) error { - return autoConvert_v1alpha7_BlockDeviceVolume_To_v1alpha8_BlockDeviceVolume(in, out, s) +// Convert_v1alpha7_BlockDeviceVolume_To_v1beta1_BlockDeviceVolume is an autogenerated conversion function. +func Convert_v1alpha7_BlockDeviceVolume_To_v1beta1_BlockDeviceVolume(in *BlockDeviceVolume, out *v1beta1.BlockDeviceVolume, s conversion.Scope) error { + return autoConvert_v1alpha7_BlockDeviceVolume_To_v1beta1_BlockDeviceVolume(in, out, s) } -func autoConvert_v1alpha8_BlockDeviceVolume_To_v1alpha7_BlockDeviceVolume(in *v1alpha8.BlockDeviceVolume, out *BlockDeviceVolume, s conversion.Scope) error { +func autoConvert_v1beta1_BlockDeviceVolume_To_v1alpha7_BlockDeviceVolume(in *v1beta1.BlockDeviceVolume, out *BlockDeviceVolume, s conversion.Scope) error { out.Type = in.Type out.AvailabilityZone = in.AvailabilityZone return nil } -// Convert_v1alpha8_BlockDeviceVolume_To_v1alpha7_BlockDeviceVolume is an autogenerated conversion function. -func Convert_v1alpha8_BlockDeviceVolume_To_v1alpha7_BlockDeviceVolume(in *v1alpha8.BlockDeviceVolume, out *BlockDeviceVolume, s conversion.Scope) error { - return autoConvert_v1alpha8_BlockDeviceVolume_To_v1alpha7_BlockDeviceVolume(in, out, s) +// Convert_v1beta1_BlockDeviceVolume_To_v1alpha7_BlockDeviceVolume is an autogenerated conversion function. +func Convert_v1beta1_BlockDeviceVolume_To_v1alpha7_BlockDeviceVolume(in *v1beta1.BlockDeviceVolume, out *BlockDeviceVolume, s conversion.Scope) error { + return autoConvert_v1beta1_BlockDeviceVolume_To_v1alpha7_BlockDeviceVolume(in, out, s) } -func autoConvert_v1alpha7_ExternalRouterIPParam_To_v1alpha8_ExternalRouterIPParam(in *ExternalRouterIPParam, out *v1alpha8.ExternalRouterIPParam, s conversion.Scope) error { +func autoConvert_v1alpha7_ExternalRouterIPParam_To_v1beta1_ExternalRouterIPParam(in *ExternalRouterIPParam, out *v1beta1.ExternalRouterIPParam, s conversion.Scope) error { out.FixedIP = in.FixedIP - if err := Convert_v1alpha7_SubnetFilter_To_v1alpha8_SubnetFilter(&in.Subnet, &out.Subnet, s); err != nil { + if err := Convert_v1alpha7_SubnetFilter_To_v1beta1_SubnetFilter(&in.Subnet, &out.Subnet, s); err != nil { return err } return nil } -// Convert_v1alpha7_ExternalRouterIPParam_To_v1alpha8_ExternalRouterIPParam is an autogenerated conversion function. -func Convert_v1alpha7_ExternalRouterIPParam_To_v1alpha8_ExternalRouterIPParam(in *ExternalRouterIPParam, out *v1alpha8.ExternalRouterIPParam, s conversion.Scope) error { - return autoConvert_v1alpha7_ExternalRouterIPParam_To_v1alpha8_ExternalRouterIPParam(in, out, s) +// Convert_v1alpha7_ExternalRouterIPParam_To_v1beta1_ExternalRouterIPParam is an autogenerated conversion function. +func Convert_v1alpha7_ExternalRouterIPParam_To_v1beta1_ExternalRouterIPParam(in *ExternalRouterIPParam, out *v1beta1.ExternalRouterIPParam, s conversion.Scope) error { + return autoConvert_v1alpha7_ExternalRouterIPParam_To_v1beta1_ExternalRouterIPParam(in, out, s) } -func autoConvert_v1alpha8_ExternalRouterIPParam_To_v1alpha7_ExternalRouterIPParam(in *v1alpha8.ExternalRouterIPParam, out *ExternalRouterIPParam, s conversion.Scope) error { +func autoConvert_v1beta1_ExternalRouterIPParam_To_v1alpha7_ExternalRouterIPParam(in *v1beta1.ExternalRouterIPParam, out *ExternalRouterIPParam, s conversion.Scope) error { out.FixedIP = in.FixedIP - if err := Convert_v1alpha8_SubnetFilter_To_v1alpha7_SubnetFilter(&in.Subnet, &out.Subnet, s); err != nil { + if err := Convert_v1beta1_SubnetFilter_To_v1alpha7_SubnetFilter(&in.Subnet, &out.Subnet, s); err != nil { return err } return nil } -// Convert_v1alpha8_ExternalRouterIPParam_To_v1alpha7_ExternalRouterIPParam is an autogenerated conversion function. -func Convert_v1alpha8_ExternalRouterIPParam_To_v1alpha7_ExternalRouterIPParam(in *v1alpha8.ExternalRouterIPParam, out *ExternalRouterIPParam, s conversion.Scope) error { - return autoConvert_v1alpha8_ExternalRouterIPParam_To_v1alpha7_ExternalRouterIPParam(in, out, s) +// Convert_v1beta1_ExternalRouterIPParam_To_v1alpha7_ExternalRouterIPParam is an autogenerated conversion function. +func Convert_v1beta1_ExternalRouterIPParam_To_v1alpha7_ExternalRouterIPParam(in *v1beta1.ExternalRouterIPParam, out *ExternalRouterIPParam, s conversion.Scope) error { + return autoConvert_v1beta1_ExternalRouterIPParam_To_v1alpha7_ExternalRouterIPParam(in, out, s) } -func autoConvert_v1alpha7_FixedIP_To_v1alpha8_FixedIP(in *FixedIP, out *v1alpha8.FixedIP, s conversion.Scope) error { - out.Subnet = (*v1alpha8.SubnetFilter)(unsafe.Pointer(in.Subnet)) +func autoConvert_v1alpha7_FixedIP_To_v1beta1_FixedIP(in *FixedIP, out *v1beta1.FixedIP, s conversion.Scope) error { + out.Subnet = (*v1beta1.SubnetFilter)(unsafe.Pointer(in.Subnet)) out.IPAddress = in.IPAddress return nil } -// Convert_v1alpha7_FixedIP_To_v1alpha8_FixedIP is an autogenerated conversion function. -func Convert_v1alpha7_FixedIP_To_v1alpha8_FixedIP(in *FixedIP, out *v1alpha8.FixedIP, s conversion.Scope) error { - return autoConvert_v1alpha7_FixedIP_To_v1alpha8_FixedIP(in, out, s) +// Convert_v1alpha7_FixedIP_To_v1beta1_FixedIP is an autogenerated conversion function. +func Convert_v1alpha7_FixedIP_To_v1beta1_FixedIP(in *FixedIP, out *v1beta1.FixedIP, s conversion.Scope) error { + return autoConvert_v1alpha7_FixedIP_To_v1beta1_FixedIP(in, out, s) } -func autoConvert_v1alpha8_FixedIP_To_v1alpha7_FixedIP(in *v1alpha8.FixedIP, out *FixedIP, s conversion.Scope) error { +func autoConvert_v1beta1_FixedIP_To_v1alpha7_FixedIP(in *v1beta1.FixedIP, out *FixedIP, s conversion.Scope) error { out.Subnet = (*SubnetFilter)(unsafe.Pointer(in.Subnet)) out.IPAddress = in.IPAddress return nil } -// Convert_v1alpha8_FixedIP_To_v1alpha7_FixedIP is an autogenerated conversion function. -func Convert_v1alpha8_FixedIP_To_v1alpha7_FixedIP(in *v1alpha8.FixedIP, out *FixedIP, s conversion.Scope) error { - return autoConvert_v1alpha8_FixedIP_To_v1alpha7_FixedIP(in, out, s) +// Convert_v1beta1_FixedIP_To_v1alpha7_FixedIP is an autogenerated conversion function. +func Convert_v1beta1_FixedIP_To_v1alpha7_FixedIP(in *v1beta1.FixedIP, out *FixedIP, s conversion.Scope) error { + return autoConvert_v1beta1_FixedIP_To_v1alpha7_FixedIP(in, out, s) } -func autoConvert_v1alpha7_LoadBalancer_To_v1alpha8_LoadBalancer(in *LoadBalancer, out *v1alpha8.LoadBalancer, s conversion.Scope) error { +func autoConvert_v1alpha7_LoadBalancer_To_v1beta1_LoadBalancer(in *LoadBalancer, out *v1beta1.LoadBalancer, s conversion.Scope) error { out.Name = in.Name out.ID = in.ID out.IP = in.IP @@ -687,12 +687,12 @@ func autoConvert_v1alpha7_LoadBalancer_To_v1alpha8_LoadBalancer(in *LoadBalancer return nil } -// Convert_v1alpha7_LoadBalancer_To_v1alpha8_LoadBalancer is an autogenerated conversion function. -func Convert_v1alpha7_LoadBalancer_To_v1alpha8_LoadBalancer(in *LoadBalancer, out *v1alpha8.LoadBalancer, s conversion.Scope) error { - return autoConvert_v1alpha7_LoadBalancer_To_v1alpha8_LoadBalancer(in, out, s) +// Convert_v1alpha7_LoadBalancer_To_v1beta1_LoadBalancer is an autogenerated conversion function. +func Convert_v1alpha7_LoadBalancer_To_v1beta1_LoadBalancer(in *LoadBalancer, out *v1beta1.LoadBalancer, s conversion.Scope) error { + return autoConvert_v1alpha7_LoadBalancer_To_v1beta1_LoadBalancer(in, out, s) } -func autoConvert_v1alpha8_LoadBalancer_To_v1alpha7_LoadBalancer(in *v1alpha8.LoadBalancer, out *LoadBalancer, s conversion.Scope) error { +func autoConvert_v1beta1_LoadBalancer_To_v1alpha7_LoadBalancer(in *v1beta1.LoadBalancer, out *LoadBalancer, s conversion.Scope) error { out.Name = in.Name out.ID = in.ID out.IP = in.IP @@ -702,12 +702,12 @@ func autoConvert_v1alpha8_LoadBalancer_To_v1alpha7_LoadBalancer(in *v1alpha8.Loa return nil } -// Convert_v1alpha8_LoadBalancer_To_v1alpha7_LoadBalancer is an autogenerated conversion function. -func Convert_v1alpha8_LoadBalancer_To_v1alpha7_LoadBalancer(in *v1alpha8.LoadBalancer, out *LoadBalancer, s conversion.Scope) error { - return autoConvert_v1alpha8_LoadBalancer_To_v1alpha7_LoadBalancer(in, out, s) +// Convert_v1beta1_LoadBalancer_To_v1alpha7_LoadBalancer is an autogenerated conversion function. +func Convert_v1beta1_LoadBalancer_To_v1alpha7_LoadBalancer(in *v1beta1.LoadBalancer, out *LoadBalancer, s conversion.Scope) error { + return autoConvert_v1beta1_LoadBalancer_To_v1alpha7_LoadBalancer(in, out, s) } -func autoConvert_v1alpha7_NetworkFilter_To_v1alpha8_NetworkFilter(in *NetworkFilter, out *v1alpha8.NetworkFilter, s conversion.Scope) error { +func autoConvert_v1alpha7_NetworkFilter_To_v1beta1_NetworkFilter(in *NetworkFilter, out *v1beta1.NetworkFilter, s conversion.Scope) error { out.Name = in.Name out.Description = in.Description out.ProjectID = in.ProjectID @@ -719,12 +719,12 @@ func autoConvert_v1alpha7_NetworkFilter_To_v1alpha8_NetworkFilter(in *NetworkFil return nil } -// Convert_v1alpha7_NetworkFilter_To_v1alpha8_NetworkFilter is an autogenerated conversion function. -func Convert_v1alpha7_NetworkFilter_To_v1alpha8_NetworkFilter(in *NetworkFilter, out *v1alpha8.NetworkFilter, s conversion.Scope) error { - return autoConvert_v1alpha7_NetworkFilter_To_v1alpha8_NetworkFilter(in, out, s) +// Convert_v1alpha7_NetworkFilter_To_v1beta1_NetworkFilter is an autogenerated conversion function. +func Convert_v1alpha7_NetworkFilter_To_v1beta1_NetworkFilter(in *NetworkFilter, out *v1beta1.NetworkFilter, s conversion.Scope) error { + return autoConvert_v1alpha7_NetworkFilter_To_v1beta1_NetworkFilter(in, out, s) } -func autoConvert_v1alpha8_NetworkFilter_To_v1alpha7_NetworkFilter(in *v1alpha8.NetworkFilter, out *NetworkFilter, s conversion.Scope) error { +func autoConvert_v1beta1_NetworkFilter_To_v1alpha7_NetworkFilter(in *v1beta1.NetworkFilter, out *NetworkFilter, s conversion.Scope) error { out.Name = in.Name out.Description = in.Description out.ProjectID = in.ProjectID @@ -736,100 +736,100 @@ func autoConvert_v1alpha8_NetworkFilter_To_v1alpha7_NetworkFilter(in *v1alpha8.N return nil } -// Convert_v1alpha8_NetworkFilter_To_v1alpha7_NetworkFilter is an autogenerated conversion function. -func Convert_v1alpha8_NetworkFilter_To_v1alpha7_NetworkFilter(in *v1alpha8.NetworkFilter, out *NetworkFilter, s conversion.Scope) error { - return autoConvert_v1alpha8_NetworkFilter_To_v1alpha7_NetworkFilter(in, out, s) +// Convert_v1beta1_NetworkFilter_To_v1alpha7_NetworkFilter is an autogenerated conversion function. +func Convert_v1beta1_NetworkFilter_To_v1alpha7_NetworkFilter(in *v1beta1.NetworkFilter, out *NetworkFilter, s conversion.Scope) error { + return autoConvert_v1beta1_NetworkFilter_To_v1alpha7_NetworkFilter(in, out, s) } -func autoConvert_v1alpha7_NetworkStatus_To_v1alpha8_NetworkStatus(in *NetworkStatus, out *v1alpha8.NetworkStatus, s conversion.Scope) error { +func autoConvert_v1alpha7_NetworkStatus_To_v1beta1_NetworkStatus(in *NetworkStatus, out *v1beta1.NetworkStatus, s conversion.Scope) error { out.Name = in.Name out.ID = in.ID out.Tags = *(*[]string)(unsafe.Pointer(&in.Tags)) return nil } -// Convert_v1alpha7_NetworkStatus_To_v1alpha8_NetworkStatus is an autogenerated conversion function. -func Convert_v1alpha7_NetworkStatus_To_v1alpha8_NetworkStatus(in *NetworkStatus, out *v1alpha8.NetworkStatus, s conversion.Scope) error { - return autoConvert_v1alpha7_NetworkStatus_To_v1alpha8_NetworkStatus(in, out, s) +// Convert_v1alpha7_NetworkStatus_To_v1beta1_NetworkStatus is an autogenerated conversion function. +func Convert_v1alpha7_NetworkStatus_To_v1beta1_NetworkStatus(in *NetworkStatus, out *v1beta1.NetworkStatus, s conversion.Scope) error { + return autoConvert_v1alpha7_NetworkStatus_To_v1beta1_NetworkStatus(in, out, s) } -func autoConvert_v1alpha8_NetworkStatus_To_v1alpha7_NetworkStatus(in *v1alpha8.NetworkStatus, out *NetworkStatus, s conversion.Scope) error { +func autoConvert_v1beta1_NetworkStatus_To_v1alpha7_NetworkStatus(in *v1beta1.NetworkStatus, out *NetworkStatus, s conversion.Scope) error { out.Name = in.Name out.ID = in.ID out.Tags = *(*[]string)(unsafe.Pointer(&in.Tags)) return nil } -// Convert_v1alpha8_NetworkStatus_To_v1alpha7_NetworkStatus is an autogenerated conversion function. -func Convert_v1alpha8_NetworkStatus_To_v1alpha7_NetworkStatus(in *v1alpha8.NetworkStatus, out *NetworkStatus, s conversion.Scope) error { - return autoConvert_v1alpha8_NetworkStatus_To_v1alpha7_NetworkStatus(in, out, s) +// Convert_v1beta1_NetworkStatus_To_v1alpha7_NetworkStatus is an autogenerated conversion function. +func Convert_v1beta1_NetworkStatus_To_v1alpha7_NetworkStatus(in *v1beta1.NetworkStatus, out *NetworkStatus, s conversion.Scope) error { + return autoConvert_v1beta1_NetworkStatus_To_v1alpha7_NetworkStatus(in, out, s) } -func autoConvert_v1alpha7_NetworkStatusWithSubnets_To_v1alpha8_NetworkStatusWithSubnets(in *NetworkStatusWithSubnets, out *v1alpha8.NetworkStatusWithSubnets, s conversion.Scope) error { - if err := Convert_v1alpha7_NetworkStatus_To_v1alpha8_NetworkStatus(&in.NetworkStatus, &out.NetworkStatus, s); err != nil { +func autoConvert_v1alpha7_NetworkStatusWithSubnets_To_v1beta1_NetworkStatusWithSubnets(in *NetworkStatusWithSubnets, out *v1beta1.NetworkStatusWithSubnets, s conversion.Scope) error { + if err := Convert_v1alpha7_NetworkStatus_To_v1beta1_NetworkStatus(&in.NetworkStatus, &out.NetworkStatus, s); err != nil { return err } - out.Subnets = *(*[]v1alpha8.Subnet)(unsafe.Pointer(&in.Subnets)) + out.Subnets = *(*[]v1beta1.Subnet)(unsafe.Pointer(&in.Subnets)) return nil } -// Convert_v1alpha7_NetworkStatusWithSubnets_To_v1alpha8_NetworkStatusWithSubnets is an autogenerated conversion function. -func Convert_v1alpha7_NetworkStatusWithSubnets_To_v1alpha8_NetworkStatusWithSubnets(in *NetworkStatusWithSubnets, out *v1alpha8.NetworkStatusWithSubnets, s conversion.Scope) error { - return autoConvert_v1alpha7_NetworkStatusWithSubnets_To_v1alpha8_NetworkStatusWithSubnets(in, out, s) +// Convert_v1alpha7_NetworkStatusWithSubnets_To_v1beta1_NetworkStatusWithSubnets is an autogenerated conversion function. +func Convert_v1alpha7_NetworkStatusWithSubnets_To_v1beta1_NetworkStatusWithSubnets(in *NetworkStatusWithSubnets, out *v1beta1.NetworkStatusWithSubnets, s conversion.Scope) error { + return autoConvert_v1alpha7_NetworkStatusWithSubnets_To_v1beta1_NetworkStatusWithSubnets(in, out, s) } -func autoConvert_v1alpha8_NetworkStatusWithSubnets_To_v1alpha7_NetworkStatusWithSubnets(in *v1alpha8.NetworkStatusWithSubnets, out *NetworkStatusWithSubnets, s conversion.Scope) error { - if err := Convert_v1alpha8_NetworkStatus_To_v1alpha7_NetworkStatus(&in.NetworkStatus, &out.NetworkStatus, s); err != nil { +func autoConvert_v1beta1_NetworkStatusWithSubnets_To_v1alpha7_NetworkStatusWithSubnets(in *v1beta1.NetworkStatusWithSubnets, out *NetworkStatusWithSubnets, s conversion.Scope) error { + if err := Convert_v1beta1_NetworkStatus_To_v1alpha7_NetworkStatus(&in.NetworkStatus, &out.NetworkStatus, s); err != nil { return err } out.Subnets = *(*[]Subnet)(unsafe.Pointer(&in.Subnets)) return nil } -// Convert_v1alpha8_NetworkStatusWithSubnets_To_v1alpha7_NetworkStatusWithSubnets is an autogenerated conversion function. -func Convert_v1alpha8_NetworkStatusWithSubnets_To_v1alpha7_NetworkStatusWithSubnets(in *v1alpha8.NetworkStatusWithSubnets, out *NetworkStatusWithSubnets, s conversion.Scope) error { - return autoConvert_v1alpha8_NetworkStatusWithSubnets_To_v1alpha7_NetworkStatusWithSubnets(in, out, s) +// Convert_v1beta1_NetworkStatusWithSubnets_To_v1alpha7_NetworkStatusWithSubnets is an autogenerated conversion function. +func Convert_v1beta1_NetworkStatusWithSubnets_To_v1alpha7_NetworkStatusWithSubnets(in *v1beta1.NetworkStatusWithSubnets, out *NetworkStatusWithSubnets, s conversion.Scope) error { + return autoConvert_v1beta1_NetworkStatusWithSubnets_To_v1alpha7_NetworkStatusWithSubnets(in, out, s) } -func autoConvert_v1alpha7_OpenStackCluster_To_v1alpha8_OpenStackCluster(in *OpenStackCluster, out *v1alpha8.OpenStackCluster, s conversion.Scope) error { +func autoConvert_v1alpha7_OpenStackCluster_To_v1beta1_OpenStackCluster(in *OpenStackCluster, out *v1beta1.OpenStackCluster, s conversion.Scope) error { out.ObjectMeta = in.ObjectMeta - if err := Convert_v1alpha7_OpenStackClusterSpec_To_v1alpha8_OpenStackClusterSpec(&in.Spec, &out.Spec, s); err != nil { + if err := Convert_v1alpha7_OpenStackClusterSpec_To_v1beta1_OpenStackClusterSpec(&in.Spec, &out.Spec, s); err != nil { return err } - if err := Convert_v1alpha7_OpenStackClusterStatus_To_v1alpha8_OpenStackClusterStatus(&in.Status, &out.Status, s); err != nil { + if err := Convert_v1alpha7_OpenStackClusterStatus_To_v1beta1_OpenStackClusterStatus(&in.Status, &out.Status, s); err != nil { return err } return nil } -// Convert_v1alpha7_OpenStackCluster_To_v1alpha8_OpenStackCluster is an autogenerated conversion function. -func Convert_v1alpha7_OpenStackCluster_To_v1alpha8_OpenStackCluster(in *OpenStackCluster, out *v1alpha8.OpenStackCluster, s conversion.Scope) error { - return autoConvert_v1alpha7_OpenStackCluster_To_v1alpha8_OpenStackCluster(in, out, s) +// Convert_v1alpha7_OpenStackCluster_To_v1beta1_OpenStackCluster is an autogenerated conversion function. +func Convert_v1alpha7_OpenStackCluster_To_v1beta1_OpenStackCluster(in *OpenStackCluster, out *v1beta1.OpenStackCluster, s conversion.Scope) error { + return autoConvert_v1alpha7_OpenStackCluster_To_v1beta1_OpenStackCluster(in, out, s) } -func autoConvert_v1alpha8_OpenStackCluster_To_v1alpha7_OpenStackCluster(in *v1alpha8.OpenStackCluster, out *OpenStackCluster, s conversion.Scope) error { +func autoConvert_v1beta1_OpenStackCluster_To_v1alpha7_OpenStackCluster(in *v1beta1.OpenStackCluster, out *OpenStackCluster, s conversion.Scope) error { out.ObjectMeta = in.ObjectMeta - if err := Convert_v1alpha8_OpenStackClusterSpec_To_v1alpha7_OpenStackClusterSpec(&in.Spec, &out.Spec, s); err != nil { + if err := Convert_v1beta1_OpenStackClusterSpec_To_v1alpha7_OpenStackClusterSpec(&in.Spec, &out.Spec, s); err != nil { return err } - if err := Convert_v1alpha8_OpenStackClusterStatus_To_v1alpha7_OpenStackClusterStatus(&in.Status, &out.Status, s); err != nil { + if err := Convert_v1beta1_OpenStackClusterStatus_To_v1alpha7_OpenStackClusterStatus(&in.Status, &out.Status, s); err != nil { return err } return nil } -// Convert_v1alpha8_OpenStackCluster_To_v1alpha7_OpenStackCluster is an autogenerated conversion function. -func Convert_v1alpha8_OpenStackCluster_To_v1alpha7_OpenStackCluster(in *v1alpha8.OpenStackCluster, out *OpenStackCluster, s conversion.Scope) error { - return autoConvert_v1alpha8_OpenStackCluster_To_v1alpha7_OpenStackCluster(in, out, s) +// Convert_v1beta1_OpenStackCluster_To_v1alpha7_OpenStackCluster is an autogenerated conversion function. +func Convert_v1beta1_OpenStackCluster_To_v1alpha7_OpenStackCluster(in *v1beta1.OpenStackCluster, out *OpenStackCluster, s conversion.Scope) error { + return autoConvert_v1beta1_OpenStackCluster_To_v1alpha7_OpenStackCluster(in, out, s) } -func autoConvert_v1alpha7_OpenStackClusterList_To_v1alpha8_OpenStackClusterList(in *OpenStackClusterList, out *v1alpha8.OpenStackClusterList, s conversion.Scope) error { +func autoConvert_v1alpha7_OpenStackClusterList_To_v1beta1_OpenStackClusterList(in *OpenStackClusterList, out *v1beta1.OpenStackClusterList, s conversion.Scope) error { out.ListMeta = in.ListMeta if in.Items != nil { in, out := &in.Items, &out.Items - *out = make([]v1alpha8.OpenStackCluster, len(*in)) + *out = make([]v1beta1.OpenStackCluster, len(*in)) for i := range *in { - if err := Convert_v1alpha7_OpenStackCluster_To_v1alpha8_OpenStackCluster(&(*in)[i], &(*out)[i], s); err != nil { + if err := Convert_v1alpha7_OpenStackCluster_To_v1beta1_OpenStackCluster(&(*in)[i], &(*out)[i], s); err != nil { return err } } @@ -839,18 +839,18 @@ func autoConvert_v1alpha7_OpenStackClusterList_To_v1alpha8_OpenStackClusterList( return nil } -// Convert_v1alpha7_OpenStackClusterList_To_v1alpha8_OpenStackClusterList is an autogenerated conversion function. -func Convert_v1alpha7_OpenStackClusterList_To_v1alpha8_OpenStackClusterList(in *OpenStackClusterList, out *v1alpha8.OpenStackClusterList, s conversion.Scope) error { - return autoConvert_v1alpha7_OpenStackClusterList_To_v1alpha8_OpenStackClusterList(in, out, s) +// Convert_v1alpha7_OpenStackClusterList_To_v1beta1_OpenStackClusterList is an autogenerated conversion function. +func Convert_v1alpha7_OpenStackClusterList_To_v1beta1_OpenStackClusterList(in *OpenStackClusterList, out *v1beta1.OpenStackClusterList, s conversion.Scope) error { + return autoConvert_v1alpha7_OpenStackClusterList_To_v1beta1_OpenStackClusterList(in, out, s) } -func autoConvert_v1alpha8_OpenStackClusterList_To_v1alpha7_OpenStackClusterList(in *v1alpha8.OpenStackClusterList, out *OpenStackClusterList, s conversion.Scope) error { +func autoConvert_v1beta1_OpenStackClusterList_To_v1alpha7_OpenStackClusterList(in *v1beta1.OpenStackClusterList, out *OpenStackClusterList, s conversion.Scope) error { out.ListMeta = in.ListMeta if in.Items != nil { in, out := &in.Items, &out.Items *out = make([]OpenStackCluster, len(*in)) for i := range *in { - if err := Convert_v1alpha8_OpenStackCluster_To_v1alpha7_OpenStackCluster(&(*in)[i], &(*out)[i], s); err != nil { + if err := Convert_v1beta1_OpenStackCluster_To_v1alpha7_OpenStackCluster(&(*in)[i], &(*out)[i], s); err != nil { return err } } @@ -860,31 +860,31 @@ func autoConvert_v1alpha8_OpenStackClusterList_To_v1alpha7_OpenStackClusterList( return nil } -// Convert_v1alpha8_OpenStackClusterList_To_v1alpha7_OpenStackClusterList is an autogenerated conversion function. -func Convert_v1alpha8_OpenStackClusterList_To_v1alpha7_OpenStackClusterList(in *v1alpha8.OpenStackClusterList, out *OpenStackClusterList, s conversion.Scope) error { - return autoConvert_v1alpha8_OpenStackClusterList_To_v1alpha7_OpenStackClusterList(in, out, s) +// Convert_v1beta1_OpenStackClusterList_To_v1alpha7_OpenStackClusterList is an autogenerated conversion function. +func Convert_v1beta1_OpenStackClusterList_To_v1alpha7_OpenStackClusterList(in *v1beta1.OpenStackClusterList, out *OpenStackClusterList, s conversion.Scope) error { + return autoConvert_v1beta1_OpenStackClusterList_To_v1alpha7_OpenStackClusterList(in, out, s) } -func autoConvert_v1alpha7_OpenStackClusterSpec_To_v1alpha8_OpenStackClusterSpec(in *OpenStackClusterSpec, out *v1alpha8.OpenStackClusterSpec, s conversion.Scope) error { +func autoConvert_v1alpha7_OpenStackClusterSpec_To_v1beta1_OpenStackClusterSpec(in *OpenStackClusterSpec, out *v1beta1.OpenStackClusterSpec, s conversion.Scope) error { out.CloudName = in.CloudName // WARNING: in.NodeCIDR requires manual conversion: does not exist in peer-type - out.Router = (*v1alpha8.RouterFilter)(unsafe.Pointer(in.Router)) - if err := Convert_v1alpha7_NetworkFilter_To_v1alpha8_NetworkFilter(&in.Network, &out.Network, s); err != nil { + out.Router = (*v1beta1.RouterFilter)(unsafe.Pointer(in.Router)) + if err := Convert_v1alpha7_NetworkFilter_To_v1beta1_NetworkFilter(&in.Network, &out.Network, s); err != nil { return err } // WARNING: in.Subnet requires manual conversion: does not exist in peer-type out.NetworkMTU = in.NetworkMTU // WARNING: in.DNSNameservers requires manual conversion: does not exist in peer-type - out.ExternalRouterIPs = *(*[]v1alpha8.ExternalRouterIPParam)(unsafe.Pointer(&in.ExternalRouterIPs)) + out.ExternalRouterIPs = *(*[]v1beta1.ExternalRouterIPParam)(unsafe.Pointer(&in.ExternalRouterIPs)) // WARNING: in.ExternalNetworkID requires manual conversion: does not exist in peer-type - if err := Convert_v1alpha7_APIServerLoadBalancer_To_v1alpha8_APIServerLoadBalancer(&in.APIServerLoadBalancer, &out.APIServerLoadBalancer, s); err != nil { + if err := Convert_v1alpha7_APIServerLoadBalancer_To_v1beta1_APIServerLoadBalancer(&in.APIServerLoadBalancer, &out.APIServerLoadBalancer, s); err != nil { return err } out.DisableAPIServerFloatingIP = in.DisableAPIServerFloatingIP out.APIServerFloatingIP = in.APIServerFloatingIP out.APIServerFixedIP = in.APIServerFixedIP out.APIServerPort = in.APIServerPort - // WARNING: in.ManagedSecurityGroups requires manual conversion: inconvertible types (bool vs *sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha8.ManagedSecurityGroups) + // WARNING: in.ManagedSecurityGroups requires manual conversion: inconvertible types (bool vs *sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1.ManagedSecurityGroups) // WARNING: in.AllowAllInClusterTraffic requires manual conversion: does not exist in peer-type out.DisablePortSecurity = in.DisablePortSecurity out.Tags = *(*[]string)(unsafe.Pointer(&in.Tags)) @@ -893,22 +893,22 @@ func autoConvert_v1alpha7_OpenStackClusterSpec_To_v1alpha8_OpenStackClusterSpec( out.ControlPlaneOmitAvailabilityZone = in.ControlPlaneOmitAvailabilityZone if in.Bastion != nil { in, out := &in.Bastion, &out.Bastion - *out = new(v1alpha8.Bastion) - if err := Convert_v1alpha7_Bastion_To_v1alpha8_Bastion(*in, *out, s); err != nil { + *out = new(v1beta1.Bastion) + if err := Convert_v1alpha7_Bastion_To_v1beta1_Bastion(*in, *out, s); err != nil { return err } } else { out.Bastion = nil } - out.IdentityRef = (*v1alpha8.OpenStackIdentityReference)(unsafe.Pointer(in.IdentityRef)) + out.IdentityRef = (*v1beta1.OpenStackIdentityReference)(unsafe.Pointer(in.IdentityRef)) return nil } -func autoConvert_v1alpha8_OpenStackClusterSpec_To_v1alpha7_OpenStackClusterSpec(in *v1alpha8.OpenStackClusterSpec, out *OpenStackClusterSpec, s conversion.Scope) error { +func autoConvert_v1beta1_OpenStackClusterSpec_To_v1alpha7_OpenStackClusterSpec(in *v1beta1.OpenStackClusterSpec, out *OpenStackClusterSpec, s conversion.Scope) error { out.CloudName = in.CloudName // WARNING: in.ManagedSubnets requires manual conversion: does not exist in peer-type out.Router = (*RouterFilter)(unsafe.Pointer(in.Router)) - if err := Convert_v1alpha8_NetworkFilter_To_v1alpha7_NetworkFilter(&in.Network, &out.Network, s); err != nil { + if err := Convert_v1beta1_NetworkFilter_To_v1alpha7_NetworkFilter(&in.Network, &out.Network, s); err != nil { return err } // WARNING: in.Subnets requires manual conversion: does not exist in peer-type @@ -916,14 +916,14 @@ func autoConvert_v1alpha8_OpenStackClusterSpec_To_v1alpha7_OpenStackClusterSpec( out.ExternalRouterIPs = *(*[]ExternalRouterIPParam)(unsafe.Pointer(&in.ExternalRouterIPs)) // WARNING: in.ExternalNetwork requires manual conversion: does not exist in peer-type // WARNING: in.DisableExternalNetwork requires manual conversion: does not exist in peer-type - if err := Convert_v1alpha8_APIServerLoadBalancer_To_v1alpha7_APIServerLoadBalancer(&in.APIServerLoadBalancer, &out.APIServerLoadBalancer, s); err != nil { + if err := Convert_v1beta1_APIServerLoadBalancer_To_v1alpha7_APIServerLoadBalancer(&in.APIServerLoadBalancer, &out.APIServerLoadBalancer, s); err != nil { return err } out.DisableAPIServerFloatingIP = in.DisableAPIServerFloatingIP out.APIServerFloatingIP = in.APIServerFloatingIP out.APIServerFixedIP = in.APIServerFixedIP out.APIServerPort = in.APIServerPort - // WARNING: in.ManagedSecurityGroups requires manual conversion: inconvertible types (*sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha8.ManagedSecurityGroups vs bool) + // WARNING: in.ManagedSecurityGroups requires manual conversion: inconvertible types (*sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1.ManagedSecurityGroups vs bool) out.DisablePortSecurity = in.DisablePortSecurity out.Tags = *(*[]string)(unsafe.Pointer(&in.Tags)) out.ControlPlaneEndpoint = in.ControlPlaneEndpoint @@ -932,7 +932,7 @@ func autoConvert_v1alpha8_OpenStackClusterSpec_To_v1alpha7_OpenStackClusterSpec( if in.Bastion != nil { in, out := &in.Bastion, &out.Bastion *out = new(Bastion) - if err := Convert_v1alpha8_Bastion_To_v1alpha7_Bastion(*in, *out, s); err != nil { + if err := Convert_v1beta1_Bastion_To_v1alpha7_Bastion(*in, *out, s); err != nil { return err } } else { @@ -942,17 +942,17 @@ func autoConvert_v1alpha8_OpenStackClusterSpec_To_v1alpha7_OpenStackClusterSpec( return nil } -func autoConvert_v1alpha7_OpenStackClusterStatus_To_v1alpha8_OpenStackClusterStatus(in *OpenStackClusterStatus, out *v1alpha8.OpenStackClusterStatus, s conversion.Scope) error { +func autoConvert_v1alpha7_OpenStackClusterStatus_To_v1beta1_OpenStackClusterStatus(in *OpenStackClusterStatus, out *v1beta1.OpenStackClusterStatus, s conversion.Scope) error { out.Ready = in.Ready - out.Network = (*v1alpha8.NetworkStatusWithSubnets)(unsafe.Pointer(in.Network)) - out.ExternalNetwork = (*v1alpha8.NetworkStatus)(unsafe.Pointer(in.ExternalNetwork)) - out.Router = (*v1alpha8.Router)(unsafe.Pointer(in.Router)) - out.APIServerLoadBalancer = (*v1alpha8.LoadBalancer)(unsafe.Pointer(in.APIServerLoadBalancer)) - out.FailureDomains = *(*v1beta1.FailureDomains)(unsafe.Pointer(&in.FailureDomains)) + out.Network = (*v1beta1.NetworkStatusWithSubnets)(unsafe.Pointer(in.Network)) + out.ExternalNetwork = (*v1beta1.NetworkStatus)(unsafe.Pointer(in.ExternalNetwork)) + out.Router = (*v1beta1.Router)(unsafe.Pointer(in.Router)) + out.APIServerLoadBalancer = (*v1beta1.LoadBalancer)(unsafe.Pointer(in.APIServerLoadBalancer)) + out.FailureDomains = *(*apiv1beta1.FailureDomains)(unsafe.Pointer(&in.FailureDomains)) if in.ControlPlaneSecurityGroup != nil { in, out := &in.ControlPlaneSecurityGroup, &out.ControlPlaneSecurityGroup - *out = new(v1alpha8.SecurityGroupStatus) - if err := Convert_v1alpha7_SecurityGroup_To_v1alpha8_SecurityGroupStatus(*in, *out, s); err != nil { + *out = new(v1beta1.SecurityGroupStatus) + if err := Convert_v1alpha7_SecurityGroup_To_v1beta1_SecurityGroupStatus(*in, *out, s); err != nil { return err } } else { @@ -960,8 +960,8 @@ func autoConvert_v1alpha7_OpenStackClusterStatus_To_v1alpha8_OpenStackClusterSta } if in.WorkerSecurityGroup != nil { in, out := &in.WorkerSecurityGroup, &out.WorkerSecurityGroup - *out = new(v1alpha8.SecurityGroupStatus) - if err := Convert_v1alpha7_SecurityGroup_To_v1alpha8_SecurityGroupStatus(*in, *out, s); err != nil { + *out = new(v1beta1.SecurityGroupStatus) + if err := Convert_v1alpha7_SecurityGroup_To_v1beta1_SecurityGroupStatus(*in, *out, s); err != nil { return err } } else { @@ -969,8 +969,8 @@ func autoConvert_v1alpha7_OpenStackClusterStatus_To_v1alpha8_OpenStackClusterSta } if in.BastionSecurityGroup != nil { in, out := &in.BastionSecurityGroup, &out.BastionSecurityGroup - *out = new(v1alpha8.SecurityGroupStatus) - if err := Convert_v1alpha7_SecurityGroup_To_v1alpha8_SecurityGroupStatus(*in, *out, s); err != nil { + *out = new(v1beta1.SecurityGroupStatus) + if err := Convert_v1alpha7_SecurityGroup_To_v1beta1_SecurityGroupStatus(*in, *out, s); err != nil { return err } } else { @@ -978,8 +978,8 @@ func autoConvert_v1alpha7_OpenStackClusterStatus_To_v1alpha8_OpenStackClusterSta } if in.Bastion != nil { in, out := &in.Bastion, &out.Bastion - *out = new(v1alpha8.BastionStatus) - if err := Convert_v1alpha7_BastionStatus_To_v1alpha8_BastionStatus(*in, *out, s); err != nil { + *out = new(v1beta1.BastionStatus) + if err := Convert_v1alpha7_BastionStatus_To_v1beta1_BastionStatus(*in, *out, s); err != nil { return err } } else { @@ -990,22 +990,22 @@ func autoConvert_v1alpha7_OpenStackClusterStatus_To_v1alpha8_OpenStackClusterSta return nil } -// Convert_v1alpha7_OpenStackClusterStatus_To_v1alpha8_OpenStackClusterStatus is an autogenerated conversion function. -func Convert_v1alpha7_OpenStackClusterStatus_To_v1alpha8_OpenStackClusterStatus(in *OpenStackClusterStatus, out *v1alpha8.OpenStackClusterStatus, s conversion.Scope) error { - return autoConvert_v1alpha7_OpenStackClusterStatus_To_v1alpha8_OpenStackClusterStatus(in, out, s) +// Convert_v1alpha7_OpenStackClusterStatus_To_v1beta1_OpenStackClusterStatus is an autogenerated conversion function. +func Convert_v1alpha7_OpenStackClusterStatus_To_v1beta1_OpenStackClusterStatus(in *OpenStackClusterStatus, out *v1beta1.OpenStackClusterStatus, s conversion.Scope) error { + return autoConvert_v1alpha7_OpenStackClusterStatus_To_v1beta1_OpenStackClusterStatus(in, out, s) } -func autoConvert_v1alpha8_OpenStackClusterStatus_To_v1alpha7_OpenStackClusterStatus(in *v1alpha8.OpenStackClusterStatus, out *OpenStackClusterStatus, s conversion.Scope) error { +func autoConvert_v1beta1_OpenStackClusterStatus_To_v1alpha7_OpenStackClusterStatus(in *v1beta1.OpenStackClusterStatus, out *OpenStackClusterStatus, s conversion.Scope) error { out.Ready = in.Ready out.Network = (*NetworkStatusWithSubnets)(unsafe.Pointer(in.Network)) out.ExternalNetwork = (*NetworkStatus)(unsafe.Pointer(in.ExternalNetwork)) out.Router = (*Router)(unsafe.Pointer(in.Router)) out.APIServerLoadBalancer = (*LoadBalancer)(unsafe.Pointer(in.APIServerLoadBalancer)) - out.FailureDomains = *(*v1beta1.FailureDomains)(unsafe.Pointer(&in.FailureDomains)) + out.FailureDomains = *(*apiv1beta1.FailureDomains)(unsafe.Pointer(&in.FailureDomains)) if in.ControlPlaneSecurityGroup != nil { in, out := &in.ControlPlaneSecurityGroup, &out.ControlPlaneSecurityGroup *out = new(SecurityGroup) - if err := Convert_v1alpha8_SecurityGroupStatus_To_v1alpha7_SecurityGroup(*in, *out, s); err != nil { + if err := Convert_v1beta1_SecurityGroupStatus_To_v1alpha7_SecurityGroup(*in, *out, s); err != nil { return err } } else { @@ -1014,7 +1014,7 @@ func autoConvert_v1alpha8_OpenStackClusterStatus_To_v1alpha7_OpenStackClusterSta if in.WorkerSecurityGroup != nil { in, out := &in.WorkerSecurityGroup, &out.WorkerSecurityGroup *out = new(SecurityGroup) - if err := Convert_v1alpha8_SecurityGroupStatus_To_v1alpha7_SecurityGroup(*in, *out, s); err != nil { + if err := Convert_v1beta1_SecurityGroupStatus_To_v1alpha7_SecurityGroup(*in, *out, s); err != nil { return err } } else { @@ -1023,7 +1023,7 @@ func autoConvert_v1alpha8_OpenStackClusterStatus_To_v1alpha7_OpenStackClusterSta if in.BastionSecurityGroup != nil { in, out := &in.BastionSecurityGroup, &out.BastionSecurityGroup *out = new(SecurityGroup) - if err := Convert_v1alpha8_SecurityGroupStatus_To_v1alpha7_SecurityGroup(*in, *out, s); err != nil { + if err := Convert_v1beta1_SecurityGroupStatus_To_v1alpha7_SecurityGroup(*in, *out, s); err != nil { return err } } else { @@ -1032,7 +1032,7 @@ func autoConvert_v1alpha8_OpenStackClusterStatus_To_v1alpha7_OpenStackClusterSta if in.Bastion != nil { in, out := &in.Bastion, &out.Bastion *out = new(BastionStatus) - if err := Convert_v1alpha8_BastionStatus_To_v1alpha7_BastionStatus(*in, *out, s); err != nil { + if err := Convert_v1beta1_BastionStatus_To_v1alpha7_BastionStatus(*in, *out, s); err != nil { return err } } else { @@ -1043,44 +1043,44 @@ func autoConvert_v1alpha8_OpenStackClusterStatus_To_v1alpha7_OpenStackClusterSta return nil } -// Convert_v1alpha8_OpenStackClusterStatus_To_v1alpha7_OpenStackClusterStatus is an autogenerated conversion function. -func Convert_v1alpha8_OpenStackClusterStatus_To_v1alpha7_OpenStackClusterStatus(in *v1alpha8.OpenStackClusterStatus, out *OpenStackClusterStatus, s conversion.Scope) error { - return autoConvert_v1alpha8_OpenStackClusterStatus_To_v1alpha7_OpenStackClusterStatus(in, out, s) +// Convert_v1beta1_OpenStackClusterStatus_To_v1alpha7_OpenStackClusterStatus is an autogenerated conversion function. +func Convert_v1beta1_OpenStackClusterStatus_To_v1alpha7_OpenStackClusterStatus(in *v1beta1.OpenStackClusterStatus, out *OpenStackClusterStatus, s conversion.Scope) error { + return autoConvert_v1beta1_OpenStackClusterStatus_To_v1alpha7_OpenStackClusterStatus(in, out, s) } -func autoConvert_v1alpha7_OpenStackClusterTemplate_To_v1alpha8_OpenStackClusterTemplate(in *OpenStackClusterTemplate, out *v1alpha8.OpenStackClusterTemplate, s conversion.Scope) error { +func autoConvert_v1alpha7_OpenStackClusterTemplate_To_v1beta1_OpenStackClusterTemplate(in *OpenStackClusterTemplate, out *v1beta1.OpenStackClusterTemplate, s conversion.Scope) error { out.ObjectMeta = in.ObjectMeta - if err := Convert_v1alpha7_OpenStackClusterTemplateSpec_To_v1alpha8_OpenStackClusterTemplateSpec(&in.Spec, &out.Spec, s); err != nil { + if err := Convert_v1alpha7_OpenStackClusterTemplateSpec_To_v1beta1_OpenStackClusterTemplateSpec(&in.Spec, &out.Spec, s); err != nil { return err } return nil } -// Convert_v1alpha7_OpenStackClusterTemplate_To_v1alpha8_OpenStackClusterTemplate is an autogenerated conversion function. -func Convert_v1alpha7_OpenStackClusterTemplate_To_v1alpha8_OpenStackClusterTemplate(in *OpenStackClusterTemplate, out *v1alpha8.OpenStackClusterTemplate, s conversion.Scope) error { - return autoConvert_v1alpha7_OpenStackClusterTemplate_To_v1alpha8_OpenStackClusterTemplate(in, out, s) +// Convert_v1alpha7_OpenStackClusterTemplate_To_v1beta1_OpenStackClusterTemplate is an autogenerated conversion function. +func Convert_v1alpha7_OpenStackClusterTemplate_To_v1beta1_OpenStackClusterTemplate(in *OpenStackClusterTemplate, out *v1beta1.OpenStackClusterTemplate, s conversion.Scope) error { + return autoConvert_v1alpha7_OpenStackClusterTemplate_To_v1beta1_OpenStackClusterTemplate(in, out, s) } -func autoConvert_v1alpha8_OpenStackClusterTemplate_To_v1alpha7_OpenStackClusterTemplate(in *v1alpha8.OpenStackClusterTemplate, out *OpenStackClusterTemplate, s conversion.Scope) error { +func autoConvert_v1beta1_OpenStackClusterTemplate_To_v1alpha7_OpenStackClusterTemplate(in *v1beta1.OpenStackClusterTemplate, out *OpenStackClusterTemplate, s conversion.Scope) error { out.ObjectMeta = in.ObjectMeta - if err := Convert_v1alpha8_OpenStackClusterTemplateSpec_To_v1alpha7_OpenStackClusterTemplateSpec(&in.Spec, &out.Spec, s); err != nil { + if err := Convert_v1beta1_OpenStackClusterTemplateSpec_To_v1alpha7_OpenStackClusterTemplateSpec(&in.Spec, &out.Spec, s); err != nil { return err } return nil } -// Convert_v1alpha8_OpenStackClusterTemplate_To_v1alpha7_OpenStackClusterTemplate is an autogenerated conversion function. -func Convert_v1alpha8_OpenStackClusterTemplate_To_v1alpha7_OpenStackClusterTemplate(in *v1alpha8.OpenStackClusterTemplate, out *OpenStackClusterTemplate, s conversion.Scope) error { - return autoConvert_v1alpha8_OpenStackClusterTemplate_To_v1alpha7_OpenStackClusterTemplate(in, out, s) +// Convert_v1beta1_OpenStackClusterTemplate_To_v1alpha7_OpenStackClusterTemplate is an autogenerated conversion function. +func Convert_v1beta1_OpenStackClusterTemplate_To_v1alpha7_OpenStackClusterTemplate(in *v1beta1.OpenStackClusterTemplate, out *OpenStackClusterTemplate, s conversion.Scope) error { + return autoConvert_v1beta1_OpenStackClusterTemplate_To_v1alpha7_OpenStackClusterTemplate(in, out, s) } -func autoConvert_v1alpha7_OpenStackClusterTemplateList_To_v1alpha8_OpenStackClusterTemplateList(in *OpenStackClusterTemplateList, out *v1alpha8.OpenStackClusterTemplateList, s conversion.Scope) error { +func autoConvert_v1alpha7_OpenStackClusterTemplateList_To_v1beta1_OpenStackClusterTemplateList(in *OpenStackClusterTemplateList, out *v1beta1.OpenStackClusterTemplateList, s conversion.Scope) error { out.ListMeta = in.ListMeta if in.Items != nil { in, out := &in.Items, &out.Items - *out = make([]v1alpha8.OpenStackClusterTemplate, len(*in)) + *out = make([]v1beta1.OpenStackClusterTemplate, len(*in)) for i := range *in { - if err := Convert_v1alpha7_OpenStackClusterTemplate_To_v1alpha8_OpenStackClusterTemplate(&(*in)[i], &(*out)[i], s); err != nil { + if err := Convert_v1alpha7_OpenStackClusterTemplate_To_v1beta1_OpenStackClusterTemplate(&(*in)[i], &(*out)[i], s); err != nil { return err } } @@ -1090,18 +1090,18 @@ func autoConvert_v1alpha7_OpenStackClusterTemplateList_To_v1alpha8_OpenStackClus return nil } -// Convert_v1alpha7_OpenStackClusterTemplateList_To_v1alpha8_OpenStackClusterTemplateList is an autogenerated conversion function. -func Convert_v1alpha7_OpenStackClusterTemplateList_To_v1alpha8_OpenStackClusterTemplateList(in *OpenStackClusterTemplateList, out *v1alpha8.OpenStackClusterTemplateList, s conversion.Scope) error { - return autoConvert_v1alpha7_OpenStackClusterTemplateList_To_v1alpha8_OpenStackClusterTemplateList(in, out, s) +// Convert_v1alpha7_OpenStackClusterTemplateList_To_v1beta1_OpenStackClusterTemplateList is an autogenerated conversion function. +func Convert_v1alpha7_OpenStackClusterTemplateList_To_v1beta1_OpenStackClusterTemplateList(in *OpenStackClusterTemplateList, out *v1beta1.OpenStackClusterTemplateList, s conversion.Scope) error { + return autoConvert_v1alpha7_OpenStackClusterTemplateList_To_v1beta1_OpenStackClusterTemplateList(in, out, s) } -func autoConvert_v1alpha8_OpenStackClusterTemplateList_To_v1alpha7_OpenStackClusterTemplateList(in *v1alpha8.OpenStackClusterTemplateList, out *OpenStackClusterTemplateList, s conversion.Scope) error { +func autoConvert_v1beta1_OpenStackClusterTemplateList_To_v1alpha7_OpenStackClusterTemplateList(in *v1beta1.OpenStackClusterTemplateList, out *OpenStackClusterTemplateList, s conversion.Scope) error { out.ListMeta = in.ListMeta if in.Items != nil { in, out := &in.Items, &out.Items *out = make([]OpenStackClusterTemplate, len(*in)) for i := range *in { - if err := Convert_v1alpha8_OpenStackClusterTemplate_To_v1alpha7_OpenStackClusterTemplate(&(*in)[i], &(*out)[i], s); err != nil { + if err := Convert_v1beta1_OpenStackClusterTemplate_To_v1alpha7_OpenStackClusterTemplate(&(*in)[i], &(*out)[i], s); err != nil { return err } } @@ -1111,120 +1111,120 @@ func autoConvert_v1alpha8_OpenStackClusterTemplateList_To_v1alpha7_OpenStackClus return nil } -// Convert_v1alpha8_OpenStackClusterTemplateList_To_v1alpha7_OpenStackClusterTemplateList is an autogenerated conversion function. -func Convert_v1alpha8_OpenStackClusterTemplateList_To_v1alpha7_OpenStackClusterTemplateList(in *v1alpha8.OpenStackClusterTemplateList, out *OpenStackClusterTemplateList, s conversion.Scope) error { - return autoConvert_v1alpha8_OpenStackClusterTemplateList_To_v1alpha7_OpenStackClusterTemplateList(in, out, s) +// Convert_v1beta1_OpenStackClusterTemplateList_To_v1alpha7_OpenStackClusterTemplateList is an autogenerated conversion function. +func Convert_v1beta1_OpenStackClusterTemplateList_To_v1alpha7_OpenStackClusterTemplateList(in *v1beta1.OpenStackClusterTemplateList, out *OpenStackClusterTemplateList, s conversion.Scope) error { + return autoConvert_v1beta1_OpenStackClusterTemplateList_To_v1alpha7_OpenStackClusterTemplateList(in, out, s) } -func autoConvert_v1alpha7_OpenStackClusterTemplateResource_To_v1alpha8_OpenStackClusterTemplateResource(in *OpenStackClusterTemplateResource, out *v1alpha8.OpenStackClusterTemplateResource, s conversion.Scope) error { - if err := Convert_v1alpha7_OpenStackClusterSpec_To_v1alpha8_OpenStackClusterSpec(&in.Spec, &out.Spec, s); err != nil { +func autoConvert_v1alpha7_OpenStackClusterTemplateResource_To_v1beta1_OpenStackClusterTemplateResource(in *OpenStackClusterTemplateResource, out *v1beta1.OpenStackClusterTemplateResource, s conversion.Scope) error { + if err := Convert_v1alpha7_OpenStackClusterSpec_To_v1beta1_OpenStackClusterSpec(&in.Spec, &out.Spec, s); err != nil { return err } return nil } -// Convert_v1alpha7_OpenStackClusterTemplateResource_To_v1alpha8_OpenStackClusterTemplateResource is an autogenerated conversion function. -func Convert_v1alpha7_OpenStackClusterTemplateResource_To_v1alpha8_OpenStackClusterTemplateResource(in *OpenStackClusterTemplateResource, out *v1alpha8.OpenStackClusterTemplateResource, s conversion.Scope) error { - return autoConvert_v1alpha7_OpenStackClusterTemplateResource_To_v1alpha8_OpenStackClusterTemplateResource(in, out, s) +// Convert_v1alpha7_OpenStackClusterTemplateResource_To_v1beta1_OpenStackClusterTemplateResource is an autogenerated conversion function. +func Convert_v1alpha7_OpenStackClusterTemplateResource_To_v1beta1_OpenStackClusterTemplateResource(in *OpenStackClusterTemplateResource, out *v1beta1.OpenStackClusterTemplateResource, s conversion.Scope) error { + return autoConvert_v1alpha7_OpenStackClusterTemplateResource_To_v1beta1_OpenStackClusterTemplateResource(in, out, s) } -func autoConvert_v1alpha8_OpenStackClusterTemplateResource_To_v1alpha7_OpenStackClusterTemplateResource(in *v1alpha8.OpenStackClusterTemplateResource, out *OpenStackClusterTemplateResource, s conversion.Scope) error { - if err := Convert_v1alpha8_OpenStackClusterSpec_To_v1alpha7_OpenStackClusterSpec(&in.Spec, &out.Spec, s); err != nil { +func autoConvert_v1beta1_OpenStackClusterTemplateResource_To_v1alpha7_OpenStackClusterTemplateResource(in *v1beta1.OpenStackClusterTemplateResource, out *OpenStackClusterTemplateResource, s conversion.Scope) error { + if err := Convert_v1beta1_OpenStackClusterSpec_To_v1alpha7_OpenStackClusterSpec(&in.Spec, &out.Spec, s); err != nil { return err } return nil } -// Convert_v1alpha8_OpenStackClusterTemplateResource_To_v1alpha7_OpenStackClusterTemplateResource is an autogenerated conversion function. -func Convert_v1alpha8_OpenStackClusterTemplateResource_To_v1alpha7_OpenStackClusterTemplateResource(in *v1alpha8.OpenStackClusterTemplateResource, out *OpenStackClusterTemplateResource, s conversion.Scope) error { - return autoConvert_v1alpha8_OpenStackClusterTemplateResource_To_v1alpha7_OpenStackClusterTemplateResource(in, out, s) +// Convert_v1beta1_OpenStackClusterTemplateResource_To_v1alpha7_OpenStackClusterTemplateResource is an autogenerated conversion function. +func Convert_v1beta1_OpenStackClusterTemplateResource_To_v1alpha7_OpenStackClusterTemplateResource(in *v1beta1.OpenStackClusterTemplateResource, out *OpenStackClusterTemplateResource, s conversion.Scope) error { + return autoConvert_v1beta1_OpenStackClusterTemplateResource_To_v1alpha7_OpenStackClusterTemplateResource(in, out, s) } -func autoConvert_v1alpha7_OpenStackClusterTemplateSpec_To_v1alpha8_OpenStackClusterTemplateSpec(in *OpenStackClusterTemplateSpec, out *v1alpha8.OpenStackClusterTemplateSpec, s conversion.Scope) error { - if err := Convert_v1alpha7_OpenStackClusterTemplateResource_To_v1alpha8_OpenStackClusterTemplateResource(&in.Template, &out.Template, s); err != nil { +func autoConvert_v1alpha7_OpenStackClusterTemplateSpec_To_v1beta1_OpenStackClusterTemplateSpec(in *OpenStackClusterTemplateSpec, out *v1beta1.OpenStackClusterTemplateSpec, s conversion.Scope) error { + if err := Convert_v1alpha7_OpenStackClusterTemplateResource_To_v1beta1_OpenStackClusterTemplateResource(&in.Template, &out.Template, s); err != nil { return err } return nil } -// Convert_v1alpha7_OpenStackClusterTemplateSpec_To_v1alpha8_OpenStackClusterTemplateSpec is an autogenerated conversion function. -func Convert_v1alpha7_OpenStackClusterTemplateSpec_To_v1alpha8_OpenStackClusterTemplateSpec(in *OpenStackClusterTemplateSpec, out *v1alpha8.OpenStackClusterTemplateSpec, s conversion.Scope) error { - return autoConvert_v1alpha7_OpenStackClusterTemplateSpec_To_v1alpha8_OpenStackClusterTemplateSpec(in, out, s) +// Convert_v1alpha7_OpenStackClusterTemplateSpec_To_v1beta1_OpenStackClusterTemplateSpec is an autogenerated conversion function. +func Convert_v1alpha7_OpenStackClusterTemplateSpec_To_v1beta1_OpenStackClusterTemplateSpec(in *OpenStackClusterTemplateSpec, out *v1beta1.OpenStackClusterTemplateSpec, s conversion.Scope) error { + return autoConvert_v1alpha7_OpenStackClusterTemplateSpec_To_v1beta1_OpenStackClusterTemplateSpec(in, out, s) } -func autoConvert_v1alpha8_OpenStackClusterTemplateSpec_To_v1alpha7_OpenStackClusterTemplateSpec(in *v1alpha8.OpenStackClusterTemplateSpec, out *OpenStackClusterTemplateSpec, s conversion.Scope) error { - if err := Convert_v1alpha8_OpenStackClusterTemplateResource_To_v1alpha7_OpenStackClusterTemplateResource(&in.Template, &out.Template, s); err != nil { +func autoConvert_v1beta1_OpenStackClusterTemplateSpec_To_v1alpha7_OpenStackClusterTemplateSpec(in *v1beta1.OpenStackClusterTemplateSpec, out *OpenStackClusterTemplateSpec, s conversion.Scope) error { + if err := Convert_v1beta1_OpenStackClusterTemplateResource_To_v1alpha7_OpenStackClusterTemplateResource(&in.Template, &out.Template, s); err != nil { return err } return nil } -// Convert_v1alpha8_OpenStackClusterTemplateSpec_To_v1alpha7_OpenStackClusterTemplateSpec is an autogenerated conversion function. -func Convert_v1alpha8_OpenStackClusterTemplateSpec_To_v1alpha7_OpenStackClusterTemplateSpec(in *v1alpha8.OpenStackClusterTemplateSpec, out *OpenStackClusterTemplateSpec, s conversion.Scope) error { - return autoConvert_v1alpha8_OpenStackClusterTemplateSpec_To_v1alpha7_OpenStackClusterTemplateSpec(in, out, s) +// Convert_v1beta1_OpenStackClusterTemplateSpec_To_v1alpha7_OpenStackClusterTemplateSpec is an autogenerated conversion function. +func Convert_v1beta1_OpenStackClusterTemplateSpec_To_v1alpha7_OpenStackClusterTemplateSpec(in *v1beta1.OpenStackClusterTemplateSpec, out *OpenStackClusterTemplateSpec, s conversion.Scope) error { + return autoConvert_v1beta1_OpenStackClusterTemplateSpec_To_v1alpha7_OpenStackClusterTemplateSpec(in, out, s) } -func autoConvert_v1alpha7_OpenStackIdentityReference_To_v1alpha8_OpenStackIdentityReference(in *OpenStackIdentityReference, out *v1alpha8.OpenStackIdentityReference, s conversion.Scope) error { +func autoConvert_v1alpha7_OpenStackIdentityReference_To_v1beta1_OpenStackIdentityReference(in *OpenStackIdentityReference, out *v1beta1.OpenStackIdentityReference, s conversion.Scope) error { out.Kind = in.Kind out.Name = in.Name return nil } -// Convert_v1alpha7_OpenStackIdentityReference_To_v1alpha8_OpenStackIdentityReference is an autogenerated conversion function. -func Convert_v1alpha7_OpenStackIdentityReference_To_v1alpha8_OpenStackIdentityReference(in *OpenStackIdentityReference, out *v1alpha8.OpenStackIdentityReference, s conversion.Scope) error { - return autoConvert_v1alpha7_OpenStackIdentityReference_To_v1alpha8_OpenStackIdentityReference(in, out, s) +// Convert_v1alpha7_OpenStackIdentityReference_To_v1beta1_OpenStackIdentityReference is an autogenerated conversion function. +func Convert_v1alpha7_OpenStackIdentityReference_To_v1beta1_OpenStackIdentityReference(in *OpenStackIdentityReference, out *v1beta1.OpenStackIdentityReference, s conversion.Scope) error { + return autoConvert_v1alpha7_OpenStackIdentityReference_To_v1beta1_OpenStackIdentityReference(in, out, s) } -func autoConvert_v1alpha8_OpenStackIdentityReference_To_v1alpha7_OpenStackIdentityReference(in *v1alpha8.OpenStackIdentityReference, out *OpenStackIdentityReference, s conversion.Scope) error { +func autoConvert_v1beta1_OpenStackIdentityReference_To_v1alpha7_OpenStackIdentityReference(in *v1beta1.OpenStackIdentityReference, out *OpenStackIdentityReference, s conversion.Scope) error { out.Kind = in.Kind out.Name = in.Name return nil } -// Convert_v1alpha8_OpenStackIdentityReference_To_v1alpha7_OpenStackIdentityReference is an autogenerated conversion function. -func Convert_v1alpha8_OpenStackIdentityReference_To_v1alpha7_OpenStackIdentityReference(in *v1alpha8.OpenStackIdentityReference, out *OpenStackIdentityReference, s conversion.Scope) error { - return autoConvert_v1alpha8_OpenStackIdentityReference_To_v1alpha7_OpenStackIdentityReference(in, out, s) +// Convert_v1beta1_OpenStackIdentityReference_To_v1alpha7_OpenStackIdentityReference is an autogenerated conversion function. +func Convert_v1beta1_OpenStackIdentityReference_To_v1alpha7_OpenStackIdentityReference(in *v1beta1.OpenStackIdentityReference, out *OpenStackIdentityReference, s conversion.Scope) error { + return autoConvert_v1beta1_OpenStackIdentityReference_To_v1alpha7_OpenStackIdentityReference(in, out, s) } -func autoConvert_v1alpha7_OpenStackMachine_To_v1alpha8_OpenStackMachine(in *OpenStackMachine, out *v1alpha8.OpenStackMachine, s conversion.Scope) error { +func autoConvert_v1alpha7_OpenStackMachine_To_v1beta1_OpenStackMachine(in *OpenStackMachine, out *v1beta1.OpenStackMachine, s conversion.Scope) error { out.ObjectMeta = in.ObjectMeta - if err := Convert_v1alpha7_OpenStackMachineSpec_To_v1alpha8_OpenStackMachineSpec(&in.Spec, &out.Spec, s); err != nil { + if err := Convert_v1alpha7_OpenStackMachineSpec_To_v1beta1_OpenStackMachineSpec(&in.Spec, &out.Spec, s); err != nil { return err } - if err := Convert_v1alpha7_OpenStackMachineStatus_To_v1alpha8_OpenStackMachineStatus(&in.Status, &out.Status, s); err != nil { + if err := Convert_v1alpha7_OpenStackMachineStatus_To_v1beta1_OpenStackMachineStatus(&in.Status, &out.Status, s); err != nil { return err } return nil } -// Convert_v1alpha7_OpenStackMachine_To_v1alpha8_OpenStackMachine is an autogenerated conversion function. -func Convert_v1alpha7_OpenStackMachine_To_v1alpha8_OpenStackMachine(in *OpenStackMachine, out *v1alpha8.OpenStackMachine, s conversion.Scope) error { - return autoConvert_v1alpha7_OpenStackMachine_To_v1alpha8_OpenStackMachine(in, out, s) +// Convert_v1alpha7_OpenStackMachine_To_v1beta1_OpenStackMachine is an autogenerated conversion function. +func Convert_v1alpha7_OpenStackMachine_To_v1beta1_OpenStackMachine(in *OpenStackMachine, out *v1beta1.OpenStackMachine, s conversion.Scope) error { + return autoConvert_v1alpha7_OpenStackMachine_To_v1beta1_OpenStackMachine(in, out, s) } -func autoConvert_v1alpha8_OpenStackMachine_To_v1alpha7_OpenStackMachine(in *v1alpha8.OpenStackMachine, out *OpenStackMachine, s conversion.Scope) error { +func autoConvert_v1beta1_OpenStackMachine_To_v1alpha7_OpenStackMachine(in *v1beta1.OpenStackMachine, out *OpenStackMachine, s conversion.Scope) error { out.ObjectMeta = in.ObjectMeta - if err := Convert_v1alpha8_OpenStackMachineSpec_To_v1alpha7_OpenStackMachineSpec(&in.Spec, &out.Spec, s); err != nil { + if err := Convert_v1beta1_OpenStackMachineSpec_To_v1alpha7_OpenStackMachineSpec(&in.Spec, &out.Spec, s); err != nil { return err } - if err := Convert_v1alpha8_OpenStackMachineStatus_To_v1alpha7_OpenStackMachineStatus(&in.Status, &out.Status, s); err != nil { + if err := Convert_v1beta1_OpenStackMachineStatus_To_v1alpha7_OpenStackMachineStatus(&in.Status, &out.Status, s); err != nil { return err } return nil } -// Convert_v1alpha8_OpenStackMachine_To_v1alpha7_OpenStackMachine is an autogenerated conversion function. -func Convert_v1alpha8_OpenStackMachine_To_v1alpha7_OpenStackMachine(in *v1alpha8.OpenStackMachine, out *OpenStackMachine, s conversion.Scope) error { - return autoConvert_v1alpha8_OpenStackMachine_To_v1alpha7_OpenStackMachine(in, out, s) +// Convert_v1beta1_OpenStackMachine_To_v1alpha7_OpenStackMachine is an autogenerated conversion function. +func Convert_v1beta1_OpenStackMachine_To_v1alpha7_OpenStackMachine(in *v1beta1.OpenStackMachine, out *OpenStackMachine, s conversion.Scope) error { + return autoConvert_v1beta1_OpenStackMachine_To_v1alpha7_OpenStackMachine(in, out, s) } -func autoConvert_v1alpha7_OpenStackMachineList_To_v1alpha8_OpenStackMachineList(in *OpenStackMachineList, out *v1alpha8.OpenStackMachineList, s conversion.Scope) error { +func autoConvert_v1alpha7_OpenStackMachineList_To_v1beta1_OpenStackMachineList(in *OpenStackMachineList, out *v1beta1.OpenStackMachineList, s conversion.Scope) error { out.ListMeta = in.ListMeta if in.Items != nil { in, out := &in.Items, &out.Items - *out = make([]v1alpha8.OpenStackMachine, len(*in)) + *out = make([]v1beta1.OpenStackMachine, len(*in)) for i := range *in { - if err := Convert_v1alpha7_OpenStackMachine_To_v1alpha8_OpenStackMachine(&(*in)[i], &(*out)[i], s); err != nil { + if err := Convert_v1alpha7_OpenStackMachine_To_v1beta1_OpenStackMachine(&(*in)[i], &(*out)[i], s); err != nil { return err } } @@ -1234,18 +1234,18 @@ func autoConvert_v1alpha7_OpenStackMachineList_To_v1alpha8_OpenStackMachineList( return nil } -// Convert_v1alpha7_OpenStackMachineList_To_v1alpha8_OpenStackMachineList is an autogenerated conversion function. -func Convert_v1alpha7_OpenStackMachineList_To_v1alpha8_OpenStackMachineList(in *OpenStackMachineList, out *v1alpha8.OpenStackMachineList, s conversion.Scope) error { - return autoConvert_v1alpha7_OpenStackMachineList_To_v1alpha8_OpenStackMachineList(in, out, s) +// Convert_v1alpha7_OpenStackMachineList_To_v1beta1_OpenStackMachineList is an autogenerated conversion function. +func Convert_v1alpha7_OpenStackMachineList_To_v1beta1_OpenStackMachineList(in *OpenStackMachineList, out *v1beta1.OpenStackMachineList, s conversion.Scope) error { + return autoConvert_v1alpha7_OpenStackMachineList_To_v1beta1_OpenStackMachineList(in, out, s) } -func autoConvert_v1alpha8_OpenStackMachineList_To_v1alpha7_OpenStackMachineList(in *v1alpha8.OpenStackMachineList, out *OpenStackMachineList, s conversion.Scope) error { +func autoConvert_v1beta1_OpenStackMachineList_To_v1alpha7_OpenStackMachineList(in *v1beta1.OpenStackMachineList, out *OpenStackMachineList, s conversion.Scope) error { out.ListMeta = in.ListMeta if in.Items != nil { in, out := &in.Items, &out.Items *out = make([]OpenStackMachine, len(*in)) for i := range *in { - if err := Convert_v1alpha8_OpenStackMachine_To_v1alpha7_OpenStackMachine(&(*in)[i], &(*out)[i], s); err != nil { + if err := Convert_v1beta1_OpenStackMachine_To_v1alpha7_OpenStackMachine(&(*in)[i], &(*out)[i], s); err != nil { return err } } @@ -1255,45 +1255,45 @@ func autoConvert_v1alpha8_OpenStackMachineList_To_v1alpha7_OpenStackMachineList( return nil } -// Convert_v1alpha8_OpenStackMachineList_To_v1alpha7_OpenStackMachineList is an autogenerated conversion function. -func Convert_v1alpha8_OpenStackMachineList_To_v1alpha7_OpenStackMachineList(in *v1alpha8.OpenStackMachineList, out *OpenStackMachineList, s conversion.Scope) error { - return autoConvert_v1alpha8_OpenStackMachineList_To_v1alpha7_OpenStackMachineList(in, out, s) +// Convert_v1beta1_OpenStackMachineList_To_v1alpha7_OpenStackMachineList is an autogenerated conversion function. +func Convert_v1beta1_OpenStackMachineList_To_v1alpha7_OpenStackMachineList(in *v1beta1.OpenStackMachineList, out *OpenStackMachineList, s conversion.Scope) error { + return autoConvert_v1beta1_OpenStackMachineList_To_v1alpha7_OpenStackMachineList(in, out, s) } -func autoConvert_v1alpha7_OpenStackMachineSpec_To_v1alpha8_OpenStackMachineSpec(in *OpenStackMachineSpec, out *v1alpha8.OpenStackMachineSpec, s conversion.Scope) error { +func autoConvert_v1alpha7_OpenStackMachineSpec_To_v1beta1_OpenStackMachineSpec(in *OpenStackMachineSpec, out *v1beta1.OpenStackMachineSpec, s conversion.Scope) error { out.ProviderID = (*string)(unsafe.Pointer(in.ProviderID)) out.InstanceID = (*string)(unsafe.Pointer(in.InstanceID)) out.CloudName = in.CloudName out.Flavor = in.Flavor - // WARNING: in.Image requires manual conversion: inconvertible types (string vs sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha8.ImageFilter) + // WARNING: in.Image requires manual conversion: inconvertible types (string vs sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1.ImageFilter) // WARNING: in.ImageUUID requires manual conversion: does not exist in peer-type out.SSHKeyName = in.SSHKeyName - out.Ports = *(*[]v1alpha8.PortOpts)(unsafe.Pointer(&in.Ports)) + out.Ports = *(*[]v1beta1.PortOpts)(unsafe.Pointer(&in.Ports)) // WARNING: in.FloatingIP requires manual conversion: does not exist in peer-type - out.SecurityGroups = *(*[]v1alpha8.SecurityGroupFilter)(unsafe.Pointer(&in.SecurityGroups)) + out.SecurityGroups = *(*[]v1beta1.SecurityGroupFilter)(unsafe.Pointer(&in.SecurityGroups)) out.Trunk = in.Trunk out.Tags = *(*[]string)(unsafe.Pointer(&in.Tags)) - // WARNING: in.ServerMetadata requires manual conversion: inconvertible types (map[string]string vs []sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha8.ServerMetadata) + // WARNING: in.ServerMetadata requires manual conversion: inconvertible types (map[string]string vs []sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1.ServerMetadata) out.ConfigDrive = (*bool)(unsafe.Pointer(in.ConfigDrive)) - out.RootVolume = (*v1alpha8.RootVolume)(unsafe.Pointer(in.RootVolume)) - out.AdditionalBlockDevices = *(*[]v1alpha8.AdditionalBlockDevice)(unsafe.Pointer(&in.AdditionalBlockDevices)) + out.RootVolume = (*v1beta1.RootVolume)(unsafe.Pointer(in.RootVolume)) + out.AdditionalBlockDevices = *(*[]v1beta1.AdditionalBlockDevice)(unsafe.Pointer(&in.AdditionalBlockDevices)) // WARNING: in.ServerGroupID requires manual conversion: does not exist in peer-type - out.IdentityRef = (*v1alpha8.OpenStackIdentityReference)(unsafe.Pointer(in.IdentityRef)) + out.IdentityRef = (*v1beta1.OpenStackIdentityReference)(unsafe.Pointer(in.IdentityRef)) return nil } -func autoConvert_v1alpha8_OpenStackMachineSpec_To_v1alpha7_OpenStackMachineSpec(in *v1alpha8.OpenStackMachineSpec, out *OpenStackMachineSpec, s conversion.Scope) error { +func autoConvert_v1beta1_OpenStackMachineSpec_To_v1alpha7_OpenStackMachineSpec(in *v1beta1.OpenStackMachineSpec, out *OpenStackMachineSpec, s conversion.Scope) error { out.ProviderID = (*string)(unsafe.Pointer(in.ProviderID)) out.InstanceID = (*string)(unsafe.Pointer(in.InstanceID)) out.CloudName = in.CloudName out.Flavor = in.Flavor - // WARNING: in.Image requires manual conversion: inconvertible types (sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha8.ImageFilter vs string) + // WARNING: in.Image requires manual conversion: inconvertible types (sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1.ImageFilter vs string) out.SSHKeyName = in.SSHKeyName out.Ports = *(*[]PortOpts)(unsafe.Pointer(&in.Ports)) out.SecurityGroups = *(*[]SecurityGroupFilter)(unsafe.Pointer(&in.SecurityGroups)) out.Trunk = in.Trunk out.Tags = *(*[]string)(unsafe.Pointer(&in.Tags)) - // WARNING: in.ServerMetadata requires manual conversion: inconvertible types ([]sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha8.ServerMetadata vs map[string]string) + // WARNING: in.ServerMetadata requires manual conversion: inconvertible types ([]sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1.ServerMetadata vs map[string]string) out.ConfigDrive = (*bool)(unsafe.Pointer(in.ConfigDrive)) out.RootVolume = (*RootVolume)(unsafe.Pointer(in.RootVolume)) out.AdditionalBlockDevices = *(*[]AdditionalBlockDevice)(unsafe.Pointer(&in.AdditionalBlockDevices)) @@ -1302,65 +1302,65 @@ func autoConvert_v1alpha8_OpenStackMachineSpec_To_v1alpha7_OpenStackMachineSpec( return nil } -func autoConvert_v1alpha7_OpenStackMachineStatus_To_v1alpha8_OpenStackMachineStatus(in *OpenStackMachineStatus, out *v1alpha8.OpenStackMachineStatus, s conversion.Scope) error { +func autoConvert_v1alpha7_OpenStackMachineStatus_To_v1beta1_OpenStackMachineStatus(in *OpenStackMachineStatus, out *v1beta1.OpenStackMachineStatus, s conversion.Scope) error { out.Ready = in.Ready out.Addresses = *(*[]v1.NodeAddress)(unsafe.Pointer(&in.Addresses)) - out.InstanceState = (*v1alpha8.InstanceState)(unsafe.Pointer(in.InstanceState)) + out.InstanceState = (*v1beta1.InstanceState)(unsafe.Pointer(in.InstanceState)) out.FailureReason = (*errors.MachineStatusError)(unsafe.Pointer(in.FailureReason)) out.FailureMessage = (*string)(unsafe.Pointer(in.FailureMessage)) - out.Conditions = *(*v1beta1.Conditions)(unsafe.Pointer(&in.Conditions)) + out.Conditions = *(*apiv1beta1.Conditions)(unsafe.Pointer(&in.Conditions)) return nil } -// Convert_v1alpha7_OpenStackMachineStatus_To_v1alpha8_OpenStackMachineStatus is an autogenerated conversion function. -func Convert_v1alpha7_OpenStackMachineStatus_To_v1alpha8_OpenStackMachineStatus(in *OpenStackMachineStatus, out *v1alpha8.OpenStackMachineStatus, s conversion.Scope) error { - return autoConvert_v1alpha7_OpenStackMachineStatus_To_v1alpha8_OpenStackMachineStatus(in, out, s) +// Convert_v1alpha7_OpenStackMachineStatus_To_v1beta1_OpenStackMachineStatus is an autogenerated conversion function. +func Convert_v1alpha7_OpenStackMachineStatus_To_v1beta1_OpenStackMachineStatus(in *OpenStackMachineStatus, out *v1beta1.OpenStackMachineStatus, s conversion.Scope) error { + return autoConvert_v1alpha7_OpenStackMachineStatus_To_v1beta1_OpenStackMachineStatus(in, out, s) } -func autoConvert_v1alpha8_OpenStackMachineStatus_To_v1alpha7_OpenStackMachineStatus(in *v1alpha8.OpenStackMachineStatus, out *OpenStackMachineStatus, s conversion.Scope) error { +func autoConvert_v1beta1_OpenStackMachineStatus_To_v1alpha7_OpenStackMachineStatus(in *v1beta1.OpenStackMachineStatus, out *OpenStackMachineStatus, s conversion.Scope) error { out.Ready = in.Ready out.Addresses = *(*[]v1.NodeAddress)(unsafe.Pointer(&in.Addresses)) out.InstanceState = (*InstanceState)(unsafe.Pointer(in.InstanceState)) // WARNING: in.ReferencedResources requires manual conversion: does not exist in peer-type out.FailureReason = (*errors.MachineStatusError)(unsafe.Pointer(in.FailureReason)) out.FailureMessage = (*string)(unsafe.Pointer(in.FailureMessage)) - out.Conditions = *(*v1beta1.Conditions)(unsafe.Pointer(&in.Conditions)) + out.Conditions = *(*apiv1beta1.Conditions)(unsafe.Pointer(&in.Conditions)) return nil } -func autoConvert_v1alpha7_OpenStackMachineTemplate_To_v1alpha8_OpenStackMachineTemplate(in *OpenStackMachineTemplate, out *v1alpha8.OpenStackMachineTemplate, s conversion.Scope) error { +func autoConvert_v1alpha7_OpenStackMachineTemplate_To_v1beta1_OpenStackMachineTemplate(in *OpenStackMachineTemplate, out *v1beta1.OpenStackMachineTemplate, s conversion.Scope) error { out.ObjectMeta = in.ObjectMeta - if err := Convert_v1alpha7_OpenStackMachineTemplateSpec_To_v1alpha8_OpenStackMachineTemplateSpec(&in.Spec, &out.Spec, s); err != nil { + if err := Convert_v1alpha7_OpenStackMachineTemplateSpec_To_v1beta1_OpenStackMachineTemplateSpec(&in.Spec, &out.Spec, s); err != nil { return err } return nil } -// Convert_v1alpha7_OpenStackMachineTemplate_To_v1alpha8_OpenStackMachineTemplate is an autogenerated conversion function. -func Convert_v1alpha7_OpenStackMachineTemplate_To_v1alpha8_OpenStackMachineTemplate(in *OpenStackMachineTemplate, out *v1alpha8.OpenStackMachineTemplate, s conversion.Scope) error { - return autoConvert_v1alpha7_OpenStackMachineTemplate_To_v1alpha8_OpenStackMachineTemplate(in, out, s) +// Convert_v1alpha7_OpenStackMachineTemplate_To_v1beta1_OpenStackMachineTemplate is an autogenerated conversion function. +func Convert_v1alpha7_OpenStackMachineTemplate_To_v1beta1_OpenStackMachineTemplate(in *OpenStackMachineTemplate, out *v1beta1.OpenStackMachineTemplate, s conversion.Scope) error { + return autoConvert_v1alpha7_OpenStackMachineTemplate_To_v1beta1_OpenStackMachineTemplate(in, out, s) } -func autoConvert_v1alpha8_OpenStackMachineTemplate_To_v1alpha7_OpenStackMachineTemplate(in *v1alpha8.OpenStackMachineTemplate, out *OpenStackMachineTemplate, s conversion.Scope) error { +func autoConvert_v1beta1_OpenStackMachineTemplate_To_v1alpha7_OpenStackMachineTemplate(in *v1beta1.OpenStackMachineTemplate, out *OpenStackMachineTemplate, s conversion.Scope) error { out.ObjectMeta = in.ObjectMeta - if err := Convert_v1alpha8_OpenStackMachineTemplateSpec_To_v1alpha7_OpenStackMachineTemplateSpec(&in.Spec, &out.Spec, s); err != nil { + if err := Convert_v1beta1_OpenStackMachineTemplateSpec_To_v1alpha7_OpenStackMachineTemplateSpec(&in.Spec, &out.Spec, s); err != nil { return err } return nil } -// Convert_v1alpha8_OpenStackMachineTemplate_To_v1alpha7_OpenStackMachineTemplate is an autogenerated conversion function. -func Convert_v1alpha8_OpenStackMachineTemplate_To_v1alpha7_OpenStackMachineTemplate(in *v1alpha8.OpenStackMachineTemplate, out *OpenStackMachineTemplate, s conversion.Scope) error { - return autoConvert_v1alpha8_OpenStackMachineTemplate_To_v1alpha7_OpenStackMachineTemplate(in, out, s) +// Convert_v1beta1_OpenStackMachineTemplate_To_v1alpha7_OpenStackMachineTemplate is an autogenerated conversion function. +func Convert_v1beta1_OpenStackMachineTemplate_To_v1alpha7_OpenStackMachineTemplate(in *v1beta1.OpenStackMachineTemplate, out *OpenStackMachineTemplate, s conversion.Scope) error { + return autoConvert_v1beta1_OpenStackMachineTemplate_To_v1alpha7_OpenStackMachineTemplate(in, out, s) } -func autoConvert_v1alpha7_OpenStackMachineTemplateList_To_v1alpha8_OpenStackMachineTemplateList(in *OpenStackMachineTemplateList, out *v1alpha8.OpenStackMachineTemplateList, s conversion.Scope) error { +func autoConvert_v1alpha7_OpenStackMachineTemplateList_To_v1beta1_OpenStackMachineTemplateList(in *OpenStackMachineTemplateList, out *v1beta1.OpenStackMachineTemplateList, s conversion.Scope) error { out.ListMeta = in.ListMeta if in.Items != nil { in, out := &in.Items, &out.Items - *out = make([]v1alpha8.OpenStackMachineTemplate, len(*in)) + *out = make([]v1beta1.OpenStackMachineTemplate, len(*in)) for i := range *in { - if err := Convert_v1alpha7_OpenStackMachineTemplate_To_v1alpha8_OpenStackMachineTemplate(&(*in)[i], &(*out)[i], s); err != nil { + if err := Convert_v1alpha7_OpenStackMachineTemplate_To_v1beta1_OpenStackMachineTemplate(&(*in)[i], &(*out)[i], s); err != nil { return err } } @@ -1370,18 +1370,18 @@ func autoConvert_v1alpha7_OpenStackMachineTemplateList_To_v1alpha8_OpenStackMach return nil } -// Convert_v1alpha7_OpenStackMachineTemplateList_To_v1alpha8_OpenStackMachineTemplateList is an autogenerated conversion function. -func Convert_v1alpha7_OpenStackMachineTemplateList_To_v1alpha8_OpenStackMachineTemplateList(in *OpenStackMachineTemplateList, out *v1alpha8.OpenStackMachineTemplateList, s conversion.Scope) error { - return autoConvert_v1alpha7_OpenStackMachineTemplateList_To_v1alpha8_OpenStackMachineTemplateList(in, out, s) +// Convert_v1alpha7_OpenStackMachineTemplateList_To_v1beta1_OpenStackMachineTemplateList is an autogenerated conversion function. +func Convert_v1alpha7_OpenStackMachineTemplateList_To_v1beta1_OpenStackMachineTemplateList(in *OpenStackMachineTemplateList, out *v1beta1.OpenStackMachineTemplateList, s conversion.Scope) error { + return autoConvert_v1alpha7_OpenStackMachineTemplateList_To_v1beta1_OpenStackMachineTemplateList(in, out, s) } -func autoConvert_v1alpha8_OpenStackMachineTemplateList_To_v1alpha7_OpenStackMachineTemplateList(in *v1alpha8.OpenStackMachineTemplateList, out *OpenStackMachineTemplateList, s conversion.Scope) error { +func autoConvert_v1beta1_OpenStackMachineTemplateList_To_v1alpha7_OpenStackMachineTemplateList(in *v1beta1.OpenStackMachineTemplateList, out *OpenStackMachineTemplateList, s conversion.Scope) error { out.ListMeta = in.ListMeta if in.Items != nil { in, out := &in.Items, &out.Items *out = make([]OpenStackMachineTemplate, len(*in)) for i := range *in { - if err := Convert_v1alpha8_OpenStackMachineTemplate_To_v1alpha7_OpenStackMachineTemplate(&(*in)[i], &(*out)[i], s); err != nil { + if err := Convert_v1beta1_OpenStackMachineTemplate_To_v1alpha7_OpenStackMachineTemplate(&(*in)[i], &(*out)[i], s); err != nil { return err } } @@ -1391,87 +1391,87 @@ func autoConvert_v1alpha8_OpenStackMachineTemplateList_To_v1alpha7_OpenStackMach return nil } -// Convert_v1alpha8_OpenStackMachineTemplateList_To_v1alpha7_OpenStackMachineTemplateList is an autogenerated conversion function. -func Convert_v1alpha8_OpenStackMachineTemplateList_To_v1alpha7_OpenStackMachineTemplateList(in *v1alpha8.OpenStackMachineTemplateList, out *OpenStackMachineTemplateList, s conversion.Scope) error { - return autoConvert_v1alpha8_OpenStackMachineTemplateList_To_v1alpha7_OpenStackMachineTemplateList(in, out, s) +// Convert_v1beta1_OpenStackMachineTemplateList_To_v1alpha7_OpenStackMachineTemplateList is an autogenerated conversion function. +func Convert_v1beta1_OpenStackMachineTemplateList_To_v1alpha7_OpenStackMachineTemplateList(in *v1beta1.OpenStackMachineTemplateList, out *OpenStackMachineTemplateList, s conversion.Scope) error { + return autoConvert_v1beta1_OpenStackMachineTemplateList_To_v1alpha7_OpenStackMachineTemplateList(in, out, s) } -func autoConvert_v1alpha7_OpenStackMachineTemplateResource_To_v1alpha8_OpenStackMachineTemplateResource(in *OpenStackMachineTemplateResource, out *v1alpha8.OpenStackMachineTemplateResource, s conversion.Scope) error { - if err := Convert_v1alpha7_OpenStackMachineSpec_To_v1alpha8_OpenStackMachineSpec(&in.Spec, &out.Spec, s); err != nil { +func autoConvert_v1alpha7_OpenStackMachineTemplateResource_To_v1beta1_OpenStackMachineTemplateResource(in *OpenStackMachineTemplateResource, out *v1beta1.OpenStackMachineTemplateResource, s conversion.Scope) error { + if err := Convert_v1alpha7_OpenStackMachineSpec_To_v1beta1_OpenStackMachineSpec(&in.Spec, &out.Spec, s); err != nil { return err } return nil } -// Convert_v1alpha7_OpenStackMachineTemplateResource_To_v1alpha8_OpenStackMachineTemplateResource is an autogenerated conversion function. -func Convert_v1alpha7_OpenStackMachineTemplateResource_To_v1alpha8_OpenStackMachineTemplateResource(in *OpenStackMachineTemplateResource, out *v1alpha8.OpenStackMachineTemplateResource, s conversion.Scope) error { - return autoConvert_v1alpha7_OpenStackMachineTemplateResource_To_v1alpha8_OpenStackMachineTemplateResource(in, out, s) +// Convert_v1alpha7_OpenStackMachineTemplateResource_To_v1beta1_OpenStackMachineTemplateResource is an autogenerated conversion function. +func Convert_v1alpha7_OpenStackMachineTemplateResource_To_v1beta1_OpenStackMachineTemplateResource(in *OpenStackMachineTemplateResource, out *v1beta1.OpenStackMachineTemplateResource, s conversion.Scope) error { + return autoConvert_v1alpha7_OpenStackMachineTemplateResource_To_v1beta1_OpenStackMachineTemplateResource(in, out, s) } -func autoConvert_v1alpha8_OpenStackMachineTemplateResource_To_v1alpha7_OpenStackMachineTemplateResource(in *v1alpha8.OpenStackMachineTemplateResource, out *OpenStackMachineTemplateResource, s conversion.Scope) error { - if err := Convert_v1alpha8_OpenStackMachineSpec_To_v1alpha7_OpenStackMachineSpec(&in.Spec, &out.Spec, s); err != nil { +func autoConvert_v1beta1_OpenStackMachineTemplateResource_To_v1alpha7_OpenStackMachineTemplateResource(in *v1beta1.OpenStackMachineTemplateResource, out *OpenStackMachineTemplateResource, s conversion.Scope) error { + if err := Convert_v1beta1_OpenStackMachineSpec_To_v1alpha7_OpenStackMachineSpec(&in.Spec, &out.Spec, s); err != nil { return err } return nil } -// Convert_v1alpha8_OpenStackMachineTemplateResource_To_v1alpha7_OpenStackMachineTemplateResource is an autogenerated conversion function. -func Convert_v1alpha8_OpenStackMachineTemplateResource_To_v1alpha7_OpenStackMachineTemplateResource(in *v1alpha8.OpenStackMachineTemplateResource, out *OpenStackMachineTemplateResource, s conversion.Scope) error { - return autoConvert_v1alpha8_OpenStackMachineTemplateResource_To_v1alpha7_OpenStackMachineTemplateResource(in, out, s) +// Convert_v1beta1_OpenStackMachineTemplateResource_To_v1alpha7_OpenStackMachineTemplateResource is an autogenerated conversion function. +func Convert_v1beta1_OpenStackMachineTemplateResource_To_v1alpha7_OpenStackMachineTemplateResource(in *v1beta1.OpenStackMachineTemplateResource, out *OpenStackMachineTemplateResource, s conversion.Scope) error { + return autoConvert_v1beta1_OpenStackMachineTemplateResource_To_v1alpha7_OpenStackMachineTemplateResource(in, out, s) } -func autoConvert_v1alpha7_OpenStackMachineTemplateSpec_To_v1alpha8_OpenStackMachineTemplateSpec(in *OpenStackMachineTemplateSpec, out *v1alpha8.OpenStackMachineTemplateSpec, s conversion.Scope) error { - if err := Convert_v1alpha7_OpenStackMachineTemplateResource_To_v1alpha8_OpenStackMachineTemplateResource(&in.Template, &out.Template, s); err != nil { +func autoConvert_v1alpha7_OpenStackMachineTemplateSpec_To_v1beta1_OpenStackMachineTemplateSpec(in *OpenStackMachineTemplateSpec, out *v1beta1.OpenStackMachineTemplateSpec, s conversion.Scope) error { + if err := Convert_v1alpha7_OpenStackMachineTemplateResource_To_v1beta1_OpenStackMachineTemplateResource(&in.Template, &out.Template, s); err != nil { return err } return nil } -// Convert_v1alpha7_OpenStackMachineTemplateSpec_To_v1alpha8_OpenStackMachineTemplateSpec is an autogenerated conversion function. -func Convert_v1alpha7_OpenStackMachineTemplateSpec_To_v1alpha8_OpenStackMachineTemplateSpec(in *OpenStackMachineTemplateSpec, out *v1alpha8.OpenStackMachineTemplateSpec, s conversion.Scope) error { - return autoConvert_v1alpha7_OpenStackMachineTemplateSpec_To_v1alpha8_OpenStackMachineTemplateSpec(in, out, s) +// Convert_v1alpha7_OpenStackMachineTemplateSpec_To_v1beta1_OpenStackMachineTemplateSpec is an autogenerated conversion function. +func Convert_v1alpha7_OpenStackMachineTemplateSpec_To_v1beta1_OpenStackMachineTemplateSpec(in *OpenStackMachineTemplateSpec, out *v1beta1.OpenStackMachineTemplateSpec, s conversion.Scope) error { + return autoConvert_v1alpha7_OpenStackMachineTemplateSpec_To_v1beta1_OpenStackMachineTemplateSpec(in, out, s) } -func autoConvert_v1alpha8_OpenStackMachineTemplateSpec_To_v1alpha7_OpenStackMachineTemplateSpec(in *v1alpha8.OpenStackMachineTemplateSpec, out *OpenStackMachineTemplateSpec, s conversion.Scope) error { - if err := Convert_v1alpha8_OpenStackMachineTemplateResource_To_v1alpha7_OpenStackMachineTemplateResource(&in.Template, &out.Template, s); err != nil { +func autoConvert_v1beta1_OpenStackMachineTemplateSpec_To_v1alpha7_OpenStackMachineTemplateSpec(in *v1beta1.OpenStackMachineTemplateSpec, out *OpenStackMachineTemplateSpec, s conversion.Scope) error { + if err := Convert_v1beta1_OpenStackMachineTemplateResource_To_v1alpha7_OpenStackMachineTemplateResource(&in.Template, &out.Template, s); err != nil { return err } return nil } -// Convert_v1alpha8_OpenStackMachineTemplateSpec_To_v1alpha7_OpenStackMachineTemplateSpec is an autogenerated conversion function. -func Convert_v1alpha8_OpenStackMachineTemplateSpec_To_v1alpha7_OpenStackMachineTemplateSpec(in *v1alpha8.OpenStackMachineTemplateSpec, out *OpenStackMachineTemplateSpec, s conversion.Scope) error { - return autoConvert_v1alpha8_OpenStackMachineTemplateSpec_To_v1alpha7_OpenStackMachineTemplateSpec(in, out, s) +// Convert_v1beta1_OpenStackMachineTemplateSpec_To_v1alpha7_OpenStackMachineTemplateSpec is an autogenerated conversion function. +func Convert_v1beta1_OpenStackMachineTemplateSpec_To_v1alpha7_OpenStackMachineTemplateSpec(in *v1beta1.OpenStackMachineTemplateSpec, out *OpenStackMachineTemplateSpec, s conversion.Scope) error { + return autoConvert_v1beta1_OpenStackMachineTemplateSpec_To_v1alpha7_OpenStackMachineTemplateSpec(in, out, s) } -func autoConvert_v1alpha7_PortOpts_To_v1alpha8_PortOpts(in *PortOpts, out *v1alpha8.PortOpts, s conversion.Scope) error { - out.Network = (*v1alpha8.NetworkFilter)(unsafe.Pointer(in.Network)) +func autoConvert_v1alpha7_PortOpts_To_v1beta1_PortOpts(in *PortOpts, out *v1beta1.PortOpts, s conversion.Scope) error { + out.Network = (*v1beta1.NetworkFilter)(unsafe.Pointer(in.Network)) out.NameSuffix = in.NameSuffix out.Description = in.Description out.AdminStateUp = (*bool)(unsafe.Pointer(in.AdminStateUp)) out.MACAddress = in.MACAddress - out.FixedIPs = *(*[]v1alpha8.FixedIP)(unsafe.Pointer(&in.FixedIPs)) - out.SecurityGroupFilters = *(*[]v1alpha8.SecurityGroupFilter)(unsafe.Pointer(&in.SecurityGroupFilters)) - out.AllowedAddressPairs = *(*[]v1alpha8.AddressPair)(unsafe.Pointer(&in.AllowedAddressPairs)) + out.FixedIPs = *(*[]v1beta1.FixedIP)(unsafe.Pointer(&in.FixedIPs)) + out.SecurityGroupFilters = *(*[]v1beta1.SecurityGroupFilter)(unsafe.Pointer(&in.SecurityGroupFilters)) + out.AllowedAddressPairs = *(*[]v1beta1.AddressPair)(unsafe.Pointer(&in.AllowedAddressPairs)) out.Trunk = (*bool)(unsafe.Pointer(in.Trunk)) out.HostID = in.HostID out.VNICType = in.VNICType - if err := Convert_v1alpha7_BindingProfile_To_v1alpha8_BindingProfile(&in.Profile, &out.Profile, s); err != nil { + if err := Convert_v1alpha7_BindingProfile_To_v1beta1_BindingProfile(&in.Profile, &out.Profile, s); err != nil { return err } out.DisablePortSecurity = (*bool)(unsafe.Pointer(in.DisablePortSecurity)) out.PropagateUplinkStatus = (*bool)(unsafe.Pointer(in.PropagateUplinkStatus)) out.Tags = *(*[]string)(unsafe.Pointer(&in.Tags)) - out.ValueSpecs = *(*[]v1alpha8.ValueSpec)(unsafe.Pointer(&in.ValueSpecs)) + out.ValueSpecs = *(*[]v1beta1.ValueSpec)(unsafe.Pointer(&in.ValueSpecs)) return nil } -// Convert_v1alpha7_PortOpts_To_v1alpha8_PortOpts is an autogenerated conversion function. -func Convert_v1alpha7_PortOpts_To_v1alpha8_PortOpts(in *PortOpts, out *v1alpha8.PortOpts, s conversion.Scope) error { - return autoConvert_v1alpha7_PortOpts_To_v1alpha8_PortOpts(in, out, s) +// Convert_v1alpha7_PortOpts_To_v1beta1_PortOpts is an autogenerated conversion function. +func Convert_v1alpha7_PortOpts_To_v1beta1_PortOpts(in *PortOpts, out *v1beta1.PortOpts, s conversion.Scope) error { + return autoConvert_v1alpha7_PortOpts_To_v1beta1_PortOpts(in, out, s) } -func autoConvert_v1alpha8_PortOpts_To_v1alpha7_PortOpts(in *v1alpha8.PortOpts, out *PortOpts, s conversion.Scope) error { +func autoConvert_v1beta1_PortOpts_To_v1alpha7_PortOpts(in *v1beta1.PortOpts, out *PortOpts, s conversion.Scope) error { out.Network = (*NetworkFilter)(unsafe.Pointer(in.Network)) out.NameSuffix = in.NameSuffix out.Description = in.Description @@ -1483,7 +1483,7 @@ func autoConvert_v1alpha8_PortOpts_To_v1alpha7_PortOpts(in *v1alpha8.PortOpts, o out.Trunk = (*bool)(unsafe.Pointer(in.Trunk)) out.HostID = in.HostID out.VNICType = in.VNICType - if err := Convert_v1alpha8_BindingProfile_To_v1alpha7_BindingProfile(&in.Profile, &out.Profile, s); err != nil { + if err := Convert_v1beta1_BindingProfile_To_v1alpha7_BindingProfile(&in.Profile, &out.Profile, s); err != nil { return err } out.DisablePortSecurity = (*bool)(unsafe.Pointer(in.DisablePortSecurity)) @@ -1493,36 +1493,36 @@ func autoConvert_v1alpha8_PortOpts_To_v1alpha7_PortOpts(in *v1alpha8.PortOpts, o return nil } -// Convert_v1alpha8_PortOpts_To_v1alpha7_PortOpts is an autogenerated conversion function. -func Convert_v1alpha8_PortOpts_To_v1alpha7_PortOpts(in *v1alpha8.PortOpts, out *PortOpts, s conversion.Scope) error { - return autoConvert_v1alpha8_PortOpts_To_v1alpha7_PortOpts(in, out, s) +// Convert_v1beta1_PortOpts_To_v1alpha7_PortOpts is an autogenerated conversion function. +func Convert_v1beta1_PortOpts_To_v1alpha7_PortOpts(in *v1beta1.PortOpts, out *PortOpts, s conversion.Scope) error { + return autoConvert_v1beta1_PortOpts_To_v1alpha7_PortOpts(in, out, s) } -func autoConvert_v1alpha7_RootVolume_To_v1alpha8_RootVolume(in *RootVolume, out *v1alpha8.RootVolume, s conversion.Scope) error { +func autoConvert_v1alpha7_RootVolume_To_v1beta1_RootVolume(in *RootVolume, out *v1beta1.RootVolume, s conversion.Scope) error { out.Size = in.Size out.VolumeType = in.VolumeType out.AvailabilityZone = in.AvailabilityZone return nil } -// Convert_v1alpha7_RootVolume_To_v1alpha8_RootVolume is an autogenerated conversion function. -func Convert_v1alpha7_RootVolume_To_v1alpha8_RootVolume(in *RootVolume, out *v1alpha8.RootVolume, s conversion.Scope) error { - return autoConvert_v1alpha7_RootVolume_To_v1alpha8_RootVolume(in, out, s) +// Convert_v1alpha7_RootVolume_To_v1beta1_RootVolume is an autogenerated conversion function. +func Convert_v1alpha7_RootVolume_To_v1beta1_RootVolume(in *RootVolume, out *v1beta1.RootVolume, s conversion.Scope) error { + return autoConvert_v1alpha7_RootVolume_To_v1beta1_RootVolume(in, out, s) } -func autoConvert_v1alpha8_RootVolume_To_v1alpha7_RootVolume(in *v1alpha8.RootVolume, out *RootVolume, s conversion.Scope) error { +func autoConvert_v1beta1_RootVolume_To_v1alpha7_RootVolume(in *v1beta1.RootVolume, out *RootVolume, s conversion.Scope) error { out.Size = in.Size out.VolumeType = in.VolumeType out.AvailabilityZone = in.AvailabilityZone return nil } -// Convert_v1alpha8_RootVolume_To_v1alpha7_RootVolume is an autogenerated conversion function. -func Convert_v1alpha8_RootVolume_To_v1alpha7_RootVolume(in *v1alpha8.RootVolume, out *RootVolume, s conversion.Scope) error { - return autoConvert_v1alpha8_RootVolume_To_v1alpha7_RootVolume(in, out, s) +// Convert_v1beta1_RootVolume_To_v1alpha7_RootVolume is an autogenerated conversion function. +func Convert_v1beta1_RootVolume_To_v1alpha7_RootVolume(in *v1beta1.RootVolume, out *RootVolume, s conversion.Scope) error { + return autoConvert_v1beta1_RootVolume_To_v1alpha7_RootVolume(in, out, s) } -func autoConvert_v1alpha7_Router_To_v1alpha8_Router(in *Router, out *v1alpha8.Router, s conversion.Scope) error { +func autoConvert_v1alpha7_Router_To_v1beta1_Router(in *Router, out *v1beta1.Router, s conversion.Scope) error { out.Name = in.Name out.ID = in.ID out.Tags = *(*[]string)(unsafe.Pointer(&in.Tags)) @@ -1530,12 +1530,12 @@ func autoConvert_v1alpha7_Router_To_v1alpha8_Router(in *Router, out *v1alpha8.Ro return nil } -// Convert_v1alpha7_Router_To_v1alpha8_Router is an autogenerated conversion function. -func Convert_v1alpha7_Router_To_v1alpha8_Router(in *Router, out *v1alpha8.Router, s conversion.Scope) error { - return autoConvert_v1alpha7_Router_To_v1alpha8_Router(in, out, s) +// Convert_v1alpha7_Router_To_v1beta1_Router is an autogenerated conversion function. +func Convert_v1alpha7_Router_To_v1beta1_Router(in *Router, out *v1beta1.Router, s conversion.Scope) error { + return autoConvert_v1alpha7_Router_To_v1beta1_Router(in, out, s) } -func autoConvert_v1alpha8_Router_To_v1alpha7_Router(in *v1alpha8.Router, out *Router, s conversion.Scope) error { +func autoConvert_v1beta1_Router_To_v1alpha7_Router(in *v1beta1.Router, out *Router, s conversion.Scope) error { out.Name = in.Name out.ID = in.ID out.Tags = *(*[]string)(unsafe.Pointer(&in.Tags)) @@ -1543,12 +1543,12 @@ func autoConvert_v1alpha8_Router_To_v1alpha7_Router(in *v1alpha8.Router, out *Ro return nil } -// Convert_v1alpha8_Router_To_v1alpha7_Router is an autogenerated conversion function. -func Convert_v1alpha8_Router_To_v1alpha7_Router(in *v1alpha8.Router, out *Router, s conversion.Scope) error { - return autoConvert_v1alpha8_Router_To_v1alpha7_Router(in, out, s) +// Convert_v1beta1_Router_To_v1alpha7_Router is an autogenerated conversion function. +func Convert_v1beta1_Router_To_v1alpha7_Router(in *v1beta1.Router, out *Router, s conversion.Scope) error { + return autoConvert_v1beta1_Router_To_v1alpha7_Router(in, out, s) } -func autoConvert_v1alpha7_RouterFilter_To_v1alpha8_RouterFilter(in *RouterFilter, out *v1alpha8.RouterFilter, s conversion.Scope) error { +func autoConvert_v1alpha7_RouterFilter_To_v1beta1_RouterFilter(in *RouterFilter, out *v1beta1.RouterFilter, s conversion.Scope) error { out.ID = in.ID out.Name = in.Name out.Description = in.Description @@ -1560,12 +1560,12 @@ func autoConvert_v1alpha7_RouterFilter_To_v1alpha8_RouterFilter(in *RouterFilter return nil } -// Convert_v1alpha7_RouterFilter_To_v1alpha8_RouterFilter is an autogenerated conversion function. -func Convert_v1alpha7_RouterFilter_To_v1alpha8_RouterFilter(in *RouterFilter, out *v1alpha8.RouterFilter, s conversion.Scope) error { - return autoConvert_v1alpha7_RouterFilter_To_v1alpha8_RouterFilter(in, out, s) +// Convert_v1alpha7_RouterFilter_To_v1beta1_RouterFilter is an autogenerated conversion function. +func Convert_v1alpha7_RouterFilter_To_v1beta1_RouterFilter(in *RouterFilter, out *v1beta1.RouterFilter, s conversion.Scope) error { + return autoConvert_v1alpha7_RouterFilter_To_v1beta1_RouterFilter(in, out, s) } -func autoConvert_v1alpha8_RouterFilter_To_v1alpha7_RouterFilter(in *v1alpha8.RouterFilter, out *RouterFilter, s conversion.Scope) error { +func autoConvert_v1beta1_RouterFilter_To_v1alpha7_RouterFilter(in *v1beta1.RouterFilter, out *RouterFilter, s conversion.Scope) error { out.ID = in.ID out.Name = in.Name out.Description = in.Description @@ -1577,12 +1577,12 @@ func autoConvert_v1alpha8_RouterFilter_To_v1alpha7_RouterFilter(in *v1alpha8.Rou return nil } -// Convert_v1alpha8_RouterFilter_To_v1alpha7_RouterFilter is an autogenerated conversion function. -func Convert_v1alpha8_RouterFilter_To_v1alpha7_RouterFilter(in *v1alpha8.RouterFilter, out *RouterFilter, s conversion.Scope) error { - return autoConvert_v1alpha8_RouterFilter_To_v1alpha7_RouterFilter(in, out, s) +// Convert_v1beta1_RouterFilter_To_v1alpha7_RouterFilter is an autogenerated conversion function. +func Convert_v1beta1_RouterFilter_To_v1alpha7_RouterFilter(in *v1beta1.RouterFilter, out *RouterFilter, s conversion.Scope) error { + return autoConvert_v1beta1_RouterFilter_To_v1alpha7_RouterFilter(in, out, s) } -func autoConvert_v1alpha7_SecurityGroupFilter_To_v1alpha8_SecurityGroupFilter(in *SecurityGroupFilter, out *v1alpha8.SecurityGroupFilter, s conversion.Scope) error { +func autoConvert_v1alpha7_SecurityGroupFilter_To_v1beta1_SecurityGroupFilter(in *SecurityGroupFilter, out *v1beta1.SecurityGroupFilter, s conversion.Scope) error { out.ID = in.ID out.Name = in.Name out.Description = in.Description @@ -1594,12 +1594,12 @@ func autoConvert_v1alpha7_SecurityGroupFilter_To_v1alpha8_SecurityGroupFilter(in return nil } -// Convert_v1alpha7_SecurityGroupFilter_To_v1alpha8_SecurityGroupFilter is an autogenerated conversion function. -func Convert_v1alpha7_SecurityGroupFilter_To_v1alpha8_SecurityGroupFilter(in *SecurityGroupFilter, out *v1alpha8.SecurityGroupFilter, s conversion.Scope) error { - return autoConvert_v1alpha7_SecurityGroupFilter_To_v1alpha8_SecurityGroupFilter(in, out, s) +// Convert_v1alpha7_SecurityGroupFilter_To_v1beta1_SecurityGroupFilter is an autogenerated conversion function. +func Convert_v1alpha7_SecurityGroupFilter_To_v1beta1_SecurityGroupFilter(in *SecurityGroupFilter, out *v1beta1.SecurityGroupFilter, s conversion.Scope) error { + return autoConvert_v1alpha7_SecurityGroupFilter_To_v1beta1_SecurityGroupFilter(in, out, s) } -func autoConvert_v1alpha8_SecurityGroupFilter_To_v1alpha7_SecurityGroupFilter(in *v1alpha8.SecurityGroupFilter, out *SecurityGroupFilter, s conversion.Scope) error { +func autoConvert_v1beta1_SecurityGroupFilter_To_v1alpha7_SecurityGroupFilter(in *v1beta1.SecurityGroupFilter, out *SecurityGroupFilter, s conversion.Scope) error { out.ID = in.ID out.Name = in.Name out.Description = in.Description @@ -1611,12 +1611,12 @@ func autoConvert_v1alpha8_SecurityGroupFilter_To_v1alpha7_SecurityGroupFilter(in return nil } -// Convert_v1alpha8_SecurityGroupFilter_To_v1alpha7_SecurityGroupFilter is an autogenerated conversion function. -func Convert_v1alpha8_SecurityGroupFilter_To_v1alpha7_SecurityGroupFilter(in *v1alpha8.SecurityGroupFilter, out *SecurityGroupFilter, s conversion.Scope) error { - return autoConvert_v1alpha8_SecurityGroupFilter_To_v1alpha7_SecurityGroupFilter(in, out, s) +// Convert_v1beta1_SecurityGroupFilter_To_v1alpha7_SecurityGroupFilter is an autogenerated conversion function. +func Convert_v1beta1_SecurityGroupFilter_To_v1alpha7_SecurityGroupFilter(in *v1beta1.SecurityGroupFilter, out *SecurityGroupFilter, s conversion.Scope) error { + return autoConvert_v1beta1_SecurityGroupFilter_To_v1alpha7_SecurityGroupFilter(in, out, s) } -func autoConvert_v1alpha7_Subnet_To_v1alpha8_Subnet(in *Subnet, out *v1alpha8.Subnet, s conversion.Scope) error { +func autoConvert_v1alpha7_Subnet_To_v1beta1_Subnet(in *Subnet, out *v1beta1.Subnet, s conversion.Scope) error { out.Name = in.Name out.ID = in.ID out.CIDR = in.CIDR @@ -1624,12 +1624,12 @@ func autoConvert_v1alpha7_Subnet_To_v1alpha8_Subnet(in *Subnet, out *v1alpha8.Su return nil } -// Convert_v1alpha7_Subnet_To_v1alpha8_Subnet is an autogenerated conversion function. -func Convert_v1alpha7_Subnet_To_v1alpha8_Subnet(in *Subnet, out *v1alpha8.Subnet, s conversion.Scope) error { - return autoConvert_v1alpha7_Subnet_To_v1alpha8_Subnet(in, out, s) +// Convert_v1alpha7_Subnet_To_v1beta1_Subnet is an autogenerated conversion function. +func Convert_v1alpha7_Subnet_To_v1beta1_Subnet(in *Subnet, out *v1beta1.Subnet, s conversion.Scope) error { + return autoConvert_v1alpha7_Subnet_To_v1beta1_Subnet(in, out, s) } -func autoConvert_v1alpha8_Subnet_To_v1alpha7_Subnet(in *v1alpha8.Subnet, out *Subnet, s conversion.Scope) error { +func autoConvert_v1beta1_Subnet_To_v1alpha7_Subnet(in *v1beta1.Subnet, out *Subnet, s conversion.Scope) error { out.Name = in.Name out.ID = in.ID out.CIDR = in.CIDR @@ -1637,12 +1637,12 @@ func autoConvert_v1alpha8_Subnet_To_v1alpha7_Subnet(in *v1alpha8.Subnet, out *Su return nil } -// Convert_v1alpha8_Subnet_To_v1alpha7_Subnet is an autogenerated conversion function. -func Convert_v1alpha8_Subnet_To_v1alpha7_Subnet(in *v1alpha8.Subnet, out *Subnet, s conversion.Scope) error { - return autoConvert_v1alpha8_Subnet_To_v1alpha7_Subnet(in, out, s) +// Convert_v1beta1_Subnet_To_v1alpha7_Subnet is an autogenerated conversion function. +func Convert_v1beta1_Subnet_To_v1alpha7_Subnet(in *v1beta1.Subnet, out *Subnet, s conversion.Scope) error { + return autoConvert_v1beta1_Subnet_To_v1alpha7_Subnet(in, out, s) } -func autoConvert_v1alpha7_SubnetFilter_To_v1alpha8_SubnetFilter(in *SubnetFilter, out *v1alpha8.SubnetFilter, s conversion.Scope) error { +func autoConvert_v1alpha7_SubnetFilter_To_v1beta1_SubnetFilter(in *SubnetFilter, out *v1beta1.SubnetFilter, s conversion.Scope) error { out.Name = in.Name out.Description = in.Description out.ProjectID = in.ProjectID @@ -1659,12 +1659,12 @@ func autoConvert_v1alpha7_SubnetFilter_To_v1alpha8_SubnetFilter(in *SubnetFilter return nil } -// Convert_v1alpha7_SubnetFilter_To_v1alpha8_SubnetFilter is an autogenerated conversion function. -func Convert_v1alpha7_SubnetFilter_To_v1alpha8_SubnetFilter(in *SubnetFilter, out *v1alpha8.SubnetFilter, s conversion.Scope) error { - return autoConvert_v1alpha7_SubnetFilter_To_v1alpha8_SubnetFilter(in, out, s) +// Convert_v1alpha7_SubnetFilter_To_v1beta1_SubnetFilter is an autogenerated conversion function. +func Convert_v1alpha7_SubnetFilter_To_v1beta1_SubnetFilter(in *SubnetFilter, out *v1beta1.SubnetFilter, s conversion.Scope) error { + return autoConvert_v1alpha7_SubnetFilter_To_v1beta1_SubnetFilter(in, out, s) } -func autoConvert_v1alpha8_SubnetFilter_To_v1alpha7_SubnetFilter(in *v1alpha8.SubnetFilter, out *SubnetFilter, s conversion.Scope) error { +func autoConvert_v1beta1_SubnetFilter_To_v1alpha7_SubnetFilter(in *v1beta1.SubnetFilter, out *SubnetFilter, s conversion.Scope) error { out.Name = in.Name out.Description = in.Description out.ProjectID = in.ProjectID @@ -1681,31 +1681,31 @@ func autoConvert_v1alpha8_SubnetFilter_To_v1alpha7_SubnetFilter(in *v1alpha8.Sub return nil } -// Convert_v1alpha8_SubnetFilter_To_v1alpha7_SubnetFilter is an autogenerated conversion function. -func Convert_v1alpha8_SubnetFilter_To_v1alpha7_SubnetFilter(in *v1alpha8.SubnetFilter, out *SubnetFilter, s conversion.Scope) error { - return autoConvert_v1alpha8_SubnetFilter_To_v1alpha7_SubnetFilter(in, out, s) +// Convert_v1beta1_SubnetFilter_To_v1alpha7_SubnetFilter is an autogenerated conversion function. +func Convert_v1beta1_SubnetFilter_To_v1alpha7_SubnetFilter(in *v1beta1.SubnetFilter, out *SubnetFilter, s conversion.Scope) error { + return autoConvert_v1beta1_SubnetFilter_To_v1alpha7_SubnetFilter(in, out, s) } -func autoConvert_v1alpha7_ValueSpec_To_v1alpha8_ValueSpec(in *ValueSpec, out *v1alpha8.ValueSpec, s conversion.Scope) error { +func autoConvert_v1alpha7_ValueSpec_To_v1beta1_ValueSpec(in *ValueSpec, out *v1beta1.ValueSpec, s conversion.Scope) error { out.Name = in.Name out.Key = in.Key out.Value = in.Value return nil } -// Convert_v1alpha7_ValueSpec_To_v1alpha8_ValueSpec is an autogenerated conversion function. -func Convert_v1alpha7_ValueSpec_To_v1alpha8_ValueSpec(in *ValueSpec, out *v1alpha8.ValueSpec, s conversion.Scope) error { - return autoConvert_v1alpha7_ValueSpec_To_v1alpha8_ValueSpec(in, out, s) +// Convert_v1alpha7_ValueSpec_To_v1beta1_ValueSpec is an autogenerated conversion function. +func Convert_v1alpha7_ValueSpec_To_v1beta1_ValueSpec(in *ValueSpec, out *v1beta1.ValueSpec, s conversion.Scope) error { + return autoConvert_v1alpha7_ValueSpec_To_v1beta1_ValueSpec(in, out, s) } -func autoConvert_v1alpha8_ValueSpec_To_v1alpha7_ValueSpec(in *v1alpha8.ValueSpec, out *ValueSpec, s conversion.Scope) error { +func autoConvert_v1beta1_ValueSpec_To_v1alpha7_ValueSpec(in *v1beta1.ValueSpec, out *ValueSpec, s conversion.Scope) error { out.Name = in.Name out.Key = in.Key out.Value = in.Value return nil } -// Convert_v1alpha8_ValueSpec_To_v1alpha7_ValueSpec is an autogenerated conversion function. -func Convert_v1alpha8_ValueSpec_To_v1alpha7_ValueSpec(in *v1alpha8.ValueSpec, out *ValueSpec, s conversion.Scope) error { - return autoConvert_v1alpha8_ValueSpec_To_v1alpha7_ValueSpec(in, out, s) +// Convert_v1beta1_ValueSpec_To_v1alpha7_ValueSpec is an autogenerated conversion function. +func Convert_v1beta1_ValueSpec_To_v1alpha7_ValueSpec(in *v1beta1.ValueSpec, out *ValueSpec, s conversion.Scope) error { + return autoConvert_v1beta1_ValueSpec_To_v1alpha7_ValueSpec(in, out, s) } diff --git a/api/v1alpha8/conditions_consts.go b/api/v1beta1/conditions_consts.go similarity index 99% rename from api/v1alpha8/conditions_consts.go rename to api/v1beta1/conditions_consts.go index de16adeb08..288251636d 100644 --- a/api/v1alpha8/conditions_consts.go +++ b/api/v1beta1/conditions_consts.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package v1alpha8 +package v1beta1 import clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1" diff --git a/api/v1alpha8/conversion.go b/api/v1beta1/conversion.go similarity index 96% rename from api/v1alpha8/conversion.go rename to api/v1beta1/conversion.go index d59b51d96f..ab9d242d42 100644 --- a/api/v1alpha8/conversion.go +++ b/api/v1beta1/conversion.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package v1alpha8 +package v1beta1 import "k8s.io/utils/pointer" @@ -44,7 +44,7 @@ func (*OpenStackMachineTemplateList) Hub() {} // LegacyCalicoSecurityGroupRules returns a list of security group rules for calico // that need to be applied to the control plane and worker security groups when -// managed security groups are enabled and upgrading to v1alpha8. +// managed security groups are enabled and upgrading to v1beta1. func LegacyCalicoSecurityGroupRules() []SecurityGroupRuleSpec { return []SecurityGroupRuleSpec{ { diff --git a/api/v1alpha8/doc.go b/api/v1beta1/doc.go similarity index 97% rename from api/v1alpha8/doc.go rename to api/v1beta1/doc.go index 6e9bd36d84..465e3a377a 100644 --- a/api/v1alpha8/doc.go +++ b/api/v1beta1/doc.go @@ -14,4 +14,4 @@ See the License for the specific language governing permissions and limitations under the License. */ -package v1alpha8 +package v1beta1 diff --git a/api/v1alpha8/filter_convert.go b/api/v1beta1/filter_convert.go similarity index 99% rename from api/v1alpha8/filter_convert.go rename to api/v1beta1/filter_convert.go index 378642ce5f..e168c63e0a 100644 --- a/api/v1alpha8/filter_convert.go +++ b/api/v1beta1/filter_convert.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package v1alpha8 +package v1beta1 import ( "github.com/gophercloud/gophercloud/openstack/imageservice/v2/images" diff --git a/api/v1alpha8/groupversion_info.go b/api/v1beta1/groupversion_info.go similarity index 90% rename from api/v1alpha8/groupversion_info.go rename to api/v1beta1/groupversion_info.go index b0ab35273c..de2087f709 100644 --- a/api/v1alpha8/groupversion_info.go +++ b/api/v1beta1/groupversion_info.go @@ -14,10 +14,10 @@ See the License for the specific language governing permissions and limitations under the License. */ -// package v1alpha8 contains API Schema definitions for the infrastructure v1alpha8 API group +// package v1beta1 contains API Schema definitions for the infrastructure v1beta1 API group // +kubebuilder:object:generate=true // +groupName=infrastructure.cluster.x-k8s.io -package v1alpha8 +package v1beta1 import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -27,7 +27,7 @@ import ( var ( // GroupVersion is group version used to register these objects. - GroupVersion = schema.GroupVersion{Group: "infrastructure.cluster.x-k8s.io", Version: "v1alpha8"} + GroupVersion = schema.GroupVersion{Group: "infrastructure.cluster.x-k8s.io", Version: "v1beta1"} // schemeBuilder is used to add go types to the GroupVersionKind scheme. schemeBuilder = runtime.NewSchemeBuilder(addKnownTypes) diff --git a/api/v1alpha8/identity_types.go b/api/v1beta1/identity_types.go similarity index 98% rename from api/v1alpha8/identity_types.go rename to api/v1beta1/identity_types.go index b77700c2df..3c0e16d65e 100644 --- a/api/v1alpha8/identity_types.go +++ b/api/v1beta1/identity_types.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package v1alpha8 +package v1beta1 const defaultIdentityRefKind = "Secret" diff --git a/api/v1alpha8/openstackcluster_types.go b/api/v1beta1/openstackcluster_types.go similarity index 99% rename from api/v1alpha8/openstackcluster_types.go rename to api/v1beta1/openstackcluster_types.go index a6f9c0b15f..728310a82b 100644 --- a/api/v1alpha8/openstackcluster_types.go +++ b/api/v1beta1/openstackcluster_types.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package v1alpha8 +package v1beta1 import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/api/v1alpha8/openstackcluster_webhook.go b/api/v1beta1/openstackcluster_webhook.go similarity index 91% rename from api/v1alpha8/openstackcluster_webhook.go rename to api/v1beta1/openstackcluster_webhook.go index 78eb4a21b5..e8d1b3fb66 100644 --- a/api/v1alpha8/openstackcluster_webhook.go +++ b/api/v1beta1/openstackcluster_webhook.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package v1alpha8 +package v1beta1 import ( "fmt" @@ -40,8 +40,8 @@ func (r *OpenStackCluster) SetupWebhookWithManager(mgr manager.Manager) error { Complete() } -// +kubebuilder:webhook:verbs=create;update,path=/validate-infrastructure-cluster-x-k8s-io-v1alpha8-openstackcluster,mutating=false,failurePolicy=fail,matchPolicy=Equivalent,groups=infrastructure.cluster.x-k8s.io,resources=openstackclusters,versions=v1alpha8,name=validation.openstackcluster.infrastructure.cluster.x-k8s.io,sideEffects=None,admissionReviewVersions=v1beta1 -// +kubebuilder:webhook:verbs=create;update,path=/mutate-infrastructure-cluster-x-k8s-io-v1alpha8-openstackcluster,mutating=true,failurePolicy=fail,matchPolicy=Equivalent,groups=infrastructure.cluster.x-k8s.io,resources=openstackclusters,versions=v1alpha8,name=default.openstackcluster.infrastructure.cluster.x-k8s.io,sideEffects=None,admissionReviewVersions=v1beta1 +// +kubebuilder:webhook:verbs=create;update,path=/validate-infrastructure-cluster-x-k8s-io-v1beta1-openstackcluster,mutating=false,failurePolicy=fail,matchPolicy=Equivalent,groups=infrastructure.cluster.x-k8s.io,resources=openstackclusters,versions=v1beta1,name=validation.openstackcluster.infrastructure.cluster.x-k8s.io,sideEffects=None,admissionReviewVersions=v1beta1 +// +kubebuilder:webhook:verbs=create;update,path=/mutate-infrastructure-cluster-x-k8s-io-v1beta1-openstackcluster,mutating=true,failurePolicy=fail,matchPolicy=Equivalent,groups=infrastructure.cluster.x-k8s.io,resources=openstackclusters,versions=v1beta1,name=default.openstackcluster.infrastructure.cluster.x-k8s.io,sideEffects=None,admissionReviewVersions=v1beta1 var ( _ webhook.Defaulter = &OpenStackCluster{} diff --git a/api/v1alpha8/openstackcluster_webhook_test.go b/api/v1beta1/openstackcluster_webhook_test.go similarity index 99% rename from api/v1alpha8/openstackcluster_webhook_test.go rename to api/v1beta1/openstackcluster_webhook_test.go index 3985e76605..df1f16f7e3 100644 --- a/api/v1alpha8/openstackcluster_webhook_test.go +++ b/api/v1beta1/openstackcluster_webhook_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package v1alpha8 +package v1beta1 import ( "testing" diff --git a/api/v1alpha8/openstackclusterlist_webhook.go b/api/v1beta1/openstackclusterlist_webhook.go similarity index 98% rename from api/v1alpha8/openstackclusterlist_webhook.go rename to api/v1beta1/openstackclusterlist_webhook.go index e6c3d9d47a..c765ad7cb8 100644 --- a/api/v1alpha8/openstackclusterlist_webhook.go +++ b/api/v1beta1/openstackclusterlist_webhook.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package v1alpha8 +package v1beta1 import ( "sigs.k8s.io/controller-runtime/pkg/builder" diff --git a/api/v1alpha8/openstackclustertemplate_types.go b/api/v1beta1/openstackclustertemplate_types.go similarity index 99% rename from api/v1alpha8/openstackclustertemplate_types.go rename to api/v1beta1/openstackclustertemplate_types.go index 65ea6aeff6..2134595759 100644 --- a/api/v1alpha8/openstackclustertemplate_types.go +++ b/api/v1beta1/openstackclustertemplate_types.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package v1alpha8 +package v1beta1 import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/api/v1alpha8/openstackclustertemplate_webhook.go b/api/v1beta1/openstackclustertemplate_webhook.go similarity index 82% rename from api/v1alpha8/openstackclustertemplate_webhook.go rename to api/v1beta1/openstackclustertemplate_webhook.go index 5cfbc6b92d..8ad94ace69 100644 --- a/api/v1alpha8/openstackclustertemplate_webhook.go +++ b/api/v1beta1/openstackclustertemplate_webhook.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package v1alpha8 +package v1beta1 import ( "fmt" @@ -36,8 +36,8 @@ func (r *OpenStackClusterTemplate) SetupWebhookWithManager(mgr ctrl.Manager) err Complete() } -// +kubebuilder:webhook:verbs=create;update,path=/mutate-infrastructure-cluster-x-k8s-io-v1alpha8-openstackclustertemplate,mutating=true,failurePolicy=fail,matchPolicy=Equivalent,groups=infrastructure.cluster.x-k8s.io,resources=openstackclustertemplates,versions=v1alpha8,name=default.openstackclustertemplate.infrastructure.cluster.x-k8s.io,sideEffects=None,admissionReviewVersions=v1beta1 -// +kubebuilder:webhook:verbs=create;update,path=/validate-infrastructure-cluster-x-k8s-io-v1alpha8-openstackclustertemplate,mutating=false,failurePolicy=fail,matchPolicy=Equivalent,groups=infrastructure.cluster.x-k8s.io,resources=openstackclustertemplates,versions=v1alpha8,name=validation.openstackclustertemplate.infrastructure.cluster.x-k8s.io,sideEffects=None,admissionReviewVersions=v1beta1 +// +kubebuilder:webhook:verbs=create;update,path=/mutate-infrastructure-cluster-x-k8s-io-v1beta1-openstackclustertemplate,mutating=true,failurePolicy=fail,matchPolicy=Equivalent,groups=infrastructure.cluster.x-k8s.io,resources=openstackclustertemplates,versions=v1beta1,name=default.openstackclustertemplate.infrastructure.cluster.x-k8s.io,sideEffects=None,admissionReviewVersions=v1beta1 +// +kubebuilder:webhook:verbs=create;update,path=/validate-infrastructure-cluster-x-k8s-io-v1beta1-openstackclustertemplate,mutating=false,failurePolicy=fail,matchPolicy=Equivalent,groups=infrastructure.cluster.x-k8s.io,resources=openstackclustertemplates,versions=v1beta1,name=validation.openstackclustertemplate.infrastructure.cluster.x-k8s.io,sideEffects=None,admissionReviewVersions=v1beta1 var ( _ webhook.Defaulter = &OpenStackClusterTemplate{} diff --git a/api/v1alpha8/openstackmachine_types.go b/api/v1beta1/openstackmachine_types.go similarity index 99% rename from api/v1alpha8/openstackmachine_types.go rename to api/v1beta1/openstackmachine_types.go index bc98e02a98..e16e5e495a 100644 --- a/api/v1alpha8/openstackmachine_types.go +++ b/api/v1beta1/openstackmachine_types.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package v1alpha8 +package v1beta1 import ( corev1 "k8s.io/api/core/v1" diff --git a/api/v1alpha8/openstackmachine_webhook.go b/api/v1beta1/openstackmachine_webhook.go similarity index 87% rename from api/v1alpha8/openstackmachine_webhook.go rename to api/v1beta1/openstackmachine_webhook.go index b5ddbaf0e3..99f0923f33 100644 --- a/api/v1alpha8/openstackmachine_webhook.go +++ b/api/v1beta1/openstackmachine_webhook.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package v1alpha8 +package v1beta1 import ( "fmt" @@ -39,8 +39,8 @@ func (r *OpenStackMachine) SetupWebhookWithManager(mgr manager.Manager) error { Complete() } -// +kubebuilder:webhook:verbs=create;update,path=/validate-infrastructure-cluster-x-k8s-io-v1alpha8-openstackmachine,mutating=false,failurePolicy=fail,matchPolicy=Equivalent,groups=infrastructure.cluster.x-k8s.io,resources=openstackmachines,versions=v1alpha8,name=validation.openstackmachine.infrastructure.cluster.x-k8s.io,sideEffects=None,admissionReviewVersions=v1beta1 -// +kubebuilder:webhook:verbs=create;update,path=/mutate-infrastructure-cluster-x-k8s-io-v1alpha8-openstackmachine,mutating=true,failurePolicy=fail,matchPolicy=Equivalent,groups=infrastructure.cluster.x-k8s.io,resources=openstackmachines,versions=v1alpha8,name=default.openstackmachine.infrastructure.cluster.x-k8s.io,sideEffects=None,admissionReviewVersions=v1beta1 +// +kubebuilder:webhook:verbs=create;update,path=/validate-infrastructure-cluster-x-k8s-io-v1beta1-openstackmachine,mutating=false,failurePolicy=fail,matchPolicy=Equivalent,groups=infrastructure.cluster.x-k8s.io,resources=openstackmachines,versions=v1beta1,name=validation.openstackmachine.infrastructure.cluster.x-k8s.io,sideEffects=None,admissionReviewVersions=v1beta1 +// +kubebuilder:webhook:verbs=create;update,path=/mutate-infrastructure-cluster-x-k8s-io-v1beta1-openstackmachine,mutating=true,failurePolicy=fail,matchPolicy=Equivalent,groups=infrastructure.cluster.x-k8s.io,resources=openstackmachines,versions=v1beta1,name=default.openstackmachine.infrastructure.cluster.x-k8s.io,sideEffects=None,admissionReviewVersions=v1beta1 var ( _ webhook.Defaulter = &OpenStackMachine{} diff --git a/api/v1alpha8/openstackmachinelist_webhook.go b/api/v1beta1/openstackmachinelist_webhook.go similarity index 98% rename from api/v1alpha8/openstackmachinelist_webhook.go rename to api/v1beta1/openstackmachinelist_webhook.go index e858ba072d..9e6a551f2d 100644 --- a/api/v1alpha8/openstackmachinelist_webhook.go +++ b/api/v1beta1/openstackmachinelist_webhook.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package v1alpha8 +package v1beta1 import ( "sigs.k8s.io/controller-runtime/pkg/builder" diff --git a/api/v1alpha8/openstackmachinetemplate_types.go b/api/v1beta1/openstackmachinetemplate_types.go similarity index 98% rename from api/v1alpha8/openstackmachinetemplate_types.go rename to api/v1beta1/openstackmachinetemplate_types.go index fa80dc371d..c085f2620d 100644 --- a/api/v1alpha8/openstackmachinetemplate_types.go +++ b/api/v1beta1/openstackmachinetemplate_types.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package v1alpha8 +package v1beta1 import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/api/v1alpha8/openstackmachinetemplate_webhook.go b/api/v1beta1/openstackmachinetemplate_webhook.go similarity index 91% rename from api/v1alpha8/openstackmachinetemplate_webhook.go rename to api/v1beta1/openstackmachinetemplate_webhook.go index cbb91ebb17..24f27a937e 100644 --- a/api/v1alpha8/openstackmachinetemplate_webhook.go +++ b/api/v1beta1/openstackmachinetemplate_webhook.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package v1alpha8 +package v1beta1 import ( "context" @@ -44,7 +44,7 @@ func (r *OpenStackMachineTemplateWebhook) SetupWebhookWithManager(mgr manager.Ma Complete() } -// +kubebuilder:webhook:verbs=create;update,path=/validate-infrastructure-cluster-x-k8s-io-v1alpha8-openstackmachinetemplate,mutating=false,failurePolicy=fail,matchPolicy=Equivalent,groups=infrastructure.cluster.x-k8s.io,resources=openstackmachinetemplates,versions=v1alpha8,name=validation.openstackmachinetemplate.infrastructure.cluster.x-k8s.io,sideEffects=None,admissionReviewVersions=v1beta1 +// +kubebuilder:webhook:verbs=create;update,path=/validate-infrastructure-cluster-x-k8s-io-v1beta1-openstackmachinetemplate,mutating=false,failurePolicy=fail,matchPolicy=Equivalent,groups=infrastructure.cluster.x-k8s.io,resources=openstackmachinetemplates,versions=v1beta1,name=validation.openstackmachinetemplate.infrastructure.cluster.x-k8s.io,sideEffects=None,admissionReviewVersions=v1beta1 var _ webhook.CustomValidator = &OpenStackMachineTemplateWebhook{} diff --git a/api/v1alpha8/openstackmachinetemplate_webhook_test.go b/api/v1beta1/openstackmachinetemplate_webhook_test.go similarity index 99% rename from api/v1alpha8/openstackmachinetemplate_webhook_test.go rename to api/v1beta1/openstackmachinetemplate_webhook_test.go index e441ef0583..95fd2c7ccf 100644 --- a/api/v1alpha8/openstackmachinetemplate_webhook_test.go +++ b/api/v1beta1/openstackmachinetemplate_webhook_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package v1alpha8 +package v1beta1 import ( "context" diff --git a/api/v1alpha8/openstackmachinetemplatelist_webhook.go b/api/v1beta1/openstackmachinetemplatelist_webhook.go similarity index 98% rename from api/v1alpha8/openstackmachinetemplatelist_webhook.go rename to api/v1beta1/openstackmachinetemplatelist_webhook.go index 01d976b51e..03d438e925 100644 --- a/api/v1alpha8/openstackmachinetemplatelist_webhook.go +++ b/api/v1beta1/openstackmachinetemplatelist_webhook.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package v1alpha8 +package v1beta1 import ( "sigs.k8s.io/controller-runtime/pkg/builder" diff --git a/api/v1alpha8/types.go b/api/v1beta1/types.go similarity index 99% rename from api/v1alpha8/types.go rename to api/v1beta1/types.go index 8c206d803d..f645c03339 100644 --- a/api/v1alpha8/types.go +++ b/api/v1beta1/types.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package v1alpha8 +package v1beta1 // OpenStackMachineTemplateResource describes the data needed to create a OpenStackMachine from a template. type OpenStackMachineTemplateResource struct { diff --git a/api/v1alpha8/webhooks.go b/api/v1beta1/webhooks.go similarity index 98% rename from api/v1alpha8/webhooks.go rename to api/v1beta1/webhooks.go index 87a4a374a0..3df43589ba 100644 --- a/api/v1alpha8/webhooks.go +++ b/api/v1beta1/webhooks.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package v1alpha8 +package v1beta1 import ( apierrors "k8s.io/apimachinery/pkg/api/errors" diff --git a/api/v1alpha8/zz_generated.deepcopy.go b/api/v1beta1/zz_generated.deepcopy.go similarity index 99% rename from api/v1alpha8/zz_generated.deepcopy.go rename to api/v1beta1/zz_generated.deepcopy.go index 2b52b02cd2..44ba17860a 100644 --- a/api/v1alpha8/zz_generated.deepcopy.go +++ b/api/v1beta1/zz_generated.deepcopy.go @@ -18,12 +18,12 @@ limitations under the License. // Code generated by controller-gen. DO NOT EDIT. -package v1alpha8 +package v1beta1 import ( "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime" - "sigs.k8s.io/cluster-api/api/v1beta1" + apiv1beta1 "sigs.k8s.io/cluster-api/api/v1beta1" "sigs.k8s.io/cluster-api/errors" ) @@ -476,7 +476,7 @@ func (in *OpenStackClusterStatus) DeepCopyInto(out *OpenStackClusterStatus) { } if in.FailureDomains != nil { in, out := &in.FailureDomains, &out.FailureDomains - *out = make(v1beta1.FailureDomains, len(*in)) + *out = make(apiv1beta1.FailureDomains, len(*in)) for key, val := range *in { (*out)[key] = *val.DeepCopy() } @@ -788,7 +788,7 @@ func (in *OpenStackMachineStatus) DeepCopyInto(out *OpenStackMachineStatus) { } if in.Conditions != nil { in, out := &in.Conditions, &out.Conditions - *out = make(v1beta1.Conditions, len(*in)) + *out = make(apiv1beta1.Conditions, len(*in)) for i := range *in { (*in)[i].DeepCopyInto(&(*out)[i]) } diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_openstackclusters.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_openstackclusters.yaml index aa96ad27ea..69eb43b09c 100644 --- a/config/crd/bases/infrastructure.cluster.x-k8s.io_openstackclusters.yaml +++ b/config/crd/bases/infrastructure.cluster.x-k8s.io_openstackclusters.yaml @@ -4820,7 +4820,7 @@ spec: jsonPath: .metadata.creationTimestamp name: Age type: date - name: v1alpha8 + name: v1beta1 schema: openAPIV3Schema: description: OpenStackCluster is the Schema for the openstackclusters API. diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_openstackclustertemplates.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_openstackclustertemplates.yaml index cb48bc42f4..016809a162 100644 --- a/config/crd/bases/infrastructure.cluster.x-k8s.io_openstackclustertemplates.yaml +++ b/config/crd/bases/infrastructure.cluster.x-k8s.io_openstackclustertemplates.yaml @@ -2234,7 +2234,7 @@ spec: type: object served: true storage: false - - name: v1alpha8 + - name: v1beta1 schema: openAPIV3Schema: description: OpenStackClusterTemplate is the Schema for the openstackclustertemplates diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_openstackmachines.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_openstackmachines.yaml index 67da66b7ea..0c38e70382 100644 --- a/config/crd/bases/infrastructure.cluster.x-k8s.io_openstackmachines.yaml +++ b/config/crd/bases/infrastructure.cluster.x-k8s.io_openstackmachines.yaml @@ -1692,7 +1692,7 @@ spec: jsonPath: .metadata.creationTimestamp name: Age type: date - name: v1alpha8 + name: v1beta1 schema: openAPIV3Schema: description: OpenStackMachine is the Schema for the openstackmachines API. diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_openstackmachinetemplates.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_openstackmachinetemplates.yaml index c96a204003..4c0d2b51fe 100644 --- a/config/crd/bases/infrastructure.cluster.x-k8s.io_openstackmachinetemplates.yaml +++ b/config/crd/bases/infrastructure.cluster.x-k8s.io_openstackmachinetemplates.yaml @@ -1354,7 +1354,7 @@ spec: type: object served: true storage: false - - name: v1alpha8 + - name: v1beta1 schema: openAPIV3Schema: description: OpenStackMachineTemplate is the Schema for the openstackmachinetemplates diff --git a/config/crd/kustomization.yaml b/config/crd/kustomization.yaml index c153237cc4..5e25640181 100644 --- a/config/crd/kustomization.yaml +++ b/config/crd/kustomization.yaml @@ -1,5 +1,5 @@ commonLabels: - cluster.x-k8s.io/v1beta1: v1alpha5_v1alpha6_v1alpha7_v1alpha8 + cluster.x-k8s.io/v1beta1: v1alpha5_v1alpha6_v1alpha7_v1beta1 # This kustomization.yaml is not intended to be run by itself, # since it depends on service name and namespace that are out of this kustomize package. diff --git a/config/webhook/manifests.yaml b/config/webhook/manifests.yaml index d65e84a9f2..260778c5cf 100644 --- a/config/webhook/manifests.yaml +++ b/config/webhook/manifests.yaml @@ -10,7 +10,7 @@ webhooks: service: name: webhook-service namespace: system - path: /mutate-infrastructure-cluster-x-k8s-io-v1alpha8-openstackcluster + path: /mutate-infrastructure-cluster-x-k8s-io-v1beta1-openstackcluster failurePolicy: Fail matchPolicy: Equivalent name: default.openstackcluster.infrastructure.cluster.x-k8s.io @@ -18,7 +18,7 @@ webhooks: - apiGroups: - infrastructure.cluster.x-k8s.io apiVersions: - - v1alpha8 + - v1beta1 operations: - CREATE - UPDATE @@ -31,7 +31,7 @@ webhooks: service: name: webhook-service namespace: system - path: /mutate-infrastructure-cluster-x-k8s-io-v1alpha8-openstackclustertemplate + path: /mutate-infrastructure-cluster-x-k8s-io-v1beta1-openstackclustertemplate failurePolicy: Fail matchPolicy: Equivalent name: default.openstackclustertemplate.infrastructure.cluster.x-k8s.io @@ -39,7 +39,7 @@ webhooks: - apiGroups: - infrastructure.cluster.x-k8s.io apiVersions: - - v1alpha8 + - v1beta1 operations: - CREATE - UPDATE @@ -52,7 +52,7 @@ webhooks: service: name: webhook-service namespace: system - path: /mutate-infrastructure-cluster-x-k8s-io-v1alpha8-openstackmachine + path: /mutate-infrastructure-cluster-x-k8s-io-v1beta1-openstackmachine failurePolicy: Fail matchPolicy: Equivalent name: default.openstackmachine.infrastructure.cluster.x-k8s.io @@ -60,7 +60,7 @@ webhooks: - apiGroups: - infrastructure.cluster.x-k8s.io apiVersions: - - v1alpha8 + - v1beta1 operations: - CREATE - UPDATE @@ -79,7 +79,7 @@ webhooks: service: name: webhook-service namespace: system - path: /validate-infrastructure-cluster-x-k8s-io-v1alpha8-openstackcluster + path: /validate-infrastructure-cluster-x-k8s-io-v1beta1-openstackcluster failurePolicy: Fail matchPolicy: Equivalent name: validation.openstackcluster.infrastructure.cluster.x-k8s.io @@ -87,7 +87,7 @@ webhooks: - apiGroups: - infrastructure.cluster.x-k8s.io apiVersions: - - v1alpha8 + - v1beta1 operations: - CREATE - UPDATE @@ -100,7 +100,7 @@ webhooks: service: name: webhook-service namespace: system - path: /validate-infrastructure-cluster-x-k8s-io-v1alpha8-openstackclustertemplate + path: /validate-infrastructure-cluster-x-k8s-io-v1beta1-openstackclustertemplate failurePolicy: Fail matchPolicy: Equivalent name: validation.openstackclustertemplate.infrastructure.cluster.x-k8s.io @@ -108,7 +108,7 @@ webhooks: - apiGroups: - infrastructure.cluster.x-k8s.io apiVersions: - - v1alpha8 + - v1beta1 operations: - CREATE - UPDATE @@ -121,7 +121,7 @@ webhooks: service: name: webhook-service namespace: system - path: /validate-infrastructure-cluster-x-k8s-io-v1alpha8-openstackmachine + path: /validate-infrastructure-cluster-x-k8s-io-v1beta1-openstackmachine failurePolicy: Fail matchPolicy: Equivalent name: validation.openstackmachine.infrastructure.cluster.x-k8s.io @@ -129,7 +129,7 @@ webhooks: - apiGroups: - infrastructure.cluster.x-k8s.io apiVersions: - - v1alpha8 + - v1beta1 operations: - CREATE - UPDATE @@ -142,7 +142,7 @@ webhooks: service: name: webhook-service namespace: system - path: /validate-infrastructure-cluster-x-k8s-io-v1alpha8-openstackmachinetemplate + path: /validate-infrastructure-cluster-x-k8s-io-v1beta1-openstackmachinetemplate failurePolicy: Fail matchPolicy: Equivalent name: validation.openstackmachinetemplate.infrastructure.cluster.x-k8s.io @@ -150,7 +150,7 @@ webhooks: - apiGroups: - infrastructure.cluster.x-k8s.io apiVersions: - - v1alpha8 + - v1beta1 operations: - CREATE - UPDATE diff --git a/controllers/openstackcluster_controller.go b/controllers/openstackcluster_controller.go index 914e662fa4..3eec38a403 100644 --- a/controllers/openstackcluster_controller.go +++ b/controllers/openstackcluster_controller.go @@ -47,7 +47,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/predicate" "sigs.k8s.io/controller-runtime/pkg/reconcile" - infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha8" + infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1" "sigs.k8s.io/cluster-api-provider-openstack/pkg/cloud/services/compute" "sigs.k8s.io/cluster-api-provider-openstack/pkg/cloud/services/loadbalancer" "sigs.k8s.io/cluster-api-provider-openstack/pkg/cloud/services/networking" diff --git a/controllers/openstackcluster_controller_test.go b/controllers/openstackcluster_controller_test.go index 3a51ad6413..a9c0b0c5cf 100644 --- a/controllers/openstackcluster_controller_test.go +++ b/controllers/openstackcluster_controller_test.go @@ -45,7 +45,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/reconcile" - infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha8" + infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1" "sigs.k8s.io/cluster-api-provider-openstack/pkg/clients" "sigs.k8s.io/cluster-api-provider-openstack/pkg/scope" ) diff --git a/controllers/openstackfloatingippool_controller.go b/controllers/openstackfloatingippool_controller.go index c01a5603dd..7c72bc081d 100644 --- a/controllers/openstackfloatingippool_controller.go +++ b/controllers/openstackfloatingippool_controller.go @@ -42,7 +42,7 @@ import ( infrav1alpha1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha1" infrav1alpha7 "sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha7" - infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha8" + infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1" "sigs.k8s.io/cluster-api-provider-openstack/pkg/cloud/services/networking" "sigs.k8s.io/cluster-api-provider-openstack/pkg/scope" ) diff --git a/controllers/openstackmachine_controller.go b/controllers/openstackmachine_controller.go index 71972fdeff..417f017cd6 100644 --- a/controllers/openstackmachine_controller.go +++ b/controllers/openstackmachine_controller.go @@ -48,7 +48,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/predicate" "sigs.k8s.io/controller-runtime/pkg/reconcile" - infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha8" + infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1" "sigs.k8s.io/cluster-api-provider-openstack/pkg/cloud/services/compute" "sigs.k8s.io/cluster-api-provider-openstack/pkg/cloud/services/loadbalancer" "sigs.k8s.io/cluster-api-provider-openstack/pkg/cloud/services/networking" diff --git a/controllers/openstackmachine_controller_test.go b/controllers/openstackmachine_controller_test.go index 32db7b92bb..4ed60bbbc8 100644 --- a/controllers/openstackmachine_controller_test.go +++ b/controllers/openstackmachine_controller_test.go @@ -24,7 +24,7 @@ import ( "k8s.io/utils/pointer" clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1" - infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha8" + infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1" "sigs.k8s.io/cluster-api-provider-openstack/pkg/cloud/services/compute" ) diff --git a/controllers/suite_test.go b/controllers/suite_test.go index fdbda08855..a082ebbfd7 100644 --- a/controllers/suite_test.go +++ b/controllers/suite_test.go @@ -38,7 +38,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/envtest" - infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha8" + infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1" "sigs.k8s.io/cluster-api-provider-openstack/pkg/clients" "sigs.k8s.io/cluster-api-provider-openstack/pkg/cloud/services/compute" "sigs.k8s.io/cluster-api-provider-openstack/pkg/scope" diff --git a/docs/book/src/SUMMARY.md b/docs/book/src/SUMMARY.md index a03f4c5fc7..476311d1f7 100644 --- a/docs/book/src/SUMMARY.md +++ b/docs/book/src/SUMMARY.md @@ -11,6 +11,6 @@ - [v1alpha4 to v1alpha5](./topics/crd-changes/v1alpha4-to-v1alpha5.md) - [v1alpha5 to v1alpha6](./topics/crd-changes/v1alpha5-to-v1alpha6.md) - [v1alpha6 to v1alpha7](./topics/crd-changes/v1alpha6-to-v1alpha7.md) - - [v1alpha7 to v1alpha8](./topics/crd-changes/v1alpha7-to-v1alpha8.md) + - [v1alpha7 to v1beta1](./topics/crd-changes/v1alpha7-to-v1beta1.md) - [Development](./development/development.md) - [Hacking CI](./development/ci.md) diff --git a/docs/book/src/clusteropenstack/configuration.md b/docs/book/src/clusteropenstack/configuration.md index 0a87afcee1..810d33b322 100644 --- a/docs/book/src/clusteropenstack/configuration.md +++ b/docs/book/src/clusteropenstack/configuration.md @@ -186,7 +186,7 @@ The recommmend minimum value of control plane flavor's vCPU is 2 and minimum val Depending on the CNI that will be deployed on the cluster, you may need to add specific security group rules to the control plane and worker nodes. For example, if you are using Calico with BGP, you will need to add the following security group rules to the control plane and worker nodes: ```yaml - apiVersion: infrastructure.cluster.x-k8s.io/v1alpha8 + apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 kind: OpenStackCluster metadata: name: @@ -239,7 +239,7 @@ Note: If your openstack cluster does not already have a public network, you shou You can use a pre-existing router instead of creating a new one. When deleting a cluster a pre-existing router will not be deleted. ```yaml - apiVersion: infrastructure.cluster.x-k8s.io/v1alpha8 + apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 kind: OpenStackCluster metadata: name: @@ -306,7 +306,7 @@ It is possible to restrict access to the Kubernetes API server on a network leve the allowed CIDRs by `spec.APIServerLoadBalancer.AllowedCIDRs` of `OpenStackCluster`. ```yaml -apiVersion: infrastructure.cluster.x-k8s.io/v1alpha8 +apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 kind: OpenStackCluster metadata: name: @@ -324,7 +324,7 @@ All known IPs of the target cluster will be discovered dynamically (e.g. you don All applied CIDRs (user defined + dynamically discovered) are written back into `status.network.apiServerLoadBalancer.allowedCIDRs` ```yaml -apiVersion: infrastructure.cluster.x-k8s.io/v1alpha8 +apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 kind: OpenStackCluster metadata: name: @@ -357,7 +357,7 @@ If you have a complex query that you want to use to lookup a network, then you c By using filters to look up a network, please note that it is possible to get multiple networks as a result. This should not be a problem, however please test your filters with `openstack network list` to be certain that it returns the networks you want. Please refer to the following usage example: ```yaml -apiVersion: infrastructure.cluster.x-k8s.io/v1alpha8 +apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 kind: OpenStackMachineTemplate metadata: name: -controlplane @@ -375,7 +375,7 @@ spec: You can specify multiple networks (or subnets) to connect your server to. To do this, simply add another entry in the networks array. The following example connects the server to 3 different networks: ```yaml -apiVersion: infrastructure.cluster.x-k8s.io/v1alpha8 +apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 kind: OpenStackMachineTemplate metadata: name: -controlplane @@ -399,7 +399,7 @@ spec: Rather than just using a network, you have the option of specifying a specific subnet to connect your server to. The following is an example of how to specify a specific subnet of a network to use for your server. ```yaml -apiVersion: infrastructure.cluster.x-k8s.io/v1alpha8 +apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 kind: OpenStackMachineTemplate metadata: name: -controlplane @@ -420,7 +420,7 @@ spec: A server can also be connected to networks by describing what ports to create. Describing a server's connection with `ports` allows for finer and more advanced configuration. For example, you can specify per-port security groups, fixed IPs, VNIC type or profile. ```yaml -apiVersion: infrastructure.cluster.x-k8s.io/v1alpha8 +apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 kind: OpenStackMachineTemplate metadata: name: -controlplane @@ -518,7 +518,7 @@ ports: `port security` can be applied to specific port to enable/disable the `port security` on that port; When not set, it takes the value of the corresponding field at the network level. ```yaml -apiVersion: infrastructure.cluster.x-k8s.io/v1alpha8 +apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 kind: OpenStackMachineTemplate metadata: name: -controlplane @@ -589,7 +589,7 @@ If this is not flexible enough, pre-existing security groups can be added to the spec of an `OpenStackMachineTemplate`, e.g.: ```yaml -apiVersion: infrastructure.cluster.x-k8s.io/v1alpha8 +apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 kind: OpenStackMachineTemplate metadata: name: ${CLUSTER_NAME}-control-plane @@ -605,7 +605,7 @@ spec: You have the ability to tag all resources created by the cluster in the `OpenStackCluster` spec. Here is an example how to configure tagging: ```yaml -apiVersion: infrastructure.cluster.x-k8s.io/v1alpha8 +apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 kind: OpenStackCluster metadata: name: @@ -618,7 +618,7 @@ spec: To tag resources specific to a machine, add a value to the tags field in the `OpenStackMachineTemplate` spec like this: ```yaml -apiVersion: infrastructure.cluster.x-k8s.io/v1alpha8 +apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 kind: OpenStackMachineTemplate metadata: name: -controlplane @@ -635,7 +635,7 @@ spec: You also have the option to add metadata to instances. Here is a usage example: ```yaml -apiVersion: infrastructure.cluster.x-k8s.io/v1alpha8 +apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 kind: OpenStackMachineTemplate metadata: name: -controlplane @@ -653,7 +653,7 @@ spec: For example in `OpenStackMachineTemplate` set `spec.rootVolume.diskSize` to something greater than `0` means boot from volume. ```yaml -apiVersion: infrastructure.cluster.x-k8s.io/v1alpha8 +apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 kind: OpenStackMachineTemplate metadata: name: -controlplane diff --git a/docs/book/src/development/development.md b/docs/book/src/development/development.md index 9f5309fd77..661ac84ec6 100644 --- a/docs/book/src/development/development.md +++ b/docs/book/src/development/development.md @@ -500,6 +500,6 @@ This sections goal is to gather various insights into the API design that can se ### `referencedResources` -Starting from v1alpha8 both `OpenStackMachineStatus` and `BastionsStatus` feature a field named `referencedResources` which aims to include fields that list individual IDs of the resources associated with the machine or bastion. These IDs are calculated on machine or bastion creation and are not intended to be changed during the object lifecycle. +Starting from v1beta1 both `OpenStackMachineStatus` and `BastionsStatus` feature a field named `referencedResources` which aims to include fields that list individual IDs of the resources associated with the machine or bastion. These IDs are calculated on machine or bastion creation and are not intended to be changed during the object lifecycle. Having all the IDs of related resources saved in the statuses allows CAPO to make easy decisions about deleting the related resources when deleting the VM corresponding to the machine or bastion. diff --git a/docs/book/src/topics/crd-changes/v1alpha7-to-v1alpha8.md b/docs/book/src/topics/crd-changes/v1alpha7-to-v1beta1.md similarity index 88% rename from docs/book/src/topics/crd-changes/v1alpha7-to-v1alpha8.md rename to docs/book/src/topics/crd-changes/v1alpha7-to-v1beta1.md index a5f4c3121a..c42b48abb4 100644 --- a/docs/book/src/topics/crd-changes/v1alpha7-to-v1alpha8.md +++ b/docs/book/src/topics/crd-changes/v1alpha7-to-v1beta1.md @@ -2,7 +2,7 @@ **Table of Contents** *generated with [DocToc](https://github.com/thlorenz/doctoc)* -- [v1alpha7 compared to v1alpha8](#v1alpha7-compared-to-v1alpha8) +- [v1alpha7 compared to v1beta1](#v1alpha7-compared-to-v1beta1) - [Migration](#migration) - [API Changes](#api-changes) - [`OpenStackMachine`](#openstackmachine) @@ -19,16 +19,16 @@ -# v1alpha7 compared to v1alpha8 +# v1alpha7 compared to v1beta1 -> ⚠️ v1alpha8 has not been released yet. +> ⚠️ v1beta1 has not been released yet. ## Migration -All users are encouraged to migrate their usage of the CAPO CRDs from older versions to `v1alpha8`. This includes yaml files and source code. As CAPO implements automatic conversions between the CRD versions, this migration can happen after installing the new CAPO release. +All users are encouraged to migrate their usage of the CAPO CRDs from older versions to `v1beta1`. This includes yaml files and source code. As CAPO implements automatic conversions between the CRD versions, this migration can happen after installing the new CAPO release. ## API Changes -This only documents backwards incompatible changes. Fields that were added to v1alpha8 are not listed here. +This only documents backwards incompatible changes. Fields that were added to v1beta1 are not listed here. ### `OpenStackMachine` @@ -163,14 +163,14 @@ spec: #### ⚠️ Change to subnet -In v1alpha8, `Subnet` of `OpenStackCluster` is modified to `Subnets` to allow specification of two existent subnets for the dual-stack scenario. +In v1beta1, `Subnet` of `OpenStackCluster` is modified to `Subnets` to allow specification of two existent subnets for the dual-stack scenario. ```yaml subnet: id: a532beb0-c73a-4b5d-af66-3ad05b73d063 ``` -In v1alpha8, this will be automatically converted to: +In v1beta1, this will be automatically converted to: ```yaml subnets: @@ -183,14 +183,14 @@ When subnets are not specified on `OpenStackCluster` and only the network is, th #### ⚠️ Change to nodeCidr and dnsNameservers -In v1alpha8, `OpenStackCluster.Spec.ManagedSubnets` array field is introduced. The `NodeCIDR` and `DNSNameservers` fields of `OpenStackCluster.Spec` are moved into that structure (renaming `NodeCIDR` to `CIDR`). For example: +In v1beta1, `OpenStackCluster.Spec.ManagedSubnets` array field is introduced. The `NodeCIDR` and `DNSNameservers` fields of `OpenStackCluster.Spec` are moved into that structure (renaming `NodeCIDR` to `CIDR`). For example: ```yaml nodeCidr: "10.0.0.0/24" dnsNameservers: "10.0.0.123" ``` -In v1alpha8, this will be automatically converted to: +In v1beta1, this will be automatically converted to: ```yaml managedSubnets: @@ -262,4 +262,4 @@ allow backwards compatibility if `allowAllInClusterTraffic` is set to false. #### ⚠️ Change to network -In v1alpha8, when the `OpenStackCluster.Spec.Network` is not defined, the `Subnets` are now used to identify the `Network`. +In v1beta1, when the `OpenStackCluster.Spec.Network` is not defined, the `Subnets` are now used to identify the `Network`. diff --git a/kustomize/v1alpha8/default/cluster-template.yaml b/kustomize/v1beta1/default/cluster-template.yaml similarity index 92% rename from kustomize/v1alpha8/default/cluster-template.yaml rename to kustomize/v1beta1/default/cluster-template.yaml index c7554d7d7c..5ecf318473 100644 --- a/kustomize/v1alpha8/default/cluster-template.yaml +++ b/kustomize/v1beta1/default/cluster-template.yaml @@ -9,7 +9,7 @@ spec: cidrBlocks: ["192.168.0.0/16"] # CIDR block used by Calico. serviceDomain: "cluster.local" infrastructureRef: - apiVersion: infrastructure.cluster.x-k8s.io/v1alpha8 + apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 kind: OpenStackCluster name: ${CLUSTER_NAME} controlPlaneRef: @@ -17,7 +17,7 @@ spec: apiVersion: controlplane.cluster.x-k8s.io/v1beta1 name: ${CLUSTER_NAME}-control-plane --- -apiVersion: infrastructure.cluster.x-k8s.io/v1alpha8 +apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 kind: OpenStackCluster metadata: name: ${CLUSTER_NAME} @@ -64,7 +64,7 @@ spec: machineTemplate: infrastructureRef: kind: OpenStackMachineTemplate - apiVersion: infrastructure.cluster.x-k8s.io/v1alpha8 + apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 name: "${CLUSTER_NAME}-control-plane" kubeadmConfigSpec: initConfiguration: @@ -89,7 +89,7 @@ spec: files: [] version: "${KUBERNETES_VERSION}" --- -apiVersion: infrastructure.cluster.x-k8s.io/v1alpha8 +apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 kind: OpenStackMachineTemplate metadata: name: ${CLUSTER_NAME}-control-plane @@ -126,10 +126,10 @@ spec: kind: KubeadmConfigTemplate infrastructureRef: name: "${CLUSTER_NAME}-md-0" - apiVersion: infrastructure.cluster.x-k8s.io/v1alpha8 + apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 kind: OpenStackMachineTemplate --- -apiVersion: infrastructure.cluster.x-k8s.io/v1alpha8 +apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 kind: OpenStackMachineTemplate metadata: name: ${CLUSTER_NAME}-md-0 diff --git a/kustomize/v1alpha8/default/kustomization.yaml b/kustomize/v1beta1/default/kustomization.yaml similarity index 100% rename from kustomize/v1alpha8/default/kustomization.yaml rename to kustomize/v1beta1/default/kustomization.yaml diff --git a/kustomize/v1alpha8/flatcar-sysext/kustomization.yaml b/kustomize/v1beta1/flatcar-sysext/kustomization.yaml similarity index 100% rename from kustomize/v1alpha8/flatcar-sysext/kustomization.yaml rename to kustomize/v1beta1/flatcar-sysext/kustomization.yaml diff --git a/kustomize/v1alpha8/flatcar-sysext/patch-flatcar.yaml b/kustomize/v1beta1/flatcar-sysext/patch-flatcar.yaml similarity index 98% rename from kustomize/v1alpha8/flatcar-sysext/patch-flatcar.yaml rename to kustomize/v1beta1/flatcar-sysext/patch-flatcar.yaml index e66245f777..fce635f466 100644 --- a/kustomize/v1alpha8/flatcar-sysext/patch-flatcar.yaml +++ b/kustomize/v1beta1/flatcar-sysext/patch-flatcar.yaml @@ -1,5 +1,5 @@ --- -apiVersion: infrastructure.cluster.x-k8s.io/v1alpha8 +apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 kind: OpenStackCluster metadata: name: ${CLUSTER_NAME} @@ -166,7 +166,7 @@ spec: [Service] EnvironmentFile=/run/metadata/flatcar --- -apiVersion: infrastructure.cluster.x-k8s.io/v1alpha8 +apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 kind: OpenStackMachineTemplate metadata: name: ${CLUSTER_NAME}-md-0 @@ -176,7 +176,7 @@ spec: image: name: ${FLATCAR_IMAGE_NAME} --- -apiVersion: infrastructure.cluster.x-k8s.io/v1alpha8 +apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 kind: OpenStackMachineTemplate metadata: name: ${CLUSTER_NAME}-control-plane diff --git a/kustomize/v1alpha8/flatcar/kustomization.yaml b/kustomize/v1beta1/flatcar/kustomization.yaml similarity index 100% rename from kustomize/v1alpha8/flatcar/kustomization.yaml rename to kustomize/v1beta1/flatcar/kustomization.yaml diff --git a/kustomize/v1alpha8/flatcar/patch-flatcar.yaml b/kustomize/v1beta1/flatcar/patch-flatcar.yaml similarity index 95% rename from kustomize/v1alpha8/flatcar/patch-flatcar.yaml rename to kustomize/v1beta1/flatcar/patch-flatcar.yaml index 4fb1c3a8d1..19e7b7fece 100644 --- a/kustomize/v1alpha8/flatcar/patch-flatcar.yaml +++ b/kustomize/v1beta1/flatcar/patch-flatcar.yaml @@ -1,5 +1,5 @@ --- -apiVersion: infrastructure.cluster.x-k8s.io/v1alpha8 +apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 kind: OpenStackCluster metadata: name: ${CLUSTER_NAME} @@ -90,7 +90,7 @@ spec: [Service] EnvironmentFile=/run/metadata/flatcar --- -apiVersion: infrastructure.cluster.x-k8s.io/v1alpha8 +apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 kind: OpenStackMachineTemplate metadata: name: ${CLUSTER_NAME}-md-0 @@ -100,7 +100,7 @@ spec: image: name: ${OPENSTACK_FLATCAR_IMAGE_NAME} --- -apiVersion: infrastructure.cluster.x-k8s.io/v1alpha8 +apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 kind: OpenStackMachineTemplate metadata: name: ${CLUSTER_NAME}-control-plane diff --git a/kustomize/v1alpha8/without-lb/kustomization.yaml b/kustomize/v1beta1/without-lb/kustomization.yaml similarity index 100% rename from kustomize/v1alpha8/without-lb/kustomization.yaml rename to kustomize/v1beta1/without-lb/kustomization.yaml diff --git a/kustomize/v1alpha8/without-lb/patch-without-lb.yaml b/kustomize/v1beta1/without-lb/patch-without-lb.yaml similarity index 83% rename from kustomize/v1alpha8/without-lb/patch-without-lb.yaml rename to kustomize/v1beta1/without-lb/patch-without-lb.yaml index 57166c05e2..96932f5a27 100644 --- a/kustomize/v1alpha8/without-lb/patch-without-lb.yaml +++ b/kustomize/v1beta1/without-lb/patch-without-lb.yaml @@ -1,5 +1,5 @@ --- -apiVersion: infrastructure.cluster.x-k8s.io/v1alpha8 +apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 kind: OpenStackCluster metadata: name: ${CLUSTER_NAME} diff --git a/main.go b/main.go index f9dfdd5d03..9fa9fc5eb0 100644 --- a/main.go +++ b/main.go @@ -49,7 +49,7 @@ import ( infrav1alpha5 "sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha5" infrav1alpha6 "sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha6" infrav1alpha7 "sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha7" - infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha8" + infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1" "sigs.k8s.io/cluster-api-provider-openstack/controllers" "sigs.k8s.io/cluster-api-provider-openstack/pkg/metrics" "sigs.k8s.io/cluster-api-provider-openstack/pkg/record" diff --git a/pkg/cloud/services/compute/instance.go b/pkg/cloud/services/compute/instance.go index e5648a26f0..cad688ff9f 100644 --- a/pkg/cloud/services/compute/instance.go +++ b/pkg/cloud/services/compute/instance.go @@ -34,7 +34,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/wait" - infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha8" + infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1" "sigs.k8s.io/cluster-api-provider-openstack/pkg/clients" "sigs.k8s.io/cluster-api-provider-openstack/pkg/cloud/services/networking" "sigs.k8s.io/cluster-api-provider-openstack/pkg/record" diff --git a/pkg/cloud/services/compute/instance_test.go b/pkg/cloud/services/compute/instance_test.go index d89849f507..37b50ee51f 100644 --- a/pkg/cloud/services/compute/instance_test.go +++ b/pkg/cloud/services/compute/instance_test.go @@ -45,7 +45,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/utils/pointer" - infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha8" + infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1" "sigs.k8s.io/cluster-api-provider-openstack/pkg/clients" "sigs.k8s.io/cluster-api-provider-openstack/pkg/clients/mock" "sigs.k8s.io/cluster-api-provider-openstack/pkg/cloud/services/networking" diff --git a/pkg/cloud/services/compute/instance_types.go b/pkg/cloud/services/compute/instance_types.go index 0384e64f89..6c9c211936 100644 --- a/pkg/cloud/services/compute/instance_types.go +++ b/pkg/cloud/services/compute/instance_types.go @@ -24,7 +24,7 @@ import ( "github.com/go-logr/logr" corev1 "k8s.io/api/core/v1" - infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha8" + infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1" "sigs.k8s.io/cluster-api-provider-openstack/pkg/clients" ) diff --git a/pkg/cloud/services/compute/referenced_resources.go b/pkg/cloud/services/compute/referenced_resources.go index b9350f8d06..7a1e7eadd4 100644 --- a/pkg/cloud/services/compute/referenced_resources.go +++ b/pkg/cloud/services/compute/referenced_resources.go @@ -17,7 +17,7 @@ limitations under the License. package compute import ( - infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha8" + infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1" "sigs.k8s.io/cluster-api-provider-openstack/pkg/scope" ) diff --git a/pkg/cloud/services/compute/referenced_resources_test.go b/pkg/cloud/services/compute/referenced_resources_test.go index 6a976325c4..4fc97dd069 100644 --- a/pkg/cloud/services/compute/referenced_resources_test.go +++ b/pkg/cloud/services/compute/referenced_resources_test.go @@ -26,7 +26,7 @@ import ( "github.com/gophercloud/gophercloud/openstack/imageservice/v2/images" . "github.com/onsi/gomega" - infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha8" + infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1" "sigs.k8s.io/cluster-api-provider-openstack/pkg/clients/mock" "sigs.k8s.io/cluster-api-provider-openstack/pkg/scope" ) diff --git a/pkg/cloud/services/compute/servergroup.go b/pkg/cloud/services/compute/servergroup.go index b084a99634..f4118da73f 100644 --- a/pkg/cloud/services/compute/servergroup.go +++ b/pkg/cloud/services/compute/servergroup.go @@ -21,7 +21,7 @@ import ( "github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/servergroups" - infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha8" + infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1" ) // GetServerGroupID looks up a server group using the passed filter and returns diff --git a/pkg/cloud/services/compute/servergroup_test.go b/pkg/cloud/services/compute/servergroup_test.go index 572e3d78c6..af8ed35f02 100644 --- a/pkg/cloud/services/compute/servergroup_test.go +++ b/pkg/cloud/services/compute/servergroup_test.go @@ -24,7 +24,7 @@ import ( "github.com/golang/mock/gomock" "github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/servergroups" - infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha8" + infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1" "sigs.k8s.io/cluster-api-provider-openstack/pkg/clients/mock" "sigs.k8s.io/cluster-api-provider-openstack/pkg/scope" ) diff --git a/pkg/cloud/services/loadbalancer/loadbalancer.go b/pkg/cloud/services/loadbalancer/loadbalancer.go index 956e346002..1d0812c353 100644 --- a/pkg/cloud/services/loadbalancer/loadbalancer.go +++ b/pkg/cloud/services/loadbalancer/loadbalancer.go @@ -33,7 +33,7 @@ import ( clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1" "sigs.k8s.io/cluster-api/util" - infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha8" + infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1" "sigs.k8s.io/cluster-api-provider-openstack/pkg/record" capoerrors "sigs.k8s.io/cluster-api-provider-openstack/pkg/utils/errors" "sigs.k8s.io/cluster-api-provider-openstack/pkg/utils/names" diff --git a/pkg/cloud/services/loadbalancer/loadbalancer_test.go b/pkg/cloud/services/loadbalancer/loadbalancer_test.go index b4a8960a29..d4a6b69a09 100644 --- a/pkg/cloud/services/loadbalancer/loadbalancer_test.go +++ b/pkg/cloud/services/loadbalancer/loadbalancer_test.go @@ -32,7 +32,7 @@ import ( . "github.com/onsi/gomega" clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1" - infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha8" + infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1" "sigs.k8s.io/cluster-api-provider-openstack/pkg/clients/mock" "sigs.k8s.io/cluster-api-provider-openstack/pkg/scope" ) diff --git a/pkg/cloud/services/networking/floatingip.go b/pkg/cloud/services/networking/floatingip.go index 8586ba6223..f7fc8dc308 100644 --- a/pkg/cloud/services/networking/floatingip.go +++ b/pkg/cloud/services/networking/floatingip.go @@ -26,7 +26,7 @@ import ( "k8s.io/apimachinery/pkg/util/wait" "sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha1" - infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha8" + infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1" "sigs.k8s.io/cluster-api-provider-openstack/pkg/metrics" "sigs.k8s.io/cluster-api-provider-openstack/pkg/record" "sigs.k8s.io/cluster-api-provider-openstack/pkg/utils/names" diff --git a/pkg/cloud/services/networking/floatingip_test.go b/pkg/cloud/services/networking/floatingip_test.go index 06c1fdc005..e25a42ab53 100644 --- a/pkg/cloud/services/networking/floatingip_test.go +++ b/pkg/cloud/services/networking/floatingip_test.go @@ -23,7 +23,7 @@ import ( "github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/layer3/floatingips" . "github.com/onsi/gomega" - infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha8" + infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1" "sigs.k8s.io/cluster-api-provider-openstack/pkg/clients/mock" ) diff --git a/pkg/cloud/services/networking/network.go b/pkg/cloud/services/networking/network.go index 7629abdee8..3e9ff786ac 100644 --- a/pkg/cloud/services/networking/network.go +++ b/pkg/cloud/services/networking/network.go @@ -25,7 +25,7 @@ import ( "github.com/gophercloud/gophercloud/openstack/networking/v2/networks" "github.com/gophercloud/gophercloud/openstack/networking/v2/subnets" - infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha8" + infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1" "sigs.k8s.io/cluster-api-provider-openstack/pkg/metrics" "sigs.k8s.io/cluster-api-provider-openstack/pkg/record" capoerrors "sigs.k8s.io/cluster-api-provider-openstack/pkg/utils/errors" diff --git a/pkg/cloud/services/networking/network_test.go b/pkg/cloud/services/networking/network_test.go index 47ff27783a..68c91f4d66 100644 --- a/pkg/cloud/services/networking/network_test.go +++ b/pkg/cloud/services/networking/network_test.go @@ -27,7 +27,7 @@ import ( . "github.com/onsi/gomega" "k8s.io/utils/pointer" - infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha8" + infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1" "sigs.k8s.io/cluster-api-provider-openstack/pkg/clients/mock" "sigs.k8s.io/cluster-api-provider-openstack/pkg/scope" ) diff --git a/pkg/cloud/services/networking/port.go b/pkg/cloud/services/networking/port.go index 84b9bfc618..339df46e38 100644 --- a/pkg/cloud/services/networking/port.go +++ b/pkg/cloud/services/networking/port.go @@ -28,7 +28,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/wait" - infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha8" + infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1" "sigs.k8s.io/cluster-api-provider-openstack/pkg/record" capoerrors "sigs.k8s.io/cluster-api-provider-openstack/pkg/utils/errors" "sigs.k8s.io/cluster-api-provider-openstack/pkg/utils/names" diff --git a/pkg/cloud/services/networking/port_test.go b/pkg/cloud/services/networking/port_test.go index a86837778e..43eebfaf7d 100644 --- a/pkg/cloud/services/networking/port_test.go +++ b/pkg/cloud/services/networking/port_test.go @@ -28,7 +28,7 @@ import ( "github.com/gophercloud/gophercloud/openstack/networking/v2/subnets" . "github.com/onsi/gomega" - infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha8" + infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1" "sigs.k8s.io/cluster-api-provider-openstack/pkg/clients/mock" ) diff --git a/pkg/cloud/services/networking/router.go b/pkg/cloud/services/networking/router.go index 021617c060..88fe117f1f 100644 --- a/pkg/cloud/services/networking/router.go +++ b/pkg/cloud/services/networking/router.go @@ -24,7 +24,7 @@ import ( "github.com/gophercloud/gophercloud/openstack/networking/v2/ports" "github.com/gophercloud/gophercloud/openstack/networking/v2/subnets" - infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha8" + infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1" "sigs.k8s.io/cluster-api-provider-openstack/pkg/record" capoerrors "sigs.k8s.io/cluster-api-provider-openstack/pkg/utils/errors" "sigs.k8s.io/cluster-api-provider-openstack/pkg/utils/names" diff --git a/pkg/cloud/services/networking/securitygroups.go b/pkg/cloud/services/networking/securitygroups.go index 6707b2fbe4..304f1dda96 100644 --- a/pkg/cloud/services/networking/securitygroups.go +++ b/pkg/cloud/services/networking/securitygroups.go @@ -23,7 +23,7 @@ import ( "github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/security/groups" "github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/security/rules" - infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha8" + infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1" "sigs.k8s.io/cluster-api-provider-openstack/pkg/record" ) diff --git a/pkg/cloud/services/networking/securitygroups_test.go b/pkg/cloud/services/networking/securitygroups_test.go index 407f964559..e09ba9b7fb 100644 --- a/pkg/cloud/services/networking/securitygroups_test.go +++ b/pkg/cloud/services/networking/securitygroups_test.go @@ -26,7 +26,7 @@ import ( . "github.com/onsi/gomega" "k8s.io/utils/pointer" - infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha8" + infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1" "sigs.k8s.io/cluster-api-provider-openstack/pkg/clients/mock" "sigs.k8s.io/cluster-api-provider-openstack/pkg/scope" ) diff --git a/pkg/cloud/services/networking/trunk_test.go b/pkg/cloud/services/networking/trunk_test.go index 24c6bfb719..a75519d8a8 100644 --- a/pkg/cloud/services/networking/trunk_test.go +++ b/pkg/cloud/services/networking/trunk_test.go @@ -23,7 +23,7 @@ import ( "github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/trunks" . "github.com/onsi/gomega" - infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha8" + infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1" "sigs.k8s.io/cluster-api-provider-openstack/pkg/clients/mock" ) diff --git a/pkg/scope/mock.go b/pkg/scope/mock.go index 7dd2364b92..4568a66d19 100644 --- a/pkg/scope/mock.go +++ b/pkg/scope/mock.go @@ -26,7 +26,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha1" - infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha8" + infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1" "sigs.k8s.io/cluster-api-provider-openstack/pkg/clients" "sigs.k8s.io/cluster-api-provider-openstack/pkg/clients/mock" ) diff --git a/pkg/scope/provider.go b/pkg/scope/provider.go index 707b08b5b9..2b531f361d 100644 --- a/pkg/scope/provider.go +++ b/pkg/scope/provider.go @@ -38,7 +38,7 @@ import ( "sigs.k8s.io/yaml" "sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha1" - infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha8" + infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1" "sigs.k8s.io/cluster-api-provider-openstack/pkg/clients" "sigs.k8s.io/cluster-api-provider-openstack/pkg/utils/hash" "sigs.k8s.io/cluster-api-provider-openstack/version" diff --git a/pkg/scope/scope.go b/pkg/scope/scope.go index 5c8f24b968..6b16e908f1 100644 --- a/pkg/scope/scope.go +++ b/pkg/scope/scope.go @@ -25,7 +25,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha1" - infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha8" + infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1" "sigs.k8s.io/cluster-api-provider-openstack/pkg/clients" ) diff --git a/pkg/utils/controllers/controllers.go b/pkg/utils/controllers/controllers.go index 94dfb11ac4..8c5f8f9fa2 100644 --- a/pkg/utils/controllers/controllers.go +++ b/pkg/utils/controllers/controllers.go @@ -20,7 +20,7 @@ import ( "fmt" "net" - infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha8" + infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1" ) // ValidateSubnets validates if the amount of IPv4 and IPv6 subnets is allowed by OpenStackCluster. diff --git a/pkg/utils/controllers/controllers_test.go b/pkg/utils/controllers/controllers_test.go index eadff95b77..eea58d08f4 100644 --- a/pkg/utils/controllers/controllers_test.go +++ b/pkg/utils/controllers/controllers_test.go @@ -19,7 +19,7 @@ package controllers import ( "testing" - infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha8" + infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1" ) func Test_validateSubnets(t *testing.T) { diff --git a/templates/cluster-template-flatcar-sysext.yaml b/templates/cluster-template-flatcar-sysext.yaml index ca02b3c639..dd31b5e0ba 100644 --- a/templates/cluster-template-flatcar-sysext.yaml +++ b/templates/cluster-template-flatcar-sysext.yaml @@ -98,7 +98,7 @@ spec: kind: KubeadmControlPlane name: ${CLUSTER_NAME}-control-plane infrastructureRef: - apiVersion: infrastructure.cluster.x-k8s.io/v1alpha8 + apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 kind: OpenStackCluster name: ${CLUSTER_NAME} --- @@ -121,7 +121,7 @@ spec: clusterName: ${CLUSTER_NAME} failureDomain: ${OPENSTACK_FAILURE_DOMAIN} infrastructureRef: - apiVersion: infrastructure.cluster.x-k8s.io/v1alpha8 + apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 kind: OpenStackMachineTemplate name: ${CLUSTER_NAME}-md-0 version: ${KUBERNETES_VERSION} @@ -213,13 +213,13 @@ spec: - mv /etc/kubeadm.yml.tmp /etc/kubeadm.yml machineTemplate: infrastructureRef: - apiVersion: infrastructure.cluster.x-k8s.io/v1alpha8 + apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 kind: OpenStackMachineTemplate name: ${CLUSTER_NAME}-control-plane replicas: ${CONTROL_PLANE_MACHINE_COUNT} version: ${KUBERNETES_VERSION} --- -apiVersion: infrastructure.cluster.x-k8s.io/v1alpha8 +apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 kind: OpenStackCluster metadata: name: ${CLUSTER_NAME} @@ -255,7 +255,7 @@ spec: dnsNameservers: - ${OPENSTACK_DNS_NAMESERVERS} --- -apiVersion: infrastructure.cluster.x-k8s.io/v1alpha8 +apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 kind: OpenStackMachineTemplate metadata: name: ${CLUSTER_NAME}-control-plane @@ -271,7 +271,7 @@ spec: name: ${FLATCAR_IMAGE_NAME} sshKeyName: ${OPENSTACK_SSH_KEY_NAME} --- -apiVersion: infrastructure.cluster.x-k8s.io/v1alpha8 +apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 kind: OpenStackMachineTemplate metadata: name: ${CLUSTER_NAME}-md-0 diff --git a/templates/cluster-template-flatcar.yaml b/templates/cluster-template-flatcar.yaml index c2cfdc6934..0f3fde9fb4 100644 --- a/templates/cluster-template-flatcar.yaml +++ b/templates/cluster-template-flatcar.yaml @@ -60,7 +60,7 @@ spec: kind: KubeadmControlPlane name: ${CLUSTER_NAME}-control-plane infrastructureRef: - apiVersion: infrastructure.cluster.x-k8s.io/v1alpha8 + apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 kind: OpenStackCluster name: ${CLUSTER_NAME} --- @@ -83,7 +83,7 @@ spec: clusterName: ${CLUSTER_NAME} failureDomain: ${OPENSTACK_FAILURE_DOMAIN} infrastructureRef: - apiVersion: infrastructure.cluster.x-k8s.io/v1alpha8 + apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 kind: OpenStackMachineTemplate name: ${CLUSTER_NAME}-md-0 version: ${KUBERNETES_VERSION} @@ -137,13 +137,13 @@ spec: - mv /etc/kubeadm.yml.tmp /etc/kubeadm.yml machineTemplate: infrastructureRef: - apiVersion: infrastructure.cluster.x-k8s.io/v1alpha8 + apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 kind: OpenStackMachineTemplate name: ${CLUSTER_NAME}-control-plane replicas: ${CONTROL_PLANE_MACHINE_COUNT} version: ${KUBERNETES_VERSION} --- -apiVersion: infrastructure.cluster.x-k8s.io/v1alpha8 +apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 kind: OpenStackCluster metadata: name: ${CLUSTER_NAME} @@ -179,7 +179,7 @@ spec: dnsNameservers: - ${OPENSTACK_DNS_NAMESERVERS} --- -apiVersion: infrastructure.cluster.x-k8s.io/v1alpha8 +apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 kind: OpenStackMachineTemplate metadata: name: ${CLUSTER_NAME}-control-plane @@ -195,7 +195,7 @@ spec: name: ${OPENSTACK_FLATCAR_IMAGE_NAME} sshKeyName: ${OPENSTACK_SSH_KEY_NAME} --- -apiVersion: infrastructure.cluster.x-k8s.io/v1alpha8 +apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 kind: OpenStackMachineTemplate metadata: name: ${CLUSTER_NAME}-md-0 diff --git a/templates/cluster-template-without-lb.yaml b/templates/cluster-template-without-lb.yaml index 2b206b65cd..634c867ec9 100644 --- a/templates/cluster-template-without-lb.yaml +++ b/templates/cluster-template-without-lb.yaml @@ -38,7 +38,7 @@ spec: kind: KubeadmControlPlane name: ${CLUSTER_NAME}-control-plane infrastructureRef: - apiVersion: infrastructure.cluster.x-k8s.io/v1alpha8 + apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 kind: OpenStackCluster name: ${CLUSTER_NAME} --- @@ -61,7 +61,7 @@ spec: clusterName: ${CLUSTER_NAME} failureDomain: ${OPENSTACK_FAILURE_DOMAIN} infrastructureRef: - apiVersion: infrastructure.cluster.x-k8s.io/v1alpha8 + apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 kind: OpenStackMachineTemplate name: ${CLUSTER_NAME}-md-0 version: ${KUBERNETES_VERSION} @@ -94,13 +94,13 @@ spec: name: '{{ local_hostname }}' machineTemplate: infrastructureRef: - apiVersion: infrastructure.cluster.x-k8s.io/v1alpha8 + apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 kind: OpenStackMachineTemplate name: ${CLUSTER_NAME}-control-plane replicas: 1 version: ${KUBERNETES_VERSION} --- -apiVersion: infrastructure.cluster.x-k8s.io/v1alpha8 +apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 kind: OpenStackCluster metadata: name: ${CLUSTER_NAME} @@ -136,7 +136,7 @@ spec: dnsNameservers: - ${OPENSTACK_DNS_NAMESERVERS} --- -apiVersion: infrastructure.cluster.x-k8s.io/v1alpha8 +apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 kind: OpenStackMachineTemplate metadata: name: ${CLUSTER_NAME}-control-plane @@ -152,7 +152,7 @@ spec: name: ${OPENSTACK_IMAGE_NAME} sshKeyName: ${OPENSTACK_SSH_KEY_NAME} --- -apiVersion: infrastructure.cluster.x-k8s.io/v1alpha8 +apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 kind: OpenStackMachineTemplate metadata: name: ${CLUSTER_NAME}-md-0 diff --git a/templates/cluster-template.yaml b/templates/cluster-template.yaml index e2b1ff52db..865299672a 100644 --- a/templates/cluster-template.yaml +++ b/templates/cluster-template.yaml @@ -38,7 +38,7 @@ spec: kind: KubeadmControlPlane name: ${CLUSTER_NAME}-control-plane infrastructureRef: - apiVersion: infrastructure.cluster.x-k8s.io/v1alpha8 + apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 kind: OpenStackCluster name: ${CLUSTER_NAME} --- @@ -61,7 +61,7 @@ spec: clusterName: ${CLUSTER_NAME} failureDomain: ${OPENSTACK_FAILURE_DOMAIN} infrastructureRef: - apiVersion: infrastructure.cluster.x-k8s.io/v1alpha8 + apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 kind: OpenStackMachineTemplate name: ${CLUSTER_NAME}-md-0 version: ${KUBERNETES_VERSION} @@ -94,13 +94,13 @@ spec: name: '{{ local_hostname }}' machineTemplate: infrastructureRef: - apiVersion: infrastructure.cluster.x-k8s.io/v1alpha8 + apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 kind: OpenStackMachineTemplate name: ${CLUSTER_NAME}-control-plane replicas: ${CONTROL_PLANE_MACHINE_COUNT} version: ${KUBERNETES_VERSION} --- -apiVersion: infrastructure.cluster.x-k8s.io/v1alpha8 +apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 kind: OpenStackCluster metadata: name: ${CLUSTER_NAME} @@ -138,7 +138,7 @@ spec: dnsNameservers: - ${OPENSTACK_DNS_NAMESERVERS} --- -apiVersion: infrastructure.cluster.x-k8s.io/v1alpha8 +apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 kind: OpenStackMachineTemplate metadata: name: ${CLUSTER_NAME}-control-plane @@ -154,7 +154,7 @@ spec: name: ${OPENSTACK_IMAGE_NAME} sshKeyName: ${OPENSTACK_SSH_KEY_NAME} --- -apiVersion: infrastructure.cluster.x-k8s.io/v1alpha8 +apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 kind: OpenStackMachineTemplate metadata: name: ${CLUSTER_NAME}-md-0 diff --git a/templates/clusterclass-dev-test.yaml b/templates/clusterclass-dev-test.yaml index 4112633624..a281816de2 100644 --- a/templates/clusterclass-dev-test.yaml +++ b/templates/clusterclass-dev-test.yaml @@ -10,12 +10,12 @@ spec: name: dev-test-control-plane machineInfrastructure: ref: - apiVersion: infrastructure.cluster.x-k8s.io/v1alpha8 + apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 kind: OpenStackMachineTemplate name: dev-test-control-plane-machine infrastructure: ref: - apiVersion: infrastructure.cluster.x-k8s.io/v1alpha8 + apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 kind: OpenStackClusterTemplate name: dev-test-openstackcluster workers: @@ -29,7 +29,7 @@ spec: name: dev-test-default-worker-bootstraptemplate infrastructure: ref: - apiVersion: infrastructure.cluster.x-k8s.io/v1alpha8 + apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 kind: OpenStackMachineTemplate name: dev-test-default-worker-machine patches: @@ -37,7 +37,7 @@ spec: description: "Sets the OpenStack image that is used for creating the servers." definitions: - selector: - apiVersion: infrastructure.cluster.x-k8s.io/v1alpha8 + apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 kind: OpenStackMachineTemplate matchResources: controlPlane: true @@ -51,7 +51,7 @@ spec: description: "Sets the OpenStack image that is used for creating the servers." definitions: - selector: - apiVersion: infrastructure.cluster.x-k8s.io/v1alpha8 + apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 kind: OpenStackMachineTemplate matchResources: machineDeploymentClass: @@ -108,7 +108,7 @@ spec: provider-id: openstack:///'{{ instance_id }}' name: '{{ local_hostname }}' --- -apiVersion: infrastructure.cluster.x-k8s.io/v1alpha8 +apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 kind: OpenStackClusterTemplate metadata: name: dev-test-openstackcluster @@ -146,7 +146,7 @@ spec: dnsNameservers: - 8.8.8.8 --- -apiVersion: infrastructure.cluster.x-k8s.io/v1alpha8 +apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 kind: OpenStackMachineTemplate metadata: name: dev-test-control-plane-machine @@ -162,7 +162,7 @@ spec: name: overridden-by-patch sshKeyName: ${OPENSTACK_SSH_KEY_NAME:=""} --- -apiVersion: infrastructure.cluster.x-k8s.io/v1alpha8 +apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 kind: OpenStackMachineTemplate metadata: name: dev-test-default-worker-machine diff --git a/test/e2e/data/kustomize/default/kustomization.yaml b/test/e2e/data/kustomize/default/kustomization.yaml index b648538489..3cd7a6cbb8 100644 --- a/test/e2e/data/kustomize/default/kustomization.yaml +++ b/test/e2e/data/kustomize/default/kustomization.yaml @@ -1,7 +1,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: -- ../../../../../kustomize/v1alpha8/default +- ../../../../../kustomize/v1beta1/default components: - ../common-patches/cni - ../upgrade-patches diff --git a/test/e2e/data/kustomize/flatcar-sysext/kustomization.yaml b/test/e2e/data/kustomize/flatcar-sysext/kustomization.yaml index c3d83b26c3..8fd5f119f8 100644 --- a/test/e2e/data/kustomize/flatcar-sysext/kustomization.yaml +++ b/test/e2e/data/kustomize/flatcar-sysext/kustomization.yaml @@ -1,6 +1,6 @@ --- resources: -- ../../../../../kustomize/v1alpha8/flatcar-sysext +- ../../../../../kustomize/v1beta1/flatcar-sysext components: - ../common-patches/cni diff --git a/test/e2e/data/kustomize/flatcar/kustomization.yaml b/test/e2e/data/kustomize/flatcar/kustomization.yaml index 2d7874e6ac..a85308b72c 100644 --- a/test/e2e/data/kustomize/flatcar/kustomization.yaml +++ b/test/e2e/data/kustomize/flatcar/kustomization.yaml @@ -1,7 +1,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: -- ../../../../../kustomize/v1alpha8/flatcar +- ../../../../../kustomize/v1beta1/flatcar components: - ../common-patches/cni diff --git a/test/e2e/data/kustomize/k8s-upgrade/kcp-patch.yaml b/test/e2e/data/kustomize/k8s-upgrade/kcp-patch.yaml index 0eb4b5f713..859ff0c6fc 100644 --- a/test/e2e/data/kustomize/k8s-upgrade/kcp-patch.yaml +++ b/test/e2e/data/kustomize/k8s-upgrade/kcp-patch.yaml @@ -5,6 +5,6 @@ metadata: spec: machineTemplate: infrastructureRef: - apiVersion: infrastructure.cluster.x-k8s.io/v1alpha8 + apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 kind: OpenStackMachineTemplate name: ${CLUSTER_NAME}-upgrade-from-control-plane diff --git a/test/e2e/data/kustomize/k8s-upgrade/md-patch.yaml b/test/e2e/data/kustomize/k8s-upgrade/md-patch.yaml index fb59a3df2f..a79427f8e3 100644 --- a/test/e2e/data/kustomize/k8s-upgrade/md-patch.yaml +++ b/test/e2e/data/kustomize/k8s-upgrade/md-patch.yaml @@ -6,6 +6,6 @@ spec: template: spec: infrastructureRef: - apiVersion: infrastructure.cluster.x-k8s.io/v1alpha8 + apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 kind: OpenStackMachineTemplate name: ${CLUSTER_NAME}-upgrade-from-md-0 diff --git a/test/e2e/data/kustomize/k8s-upgrade/upgrade-from-template.yaml b/test/e2e/data/kustomize/k8s-upgrade/upgrade-from-template.yaml index 339b52535a..3945fab2fa 100644 --- a/test/e2e/data/kustomize/k8s-upgrade/upgrade-from-template.yaml +++ b/test/e2e/data/kustomize/k8s-upgrade/upgrade-from-template.yaml @@ -1,5 +1,5 @@ --- -apiVersion: infrastructure.cluster.x-k8s.io/v1alpha8 +apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 kind: OpenStackMachineTemplate metadata: name: ${CLUSTER_NAME}-upgrade-from-control-plane @@ -17,7 +17,7 @@ spec: tags: - control-plane --- -apiVersion: infrastructure.cluster.x-k8s.io/v1alpha8 +apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 kind: OpenStackMachineTemplate metadata: name: ${CLUSTER_NAME}-upgrade-from-md-0 diff --git a/test/e2e/data/kustomize/k8s-upgrade/upgrade-to-template.yaml b/test/e2e/data/kustomize/k8s-upgrade/upgrade-to-template.yaml index 6e426d14a5..d59b26b0af 100644 --- a/test/e2e/data/kustomize/k8s-upgrade/upgrade-to-template.yaml +++ b/test/e2e/data/kustomize/k8s-upgrade/upgrade-to-template.yaml @@ -4,7 +4,7 @@ # See CONTROL_PLANE_MACHINE_TEMPLATE_UPGRADE_TO and WORKERS_MACHINE_TEMPLATE_UPGRADE_TO # in the e2e config. --- -apiVersion: infrastructure.cluster.x-k8s.io/v1alpha8 +apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 kind: OpenStackMachineTemplate metadata: name: upgrade-to-control-plane @@ -24,7 +24,7 @@ spec: tags: - control-plane --- -apiVersion: infrastructure.cluster.x-k8s.io/v1alpha8 +apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 kind: OpenStackMachineTemplate metadata: name: upgrade-to-md-0 diff --git a/test/e2e/data/kustomize/without-lb/kustomization.yaml b/test/e2e/data/kustomize/without-lb/kustomization.yaml index dd2efc8c50..c36196f4ac 100644 --- a/test/e2e/data/kustomize/without-lb/kustomization.yaml +++ b/test/e2e/data/kustomize/without-lb/kustomization.yaml @@ -1,7 +1,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: -- ../../../../../kustomize/v1alpha8/without-lb +- ../../../../../kustomize/v1beta1/without-lb components: - ../common-patches/cni diff --git a/test/e2e/shared/common.go b/test/e2e/shared/common.go index 8f1465e23c..b8ad587b90 100644 --- a/test/e2e/shared/common.go +++ b/test/e2e/shared/common.go @@ -40,7 +40,7 @@ import ( "sigs.k8s.io/cluster-api/util" "sigs.k8s.io/controller-runtime/pkg/client" - infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha8" + infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1" ) func SetupSpecNamespace(ctx context.Context, specName string, e2eCtx *E2EContext) *corev1.Namespace { diff --git a/test/e2e/shared/defaults.go b/test/e2e/shared/defaults.go index df6315f773..37fe9490f0 100644 --- a/test/e2e/shared/defaults.go +++ b/test/e2e/shared/defaults.go @@ -26,7 +26,7 @@ import ( clientgoscheme "k8s.io/client-go/kubernetes/scheme" "sigs.k8s.io/cluster-api/test/framework" - infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha8" + infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1" ) const ( diff --git a/test/e2e/shared/openstack.go b/test/e2e/shared/openstack.go index 85661092f3..e16de6f634 100644 --- a/test/e2e/shared/openstack.go +++ b/test/e2e/shared/openstack.go @@ -52,7 +52,7 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "sigs.k8s.io/yaml" - infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha8" + infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1" "sigs.k8s.io/cluster-api-provider-openstack/pkg/clients" "sigs.k8s.io/cluster-api-provider-openstack/pkg/cloud/services/compute" "sigs.k8s.io/cluster-api-provider-openstack/pkg/scope" diff --git a/test/e2e/suites/e2e/e2e_test.go b/test/e2e/suites/e2e/e2e_test.go index f4b92c9a42..1b842b2ed8 100644 --- a/test/e2e/suites/e2e/e2e_test.go +++ b/test/e2e/suites/e2e/e2e_test.go @@ -53,7 +53,7 @@ import ( "sigs.k8s.io/cluster-api/test/framework/clusterctl" crclient "sigs.k8s.io/controller-runtime/pkg/client" - infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha8" + infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1" "sigs.k8s.io/cluster-api-provider-openstack/test/e2e/shared" )