Move OpenStackFloatingIPPool to v1alpha1

Author: mdbooth

Makefile

@@ -257,6 +257,7 @@ generate-go: $(MOCKGEN)
 		paths=./api/... \
 		object:headerFile=./hack/boilerplate/boilerplate.generatego.txt
 	$(CONVERSION_GEN) \
+		--input-dirs=./api/v1alpha1 \
 		--input-dirs=./api/v1alpha5 \
 		--input-dirs=./api/v1alpha6 \
 		--input-dirs=./api/v1alpha7 \

api/v1alpha1/conditions_consts.go

@@ -0,0 +1,22 @@
+/*
+Copyright 2023 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package v1alpha1
+
+const (
+	// OpenstackFloatingIPPoolReadyCondition reports on the current status of the floating ip pool. Ready indicates that the pool is ready to be used.
+	OpenstackFloatingIPPoolReadyCondition = "OpenstackFloatingIPPoolReadyCondition"
+)

api/v1alpha1/doc.go

@@ -0,0 +1,17 @@
+/*
+Copyright 2023 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package v1alpha1

api/v1alpha1/groupversion_info.go

@@ -0,0 +1,36 @@
+/*
+Copyright 2023 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// package v1alpha1 contains API Schema definitions for the infrastructure v1alpha1 API group
+// +kubebuilder:object:generate=true
+// +groupName=infrastructure.cluster.x-k8s.io
+package v1alpha1
+
+import (
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	"sigs.k8s.io/controller-runtime/pkg/scheme"
+)
+
+var (
+	// GroupVersion is group version used to register these objects.
+	GroupVersion = schema.GroupVersion{Group: "infrastructure.cluster.x-k8s.io", Version: "v1alpha1"}
+
+	// SchemeBuilder is used to add go types to the GroupVersionKind scheme.
+	SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}
+
+	// AddToScheme adds the types in this group-version to the given scheme.
+	AddToScheme = SchemeBuilder.AddToScheme
+)

api/v1alpha8/openstackfloatingippool_types.go renamed to api/v1alpha1/openstackfloatingippool_types.go

@@ -14,13 +14,19 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package v1alpha8
+package v1alpha1
 
 import (
 	"fmt"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
+
+	// We use v1alpha7 here rather than anything newer because as of writing
+	// it is the newest API version we should no longer be making breaking
+	// changes to. If we bump this we need to look carefully for resulting
+	// CRD changes in v1alpha1 to ensure they are compatible.
+	"sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha7"
 )
 
 const (
@@ -50,11 +56,11 @@ type OpenStackFloatingIPPoolSpec struct {
 
 	// IdentityRef is a reference to a identity to be used when reconciling this pool.
 	// +optional
-	IdentityRef *OpenStackIdentityReference `json:"identityRef,omitempty"`
+	IdentityRef *v1alpha7.OpenStackIdentityReference `json:"identityRef,omitempty"`
 
 	// FloatingIPNetwork is the external network to use for floating ips, if there's only one external network it will be used by default
 	// +optional
-	FloatingIPNetwork NetworkFilter `json:"floatingIPNetwork"`
+	FloatingIPNetwork v1alpha7.NetworkFilter `json:"floatingIPNetwork"`
 
 	// The name of the cloud to use from the clouds secret
 	// +optional
@@ -82,7 +88,7 @@ type OpenStackFloatingIPPoolStatus struct {
 
 	// floatingIPNetwork contains information about the network used for floating ips
 	// +optional
-	FloatingIPNetwork *NetworkStatus `json:"floatingIPNetwork,omitempty"`
+	FloatingIPNetwork *v1alpha7.NetworkStatus `json:"floatingIPNetwork,omitempty"`
 
 	Conditions clusterv1.Conditions `json:"conditions,omitempty"`
 }

api/v1alpha1/zz_generated.deepcopy.go

@@ -52,7 +52,4 @@ const (
 	LoadBalancerMemberErrorReason = "LoadBalancerMemberError"
 	// FloatingIPErrorReason used when the floating ip could not be created or attached.
 	FloatingIPErrorReason = "FloatingIPError"
-
-	// OpenstackFloatingIPPoolReadyCondition reports on the current status of the floating ip pool. Ready indicates that the pool is ready to be used.
-	OpenstackFloatingIPPoolReadyCondition = "OpenstackFloatingIPPoolReadyCondition"
 )