Merge pull request #1463 from mumoshu/amazon-vpc-cni-k8s

feat: initial support for amazon-vpc-cni-k8s

Gopkg.toml

@@ -33,3 +33,7 @@ ignored = ["github.com/kubernetes-incubator/kube-aws/hack*"]
 [[constraint]]
   branch = "master"
   name = "github.com/mgutz/ansi"
+
+[[constraint]]
+  version = "v1.2.0"
+  name = "github.com/aws/amazon-vpc-cni-k8s"

core/controlplane/config/amazon_vpc.go

@@ -0,0 +1,58 @@
+package config
+
+import (
+	"fmt"
+	"github.com/aws/amazon-vpc-cni-k8s/pkg/awsutils"
+	"github.com/kubernetes-incubator/kube-aws/node"
+)
+
+type AmazonVPC struct {
+	Enabled bool `yaml:"enabled"`
+}
+
+func (a AmazonVPC) MaxPodsScript() node.UploadedFileContent {
+	script := `#!/usr/bin/env bash
+
+set -e
+
+declare -A instance_eni_available
+`
+
+	for it, num := range awsutils.InstanceENIsAvailable {
+		script = script + fmt.Sprintf(`instance_eni_available["%s"]=%d
+`, it, num)
+	}
+
+	script = script + `
+declare -A instance_ip_available
+`
+	for it, num := range awsutils.InstanceIPsAvailable {
+		script = script + fmt.Sprintf(`instance_ip_available["%s"]=%d
+`, it, num)
+	}
+
+	script = script + `
+
+instance_type=$(curl http://169.254.169.254/latest/meta-data/instance-type)
+
+enis=${instance_eni_available["$instance_type"]}
+
+if [ "" == "$enis" ]; then
+  echo "unsupported instance type: no enis_per_eni defined: $instance_type" 1>&2
+  exit 1
+fi
+
+# According to https://github.com/aws/amazon-vpc-cni-k8s#eni-allocation
+ips_per_eni=${instance_ip_available["$instance_type"]}
+
+if [ "" == "$ips_per_eni" ]; then
+  echo "unsupported instance type: no ips_per_eni defined: $instance_type" 1>&2
+  exit 1
+fi
+
+max_pods=$(( (enis * (ips_per_eni - 1)) + 2 ))
+
+printf $max_pods
+`
+	return node.NewUploadedFileContent([]byte(script))
+}

core/controlplane/config/config.go

@@ -123,7 +123,7 @@ func NewDefaultCluster() *Cluster {
 		},
 		KIAMSupport: KIAMSupport{
 			Enabled:         false,
-			Image:           model.Image{Repo: "quay.io/uswitch/kiam", Tag: "v2.7", RktPullDocker: false},
+			Image:           model.Image{Repo: "quay.io/uswitch/kiam", Tag: "v2.8", RktPullDocker: false},
 			SessionDuration: "15m",
 			ServerAddresses: KIAMServerAddresses{ServerAddress: "localhost:443", AgentAddress: "kiam-server:443"},
 		},
@@ -218,6 +218,9 @@ func NewDefaultCluster() *Cluster {
 					Enabled: false,
 				},
 				Networking: Networking{
+					AmazonVPC: AmazonVPC{
+						Enabled: false,
+					},
 					SelfHosting: SelfHosting{
 						Type:            "canal",
 						Typha:           false,
@@ -787,6 +790,7 @@ type ResourceQuota struct {
 }
 
 type Networking struct {
+	AmazonVPC   AmazonVPC   `yaml:"amazonVPC"`
 	SelfHosting SelfHosting `yaml:"selfHosting"`
 }