Merge pull request #4 from Junsheng-Wu/eks

Add DisableFloatingIP to openstackCluster spec

Author: Junsheng-Wu

api/v1alpha6/openstackcluster_types.go

@@ -63,6 +63,10 @@ type OpenStackClusterSpec struct {
 	// +optional
 	APIServerLoadBalancer APIServerLoadBalancer `json:"apiServerLoadBalancer,omitempty"`
 
+	// DisableFloatingIP determines whether or not to attempt to attach a floating
+	// IP to the Instance. 
+	DisableFloatingIP bool `json:"disableFloatingIP"`
+
 	// DisableAPIServerFloatingIP determines whether or not to attempt to attach a floating
 	// IP to the API server. This allows for the creation of clusters when attaching a floating
 	// IP to the API server (and hence, in many cases, exposing the API server to the internet)

config/crd/bases/infrastructure.cluster.x-k8s.io_openstackclusters.yaml

@@ -4771,6 +4771,10 @@ spec:
                   fail without additional configuration to manage the VIP on the control
                   plane machines, which falls outside of the scope of this controller.
                 type: boolean
+              disableFloatingIP:
+                description: DisableFloatingIP determines whether or not to attempt
+                  to attach a floating IP to the Instance.
+                type: boolean
               disablePortSecurity:
                 description: DisablePortSecurity disables the port security of the
                   network created for the Kubernetes cluster, which also disables
@@ -4932,6 +4936,8 @@ spec:
                   type: string
                 type: array
                 x-kubernetes-list-type: set
+            required:
+            - disableFloatingIP
             type: object
           status:
             description: OpenStackClusterStatus defines the observed state of OpenStackCluster.

config/crd/bases/infrastructure.cluster.x-k8s.io_openstackclustertemplates.yaml

@@ -2011,6 +2011,10 @@ spec:
                           configuration to manage the VIP on the control plane machines,
                           which falls outside of the scope of this controller.
                         type: boolean
+                      disableFloatingIP:
+                        description: DisableFloatingIP determines whether or not to
+                          attempt to attach a floating IP to the Instance.
+                        type: boolean
                       disablePortSecurity:
                         description: DisablePortSecurity disables the port security
                           of the network created for the Kubernetes cluster, which
@@ -2177,6 +2181,8 @@ spec:
                           type: string
                         type: array
                         x-kubernetes-list-type: set
+                    required:
+                    - disableFloatingIP
                     type: object
                 required:
                 - spec

controllers/openstackcluster_controller.go

@@ -344,35 +344,37 @@ func reconcileBastion(scope *scope.Scope, cluster *clusterv1.Cluster, openStackC
 	if err != nil {
 		return errors.Errorf("failed to reconcile bastion: %v", err)
 	}
+	if !openStackCluster.Spec.DisableFloatingIP {
+		networkingService, err := networking.NewService(scope)
+		if err != nil {
+			return err
+		}
+		clusterName := fmt.Sprintf("%s-%s", cluster.Namespace, cluster.Name)
+		fp, err := networkingService.GetOrCreateFloatingIP(openStackCluster, openStackCluster, clusterName, openStackCluster.Spec.Bastion.Instance.FloatingIP)
+		if err != nil {
+			handleUpdateOSCError(openStackCluster, errors.Errorf("failed to get or create floating IP for bastion: %v", err))
+			return errors.Errorf("failed to get or create floating IP for bastion: %v", err)
+		}
+		port, err := computeService.GetManagementPort(openStackCluster, instanceStatus)
+		if err != nil {
+			err = errors.Errorf("getting management port for bastion: %v", err)
+			handleUpdateOSCError(openStackCluster, err)
+			return err
+		}
+		err = networkingService.AssociateFloatingIP(openStackCluster, fp, port.ID)
+		if err != nil {
+			handleUpdateOSCError(openStackCluster, errors.Errorf("failed to associate floating IP with bastion: %v", err))
+			return errors.Errorf("failed to associate floating IP with bastion: %v", err)
+		}
 
-	networkingService, err := networking.NewService(scope)
-	if err != nil {
-		return err
-	}
-	clusterName := fmt.Sprintf("%s-%s", cluster.Namespace, cluster.Name)
-	fp, err := networkingService.GetOrCreateFloatingIP(openStackCluster, openStackCluster, clusterName, openStackCluster.Spec.Bastion.Instance.FloatingIP)
-	if err != nil {
-		handleUpdateOSCError(openStackCluster, errors.Errorf("failed to get or create floating IP for bastion: %v", err))
-		return errors.Errorf("failed to get or create floating IP for bastion: %v", err)
-	}
-	port, err := computeService.GetManagementPort(openStackCluster, instanceStatus)
-	if err != nil {
-		err = errors.Errorf("getting management port for bastion: %v", err)
-		handleUpdateOSCError(openStackCluster, err)
-		return err
-	}
-	err = networkingService.AssociateFloatingIP(openStackCluster, fp, port.ID)
-	if err != nil {
-		handleUpdateOSCError(openStackCluster, errors.Errorf("failed to associate floating IP with bastion: %v", err))
-		return errors.Errorf("failed to associate floating IP with bastion: %v", err)
+		bastion, err := instanceStatus.APIInstance(openStackCluster)
+		if err != nil {
+			return err
+		}
+		bastion.FloatingIP = fp.FloatingIP
+		openStackCluster.Status.Bastion = bastion
 	}
 
-	bastion, err := instanceStatus.APIInstance(openStackCluster)
-	if err != nil {
-		return err
-	}
-	bastion.FloatingIP = fp.FloatingIP
-	openStackCluster.Status.Bastion = bastion
 	annotations.AddAnnotations(openStackCluster, map[string]string{BastionInstanceHashAnnotation: bastionHash})
 	return nil
 }

pkg/cloud/services/networking/network.go

@@ -42,6 +42,12 @@ func (c createOpts) ToNetworkCreateMap() (map[string]interface{}, error) {
 }
 
 func (s *Service) ReconcileExternalNetwork(openStackCluster *infrav1.OpenStackCluster) error {
+	if openStackCluster.Spec.DisableFloatingIP {
+		openStackCluster.Status.ExternalNetwork = &infrav1.Network{}
+		s.scope.Logger.Info("External network was disabled - proceeding with internal network only")
+		return nil
+	}
+
 	if openStackCluster.Spec.ExternalNetworkID != "" {
 		externalNetwork, err := s.getNetworkByID(openStackCluster.Spec.ExternalNetworkID)
 		if err != nil {