Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for security group overrides #9429

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Add support for security group overrides #9429

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
856f2d1
Add support for security group overrides
ethanchowell Feb 3, 2025
5a67322
Remove duplicate spec
ethanchowell Feb 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
230 changes: 120 additions & 110 deletions pkg/asset/manifests/aws/cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,115 +43,6 @@ func GenerateClusterAssets(ic *installconfig.InstallConfig, clusterID *installco
},
Spec: capa.AWSClusterSpec{
Region: ic.Config.AWS.Region,
NetworkSpec: capa.NetworkSpec{
CNI: &capa.CNISpec{
CNIIngressRules: capa.CNIIngressRules{
{
Description: "ICMP",
Protocol: capa.SecurityGroupProtocolICMP,
FromPort: -1,
ToPort: -1,
},
{
Description: "Port 22 (TCP)",
Protocol: capa.SecurityGroupProtocolTCP,
FromPort: 22,
ToPort: 22,
},
{
Description: "Port 4789 (UDP) for VXLAN",
Protocol: capa.SecurityGroupProtocolUDP,
FromPort: 4789,
ToPort: 4789,
},
{
Description: "Port 6081 (UDP) for geneve",
Protocol: capa.SecurityGroupProtocolUDP,
FromPort: 6081,
ToPort: 6081,
},
{
Description: "Port 500 (UDP) for IKE",
Protocol: capa.SecurityGroupProtocolUDP,
FromPort: 500,
ToPort: 500,
},
{
Description: "Port 4500 (UDP) for IKE NAT",
Protocol: capa.SecurityGroupProtocolUDP,
FromPort: 4500,
ToPort: 4500,
},
{
Description: "ESP",
Protocol: capa.SecurityGroupProtocolESP,
FromPort: -1,
ToPort: -1,
},
{
Description: "Port 6441-6442 (TCP) for ovndb",
Protocol: capa.SecurityGroupProtocolTCP,
FromPort: 6441,
ToPort: 6442,
},
{
Description: "Port 9000-9999 for node ports (TCP)",
Protocol: capa.SecurityGroupProtocolTCP,
FromPort: 9000,
ToPort: 9999,
},
{
Description: "Port 9000-9999 for node ports (UDP)",
Protocol: capa.SecurityGroupProtocolUDP,
FromPort: 9000,
ToPort: 9999,
},
{
Description: "Service node ports (TCP)",
Protocol: capa.SecurityGroupProtocolTCP,
FromPort: 30000,
ToPort: 32767,
},
{
Description: "Service node ports (UDP)",
Protocol: capa.SecurityGroupProtocolUDP,
FromPort: 30000,
ToPort: 32767,
},
},
},
AdditionalControlPlaneIngressRules: []capa.IngressRule{
{
Description: "MCS traffic from cluster network",
Protocol: capa.SecurityGroupProtocolTCP,
FromPort: 22623,
ToPort: 22623,
SourceSecurityGroupRoles: []capa.SecurityGroupRole{"node", "controlplane", "apiserver-lb"},
},
{
Description: "controller-manager",
Protocol: capa.SecurityGroupProtocolTCP,
FromPort: 10257,
ToPort: 10257,
SourceSecurityGroupRoles: []capa.SecurityGroupRole{"controlplane", "node"},
},
{
Description: "kube-scheduler",
Protocol: capa.SecurityGroupProtocolTCP,
FromPort: 10259,
ToPort: 10259,
SourceSecurityGroupRoles: []capa.SecurityGroupRole{"controlplane", "node"},
},
{
Description: BootstrapSSHDescription,
Protocol: capa.SecurityGroupProtocolTCP,
FromPort: 22,
ToPort: 22,
CidrBlocks: sshRuleCidr,
},
},
NodePortIngressRuleCidrBlocks: []string{capiutils.CIDRFromInstallConfig(ic).String()},
},
S3Bucket: &capa.S3Bucket{
Name: GetIgnitionBucketName(clusterID.InfraID),
PresignedURLDuration: &metav1.Duration{Duration: 1 * time.Hour},
Expand Down Expand Up @@ -199,6 +90,125 @@ func GenerateClusterAssets(ic *installconfig.InstallConfig, clusterID *installco
}
awsCluster.SetGroupVersionKind(capa.GroupVersion.WithKind("AWSCluster"))

networkSpec := capa.NetworkSpec{
AdditionalControlPlaneIngressRules: make([]capa.IngressRule, 0),
SecurityGroupOverrides: ic.Config.AWS.SecurityGroupOverrides,
}

if len(ic.Config.AWS.SecurityGroupOverrides) == 0 {
networkSpec.CNI = &capa.CNISpec{
CNIIngressRules: capa.CNIIngressRules{
{
Description: "ICMP",
Protocol: capa.SecurityGroupProtocolICMP,
FromPort: -1,
ToPort: -1,
},
{
Description: "Port 22 (TCP)",
Protocol: capa.SecurityGroupProtocolTCP,
FromPort: 22,
ToPort: 22,
},
{
Description: "Port 4789 (UDP) for VXLAN",
Protocol: capa.SecurityGroupProtocolUDP,
FromPort: 4789,
ToPort: 4789,
},
{
Description: "Port 6081 (UDP) for geneve",
Protocol: capa.SecurityGroupProtocolUDP,
FromPort: 6081,
ToPort: 6081,
},
{
Description: "Port 500 (UDP) for IKE",
Protocol: capa.SecurityGroupProtocolUDP,
FromPort: 500,
ToPort: 500,
},
{
Description: "Port 4500 (UDP) for IKE NAT",
Protocol: capa.SecurityGroupProtocolUDP,
FromPort: 4500,
ToPort: 4500,
},
{
Description: "ESP",
Protocol: capa.SecurityGroupProtocolESP,
FromPort: -1,
ToPort: -1,
},
{
Description: "Port 6441-6442 (TCP) for ovndb",
Protocol: capa.SecurityGroupProtocolTCP,
FromPort: 6441,
ToPort: 6442,
},
{
Description: "Port 9000-9999 for node ports (TCP)",
Protocol: capa.SecurityGroupProtocolTCP,
FromPort: 9000,
ToPort: 9999,
},
{
Description: "Port 9000-9999 for node ports (UDP)",
Protocol: capa.SecurityGroupProtocolUDP,
FromPort: 9000,
ToPort: 9999,
},
{
Description: "Service node ports (TCP)",
Protocol: capa.SecurityGroupProtocolTCP,
FromPort: 30000,
ToPort: 32767,
},
{
Description: "Service node ports (UDP)",
Protocol: capa.SecurityGroupProtocolUDP,
FromPort: 30000,
ToPort: 32767,
},
},
}
}

if _, ok := ic.Config.AWS.SecurityGroupOverrides[capa.SecurityGroupControlPlane]; !ok {
networkSpec.AdditionalControlPlaneIngressRules = []capa.IngressRule{
{
Description: "MCS traffic from cluster network",
Protocol: capa.SecurityGroupProtocolTCP,
FromPort: 22623,
ToPort: 22623,
SourceSecurityGroupRoles: []capa.SecurityGroupRole{"node", "controlplane", "apiserver-lb"},
},
{
Description: "controller-manager",
Protocol: capa.SecurityGroupProtocolTCP,
FromPort: 10257,
ToPort: 10257,
SourceSecurityGroupRoles: []capa.SecurityGroupRole{"controlplane", "node"},
},
{
Description: "kube-scheduler",
Protocol: capa.SecurityGroupProtocolTCP,
FromPort: 10259,
ToPort: 10259,
SourceSecurityGroupRoles: []capa.SecurityGroupRole{"controlplane", "node"},
},
{
Description: BootstrapSSHDescription,
Protocol: capa.SecurityGroupProtocolTCP,
FromPort: 22,
ToPort: 22,
CidrBlocks: sshRuleCidr,
},
}

networkSpec.NodePortIngressRuleCidrBlocks = []string{capiutils.CIDRFromInstallConfig(ic).String()}
}

if ic.Config.PublicAPI() {
awsCluster.Spec.SecondaryControlPlaneLoadBalancer = &capa.AWSLoadBalancerSpec{
Name: ptr.To(clusterID.InfraID + "-ext"),
Expand All @@ -222,7 +232,7 @@ func GenerateClusterAssets(ic *installconfig.InstallConfig, clusterID *installco
},
},
}
} else {
} else if _, ok := ic.Config.AWS.SecurityGroupOverrides[capa.SecurityGroupAPIServerLB]; !ok {
awsCluster.Spec.ControlPlaneLoadBalancer.IngressRules = append(
awsCluster.Spec.ControlPlaneLoadBalancer.IngressRules,
capa.IngressRule{
Expand Down
6 changes: 6 additions & 0 deletions pkg/types/aws/platform.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ package aws
import (
"os"

capa "sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"

"github.com/aws/aws-sdk-go/aws/endpoints"

configv1 "github.com/openshift/api/config/v1"
Expand Down Expand Up @@ -127,6 +129,10 @@ type Platform struct {
// +default="Disabled"
// +kubebuilder:validation:Enum="Enabled";"Disabled"
UserProvisionedDNS dns.UserProvisionedDNS `json:"userProvisionedDNS,omitempty"`

// SecurityGroupOverrides is an optional field that can be used to overwrite provisioned security groups
// +optional
SecurityGroupOverrides map[capa.SecurityGroupRole]string `json:"securityGroupOverrides,omitempty"`
}

// ServiceEndpoint store the configuration for services to
Expand Down