Merge pull request #1370 from dhnikolas/use-existing-router

✨  Add RouterName for use existing router

Author: k8s-ci-robot

api/v1alpha3/conversion_test.go

@@ -233,6 +233,7 @@ func TestFuzzyConversion(t *testing.T) {
 				v1alpha7Cluster.Spec.APIServerFixedIP = ""
 				v1alpha7Cluster.Spec.AllowAllInClusterTraffic = false
 				v1alpha7Cluster.Spec.DisableAPIServerFloatingIP = false
+				v1alpha7Cluster.Spec.Router = nil
 				v1alpha7Cluster.Spec.APIServerLoadBalancer.AllowedCIDRs = nil
 				v1alpha7Cluster.Spec.APIServerLoadBalancer.Provider = ""
 				if v1alpha7Cluster.Spec.Bastion != nil {

api/v1alpha3/zz_generated.conversion.go

@@ -338,6 +338,7 @@ func TestFuzzyConversion(t *testing.T) {
 				v1alpha7Cluster.Spec.APIServerLoadBalancer.Provider = ""
 
 				v1alpha7Cluster.Spec.ControlPlaneOmitAvailabilityZone = false
+				v1alpha7Cluster.Spec.Router = nil
 
 				if v1alpha7Cluster.Spec.Bastion != nil {
 					v1alpha7Cluster.Spec.Bastion.Instance.Image = ""
@@ -418,6 +419,8 @@ func TestFuzzyConversion(t *testing.T) {
 
 				v1alpha7ClusterTemplate.Spec.Template.Spec.ControlPlaneOmitAvailabilityZone = false
 
+				v1alpha7ClusterTemplate.Spec.Template.Spec.Router = nil
+
 				if v1alpha7ClusterTemplate.Spec.Template.Spec.Bastion != nil {
 					v1alpha7ClusterTemplate.Spec.Template.Spec.Bastion.Instance.Image = ""
 				}

api/v1alpha4/conversion_test.go

@@ -91,6 +91,7 @@ func restorev1alpha6MachineSpec(previous *OpenStackMachineSpec, dst *OpenStackMa
 func restorev1alpha7ClusterSpec(previous *infrav1.OpenStackClusterSpec, dst *infrav1.OpenStackClusterSpec) {
 	// APIServerLoadBalancer.Provider is new in v1alpha7
 	dst.APIServerLoadBalancer.Provider = previous.APIServerLoadBalancer.Provider
+	dst.Router = previous.Router
 }
 
 var _ ctrlconversion.Convertible = &OpenStackCluster{}
@@ -257,3 +258,7 @@ func Convert_v1alpha7_APIServerLoadBalancer_To_v1alpha6_APIServerLoadBalancer(in
 	// Provider have been added in v1alpha7 but have no equivalent in v1alpha6
 	return autoConvert_v1alpha7_APIServerLoadBalancer_To_v1alpha6_APIServerLoadBalancer(in, out, s)
 }
+
+func Convert_v1alpha7_OpenStackClusterSpec_To_v1alpha6_OpenStackClusterSpec(in *infrav1.OpenStackClusterSpec, out *OpenStackClusterSpec, s conversion.Scope) error {
+	return autoConvert_v1alpha7_OpenStackClusterSpec_To_v1alpha6_OpenStackClusterSpec(in, out, s)
+}

api/v1alpha4/zz_generated.conversion.go

@@ -17,6 +17,7 @@ limitations under the License.
 package v1alpha7
 
 import (
+	"github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/layer3/routers"
 	"github.com/gophercloud/gophercloud/openstack/networking/v2/networks"
 	"github.com/gophercloud/gophercloud/openstack/networking/v2/subnets"
 )
@@ -51,3 +52,16 @@ func (networkFilter NetworkFilter) ToListOpt() networks.ListOpts {
 		NotTagsAny:  networkFilter.NotTagsAny,
 	}
 }
+
+func (routerFilter RouterFilter) ToListOpt() routers.ListOpts {
+	return routers.ListOpts{
+		ID:          routerFilter.ID,
+		Name:        routerFilter.Name,
+		Description: routerFilter.Description,
+		ProjectID:   routerFilter.ProjectID,
+		Tags:        routerFilter.Tags,
+		TagsAny:     routerFilter.TagsAny,
+		NotTags:     routerFilter.NotTags,
+		NotTagsAny:  routerFilter.NotTagsAny,
+	}
+}

api/v1alpha5/zz_generated.conversion.go

@@ -39,6 +39,11 @@ type OpenStackClusterSpec struct {
 	// If you leave this empty, no network will be created.
 	NodeCIDR string `json:"nodeCidr,omitempty"`
 
+	// If NodeCIDR is set this option can be used to detect an existing router.
+	// If specified, no new router will be created.
+	// +optional
+	Router *RouterFilter `json:"router,omitempty"`
+
 	// If NodeCIDR cannot be set this can be used to detect an existing network.
 	Network NetworkFilter `json:"network,omitempty"`
 

api/v1alpha6/conversion.go

@@ -104,6 +104,17 @@ type SubnetFilter struct {
 	NotTagsAny      string `json:"notTagsAny,omitempty"`
 }
 
+type RouterFilter struct {
+	ID          string `json:"id,omitempty"`
+	Name        string `json:"name,omitempty"`
+	Description string `json:"description,omitempty"`
+	ProjectID   string `json:"projectId,omitempty"`
+	Tags        string `json:"tags,omitempty"`
+	TagsAny     string `json:"tagsAny,omitempty"`
+	NotTags     string `json:"notTags,omitempty"`
+	NotTagsAny  string `json:"notTagsAny,omitempty"`
+}
+
 type PortOpts struct {
 	// Network is a query for an openstack network that the port will be created or discovered on.
 	// This will fail if the query returns more than one network.

api/v1alpha6/zz_generated.conversion.go

@@ -6792,6 +6792,27 @@ spec:
                   connected to this subnet. If you leave this empty, no network will
                   be created.
                 type: string
+              router:
+                description: If NodeCIDR is set this option can be used to detect
+                  an existing router. If specified, no new router will be created.
+                properties:
+                  description:
+                    type: string
+                  id:
+                    type: string
+                  name:
+                    type: string
+                  notTags:
+                    type: string
+                  notTagsAny:
+                    type: string
+                  projectId:
+                    type: string
+                  tags:
+                    type: string
+                  tagsAny:
+                    type: string
+                type: object
               subnet:
                 description: If NodeCIDR cannot be set this can be used to detect
                   an existing subnet.

api/v1alpha7/filter_convert.go

@@ -2914,6 +2914,28 @@ spec:
                           and a router connected to this subnet. If you leave this
                           empty, no network will be created.
                         type: string
+                      router:
+                        description: If NodeCIDR is set this option can be used to
+                          detect an existing router. If specified, no new router will
+                          be created.
+                        properties:
+                          description:
+                            type: string
+                          id:
+                            type: string
+                          name:
+                            type: string
+                          notTags:
+                            type: string
+                          notTagsAny:
+                            type: string
+                          projectId:
+                            type: string
+                          tags:
+                            type: string
+                          tagsAny:
+                            type: string
+                        type: object
                       subnet:
                         description: If NodeCIDR cannot be set this can be used to
                           detect an existing subnet.

api/v1alpha7/openstackcluster_types.go

@@ -19,6 +19,7 @@
 - [Optional Configuration](#optional-configuration)
   - [Log level](#log-level)
   - [External network](#external-network)
+  - [Use existing router](#use-existing-router)
   - [API server floating IP](#api-server-floating-ip)
     - [Disabling the API server floating IP](#disabling-the-api-server-floating-ip)
     - [Restrict Access to the API server](#restrict-access-to-the-api-server)
@@ -178,6 +179,22 @@ openstack network list --external
 
 Note: If your openstack cluster does not already have a public network, you should contact your cloud service provider. We will not review how to troubleshoot this here.
 
+## Use existing router
+
+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/v1alpha6
+ kind: OpenStackCluster
+ metadata:
+   name: <cluster-name>
+   namespace: <cluster-namespace>
+ spec:
+   ...
+   router: 
+      id: <Router id>
+ ```
+
 ## API server floating IP
 
 Unless explicitly disabled, a floating IP is automatically created and associated with the load balancer