Skip to content

Make sure Calico can talk IP-in-IP #701

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

Merged
k8s-ci-robot merged 5 commits into from
Apr 10, 2019
Merged

Make sure Calico can talk IP-in-IP #701

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2dee686
MAke sure Calico can talk IP-in-IP
sfzylad Apr 4, 2019
c331591
Add IP in IP protocol to the control plane security group
sfzylad Apr 5, 2019
97f806c
Add IPv4 protocol definition and make sure it's handled properly.
sfzylad Apr 10, 2019
a4688d5
Make port ranges AWS complient and security groups more restrictive.
sfzylad Apr 10, 2019
0bc2dfb
Fix security groups
sfzylad Apr 10, 2019
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
3 changes: 3 additions & 0 deletions pkg/apis/awsprovider/v1alpha1/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,6 +266,9 @@ var (
// SecurityGroupProtocolAll is a wildcard for all IP protocols
SecurityGroupProtocolAll = SecurityGroupProtocol("-1")

// SecurityGroupProtocolIPinIP represents the IP in IP protocol in ingress rules
SecurityGroupProtocolIPinIP = SecurityGroupProtocol("4")

// SecurityGroupProtocolTCP represents the TCP protocol in ingress rules
SecurityGroupProtocolTCP = SecurityGroupProtocol("tcp")

Expand Down
20 changes: 20 additions & 0 deletions pkg/cloud/aws/services/ec2/securitygroups.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,6 +289,16 @@ func (s *Service) getSecurityGroupIngressRules(role v1alpha1.SecurityGroupRole)
s.scope.SecurityGroups()[v1alpha1.SecurityGroupNode].ID,
},
},
{
Description: "IP-in-IP (calico)",
Protocol: v1alpha1.SecurityGroupProtocolIPinIP,
FromPort: -1,
ToPort: 65535,
SourceSecurityGroupIDs: []string{
s.scope.SecurityGroups()[v1alpha1.SecurityGroupControlPlane].ID,
s.scope.SecurityGroups()[v1alpha1.SecurityGroupNode].ID,
},
},
}, nil

case v1alpha1.SecurityGroupNode:
Expand Down Expand Up @@ -318,6 +328,16 @@ func (s *Service) getSecurityGroupIngressRules(role v1alpha1.SecurityGroupRole)
s.scope.SecurityGroups()[v1alpha1.SecurityGroupNode].ID,
},
},
{
Description: "IP-in-IP (calico)",
Protocol: v1alpha1.SecurityGroupProtocolIPinIP,
FromPort: -1,
ToPort: 65535,
Comment thread
sfzylad marked this conversation as resolved.
Outdated
SourceSecurityGroupIDs: []string{
s.scope.SecurityGroups()[v1alpha1.SecurityGroupNode].ID,
s.scope.SecurityGroups()[v1alpha1.SecurityGroupControlPlane].ID,
},
},
}, nil
}

Expand Down