Merge remote-tracking branch 'upstream/master' into sync-upstream

amazon-eks-nodegroup.yaml

@@ -80,6 +80,7 @@ Parameters:
       - p3.2xlarge
       - p3.8xlarge
       - p3.16xlarge
+      - p3dn.24xlarge
       - r5.large
       - r5.xlarge
       - r5.2xlarge

eks-worker-bionic.json

@@ -5,12 +5,15 @@
     "ami_name": "bionic-eks-node",
     "binary_bucket_name": "amazon-eks",
     "binary_bucket_region": "us-west-2",
-    "binary_bucket_path": "",
+    "binary_bucket_path": "1.11.5/2018-12-06/bin/linux/amd64",
+    "docker_version": "17.12.1-0ubuntu1",
     "creator": "{{env `USER`}}",
     "instance_type": "m5.large",
     "source_ami_id": "",
     "encrypted": "false",
-    "kms_key_id": ""
+    "kms_key_id": "",
+    "cni_version": "v0.6.0",
+    "cni_plugin_version": "v0.7.1"
   },
 
   "builders": [
@@ -40,7 +43,11 @@
           "creator": "{{user `creator`}}"
       },
       "tags": {
-          "created": "{{timestamp}}"
+          "created": "{{timestamp}}",
+          "docker_version": "{{ user `docker_version`}}",
+          "kubernetes": "{{ user `binary_bucket_path`}}",
+          "cni_version": "{{ user `cni_version`}}",
+          "cni_plugin_version": "{{ user `cni_plugin_version`}}"
       },
       "ami_name": "{{user `ami_name`}}-{{user `build_tag`}}",
       "ami_description": "EKS Kubernetes Worker AMI with Ubuntu 18.04 Bionic image"
@@ -64,7 +71,10 @@
         "AMI_NAME={{user `ami_name`}}",
         "BINARY_BUCKET_NAME={{user `binary_bucket_name`}}",
         "BINARY_BUCKET_PATH={{user `binary_bucket_path`}}",
-        "BINARY_BUCKET_REGION={{user `binary_bucket_region`}}"
+        "BINARY_BUCKET_REGION={{user `binary_bucket_region`}}",
+        "DOCKER_VERSION={{user `docker_version`}}",
+        "CNI_VERSION={{user `cni_version`}}",
+        "CNI_PLUGIN_VERSION={{user `cni_plugin_version`}}"
       ]
     }
   ],

files/docker-daemon.json

@@ -5,6 +5,6 @@
     "max-size": "10m",
     "max-file": "10"
   },
-  "max-concurrent-downloads": 10,
-  "live-restore": true
+  "live-restore": true,
+  "max-concurrent-downloads": 10
 }

files/eni-max-pods.txt

@@ -5,6 +5,12 @@
 # # of ENI * (# of IPv4 per ENI - 1)  + 2
 #
 # https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-eni.html#AvailableIpPerENI
+#
+# If f1.16xlarge, g3.16xlarge, h1.16xlarge, i3.16xlarge, and r4.16xlarge
+# instances use more than 31 IPv4 or IPv6 addresses per interface, they cannot
+# access the instance metadata, VPC DNS, and Time Sync services from the 32nd IP
+# address onwards. If access to these services is needed from all IP addresses
+# on the interface, we recommend using a maximum of 31 IP addresses per interface.
 c1.medium 12
 c1.xlarge 58
 c3.large 29
@@ -37,17 +43,17 @@ d2.4xlarge 234
 d2.8xlarge 234
 f1.2xlarge 58
 f1.4xlarge 234
-f1.16xlarge 394
+f1.16xlarge 242
 g2.2xlarge 58
 g2.8xlarge 234
 g3s.xlarge 58
 g3.4xlarge 234
 g3.8xlarge 234
-g3.16xlarge 737
+g3.16xlarge 452
 h1.2xlarge 58
 h1.4xlarge 234
 h1.8xlarge 234
-h1.16xlarge 737
+h1.16xlarge 452
 hs1.8xlarge 234
 i2.xlarge 58
 i2.2xlarge 58
@@ -58,7 +64,7 @@ i3.xlarge 58
 i3.2xlarge 58
 i3.4xlarge 234
 i3.8xlarge 234
-i3.16xlarge 737
+i3.16xlarge 452
 i3.metal 737
 m1.small 8
 m1.medium 12
@@ -101,6 +107,7 @@ p2.16xlarge 234
 p3.2xlarge 58
 p3.8xlarge 234
 p3.16xlarge 234
+p3dn.24xlarge 737
 r3.large 29
 r3.xlarge 58
 r3.2xlarge 58
@@ -111,7 +118,7 @@ r4.xlarge 58
 r4.2xlarge 58
 r4.4xlarge 234
 r4.8xlarge 234
-r4.16xlarge 737
+r4.16xlarge 452
 r5.large 29
 r5.xlarge 58
 r5.2xlarge 58

install-worker.sh

@@ -52,7 +52,8 @@ sudo systemctl enable iptables-restore
 ### Docker #####################################################################
 ################################################################################
 
-sudo apt-get install -y --no-install-recommends docker.io=17.12.1-0ubuntu1
+DOCKER_VERSION=${DOCKER_VERSION:-"17.12.1-0ubuntu1"}
+sudo apt-get install -y --no-install-recommends docker.io=${DOCKER_VERSION}
 sudo usermod -aG docker $USER
 
 sudo mkdir -p /etc/docker