kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Import awsutils from amazon-vpc-cni-k8s plugin 

https://raw.githubusercontent.com/aws/amazon-vpc-cni-k8s/master/pkg/awsutils/vpc_ip_resource_limit.go
This commit is contained in:
Ripta Pasay 2018-11-25 20:39:43 +00:00
parent aa34956560
commit ab8565df9c
3 changed files with 341 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -786,6 +786,6 @@ build-docs:
.PHONY: update-machine-types .PHONY: update-machine-types
update-machine-types: #Update machine_types.go update-machine-types: #Update machine_types.go
go build -o hack/machine_types/machine_types ${KOPS_ROOT}/hack/machine_types/machine_types.go go build -o hack/machine_types/machine_types ${KOPS_ROOT}/hack/machine_types/machine_types.go ${KOPS_ROOT}/hack/machine_types/vpc_ip_resource_limit.go
hack/machine_types/machine_types --out upup/pkg/fi/cloudup/awsup/machine_types.go hack/machine_types/machine_types --out upup/pkg/fi/cloudup/awsup/machine_types.go
go fmt upup/pkg/fi/cloudup/awsup/machine_types.go go fmt upup/pkg/fi/cloudup/awsup/machine_types.go

5
hack/machine_types/machine_types.go
View File

@ -27,7 +27,6 @@ import (
"strconv" "strconv"
"strings" "strings"
"github.com/aws/amazon-vpc-cni-k8s/pkg/awsutils"
"github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/awserr" "github.com/aws/aws-sdk-go/aws/awserr"
"github.com/aws/aws-sdk-go/aws/session" "github.com/aws/aws-sdk-go/aws/session"
@ -204,8 +203,8 @@ func run() error {
// AWS VPC CNI plugin-specific maximum pod calculation based on: // AWS VPC CNI plugin-specific maximum pod calculation based on:
// https://github.com/aws/amazon-vpc-cni-k8s/blob/f52ad45/README.md // https://github.com/aws/amazon-vpc-cni-k8s/blob/f52ad45/README.md
enisPerInstance, enisOK := awsutils.InstanceENIsAvailable[attributes["instanceType"]] enisPerInstance, enisOK := InstanceENIsAvailable[attributes["instanceType"]]
ipsPerENI, ipsOK := awsutils.InstanceIPsAvailable[attributes["instanceType"]] ipsPerENI, ipsOK := InstanceIPsAvailable[attributes["instanceType"]]
if enisOK && ipsOK { if enisOK && ipsOK {
machine.MaxPods = enisPerInstance*(int(ipsPerENI)-1) + 2 machine.MaxPods = enisPerInstance*(int(ipsPerENI)-1) + 2
} }

338
hack/machine_types/vpc_ip_resource_limit.go Normal file
View File

@ -0,0 +1,338 @@
// Copyright 2017-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License"). You may
// not use this file except in compliance with the License. A copy of the
// License is located at
//
// http://aws.amazon.com/apache2.0/
//
// or in the "license" file accompanying this file. This file 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.
package main
// InstanceENIsAvailable contains a mapping of instance types to the number of ENIs available which is described at
// https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-eni.html#AvailableIpPerENI
var InstanceENIsAvailable = map[string]int{
"c1.medium": 2,
"c1.xlarge": 4,
"c3.large": 3,
"c3.xlarge": 4,
"c3.2xlarge": 4,
"c3.4xlarge": 8,
"c3.8xlarge": 8,
"c4.large": 3,
"c4.xlarge": 4,
"c4.2xlarge": 4,
"c4.4xlarge": 8,
"c4.8xlarge": 8,
"c5.large": 3,
"c5.xlarge": 4,
"c5.2xlarge": 4,
"c5.4xlarge": 8,
"c5.9xlarge": 8,
"c5.18xlarge": 15,
"c5d.large": 3,
"c5d.xlarge": 4,
"c5d.2xlarge": 4,
"c5d.4xlarge": 8,
"c5d.9xlarge": 8,
"c5d.18xlarge": 15,
"cc2.8xlarge": 8,
"cr1.8xlarge": 8,
"d2.xlarge": 4,
"d2.2xlarge": 4,
"d2.4xlarge": 8,
"d2.8xlarge": 8,
"f1.2xlarge": 4,
"f1.4xlarge": 8,
"f1.16xlarge": 8,
"g2.2xlarge": 4,
"g2.8xlarge": 8,
"g3s.xlarge": 4,
"g3.4xlarge": 8,
"g3.8xlarge": 8,
"g3.16xlarge": 15,
"h1.2xlarge": 4,
"h1.4xlarge": 8,
"h1.8xlarge": 8,
"h1.16xlarge": 15,
"hs1.8xlarge": 8,
"i2.xlarge": 4,
"i2.2xlarge": 4,
"i2.4xlarge": 8,
"i2.8xlarge": 8,
"i3.large": 3,
"i3.xlarge": 4,
"i3.2xlarge": 4,
"i3.4xlarge": 8,
"i3.8xlarge": 8,
"i3.16xlarge": 15,
"i3.metal": 15,
"m1.small": 2,
"m1.medium": 2,
"m1.large": 3,
"m1.xlarge": 4,
"m2.xlarge": 4,
"m2.2xlarge": 4,
"m2.4xlarge": 8,
"m3.medium": 2,
"m3.large": 3,
"m3.xlarge": 4,
"m3.2xlarge": 4,
"m4.large": 2,
"m4.xlarge": 4,
"m4.2xlarge": 4,
"m4.4xlarge": 8,
"m4.10xlarge": 8,
"m4.16xlarge": 8,
"m5.large": 3,
"m5.xlarge": 4,
"m5.2xlarge": 4,
"m5.4xlarge": 8,
"m5.12xlarge": 8,
"m5.24xlarge": 15,
"m5a.large": 3,
"m5a.xlarge": 4,
"m5a.2xlarge": 4,
"m5a.4xlarge": 8,
"m5a.12xlarge": 8,
"m5a.24xlarge": 15,
"m5d.large": 3,
"m5d.xlarge": 4,
"m5d.2xlarge": 4,
"m5d.4xlarge": 8,
"m5d.12xlarge": 8,
"m5d.24xlarge": 15,
"p2.xlarge": 4,
"p2.8xlarge": 8,
"p2.16xlarge": 8,
"p3.2xlarge": 4,
"p3.8xlarge": 8,
"p3.16xlarge": 8,
"r3.large": 3,
"r3.xlarge": 4,
"r3.2xlarge": 4,
"r3.4xlarge": 8,
"r3.8xlarge": 8,
"r4.large": 3,
"r4.xlarge": 4,
"r4.2xlarge": 4,
"r4.4xlarge": 8,
"r4.8xlarge": 8,
"r4.16xlarge": 15,
"r5.large": 3,
"r5.xlarge": 4,
"r5.2xlarge": 4,
"r5.4xlarge": 8,
"r5.12xlarge": 8,
"r5.24xlarge": 15,
"r5a.large": 3,
"r5a.xlarge": 4,
"r5a.2xlarge": 4,
"r5a.4xlarge": 8,
"r5a.12xlarge": 8,
"r5a.24xlarge": 15,
"r5d.large": 3,
"r5d.xlarge": 4,
"r5d.2xlarge": 4,
"r5d.4xlarge": 8,
"r5d.12xlarge": 8,
"r5d.24xlarge": 15,
"t1.micro": 2,
"t2.nano": 2,
"t2.micro": 2,
"t2.small": 3,
"t2.medium": 3,
"t2.large": 3,
"t2.xlarge": 3,
"t2.2xlarge": 3,
"t3.nano": 2,
"t3.micro": 2,
"t3.small": 3,
"t3.medium": 3,
"t3.large": 3,
"t3.xlarge": 4,
"t3.2xlarge": 4,
"u-6tb1.metal": 5,
"u-9tb1.metal": 5,
"u-12tb1.metal": 5,
"x1.16xlarge": 8,
"x1.32xlarge": 8,
"x1e.xlarge": 3,
"x1e.2xlarge": 4,
"x1e.4xlarge": 4,
"x1e.8xlarge": 4,
"x1e.16xlarge": 8,
"x1e.32xlarge": 8,
"z1d.large": 3,
"z1d.xlarge": 4,
"z1d.2xlarge": 4,
"z1d.3xlarge": 8,
"z1d.6xlarge": 8,
"z1d.12xlarge": 15,
}
// InstanceIPsAvailable contains a mapping of instance types to the number of IPs per ENI
// https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-eni.html#AvailableIpPerENI
var InstanceIPsAvailable = map[string]int64{
"c1.medium": 6,
"c1.xlarge": 15,
"c3.large": 10,
"c3.xlarge": 15,
"c3.2xlarge": 15,
"c3.4xlarge": 30,
"c3.8xlarge": 30,
"c4.large": 10,
"c4.xlarge": 15,
"c4.2xlarge": 15,
"c4.4xlarge": 30,
"c4.8xlarge": 30,
"c5.large": 10,
"c5.xlarge": 15,
"c5.2xlarge": 15,
"c5.4xlarge": 30,
"c5.9xlarge": 30,
"c5.18xlarge": 50,
"c5d.large": 10,
"c5d.xlarge": 15,
"c5d.2xlarge": 15,
"c5d.4xlarge": 30,
"c5d.9xlarge": 30,
"c5d.18xlarge": 50,
"cc2.8xlarge": 30,
"cr1.8xlarge": 30,
"d2.xlarge": 15,
"d2.2xlarge": 15,
"d2.4xlarge": 30,
"d2.8xlarge": 30,
"f1.2xlarge": 15,
"f1.4xlarge": 30,
"f1.16xlarge": 50,
"g2.2xlarge": 15,
"g2.8xlarge": 30,
"g3s.xlarge": 15,
"g3.4xlarge": 30,
"g3.8xlarge": 30,
"g3.16xlarge": 50,
"h1.2xlarge": 15,
"h1.4xlarge": 30,
"h1.8xlarge": 30,
"h1.16xlarge": 50,
"hs1.8xlarge": 30,
"i2.xlarge": 15,
"i2.2xlarge": 15,
"i2.4xlarge": 30,
"i2.8xlarge": 30,
"i3.large": 10,
"i3.xlarge": 15,
"i3.2xlarge": 15,
"i3.4xlarge": 30,
"i3.8xlarge": 30,
"i3.16xlarge": 50,
"i3.metal": 50,
"m1.small": 4,
"m1.medium": 6,
"m1.large": 10,
"m1.xlarge": 15,
"m2.xlarge": 15,
"m2.2xlarge": 30,
"m2.4xlarge": 30,
"m3.medium": 6,
"m3.large": 10,
"m3.xlarge": 15,
"m3.2xlarge": 30,
"m4.large": 10,
"m4.xlarge": 15,
"m4.2xlarge": 15,
"m4.4xlarge": 30,
"m4.10xlarge": 30,
"m4.16xlarge": 30,
"m5.large": 10,
"m5.xlarge": 15,
"m5.2xlarge": 15,
"m5.4xlarge": 30,
"m5.12xlarge": 30,
"m5.24xlarge": 50,
"m5a.large": 10,
"m5a.xlarge": 15,
"m5a.2xlarge": 15,
"m5a.4xlarge": 30,
"m5a.12xlarge": 30,
"m5a.24xlarge": 50,
"m5d.large": 10,
"m5d.xlarge": 15,
"m5d.2xlarge": 15,
"m5d.4xlarge": 30,
"m5d.12xlarge": 30,
"m5d.24xlarge": 50,
"p2.xlarge": 15,
"p2.8xlarge": 30,
"p2.16xlarge": 30,
"p3.2xlarge": 15,
"p3.8xlarge": 30,
"p3.16xlarge": 30,
"r3.large": 10,
"r3.xlarge": 15,
"r3.2xlarge": 15,
"r3.4xlarge": 30,
"r3.8xlarge": 30,
"r4.large": 10,
"r4.xlarge": 15,
"r4.2xlarge": 15,
"r4.4xlarge": 30,
"r4.8xlarge": 30,
"r4.16xlarge": 50,
"r5.large": 10,
"r5.xlarge": 15,
"r5.2xlarge": 15,
"r5.4xlarge": 30,
"r5.12xlarge": 30,
"r5.24xlarge": 50,
"r5a.large": 10,
"r5a.xlarge": 15,
"r5a.2xlarge": 15,
"r5a.4xlarge": 30,
"r5a.12xlarge": 30,
"r5a.24xlarge": 50,
"r5d.large": 10,
"r5d.xlarge": 15,
"r5d.2xlarge": 15,
"r5d.4xlarge": 30,
"r5d.12xlarge": 30,
"r5d.24xlarge": 50,
"t1.micro": 2,
"t2.nano": 2,
"t2.micro": 2,
"t2.small": 4,
"t2.medium": 6,
"t2.large": 12,
"t2.xlarge": 15,
"t2.2xlarge": 15,
"t3.nano": 2,
"t3.micro": 2,
"t3.small": 4,
"t3.medium": 6,
"t3.large": 12,
"t3.xlarge": 15,
"t3.2xlarge": 15,
"u-6tb1.metal": 30,
"u-9tb1.metal": 30,
"u-12tb1.metal": 30,
"x1.16xlarge": 30,
"x1.32xlarge": 30,
"x1e.xlarge": 10,
"x1e.2xlarge": 15,
"x1e.4xlarge": 15,
"x1e.8xlarge": 15,
"x1e.16xlarge": 30,
"x1e.32xlarge": 30,
"z1d.large": 10,
"z1d.xlarge": 15,
"z1d.2xlarge": 15,
"z1d.3xlarge": 30,
"z1d.6xlarge": 30,
"z1d.12xlarge": 50,
}