Merge pull request #2505 from dlom/HIVE-2637

HIVE-2637: Add new API field AdditionalSecurityGroupIDs for OpenStack machine pools

apis/hive/v1/openstack/machinepools.go

@@ -14,6 +14,12 @@ type MachinePool struct {
 	// The instances use ephemeral disks if not set.
 	// +optional
 	RootVolume *RootVolume `json:"rootVolume,omitempty"`
+
+	// AdditionalSecurityGroupIDs contains IDs of additional security groups for machines, where each ID
+	// is presented in the format sg-xxxx.
+	//
+	// +optional
+	AdditionalSecurityGroupIDs []string `json:"additionalSecurityGroupIDs,omitempty"`
 }
 
 // Set sets the values from `required` to `a`.

config/crds/hive.openshift.io_machinepools.yaml

@@ -513,6 +513,13 @@ spec:
                     description: OpenStack is the configuration used when installing
                       on OpenStack.
                     properties:
+                      additionalSecurityGroupIDs:
+                        description: |-
+                          AdditionalSecurityGroupIDs contains IDs of additional security groups for machines, where each ID
+                          is presented in the format sg-xxxx.
+                        items:
+                          type: string
+                        type: array
                       flavor:
                         description: |-
                           Flavor defines the OpenStack Nova flavor.

hack/app-sre/saas-template.yaml

@@ -7498,6 +7498,14 @@ objects:
                       description: OpenStack is the configuration used when installing
                         on OpenStack.
                       properties:
+                        additionalSecurityGroupIDs:
+                          description: 'AdditionalSecurityGroupIDs contains IDs of
+                            additional security groups for machines, where each ID
+
+                            is presented in the format sg-xxxx.'
+                          items:
+                            type: string
+                          type: array
                         flavor:
                           description: 'Flavor defines the OpenStack Nova flavor.
 

pkg/controller/machinepool/openstackactuator.go

@@ -76,7 +76,8 @@ func (a *OpenStackActuator) GenerateMachineSets(cd *hivev1.ClusterDeployment, po
 		// get back a MachineSet.
 		// Providing the empty string will give back a MachineSet running on the default
 		// OpenStack Nova availability zone.
-		Zones: []string{""},
+		Zones:                      []string{""},
+		AdditionalSecurityGroupIDs: pool.Spec.Platform.OpenStack.AdditionalSecurityGroupIDs,
 	}
 
 	if pool.Spec.Platform.OpenStack.RootVolume != nil {