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

Jump to bottom

cherry-pick PR-1476 into release-1.8 #1493

Merged
merged 1 commit into from
Jun 7, 2021
Merged

cherry-pick PR-1476 into release-1.8 #1493

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 7 additions & 19 deletions test/agent/cmd/networking/tester/network.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@ import (
"fmt"
"log"
"net"
"reflect"
"sort"
"strings"

"github.com/aws/amazon-vpc-cni-k8s/test/agent/pkg/input"
Expand All @@ -38,10 +36,6 @@ func TestNetworkingSetupForRegularPod(podNetworkingValidationInput input.PodNetw
log.Fatalf("failed to list ip rules %v", err)
}

// Sort the VPC CIDR Range as it will be compared with the
// IP Routes for Pods using Secondary ENI IPv4Address
sort.Strings(podNetworkingValidationInput.VPCCidrRange)

// Do validation for each Pod and if validation fails instead of failing
// entire test add errors to a list for all the failing Pods
var validationErrors []error
Expand Down Expand Up @@ -99,6 +93,7 @@ func TestNetworkingSetupForRegularPod(podNetworkingValidationInput input.PodNetw
nonMainTableRules = append(nonMainTableRules, rule)
}
}
log.Printf("mainTableRules %v, nonMainTableRules %v", mainTableRules, nonMainTableRules)

// Both Pod with IP from Primary and Secondary ENI will have 1 rule for main route table
if len(mainTableRules) != 1 {
Expand Down Expand Up @@ -141,21 +136,13 @@ func TestNetworkingSetupForRegularPod(podNetworkingValidationInput input.PodNetw
// Pod with IP from Secondary ENI will have additional rule for destination to each
// VPC Cidr block
if pod.IsIPFromSecondaryENI {
var destinationCidrRange []string
for _, rule := range nonMainTableRules {
destinationCidrRange = append(destinationCidrRange, rule.Dst.String())
// Add the secondary route table Index, we will do validation later
secondaryRouteTableIndex[rule.Table] = true
}
sort.Strings(destinationCidrRange)
// Validate there is one rule for each VPC CIDR Range
if !reflect.DeepEqual(destinationCidrRange, podNetworkingValidationInput.VPCCidrRange) {
if len(nonMainTableRules) != 1 {
validationErrors = append(validationErrors,
fmt.Errorf("failed to find route to vpc cidr: %v", destinationCidrRange))
continue
fmt.Errorf("incorrect number of ip rules to the secondary route tables: %+v",
nonMainTableRules))
} else {
secondaryRouteTableIndex[nonMainTableRules[0].Table] = true
}
log.Printf("validated all routes for VPC CIDR %v are present for secondary ENI",
destinationCidrRange)
}
log.Printf("validation for pod %s/%s succeeded", pod.PodNamespace, pod.PodName)
}
Expand Down Expand Up @@ -185,6 +172,7 @@ func TestNetworkingSetupForRegularPod(podNetworkingValidationInput input.PodNetw
}
log.Printf("validated route table for secondary ENI %d has right routes", index)
}
// TODO: validate iptables rules get setup correctly

return validationErrors
}
Expand Down