Merge pull request #1555 from shiftstack/externalnetwork

🌱Remove unused fields from ExternalNetwork

Author: k8s-ci-robot

api/v1alpha5/conversion.go

@@ -256,3 +256,19 @@ func Convert_v1alpha5_Network_To_v1alpha7_Network(in *Network, out *infrav1.Netw
 	// PortOpts has been removed in v1alpha7
 	return autoConvert_v1alpha5_Network_To_v1alpha7_Network(in, out, s)
 }
+
+func Convert_v1alpha5_Network_To_v1alpha7_NetworkStatus(in *Network, out *infrav1.NetworkStatus, _ conversion.Scope) error {
+	out.ID = in.ID
+	out.Name = in.Name
+	out.Tags = in.Tags
+
+	return nil
+}
+
+func Convert_v1alpha7_NetworkStatus_To_v1alpha5_Network(in *infrav1.NetworkStatus, out *Network, _ conversion.Scope) error {
+	out.ID = in.ID
+	out.Name = in.Name
+	out.Tags = in.Tags
+
+	return nil
+}

api/v1alpha5/zz_generated.conversion.go

@@ -436,3 +436,19 @@ func Convert_v1alpha6_Network_To_v1alpha7_Network(in *Network, out *infrav1.Netw
 	// PortOpts has been removed in v1alpha7
 	return autoConvert_v1alpha6_Network_To_v1alpha7_Network(in, out, s)
 }
+
+func Convert_v1alpha6_Network_To_v1alpha7_NetworkStatus(in *Network, out *infrav1.NetworkStatus, _ conversion.Scope) error {
+	out.ID = in.ID
+	out.Name = in.Name
+	out.Tags = in.Tags
+
+	return nil
+}
+
+func Convert_v1alpha7_NetworkStatus_To_v1alpha6_Network(in *infrav1.NetworkStatus, out *Network, _ conversion.Scope) error {
+	out.ID = in.ID
+	out.Name = in.Name
+	out.Tags = in.Tags
+
+	return nil
+}

api/v1alpha6/conversion.go

@@ -60,6 +60,18 @@ func TestFuzzyConversion(t *testing.T) {
 				instance.RootVolume = nil
 				instance.ServerGroupID = ""
 			},
+
+			func(status *OpenStackClusterStatus, c fuzz.Continue) {
+				c.FuzzNoCustom(status)
+
+				// None of the following fields have ever been set in v1alpha6
+				if status.ExternalNetwork != nil {
+					status.ExternalNetwork.Subnet = nil
+					status.ExternalNetwork.PortOpts = nil
+					status.ExternalNetwork.Router = nil
+					status.ExternalNetwork.APIServerLoadBalancer = nil
+				}
+			},
 		}
 	}
 

api/v1alpha6/conversion_test.go

@@ -159,8 +159,8 @@ type OpenStackClusterStatus struct {
 	// It includes Subnets and Router.
 	Network *Network `json:"network,omitempty"`
 
-	// External Network contains information about the created OpenStack external network.
-	ExternalNetwork *Network `json:"externalNetwork,omitempty"`
+	// externalNetwork contains information about the external network used for default ingress and egress traffic.
+	ExternalNetwork *NetworkStatus `json:"externalNetwork,omitempty"`
 
 	// FailureDomains represent OpenStack availability zones
 	FailureDomains clusterv1.FailureDomains `json:"failureDomains,omitempty"`

api/v1alpha6/zz_generated.conversion.go

@@ -196,6 +196,15 @@ type Network struct {
 	APIServerLoadBalancer *LoadBalancer `json:"apiServerLoadBalancer,omitempty"`
 }
 
+// NetworkStatus contains basic information about an existing neutron network.
+type NetworkStatus struct {
+	Name string `json:"name"`
+	ID   string `json:"id"`
+
+	//+optional
+	Tags []string `json:"tags,omitempty"`
+}
+
 // Subnet represents basic information about the associated OpenStack Neutron Subnet.
 type Subnet struct {
 	Name string `json:"name"`

api/v1alpha7/openstackcluster_types.go

@@ -4469,78 +4469,13 @@ spec:
                 - rules
                 type: object
               externalNetwork:
-                description: External Network contains information about the created
-                  OpenStack external network.
+                description: externalNetwork contains information about the external
+                  network used for default ingress and egress traffic.
                 properties:
-                  apiServerLoadBalancer:
-                    description: Be careful when using APIServerLoadBalancer, because
-                      this field is optional and therefore not set in all cases
-                    properties:
-                      allowedCIDRs:
-                        items:
-                          type: string
-                        type: array
-                      id:
-                        type: string
-                      internalIP:
-                        type: string
-                      ip:
-                        type: string
-                      name:
-                        type: string
-                      tags:
-                        items:
-                          type: string
-                        type: array
-                    required:
-                    - id
-                    - internalIP
-                    - ip
-                    - name
-                    type: object
                   id:
                     type: string
                   name:
                     type: string
-                  router:
-                    description: Router represents basic information about the associated
-                      OpenStack Neutron Router.
-                    properties:
-                      id:
-                        type: string
-                      ips:
-                        items:
-                          type: string
-                        type: array
-                      name:
-                        type: string
-                      tags:
-                        items:
-                          type: string
-                        type: array
-                    required:
-                    - id
-                    - name
-                    type: object
-                  subnet:
-                    description: Subnet represents basic information about the associated
-                      OpenStack Neutron Subnet.
-                    properties:
-                      cidr:
-                        type: string
-                      id:
-                        type: string
-                      name:
-                        type: string
-                      tags:
-                        items:
-                          type: string
-                        type: array
-                    required:
-                    - cidr
-                    - id
-                    - name
-                    type: object
                   tags:
                     items:
                       type: string

api/v1alpha7/types.go

@@ -43,7 +43,7 @@ func Test_ReconcileLoadBalancer(t *testing.T) {
 			DisableAPIServerFloatingIP: true,
 		},
 		Status: infrav1.OpenStackClusterStatus{
-			ExternalNetwork: &infrav1.Network{
+			ExternalNetwork: &infrav1.NetworkStatus{
 				ID: "aaaaaaaa-bbbb-cccc-dddd-111111111111",
 			},
 			Network: &infrav1.Network{