wip

kubernetes-sigs · Nov 27, 2023 · 6c89825 · 6c89825
1 parent 713d139
commit 6c89825
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/api/v1alpha7/openstackcluster_types.go b/api/v1alpha7/openstackcluster_types.go
@@ -121,7 +121,9 @@ type OpenStackClusterSpec struct {
 	// SecurityGroups contains the security groups to be used for the cluster.
 	// This can be used to let CAPO manage the security groups for the cluster.
 	// +optional
-	SecurityGroups *SecurityGroupSpec `json:"securityGroups,omitempty"`
+	//SecurityGroups *SecurityGroupSpec `json:"securityGroups,omitempty"`
+
+	SecurityGroups []SecurityGroup `json:"securityGroups,omitempty"`
 
 	// AllowAllInClusterTraffic is only used when managed security groups are in use.
 	// If set to true, the rules for the managed security groups are configured so that all

diff --git a/api/v1alpha7/types.go b/api/v1alpha7/types.go
@@ -383,6 +383,11 @@ type SecurityGroupSpec struct {
 	// function correctly.
 	// +optional
 	WorkerSecurityGroupRules []SecurityGroupRule `json:"workerSecurityGroupRules,omitempty"`
+
+	CNISecurityGroupRules []SecurityGroupRule `json:"cniSecurityGroupRules,omitempty"`
+
+	// These SGs would not be applied anywhere unless specified in the machine template
+	AdditionalSecurityGroups []SecurityGroup `json:"additionalSecurityGroups,omitempty"`
 }
 
 // ValueSpec represents a single value_spec key-value pair.