Skip to content

Commit

Permalink
OCM-3745 | feat: add security group attribute to AWS, AWS MP, VPC
Browse files Browse the repository at this point in the history
  • Loading branch information
gdbranco committed Sep 25, 2023
1 parent 39a4f31 commit d684db7
Show file tree
Hide file tree
Showing 5 changed files with 34 additions and 1 deletion.
3 changes: 3 additions & 0 deletions model/clusters_mgmt/v1/aws_machine_pool_type.model
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,7 @@ limitations under the License.
class AWSMachinePool {
// Use spot instances on this machine pool to reduce cost.
SpotMarketOptions AWSSpotMarketOptions

// Additional AWS Security Groups to be added machine pool. Note that machine pools can only be worker node at the time.
AdditionalSecurityGroupIds []String
}
24 changes: 24 additions & 0 deletions model/clusters_mgmt/v1/aws_security_group_type.model
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
/*
Copyright (c) 2023 Red Hat, Inc.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

// AWS security group object
struct SecurityGroup {
// The security group ID.
ID String

// Name of the security group according to its `Name` tag on AWS.
Name String
}
3 changes: 3 additions & 0 deletions model/clusters_mgmt/v1/aws_type.model
Original file line number Diff line number Diff line change
Expand Up @@ -61,4 +61,7 @@ struct AWS {

// Role ARN for private hosted zone.
PrivateHostedZoneRoleARN String

// Additional AWS Security Groups to be added to default worker (compute) machine pool.
AdditionalComputeSecurityGroupIds []String
}
2 changes: 1 addition & 1 deletion model/clusters_mgmt/v1/sts_type.model
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,6 @@ struct STS {
// If true, cluster account and operator roles have managed policies attached.
ManagedPolicies Boolean

// Registered Oidc Config, if available holds information related to the oidc config
// Registered Oidc Config, if available holds information related to the oidc config.
OidcConfig OidcConfig
}
3 changes: 3 additions & 0 deletions model/clusters_mgmt/v1/vpc_inquiry_type.model
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ struct CloudVPC {
// List of AWS subnetworks with details.
AWSSubnets []Subnetwork

// List of AWS security groups with details.
AWSSecurityGroups []SecurityGroup

// CIDR block of the virtual private cloud.
CIDRBlock String
}

0 comments on commit d684db7

Please sign in to comment.