Removed ipaddressController and moved the logic into the pool controller

kubernetes-sigs · Jan 4, 2024 · b1db68e · b1db68e
1 parent d986eff
commit b1db68e
Show file tree

Hide file tree

Showing 11 changed files with 209 additions and 272 deletions.
diff --git a/api/v1alpha7/openstackfloatingippool_webhook.go b/api/v1alpha7/openstackfloatingippool_webhook.go
diff --git a/api/v1alpha7/zz_generated.deepcopy.go b/api/v1alpha7/zz_generated.deepcopy.go
diff --git a/...v1alpha7/openstackfloatingippool_types.go → ...v1alpha8/openstackfloatingippool_types.go b/...v1alpha7/openstackfloatingippool_types.go → ...v1alpha8/openstackfloatingippool_types.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package v1alpha7
+package v1alpha8
 
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -50,6 +50,7 @@ type OpenStackFloatingIPPoolSpec struct {
 	IdentityRef *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"`
 
 	// The name of the cloud to use from the clouds secret
@@ -86,6 +87,7 @@ type OpenStackFloatingIPPoolStatus struct {
 }
 
 //+kubebuilder:object:root=true
+// +kubebuilder:storageversion
 //+kubebuilder:subresource:status
 
 // OpenStackFloatingIPPool is the Schema for the openstackfloatingippools API.

diff --git a/api/v1alpha8/zz_generated.deepcopy.go b/api/v1alpha8/zz_generated.deepcopy.go
diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_openstackfloatingippools.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_openstackfloatingippools.yaml
@@ -14,7 +14,7 @@ spec:
     singular: openstackfloatingippool
   scope: Namespaced
   versions:
-  - name: v1alpha7
+  - name: v1alpha8
     schema:
       openAPIV3Schema:
         description: OpenStackFloatingIPPool is the Schema for the openstackfloatingippools
@@ -90,8 +90,6 @@ spec:
                 - Retain
                 - Delete
                 type: string
-            required:
-            - floatingIPNetwork
             type: object
           status:
             description: OpenStackFloatingIPPoolStatus defines the observed state