diff --git a/misc/eni-max-pods.txt b/misc/eni-max-pods.txt index ff40b9fdf21..203187e6f2e 100644 --- a/misc/eni-max-pods.txt +++ b/misc/eni-max-pods.txt @@ -11,7 +11,26 @@ # express or implied. See the License for the specific language governing # permissions and limitations under the License. # -# This file was generated at 2021-12-08T08:35:33+01:00 +# This file was generated at 2022-02-15T18:47:49Z +# +# The regions queried were: +# - ap-northeast-1 +# - ap-northeast-2 +# - ap-northeast-3 +# - ap-south-1 +# - ap-southeast-1 +# - ap-southeast-2 +# - ca-central-1 +# - eu-central-1 +# - eu-north-1 +# - eu-west-1 +# - eu-west-2 +# - eu-west-3 +# - sa-east-1 +# - us-east-1 +# - us-east-2 +# - us-west-1 +# - us-west-2 # # Mapping is calculated from AWS EC2 API using the following formula: # * First IP on each ENI is not used for pods @@ -82,6 +101,16 @@ c5n.9xlarge 234 c5n.large 29 c5n.metal 737 c5n.xlarge 58 +c6a.12xlarge 234 +c6a.16xlarge 737 +c6a.24xlarge 737 +c6a.2xlarge 58 +c6a.32xlarge 737 +c6a.48xlarge 737 +c6a.4xlarge 234 +c6a.8xlarge 234 +c6a.large 29 +c6a.xlarge 58 c6g.12xlarge 234 c6g.16xlarge 737 c6g.2xlarge 58 @@ -164,10 +193,17 @@ g5.48xlarge 737 g5.4xlarge 234 g5.8xlarge 234 g5.xlarge 58 +g5g.16xlarge 737 +g5g.2xlarge 58 +g5g.4xlarge 234 +g5g.8xlarge 234 +g5g.metal 737 +g5g.xlarge 58 h1.16xlarge 737 h1.2xlarge 58 h1.4xlarge 234 h1.8xlarge 234 +hpc6a.48xlarge 100 hs1.8xlarge 234 i2.2xlarge 58 i2.4xlarge 234 @@ -271,6 +307,7 @@ m5n.2xlarge 58 m5n.4xlarge 234 m5n.8xlarge 234 m5n.large 29 +m5n.metal 737 m5n.xlarge 58 m5zn.12xlarge 737 m5zn.2xlarge 58 @@ -459,6 +496,7 @@ u-12tb1.112xlarge 737 u-12tb1.metal 147 u-18tb1.metal 737 u-24tb1.metal 737 +u-3tb1.56xlarge 234 u-6tb1.112xlarge 737 u-6tb1.56xlarge 737 u-6tb1.metal 147 @@ -484,6 +522,12 @@ x2gd.large 29 x2gd.medium 8 x2gd.metal 737 x2gd.xlarge 58 +x2iezn.12xlarge 737 +x2iezn.2xlarge 58 +x2iezn.4xlarge 234 +x2iezn.6xlarge 234 +x2iezn.8xlarge 234 +x2iezn.metal 737 z1d.12xlarge 737 z1d.2xlarge 58 z1d.3xlarge 234 diff --git a/pkg/awsutils/vpc_ip_resource_limit.go b/pkg/awsutils/vpc_ip_resource_limit.go index 417e9757686..2f490d741bd 100644 --- a/pkg/awsutils/vpc_ip_resource_limit.go +++ b/pkg/awsutils/vpc_ip_resource_limit.go @@ -12,8 +12,26 @@ // permissions and limitations under the License. // Code generated by go generate; DO NOT EDIT. -// This file was generated at 2021-12-08T08:35:33+01:00 - +// This file was generated at 2022-02-15T18:47:49Z +// +// The regions queried were: +// - ap-northeast-1 +// - ap-northeast-2 +// - ap-northeast-3 +// - ap-south-1 +// - ap-southeast-1 +// - ap-southeast-2 +// - ca-central-1 +// - eu-central-1 +// - eu-north-1 +// - eu-west-1 +// - eu-west-2 +// - eu-west-3 +// - sa-east-1 +// - us-east-1 +// - us-east-2 +// - us-west-1 +// - us-west-2 package awsutils // InstanceNetworkingLimits contains a mapping from instance type to networking limits for the type. Documentation found at @@ -80,6 +98,16 @@ var InstanceNetworkingLimits = map[string]InstanceTypeLimits{ "c5n.large": {ENILimit: 3, IPv4Limit: 10, HypervisorType: "nitro"}, "c5n.metal": {ENILimit: 15, IPv4Limit: 50, HypervisorType: ""}, "c5n.xlarge": {ENILimit: 4, IPv4Limit: 15, HypervisorType: "nitro"}, + "c6a.12xlarge": {ENILimit: 8, IPv4Limit: 30, HypervisorType: "nitro"}, + "c6a.16xlarge": {ENILimit: 15, IPv4Limit: 50, HypervisorType: "nitro"}, + "c6a.24xlarge": {ENILimit: 15, IPv4Limit: 50, HypervisorType: "nitro"}, + "c6a.2xlarge": {ENILimit: 4, IPv4Limit: 15, HypervisorType: "nitro"}, + "c6a.32xlarge": {ENILimit: 15, IPv4Limit: 50, HypervisorType: "nitro"}, + "c6a.48xlarge": {ENILimit: 15, IPv4Limit: 50, HypervisorType: "nitro"}, + "c6a.4xlarge": {ENILimit: 8, IPv4Limit: 30, HypervisorType: "nitro"}, + "c6a.8xlarge": {ENILimit: 8, IPv4Limit: 30, HypervisorType: "nitro"}, + "c6a.large": {ENILimit: 3, IPv4Limit: 10, HypervisorType: "nitro"}, + "c6a.xlarge": {ENILimit: 4, IPv4Limit: 15, HypervisorType: "nitro"}, "c6g.12xlarge": {ENILimit: 8, IPv4Limit: 30, HypervisorType: "nitro"}, "c6g.16xlarge": {ENILimit: 15, IPv4Limit: 50, HypervisorType: "nitro"}, "c6g.2xlarge": {ENILimit: 4, IPv4Limit: 15, HypervisorType: "nitro"}, @@ -89,15 +117,6 @@ var InstanceNetworkingLimits = map[string]InstanceTypeLimits{ "c6g.medium": {ENILimit: 2, IPv4Limit: 4, HypervisorType: "nitro"}, "c6g.metal": {ENILimit: 15, IPv4Limit: 50, HypervisorType: ""}, "c6g.xlarge": {ENILimit: 4, IPv4Limit: 15, HypervisorType: "nitro"}, - "c7g.12xlarge": {ENILimit: 8, IPv4Limit: 30, HypervisorType: "nitro"}, - "c7g.16xlarge": {ENILimit: 15, IPv4Limit: 50, HypervisorType: "nitro"}, - "c7g.2xlarge": {ENILimit: 4, IPv4Limit: 15, HypervisorType: "nitro"}, - "c7g.4xlarge": {ENILimit: 8, IPv4Limit: 30, HypervisorType: "nitro"}, - "c7g.8xlarge": {ENILimit: 8, IPv4Limit: 30, HypervisorType: "nitro"}, - "c7g.large": {ENILimit: 3, IPv4Limit: 10, HypervisorType: "nitro"}, - "c7g.medium": {ENILimit: 2, IPv4Limit: 4, HypervisorType: "nitro"}, - "c7g.xlarge": {ENILimit: 4, IPv4Limit: 15, HypervisorType: "nitro"}, - "c7g.metal": {ENILimit: 15, IPv4Limit: 50, HypervisorType: ""}, "c6gd.12xlarge": {ENILimit: 8, IPv4Limit: 30, HypervisorType: "nitro"}, "c6gd.16xlarge": {ENILimit: 15, IPv4Limit: 50, HypervisorType: "nitro"}, "c6gd.2xlarge": {ENILimit: 4, IPv4Limit: 15, HypervisorType: "nitro"}, @@ -171,10 +190,17 @@ var InstanceNetworkingLimits = map[string]InstanceTypeLimits{ "g5.4xlarge": {ENILimit: 8, IPv4Limit: 30, HypervisorType: "nitro"}, "g5.8xlarge": {ENILimit: 8, IPv4Limit: 30, HypervisorType: "nitro"}, "g5.xlarge": {ENILimit: 4, IPv4Limit: 15, HypervisorType: "nitro"}, + "g5g.16xlarge": {ENILimit: 15, IPv4Limit: 50, HypervisorType: "nitro"}, + "g5g.2xlarge": {ENILimit: 4, IPv4Limit: 15, HypervisorType: "nitro"}, + "g5g.4xlarge": {ENILimit: 8, IPv4Limit: 30, HypervisorType: "nitro"}, + "g5g.8xlarge": {ENILimit: 8, IPv4Limit: 30, HypervisorType: "nitro"}, + "g5g.metal": {ENILimit: 15, IPv4Limit: 50, HypervisorType: ""}, + "g5g.xlarge": {ENILimit: 4, IPv4Limit: 15, HypervisorType: "nitro"}, "h1.16xlarge": {ENILimit: 15, IPv4Limit: 50, HypervisorType: "xen"}, "h1.2xlarge": {ENILimit: 4, IPv4Limit: 15, HypervisorType: "xen"}, "h1.4xlarge": {ENILimit: 8, IPv4Limit: 30, HypervisorType: "xen"}, "h1.8xlarge": {ENILimit: 8, IPv4Limit: 30, HypervisorType: "xen"}, + "hpc6a.48xlarge": {ENILimit: 2, IPv4Limit: 50, HypervisorType: "nitro"}, "hs1.8xlarge": {ENILimit: 8, IPv4Limit: 30, HypervisorType: "unknown"}, "i2.2xlarge": {ENILimit: 4, IPv4Limit: 15, HypervisorType: "xen"}, "i2.4xlarge": {ENILimit: 8, IPv4Limit: 30, HypervisorType: "xen"}, @@ -278,6 +304,7 @@ var InstanceNetworkingLimits = map[string]InstanceTypeLimits{ "m5n.4xlarge": {ENILimit: 8, IPv4Limit: 30, HypervisorType: "nitro"}, "m5n.8xlarge": {ENILimit: 8, IPv4Limit: 30, HypervisorType: "nitro"}, "m5n.large": {ENILimit: 3, IPv4Limit: 10, HypervisorType: "nitro"}, + "m5n.metal": {ENILimit: 15, IPv4Limit: 50, HypervisorType: ""}, "m5n.xlarge": {ENILimit: 4, IPv4Limit: 15, HypervisorType: "nitro"}, "m5zn.12xlarge": {ENILimit: 15, IPv4Limit: 50, HypervisorType: "nitro"}, "m5zn.2xlarge": {ENILimit: 4, IPv4Limit: 15, HypervisorType: "nitro"}, @@ -466,6 +493,7 @@ var InstanceNetworkingLimits = map[string]InstanceTypeLimits{ "u-12tb1.metal": {ENILimit: 5, IPv4Limit: 30, HypervisorType: "unknown"}, "u-18tb1.metal": {ENILimit: 15, IPv4Limit: 50, HypervisorType: "unknown"}, "u-24tb1.metal": {ENILimit: 15, IPv4Limit: 50, HypervisorType: "unknown"}, + "u-3tb1.56xlarge": {ENILimit: 8, IPv4Limit: 30, HypervisorType: "nitro"}, "u-6tb1.112xlarge": {ENILimit: 15, IPv4Limit: 50, HypervisorType: "nitro"}, "u-6tb1.56xlarge": {ENILimit: 15, IPv4Limit: 50, HypervisorType: "nitro"}, "u-6tb1.metal": {ENILimit: 5, IPv4Limit: 30, HypervisorType: "unknown"}, @@ -491,6 +519,12 @@ var InstanceNetworkingLimits = map[string]InstanceTypeLimits{ "x2gd.medium": {ENILimit: 2, IPv4Limit: 4, HypervisorType: "nitro"}, "x2gd.metal": {ENILimit: 15, IPv4Limit: 50, HypervisorType: ""}, "x2gd.xlarge": {ENILimit: 4, IPv4Limit: 15, HypervisorType: "nitro"}, + "x2iezn.12xlarge": {ENILimit: 15, IPv4Limit: 50, HypervisorType: "nitro"}, + "x2iezn.2xlarge": {ENILimit: 4, IPv4Limit: 15, HypervisorType: "nitro"}, + "x2iezn.4xlarge": {ENILimit: 8, IPv4Limit: 30, HypervisorType: "nitro"}, + "x2iezn.6xlarge": {ENILimit: 8, IPv4Limit: 30, HypervisorType: "nitro"}, + "x2iezn.8xlarge": {ENILimit: 8, IPv4Limit: 30, HypervisorType: "nitro"}, + "x2iezn.metal": {ENILimit: 15, IPv4Limit: 50, HypervisorType: ""}, "z1d.12xlarge": {ENILimit: 15, IPv4Limit: 50, HypervisorType: "nitro"}, "z1d.2xlarge": {ENILimit: 4, IPv4Limit: 15, HypervisorType: "nitro"}, "z1d.3xlarge": {ENILimit: 8, IPv4Limit: 30, HypervisorType: "nitro"}, diff --git a/test/framework/resources/aws/services/eks.go b/test/framework/resources/aws/services/eks.go index 36abfafa91b..1b1b35bf646 100644 --- a/test/framework/resources/aws/services/eks.go +++ b/test/framework/resources/aws/services/eks.go @@ -43,11 +43,6 @@ type AddonInput struct { K8sVersion string } -type VersionWithBuild struct { - version uint - build uint -} - func NewEKS(session *session.Session, endpoint string) EKS { return &defaultEKS{ EKSAPI: eks.New(session, &aws.Config{ diff --git a/test/integration-new/regression-tests/cni_addon_suite_test.go b/test/integration-new/addon-tests/cni_addon_suite_test.go similarity index 99% rename from test/integration-new/regression-tests/cni_addon_suite_test.go rename to test/integration-new/addon-tests/cni_addon_suite_test.go index a28f39f9257..04f41d7736a 100644 --- a/test/integration-new/regression-tests/cni_addon_suite_test.go +++ b/test/integration-new/addon-tests/cni_addon_suite_test.go @@ -1,4 +1,4 @@ -package regression_tests +package addon_tests import ( "fmt" diff --git a/test/integration-new/regression-tests/cni_addon_test.go b/test/integration-new/addon-tests/cni_addon_test.go similarity index 99% rename from test/integration-new/regression-tests/cni_addon_test.go rename to test/integration-new/addon-tests/cni_addon_test.go index 4342f45b1f0..9a868045089 100644 --- a/test/integration-new/regression-tests/cni_addon_test.go +++ b/test/integration-new/addon-tests/cni_addon_test.go @@ -1,4 +1,4 @@ -package regression_tests +package addon_tests import ( "fmt" diff --git a/test/integration-new/cni/host_networking_test.go b/test/integration-new/cni/host_networking_test.go index 2cbe5c917e1..ea4d99a0747 100644 --- a/test/integration-new/cni/host_networking_test.go +++ b/test/integration-new/cni/host_networking_test.go @@ -95,7 +95,7 @@ var _ = Describe("test host networking", func() { It("Validate Host Networking setup after changing MTU and Veth Prefix", func() { deployment := manifest.NewBusyBoxDeploymentBuilder(). - Replicas(6). + Replicas(maxIPPerInterface*2). PodLabel(podLabelKey, podLabelVal). NodeName(primaryNode.Name). Build() diff --git a/test/integration-new/ipamd/ipamd_suite_test.go b/test/integration-new/ipamd/ipamd_suite_test.go index cb82f3ee8d1..ab79fd8f189 100644 --- a/test/integration-new/ipamd/ipamd_suite_test.go +++ b/test/integration-new/ipamd/ipamd_suite_test.go @@ -52,16 +52,4 @@ var _ = BeforeSuite(func() { instanceID := k8sUtils.GetInstanceIDFromNode(primaryNode) primaryInstance, err = f.CloudServices.EC2().DescribeInstance(instanceID) Expect(err).ToNot(HaveOccurred()) - - By("Delete coredns addon if it exists") - _, addonDeleteError = f.CloudServices.EKS().DeleteAddon("coredns", f.Options.ClusterName) - -}) - -var _ = AfterSuite(func() { - if addonDeleteError == nil { - By("Restore coredns addon") - _, err := f.CloudServices.EKS().CreateAddon("coredns", f.Options.ClusterName) - Expect(err).NotTo(HaveOccurred()) - } }) diff --git a/test/integration/README.md b/test/integration/README.md index 2efffe2f721..6a355a30fdb 100644 --- a/test/integration/README.md +++ b/test/integration/README.md @@ -11,12 +11,12 @@ * set PERFORMANCE_TEST_S3_BUCKET_NAME to the name of the bucket (likely `cni-performance-tests`) * set RUN_PERFORMANCE_TESTS=true * to view data graph: - * Go to Isengard and open 719533996208 account (vpc-cni-ci-test) as admin + * Go to Isengard and open aws-wesley+vpc-cni-ci-test@amazon.com as admin * Go to QuickSight and signup with your email email (it does not need an additional password) * Open dashboards: - * 130-pod test graph: https://us-east-1.quicksight.aws.amazon.com/sn/dashboards/5b0ac811-114e-40cd-b0c9-07f006c5d840 - * 730-pod test graph: https://us-east-1.quicksight.aws.amazon.com/sn/dashboards/aa1b6544-88e0-47f0-9da7-8e0b7cbd1d88 - * 5000-pod test graph: https://us-east-1.quicksight.aws.amazon.com/sn/dashboards/029169df-7a56-4249-bb69-53b57eabfa9f + * 130-pods test - https://us-west-2.quicksight.aws.amazon.com/sn/dashboards/af137b24-a4c1-4ecd-addb-2056486e2022/views/4facfa4f-4b29-42d7-bdf5-5335d9114533 + * 5000-pods test - https://us-west-2.quicksight.aws.amazon.com/sn/dashboards/55b56360-dbc3-4fc4-917a-167249a0eb8c/views/1cb4c112-cea3-4ea2-84f6-32d0436b0711 + * 730-pods test - https://us-west-2.quicksight.aws.amazon.com/sn/dashboards/8e10011a-a29f-4218-a62d-691fd41c71f3/views/f78feb6c-f45b-4788-82c4-0fc348e793d0 * NOTE: if running on previous versions, change the date inside of the file to the date of release so as to not confuse graphing order